Changeset 1631 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.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/dialogs/ConflictResolutionDialog.java (modified) (8 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java

@@ -10 +10 @@
 import java.awt.Point;
 import java.awt.event.ActionEvent;
-import java.net.URL;
 import java.util.logging.Logger;
 
@@ -16 +15 @@
 import javax.swing.Action;
 import javax.swing.BorderFactory;
-import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.JDialog;
@@ -25 +23 @@
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.gui.conflict.ConflictResolver;
+import org.openstreetmap.josm.tools.ImageProvider;
 
+/**
+ * This is an extended dialog for resolving conflict between {@see OsmPrimitive}.
+ * 
+ *
+ */
 public class ConflictResolutionDialog extends JDialog {
     private static final Logger logger = Logger.getLogger(ConflictResolutionDialog.class.getName());
     public final static Dimension DEFAULT_SIZE = new Dimension(600,400);
 
+    /** the conflict resolver component */
     private ConflictResolver resolver;
-        
+
+    /**
+     * restore position and size on screen from preference settings
+     * 
+     */
     protected void restorePositionAndDimension() {
         Point p = new Point();
@@ -39 +48 @@
             p.x = Math.max(0,p.x);
         } catch(Exception e) {
-            logger.warning("unexpected value for preference conflictresolutiondialog.x, assuming 0"); 
+            logger.warning("unexpected value for preference conflictresolutiondialog.x, assuming 0");
             p.x = 0;
         }
@@ -46 +55 @@
             p.y = Math.max(0,p.y);
         } catch(Exception e) {
-            logger.warning("unexpected value for preference conflictresolutiondialog.x, assuming 0"); 
+            logger.warning("unexpected value for preference conflictresolutiondialog.x, assuming 0");
             p.y = 0;
         }
@@ -53 +62 @@
             d.width = Math.max(0,d.width);
         } catch(Exception e) {
-            logger.warning("unexpected value for preference conflictresolutiondialog.width, assuming " + DEFAULT_SIZE.width); 
+            logger.warning("unexpected value for preference conflictresolutiondialog.width, assuming " + DEFAULT_SIZE.width);
             p.y = 0;
         }
@@ -60 +69 @@
             d.height = Math.max(0,d.height);
         } catch(Exception e) {
-            logger.warning("unexpected value for preference conflictresolutiondialog.height, assuming " +  + DEFAULT_SIZE.height); 
+            logger.warning("unexpected value for preference conflictresolutiondialog.height, assuming " +  + DEFAULT_SIZE.height);
             p.y = 0;
         }
-        
+
         setLocation(p);
         setSize(d);
     }
-    
+
+    /**
+     * remember position and size on screen in the preferences
+     * 
+     */
     protected void rememberPositionAndDimension() {
         Point p = getLocation();
         Main.pref.put("conflictresolutiondialog.x", Integer.toString(p.x));
         Main.pref.put("conflictresolutiondialog.y", Integer.toString(p.y));
-        
+
         Dimension d = getSize();
         Main.pref.put("conflictresolutiondialog.width", Integer.toString(d.width));
         Main.pref.put("conflictresolutiondialog.height", Integer.toString(d.height));
     }
-    
+
+
+    @Override
     public void setVisible(boolean isVisible) {
         if (isVisible){
@@ -86 +101 @@
         super.setVisible(isVisible);
     }
-    
+
+    /**
+     * builds the sub panel with the control buttons
+     * 
+     * @return the panel
+     */
     protected JPanel buildButtonRow() {
         JPanel pnl = new JPanel();
         pnl.setLayout(new FlowLayout(FlowLayout.RIGHT));
-        
+
         JButton btn = new JButton(new CancelAction());
         btn.setName("button.cancel");
         pnl.add(btn);
-        
+
         btn = new JButton(new ApplyResolutionAction());
         btn.setName("button.apply");
         pnl.add(btn);
-        
+
         pnl.setBorder(BorderFactory.createLoweredBevelBorder());
         return pnl;
     }
-    
+
+    /**
+     * builds the GUI
+     */
     protected void build() {
-       setTitle(tr("Resolve conflicts"));
-       getContentPane().setLayout(new BorderLayout());     
-       
-       resolver = new ConflictResolver();
-       getContentPane().add(resolver, BorderLayout.CENTER);       
-       getContentPane().add(buildButtonRow(), BorderLayout.SOUTH);       
+        setTitle(tr("Resolve conflicts"));
+        getContentPane().setLayout(new BorderLayout());
+
+        resolver = new ConflictResolver();
+        resolver.setName("panel.conflictresolver");
+        getContentPane().add(resolver, BorderLayout.CENTER);
+        getContentPane().add(buildButtonRow(), BorderLayout.SOUTH);
     }
-    
-    
+
+
     public ConflictResolutionDialog(Component parent) {
         super(JOptionPane.getFrameForComponent(parent), true /* modal */);
         build();
     }
-    
+
     public ConflictResolver getConflictResolver() {
         return resolver;
     }
-    
-    protected ImageIcon getIcon(String iconPath) {
-        URL imageURL   = this.getClass().getResource(iconPath);            
-        if (imageURL == null) {
-            System.out.println(tr("WARNING: failed to load resource {0}", iconPath));
-            return null;
-        }
-        return new ImageIcon(imageURL);
-    }
 
-    
     class CancelAction extends AbstractAction {
-        
-        public CancelAction() {            
+        public CancelAction() {
             putValue(Action.SHORT_DESCRIPTION, tr("Cancel conflict resolution and close the dialog"));
             putValue(Action.NAME, tr("Cancel"));
-            putValue(Action.SMALL_ICON, getIcon("/images/cancel.png"));
+            putValue(Action.SMALL_ICON, ImageProvider.get("", "cancel"));
             setEnabled(true);
         }
 
-        
+
         public void actionPerformed(ActionEvent arg0) {
             setVisible(false);
-        }        
-    }   
-    
-    class ApplyResolutionAction extends AbstractAction {        
+        }
+    }
+
+    class ApplyResolutionAction extends AbstractAction {
         public ApplyResolutionAction() {
             putValue(Action.SHORT_DESCRIPTION, tr("Apply resolved conflicts and close the dialog"));
             putValue(Action.NAME, tr("Apply Resolution"));
-            putValue(Action.SMALL_ICON, getIcon("/images/dialogs/conflict.png"));
-            setEnabled(true);            
+            putValue(Action.SMALL_ICON, ImageProvider.get("dialogs", "conflict"));
+            setEnabled(true);
         }
 
-        
         public void actionPerformed(ActionEvent arg0) {
             Command cmd = resolver.buildResolveCommand();
             Main.main.undoRedo.add(cmd);
             setVisible(false);
-        }        
+        }
     }
 }