issue 1293: Layout tweaks

git-svn-id: http://svn.dmdirc.com/trunk@4133 00569f92-eb28-0410-84fd-f71c24880f

src/com/dmdirc/ui/swing/components/ColourPickerDialog.java

@@ -33,24 +33,23 @@ import javax.swing.JDialog;
  * Colour picker dialog.
  */
 public final class ColourPickerDialog extends StandardDialog {
-    
+
     /**
      * A version number for this class. It should be changed whenever the class
      * structure is changed (or anything else that would prevent serialized
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 1;
-    
     /** Colour chooser panel. */
     private ColourPickerPanel colourChooser;
-    
+
     /**
      * Creates a new instance of ColourPickerDialog.
      */
     public ColourPickerDialog() {
         this(true, true);
     }
-    
+
     /**
      * Creates a new instance of ColourPickerDialog.
      * @param showIRC show irc colours
@@ -58,15 +57,16 @@ public final class ColourPickerDialog extends StandardDialog {
      */
     public ColourPickerDialog(final boolean showIRC, final boolean showHex) {
         super((MainFrame) Main.getUI().getMainWindow(), false);
-        
+
         colourChooser = new ColourPickerPanel(showIRC, showHex);
-        this.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
-        this.add(colourChooser);
-        this.pack();
-        this.setResizable(false);
-        this.setFocusableWindowState(false);
+        
+        setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
+        add(colourChooser);
+        pack();
+        setResizable(false);
+        setFocusableWindowState(false);
     }
-    
+
     /** 
      * Creates and shows a new Colour picker dialog. 
      * @return Colour picker dialog
@@ -74,20 +74,20 @@ public final class ColourPickerDialog extends StandardDialog {
     public static ColourPickerDialog showColourPicker() {
         return showColourPicker(true, true);
     }
-    
+
     /** 
      * Creates and shows a new Colour picker dialog. 
      * @return Colour picker dialog
      * @param showIRC show irc colours
      * @param showHex show hex colours
      */
-    public static ColourPickerDialog showColourPicker(final boolean showIRC, 
+    public static ColourPickerDialog showColourPicker(final boolean showIRC,
             final boolean showHex) {
         final ColourPickerDialog cpd = new ColourPickerDialog(showIRC, showHex);
         cpd.setVisible(true);
         return cpd;
     }
-    
+
     /** 
      * Adds an actions listener to this dialog.
      *
@@ -96,5 +96,4 @@ public final class ColourPickerDialog extends StandardDialog {
     public void addActionListener(final ActionListener listener) {
         colourChooser.addActionListener(listener);
     }
-    
 }

src/com/dmdirc/ui/swing/components/ColourPickerPanel.java

@@ -44,84 +44,74 @@ import javax.swing.JPanel;
  * colour visually.
  * @author chris
  */
-public final class ColourPickerPanel extends JPanel implements MouseListener, MouseMotionListener {
-    
-    /** ActionEvent ID for when a hex colour is selected. */
-    public static final int ACTION_HEX = 10001;
-    /** ActionEvent ID for when an irc colour is selected. */
-    public static final int ACTION_IRC = 10002;
-    
+public final class ColourPickerPanel extends JPanel implements MouseListener,
+        MouseMotionListener {
+
     /**
      * A version number for this class. It should be changed whenever the class
      * structure is changed (or anything else that would prevent serialized
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 1;
-    
+    /** ActionEvent ID for when a hex colour is selected. */
+    public static final int ACTION_HEX = 10001;
+    /** ActionEvent ID for when an irc colour is selected. */
+    public static final int ACTION_IRC = 10002;
     /** The width of each IRC colour patch. */
     private static final int IRC_WIDTH = 9;
     /** The height of each IRC colour patch. */
     private static final int IRC_HEIGHT = 16;
-    
     /** The width of the hex colour patch. */
     private static final int HEX_WIDTH = 125;
     /** The height of the hex colour patch. */
     private static final int HEX_HEIGHT = 125;
-    
     /** The size of borders to use. */
     private static final int BORDER_SIZE = 7;
     /** The size of slider to use. */
     private static final int SLIDER_WIDTH = 10;
     /** The height of the preview area. */
     private static final int PREVIEW_HEIGHT = 20;
-    
     /** Whether to show IRC colours. */
     private final boolean showIrc;
-    
     /** Whether to show hex colours. */
     private final boolean showHex;
-    
     /** The y-coord of the start of the IRC colours block. */
     private int ircOffset;
-    
     /** The y-coord of the start of the hex colours block. */
     private int hexOffset;
-    
     /** The y-coord of the start of the preview block. */
     private int previewOffset;
-    
     /** The saturation to use. */
     private float saturation = (float) 1.0;
-    
     /** The colour to show in the preview window. */
     private Color preview;
-    
     /** Rectangle we use to indicate that only the preview should be drawn. */
     private Rectangle previewRect;
-    
     /** A list of registered actionlisteners. */
-    private final List<ActionListener> listeners = new ArrayList<ActionListener>();
-    
+    private final List<ActionListener> listeners =
+            new ArrayList<ActionListener>();
+
     /**
      * Creates a new instance of ColourPickerPanel.
      * @param newShowIrc Whether to show IRC colours or not
      * @param newShowHex Whether to show hex colours or not
      */
-    public ColourPickerPanel(final boolean newShowIrc, final boolean newShowHex) {
+    public ColourPickerPanel(final boolean newShowIrc,
+            final boolean newShowHex) {
         super();
-        
+
         this.showIrc = newShowIrc;
         this.showHex = newShowHex;
-        
-        final int height = 65 + (showIrc ? 30 : 0) + (showHex ? 145 : 0) 
-                + (showHex & showIrc ? 10 : 0);
-        
+
+        final int height = 65 + (showIrc ? 30 : 0) + (showHex ? 145 : 0) + (showHex & showIrc
+                ? 10 : 0);
+
         setPreferredSize(new Dimension(160, height));
-        
+
         addMouseListener(this);
         addMouseMotionListener(this);
     }
-    
+
     /**
      * Creates a new instance of ColourPickerPanel, showing both IRC and Hex
      * colours.
@@ -129,98 +119,113 @@ public final class ColourPickerPanel extends JPanel implements MouseListener, Mo
     public ColourPickerPanel() {
         this(true, true);
     }
-    
+
     /** {@inheritDoc} */
+    @Override
     public void paint(final Graphics g) {
         int offset = 20;
-        
+
         if (previewRect == null || !previewRect.equals(g.getClipBounds())) {
             g.setColor(getBackground());
-            
+
             g.fillRect(0, 0, getWidth(), getHeight());
-            
+
             g.setColor(Color.BLACK);
-            
+
             if (showIrc) {
                 g.drawString("IRC Colours", BORDER_SIZE, offset);
-                
+
                 offset += BORDER_SIZE;
-                
+
                 ircOffset = offset;
-                
+
                 for (int i = 0; i < 16; i++) {
                     g.setColor(ColourManager.getColour(i));
-                    g.fillRect(i * IRC_WIDTH + BORDER_SIZE, offset, IRC_WIDTH, IRC_HEIGHT);
+                    g.fillRect(i * IRC_WIDTH + BORDER_SIZE, offset, IRC_WIDTH,
+                            IRC_HEIGHT);
                     g.setColor(Color.BLACK);
-                    g.drawRect(i * IRC_WIDTH + BORDER_SIZE, offset, IRC_WIDTH, IRC_HEIGHT);
+                    g.drawRect(i * IRC_WIDTH + BORDER_SIZE, offset, IRC_WIDTH,
+                            IRC_HEIGHT);
                 }
-                
+
                 offset += IRC_HEIGHT + 20;
             }
-            
+
             if (showHex) {
                 g.drawString("Hex Colours", BORDER_SIZE, offset);
-                
+
                 offset += BORDER_SIZE;
-                
+
                 hexOffset = offset;
-                
+
                 for (int i = HEX_WIDTH; i > 0; i--) {
                     for (int j = HEX_HEIGHT; j > 0; j--) {
-                        g.setColor(new Color(Color.HSBtoRGB((float) i / HEX_WIDTH, saturation, (float) j / HEX_HEIGHT)));
-                        g.drawLine(BORDER_SIZE + i, offset + HEX_HEIGHT - j, BORDER_SIZE + i, offset + HEX_HEIGHT - j);
+                        g.setColor(new Color(Color.HSBtoRGB((float) i /
+                                HEX_WIDTH, saturation, (float) j / HEX_HEIGHT)));
+                        g.drawLine(BORDER_SIZE + i, offset + HEX_HEIGHT - j,
+                                BORDER_SIZE + i, offset + HEX_HEIGHT - j);
                     }
                 }
-                
+
                 g.setColor(Color.BLACK);
                 g.drawRect(BORDER_SIZE, offset, HEX_HEIGHT, HEX_WIDTH);
-                
+
                 g.drawRect(BORDER_SIZE * 2 + HEX_WIDTH, offset, 10, HEX_HEIGHT);
-                
+
                 for (int i = 1; i < HEX_HEIGHT; i++) {
-                    g.setColor(new Color(Color.HSBtoRGB(0, (float) i / HEX_HEIGHT, 1)));
+                    g.setColor(new Color(Color.HSBtoRGB(0, (float) i /
+                            HEX_HEIGHT, 1)));
                     g.drawLine(BORDER_SIZE * 2 + HEX_WIDTH + 1, offset + i,
-                            BORDER_SIZE * 2 + HEX_WIDTH + SLIDER_WIDTH - 1, offset + i);
+                            BORDER_SIZE * 2 + HEX_WIDTH + SLIDER_WIDTH - 1,
+                            offset + i);
                 }
-                
+
                 final Polygon arrow = new Polygon();
-                
-                arrow.addPoint(HEX_WIDTH + BORDER_SIZE * 2 + 4, offset + Math.round(saturation * HEX_HEIGHT));
-                arrow.addPoint(HEX_WIDTH + BORDER_SIZE * 2 + 13, offset + Math.round(saturation * HEX_HEIGHT) + 5);
-                arrow.addPoint(HEX_WIDTH + BORDER_SIZE * 2 + 13, offset + Math.round(saturation * HEX_HEIGHT) - 5);
-                
+
+                arrow.addPoint(HEX_WIDTH + BORDER_SIZE * 2 + 4, offset +
+                        Math.round(saturation * HEX_HEIGHT));
+                arrow.addPoint(HEX_WIDTH + BORDER_SIZE * 2 + 13, offset +
+                        Math.round(saturation * HEX_HEIGHT) + 5);
+                arrow.addPoint(HEX_WIDTH + BORDER_SIZE * 2 + 13, offset +
+                        Math.round(saturation * HEX_HEIGHT) - 5);
+
                 g.setColor(Color.BLACK);
                 g.fillPolygon(arrow);
-                
+
                 offset += HEX_HEIGHT + 20;
             }
-            
+
             g.drawString("Preview", BORDER_SIZE, offset);
-            
+
             offset += BORDER_SIZE;
-            
+
             previewOffset = offset;
-            
+
             if (previewRect == null) {
-                previewRect = new Rectangle(0, previewOffset, getWidth(), PREVIEW_HEIGHT);
+                previewRect = new Rectangle(0, previewOffset, getWidth(),
+                        PREVIEW_HEIGHT);
             }
         } else {
             offset = previewOffset;
         }
-        
-        g.drawRect(BORDER_SIZE, offset, getWidth() - BORDER_SIZE * 2, PREVIEW_HEIGHT);
-        
+
+        g.drawRect(BORDER_SIZE, offset, getWidth() - BORDER_SIZE * 2,
+                PREVIEW_HEIGHT);
+
         if (preview == null) {
             g.setColor(getBackground());
-            g.fillRect(BORDER_SIZE + 1, offset + 1, getWidth() - BORDER_SIZE * 2 - 1, PREVIEW_HEIGHT - 1);
+            g.fillRect(BORDER_SIZE + 1, offset + 1,
+                    getWidth() - BORDER_SIZE * 2 - 1, PREVIEW_HEIGHT - 1);
             g.setColor(Color.BLACK);
-            g.drawLine(BORDER_SIZE, offset, getWidth() - BORDER_SIZE, offset + PREVIEW_HEIGHT);
+            g.drawLine(BORDER_SIZE, offset, getWidth() - BORDER_SIZE, offset +
+                    PREVIEW_HEIGHT);
         } else {
             g.setColor(preview);
-            g.fillRect(BORDER_SIZE + 1, offset + 1, getWidth() - BORDER_SIZE * 2 - 1, PREVIEW_HEIGHT - 1);
+            g.fillRect(BORDER_SIZE + 1, offset + 1,
+                    getWidth() - BORDER_SIZE * 2 - 1, PREVIEW_HEIGHT - 1);
         }
     }
-    
+
     /**
      * Retrieves the hex colour beneath the mouse. It is assumed that this
      * method is only called if the mouse is within the hex area.
@@ -230,10 +235,11 @@ public final class ColourPickerPanel extends JPanel implements MouseListener, Mo
     private Color getHexColour(final MouseEvent e) {
         final int i = e.getX() - BORDER_SIZE;
         final int j = HEX_HEIGHT - (e.getY() - hexOffset);
-        
-        return new Color(Color.HSBtoRGB((float) i / HEX_WIDTH, saturation, (float) j / HEX_HEIGHT));
+
+        return new Color(Color.HSBtoRGB((float) i / HEX_WIDTH, saturation,
+                (float) j / HEX_HEIGHT));
     }
-    
+
     /**
      * Retrieves the irc colour beneath the mouse. It is assumed that this
      * method is only called if the mouse is within the irc colour area.
@@ -242,10 +248,10 @@ public final class ColourPickerPanel extends JPanel implements MouseListener, Mo
      */
     private Color getIrcColour(final MouseEvent e) {
         final int i = (e.getX() - BORDER_SIZE) / IRC_WIDTH;
-        
+
         return ColourManager.getColour(i);
     }
-    
+
     /**
      * Adds an action listener to this object. Action events are generated (and
      * passed to all action listeners) when the user selects a colour. The two
@@ -256,7 +262,7 @@ public final class ColourPickerPanel extends JPanel implements MouseListener, Mo
     public void addActionListener(final ActionListener listener) {
         listeners.add(listener);
     }
- 
+
     /**
      * Removes an action listener from this object.
      * @param listener The listener to be removed
@@ -264,7 +270,7 @@ public final class ColourPickerPanel extends JPanel implements MouseListener, Mo
     public void removeActionListener(final ActionListener listener) {
         listeners.remove(listener);
     }
- 
+
     /**
      * Throws a new action event to all listeners.
      * @param id The id of the action
@@ -272,12 +278,12 @@ public final class ColourPickerPanel extends JPanel implements MouseListener, Mo
      */
     private void throwAction(final int id, final String message) {
         final ActionEvent event = new ActionEvent(this, id, message);
- 
+
         for (ActionListener listener : listeners) {
             listener.actionPerformed(event);
         }
     }
- 
+
     /**
      * Converts the specified integer (in the range 0-255) into a hex string.
      * @param value The integer to convert
@@ -285,79 +291,115 @@ public final class ColourPickerPanel extends JPanel implements MouseListener, Mo
      */
     private String toHex(final int value) {
         final char[] chars = {
-            '0', '1', '2', '3', '4', '5', '6', '7', 
+            '0', '1', '2', '3', '4', '5', '6', '7',
             '8', '9', 'A', 'B', 'C', 'D', 'E', 'F',
         };
-        
+
         return ("" + chars[value / 16]) + chars[value % 16];
     }
-    
-    /** {@inheritDoc} */
+
+    /** 
+     * {@inheritDoc}
+     * 
+     * @param e Mouse event 
+     */
+    @Override
     public void mouseClicked(final MouseEvent e) {
-        if (showIrc && e.getY() > ircOffset
-                && e.getY() < ircOffset + IRC_HEIGHT && e.getX() > BORDER_SIZE
-                && e.getX() < BORDER_SIZE + 16 * IRC_WIDTH) {
-            
+        if (showIrc && e.getY() > ircOffset && e.getY() < ircOffset + IRC_HEIGHT &&
+                e.getX() > BORDER_SIZE && e.getX() < BORDER_SIZE + 16 *
+                IRC_WIDTH) {
+
             final int i = (e.getX() - BORDER_SIZE) / IRC_WIDTH;
-            
+
             throwAction(ACTION_IRC, "" + i);
-            
-        } else if (showHex
-                && e.getY() > hexOffset && e.getY() < hexOffset + HEX_HEIGHT) {
-            
+
+        } else if (showHex && e.getY() > hexOffset && e.getY() < hexOffset +
+                HEX_HEIGHT) {
+
             if (e.getX() > BORDER_SIZE && e.getX() < BORDER_SIZE + HEX_WIDTH) {
-                
+
                 final Color color = getHexColour(e);
-                
-                throwAction(ACTION_HEX, toHex(color.getRed()) + toHex(color.getGreen()) + toHex(color.getBlue()));
-                
-            } else if (e.getX() > BORDER_SIZE * 2 + HEX_WIDTH
-                    && e.getX() < BORDER_SIZE * 3 + HEX_WIDTH + SLIDER_WIDTH) {
+
+                throwAction(ACTION_HEX, toHex(color.getRed()) +
+                        toHex(color.getGreen()) + toHex(color.getBlue()));
+
+            } else if (e.getX() > BORDER_SIZE * 2 + HEX_WIDTH && e.getX() <
+                    BORDER_SIZE * 3 + HEX_WIDTH + SLIDER_WIDTH) {
                 saturation = (float) (e.getY() - hexOffset) / 125;
                 repaint();
             }
         }
     }
-    
-    /** {@inheritDoc} */
+
+    /** 
+     * {@inheritDoc}
+     * 
+     * @param e Mouse event 
+     */
+    @Override
     public void mousePressed(final MouseEvent e) {
-        // Do nothing
+    // Do nothing
     }
-    
-    /** {@inheritDoc} */
+
+    /** 
+     * {@inheritDoc}
+     * 
+     * @param e Mouse event 
+     */
+    @Override
     public void mouseReleased(final MouseEvent e) {
-        // Do nothing
+    // Do nothing
     }
-    
-    /** {@inheritDoc} */
+
+    /** 
+     * {@inheritDoc}
+     * 
+     * @param e Mouse event 
+     */
+    @Override
     public void mouseEntered(final MouseEvent e) {
-        // Do nothing
+    // Do nothing
     }
-    
-    /** {@inheritDoc} */
+
+    /** 
+     * {@inheritDoc}
+     * 
+     * @param e Mouse event 
+     */
+    @Override
     public void mouseExited(final MouseEvent e) {
-        // Do nothing
+    // Do nothing
     }
-    
-    /** {@inheritDoc} */
+
+    /** 
+     * {@inheritDoc}
+     * 
+     * @param e Mouse event 
+     */
+    @Override
     public void mouseDragged(final MouseEvent e) {
-        // Do nothing
+    // Do nothing
     }
-    
-    /** {@inheritDoc} */
+
+    /** 
+     * {@inheritDoc}
+     * 
+     * @param e Mouse event 
+     */
+    @Override
     public void mouseMoved(final MouseEvent e) {
-        if (showIrc && e.getY() > ircOffset
-                && e.getY() < ircOffset + IRC_HEIGHT && e.getX() > BORDER_SIZE
-                && e.getX() < BORDER_SIZE + 16 * IRC_WIDTH) {
+        if (showIrc && e.getY() > ircOffset && e.getY() < ircOffset + IRC_HEIGHT &&
+                e.getX() > BORDER_SIZE && e.getX() < BORDER_SIZE + 16 *
+                IRC_WIDTH) {
             preview = getIrcColour(e);
-        } else if (showHex && e.getY() > hexOffset
-                && e.getY() < hexOffset + HEX_HEIGHT && e.getX() > BORDER_SIZE
-                && e.getX() < BORDER_SIZE + HEX_WIDTH) {
+        } else if (showHex && e.getY() > hexOffset && e.getY() < hexOffset +
+                HEX_HEIGHT && e.getX() > BORDER_SIZE && e.getX() < BORDER_SIZE +
+                HEX_WIDTH) {
             preview = getHexColour(e);
         } else {
             preview = null;
         }
-        
+
         repaint(previewRect);
     }
 }

src/com/dmdirc/ui/swing/dialogs/profiles/ProfileDetailPanel.java

@@ -95,7 +95,7 @@ public final class ProfileDetailPanel extends JPanel implements ActionListener,
      */
     public ProfileDetailPanel(final ProfileListModel model) {
         super();
-        
+
         this.model = model;
 
         initMainComponents();
@@ -135,7 +135,7 @@ public final class ProfileDetailPanel extends JPanel implements ActionListener,
 
     /** Lays out the components in the panel. */
     private void layoutComponents() {
-        setLayout(new MigLayout("fill"));
+        setLayout(new MigLayout("fillx"));
 
         add(new JLabel("Name:"));
         add(name, "growx, pushx, wrap");
@@ -150,7 +150,7 @@ public final class ProfileDetailPanel extends JPanel implements ActionListener,
         add(ident, "growx, pushx, wrap");
 
         add(new JLabel("Alternate nicknames:"));
-        add(new JScrollPane(altNicknames), "growx, pushx, wrap");
+        add(new JScrollPane(altNicknames), "grow, pushx, wrap");
 
         add(addButton, "skip 1, split 3, sg button, growx");
         add(editButton, "sg button, growx");
@@ -344,7 +344,7 @@ public final class ProfileDetailPanel extends JPanel implements ActionListener,
     public void contentsChanged(final ListDataEvent e) {
         validateDetails();
     }
-    
+
     /**
      * Ensures profile names are unique.
      */
@@ -354,14 +354,13 @@ public final class ProfileDetailPanel extends JPanel implements ActionListener,
         @Override
         public ValidationResponse validate(final String object) {
             for (Profile targetprofile : model) {
-                if (targetprofile != profile && targetprofile.getName().equalsIgnoreCase(object)) {
+                if (targetprofile != profile && targetprofile.getName().
+                        equalsIgnoreCase(object)) {
                     return new ValidationResponse("Profile names must be unique");
                 }
             }
-            
+
             return super.validate(object);
         }
-        
     }
-    
 }

src/com/dmdirc/ui/swing/dialogs/profiles/ProfileManagerDialog.java

@@ -29,8 +29,8 @@ import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.swing.components.TextLabel;
 import com.dmdirc.ui.swing.MainFrame;
 import com.dmdirc.ui.swing.components.StandardDialog;
-
 import com.dmdirc.ui.swing.dialogs.NewServerDialog;
+
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.ArrayList;
@@ -144,8 +144,9 @@ public final class ProfileManagerDialog extends StandardDialog implements Action
     private void layoutComponents() {
         getContentPane().setLayout(new MigLayout("fill, wmin 600, wmax 600"));
 
-        getContentPane().add(infoLabel, "wrap, growx, spanx 2");
-        getContentPane().add(new JScrollPane(profileList), "growy, wmin 200, wmax 200");
+        getContentPane().add(infoLabel, "wrap, spanx 2");
+        getContentPane().add(new JScrollPane(profileList),
+                "growy, wmin 200, wmax 200");
         getContentPane().add(details, "grow, wrap");
         getContentPane().add(addButton, "wrap, wmin 200, wmax 200");
         getContentPane().add(deleteButton, "left, wmin 200, wmax 200");
@@ -234,14 +235,14 @@ public final class ProfileManagerDialog extends StandardDialog implements Action
      */
     private void addProfile() {
         final String nick = System.getProperty("user.name").replace(' ', '_');
-        
+
         String name = "New Profile";
         int i = 1;
-        
+
         while (model.contains(name)) {
             name = "New Profile " + ++i;
         }
-        
+
         final Profile profile = new Profile(name, nick, nick);
         model.add(profile);
         profileList.setSelectedIndex(model.indexOf(profile));