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

Timestamp:

2009-06-01T22:20:03+02:00 (15 years ago)

Author:

Gubaer

Message:

added support for merging member lists of relations in extended conflict resolution dialog

File:

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

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

@@ -7 +7 @@
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
+import java.awt.Insets;
 import java.awt.event.ActionEvent;
 import java.awt.event.AdjustmentEvent;
@@ -29 +30 @@
 
     private JTable mineTable;
-    private JTable undecidedTable;
+    private JTable mergedTable;
     private JTable theirTable;
-    private TagMergeModel model; 
+    private final TagMergeModel model;
     private JButton btnKeepMine;
     private JButton btnKeepTheir;
@@ -40 +41 @@
         pane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
         pane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED);
-        
+
         adjustmentSynchronizer.synchronizeAdjustment(pane.getVerticalScrollBar());
         return pane;
     }
-    
+
     protected JScrollPane buildMineTagTable() {
         mineTable  = new JTable(
-           model,
-           new TagMergeColumnModel(
-              new MineTableCellRenderer()
-           )
+                model,
+                new TagMergeColumnModel(
+                        new MineTableCellRenderer()
+                )
         );
+        mineTable.setName("table.my");
         return embeddInScrollPane(mineTable);
     }
@@ -57 +59 @@
     protected JScrollPane buildTheirTable() {
         theirTable  = new JTable(
-            model,
-            new TagMergeColumnModel(
-               new TheirTableCellRenderer()
-            )
-         );
-         return embeddInScrollPane(theirTable);
-    }
-    
+                model,
+                new TagMergeColumnModel(
+                        new TheirTableCellRenderer()
+                )
+        );
+        theirTable.setName("table.their");
+        return embeddInScrollPane(theirTable);
+    }
+
     protected JScrollPane buildUndecidedTable() {
-        undecidedTable  = new JTable(
-            model,
-            new TagMergeColumnModel(
-               new UndecidedTableCellRenderer()
-            )
-         );
-         return embeddInScrollPane(undecidedTable);
-    }
-    
+        mergedTable  = new JTable(
+                model,
+                new TagMergeColumnModel(
+                        new UndecidedTableCellRenderer()
+                )
+        );
+        mergedTable.setName("table.merged");
+        return embeddInScrollPane(mergedTable);
+    }
+
     protected void build() {
         GridBagConstraints gc = new GridBagConstraints();
         setLayout(new GridBagLayout());
-        
+
         adjustmentSynchronizer = new AdjustmentSynchronizer();
-        
+
         gc.gridx = 0;
         gc.gridy = 0;
@@ -86 +90 @@
         gc.gridheight = 1;
         gc.fill = GridBagConstraints.NONE;
-        gc.anchor = GridBagConstraints.CENTER;  
-        gc.weightx = 0.0;
-        gc.weighty = 0.0;
+        gc.anchor = GridBagConstraints.CENTER;
+        gc.weightx = 0.0;
+        gc.weighty = 0.0;
+        gc.insets = new Insets(10,0,10,0);
         JLabel lbl = new JLabel(tr("My version (local dataset)"));
         add(lbl, gc);
@@ -111 +116 @@
         gc.weightx = 0.0;
         gc.weighty = 0.0;
+        gc.insets = new Insets(0,0,0,0);
         lbl = new JLabel(tr("Their version (server dataset)"));
         add(lbl, gc);
@@ -123 +129 @@
         gc.weighty = 1.0;
         add(buildMineTagTable(), gc);
-        
+
         gc.gridx = 1;
         gc.gridy = 1;
@@ -135 +141 @@
         mineTable.getSelectionModel().addListSelectionListener(keepMineAction);
         btnKeepMine = new JButton(keepMineAction);
+        btnKeepMine.setName("button.keepmine");
         add(btnKeepMine, gc);
-        
+
         gc.gridx = 2;
         gc.gridy = 1;
@@ -146 +153 @@
         gc.weighty = 1.0;
         add(buildUndecidedTable(), gc);
-        
+
         gc.gridx = 3;
         gc.gridy = 1;
@@ -157 +164 @@
         KeepTheirAction keepTheirAction = new KeepTheirAction();
         btnKeepTheir = new JButton(keepTheirAction);
+        btnKeepTheir.setName("button.keeptheir");
         add(btnKeepTheir, gc);
-        
+
         gc.gridx = 4;
         gc.gridy = 1;
@@ -169 +177 @@
         add(buildTheirTable(), gc);
         theirTable.getSelectionModel().addListSelectionListener(keepTheirAction);
-        
-        
+
+
         DoubleClickAdapter dblClickAdapter = new DoubleClickAdapter();
         mineTable.addMouseListener(dblClickAdapter);
         theirTable.addMouseListener(dblClickAdapter);
-        
-        
+
+
         gc.gridx = 2;
         gc.gridy = 2;
@@ -185 +193 @@
         gc.weighty = 0.0;
         UndecideAction undecidedAction = new UndecideAction();
-        undecidedTable.getSelectionModel().addListSelectionListener(undecidedAction);
+        mergedTable.getSelectionModel().addListSelectionListener(undecidedAction);
         JButton btnUndecide = new JButton(undecidedAction);
+        btnUndecide.setName("button.undecide");
         add(btnUndecide, gc);
-        
-    }
-    
+
+    }
+
     public TagMerger() {
         model = new TagMergeModel();
         build();
     }
-    
-    
+
     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);
-    }
-    
+        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);
+    }
+
     class KeepMineAction extends AbstractAction implements ListSelectionListener {
 
-       
+
         public KeepMineAction() {
             ImageIcon icon = loadIcon("tagkeepmine.png");
@@ -225 +233 @@
             setEnabled(false);
         }
-        
+
         public void actionPerformed(ActionEvent arg0) {
             int rows[] = mineTable.getSelectedRows();
-            if (rows == null || rows.length == 0) {
-                return; 
-            }
-            model.decide(rows, MergeDecisionType.KEEP_MINE);     
+            if (rows == null || rows.length == 0)
+                return;
+            model.decide(rows, MergeDecisionType.KEEP_MINE);
         }
 
         public void valueChanged(ListSelectionEvent e) {
-           setEnabled(mineTable.getSelectedRowCount() > 0);            
-        }
-    }
-    
+            setEnabled(mineTable.getSelectedRowCount() > 0);
+        }
+    }
+
     class KeepTheirAction extends AbstractAction implements ListSelectionListener {
-        
+
         public KeepTheirAction() {
             ImageIcon icon = loadIcon("tagkeeptheir.png");
@@ -252 +259 @@
             setEnabled(false);
         }
-        
+
         public void actionPerformed(ActionEvent arg0) {
             int rows[] = theirTable.getSelectedRows();
-            if (rows == null || rows.length == 0) {
-                return; 
-            }
-            model.decide(rows, MergeDecisionType.KEEP_THEIR);     
+            if (rows == null || rows.length == 0)
+                return;
+            model.decide(rows, MergeDecisionType.KEEP_THEIR);
         }
 
         public void valueChanged(ListSelectionEvent e) {
-           setEnabled(theirTable.getSelectedRowCount() > 0);            
-        }
-    }
-    
+            setEnabled(theirTable.getSelectedRowCount() > 0);
+        }
+    }
+
     class AdjustmentSynchronizer implements AdjustmentListener {
-        private ArrayList<Adjustable> synchronizedAdjustables;
-        
+        private final ArrayList<Adjustable> synchronizedAdjustables;
+
         public AdjustmentSynchronizer() {
             synchronizedAdjustables = new ArrayList<Adjustable>();
         }
-        
+
         public void synchronizeAdjustment(Adjustable adjustable) {
-            if (adjustable == null) {
-                return;
-            }
-            if (synchronizedAdjustables.contains(adjustable)) {
-                return;
-            }
+            if (adjustable == null)
+                return;
+            if (synchronizedAdjustables.contains(adjustable))
+                return;
             synchronizedAdjustables.add(adjustable);
             adjustable.addAdjustmentListener(this);
@@ -292 +296 @@
         }
     }
-    
+
     class DoubleClickAdapter extends MouseAdapter {
 
+        @Override
         public void mouseClicked(MouseEvent e) {
-            if (e.getClickCount() != 2) {
-                return;
-            }
+            if (e.getClickCount() != 2)
+                return;
             JTable table = null;
             MergeDecisionType mergeDecision;
-            
+
             if (e.getSource() == mineTable) {
-                table = (JTable)mineTable;
+                table = mineTable;
                 mergeDecision = MergeDecisionType.KEEP_MINE;
             } else if (e.getSource() == theirTable) {
-                table = (JTable)theirTable;
+                table = theirTable;
                 mergeDecision = MergeDecisionType.KEEP_THEIR;
-            } else if (e.getSource() == undecidedTable) {
-                table = (JTable)undecidedTable;
+            } else if (e.getSource() == mergedTable) {
+                table = mergedTable;
                 mergeDecision = MergeDecisionType.UNDECIDED;
-            } else {
+            } else
                 // double click in another component; shouldn't happen,
-                // but just in case 
-                return;
-            }
+                // but just in case
+                return;
             int row = table.rowAtPoint(e.getPoint());
             model.decide(row, mergeDecision);
         }
-    } 
-    
+    }
+
     class UndecideAction extends AbstractAction implements ListSelectionListener  {
 
@@ -334 +337 @@
             setEnabled(false);
         }
-        
+
         public void actionPerformed(ActionEvent arg0) {
-            int rows[] = undecidedTable.getSelectedRows();
-            if (rows == null || rows.length == 0) {
-                return; 
-            }
-            model.decide(rows, MergeDecisionType.UNDECIDED);     
+            int rows[] = mergedTable.getSelectedRows();
+            if (rows == null || rows.length == 0)
+                return;
+            model.decide(rows, MergeDecisionType.UNDECIDED);
         }
 
         public void valueChanged(ListSelectionEvent e) {
-           setEnabled(undecidedTable.getSelectedRowCount() > 0);            
-        }    
+            setEnabled(mergedTable.getSelectedRowCount() > 0);
+        }
     }
 }