Changeset 895 in josm for trunk

Timestamp:

2008-08-29T23:34:58+02:00 (16 years ago)

Author:

stoecker

Message:

renamed seperator to correct separator

Location:

trunk

Files:

• presets/presets.xml (modified) (17 diffs)
• src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (modified) (3 diffs)
• src/org/openstreetmap/josm/gui/tagging/TaggingPresetSeparator.java (added)
• src/org/openstreetmap/josm/gui/tagging/TaggingPresetSeperator.java (deleted)

trunk/presets/presets.xml

@@ -90 +90 @@
                 </item>
 
-                <seperator/>
+                <separator/>
 
                 <item name="Primary" icon="presets/way_primary.png">
@@ -256 +256 @@
                 </item>
 
-                <seperator/>
+                <separator/>
 
                 <item name="Road Restrictions" icon="presets/restrictions.png">
@@ -396 +396 @@
                 </item>
 
-                <seperator/>
+                <separator/>
 
                 <item name="Bridleway" icon="presets/equestrian.png">
@@ -474 +474 @@
                 </item>
 
-                <seperator/>
+                <separator/>
 
                 <item name="Track" icon="presets/track.png">
@@ -601 +601 @@
                 </item>
 
-                <seperator/>
+                <separator/>
 
                 <item name="Path" icon="presets/path.png">
@@ -790 +790 @@
         </group> <!-- Waypoints -->
 
-        <seperator/>
+        <separator/>
 
         <group name="Railway" icon="presets/railway.png">
@@ -868 +868 @@
         </group> <!-- Railway Point -->
 
-        <seperator/>
+        <separator/>
 
         <group name="Waterway" icon="presets/waterway.png">
@@ -910 +910 @@
                 </item>
 
-                <seperator/>
+                <separator/>
 
                 <item name="Weir" icon="presets/empty.png">
@@ -948 +948 @@
         </group> <!-- Waterway -->
 
-        <seperator/>
+        <separator/>
 
         <group name="Car" icon="presets/car.png">
@@ -1067 +1067 @@
         </group> <!-- Public Transport -->
 
-        <seperator/>
+        <separator/>
 
         <group name="Accomodation" icon="presets/bed.png">
@@ -1191 +1191 @@
         </group>
 
-        <seperator/>
+        <separator/>
 
         <item name="Shelter" icon="presets/shelter.png">
@@ -1305 +1305 @@
                 </item>
         </group> <!-- Leisure -->
-        <seperator/>
+        <separator/>
 
         <group name="Sport Facilities" icon="presets/stadium.png">
@@ -1592 +1592 @@
         </group>
 
-        <seperator/>
+        <separator/>
         
         <group name="Health" icon="presets/pharmacy.png">
@@ -1662 +1662 @@
                 </item>
 
-                <seperator/>
+                <separator/>
 
                 <item name="Kindergarten" icon="presets/kindergarten.png">
@@ -1688 +1688 @@
                 </item>
 
-                <seperator/>
+                <separator/>
 
                 <item name="Cinema" icon="presets/empty.png">
@@ -1841 +1841 @@
         </group> <!-- Shops -->
 
-        <seperator/>
+        <separator/>
 
         <group name="Places" icon="presets/places.png">
@@ -1928 +1928 @@
                 </item>
 
-                <seperator/>
+                <separator/>
 
                 <item name="Addresses" icon="presets/addresses.png">

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

@@ -30 +30 @@
 import org.openstreetmap.josm.gui.tagging.TaggingPreset;
 import org.openstreetmap.josm.gui.tagging.TaggingPresetMenu;
-import org.openstreetmap.josm.gui.tagging.TaggingPresetSeperator;
+import org.openstreetmap.josm.gui.tagging.TaggingPresetSeparator;
 import org.openstreetmap.josm.tools.GBC;
 
@@ -133 +133 @@
                         {
                                 JMenu m = p.group != null ? submenus.get(p.group) : Main.main.menu.presetsMenu;
-                                if (p instanceof TaggingPresetSeperator)
+                                if (p instanceof TaggingPresetSeparator)
                                         m.add(new JSeparator());
                                 else if (p instanceof TaggingPresetMenu)

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java

@@ -42 +42 @@
 import org.openstreetmap.josm.gui.QuadStateCheckBox;
 import org.openstreetmap.josm.gui.tagging.TaggingPresetMenu;
-import org.openstreetmap.josm.gui.tagging.TaggingPresetSeperator;
+import org.openstreetmap.josm.gui.tagging.TaggingPresetSeparator;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -396 +396 @@
                 XmlObjectParser parser = new XmlObjectParser();
                 parser.mapOnStart("item", TaggingPreset.class);
-                parser.mapOnStart("seperator", TaggingPresetSeperator.class);
+                parser.mapOnStart("separator", TaggingPresetSeparator.class);
                 parser.mapBoth("group", TaggingPresetMenu.class);
                 parser.map("text", Text.class);
@@ -421 +421 @@
                                         
                                 }
-                        } else if (o instanceof TaggingPresetSeperator) {
-                                TaggingPresetSeperator tp = (TaggingPresetSeperator) o;
+                        } else if (o instanceof TaggingPresetSeparator) {
+                                TaggingPresetSeparator tp = (TaggingPresetSeparator) o;
                                 tp.group = lastmenu;
                                 all.add(tp);