Author: mmichaud
Date: 2009-05-29 07:11:29 -0700 (Fri, 29 May 2009)
New Revision: 16845
Modified:
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/AbstractPropHandler.java
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/BooleanPropHandler.java
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/DoublePropHandler.java
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/FilePropHandler.java
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/FloatPropHandler.java
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/InputStreamPropHandler.java
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/IntPropHandler.java
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/ListMultiplePropHandler.java
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/ListSinglePropHandler.java
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/LoadPropsInterceptor.java
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/LongPropHandler.java
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/PropHandler.java
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/PropHandlerFactory.java
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/StorePropsInterceptor.java
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/StringPropHandler.java
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/URLPropHandler.java
Log:
[]
Modified:
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/AbstractPropHandler.java
===================================================================
---
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/AbstractPropHandler.java
2009-05-29 14:06:59 UTC (rev 16844)
+++
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/AbstractPropHandler.java
2009-05-29 14:11:29 UTC (rev 16845)
@@ -16,7 +16,6 @@
propKey = n.substring( n.lastIndexOf(".") + 1) + "." +
f.getName();
}
- public abstract void add(Properties p);
public abstract Properties getProps();
public abstract void setProps(Properties p);
}
Modified:
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/BooleanPropHandler.java
===================================================================
---
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/BooleanPropHandler.java
2009-05-29 14:06:59 UTC (rev 16844)
+++
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/BooleanPropHandler.java
2009-05-29 14:11:29 UTC (rev 16845)
@@ -12,38 +12,22 @@
}
-
- public Properties getProps() {
+ public Properties getProps(){
Properties p = new Properties();
- try {
- p.put(propKey,f.get(o).toString());
- } catch (IllegalAccessException iae) {
- iae.printStackTrace();
- }
+ try{
+ p.setProperty(propKey,f.get(o).toString());
+ }catch(Exception e){e.printStackTrace();}
return p;
}
-
- public void add(Properties p) {
+
+ public void setProps(Properties p){
try{
- p.put(propKey,f.get(o));
+ if(p.containsKey(propKey)){
+ String val = p.getProperty(propKey).toString();
+ if(val != null) f.set(o,
Boolean.valueOf(Boolean.parseBoolean(val)));
+ }
}catch(Exception e){e.printStackTrace();}
}
-
-
- public void setProps(Properties p) {
- try {
- if (p.containsKey(propKey)) {
- String val = p.get(propKey).toString();
- if (val != null)
- f.set(o,
Boolean.valueOf(Boolean.parseBoolean(val)));
- }
- } catch (IllegalAccessException iae) {
- iae.printStackTrace();
- }
- }
-
-
-
}
Modified:
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/DoublePropHandler.java
===================================================================
---
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/DoublePropHandler.java
2009-05-29 14:06:59 UTC (rev 16844)
+++
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/DoublePropHandler.java
2009-05-29 14:11:29 UTC (rev 16845)
@@ -16,30 +16,18 @@
public Properties getProps() {
Properties p = new Properties();
try {
- p.put(propKey,f.get(o).toString());
- } catch (IllegalAccessException iae) {
- iae.printStackTrace();
- }
+ p.setProperty(propKey,f.get(o).toString());
+ } catch (IllegalAccessException iae) {iae.printStackTrace();}
return p;
}
-
- public void add(Properties p) {
- try{
- p.put(propKey,f.get(o));
- }catch(Exception e){e.printStackTrace();}
- }
-
public void setProps(Properties p) {
try {
if (p.containsKey(propKey)) {
- String val = p.get(propKey).toString();
- if (val != null)
- f.set(o, Double.valueOf(val));
+ String val = p.getProperty(propKey).toString();
+ if (val != null)f.setDouble(o,
Double.valueOf(Double.parseDouble(val)));
}
- } catch (IllegalAccessException iae) {
- iae.printStackTrace();
- }
+ } catch (IllegalAccessException iae) {iae.printStackTrace();}
}
}
Modified:
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/FilePropHandler.java
===================================================================
---
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/FilePropHandler.java
2009-05-29 14:06:59 UTC (rev 16844)
+++
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/FilePropHandler.java
2009-05-29 14:11:29 UTC (rev 16845)
@@ -1,45 +1,31 @@
package org.cytoscape.work.internal.props;
import java.lang.reflect.Field;
-import java.util.List;
import java.util.Properties;
-
import java.io.File;
-
import org.cytoscape.work.Tunable;
public class FilePropHandler extends AbstractPropHandler {
- File file;
- List<String> paths;
-
public FilePropHandler(Field f, Object o, Tunable t) {
super(f,o,t);
- try{
- file = (File) f.get(o);
- }catch(Exception e){e.printStackTrace();}
}
public Properties getProps() {
Properties p = new Properties();
- p.put( propKey, file.getPath());
- return p;
- }
-
- public void add(Properties p) {
try{
- p.put(propKey,file.getAbsolutePath());
+
p.setProperty(propKey,((File)f.get(o)).getPath().toString());
}catch(Exception e){e.printStackTrace();}
+ return p;
}
-
public void setProps(Properties p) {
try {
if ( p.containsKey( propKey ) ) {
- String val = p.getProperty( propKey );
+ String val = p.getProperty(propKey);
if ( val != null )
- f.set(o, val);
+ f.set(o, new File(val.toString()));
}
} catch (IllegalAccessException iae) {iae.printStackTrace();}
}
Modified:
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/FloatPropHandler.java
===================================================================
---
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/FloatPropHandler.java
2009-05-29 14:06:59 UTC (rev 16844)
+++
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/FloatPropHandler.java
2009-05-29 14:11:29 UTC (rev 16845)
@@ -16,30 +16,19 @@
public Properties getProps() {
Properties p = new Properties();
try {
- p.put(propKey,f.get(o).toString());
- } catch (IllegalAccessException iae) {
- iae.printStackTrace();
- }
+ p.setProperty(propKey,f.get(o).toString());
+ } catch (IllegalAccessException iae) {iae.printStackTrace();}
return p;
}
-
- public void add(Properties p) {
- try{
- p.put(propKey,f.get(o));
- }catch(Exception e){e.printStackTrace();}
- }
-
public void setProps(Properties p) {
try {
if (p.containsKey(propKey)) {
- String val = p.get(propKey).toString();
+ String val = p.getProperty(propKey).toString();
if (val != null)
- f.set(o, Float.valueOf(val));
+ f.setFloat(o,
Float.valueOf(Float.parseFloat(val)));
}
- } catch (IllegalAccessException iae) {
- iae.printStackTrace();
- }
+ } catch (IllegalAccessException iae) {iae.printStackTrace();}
}
}
Modified:
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/InputStreamPropHandler.java
===================================================================
---
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/InputStreamPropHandler.java
2009-05-29 14:06:59 UTC (rev 16844)
+++
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/InputStreamPropHandler.java
2009-05-29 14:11:29 UTC (rev 16845)
@@ -1,7 +1,6 @@
package org.cytoscape.work.internal.props;
import java.lang.reflect.Field;
-import java.util.List;
import java.util.Properties;
import java.io.InputStream;
@@ -9,39 +8,24 @@
public class InputStreamPropHandler extends AbstractPropHandler {
-
- InputStream str;
- List<String> paths;
- String path;
-
public InputStreamPropHandler(Field f, Object o, Tunable t) {
super(f,o,t);
- try{
- str = (InputStream) f.get(o);
- }catch(Exception e){e.printStackTrace();}
}
public Properties getProps() {
Properties p = new Properties();
- p.put( propKey,str);
+ try{
+ p.setProperty(propKey,
((InputStream)f.get(o)).toString());
+ }catch(Exception e){e.printStackTrace();}
return p;
}
-
- public void add(Properties p) {
- if(str!=null){
- p.put(propKey,str);
- }
- else {
- p.put(propKey,"");
- }
- }
public void setProps(Properties p) {
try {
- if ( p.containsKey( propKey ) ) {
- String val = p.getProperty( propKey );
+ if ( p.containsKey(propKey) ) {
+ String val = p.getProperty(propKey);
if ( val != null )
f.set(o, val);
}
Modified:
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/IntPropHandler.java
===================================================================
---
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/IntPropHandler.java
2009-05-29 14:06:59 UTC (rev 16844)
+++
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/IntPropHandler.java
2009-05-29 14:11:29 UTC (rev 16845)
@@ -15,30 +15,17 @@
public Properties getProps() {
Properties p = new Properties();
try {
- p.put(propKey,f.get(o).toString());
- } catch (IllegalAccessException iae) {
- iae.printStackTrace();
- }
+ p.setProperty(propKey,f.get(o).toString());
+ } catch (IllegalAccessException iae) {iae.printStackTrace();}
return p;
}
-
- public void add(Properties p) {
- try{
- p.put(propKey,f.get(o));
- }catch(Exception e){e.printStackTrace();}
- }
-
-
public void setProps(Properties p) {
try {
if (p.containsKey(propKey)) {
- String val = p.get(propKey).toString();
- if (val != null)
- f.set(o, Integer.valueOf(val));
+ String val = p.getProperty(propKey).toString();
+ if (val != null)f.setInt(o,
Integer.valueOf(Integer.parseInt(val)));
}
- } catch (IllegalAccessException iae) {
- iae.printStackTrace();
- }
+ } catch (IllegalAccessException iae) {iae.printStackTrace();}
}
}
Modified:
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/ListMultiplePropHandler.java
===================================================================
---
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/ListMultiplePropHandler.java
2009-05-29 14:06:59 UTC (rev 16844)
+++
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/ListMultiplePropHandler.java
2009-05-29 14:11:29 UTC (rev 16845)
@@ -7,49 +7,33 @@
import org.cytoscape.work.util.ListMultipleSelection;
-public class ListMultiplePropHandler extends AbstractPropHandler {
-
- ListMultipleSelection LMS;
- List array;
-
-
- @SuppressWarnings("unchecked")
+public class ListMultiplePropHandler<T> extends AbstractPropHandler {
+
public ListMultiplePropHandler(Field f, Object o, Tunable t) {
super(f,o,t);
- try{
- LMS = (ListMultipleSelection) f.get(o);
- }catch(Exception e){e.printStackTrace();}
}
public Properties getProps() {
Properties p = new Properties();
- p.put(propKey,(Object)((ListMultipleSelection)
LMS).getSelectedValues());
+ try{
+
p.setProperty(propKey,((ListMultipleSelection<T>)f.get(o)).getSelectedValues().toString());
+ }catch (Exception e){e.printStackTrace();}
return p;
}
-
- @SuppressWarnings("unchecked")
- public void add(Properties p) {
- array = new ArrayList();
- array.add(0, "");
- ((ListMultipleSelection) LMS).setSelectedValues(array);
- p.put(propKey,((ListMultipleSelection)
LMS).getSelectedValues());
- }
-
-
- @SuppressWarnings("unchecked")
+
public void setProps(Properties p) {
- try {
- if (p.containsKey(propKey)) {
- Object val = p.get(propKey);
- if (val != null){
- ((ListMultipleSelection)
LMS).setSelectedValues((List) val);
- f.set(o, LMS);
+ try{
+ if(p.containsKey(propKey)){
+ ListMultipleSelection<T> lms =
(ListMultipleSelection<T>) f.get(o);
+ T[] tab =
(T[])p.getProperty(propKey).split(",");
+ if(tab != null){
+
lms.setSelectedValues(Arrays.asList(tab));
+ f.set(o, lms);
}
}
- } catch (IllegalAccessException iae) {
- iae.printStackTrace();}
+ }catch(Exception e){e.printStackTrace();}
}
}
Modified:
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/ListSinglePropHandler.java
===================================================================
---
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/ListSinglePropHandler.java
2009-05-29 14:06:59 UTC (rev 16844)
+++
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/ListSinglePropHandler.java
2009-05-29 14:11:29 UTC (rev 16845)
@@ -6,54 +6,31 @@
import org.cytoscape.work.Tunable;
import org.cytoscape.work.util.ListSingleSelection;
-
-public class ListSinglePropHandler extends AbstractPropHandler {
+public class ListSinglePropHandler<T> extends AbstractPropHandler {
- ListSingleSelection LSS;
-
-
- @SuppressWarnings("unchecked")
public ListSinglePropHandler(Field f, Object o, Tunable t) {
super(f,o,t);
- try{
- LSS = (ListSingleSelection) f.get(o);
- }catch(Exception e){e.printStackTrace();}
-
}
-
public Properties getProps() {
Properties p = new Properties();
- p.put(propKey,LSS.getSelectedValue());
+ try{
+
p.setProperty(propKey,((ListSingleSelection<T>)f.get(o)).getSelectedValue().toString());
+ }catch(Exception e){e.printStackTrace();}
return p;
}
-
- @SuppressWarnings("unchecked")
- public void add(Properties p) {
- LSS.setSelectedValue( "");
-// if(LSS.getSelectedValue()==null)
- p.put(propKey,LSS.getSelectedValue());
-// else{
-// try{
-// p.put(propKey,LSS.getSelectedValue());
-// }catch(Exception e){e.printStackTrace();}
-// }
- }
-
- @SuppressWarnings("unchecked")
public void setProps(Properties p) {
- try {
- if (p.containsKey(propKey)) {
- String val = p.get(propKey).toString();
- if (val != null){
- LSS.setSelectedValue( val);
- f.set(o, LSS);
+ try{
+ if(p.containsKey(propKey)){
+ ListSingleSelection<T> lss =
(ListSingleSelection<T>) f.get(o);
+ T val = (T) p.getProperty(propKey).toString();
+ if(val != null) {
+ lss.setSelectedValue(val);
+ f.set(o, lss);
}
}
- } catch (IllegalAccessException iae) {
- iae.printStackTrace();
- }
+ }catch(Exception e){e.printStackTrace();}
}
}
Modified:
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/LoadPropsInterceptor.java
===================================================================
---
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/LoadPropsInterceptor.java
2009-05-29 14:06:59 UTC (rev 16844)
+++
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/LoadPropsInterceptor.java
2009-05-29 14:11:29 UTC (rev 16845)
@@ -15,17 +15,21 @@
public boolean createUI(Object... pobjs) {
Object[] objs = convertSpringProxyObjs(pobjs);
-
- java.util.List<PropHandler> lh = new ArrayList<PropHandler>();
+ //java.util.List<PropHandler> lh = new ArrayList<PropHandler>();
for ( Object o : objs ) {
if ( !handlerMap.containsKey( o ) )
throw new IllegalArgumentException("No Tunables
exist for Object yet!");
- lh.addAll( handlerMap.get(o).values() );
+ Collection<PropHandler> lh = handlerMap.get(o).values();
+
+ for ( PropHandler p : lh ) {
+ p.setProps( inputProps );
+ }
+// lh.addAll( handlerMap.get(o).values() );
}
- for (PropHandler p : lh) {
- p.add(inputProps);
- }
+// for (PropHandler p : lh) {
+// p.add(inputProps);
+// }
return true;
}
Modified:
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/LongPropHandler.java
===================================================================
---
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/LongPropHandler.java
2009-05-29 14:06:59 UTC (rev 16844)
+++
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/LongPropHandler.java
2009-05-29 14:11:29 UTC (rev 16845)
@@ -11,35 +11,23 @@
public LongPropHandler(Field f, Object o, Tunable t) {
super(f,o,t);
}
-
public Properties getProps() {
Properties p = new Properties();
try {
- p.put(propKey,f.get(o).toString());
- } catch (IllegalAccessException iae) {
- iae.printStackTrace();
- }
+ p.setProperty(propKey,f.get(o).toString());
+ } catch (IllegalAccessException iae) {iae.printStackTrace();}
return p;
}
-
- public void add(Properties p) {
- try{
- p.put(propKey,f.get(o));
- }catch(Exception e){e.printStackTrace();}
- }
-
public void setProps(Properties p) {
try {
if (p.containsKey(propKey)) {
- String val = p.get(propKey).toString();
+ String val = p.getProperty(propKey).toString();
if (val != null)
- f.set(o, Long.valueOf(val));
+ f.setLong(o,
Long.valueOf(Long.parseLong(val)));
}
- } catch (IllegalAccessException iae) {
- iae.printStackTrace();
- }
+ } catch (IllegalAccessException iae) {iae.printStackTrace();}
}
}
Modified:
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/PropHandler.java
===================================================================
---
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/PropHandler.java
2009-05-29 14:06:59 UTC (rev 16844)
+++
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/PropHandler.java
2009-05-29 14:11:29 UTC (rev 16845)
@@ -7,5 +7,4 @@
public interface PropHandler extends Handler {
public void setProps(Properties p);
public Properties getProps();
- public void add(Properties p);
}
Modified:
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/PropHandlerFactory.java
===================================================================
---
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/PropHandlerFactory.java
2009-05-29 14:06:59 UTC (rev 16844)
+++
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/PropHandlerFactory.java
2009-05-29 14:11:29 UTC (rev 16845)
@@ -16,30 +16,44 @@
Class<?> type = f.getType();
- if ((type == int.class || type == Integer.class))
+ if(type == Boolean.class || type == boolean.class)
+ return new BooleanPropHandler(f,o,t);
+ else if (type == String.class)
+ return new StringPropHandler(f, o, t);
+
+ else if ((type == int.class || type == Integer.class))
return new IntPropHandler(f, o, t);
else if ((type == float.class || type == Float.class))
return new FloatPropHandler(f, o, t);
else if ((type == long.class || type == Long.class))
return new LongPropHandler(f, o, t);
+ else if(type == Double.class || type == double.class)
+ return new DoublePropHandler(f,o,t);
+
else if(type == BoundedDouble.class)
- return new BoundedDoublePropHandler(f,o,t);
+ return new BoundedPropHandler<BoundedDouble>(f,o,t);
else if(type == BoundedInteger.class)
- return new BoundedIntegerPropHandler(f,o,t);
+ return new BoundedPropHandler<BoundedInteger>(f,o,t);
else if(type == BoundedLong.class)
- return new BoundedLongPropHandler(f,o,t);
+ return new BoundedPropHandler<BoundedLong>(f,o,t);
else if(type == BoundedFloat.class)
- return new BoundedFloatPropHandler(f,o,t);
- else if(type == Double.class || type == double.class)
- return new DoublePropHandler(f,o,t);
- else if (type == String.class)
- return new StringPropHandler(f, o, t);
- else if(type == Boolean.class || type == boolean.class)
- return new BooleanPropHandler(f,o,t);
+ return new BoundedPropHandler<BoundedFloat>(f,o,t);
+
+ else if(type == FlexiblyBoundedDouble.class)
+ return new
FlexiblyBoundedPropHandler<FlexiblyBoundedDouble>(f,o,t);
+ else if(type == FlexiblyBoundedInteger.class)
+ return new
FlexiblyBoundedPropHandler<FlexiblyBoundedInteger>(f,o,t);
+ else if(type == FlexiblyBoundedLong.class)
+ return new
FlexiblyBoundedPropHandler<FlexiblyBoundedLong>(f,o,t);
+ else if(type == FlexiblyBoundedFloat.class)
+ return new
FlexiblyBoundedPropHandler<FlexiblyBoundedFloat>(f,o,t);
+
+
else if (type == ListSingleSelection.class)
return new ListSinglePropHandler(f,o,t);
else if (type == ListMultipleSelection.class)
return new ListMultiplePropHandler(f,o,t);
+
else if (type == File.class)
return new FilePropHandler(f,o,t);
else if(type == URL.class)
Modified:
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/StorePropsInterceptor.java
===================================================================
---
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/StorePropsInterceptor.java
2009-05-29 14:06:59 UTC (rev 16844)
+++
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/StorePropsInterceptor.java
2009-05-29 14:11:29 UTC (rev 16845)
@@ -5,6 +5,7 @@
import org.cytoscape.work.spring.SpringTunableInterceptor;
+
public class StorePropsInterceptor extends
SpringTunableInterceptor<PropHandler> {
private Properties inputProps;
@@ -15,16 +16,20 @@
public boolean createUI(Object... pobjs) {
Object[] objs = convertSpringProxyObjs(pobjs);
-
- java.util.List<PropHandler> lh = new ArrayList<PropHandler>();
for ( Object o : objs ) {
if ( !handlerMap.containsKey( o ) )
throw new IllegalArgumentException("No Tunables
exist for Object yet!");
- lh.addAll( handlerMap.get(o).values() );
+
+ Collection<PropHandler> lh = handlerMap.get(o).values();
+
+ for ( PropHandler p : lh ) {
+ inputProps.putAll( p.getProps() );
+ }
+// lh.addAll( handlerMap.get(o).values() );
}
- for (PropHandler p : lh) {
- inputProps.putAll(p.getProps());
- }
+// for (PropHandler p : lh) {
+// inputProps.putAll(p.getProps());
+// }
return true;
}
Modified:
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/StringPropHandler.java
===================================================================
---
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/StringPropHandler.java
2009-05-29 14:06:59 UTC (rev 16844)
+++
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/StringPropHandler.java
2009-05-29 14:11:29 UTC (rev 16845)
@@ -15,29 +15,19 @@
public Properties getProps() {
Properties p = new Properties();
try {
- p.put( propKey, (String)f.get(o) );
- } catch (IllegalAccessException iae) {
- iae.printStackTrace();
- }
+ p.setProperty( propKey,f.get(o).toString());
+ }catch(IllegalAccessException iae) {iae.printStackTrace();}
return p;
}
-
- public void add(Properties p) {
- try{
- p.put(propKey,f.get(o));
- }catch(Exception e){e.printStackTrace();}
- }
-
+
public void setProps(Properties p) {
try {
- if ( p.containsKey( propKey ) ) {
- String val = p.getProperty( propKey );
- if ( val != null )
- f.set(o, val);
- }
- } catch (IllegalAccessException iae) {
- iae.printStackTrace();
- }
+ if ( p.containsKey( propKey ) ) {
+ String val = p.getProperty(propKey).toString();
+ if ( val != null )
+ f.set(o, val);
+ }
+ }catch(IllegalAccessException iae) {iae.printStackTrace();}
}
}
Modified:
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/URLPropHandler.java
===================================================================
---
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/URLPropHandler.java
2009-05-29 14:06:59 UTC (rev 16844)
+++
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/URLPropHandler.java
2009-05-29 14:11:29 UTC (rev 16845)
@@ -1,45 +1,39 @@
package org.cytoscape.work.internal.props;
import java.lang.reflect.*;
+import java.net.MalformedURLException;
import java.net.URL;
import java.util.*;
-import java.io.File;
import org.cytoscape.work.Tunable;
public class URLPropHandler extends AbstractPropHandler {
- URL url;
-
public URLPropHandler(Field f, Object o, Tunable t) {
super(f,o,t);
- try{
- url = (URL) f.get(o);
- }catch(Exception e){e.printStackTrace();}
}
public Properties getProps() {
Properties p = new Properties();
- p.put( propKey, url.toString());
+ try{
+ p.setProperty(propKey, f.get(o).toString());
+ }catch(IllegalAccessException iae){iae.printStackTrace();}
return p;
}
- public void add(Properties p) {
- try{
- p.put(propKey,url.toString());
- }catch(Exception e){e.printStackTrace();}
- }
-
-
+
public void setProps(Properties p) {
try {
- if ( p.containsKey( propKey ) ) {
- String val = p.getProperty( propKey );
- if ( val != null )
- f.set(o, val);
- }
- } catch (IllegalAccessException iae) {
- iae.printStackTrace();
- }
+ if ( p.containsKey( propKey ) ) {
+ URL url = (URL)f.get(o);
+ String val = p.getProperty(propKey);
+ if ( val != null ){
+ try {
+ url = new URL(val);
+ f.set(o, url);
+ } catch (MalformedURLException
mue){mue.printStackTrace();}
+ }
+ }
+ } catch (IllegalAccessException iae) {iae.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
-~----------~----~----~----~------~----~------~--~---
