Changeset 120 in josm for src/org/openstreetmap

Timestamp:

2006-07-21T13:49:09+02:00 (19 years ago)

Author:

imi

Message:

• added type={node,segment,way} feature to annotation presets
• fixed missing close when reading annotation presets

Location:

src/org/openstreetmap/josm

Files:

• data/osm/visitor/NameVisitor.java (added)
• gui/dialogs/AnnotationPreset.java (modified) (5 diffs)
• gui/dialogs/AnnotationTester.java (modified) (1 diff)
• gui/dialogs/PropertiesDialog.java (modified) (3 diffs)

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

@@ -132 +132 @@
                 List<Item> current;
                 String currentName;
+                Class<?> currentType;
                 private static int unknownCounter = 1;
 
@@ -142 +143 @@
                                 if (currentName == null)
                                         currentName = "Unnamed Preset #"+(unknownCounter++);
+                                if (a.getValue("type") != null) {
+                                        String s = a.getValue("type");
+                                        s = Character.toUpperCase(s.charAt(0))+s.substring(1);
+                                        try {
+                                                currentType = Class.forName("org.openstreetmap.josm.data.osm."+s);
+                                        } catch (ClassNotFoundException e) {
+                                                e.printStackTrace();
+                                                throw new SAXException(tr("Unknown type at line {0}", getLineNumber()));
+                                        }
+                                }
                         } else if (qname.equals("text"))
                                 current.add(new Text(a.getValue("key"), a.getValue("text"), a.getValue("default")));
@@ -160 +171 @@
                                 throw new SAXException(tr("Unknown annotation object {0} at line {1} column {2}", qname, getLineNumber(), getColumnNumber()));
                 }
+
                 @Override public void endElement(String ns, String lname, String qname) {
                         if (qname.equals("item"))
-                                data.add(new AnnotationPreset(current, currentName));
+                                data.add(new AnnotationPreset(current, currentName, currentType));
                 }
         }
@@ -168 +180 @@
         private List<Item> data;
         String name;
-
-        public AnnotationPreset(List<Item> data, String name) {
+        private Class<?> type;
+
+        public AnnotationPreset(List<Item> data, String name, Class<?> currentType) {
                 this.data = data;
                 this.name = name;
+                this.type = currentType;
         }
 
@@ -209 +223 @@
         }
 
-        public Command createCommand(Collection<OsmPrimitive> sel) {
+        public Command createCommand(Collection<OsmPrimitive> participants) {
+                Collection<OsmPrimitive> sel = new LinkedList<OsmPrimitive>();
+                for (OsmPrimitive osm : participants)
+                        if (osm.getClass() == type)
+                                sel.add(osm);
+                if (sel.isEmpty())
+                        return null;
+
                 List<Command> cmds = new LinkedList<Command>();
                 for (Item i : data)

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

@@ -46 +46 @@
                                 JOptionPane.showMessageDialog(null, "Error parsing "+source+": "+e.getMessage());
                         }
+
+                        try {
+                    if (in != null)
+                        in.close();
+            } catch (IOException e) {
+            }
                 }
                 annotationPresets.setModel(new DefaultComboBoxModel(allPresets));

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

@@ -43 +43 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.ChangePropertyCommand;
+import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.data.SelectionChangedListener;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -224 +225 @@
                                         in = new FileInputStream(source);
                                 allPresets.addAll(AnnotationPreset.readAll(in));
+                                in.close();
                         } catch (IOException e) {
                                 e.printStackTrace();
@@ -250 +252 @@
                                         answer = JOptionPane.showConfirmDialog(Main.parent, p, trn("Change {0} object", "Change {0} objects", sel.size(), sel.size()), JOptionPane.OK_CANCEL_OPTION);
                                 if (answer == JOptionPane.OK_OPTION) {
-                                        Main.main.editLayer().add(preset.createCommand(sel));
-                                        selectionChanged(sel); // update whole table
+                                        Command cmd = preset.createCommand(sel);
+                                        if (cmd != null) {
+                                                Main.main.editLayer().add(cmd);
+                                                selectionChanged(sel); // update whole table
+                                        }
                                 }
                                 annotationPresets.setSelectedIndex(0);