Changeset 2512 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java

Timestamp:

2009-11-24T10:45:04+01:00 (14 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/pair/ConflictResolver.java (modified) (9 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java

@@ -34 +34 @@
 /**
  * An UI component for resolving conflicts between two {@see OsmPrimitive}s.
- * 
+ *
  * This component emits {@see PropertyChangeEvent}s for three properties:
  * <ul>
@@ -44 +44 @@
  *   their primitive</li>
  * </ul>
- * 
+ *
  */
 public class ConflictResolver extends JPanel implements PropertyChangeListener  {
@@ -64 +64 @@
      */
     static public final String THEIR_PRIMITIVE_PROP = ConflictResolver.class.getName() + ".theirPrimitive";
-
 
     private static final Logger logger = Logger.getLogger(ConflictResolver.class.getName());
@@ -131 +130 @@
     /**
      * Sets the {@see OsmPrimitive} in the role "my"
-     * 
+     *
      * @param my the primitive in the role "my"
      */
@@ -144 +143 @@
     /**
      * Sets the {@see OsmPrimitive} in the role "their".
-     * 
+     *
      * @param their the primitive in the role "their"
      */
@@ -209 +208 @@
     /**
      * populates the conflict resolver with the conflicts between my and their
-     * 
+     *
      * @param my   my primitive (i.e. the primitive in the local dataset)
      * @param their their primitive (i.e. the primitive in the server dataset)
-     * 
+     *
      */
     public void populate(OsmPrimitive my, OsmPrimitive their) {
@@ -250 +249 @@
      * Builds the resolution command(s) for the resolved conflicts in this
      * ConflictResolver
-     * 
+     *
      * @return the resolution command
      */
@@ -282 +281 @@
     /**
      * Updates the state of the property {@see #RESOLVED_COMPLETELY_PROP}
-     * 
+     *
      */
     protected void updateResolvedCompletely() {
@@ -319 +318 @@
     /**
      * Replies true all differences in this conflicts are resolved
-     * 
+     *
      * @return true all differences in this conflicts are resolved
      */