code tidying, more *_BORDER removal

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

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

@@ -38,7 +38,6 @@ import com.dmdirc.ui.swing.actions.CopyAction;
 import com.dmdirc.ui.swing.actions.CutAction;
 import com.dmdirc.ui.swing.actions.InputTextFramePasteAction;
 import com.dmdirc.ui.swing.dialogs.paste.PasteDialog;
-import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
 import com.dmdirc.ui.swing.actions.CommandAction;
 
 import java.awt.AWTException;
@@ -49,7 +48,6 @@ import java.awt.Robot;
 import java.awt.Toolkit;
 import java.awt.datatransfer.DataFlavor;
 import java.awt.datatransfer.UnsupportedFlavorException;
-import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;
 import java.awt.event.MouseEvent;
@@ -57,7 +55,6 @@ import java.awt.event.MouseListener;
 import java.io.IOException;
 import java.io.Serializable;
 
-import javax.swing.BorderFactory;
 import javax.swing.JComponent;
 import javax.swing.JLabel;
 import javax.swing.JMenu;
@@ -68,6 +65,9 @@ import javax.swing.JSeparator;
 import javax.swing.KeyStroke;
 import javax.swing.event.InternalFrameEvent;
 import javax.swing.event.InternalFrameListener;
+import net.miginfocom.layout.PlatformDefaults;
+
+import net.miginfocom.swing.MigLayout;
 
 /**
  * Frame with an input field.
@@ -164,7 +164,9 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
         awayLabel.setText("(away)");
         awayLabel.setVisible(false);
 
-        inputPanel = new JPanel(new BorderLayout(SMALL_BORDER, SMALL_BORDER));
+        inputPanel = new JPanel(new BorderLayout(
+                (int) PlatformDefaults.getUnitValueX("related").getValue(), 
+                (int) PlatformDefaults.getUnitValueX("related").getValue()));
         inputPanel.add(awayLabel, BorderLayout.LINE_START);
         inputPanel.add(inputField, BorderLayout.CENTER);
 
@@ -418,7 +420,7 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
                 initPopupMenu();
                 inputFieldPopup.show(this, (int) point.getX(),
                         (int) point.getY() + getTextPane().getHeight() +
-                        SMALL_BORDER);
+                        (int) PlatformDefaults.getUnitValueX("related").getValue());
             }
         }
         super.processMouseEvent(e);

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

@@ -52,14 +52,16 @@ public class SwingInputField extends JComponent implements InputField,
     /** Colour picker. */
     private ColourPickerDialog colourPicker;
     /** Input field text field. */
-    private JTextField textField;
+    private final JTextField textField;
     /** Line wrap indicator. */
-    private JLabel wrapIndicator;
+    private final JLabel wrapIndicator;
 
     /**
      * Instantiates a new swing input field.
      */
     public SwingInputField() {
+        super();
+        
         textField = new JTextField();
         textField.setFocusTraversalKeysEnabled(false);
         wrapIndicator =
@@ -89,7 +91,7 @@ public class SwingInputField extends JComponent implements InputField,
 
     /** {@inheritDoc} */
     @Override
-    public void showColourPicker(boolean irc, boolean hex) {
+    public void showColourPicker(final boolean irc, final boolean hex) {
         if (IdentityManager.getGlobalConfig().getOptionBool("general",
                 "showcolourdialog", false)) {
             colourPicker = new ColourPickerDialog(irc, hex);
@@ -135,25 +137,25 @@ public class SwingInputField extends JComponent implements InputField,
 
     /** {@inheritDoc} */
     @Override
-    public void addActionListener(ActionListener listener) {
+    public void addActionListener(final ActionListener listener) {
         textField.addActionListener(listener);
     }
 
     /** {@inheritDoc} */
     @Override
-    public void addKeyListener(KeyListener listener) {
+    public void addKeyListener(final KeyListener listener) {
         textField.addKeyListener(listener);
     }
 
     /** {@inheritDoc} */
     @Override
-    public void removeActionListener(ActionListener listener) {
+    public void removeActionListener(final ActionListener listener) {
         textField.removeActionListener(listener);
     }
 
     /** {@inheritDoc} */
     @Override
-    public void removeKeyListener(KeyListener listener) {
+    public void removeKeyListener(final KeyListener listener) {
         textField.removeKeyListener(listener);
     }
 
@@ -183,7 +185,7 @@ public class SwingInputField extends JComponent implements InputField,
 
     /** {@inheritDoc} */
     @Override
-    public void setText(String text) {
+    public void setText(final String text) {
         textField.setText(text);
     }
 
@@ -195,7 +197,7 @@ public class SwingInputField extends JComponent implements InputField,
 
     /** {@inheritDoc} */
     @Override
-    public void setCaretPosition(int position) {
+    public void setCaretPosition(final int position) {
         textField.setCaretPosition(position);
     }
 
@@ -204,7 +206,7 @@ public class SwingInputField extends JComponent implements InputField,
      * 
      * @param clipboard Text to replace selection with
      */
-    public void replaceSelection(String clipboard) {
+    public void replaceSelection(final String clipboard) {
         textField.replaceSelection(clipboard);
     }
 
@@ -213,7 +215,7 @@ public class SwingInputField extends JComponent implements InputField,
      * 
      * @param optionColour Colour for the caret
      */
-    public void setCaretColor(Color optionColour) {
+    public void setCaretColor(final Color optionColour) {
         textField.setCaretColor(optionColour);
     }
 
@@ -223,7 +225,7 @@ public class SwingInputField extends JComponent implements InputField,
      * @param optionColour Colour for the caret
      */
     @Override
-    public void setForeground(Color optionColour) {
+    public void setForeground(final Color optionColour) {
         textField.setForeground(optionColour);
     }
 
@@ -233,7 +235,7 @@ public class SwingInputField extends JComponent implements InputField,
      * @param optionColour Colour for the caret
      */
     @Override
-    public void setBackground(Color optionColour) {
+    public void setBackground(final Color optionColour) {
         textField.setBackground(optionColour);
     }