Changeset 29 in josm for src/org/openstreetmap/josm/gui

Timestamp:

2005-12-02T07:40:16+01:00 (19 years ago)

Author:

imi

Message:

• fixed GPX export / import. Now featuring pending line segments
• added XML export
• merged open actions to autodetect format by extension
• added undo (not working yet)

Location:

src/org/openstreetmap/josm/gui

Files:

• MapView.java (modified) (1 diff)
• dialogs/LayerList.java (modified) (2 diffs)
• dialogs/PropertiesDialog.java (modified) (3 diffs)
• layer/EditLayer.java (modified) (1 diff)

src/org/openstreetmap/josm/gui/MapView.java

@@ -141 +141 @@
                         for (LayerChangeListener l : listeners)
                                 l.layerRemoved(layer);
+                if (layer == editLayer)
+                        editLayer = null;
         }
 

src/org/openstreetmap/josm/gui/dialogs/LayerList.java

@@ -24 +24 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.gui.ImageProvider;
 import org.openstreetmap.josm.gui.MapFrame;
@@ -154 +155 @@
                                 if (model.size() == 1) {
                                         Main.main.setMapFrame(null, null);
+                                        Main.main.ds = new DataSet();
                                 } else {
                                         int sel = layers.getSelectedIndex();

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

@@ -13 +13 @@
 import java.awt.event.WindowFocusListener;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.TreeMap;
@@ -292 +293 @@
                 data.setRowCount(0);
                 TreeMap<String, Collection<String>> props = new TreeMap<String, Collection<String>>();
+                HashMap<String, Integer> valueCounts = new HashMap<String, Integer>();
                 for (OsmPrimitive osm : newSelection) {
                         if (osm.keys != null) {
@@ -301 +303 @@
                                         }
                                         value.add(e.getValue());
+                                        
+                                        Integer count = valueCounts.get(e.getValue());
+                                        if (count == null)
+                                                count = 0;
+                                        valueCounts.put(e.getValue(), count+1);
                                 }
                         }
                 }
+                int selCount = newSelection.size();
                 for (Entry<String, Collection<String>> e : props.entrySet()) {
                         JComboBox value = new JComboBox(e.getValue().toArray());
                         value.setEditable(true);
-                        if (e.getValue().size() > 1)
+                        if (e.getValue().size() > 1 || valueCounts.get(e.getValue().iterator().next()) != selCount)
                                 value.getEditor().setItem("<different>");
                         data.addRow(new Object[]{e.getKey(), value});

src/org/openstreetmap/josm/gui/layer/EditLayer.java

@@ -42 +42 @@
          * All commands that were made on the dataset.
          */
-        public Collection<Command> commands = new LinkedList<Command>();
+        public LinkedList<Command> commands = new LinkedList<Command>();
 
         /**