Author: mmichaud
Date: 2009-05-29 07:01:54 -0700 (Fri, 29 May 2009)
New Revision: 16842
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/command/PrintSomething.java
csplugins/trunk/ucsd/mes/anntun/src/main/java/org/example/tunable/internal/props/AbstractPropHandler.java
csplugins/trunk/ucsd/mes/anntun/src/main/java/org/example/tunable/internal/props/IntPropHandler.java
csplugins/trunk/ucsd/mes/anntun/src/main/java/org/example/tunable/internal/props/LoadPropsInterceptor.java
csplugins/trunk/ucsd/mes/anntun/src/main/java/org/example/tunable/internal/props/PropHandlerFactory.java
csplugins/trunk/ucsd/mes/anntun/src/main/java/org/example/tunable/internal/props/StorePropsInterceptor.java
csplugins/trunk/ucsd/mes/anntun/src/main/java/org/example/tunable/internal/props/StringPropHandler.java
Log:
[]
Modified: csplugins/trunk/ucsd/mes/anntun/pom.xml
===================================================================
--- csplugins/trunk/ucsd/mes/anntun/pom.xml 2009-05-28 22:33:14 UTC (rev
16841)
+++ csplugins/trunk/ucsd/mes/anntun/pom.xml 2009-05-29 14:01:54 UTC (rev
16842)
@@ -49,9 +49,9 @@
<manifest>
<!--
<mainClass>org.example.AppGUI</mainClass>
-
<mainClass>org.example.AppCL</mainClass>
+
<mainClass>org.example.AppCL2</mainClass>
-->
-
<mainClass>org.example.AppCL2</mainClass>
+
<mainClass>org.example.AppCL</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-28 22:33:14 UTC (rev 16841)
+++ csplugins/trunk/ucsd/mes/anntun/src/main/java/org/example/AppCL.java
2009-05-29 14:01:54 UTC (rev 16842)
@@ -4,6 +4,9 @@
import org.example.tunable.*;
import org.example.tunable.internal.props.*;
import org.example.tunable.internal.cl.*;
+import org.example.tunable.util.BoundedDouble;
+import org.example.tunable.util.FlexiblyBoundedInteger;
+import org.example.tunable.util.ListSingleSelection;
import org.example.command.*;
import java.util.*;
@@ -43,11 +46,16 @@
System.out.println();
// a properties object generated from someplace
- Properties p = new Properties();
- p.setProperty("printSomething.firstName","marge");
-
+ Properties load = new Properties();
+ load.setProperty("PrintSomething.firstName","marge");
+ load.setProperty("PrintSomething.footSize","5.34");
+ load.setProperty("PrintSomething.bool", "true");
+ load.setProperty("PrintSomething.lss","1");
+
load.setProperty("PrintSomething.income","0,3444,10000,true,true");
+ load.setProperty("PrintSomething.lms", "one,three");
+
// create the interceptor
- TunableInterceptor lp = new LoadPropsInterceptor(p);
+ TunableInterceptor lp = new LoadPropsInterceptor(load);
// load the tunables from the object
lp.loadTunables(com);
Modified:
csplugins/trunk/ucsd/mes/anntun/src/main/java/org/example/command/PrintSomething.java
===================================================================
---
csplugins/trunk/ucsd/mes/anntun/src/main/java/org/example/command/PrintSomething.java
2009-05-28 22:33:14 UTC (rev 16841)
+++
csplugins/trunk/ucsd/mes/anntun/src/main/java/org/example/command/PrintSomething.java
2009-05-29 14:01:54 UTC (rev 16842)
@@ -19,6 +19,9 @@
@Tunable(description="your last name", group={"stuff","advanced"},
flags={"collapsable"} )
public String lastName = "simpson";
+ @Tunable(description="an integer test", group={"stuff","advanced"},
flags={"collapsable"} )
+ public int test = 3;
+
@Tunable(description="your foot size", group={"stuff","advanced"})
public BoundedDouble footSize = new BoundedDouble(5.0, 8.5, 13.5, true,
false);
Modified:
csplugins/trunk/ucsd/mes/anntun/src/main/java/org/example/tunable/internal/props/AbstractPropHandler.java
===================================================================
---
csplugins/trunk/ucsd/mes/anntun/src/main/java/org/example/tunable/internal/props/AbstractPropHandler.java
2009-05-28 22:33:14 UTC (rev 16841)
+++
csplugins/trunk/ucsd/mes/anntun/src/main/java/org/example/tunable/internal/props/AbstractPropHandler.java
2009-05-29 14:01:54 UTC (rev 16842)
@@ -12,7 +12,6 @@
public AbstractPropHandler(Field f, Object o, Tunable t) {
super(f,o,t);
String n = f.getDeclaringClass().toString();
-
propKey = n.substring( n.lastIndexOf(".") + 1) + "." +
f.getName();
}
Modified:
csplugins/trunk/ucsd/mes/anntun/src/main/java/org/example/tunable/internal/props/IntPropHandler.java
===================================================================
---
csplugins/trunk/ucsd/mes/anntun/src/main/java/org/example/tunable/internal/props/IntPropHandler.java
2009-05-28 22:33:14 UTC (rev 16841)
+++
csplugins/trunk/ucsd/mes/anntun/src/main/java/org/example/tunable/internal/props/IntPropHandler.java
2009-05-29 14:01:54 UTC (rev 16842)
@@ -16,7 +16,7 @@
public Properties getProps() {
Properties p = new Properties();
try {
- p.put( propKey,f.get(o).toString() );
+ p.setProperty( propKey,f.get(o).toString() );
} catch (IllegalAccessException iae) {
iae.printStackTrace();
}
@@ -28,7 +28,7 @@
if ( p.containsKey( propKey ) ) {
String val = p.getProperty( propKey );
if ( val != null )
- f.setInt(o, Integer.valueOf(val));
+ f.setInt(o,
Integer.valueOf(Integer.parseInt(val)));
}
} catch (IllegalAccessException iae) {
iae.printStackTrace();
Modified:
csplugins/trunk/ucsd/mes/anntun/src/main/java/org/example/tunable/internal/props/LoadPropsInterceptor.java
===================================================================
---
csplugins/trunk/ucsd/mes/anntun/src/main/java/org/example/tunable/internal/props/LoadPropsInterceptor.java
2009-05-28 22:33:14 UTC (rev 16841)
+++
csplugins/trunk/ucsd/mes/anntun/src/main/java/org/example/tunable/internal/props/LoadPropsInterceptor.java
2009-05-29 14:01:54 UTC (rev 16842)
@@ -1,11 +1,8 @@
package org.example.tunable.internal.props;
-import java.lang.reflect.*;
-import java.lang.annotation.*;
-import java.util.*;
-import java.awt.*;
-import javax.swing.*;
-import java.awt.event.*;
+import java.util.Collection;
+import java.util.Properties;
+
import org.example.tunable.*;
/**
@@ -27,7 +24,7 @@
throw new IllegalArgumentException("Interceptor
does not yet know about this object");
Collection<PropHandler> lh = handlerMap.get(o).values();
-
+
for ( PropHandler p : lh ) {
p.setProps( inputProps );
}
Modified:
csplugins/trunk/ucsd/mes/anntun/src/main/java/org/example/tunable/internal/props/PropHandlerFactory.java
===================================================================
---
csplugins/trunk/ucsd/mes/anntun/src/main/java/org/example/tunable/internal/props/PropHandlerFactory.java
2009-05-28 22:33:14 UTC (rev 16841)
+++
csplugins/trunk/ucsd/mes/anntun/src/main/java/org/example/tunable/internal/props/PropHandlerFactory.java
2009-05-29 14:01:54 UTC (rev 16842)
@@ -4,6 +4,12 @@
import java.lang.reflect.*;
import org.example.tunable.*;
+import org.example.tunable.util.BoundedDouble;
+import org.example.tunable.util.BoundedInteger;
+import org.example.tunable.util.FlexiblyBoundedDouble;
+import org.example.tunable.util.FlexiblyBoundedInteger;
+import org.example.tunable.util.ListMultipleSelection;
+import org.example.tunable.util.ListSingleSelection;
public class PropHandlerFactory implements HandlerFactory<PropHandler> {
@@ -12,11 +18,29 @@
}
public PropHandler getHandler(Field f, Object o, Tunable t) {
- Class type = f.getType();
+ Class<?> type = f.getType();
if ( type == int.class || type == Integer.class )
return new IntPropHandler(f,o,t);
else if ( type == String.class )
return new StringPropHandler(f,o,t);
+
+ //added
+ else if ( type == Boolean.class || type == boolean.class)
+ return new BooleanPropHandler(f,o,t);
+ else if ( type == BoundedDouble.class )
+ return new BoundedPropHandler<BoundedDouble>(f,o,t);
+ else if ( type == BoundedInteger.class )
+ return new BoundedPropHandler<BoundedInteger>(f,o,t);
+ else if( type == FlexiblyBoundedInteger.class)
+ return new
FlexiblyBoundedPropHandler<FlexiblyBoundedInteger>(f,o,t);
+ else if( type == FlexiblyBoundedDouble.class)
+ return new
FlexiblyBoundedPropHandler<FlexiblyBoundedDouble>(f,o,t);
+ else if( type == ListSingleSelection.class) // check needed
+ return new ListSingleSelectionPropHandler(f,o,t);
+ else if( type == ListMultipleSelection.class) // check needed
+ return new ListMultipleSelectionPropHandler(f,o,t);
+
+
else
return null;
}
Modified:
csplugins/trunk/ucsd/mes/anntun/src/main/java/org/example/tunable/internal/props/StorePropsInterceptor.java
===================================================================
---
csplugins/trunk/ucsd/mes/anntun/src/main/java/org/example/tunable/internal/props/StorePropsInterceptor.java
2009-05-28 22:33:14 UTC (rev 16841)
+++
csplugins/trunk/ucsd/mes/anntun/src/main/java/org/example/tunable/internal/props/StorePropsInterceptor.java
2009-05-29 14:01:54 UTC (rev 16842)
@@ -1,11 +1,8 @@
package org.example.tunable.internal.props;
-import java.lang.reflect.*;
-import java.lang.annotation.*;
-import java.util.*;
-import java.awt.*;
-import javax.swing.*;
-import java.awt.event.*;
+import java.util.Collection;
+import java.util.Properties;
+
import org.example.tunable.*;
/**
@@ -27,7 +24,7 @@
throw new IllegalArgumentException("Interceptor
does not yet know about this object");
Collection<PropHandler> lh = handlerMap.get(o).values();
-
+
for ( PropHandler p : lh ) {
inputProps.putAll( p.getProps() );
}
Modified:
csplugins/trunk/ucsd/mes/anntun/src/main/java/org/example/tunable/internal/props/StringPropHandler.java
===================================================================
---
csplugins/trunk/ucsd/mes/anntun/src/main/java/org/example/tunable/internal/props/StringPropHandler.java
2009-05-28 22:33:14 UTC (rev 16841)
+++
csplugins/trunk/ucsd/mes/anntun/src/main/java/org/example/tunable/internal/props/StringPropHandler.java
2009-05-29 14:01:54 UTC (rev 16842)
@@ -1,5 +1,3 @@
-
-
package org.example.tunable.internal.props;
import java.lang.reflect.*;
@@ -17,7 +15,7 @@
public Properties getProps() {
Properties p = new Properties();
try {
- p.put( propKey, (String)f.get(o) );
+ p.setProperty( propKey, f.get(o).toString());
} catch (IllegalAccessException iae) {
iae.printStackTrace();
}
@@ -27,7 +25,7 @@
public void setProps(Properties p) {
try {
if ( p.containsKey( propKey ) ) {
- String val = p.getProperty( propKey );
+ String val = p.getProperty( propKey ).toString();
if ( val != null )
f.set(o, val);
}
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
