Changeset 4353 in josm for trunk/src/org

Timestamp:

2011-08-27T13:57:45+02:00 (13 years ago)

Author:

stoecker

Message:

see #6731 - introduce better layout function for ToggleDialogs, changed author and relation dialog

Location:

trunk/src/org/openstreetmap/josm/gui/dialogs

Files:

• RelationListDialog.java (modified) (7 diffs)
• ToggleDialog.java (modified) (6 diffs)
• UserListDialog.java (modified) (4 diffs)

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

@@ -12 +12 @@
 import java.awt.event.MouseEvent;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -23 +24 @@
 import javax.swing.DefaultListSelectionModel;
 import javax.swing.JList;
-import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
-import javax.swing.JScrollPane;
 import javax.swing.KeyStroke;
 import javax.swing.ListSelectionModel;
@@ -106 +105 @@
         displaylist.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
         displaylist.addMouseListener(new MouseEventHandler());
-        add(new JScrollPane(displaylist), BorderLayout.CENTER);
-
-        // create the panel with buttons
-        //
-        JPanel tp = getButtonPanel(5);
+
         // the new action
         //
         newAction = new NewAction();
-        tp.add(new SideButton(newAction, false));
 
         // the edit action
@@ -120 +114 @@
         editAction = new EditAction();
         displaylist.addListSelectionListener(editAction);
-        tp.add(new SideButton(editAction, false));
 
         // the duplicate action
@@ -126 +119 @@
         DuplicateAction duplicateAction = new DuplicateAction();
         displaylist.addListSelectionListener(duplicateAction);
-        tp.add(new SideButton(duplicateAction, false));
 
         // the delete action
@@ -132 +124 @@
         deleteAction = new DeleteAction();
         displaylist.addListSelectionListener(deleteAction);
-        tp.add(new SideButton(deleteAction, false));
 
         // the select action
@@ -138 +129 @@
         SelectAction selectAction = new SelectAction(false);
         displaylist.addListSelectionListener(selectAction);
-        tp.add(new SideButton(selectAction, false));
-
-        add(tp, BorderLayout.SOUTH);
+
+        createLayout(displaylist, true, Arrays.asList(new SideButton[] {
+            new SideButton(newAction, false),
+            new SideButton(editAction, false),
+            new SideButton(duplicateAction, false),
+            new SideButton(deleteAction, false),
+            new SideButton(selectAction, false)
+        }));
 
         // activate DEL in the list of relations

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

@@ -22 +22 @@
 import java.awt.event.WindowEvent;
 
+import java.util.Collection;
+
 import javax.swing.AbstractAction;
 import javax.swing.BorderFactory;
@@ -30 +32 @@
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
+import javax.swing.JScrollPane;
 import javax.swing.JPanel;
 import javax.swing.JToggleButton;
@@ -39 +42 @@
 import org.openstreetmap.josm.gui.help.Helpful;
 import org.openstreetmap.josm.gui.util.RedirectInputMap;
+import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -116 +120 @@
         String helpId = "Dialog/"+getClass().getName().substring(getClass().getName().lastIndexOf('.')+1);
         toggleAction.putValue("help", helpId.substring(0, helpId.length()-6));
-
-        setLayout(new BorderLayout());
 
         /** show the minimize button */
@@ -654 +656 @@
     }
 
+    /* use createLayout() instead of self-constructed dialogs */
+    @Deprecated
     protected JPanel getButtonPanel(int columns) {
         JPanel pnl = new JPanel();
@@ -660 +664 @@
         return pnl;
     }
+
+    protected void createLayout(Component data, boolean scroll, Collection<SideButton> buttons) {
+        if(scroll)
+            add(new JScrollPane(data), BorderLayout.CENTER);
+        else
+            add(data, BorderLayout.CENTER);
+        if(buttons != null && buttons.size() != 0) {
+            JPanel buttonsPanel = new JPanel();
+            buttonsPanel.setLayout(Main.pref.getBoolean("dialog.align.left", false)
+                ? new FlowLayout(FlowLayout.LEFT) : new GridLayout(1,buttons.size()));
+            for(SideButton button : buttons)
+                buttonsPanel.add(button);
+            add(buttonsPanel, BorderLayout.SOUTH);
+        }
+    }
 }

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

@@ -15 +15 @@
 import java.text.NumberFormat;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -29 +30 @@
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
 import javax.swing.JTable;
 import javax.swing.ListSelectionModel;
@@ -87 +86 @@
     }
 
-    protected JPanel buildButtonRow() {
-        JPanel pnl = getButtonPanel(2);
-
-        // -- select users primitives action
-        //
-        selectionUsersPrimitivesAction = new SelectUsersPrimitivesAction();
-        userTable.getSelectionModel().addListSelectionListener(selectionUsersPrimitivesAction);
-        pnl.add(new SideButton(selectionUsersPrimitivesAction));
-
-        // -- info action
-        //
-        showUserInfoAction = new ShowUserInfoAction();
-        userTable.getSelectionModel().addListSelectionListener(showUserInfoAction);
-        pnl.add(new SideButton(showUserInfoAction));
-
-        // -- load relicensing info action
-        loadRelicensingInformationAction = new LoadRelicensingInformationAction();
-        pnl.add(new SideButton(loadRelicensingInformationAction));
-        return pnl;
-    }
-
     protected void build() {
-        JPanel pnl = new JPanel();
-        pnl.setLayout(new BorderLayout());
         model = new UserTableModel();
         userTable = new JTable(model);
         userTable.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
+        userTable.addMouseListener(new DoubleClickAdapter());
         TableColumnModel columnModel = userTable.getColumnModel();
         columnModel.getColumn(3).setPreferredWidth(20);
@@ -125 +102 @@
             };
         });
-        pnl.add(new JScrollPane(userTable), BorderLayout.CENTER);
-
-        // -- the button row
-        pnl.add(buildButtonRow(), BorderLayout.SOUTH);
-        userTable.addMouseListener(new DoubleClickAdapter());
-        add(pnl, BorderLayout.CENTER);
+
+        // -- select users primitives action
+        //
+        selectionUsersPrimitivesAction = new SelectUsersPrimitivesAction();
+        userTable.getSelectionModel().addListSelectionListener(selectionUsersPrimitivesAction);
+
+        // -- info action
+        //
+        showUserInfoAction = new ShowUserInfoAction();
+        userTable.getSelectionModel().addListSelectionListener(showUserInfoAction);
+
+        // -- load relicensing info action
+        loadRelicensingInformationAction = new LoadRelicensingInformationAction();
+
+        createLayout(userTable, true, Arrays.asList(new SideButton[] {
+            new SideButton(selectionUsersPrimitivesAction),
+            new SideButton(showUserInfoAction),
+            new SideButton(loadRelicensingInformationAction)
+        }));
     }