Changeset 294 in josm

Timestamp:

2007-07-20T17:21:38+02:00 (18 years ago)

Author:

imi

Message:

• renamed annotation presets to tagging presets

Files:

• src/org/openstreetmap/josm/Main.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/annotation (deleted)
• src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java (modified) (3 diffs)
• src/org/openstreetmap/josm/gui/preferences/PluginPreference.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java (moved) (moved from src/org/openstreetmap/josm/gui/preferences/AnnotationPresetPreference.java ) (4 diffs)
• src/org/openstreetmap/josm/gui/tagging (added)
• src/org/openstreetmap/josm/gui/tagging/ForwardActionListener.java (copied) (copied from src/org/openstreetmap/josm/gui/annotation/ForwardActionListener.java ) (3 diffs)
• src/org/openstreetmap/josm/gui/tagging/TaggingCellRenderer.java (added)
• src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (added)
• test/unit/org/openstreetmap/josm/gui/tagging (moved) (moved from test/unit/org/openstreetmap/josm/gui/annotation )
• test/unit/org/openstreetmap/josm/gui/tagging/AnnotationPresetTest.java (deleted)
• test/unit/org/openstreetmap/josm/gui/tagging/TaggingPresetTest.java (copied) (copied from test/unit/org/openstreetmap/josm/gui/annotation/AnnotationPresetTest.java ) (3 diffs)
• test/unit/org/openstreetmap/josm/gui/tagging/annotation-test.xml (deleted)
• test/unit/org/openstreetmap/josm/gui/tagging/taggingpreset-test.xml (copied) (copied from test/unit/org/openstreetmap/josm/gui/annotation/annotation-test.xml )

src/org/openstreetmap/josm/Main.java

@@ -52 +52 @@
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer.CommandQueueListener;
-import org.openstreetmap.josm.gui.preferences.AnnotationPresetPreference;
+import org.openstreetmap.josm.gui.preferences.TaggingPresetPreference;
 import org.openstreetmap.josm.gui.preferences.ToolbarPreferences;
 import org.openstreetmap.josm.plugins.PluginException;
@@ -192 +192 @@
                 contentPane.getActionMap().put("Help", menu.help);
 
-                AnnotationPresetPreference.initialize();
+                TaggingPresetPreference.initialize();
 
                 toolbar.refreshToolbarControl();

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

@@ -48 +48 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.MapFrame;
-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.gui.preferences.TaggingPresetPreference;
+import org.openstreetmap.josm.gui.tagging.TaggingCellRenderer;
+import org.openstreetmap.josm.gui.tagging.ForwardActionListener;
+import org.openstreetmap.josm.gui.tagging.TaggingPreset;
 import org.openstreetmap.josm.tools.AutoCompleteComboBox;
 import org.openstreetmap.josm.tools.GBC;
@@ -269 +269 @@
          */
         private final JTable propertyTable = new JTable(data);
-        public JComboBox annotationPresets = new JComboBox();
+        public JComboBox taggingPresets = new JComboBox();
 
 
@@ -278 +278 @@
                 super(tr("Properties"), "propertiesdialog", tr("Properties for selected objects."), KeyEvent.VK_P, 150);
 
-                if (AnnotationPresetPreference.annotationPresets.size() > 0) {
+                if (TaggingPresetPreference.taggingPresets.size() > 0) {
                         Vector<ActionListener> allPresets = new Vector<ActionListener>();
-                        for (final AnnotationPreset p : AnnotationPresetPreference.annotationPresets)
+                        for (final TaggingPreset p : TaggingPresetPreference.taggingPresets)
                                 allPresets.add(new ForwardActionListener(this, p));
 
-                        allPresets.add(0, new ForwardActionListener(this, new AnnotationPreset()));
-                        annotationPresets.setModel(new DefaultComboBoxModel(allPresets));
+                        allPresets.add(0, new ForwardActionListener(this, new TaggingPreset()));
+                        taggingPresets.setModel(new DefaultComboBoxModel(allPresets));
                         JPanel north = new JPanel(new GridBagLayout());
                         north.add(getComponent(0),GBC.eol().fill(GBC.HORIZONTAL));
-                        north.add(annotationPresets,GBC.eol().fill(GBC.HORIZONTAL));
+                        north.add(taggingPresets,GBC.eol().fill(GBC.HORIZONTAL));
                         add(north, BorderLayout.NORTH);
                 }
-                annotationPresets.addActionListener(new ActionListener(){
+                taggingPresets.addActionListener(new ActionListener(){
                         public void actionPerformed(ActionEvent e) {
-                                AnnotationPreset preset = ((ForwardActionListener)annotationPresets.getSelectedItem()).preset;
+                                TaggingPreset preset = ((ForwardActionListener)taggingPresets.getSelectedItem()).preset;
                                 preset.actionPerformed(e);
-                                annotationPresets.setSelectedItem(null);
+                                taggingPresets.setSelectedItem(null);
                         }
                 });
-                annotationPresets.setRenderer(new AnnotationCellRenderer());
+                taggingPresets.setRenderer(new TaggingCellRenderer());
 
                 data.setColumnIdentifiers(new String[]{tr("Key"),tr("Value")});

src/org/openstreetmap/josm/gui/preferences/PluginPreference.java

@@ -169 +169 @@
                                                 proxy.info.name, 
                                                 proxy.info.description, 
-                                                PluginInformation.getURLString(proxy.info.file.getPath())));
+                                                proxy.info.file == null ? null : PluginInformation.getURLString(proxy.info.file.getPath())));
             return availablePlugins.values();
     }

src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java

@@ -103 +103 @@
                 settings.add(new CsvPreference());
                 settings.add(new ProjectionPreference());
-                settings.add(new AnnotationPresetPreference());
+                settings.add(new TaggingPresetPreference());
                 settings.add(new PluginPreference());
                 settings.add(Main.toolbar);

src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java

@@ -19 +19 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.gui.annotation.AnnotationPreset;
+import org.openstreetmap.josm.gui.tagging.TaggingPreset;
 import org.openstreetmap.josm.tools.GBC;
 
-public class AnnotationPresetPreference implements PreferenceSetting {
+public class TaggingPresetPreference implements PreferenceSetting {
 
-        public static Collection<AnnotationPreset> annotationPresets;
-        private JList annotationSources;
+        public static Collection<TaggingPreset> taggingPresets;
+        private JList taggingPresetSources;
 
         public void addGui(final PreferenceDialog gui) {
-                annotationSources = new JList(new DefaultListModel());
-                String annos = Main.pref.get("annotation.sources");
+                taggingPresetSources = new JList(new DefaultListModel());
+                String annos = Main.pref.get("taggingpreset.sources");
                 StringTokenizer st = new StringTokenizer(annos, ";");
                 while (st.hasMoreTokens())
-                        ((DefaultListModel)annotationSources.getModel()).addElement(st.nextToken());
+                        ((DefaultListModel)taggingPresetSources.getModel()).addElement(st.nextToken());
 
                 JButton addAnno = new JButton(tr("Add"));
                 addAnno.addActionListener(new ActionListener(){
                         public void actionPerformed(ActionEvent e) {
-                                String source = JOptionPane.showInputDialog(Main.parent, tr("Annotation preset source"));
+                                String source = JOptionPane.showInputDialog(Main.parent, tr("Tagging preset source"));
                                 if (source == null)
                                         return;
-                                ((DefaultListModel)annotationSources.getModel()).addElement(source);
+                                ((DefaultListModel)taggingPresetSources.getModel()).addElement(source);
                                 gui.requiresRestart = true;
                         }
@@ -48 +48 @@
                 editAnno.addActionListener(new ActionListener(){
                         public void actionPerformed(ActionEvent e) {
-                                if (annotationSources.getSelectedIndex() == -1)
+                                if (taggingPresetSources.getSelectedIndex() == -1)
                                         JOptionPane.showMessageDialog(Main.parent, tr("Please select the row to edit."));
                                 else {
-                                        String source = JOptionPane.showInputDialog(Main.parent, tr("Annotation preset source"), annotationSources.getSelectedValue());
+                                        String source = JOptionPane.showInputDialog(Main.parent, tr("Tagging preset source"), taggingPresetSources.getSelectedValue());
                                         if (source == null)
                                                 return;
-                                        ((DefaultListModel)annotationSources.getModel()).setElementAt(source, annotationSources.getSelectedIndex());
+                                        ((DefaultListModel)taggingPresetSources.getModel()).setElementAt(source, taggingPresetSources.getSelectedIndex());
                                         gui.requiresRestart = true;
                                 }
@@ -63 +63 @@
                 deleteAnno.addActionListener(new ActionListener(){
                         public void actionPerformed(ActionEvent e) {
-                                if (annotationSources.getSelectedIndex() == -1)
+                                if (taggingPresetSources.getSelectedIndex() == -1)
                                         JOptionPane.showMessageDialog(Main.parent, tr("Please select the row to delete."));
                                 else {
-                                        ((DefaultListModel)annotationSources.getModel()).remove(annotationSources.getSelectedIndex());
+                                        ((DefaultListModel)taggingPresetSources.getModel()).remove(taggingPresetSources.getSelectedIndex());
                                         gui.requiresRestart = true;
                                 }
                         }
                 });
-                annotationSources.setVisibleRowCount(3);
+                taggingPresetSources.setVisibleRowCount(3);
 
-                annotationSources.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
-                addAnno.setToolTipText(tr("Add a new annotation preset source to the list."));
+                taggingPresetSources.setToolTipText(tr("The sources (url or filename) of tagging preset definition files. See http://josm.eigenheimstrasse.de/wiki/TaggingPresets for help."));
+                addAnno.setToolTipText(tr("Add a new tagging preset source to the list."));
                 deleteAnno.setToolTipText(tr("Delete the selected source from the list."));
 
-                gui.map.add(new JLabel(tr("Annotation preset sources")), GBC.eol().insets(0,5,0,0));
-                gui.map.add(new JScrollPane(annotationSources), GBC.eol().fill(GBC.BOTH));
+                gui.map.add(new JLabel(tr("Tagging preset sources")), GBC.eol().insets(0,5,0,0));
+                gui.map.add(new JScrollPane(taggingPresetSources), GBC.eol().fill(GBC.BOTH));
                 JPanel buttonPanel = new JPanel(new GridBagLayout());
                 gui.map.add(buttonPanel, GBC.eol().fill(GBC.HORIZONTAL));
@@ -88 +88 @@
 
         public void ok() {
-                if (annotationSources.getModel().getSize() > 0) {
+                if (taggingPresetSources.getModel().getSize() > 0) {
                         StringBuilder sb = new StringBuilder();
-                        for (int i = 0; i < annotationSources.getModel().getSize(); ++i)
-                                sb.append(";"+annotationSources.getModel().getElementAt(i));
-                        Main.pref.put("annotation.sources", sb.toString().substring(1));
+                        for (int i = 0; i < taggingPresetSources.getModel().getSize(); ++i)
+                                sb.append(";"+taggingPresetSources.getModel().getElementAt(i));
+                        Main.pref.put("taggingpreset.sources", sb.toString().substring(1));
                 } else
-                        Main.pref.put("annotation.sources", null);
+                        Main.pref.put("taggingpreset.sources", null);
         }
 
         /** 
-         * Initialize the annotation presets (load and may display error)
+         * Initialize the tagging presets (load and may display error)
          */
         public static void initialize() {
-                annotationPresets = AnnotationPreset.readFromPreferences();
+                taggingPresets = TaggingPreset.readFromPreferences();
         }
 }

src/org/openstreetmap/josm/gui/tagging/ForwardActionListener.java

@@ -1 @@
-package org.openstreetmap.josm.gui.annotation;
+package org.openstreetmap.josm.gui.tagging;
 
 import java.awt.event.ActionEvent;
@@ -12 +12 @@
  */
 public final class ForwardActionListener implements ActionListener {
-        public final AnnotationPreset preset;
+        public final TaggingPreset preset;
 
         private final PropertiesDialog propertiesDialog;
 
-        public ForwardActionListener(PropertiesDialog propertiesDialog, AnnotationPreset preset) {
+        public ForwardActionListener(PropertiesDialog propertiesDialog, TaggingPreset preset) {
                 this.propertiesDialog = propertiesDialog;
                 this.preset = preset;
@@ -22 +22 @@
 
         public void actionPerformed(ActionEvent e) {
-                this.propertiesDialog.annotationPresets.setSelectedIndex(0);
+                this.propertiesDialog.taggingPresets.setSelectedIndex(0);
                 e.setSource(this);
                 preset.actionPerformed(e);

test/unit/org/openstreetmap/josm/gui/tagging/TaggingPresetTest.java

@@ -1 @@
-package org.openstreetmap.josm.gui.annotation;
+package org.openstreetmap.josm.gui.tagging;
 
 import java.io.ByteArrayInputStream;
@@ -11 +11 @@
 import junit.framework.TestCase;
 
-import org.openstreetmap.josm.gui.annotation.AnnotationPreset.Check;
-import org.openstreetmap.josm.gui.annotation.AnnotationPreset.Combo;
-import org.openstreetmap.josm.gui.annotation.AnnotationPreset.Key;
-import org.openstreetmap.josm.gui.annotation.AnnotationPreset.Label;
-import org.openstreetmap.josm.gui.annotation.AnnotationPreset.Text;
+import org.openstreetmap.josm.gui.tagging.TaggingPreset;
+import org.openstreetmap.josm.gui.tagging.TaggingPreset.Check;
+import org.openstreetmap.josm.gui.tagging.TaggingPreset.Combo;
+import org.openstreetmap.josm.gui.tagging.TaggingPreset.Key;
+import org.openstreetmap.josm.gui.tagging.TaggingPreset.Label;
+import org.openstreetmap.josm.gui.tagging.TaggingPreset.Text;
 
-public class AnnotationPresetTest extends TestCase {
+public class TaggingPresetTest extends TestCase {
 
-        public void testAnnotationPresetLoads() throws Exception {
-                InputStream in = getClass().getResourceAsStream("annotation-test.xml");
-                List<AnnotationPreset> all = AnnotationPreset.readAll(in);
+        public void testTaggingPresetLoads() throws Exception {
+                InputStream in = getClass().getResourceAsStream("taggingpreset-test.xml");
+                List<TaggingPreset> all = TaggingPreset.readAll(in);
 
                 assertEquals(1, all.size());
-                AnnotationPreset a = all.get(0);
+                TaggingPreset a = all.get(0);
                 assertEquals("Highway", a.getValue(Action.NAME));
                 Field dataField = a.getClass().getDeclaredField("data");
@@ -60 +61 @@
         public void testIconLoadsFromClasspath() throws Exception {
                 String xml = "<annotations><item icon='logo'></item></annotations>";
-                List<AnnotationPreset> all = AnnotationPreset.readAll(new ByteArrayInputStream(xml.getBytes()));
+                List<TaggingPreset> all = TaggingPreset.readAll(new ByteArrayInputStream(xml.getBytes()));
 
                 assertEquals(1, all.size());