Java 1.6 includes a javax.swing.GroupLayout, so be specific about the

things we're importing from samskivert.
(Our style nowadays is to always explicitely specify imports.)


git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@72 ed5b42cb-e716-0410-a449-f6a68f950b19

src/java/com/threerings/cast/builder/BuilderPanel.java

@@ -22,7 +22,8 @@
 package com.threerings.cast.builder;
 
 import javax.swing.*;
-import com.samskivert.swing.*;
+import com.samskivert.swing.HGroupLayout;
+import com.samskivert.swing.VGroupLayout;
 
 import com.threerings.cast.CharacterManager;
 import com.threerings.cast.ComponentRepository;
@@ -45,8 +46,8 @@ public class BuilderPanel extends JPanel
 	// give ourselves a wee bit of a border
 	setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
 
-        GroupLayout gl = new HGroupLayout(GroupLayout.STRETCH);
-        gl.setOffAxisPolicy(GroupLayout.STRETCH);
+        HGroupLayout gl = new HGroupLayout(HGroupLayout.STRETCH);
+        gl.setOffAxisPolicy(HGroupLayout.STRETCH);
 
         // create the builder model
         BuilderModel model = new BuilderModel(crepo);

src/java/com/threerings/cast/builder/ClassEditor.java

@@ -28,7 +28,8 @@ import javax.swing.*;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 
-import com.samskivert.swing.*;
+import com.samskivert.swing.HGroupLayout;
+import com.samskivert.swing.VGroupLayout;
 
 import com.threerings.cast.ComponentClass;
 
@@ -48,13 +49,13 @@ public class ClassEditor extends JPanel implements ChangeListener
         _components = components;
         _cclass = cclass;
 
-        GroupLayout gl = new VGroupLayout(GroupLayout.STRETCH);
-        gl.setOffAxisPolicy(GroupLayout.STRETCH);
-        setLayout(gl);
+        VGroupLayout vgl = new VGroupLayout(VGroupLayout.STRETCH);
+        vgl.setOffAxisPolicy(VGroupLayout.STRETCH);
+        setLayout(vgl);
 
-        gl = new HGroupLayout();
-        gl.setJustification(GroupLayout.LEFT);
-        JPanel sub = new JPanel(gl);
+        HGroupLayout hgl = new HGroupLayout();
+        hgl.setJustification(HGroupLayout.LEFT);
+        JPanel sub = new JPanel(hgl);
 
         sub.add(new JLabel(cclass.name + ": "));
         sub.add(_clabel = new JLabel("0"));

src/java/com/threerings/cast/builder/ComponentPanel.java

@@ -25,7 +25,7 @@ import java.util.List;
 
 import javax.swing.*;
 
-import com.samskivert.swing.*;
+import com.samskivert.swing.VGroupLayout;
 
 import com.threerings.cast.Log;
 import com.threerings.cast.*;
@@ -42,7 +42,7 @@ public class ComponentPanel extends JPanel
      */
     public ComponentPanel (BuilderModel model, String cprefix)
     {
-	setLayout(new VGroupLayout(GroupLayout.STRETCH));
+	setLayout(new VGroupLayout(VGroupLayout.STRETCH));
 	// set up a border
 	setBorder(BorderFactory.createEtchedBorder());
         // add the component editors to the panel