Changeset 3346 in josm for trunk/src/org

Timestamp:

2010-06-27T10:57:00+02:00 (14 years ago)

Author:

bastiK

Message:

fixed: header of filter dialog shows wrong numbers (always 0)

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/Filters.java (modified) (2 diffs)
• gui/dialogs/FilterDialog.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/data/osm/Filters.java

@@ -64 +64 @@
      * (but hides them only if they are not used by any unfiltered way).
      */
-    public void executeFilters(){
+    public void executeFilters() {
         DataSet ds = Main.main.getCurrentDataSet();
         if (ds == null)
@@ -248 +248 @@
 
         Main.map.mapView.repaint();
+        Main.map.filterDialog.updateDialogHeader();
     }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java

@@ -18 +18 @@
 import javax.swing.JTable;
 import javax.swing.ListSelectionModel;
-import javax.swing.event.TableModelEvent;
-import javax.swing.event.TableModelListener;
+import javax.swing.SwingUtilities;
 import javax.swing.table.DefaultTableCellRenderer;
 import javax.swing.table.JTableHeader;
@@ -41 +40 @@
  * @author Petr_Dlouhý
  */
-public class FilterDialog extends ToggleDialog implements Listener, TableModelListener {
+public class FilterDialog extends ToggleDialog implements Listener {
 
     private JTable userTable;
@@ -162 +161 @@
         };
 
-        filters.addTableModelListener(this);
-
         userTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
 
@@ -178 +175 @@
         userTable.setDefaultRenderer(Boolean.class, new BooleanRenderer());
         userTable.setDefaultRenderer(String.class, new StringRenderer());
-
-        tableChanged(null);
 
         pnl.add(new JScrollPane(userTable), BorderLayout.CENTER);
@@ -213 +208 @@
     }
 
-    public void tableChanged(TableModelEvent e){
-        setTitle(tr("Filter Hidden:{0} Disabled:{1}", filters.disabledAndHiddenCount, filters.disabledCount));
+    public void updateDialogHeader() {
+        SwingUtilities.invokeLater(new Runnable() {
+            public void run() {
+                setTitle(tr("Filter Hidden:{0} Disabled:{1}", filters.disabledAndHiddenCount, filters.disabledCount));
+            }
+        });
     }