Changeset 178 in josm for src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java

Timestamp:

2006-12-29T16:57:07+01:00 (19 years ago)

Author:

imi

Message:

• fixed display of tooltip shortcuts
• added icon=... to annotation presets
• added support for putting annotation presets in the toolbar

File:

• src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java (modified) (6 diffs)

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

@@ -14 +14 @@
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.StringTokenizer;
 import java.util.TreeMap;
 import java.util.TreeSet;
@@ -43 +38 @@
 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;
@@ -49 +43 @@
 import org.openstreetmap.josm.gui.annotation.AnnotationCellRenderer;
 import org.openstreetmap.josm.gui.annotation.AnnotationPreset;
+import org.openstreetmap.josm.gui.annotation.ForwardActionListener;
+import org.openstreetmap.josm.gui.preferences.AnnotationPresetPreference;
 import org.openstreetmap.josm.tools.ImageProvider;
-import org.xml.sax.SAXException;
 
 /**
@@ -214 +209 @@
          */
         private final JTable propertyTable = new JTable(data);
-        private JComboBox annotationPresets = new JComboBox();
+        public JComboBox annotationPresets = new JComboBox();
+
 
         /**
@@ -222 +218 @@
                 super(tr("Properties"), "propertiesdialog", tr("Property for selected objects."), KeyEvent.VK_P, 150);
 
-                Vector<AnnotationPreset> allPresets = new Vector<AnnotationPreset>();
-                String allAnnotations = Main.pref.get("annotation.sources");
-                StringTokenizer st = new StringTokenizer(allAnnotations, ";");
-                while (st.hasMoreTokens()) {
-                        InputStream in = null;
-                        String source = st.nextToken();
-                        try {
-                                if (source.startsWith("http") || source.startsWith("ftp") || source.startsWith("file"))
-                                        in = new URL(source).openStream();
-                                else if (source.startsWith("resource://"))
-                                        in = Main.class.getResourceAsStream(source.substring("resource:/".length()));
-                                else
-                                        in = new FileInputStream(source);
-                                allPresets.addAll(AnnotationPreset.readAll(in));
-                                in.close();
-                        } catch (IOException e) {
-                                e.printStackTrace();
-                                JOptionPane.showMessageDialog(Main.parent, tr("Could not read annotation preset source: {0}",source));
-                        } catch (SAXException e) {
-                                e.printStackTrace();
-                                JOptionPane.showMessageDialog(Main.parent, tr("Error parsing {0}: ", source)+e.getMessage());
-                        }
-                }
-                if (allPresets.size() > 0) {
-                        allPresets.add(0, new AnnotationPreset());
+                if (AnnotationPresetPreference.annotationPresets.size() > 0) {
+                        Vector<ActionListener> allPresets = new Vector<ActionListener>();
+                        for (final AnnotationPreset p : AnnotationPresetPreference.annotationPresets)
+                                allPresets.add(new ForwardActionListener(this, p));
+
+                        allPresets.add(0, new ForwardActionListener(this, new AnnotationPreset()));
                         annotationPresets.setModel(new DefaultComboBoxModel(allPresets));
                         add(annotationPresets, BorderLayout.NORTH);
@@ -252 +229 @@
                 annotationPresets.addActionListener(new ActionListener(){
                         public void actionPerformed(ActionEvent e) {
-                                Collection<OsmPrimitive> sel = Main.ds.getSelected();
-                                AnnotationPreset preset = (AnnotationPreset)annotationPresets.getSelectedItem();
-                                JPanel p = preset.createPanel();
-                                if (p == null)
-                                        return;
-                                int answer;
-                                if (p.getComponentCount() == 0)
-                                        answer = JOptionPane.OK_OPTION;
-                                else
-                                        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) {
-                                        Command cmd = preset.createCommand(sel);
-                                        if (cmd != null) {
-                                                Main.main.editLayer().add(cmd);
-                                                selectionChanged(sel); // update whole table
-                                        }
-                                }
-                                annotationPresets.setSelectedIndex(0);
+                                AnnotationPreset preset = ((ForwardActionListener)annotationPresets.getSelectedItem()).preset;
+                                preset.actionPerformed(e);
                         }
                 });