[netbeans] 11/49: 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 e2a3cbcb4561a1a9b3fc6d4c4a03988179917452
Author: Markus Koschany <apo at debian.org>
Date:   Thu Dec 17 01:31:18 2015 +0100

    Drop db.dataview-setRowFilter-method.patch
---
 .../patches/db.dataview-setRowFilter-method.patch  | 58 ----------------------
 debian/patches/series                              |  1 -
 2 files changed, 59 deletions(-)

diff --git a/debian/patches/db.dataview-setRowFilter-method.patch b/debian/patches/db.dataview-setRowFilter-method.patch
deleted file mode 100644
index db628e8..0000000
--- a/debian/patches/db.dataview-setRowFilter-method.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Mon, 8 Jun 2015 14:53:40 +0200
-Subject: db.dataview setRowFilter method
-
-Fix for another compilation failure due to missing symbols.
-
-Forwarded: not-needed
----
- .../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 cc9e04b..43c72ac 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,7 +6,6 @@ netbeans-platform-nojnabinaries.patch
 netbeans-platform-o.n.html.ko4j.patch
 netbeans-platform-windowslauncher.patch
 osgi-update.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