Changeset 2912 in josm for trunk

Timestamp:

2010-01-31T16:13:51+01:00 (14 years ago)

Author:

jttt

Message:

Fixed #4330 java.lang.ArrayIndexOutOfBoundsException: 6 >= 6, added SelectionEventManager (similar to DatasetEventManager)

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/search/SearchAction.java (modified) (3 diffs)
• actions/search/SearchCompiler.java (modified) (1 diff)
• data/osm/event/SelectionEventManager.java (added)
• gui/dialogs/SelectionListDialog.java (modified) (4 diffs)
• gui/dialogs/properties/PropertiesDialog.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java

@@ -57 +57 @@
         SearchSetting s = lastSearch;
         if (s == null) {
-            s = new SearchSetting("", SearchMode.replace, false /* case insensitive */, false /* no regexp */);
+            s = new SearchSetting();
         }
         SearchSetting se = showSearchDialog(s);
@@ -303 +303 @@
         public boolean regexSearch;
 
+        public SearchSetting() {
+            this("", SearchMode.replace, false /* case insensitive */, false /* no regexp */);
+        }
+
         public SearchSetting(String text, SearchMode mode, boolean caseSensitive, boolean regexSearch) {
-            super();
             this.caseSensitive = caseSensitive;
             this.regexSearch = regexSearch;
@@ -312 +315 @@
 
         public SearchSetting(SearchSetting original) {
-            super();
-            this.caseSensitive = original.caseSensitive;
-            this.regexSearch = original.regexSearch;
-            this.mode = original.mode;
-            this.text = original.text;
+            this(original.text, original.mode, original.caseSensitive, original.regexSearch);
         }
 

trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java

@@ -60 +60 @@
 
     public static class Always extends Match {
+        public static Always INSTANCE = new Always();
         @Override public boolean match(OsmPrimitive osm) {
             return true;

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

@@ -40 +40 @@
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.osm.event.SelectionEventManager;
+import org.openstreetmap.josm.data.osm.event.DatasetEventManager.FireMode;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
 import org.openstreetmap.josm.gui.MapView;
@@ -163 +165 @@
     @Override
     public void showNotify() {
-        DataSet.selListeners.add(this);
+        SelectionEventManager.getInstance().addSelectionListener(this, FireMode.IN_EDT_CONSOLIDATED);
         MapView.addEditLayerChangeListener(this);
         updateSelection();
@@ -170 +172 @@
     @Override
     public void hideNotify() {
-        DataSet.selListeners.remove(this);
+        SelectionEventManager.getInstance().removeSelectionListener(this);
         MapView.removeEditLayerChangeListener(this);
     }
@@ -277 +279 @@
             setTitle(tr("Selection"));
         }
-        
+
         if (selectionHistory != null && newSelection.size() > 0 && !newSelection.equals(historyIgnoreSelection)) {
             historyIgnoreSelection = null;

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -59 +59 @@
 import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.data.SelectionChangedListener;
-import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -68 +67 @@
 import org.openstreetmap.josm.data.osm.event.DataSetListenerAdapter;
 import org.openstreetmap.josm.data.osm.event.DatasetEventManager;
+import org.openstreetmap.josm.data.osm.event.SelectionEventManager;
 import org.openstreetmap.josm.data.osm.event.DatasetEventManager.FireMode;
 import org.openstreetmap.josm.gui.DefaultNameFormatter;
@@ -154 +154 @@
         DatasetEventManager.getInstance().addDatasetListener(dataChangedAdapter, FireMode.IN_EDT_CONSOLIDATED);
         listOfUsedTags.rebuildNecessary();
-        DataSet.selListeners.add(this);
+        SelectionEventManager.getInstance().addSelectionListener(this, FireMode.IN_EDT_CONSOLIDATED);
         MapView.addEditLayerChangeListener(this);
         updateSelection();
@@ -163 +163 @@
         DatasetEventManager.getInstance().removeDatasetListener(listOfUsedTags);
         DatasetEventManager.getInstance().removeDatasetListener(dataChangedAdapter);
-        DataSet.selListeners.remove(this);
+        SelectionEventManager.getInstance().removeSelectionListener(this);
         MapView.removeEditLayerChangeListener(this);
     }