Changeset 3530 in josm for trunk/src/org/openstreetmap/josm/data/conflict

Timestamp:

15.09.2010 08:21:16 (21 months ago)

Author:

stoecker

Message:

fix array preferences

File:

• trunk/src/org/openstreetmap/josm/data/conflict/Conflict.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/conflict/Conflict.java

@@ -52 +52 @@
      * Replies true if the primitive <code>primitive</code> is participating
      * in this conflict
-     * 
+     *
      * @param primitive the primitive
      * @return true if the primitive <code>primitive</code> is participating
@@ -66 +66 @@
      * Replies true if the primitive with id <code>id</code> is participating
      * in this conflict
-     * 
+     *
      * @param id the primitive id
      * @return true if the primitive <code>primitive</code> is participating
@@ -104 +104 @@
 
     /**
-     * 
+     *
      * @return True if my primitive was deleted but it has set non deleted status because it's referred by another
      * primitive and references to deleted primitives are not allowed.