diff --git a/o.n.swing.outline/apichanges.xml b/o.n.swing.outline/apichanges.xml --- a/o.n.swing.outline/apichanges.xml +++ b/o.n.swing.outline/apichanges.xml @@ -170,6 +170,20 @@ + + + Add a way to clean all columns from the column model, including hidden ones. + + + + + +

Added ETableColumnModel.clean() method. +

+
+ + +
diff --git a/o.n.swing.outline/manifest.mf b/o.n.swing.outline/manifest.mf --- a/o.n.swing.outline/manifest.mf +++ b/o.n.swing.outline/manifest.mf @@ -1,5 +1,5 @@ Manifest-Version: 1.0 OpenIDE-Module: org.netbeans.swing.outline OpenIDE-Module-Localizing-Bundle: org/netbeans/swing/outline/Bundle.properties -OpenIDE-Module-Specification-Version: 1.11 +OpenIDE-Module-Specification-Version: 1.12 diff --git a/o.n.swing.outline/src/org/netbeans/swing/etable/ETableColumnModel.java b/o.n.swing.outline/src/org/netbeans/swing/etable/ETableColumnModel.java --- a/o.n.swing.outline/src/org/netbeans/swing/etable/ETableColumnModel.java +++ b/o.n.swing.outline/src/org/netbeans/swing/etable/ETableColumnModel.java @@ -329,8 +329,11 @@ return sortedColumns; } - /** Removes all columns, including hidden ones. TODO: Add to public APIs */ - void clean() { + /** + * Removes all columns, including hidden ones. + * @since 1.12 + */ + public void clean() { List allColumns = new ArrayList(tableColumns.size() + hiddenColumns.size()); allColumns.addAll(tableColumns); allColumns.addAll(hiddenColumns); diff --git a/openide.explorer/nbproject/project.xml b/openide.explorer/nbproject/project.xml --- a/openide.explorer/nbproject/project.xml +++ b/openide.explorer/nbproject/project.xml @@ -54,7 +54,7 @@ - 1.4 + 1.12 diff --git a/openide.explorer/src/org/openide/explorer/view/OutlineView.java b/openide.explorer/src/org/openide/explorer/view/OutlineView.java --- a/openide.explorer/src/org/openide/explorer/view/OutlineView.java +++ b/openide.explorer/src/org/openide/explorer/view/OutlineView.java @@ -456,13 +456,7 @@ if (doCleanColumns) { TableColumnModel tcm = outline.getColumnModel(); if (tcm instanceof ETableColumnModel) { - try { - java.lang.reflect.Method cleanMethod = ETableColumnModel.class.getDeclaredMethod("clean"); - cleanMethod.setAccessible(true); - cleanMethod.invoke(tcm); - } catch (Exception ex) { - Exceptions.printStackTrace(ex); - } + ((ETableColumnModel) tcm).clean(); } } rowModel.setProperties(newProperties);