Changeset 2512 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java

Timestamp:

2009-11-24T10:45:04+01:00 (15 years ago)

Author:

stoecker

Message:

i18n updated, fixed files to reduce problems when applying patches, fix #4017

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java (modified) (17 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java

@@ -17 +17 @@
 /**
  * Represents a decision for a conflict due to multiple possible value for a tag.
- * 
+ *
  *
  */
@@ -41 +41 @@
      * Creates a new decision for the tag collection <code>tags</code>.
      * All tags must have the same key.
-     * 
+     *
      * @param tags the tags. Must not be null.
      * @exception IllegalArgumentException  thrown if tags is null
@@ -90 +90 @@
     /**
      * Apply the decision to keep exactly one value
-     * 
+     *
      * @param value  the value to keep
      * @throws IllegalArgumentException thrown if value is null
@@ -106 +106 @@
     /**
      * sets a new value for this
-     * 
+     *
      * @param value the new vlaue
      */
@@ -120 +120 @@
     /**
      * marks this as undecided
-     * 
+     *
      */
     public void undecide() {
@@ -128 +128 @@
     /**
      * Replies the chosen value
-     * 
+     *
      * @return the chosen value
      * @throws IllegalStateException thrown if this resolution is not yet decided
@@ -145 +145 @@
     /**
      * Replies the list of possible, non empty values
-     * 
+     *
      * @return the list of possible, non empty values
      */
@@ -158 +158 @@
     /**
      * Replies the key of the tag to be resolved by this resolution
-     * 
+     *
      * @return the key of the tag to be resolved by this resolution
      */
@@ -167 +167 @@
     /**
      * Replies true if the empty value is a possible value in this resolution
-     * 
+     *
      * @return true if the empty value is a possible value in this resolution
      */
@@ -176 +176 @@
     /**
      * Replies true, if this resolution has more than 1 possible non-empty values
-     * 
+     *
      * @return true, if this resolution has more than 1 possible non-empty values
      */
@@ -185 +185 @@
     /**
      * Replies  true if this resolution is decided
-     * 
+     *
      * @return true if this resolution is decided
      */
@@ -194 +194 @@
     /**
      * Replies the type of the resolution
-     * 
+     *
      * @return the type of the resolution
      */
@@ -203 +203 @@
     /**
      * Applies the resolution to an {@see OsmPrimitive}
-     * 
+     *
      * @param primitive the primitive
      * @throws IllegalStateException thrown if this resolution is not resolved yet
-     * 
+     *
      */
     public void applyTo(OsmPrimitive primitive) throws IllegalStateException{
@@ -223 +223 @@
     /**
      * Applies this resolution to a collection of primitives
-     * 
+     *
      * @param primtives the collection of primitives
      * @throws IllegalStateException thrown if this resolution is not resolved yet
@@ -239 +239 @@
     /**
      * Builds a change command for applying this resolution to a primitive
-     * 
+     *
      * @param primitive  the primitive
      * @return the change command
@@ -258 +258 @@
     /**
      * Builds a change command for applying this resolution to a collection of primitives
-     * 
+     *
      * @param primitives  the collection of primitives
      * @return the change command
@@ -278 +278 @@
      * Replies a tag representing the current resolution. Null, if this resolution is not resolved
      * yet.
-     * 
+     *
      * @return a tag representing the current resolution. Null, if this resolution is not resolved
      * yet