You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2015/12/31 22:30:38 UTC
nifi git commit: NIFI-108: - Ensured the column sort indicator is
reset when a new listing is opened. - Removing unused import.
Repository: nifi
Updated Branches:
refs/heads/NIFI-108 7f3980d42 -> f0e86e5a7
NIFI-108:
- Ensured the column sort indicator is reset when a new listing is opened.
- Removing unused import.
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/f0e86e5a
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/f0e86e5a
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/f0e86e5a
Branch: refs/heads/NIFI-108
Commit: f0e86e5a7119a76bb14f2f4e507ebab96a8b3abf
Parents: 7f3980d
Author: Matt Gilman <ma...@gmail.com>
Authored: Thu Dec 31 16:30:15 2015 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Thu Dec 31 16:30:15 2015 -0500
----------------------------------------------------------------------
.../nifi/controller/StandardFlowFileQueue.java | 43 ++++++++++----------
.../webapp/js/nf/canvas/nf-queue-listing.js | 17 ++++----
2 files changed, 29 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/f0e86e5a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowFileQueue.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowFileQueue.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowFileQueue.java
index 57e84b1..9c731a8 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowFileQueue.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowFileQueue.java
@@ -16,27 +16,6 @@
*/
package org.apache.nifi.controller;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.NavigableSet;
-import java.util.PriorityQueue;
-import java.util.Queue;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-
import org.apache.nifi.attribute.expression.language.PreparedQuery;
import org.apache.nifi.attribute.expression.language.Query;
import org.apache.nifi.attribute.expression.language.exception.AttributeExpressionLanguageParsingException;
@@ -75,10 +54,30 @@ import org.apache.nifi.reporting.Severity;
import org.apache.nifi.scheduling.SchedulingStrategy;
import org.apache.nifi.util.FormatUtils;
import org.apache.nifi.util.concurrency.TimedLock;
-import org.apache.nifi.web.api.dto.FlowFileSummaryDTO;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.NavigableSet;
+import java.util.PriorityQueue;
+import java.util.Queue;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+
/**
* A FlowFileQueue is used to queue FlowFile objects that are awaiting further
* processing. Must be thread safe.
http://git-wip-us.apache.org/repos/asf/nifi/blob/f0e86e5a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-queue-listing.js
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-queue-listing.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-queue-listing.js
index e3c1009..3c33f3a 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-queue-listing.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-queue-listing.js
@@ -484,7 +484,6 @@ nf.QueueListing = (function () {
var queueListingGrid = new Slick.Grid('#queue-listing-table', queueListingData, queueListingColumns, queueListingOptions);
queueListingGrid.setSelectionModel(new Slick.RowSelectionModel());
queueListingGrid.registerPlugin(new Slick.AutoTooltips());
- queueListingGrid.setSortColumn(DEFAULT_SORT_COL, DEFAULT_SORT_ASC);
queueListingGrid.onSort.subscribe(function (e, args) {
var connection = $('#queue-listing-table').data('connection');
performListing(connection, args.sortCol.id, args.sortAsc);
@@ -531,6 +530,9 @@ nf.QueueListing = (function () {
* @param {object} The connection
*/
listQueue: function (connection) {
+ var queueListingGrid = $('#queue-listing-table').data('gridInstance');
+ queueListingGrid.setSortColumn(DEFAULT_SORT_COL, DEFAULT_SORT_ASC);
+
// perform the initial listing
performListing(connection, DEFAULT_SORT_COL, DEFAULT_SORT_ASC).done(function () {
// update the connection name
@@ -545,15 +547,12 @@ nf.QueueListing = (function () {
$('#queue-listing-table').removeData('connection');
// clear the table
- var queueListingGrid = $('#queue-listing-table').data('gridInstance');
- if (nf.Common.isDefinedAndNotNull(queueListingGrid)) {
- var queueListingData = queueListingGrid.getData();
+ var queueListingData = queueListingGrid.getData();
- // clear the flowfiles
- queueListingData.beginUpdate();
- queueListingData.setItems([], 'uuid');
- queueListingData.endUpdate();
- }
+ // clear the flowfiles
+ queueListingData.beginUpdate();
+ queueListingData.setItems([], 'uuid');
+ queueListingData.endUpdate();
// reset stats
$('#displayed-flowfiles, #total-flowfiles-count').text('0');