Changeset 1642 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java

Timestamp:

2009-06-06T16:25:25+02:00 (15 years ago)

Author:

Gubaer

Message:

added row numbers and synchronized scrolling in conflict resolution dialog
fixed bugs in conflict resolution

File:

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

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

@@ -13 +13 @@
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
-import java.net.URL;
 import java.util.ArrayList;
 
@@ -27 +26 @@
 import javax.swing.event.ListSelectionListener;
 
+import org.openstreetmap.josm.tools.ImageProvider;
+/**
+ * UI component for resolving conflicts in the tag sets of two {@see OsmPrimitive}s.
+ *
+ */
 public class TagMerger extends JPanel {
 
@@ -37 +41 @@
     AdjustmentSynchronizer adjustmentSynchronizer;
 
+    /**
+     * embeds table in a new {@see JScrollPane} and returns th scroll pane
+     * 
+     * @param table the table
+     * @return the scroll pane embedding the table
+     */
     protected JScrollPane embeddInScrollPane(JTable table) {
         JScrollPane pane = new JScrollPane(table);
@@ -46 +56 @@
     }
 
+    /**
+     * builds the table for my tag set (table already embedded in a scroll pane)
+     * 
+     * @return the table (embedded in a scroll pane)
+     */
     protected JScrollPane buildMineTagTable() {
         mineTable  = new JTable(
@@ -57 +72 @@
     }
 
+    /**
+     * builds the table for their tag set (table already embedded in a scroll pane)
+     * 
+     * @return the table (embedded in a scroll pane)
+     */
     protected JScrollPane buildTheirTable() {
         theirTable  = new JTable(
@@ -68 +88 @@
     }
 
-    protected JScrollPane buildUndecidedTable() {
+    /**
+     * builds the table for the merged tag set (table already embedded in a scroll pane)
+     * 
+     * @return the table (embedded in a scroll pane)
+     */
+
+    protected JScrollPane buildMergedTable() {
         mergedTable  = new JTable(
                 model,
                 new TagMergeColumnModel(
-                        new UndecidedTableCellRenderer()
+                        new MergedTableCellRenderer()
                 )
         );
@@ -79 +105 @@
     }
 
+    /**
+     * build the user interface
+     */
     protected void build() {
         GridBagConstraints gc = new GridBagConstraints();
@@ -152 +181 @@
         gc.weightx = 0.3;
         gc.weighty = 1.0;
-        add(buildUndecidedTable(), gc);
+        add(buildMergedTable(), gc);
 
         gc.gridx = 3;
@@ -205 +234 @@
     }
 
+    /**
+     * replies the model used by this tag merger
+     * 
+     * @return the model
+     */
     public TagMergeModel getModel() {
         return model;
     }
 
-    protected ImageIcon loadIcon(String name) {
-        String path = "/images/dialogs/conflict/" + name;
-        URL url = this.getClass().getResource(path);
-        if (url == null) {
-            System.out.println(tr("WARNING: failed to load resource {0}", path));
-            return null;
-        }
-        return new ImageIcon(url);
-    }
-
+    /**
+     * Keeps the currently selected tags in my table in the list of merged tags.
+     *
+     */
     class KeepMineAction extends AbstractAction implements ListSelectionListener {
-
-
         public KeepMineAction() {
-            ImageIcon icon = loadIcon("tagkeepmine.png");
+            ImageIcon icon = ImageProvider.get("dialogs/conflict", "tagkeepmine.png");
             if (icon != null) {
                 putValue(Action.SMALL_ICON, icon);
@@ -246 +272 @@
     }
 
+    /**
+     * Keeps the currently selected tags in their table in the list of merged tags.
+     *
+     */
     class KeepTheirAction extends AbstractAction implements ListSelectionListener {
-
         public KeepTheirAction() {
-            ImageIcon icon = loadIcon("tagkeeptheir.png");
+            ImageIcon icon = ImageProvider.get("dialogs/conflict", "tagkeeptheir.png");
             if (icon != null) {
                 putValue(Action.SMALL_ICON, icon);
@@ -272 +301 @@
     }
 
+    /**
+     * Synchronizes scrollbar adjustments between a set of
+     * {@see Adjustable}s. Whenever the adjustment of one of
+     * the registerd Adjustables is updated the adjustment of
+     * the other registered Adjustables is adjusted too.
+     * 
+     */
     class AdjustmentSynchronizer implements AdjustmentListener {
         private final ArrayList<Adjustable> synchronizedAdjustables;
@@ -297 +333 @@
     }
 
+    /**
+     * Handler for double clicks on entries in the three tag tables.
+     * 
+     */
     class DoubleClickAdapter extends MouseAdapter {
 
@@ -324 +364 @@
     }
 
+    /**
+     * Sets the currently selected tags in the table of merged tags to state
+     * {@see MergeDecisionType#UNDECIDED}
+     * 
+     */
     class UndecideAction extends AbstractAction implements ListSelectionListener  {
 
         public UndecideAction() {
-            ImageIcon icon = loadIcon("tagundecide.png");
+            ImageIcon icon = ImageProvider.get("dialogs/conflict", "tagundecide.png");
             if (icon != null) {
                 putValue(Action.SMALL_ICON, icon);