Changeset 1653 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/ListMerger.java

Timestamp:

2009-06-07T16:18:31+02:00 (17 years ago)

Author:

stoecker

Message:

add support for compressed OSM files (bzip2, gzip)

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/ListMerger.java (modified) (10 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/ListMerger.java

@@ -40 +40 @@
 /**
  * A UI component for resolving conflicts in two lists of entries of type T.
- * 
+ *
  * @param T  the type of the entries
  * @see ListMergeModel
@@ -687 +687 @@
      * Action for removing the selected entries in the list of merged entries
      * from the list of merged entries.
-     * 
+     *
      */
     class RemoveMergedAction extends AbstractAction implements ListSelectionListener {
@@ -740 +740 @@
          * such that the action gets notified about item state changes and the button gets
          * notified about selection state changes of the action.
-         * 
+         *
          * @param btn a toggle button
          */
@@ -811 +811 @@
     public void update(Observable o, Object arg) {
         lblMyVersion.setText(
-                tr("My version ")
-                + trn("({0} entry)", "({0} entries)", model.getMyEntriesSize(), model.getMyEntriesSize())
+                trn("My version ({0} entry)", "My version ({0} entries)", model.getMyEntriesSize(), model.getMyEntriesSize())
         );
         lblMergedVersion.setText(
-                tr("Merged version ")
-                + trn("({0} entry)", "({0} entries)", model.getMergedEntriesSize(), model.getMergedEntriesSize())
+                trn("Merged version ({0} entry)", "Merged version ({0} entries)", model.getMergedEntriesSize(), model.getMergedEntriesSize())
         );
         lblTheirVersion.setText(
-                tr("Their version ")
-                + trn("({0} entry)", "({0} entries)", model.getTheirEntriesSize(), model.getTheirEntriesSize())
+                trn("Their version ({0} entry)", "Their version ({0} entries)", model.getTheirEntriesSize(), model.getTheirEntriesSize())
         );
     }
-
-
 
     /**
@@ -831 +826 @@
      * the registerd Adjustables is updated the adjustment of
      * the other registered Adjustables is adjusted too.
-     * 
+     *
      */
     class AdjustmentSynchronizer implements AdjustmentListener {
@@ -850 +845 @@
          * registers an {@see Adjustable} for participation in synchronized
          * scrolling.
-         * 
+         *
          * @param adjustable the adjustable
          */
@@ -865 +860 @@
         /**
          * event handler for {@see AdjustmentEvent}s
-         * 
+         *
          */
         public void adjustmentValueChanged(AdjustmentEvent e) {
@@ -880 +875 @@
          * sets whether adjustable participates in adjustment synchronization
          * or not
-         * 
+         *
          * @param adjustable the adjustable
          */
@@ -896 +891 @@
         /**
          * returns true if an adjustable is participating in synchronized scrolling
-         * 
+         *
          * @param adjustable the adjustable
          * @return true, if the adjustable is participating in synchronized scrolling, false otherwise
@@ -916 +911 @@
          *      {@see JCheckBox}</ol>
          * </li>
-         * 
-         * 
+         *
+         *
          * @param view  the checkbox to control whether an adjustable participates in synchronized
          *      adjustment