Changeset 2083 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2009-09-09T00:46:01+02:00 (15 years ago)

Author:

Gubaer

Message:

Removed deprecated constructors in ExtendedDialog
Turned most of the fields in the OSM data classes into private fields

Location:

trunk/src/org/openstreetmap/josm/data/osm

Files:

• OsmPrimitive.java (modified) (5 diffs)
• Relation.java (modified) (1 diff)
• RelationMember.java (modified) (2 diffs)

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

@@ -97 +97 @@
      * the respective class.
      * 
-     * @deprecated use {@see #getId()} and {@see #setId()}. Don't assign an id, create a primitive with
-     * the respective constructors.
-     */
-    @Deprecated
-    public long id = 0;
+     */
+    private long id = 0;
 
     /**
@@ -109 +106 @@
      * the modified is ignored and the object is added to the server.
      * 
-     * @deprecated Please use {@see #setModified()} and {@see #getModified()}
-     */
-    @Deprecated
-    public boolean modified = false;
+     */
+    private boolean modified = false;
 
     /**
      * <code>true</code>, if the object has been deleted.
      * 
-     * @deprecated use {@see #delete()} and {@see #isDeleted()}
-     */
-    @Deprecated
-    public boolean deleted = false;
+     */
+    private boolean deleted = false;
 
     /**
@@ -127 +120 @@
      * (they will have visible=false).
      * 
-     * @deprecated use {@see #isVisible()} and {@see #setVisible(boolean)}
-     */
-    @Deprecated
-    public boolean visible = true;
+     */
+    private boolean visible = true;
 
     /**
@@ -141 +132 @@
      * If set to true, this object is currently selected.
      * 
-     * @deprecated use {@see #isSelected()} and {@see #setSelected(boolean)}
-     */
-    @Deprecated
-    public volatile boolean selected = false;
+     */
+    private volatile boolean selected = false;
 
     /**
@@ -155 +144 @@
      * Contains the version number as returned by the API. Needed to
      * ensure update consistency
-     * @deprecated use {@see #getVersion()} and {@see #setVersion(long)}
-     */
-    @Deprecated
-    public int version = 0;
-
+     */
+    private int version = 0;
 
     /**

trunk/src/org/openstreetmap/josm/data/osm/Relation.java

@@ -20 +20 @@
      * makeBackReferences and/or removeBackReferences should be called.
      * 
-     * @deprecated use the improved API instead of accessing this list directly
-     */
-    @Deprecated
-    public final List<RelationMember> members = new ArrayList<RelationMember>();
+     */
+    private final List<RelationMember> members = new ArrayList<RelationMember>();
 
     /**

trunk/src/org/openstreetmap/josm/data/osm/RelationMember.java

@@ -11 +11 @@
     /**
      * 
-     * @deprecated use {@see #getRole()} or create a clone in order to assign a new role
      */
-    @Deprecated
-    public String role;
+    private String role;
 
     /**
      * 
-     * @deprecated use {@see #getMember()} or create a clone in order to assign a new member
      */
-    @Deprecated
-    public OsmPrimitive member;
+    private OsmPrimitive member;
 
     /**
@@ -106 +102 @@
     }
 
-
-    /**
-     * Default constructor. Does nothing.
-     * @deprecated Use other constructors because RelationMember class will become immutable
-     * in the future
-     */
-    @Deprecated
-    public RelationMember() { }
-
     public RelationMember(String role, OsmPrimitive member) {
         this.role = role;