Changeset 33 in josm for src/org/openstreetmap/josm/data

Timestamp:

2005-12-22T01:32:33+01:00 (18 years ago)

Author:

imi

Message:

• prepared for uploading.
• fixed gpx export/import with uid and modified flag

Location:

src/org/openstreetmap/josm/data

Files:

• Preferences.java (modified) (3 diffs)
• osm/OsmPrimitive.java (modified) (5 diffs)

src/org/openstreetmap/josm/data/Preferences.java

@@ -50 +50 @@
          */
         private boolean forceRawGpsLines = false;
-        /**
-         * Whether nodes on the same place should be considered identical.
-         */
-        public boolean mergeNodes = true;
 
         /**
@@ -132 +128 @@
                                 osmDataPassword = osmServer.getChildText("password");
                         }
-                        mergeNodes = root.getChild("mergeNodes") != null;
                         drawRawGpsLines = root.getChild("drawRawGpsLines") != null;
                         forceRawGpsLines = root.getChild("forceRawGpsLines") != null;
@@ -153 +148 @@
                 children.add(new Element("laf").setText(laf.getClassName()));
                 children.add(new Element("projection").setText(getProjection().getClass().getName()));
-                if (mergeNodes)
-                        children.add(new Element("mergeNodes"));
                 if (drawRawGpsLines)
                         children.add(new Element("drawRawGpsLines"));

src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

@@ -15 +15 @@
 abstract public class OsmPrimitive {
 
-        private static int idcount = 0;
-        public OsmPrimitive() {
-                id = ++idcount;
-        }
-        
         /**
          * The key/value list for this primitive.
@@ -43 +38 @@
          * If set to true, this object is currently selected.
          */
-        transient private boolean selected = false;
+        private boolean selected = false;
 
         /**
@@ -60 +55 @@
          * @return      True, if the keysets are mergable
          */
-        public boolean keyPropertiesMergable(OsmPrimitive other) {
+        final public boolean keyPropertiesMergable(OsmPrimitive other) {
                 if ((keys == null) != (other.keys == null))
                         return false;
@@ -80 +75 @@
          * @param selected Whether the primitive should be selected or not.
          */
-        public void setSelected(boolean selected) {
+        final public void setSelected(boolean selected) {
                 if (selected != this.selected)
                         Main.main.ds.fireSelectionChanged();
@@ -89 +84 @@
          * @return Return whether the primitive is selected on screen.
          */
-        public boolean isSelected() {
+        final public boolean isSelected() {
                 return selected;
         }