Changeset 3582 in josm for trunk

Timestamp:

2010-10-03T13:45:49+02:00 (14 years ago)

Author:

jttt

Message:

Fix minor errors in tagging-preset.xsd, remove focus attribute (it wasn't implemented and imho not necessary)

Location:

trunk

Files:

• data/tagging-preset.xsd (modified) (6 diffs)
• src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (modified) (4 diffs)

trunk/data/tagging-preset.xsd

@@ -85 +85 @@
                 <attribute name="href" type="string" use="required" />
                 <attribute name="text" type="string" />
+                <attribute name="text_context" type="string" />
 
                 <attribute name="name" use="prohibited"/>
@@ -92 +93 @@
         <complexType name="label">
                 <attribute name="text" type="string" use="required" />
+                <attribute name="text_context" type="string" />
 
                 <attribute name="name" use="prohibited"/>
@@ -102 +104 @@
                 <attribute name="key" type="string" use="required"/>
                 <attribute name="text" type="string" />
+                <attribute name="text_context" type="string" />
                 <attribute name="default" type="string" />
                 <attribute name="delete_if_empty" type="boolean" />
@@ -117 +120 @@
                 <attribute name="key" type="string" use="required" />
                 <attribute name="text" type="string" />
+                <attribute name="text_context" type="string" />
                 <attribute name="values" type="string" use="required" />
+                <attribute name="values_context" type="string" />
+                <attribute name="display_values" type="string"/>
                 <attribute name="default" type="string" />
                 <attribute name="editable" type="boolean" />
                 <attribute name="delete_if_empty" type="boolean" />
-                <attribute name="display_values" type="string"/>
                 <attribute name="required" type="boolean"/>
 
@@ -135 +140 @@
                 <attribute name="key" type="string" use="required" />
                 <attribute name="text" type="string" />
+                <attribute name="text_context" type="string" />
                 <attribute name="default" type="tns:check_default" />
-                <attribute name="delete_if_empty" type="boolean" />
                 <attribute name="use_last_as_default" type="boolean" />
                 <attribute name="required" type="boolean"/>
+                <attribute name="value_on" type="string"/>
+                <attribute name="value_off" type="string"/>
 
                 <attribute name="name" use="prohibited"/>
@@ -162 +169 @@
                 <attribute name="key" type="string"/>
                 <attribute name="text" type="string"/>
+                <attribute name="text_context" type="string"/>
                 <attribute name="requisite" type="string"/>
                 <attribute name="type" type="string"/>
                 <attribute name="count" type="integer"/>
+                <attribute name="required" type="boolean"/>
         </complexType>
 

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

@@ -22 +22 @@
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.EnumSet;
 import java.util.HashMap;
@@ -44 +43 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.command.AddCommand;
 import org.openstreetmap.josm.command.ChangePropertyCommand;
 import org.openstreetmap.josm.command.Command;
@@ -118 +116 @@
         }
 
-        public boolean focus = false;
         abstract boolean addToPanel(JPanel p, Collection<OsmPrimitive> sel);
         abstract void addCommands(List<Tag> changedTags);
@@ -952 +949 @@
             final Collection<RelationMember> members = new HashSet<RelationMember>();
             for(Tag t : getChangedTags()) {
-              r.put(t.getKey(), t.getValue());
+                r.put(t.getKey(), t.getValue());
             }
             for(OsmPrimitive osm : sel) {
-              RelationMember rm = new RelationMember("", osm);
-              r.addMember(rm);
-              members.add(rm);
+                RelationMember rm = new RelationMember("", osm);
+                r.addMember(rm);
+                members.add(rm);
             }
             SwingUtilities.invokeLater(new Runnable() {