[Japi-cvs] SF.net SVN: japi:[1398] libs/swing-misc/trunk/src/prj/net/sf/japi/swing/ misc/JFileField.java

[<aki...@us...>]

Revision: 1398
          http://japi.svn.sourceforge.net/japi/?rev=1398&view=rev
Author:   akirschbaum
Date:     2010-01-31 11:03:41 +0000 (Sun, 31 Jan 2010)

Log Message:
-----------
Properly update JFileField's layout after resize.

Modified Paths:
--------------
    libs/swing-misc/trunk/src/prj/net/sf/japi/swing/misc/JFileField.java

Modified: libs/swing-misc/trunk/src/prj/net/sf/japi/swing/misc/JFileField.java
===================================================================
--- libs/swing-misc/trunk/src/prj/net/sf/japi/swing/misc/JFileField.java	2009-11-03 00:30:52 UTC (rev 1397)
+++ libs/swing-misc/trunk/src/prj/net/sf/japi/swing/misc/JFileField.java	2010-01-31 11:03:41 UTC (rev 1398)
@@ -18,11 +18,12 @@
 
 package net.sf.japi.swing.misc;
 
-import java.awt.FlowLayout;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
 import javax.swing.JComponent;
+import javax.swing.JFileChooser;
 import javax.swing.JLabel;
 import javax.swing.JTextField;
-import javax.swing.JFileChooser;
 
 /** Component for selecting a file.
  * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
@@ -56,13 +57,11 @@
      * @see JFileChooser for fileSelectionMode.
      */
     public JFileField(final String labelText, final String initial, final int fileSelectionMode) {
-        setLayout(new FlowLayout(FlowLayout.RIGHT));
+        setLayout(new GridBagLayout());
         fileField = new JTextField(initial, DEFAULT_TEXTFIELD_COLUMNS);
         chooserButton = new JFileChooserButton(fileField, fileSelectionMode);
         label = new JLabel(labelText);
-        add(label);
-        add(fileField);
-        add(chooserButton);
+        addFields();
     }
 
     /**
@@ -72,14 +71,33 @@
      * @see JFileChooser for fileSelectionMode.
      */
     public JFileField(final String initial, final int fileSelectionMode) {
-        setLayout(new FlowLayout(FlowLayout.RIGHT));
+        setLayout(new GridBagLayout());
         fileField = new JTextField(initial, DEFAULT_TEXTFIELD_COLUMNS);
         chooserButton = new JFileChooserButton(fileField, fileSelectionMode);
         label = null;
-        add(fileField);
-        add(chooserButton);
+        addFields();
     }
 
+    /**
+     * Adds all fields to this component.
+     */
+    private void addFields() {
+        final GridBagConstraints gbc = new GridBagConstraints();
+        gbc.gridx = 0;
+        gbc.gridy = 0;
+        gbc.fill = GridBagConstraints.HORIZONTAL;
+        if (label != null) {
+            gbc.weightx = 0.0;
+            add(label, gbc);
+        }
+        gbc.gridx++;
+        gbc.weightx = 1.0;
+        add(fileField, gbc);
+        gbc.gridx++;
+        gbc.weightx = 0.0;
+        add(chooserButton, gbc);
+    }
+
     /** {@inheritDoc} */
     @Override public void setEnabled(final boolean enabled) {
         super.setEnabled(enabled);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.