Author: mmichaud
Date: 2009-05-29 09:53:28 -0700 (Fri, 29 May 2009)
New Revision: 16851
Modified:
csplugins/trunk/ucsd/mes/anntun/pom.xml
csplugins/trunk/ucsd/mes/anntun/src/main/java/org/example/AppCL.java
csplugins/trunk/ucsd/mes/anntun/src/main/java/org/example/tunable/AbstractTunableInterceptor.java
csplugins/trunk/ucsd/mes/anntun/src/main/java/org/example/tunable/internal/gui/AbstractGuiHandler.java
csplugins/trunk/ucsd/mes/anntun/src/main/java/org/example/tunable/internal/gui/FlexiblyBoundedHandler.java
csplugins/trunk/ucsd/mes/anntun/src/main/java/org/example/tunable/internal/gui/GuiHandlerFactory.java
csplugins/trunk/ucsd/mes/anntun/src/main/java/org/example/tunable/internal/gui/GuiTunableInterceptor.java
csplugins/trunk/ucsd/mes/anntun/src/main/java/org/example/tunable/internal/gui/IntHandler.java
Log:
[]
Modified: csplugins/trunk/ucsd/mes/anntun/pom.xml
===================================================================
--- csplugins/trunk/ucsd/mes/anntun/pom.xml 2009-05-29 15:34:04 UTC (rev
16850)
+++ csplugins/trunk/ucsd/mes/anntun/pom.xml 2009-05-29 16:53:28 UTC (rev
16851)
@@ -48,10 +48,10 @@
<archive>
<manifest>
<!--
-
<mainClass>org.example.AppGUI</mainClass>
-
<mainClass>org.example.AppCL2</mainClass>
+
<mainClass>org.example.AppCL</mainClass>
+
<mainClass>org.example.AppGUI</mainClass>
-->
-
<mainClass>org.example.AppCL</mainClass>
+
<mainClass>org.example.AppCL2</mainClass>
</manifest>
</archive>
</configuration>
Modified: csplugins/trunk/ucsd/mes/anntun/src/main/java/org/example/AppCL.java
===================================================================
--- csplugins/trunk/ucsd/mes/anntun/src/main/java/org/example/AppCL.java
2009-05-29 15:34:04 UTC (rev 16850)
+++ csplugins/trunk/ucsd/mes/anntun/src/main/java/org/example/AppCL.java
2009-05-29 16:53:28 UTC (rev 16851)
@@ -27,8 +27,6 @@
// load the tunables from the object
cl.loadTunables(com);
-
-
// // if the object implements the interface,
// // give the object access to the handlers
// // created for the tunables
@@ -54,6 +52,7 @@
load.setProperty("PrintSomething.income","0,3444,10000,true,true");
load.setProperty("PrintSomething.lms", "one,three");
+
// create the interceptor
TunableInterceptor lp = new LoadPropsInterceptor(load);
Modified:
csplugins/trunk/ucsd/mes/anntun/src/main/java/org/example/tunable/AbstractTunableInterceptor.java
===================================================================
---
csplugins/trunk/ucsd/mes/anntun/src/main/java/org/example/tunable/AbstractTunableInterceptor.java
2009-05-29 15:34:04 UTC (rev 16850)
+++
csplugins/trunk/ucsd/mes/anntun/src/main/java/org/example/tunable/AbstractTunableInterceptor.java
2009-05-29 16:53:28 UTC (rev 16851)
@@ -1,16 +1,13 @@
-
package org.example.tunable;
import java.lang.reflect.*;
-import java.lang.annotation.*;
import java.util.*;
/**
* An abstract implementation of {...@link TunableInterceptor} that should
serve as
* the super class for almost all implementations of {...@link
TunableInterceptor}.
*/
-public abstract class AbstractTunableInterceptor<T extends Handler>
- implements TunableInterceptor {
+public abstract class AbstractTunableInterceptor<T extends Handler> implements
TunableInterceptor {
protected HandlerFactory<T> factory;
Modified:
csplugins/trunk/ucsd/mes/anntun/src/main/java/org/example/tunable/internal/gui/AbstractGuiHandler.java
===================================================================
---
csplugins/trunk/ucsd/mes/anntun/src/main/java/org/example/tunable/internal/gui/AbstractGuiHandler.java
2009-05-29 15:34:04 UTC (rev 16850)
+++
csplugins/trunk/ucsd/mes/anntun/src/main/java/org/example/tunable/internal/gui/AbstractGuiHandler.java
2009-05-29 16:53:28 UTC (rev 16851)
@@ -1,10 +1,7 @@
-
package org.example.tunable.internal.gui;
import java.lang.reflect.*;
-import java.util.*;
import javax.swing.*;
-import javax.swing.event.*;
import java.awt.event.*;
import java.awt.*;
import org.example.tunable.*;
@@ -12,7 +9,6 @@
public abstract class AbstractGuiHandler extends AbstractHandler implements
GuiHandler, ActionListener {
protected JPanel panel;
-
private String depName;
private String depState;
@@ -23,10 +19,10 @@
depName = s.substring(0,s.indexOf("="));
depState = s.substring(s.indexOf("=") + 1);
}
-
panel = new JPanel();
}
-
+
+
public void actionPerformed(ActionEvent ae) {
//System.out.println(this.getName() + " actionPerformed");
handle();
Modified:
csplugins/trunk/ucsd/mes/anntun/src/main/java/org/example/tunable/internal/gui/FlexiblyBoundedHandler.java
===================================================================
---
csplugins/trunk/ucsd/mes/anntun/src/main/java/org/example/tunable/internal/gui/FlexiblyBoundedHandler.java
2009-05-29 15:34:04 UTC (rev 16850)
+++
csplugins/trunk/ucsd/mes/anntun/src/main/java/org/example/tunable/internal/gui/FlexiblyBoundedHandler.java
2009-05-29 16:53:28 UTC (rev 16851)
@@ -17,8 +17,8 @@
JTextField tf;
final T b;
final JLabel label;
+ JTextField test;
-
public FlexiblyBoundedHandler(Field f, Object o, Tunable t) {
super(f,o,t);
T bb;
@@ -38,8 +38,9 @@
label = new JLabel();
setLabelText();
+
try {
- panel.add( label );
+ panel.add(label);
tf = new JTextField( b.getValue().toString(), 6);
tf.addActionListener( this );
panel.add( tf );
@@ -50,7 +51,7 @@
}
private void setLabelText() {
- label.setText( t.description() + " (min: " +
b.getLowerBound().toString() + " max: " + b.getUpperBound().toString() + ")" );
+ label.setText( t.description() +"\n(min: " +
b.getLowerBound().toString() + " max: " + b.getUpperBound().toString() + ")" );
}
public void handle() {
Modified:
csplugins/trunk/ucsd/mes/anntun/src/main/java/org/example/tunable/internal/gui/GuiHandlerFactory.java
===================================================================
---
csplugins/trunk/ucsd/mes/anntun/src/main/java/org/example/tunable/internal/gui/GuiHandlerFactory.java
2009-05-29 15:34:04 UTC (rev 16850)
+++
csplugins/trunk/ucsd/mes/anntun/src/main/java/org/example/tunable/internal/gui/GuiHandlerFactory.java
2009-05-29 16:53:28 UTC (rev 16851)
@@ -1,4 +1,3 @@
-
package org.example.tunable.internal.gui;
import java.lang.reflect.*;
@@ -12,47 +11,35 @@
}
public GuiHandler getHandler(Field f, Object o, Tunable t) {
- Class type = f.getType();
+ Class<?> type = f.getType();
+ if ( type == String.class )
+ return new StringHandler(f,o,t);
+ else if ( type == Boolean.class || type == boolean.class )
+ return new BooleanHandler(f,o,t);
+
if ( type == int.class || type == Integer.class )
return new IntHandler(f,o,t);
- else if ( type == String.class )
- return new StringHandler(f,o,t);
-
else if ( type == BoundedInteger.class )
return new BoundedHandler<BoundedInteger>(f,o,t);
-
else if ( type == BoundedDouble.class )
return new BoundedHandler<BoundedDouble>(f,o,t);
else if ( type == FlexiblyBoundedInteger.class )
return new
FlexiblyBoundedHandler<FlexiblyBoundedInteger>(f,o,t);
-
else if ( type == FlexiblyBoundedDouble.class )
return new
FlexiblyBoundedHandler<FlexiblyBoundedDouble>(f,o,t);
-
- else if ( type == Boolean.class || type == boolean.class )
- return new BooleanHandler(f,o,t);
-
+
else if ( type == ListSingleSelection.class )
return new ListSingleSelectionHandler(f,o,t);
-
else if ( type == ListMultipleSelection.class )
return new ListMultipleSelectionHandler(f,o,t);
-
return null;
}
- public GuiHandler getHandler(Method gmethod, Method smethod, Object o,
- Tunable t) {
- // TODO Auto-generated method stub
+
+ public GuiHandler getHandler(Method gmethod, Method smethod, Object
o,Tunable tg,Tunable ts) {
return null;
}
-
- public GuiHandler getHandler(Method gmethod, Method smethod, Object o,
- Tunable tg, Tunable ts) {
- // TODO Auto-generated method stub
- return null;
- }
}
Modified:
csplugins/trunk/ucsd/mes/anntun/src/main/java/org/example/tunable/internal/gui/GuiTunableInterceptor.java
===================================================================
---
csplugins/trunk/ucsd/mes/anntun/src/main/java/org/example/tunable/internal/gui/GuiTunableInterceptor.java
2009-05-29 15:34:04 UTC (rev 16850)
+++
csplugins/trunk/ucsd/mes/anntun/src/main/java/org/example/tunable/internal/gui/GuiTunableInterceptor.java
2009-05-29 16:53:28 UTC (rev 16851)
@@ -1,11 +1,8 @@
package org.example.tunable.internal.gui;
-import java.lang.reflect.*;
-import java.lang.annotation.*;
import java.util.*;
import java.awt.*;
import javax.swing.*;
-import java.awt.event.*;
import org.example.tunable.*;
/**
Modified:
csplugins/trunk/ucsd/mes/anntun/src/main/java/org/example/tunable/internal/gui/IntHandler.java
===================================================================
---
csplugins/trunk/ucsd/mes/anntun/src/main/java/org/example/tunable/internal/gui/IntHandler.java
2009-05-29 15:34:04 UTC (rev 16850)
+++
csplugins/trunk/ucsd/mes/anntun/src/main/java/org/example/tunable/internal/gui/IntHandler.java
2009-05-29 16:53:28 UTC (rev 16851)
@@ -1,12 +1,7 @@
-
package org.example.tunable.internal.gui;
import java.lang.reflect.*;
-import java.util.*;
import javax.swing.*;
-import javax.swing.event.*;
-import java.awt.event.*;
-import java.awt.*;
import org.example.tunable.*;
public class IntHandler extends AbstractGuiHandler {
@@ -19,19 +14,18 @@
panel = new JPanel();
try {
- panel.add( new JLabel( t.description() ) );
- tf = new JTextField( Integer.toString(f.getInt(o)), 10);
- tf.addActionListener( this );
- panel.add( tf );
+ panel.add( new JLabel( t.description() ) );
+ tf = new JTextField( Integer.toString(f.getInt(o)), 10);
+ tf.addActionListener( this );
+ panel.add( tf );
} catch (Exception e) { e.printStackTrace(); }
-
}
+
public void handle() {
String s = tf.getText();
try {
- int n = Integer.parseInt(s);
- f.set(o,n);
+ f.set(o,Integer.parseInt(s));
} catch (Exception e) { e.printStackTrace(); }
}
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
