This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository netbeans.
commit b0847508261bd3750ff474b9161ef19baed2126a Author: Markus Koschany <[email protected]> Date: Fri Dec 25 23:22:14 2015 +0100 Refresh db.dataview-setRowFilter-method.patch --- .../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..5655c26 --- /dev/null +++ b/debian/patches/db.dataview-setRowFilter-method.patch @@ -0,0 +1,55 @@ +From: Markus Koschany <[email protected]> +Date: Fri, 25 Dec 2015 23:20:55 +0100 +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 e0d8a70..09fd256 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 +@@ -134,7 +134,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 b0eb987..5ce28c2 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 88a9b3a..e1dd566 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 +@@ -161,16 +161,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 39e515f..f7d2b81 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -22,3 +22,4 @@ netbeans-jemmy.patch netbeans-core.browser.webview.patch antlr-3.5.2.patch netbeans-nocopy.patch +db.dataview-setRowFilter-method.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/netbeans.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
