[netbeans] 04/05: Revert "Drop db.dataview-setRowFilter-method.patch"

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository netbeans.

commit d835ff27f10eddc6f6b704235a0be65c90659f87
Author: Markus Koschany <apo at gambaru.de>
Date:   Mon Jun 15 18:35:23 2015 +0200

    Revert "Drop db.dataview-setRowFilter-method.patch"
    
    This reverts commit 43aa7b0208d5f9d01641a806a81ca038746ec711.
---
 .../patches/db.dataview-setRowFilter-method.patch  | 55 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 56 insertions(+)

diff --git a/debian/patches/db.dataview-setRowFilter-method.patch b/debian/patches/db.dataview-setRowFilter-method.patch
new file mode 100644
index 0000000..5e95c17
--- /dev/null
+++ b/debian/patches/db.dataview-setRowFilter-method.patch
@@ -0,0 +1,55 @@
+From: Markus Koschany <apo at gambaru.de>
+Date: Mon, 8 Jun 2015 14:53:40 +0200
+Subject: db.dataview setRowFilter method
+
+---
+ .../netbeans/modules/db/dataview/output/DataViewTableUI.java   |  1 -
+ .../org/netbeans/modules/db/dataview/output/DataViewUI.java    |  1 -
+ .../netbeans/modules/db/dataview/table/ResultSetJXTable.java   | 10 ----------
+ 3 files changed, 12 deletions(-)
+
+diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewTableUI.java b/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewTableUI.java
+index 582e5be..911df13 100644
+--- a/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewTableUI.java
++++ b/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewTableUI.java
+@@ -130,7 +130,6 @@ final class DataViewTableUI extends ResultSetJXTable {
+         }
+         super.setModel(dataModel);
+         dataModel.addTableModelListener(dataChangedListener); // Add new change listener
+-        setRowFilter((RowFilter) oldFilter);
+         if(dataviewUI != null) {
+             dataviewUI.handleColumnUpdated();
+         }
+diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewUI.java b/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewUI.java
+index 1bdcb80..69e2519 100644
+--- a/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewUI.java
++++ b/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewUI.java
+@@ -504,7 +504,6 @@ class DataViewUI extends JXPanel {
+         {
+             MultiColPatternFilter filterP = new MultiColPatternFilter(rows);
+             filterP.setFilterStr(matchBoxField.getText(), LITERAL_FIND);
+-            table.setRowFilter(filterP);
+         }
+     }
+ 
+diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetJXTable.java b/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetJXTable.java
+index 8e7776a..a42d842 100644
+--- a/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetJXTable.java
++++ b/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetJXTable.java
+@@ -153,16 +153,6 @@ public class ResultSetJXTable extends JXTableDecorator {
+     }
+ 
+     @Override
+-    @SuppressWarnings("unchecked")
+-    public <R extends TableModel> void setRowFilter(RowFilter<? super R, ? super Integer> filter) {
+-        if(getRowSorter() instanceof DefaultRowSorter) {
+-            ((DefaultRowSorter) getRowSorter()).setRowFilter(filter);
+-        } else {
+-            super.setRowFilter(filter);
+-        }
+-    }
+-
+-    @Override
+     public void setModel(TableModel dataModel) {
+         if(! (dataModel instanceof ResultSetTableModel)) {
+             throw new IllegalArgumentException(
diff --git a/debian/patches/series b/debian/patches/series
index 7d392c2..a7b6548 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,6 +8,7 @@ netbeans-platform-jemmy.patch
 netbeans-cluster-properties.patch
 Css3Parser-antlr.patch
 netbeans-nocopy.patch
+db.dataview-setRowFilter-method.patch
 netbeans-javacc.patch
 dlight.nativeexecution.patch
 netbeans-extexecution.impl.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/netbeans.git