Changeset 2512 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.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/tags/RelationMemberConflictResolverModel.java (modified) (12 diffs)

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

@@ -22 +22 @@
 /**
  * This model manages a list of conflicting relation members.
- * 
+ *
  * It can be used as {@see TableModel}.
  *
@@ -39 +39 @@
     private PropertyChangeSupport support;
 
-
     /**
      * Replies the current number of conflicts
-     * 
+     *
      * @return the current number of conflicts
      */
@@ -52 +51 @@
      * Updates the current number of conflicts from list of decisions and emits
      * a property change event if necessary.
-     * 
+     *
      */
     protected void updateNumConflicts() {
@@ -120 +119 @@
      * Populates the model with the members of the relation <code>relation</code>
      * referring to <code>primitive</code>.
-     * 
+     *
      * @param relation the parent relation
      * @param primitive the child primitive
@@ -135 +134 @@
      * Populates the model with the relation members belonging to one of the relations in <code>relations</code>
      * and referring to one of the primitives in <code>memberPrimitives</code>.
-     * 
+     *
      * @param relations  the parent relations. Empty list assumed if null.
      * @param memberPrimitives the child primitives. Empty list assumed if null.
@@ -155 +154 @@
      * Populates the model with the relation members represented as a collection of
      * {@see RelationToChildReference}s.
-     * 
+     *
      * @param references the references. Empty list assumed if null.
      */
@@ -175 +174 @@
     /**
      * Replies the decision at position <code>row</code>
-     * 
+     *
      * @param row
      * @return the decision at position <code>row</code>
@@ -185 +184 @@
     /**
      * Replies the number of decisions managed by this model
-     * 
+     *
      * @return the number of decisions managed by this model
      */
@@ -195 +194 @@
      * Refreshes the model state. Invoke this method to trigger necessary change
      * events after an update of the model data.
-     * 
+     *
      */
     public void refresh() {
@@ -204 +203 @@
     /**
      * Apply a role to all member managed by this model.
-     * 
+     *
      * @param role the role. Empty string assumed if null.
      */
@@ -256 +255 @@
     /**
      * Builds a collection of commands executing the decisions made in this model.
-     * 
+     *
      * @param newPrimitive the primitive which members shall refer to if the
      * decision is {@see RelationMemberConflictDecisionType#REPLACE}
@@ -295 +294 @@
      * Replies the set of relations which have to be modified according
      * to the decisions managed by this model.
-     * 
+     *
      * @param newPrimitive the primitive which members shall refer to if the
      * decision is {@see RelationMemberConflictDecisionType#REPLACE}
-     * 
+     *
      * @return the set of relations which have to be modified according
      * to the decisions managed by this model