Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-730: 

- Fixing checkstyle violations.
- Renaming context menu item for emptying a queue.
This commit is contained in:
Matt Gilman 2015-10-13 10:12:58 -04:00
parent ad6af95d07
commit 09d6fe5cdb
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/NiFiServiceFacade.java
View File

@ -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
// ----------------------------------------

2
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ConnectionResource.java
View File

@ -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

12
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/ConnectionDAO.java
View File

@ -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);

2
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js
View File

@ -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;
}

2
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-context-menu.js
View File

@ -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'}}
];