You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2015/11/02 20:32:32 UTC
[08/30] nifi git commit: NIFI-730: - Fixing checkstyle violations. -
Renaming context menu item for emptying a queue.
NIFI-730:
- Fixing checkstyle violations.
- Renaming context menu item for emptying a queue.
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/09d6fe5c
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/09d6fe5c
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/09d6fe5c
Branch: refs/heads/master
Commit: 09d6fe5cdb93ed3660263165f909e088244796db
Parents: ad6af95
Author: Matt Gilman <ma...@gmail.com>
Authored: Tue Oct 13 10:12:58 2015 -0400
Committer: Matt Gilman <ma...@gmail.com>
Committed: Tue Oct 13 10:12:58 2015 -0400
----------------------------------------------------------------------
.../java/org/apache/nifi/web/NiFiServiceFacade.java | 14 +++++++-------
.../org/apache/nifi/web/api/ConnectionResource.java | 2 +-
.../java/org/apache/nifi/web/dao/ConnectionDAO.java | 12 ++++++------
.../src/main/webapp/js/nf/canvas/nf-actions.js | 2 +-
.../src/main/webapp/js/nf/canvas/nf-context-menu.js | 2 +-
5 files changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/09d6fe5c/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/NiFiServiceFacade.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/NiFiServiceFacade.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/NiFiServiceFacade.java
index 28f6b61..5f89d8e 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/NiFiServiceFacade.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/NiFiServiceFacade.java
@@ -528,28 +528,28 @@ public interface NiFiServiceFacade {
/**
* Creates a new flow file drop request.
- *
+ *
* @param groupId group
* @param connectionId The ID of the connection
- * @return
+ * @return The DropRequest
*/
DropRequestDTO createFlowFileDropRequest(String groupId, String connectionId);
-
+
/**
* Gets the specified flow file drop request.
- *
+ *
* @param dropRequestId The flow file drop request
* @return The DropRequest
*/
DropRequestDTO getFlowFileDropRequest(String dropRequestId);
-
+
/**
* Cancels/removes the specified flow file drop request.
- *
+ *
* @param dropRequestId The flow file drop request
*/
void deleteFlowFileDropRequest(String dropRequestId);
-
+
// ----------------------------------------
// InputPort methods
// ----------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/09d6fe5c/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ConnectionResource.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ConnectionResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ConnectionResource.java
index dfc20fb..4265ead 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ConnectionResource.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ConnectionResource.java
@@ -1036,7 +1036,7 @@ public class ConnectionResource extends ApplicationResource {
/**
* Deletes the specified drop request.
- *
+ *
* @param clientId Optional client id. If the client id is not specified, a new one will be generated. This value (whether specified or generated) is included in the response.
* @param connectionId The connection id
* @param dropRequestId The drop request id
http://git-wip-us.apache.org/repos/asf/nifi/blob/09d6fe5c/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/ConnectionDAO.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/ConnectionDAO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/ConnectionDAO.java
index ce1d1fd..8c09919 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/ConnectionDAO.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/ConnectionDAO.java
@@ -33,11 +33,11 @@ public interface ConnectionDAO {
/**
* Gets the specified flow file drop request.
- *
+ *
* @param dropRequestId The drop request id
*/
void getFlowFileDropRequest(String dropRequestId);
-
+
/**
* Gets the connections for the specified source processor.
*
@@ -75,12 +75,12 @@ public interface ConnectionDAO {
/**
* Creates a new flow file drop request.
- *
+ *
* @param groupId group id
* @param id connection id
*/
void createFileFlowDropRequest(String groupId, String id);
-
+
/**
* Verifies the create request can be processed.
*
@@ -121,10 +121,10 @@ public interface ConnectionDAO {
* @param id The id of the connection
*/
void deleteConnection(String groupId, String id);
-
+
/**
* Deletes the specified flow file drop request.
- *
+ *
* @param dropRequestId The drop request id
*/
void deleteFlowFileDropRequest(String dropRequestId);
http://git-wip-us.apache.org/repos/asf/nifi/blob/09d6fe5c/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js
index bab2236..1d8152b 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js
@@ -850,7 +850,7 @@ nf.Actions = (function () {
*
* @param {type} selection
*/
- deleteQueueContents: function (selection) {
+ emptyQueue: function (selection) {
if (selection.size() !== 1 || !nf.CanvasUtils.isConnection(selection)) {
return;
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/09d6fe5c/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-context-menu.js
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-context-menu.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-context-menu.js
index 58397d4..f2b358d 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-context-menu.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-context-menu.js
@@ -382,7 +382,7 @@ nf.ContextMenu = (function () {
{condition: isCopyable, menuItem: {img: 'images/iconCopy.png', text: 'Copy', action: 'copy'}},
{condition: isPastable, menuItem: {img: 'images/iconPaste.png', text: 'Paste', action: 'paste'}},
{condition: canMoveToParent, menuItem: {img: 'images/iconMoveToParent.png', text: 'Move to parent group', action: 'moveIntoParent'}},
- {condition: canDeleteFlowFiles, menuItem: {img: 'images/iconDelete.png', text: 'Delete Flow Files', action: 'deleteQueueContents'}},
+ {condition: canDeleteFlowFiles, menuItem: {img: 'images/iconDelete.png', text: 'Empty queue', action: 'emptyQueue'}},
{condition: isDeletable, menuItem: {img: 'images/iconDelete.png', text: 'Delete', action: 'delete'}}
];