Author: mmichaud
Date: 2009-04-02 08:32:27 -0700 (Thu, 02 Apr 2009)
New Revision: 16432

Modified:
   
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/BooleanHandler.java
   
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/DoubleHandler.java
   
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/FloatHandler.java
   
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/IntegerHandler.java
   
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/LongHandler.java
   
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/StringHandler.java
Log:


Modified: 
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/BooleanHandler.java
===================================================================
--- 
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/BooleanHandler.java
  2009-04-02 15:24:53 UTC (rev 16431)
+++ 
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/BooleanHandler.java
  2009-04-02 15:32:27 UTC (rev 16432)
@@ -10,6 +10,7 @@
 import javax.swing.JPanel;
 
 import org.cytoscape.work.Tunable;
+import org.cytoscape.work.Tunable.Param;
 
 
 
@@ -26,21 +27,26 @@
                }catch(Exception e){e.printStackTrace();}
                
                panel = new JPanel(new BorderLayout());
-               try {
-                       jcb = new JCheckBox();
-                       jcb.setSelected(myBoolean.booleanValue());
-                       JLabel label = new JLabel(t.description());
-                       label.setFont(new Font(null, Font.PLAIN,12));
-                       //jcb.addActionListener(this);
+               jcb = new JCheckBox();
+               jcb.setSelected(myBoolean.booleanValue());
+               JLabel label = new JLabel(t.description());
+               label.setFont(new Font(null,Font.PLAIN,12));
+               jcb.addActionListener(this);
+
+               for(Param param : t.alignment())if(param==Param.horizontal){
+                       panel.add(label,BorderLayout.NORTH);
+                       panel.add(jcb,BorderLayout.SOUTH);
+               }
+               else{
                        panel.add(label,BorderLayout.WEST);
-                       panel.add( jcb ,BorderLayout.EAST);
-               } catch (Exception e) { e.printStackTrace(); }
+                       panel.add(jcb,BorderLayout.EAST);
+               }
        }
 
        public void handle() {
                try {
                f.set(o,jcb.isSelected());
-               } catch (Exception e) { e.printStackTrace(); }
+               } catch (Exception e) {e.printStackTrace();}
        }
        
 
@@ -48,7 +54,6 @@
                String s;
                try {
                        s = f.get(o).toString();
-               //s = Boolean.toString(f.getBoolean(o));
                } catch (IllegalAccessException e) {
                        e.printStackTrace();
                        s = "";

Modified: 
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/DoubleHandler.java
===================================================================
--- 
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/DoubleHandler.java
   2009-04-02 15:24:53 UTC (rev 16431)
+++ 
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/DoubleHandler.java
   2009-04-02 15:32:27 UTC (rev 16432)
@@ -7,30 +7,36 @@
 import javax.swing.*;
 
 import org.cytoscape.work.Tunable;
+import org.cytoscape.work.Tunable.Param;
 
 
 public class DoubleHandler extends AbstractGuiHandler {
 
-       JTextField jtf;
-       Double value = null;
+       private JTextField jtf;
+       private Double value = null;
        Double myDouble;
-       String newline = System.getProperty("line.separator");
+       private String newline = System.getProperty("line.separator");
 
 
        protected DoubleHandler(Field f, Object o, Tunable t) {
                super(f,o,t);
                try{
                        this.myDouble=(Double)f.get(o);
+                       jtf = new JTextField(f.get(o).toString(), 10);
                }catch(Exception e){e.printStackTrace();}
                panel = new JPanel(new BorderLayout());
                JLabel label = new JLabel(t.description());
                label.setFont(new Font(null, Font.PLAIN,12));
-               panel.add(label,BorderLayout.WEST);
-               try {
-                       jtf = new JTextField(f.get(o).toString(), 10);
-               } catch (Exception e) { e.printStackTrace(); }
                jtf.setHorizontalAlignment(JTextField.RIGHT);
-               panel.add(jtf,BorderLayout.EAST);                       
+
+               for(Param par : t.alignment())if(par==Param.horizontal){
+                       panel.add(label,BorderLayout.NORTH);
+                       panel.add(jtf,BorderLayout.SOUTH);      
+               }
+               else{
+                       panel.add(label,BorderLayout.WEST);
+                       panel.add(jtf,BorderLayout.EAST);
+               }
        }
 
        public void handle() {

Modified: 
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/FloatHandler.java
===================================================================
--- 
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/FloatHandler.java
    2009-04-02 15:24:53 UTC (rev 16431)
+++ 
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/FloatHandler.java
    2009-04-02 15:32:27 UTC (rev 16432)
@@ -7,6 +7,7 @@
 import javax.swing.*;
 
 import org.cytoscape.work.Tunable;
+import org.cytoscape.work.Tunable.Param;
 
 public class FloatHandler extends AbstractGuiHandler {
 
@@ -20,16 +21,21 @@
                super(f,o,t);
                try{
                        this.myFloat=(Float)f.get(o);
+                       jtf = new JTextField(f.get(o).toString(), 10);
                }catch(Exception e){e.printStackTrace();}
                panel = new JPanel(new BorderLayout());
                JLabel label = new JLabel(t.description());
                label.setFont(new Font(null, Font.PLAIN,12));
-               panel.add(label,BorderLayout.WEST);
-               try {
-                       jtf = new JTextField(f.get(o).toString(), 10);
-               } catch (Exception e) { e.printStackTrace(); }
                jtf.setHorizontalAlignment(JTextField.RIGHT);
-               panel.add(jtf,BorderLayout.EAST);
+
+               for(Param par : t.alignment())if(par==Param.horizontal){
+                       panel.add(label,BorderLayout.NORTH);
+                       panel.add(jtf,BorderLayout.SOUTH);
+               }
+               else{
+                       panel.add(label,BorderLayout.WEST);
+                       panel.add(jtf,BorderLayout.EAST);
+               }
        }
 
        public void handle() {

Modified: 
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/IntegerHandler.java
===================================================================
--- 
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/IntegerHandler.java
  2009-04-02 15:24:53 UTC (rev 16431)
+++ 
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/IntegerHandler.java
  2009-04-02 15:32:27 UTC (rev 16432)
@@ -7,30 +7,36 @@
 import javax.swing.*;
 
 import org.cytoscape.work.Tunable;
+import org.cytoscape.work.Tunable.Param;
 
 
 public class IntegerHandler extends AbstractGuiHandler {
 
-       JTextField jtf;
-       Double value = null;
+       private JTextField jtf;
+       private Double value = null;
        Integer myInteger;
-       String newline = System.getProperty("line.separator");
+       private String newline = System.getProperty("line.separator");
        
        
        protected IntegerHandler(Field f, Object o, Tunable t) {
                super(f,o,t);
                try{
                        this.myInteger=(Integer)f.get(o);
+                       jtf = new JTextField(f.get(o).toString(), 10);
                }catch(Exception e){e.printStackTrace();}
                panel = new JPanel(new BorderLayout());
                JLabel label = new JLabel(t.description());
                label.setFont(new Font(null, Font.PLAIN,12));
-               panel.add(label,BorderLayout.WEST );
-               try {
-                       jtf = new JTextField(f.get(o).toString(), 10);
-               } catch (Exception e) { e.printStackTrace(); }
                jtf.setHorizontalAlignment(JTextField.RIGHT);
-               panel.add(jtf,BorderLayout.EAST);                       
+               
+               for(Param par : t.alignment())if(par==Param.horizontal){
+                       panel.add(label,BorderLayout.NORTH);
+                       panel.add(jtf,BorderLayout.SOUTH);      
+               }
+               else{
+                       panel.add(label,BorderLayout.WEST );
+                       panel.add(jtf,BorderLayout.EAST);
+               }
        }
 
        public void handle() {

Modified: 
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/LongHandler.java
===================================================================
--- 
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/LongHandler.java
     2009-04-02 15:24:53 UTC (rev 16431)
+++ 
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/LongHandler.java
     2009-04-02 15:32:27 UTC (rev 16432)
@@ -7,28 +7,34 @@
 import javax.swing.*;
 
 import org.cytoscape.work.Tunable;
+import org.cytoscape.work.Tunable.Param;
 
 public class LongHandler extends AbstractGuiHandler {
 
-       JTextField jtf;
-       Double value = null;
+       private JTextField jtf;
+       private Double value = null;
        Long myLong;
-       String newline = System.getProperty("line.separator");
+       private String newline = System.getProperty("line.separator");
 
        protected LongHandler(Field f, Object o, Tunable t) {
                super(f,o,t);
                try{
                        this.myLong=(Long)f.get(o);
+                       jtf = new JTextField( f.get(o).toString(), 10);
                }catch(Exception e){e.printStackTrace();}
                panel = new JPanel(new BorderLayout());
                JLabel label = new JLabel(t.description());
                label.setFont(new Font(null, Font.PLAIN,12));
-               panel.add(label,BorderLayout.WEST);
-               try {
-                       jtf = new JTextField( f.get(o).toString(), 10);
-               } catch (Exception e) { e.printStackTrace(); }
                jtf.setHorizontalAlignment(JTextField.RIGHT);
-               panel.add(jtf,BorderLayout.EAST);                       
+
+               for(Param par : t.alignment())if(par==Param.horizontal){
+                       panel.add(label,BorderLayout.NORTH);
+                       panel.add(jtf,BorderLayout.SOUTH);      
+               }
+               else{
+                       panel.add(label,BorderLayout.WEST );
+                       panel.add(jtf,BorderLayout.EAST);
+               }
        }
 
        public void handle() {

Modified: 
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/StringHandler.java
===================================================================
--- 
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/StringHandler.java
   2009-04-02 15:24:53 UTC (rev 16431)
+++ 
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/StringHandler.java
   2009-04-02 15:32:27 UTC (rev 16432)
@@ -6,6 +6,7 @@
 import javax.swing.*;
 
 import org.cytoscape.work.Tunable;
+import org.cytoscape.work.Tunable.Param;
 
 
 public class StringHandler extends AbstractGuiHandler {
@@ -14,15 +15,23 @@
 
        protected StringHandler(Field f, Object o, Tunable t) {
                super(f,o,t);
+               try {
+                       jtf = new JTextField( (String)f.get(o), 15);
+               } catch (Exception e) {e.printStackTrace(); }
+               
                panel = new JPanel(new BorderLayout());
                JLabel label = new JLabel(t.description());
                label.setFont(new Font(null, Font.PLAIN,12));
-               panel.add(label,BorderLayout.WEST );
-               try {
-                       jtf = new JTextField( (String)f.get(o), 15);
-               } catch (Exception e) {e.printStackTrace(); }
                jtf.setHorizontalAlignment(JTextField.RIGHT);
-               panel.add(jtf,BorderLayout.EAST);                       
+               
+               for(Param par : t.alignment())if(par==Param.horizontal){
+                       panel.add(label,BorderLayout.NORTH);
+                       panel.add(jtf,BorderLayout.SOUTH);      
+               }
+               else{
+                       panel.add(label,BorderLayout.WEST );
+                       panel.add(jtf,BorderLayout.EAST);
+               }
        }
 
        public void handle() {


--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups 
"cytoscape-cvs" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to 
[email protected]
For more options, visit this group at 
http://groups.google.com/group/cytoscape-cvs?hl=en
-~----------~----~----~----~------~----~------~--~---

Reply via email to