Author: mes
Date: 2011-08-31 13:19:38 -0700 (Wed, 31 Aug 2011)
New Revision: 26662
Modified:
csplugins/trunk/ucsd/mes/provenance-tracker-impl/pom.xml
csplugins/trunk/ucsd/mes/provenance-tracker-impl/src/main/java/org/cytoscape/provenance/internal/BasicProvenanceHandler.java
csplugins/trunk/ucsd/mes/provenance-tracker-impl/src/main/java/org/cytoscape/provenance/internal/ProvenanceHandler.java
csplugins/trunk/ucsd/mes/provenance-tracker-impl/src/main/java/org/cytoscape/provenance/internal/ProvenanceHandlerFactory.java
csplugins/trunk/ucsd/mes/provenance-tracker-impl/src/main/java/org/cytoscape/provenance/internal/ProvenanceInterceptor.java
csplugins/trunk/ucsd/mes/provenance-tracker-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
csplugins/trunk/ucsd/mes/provenance-tracker-impl/src/main/resources/META-INF/spring/bundle-context.xml
Log:
fixed to support new Tunable regime
Modified: csplugins/trunk/ucsd/mes/provenance-tracker-impl/pom.xml
===================================================================
--- csplugins/trunk/ucsd/mes/provenance-tracker-impl/pom.xml 2011-08-31
14:48:10 UTC (rev 26661)
+++ csplugins/trunk/ucsd/mes/provenance-tracker-impl/pom.xml 2011-08-31
20:19:38 UTC (rev 26662)
@@ -12,6 +12,7 @@
<properties>
<bundle.symbolicName>org.cytoscape.provenance-tracker-impl</bundle.symbolicName>
<bundle.namespace>org.cytoscape.provenance.internal</bundle.namespace>
+
<cytoscape.api.version>3.0.0-alpha6-SNAPSHOT</cytoscape.api.version>
</properties>
<modelVersion>4.0.0</modelVersion>
@@ -77,13 +78,13 @@
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>work-api</artifactId>
- <version>3.0.0-alpha2</version>
+ <version>${cytoscape.api.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
- <artifactId>work-spring-hack</artifactId>
- <version>3.0.0-alpha1</version>
+ <artifactId>di-util-api</artifactId>
+ <version>${cytoscape.api.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified:
csplugins/trunk/ucsd/mes/provenance-tracker-impl/src/main/java/org/cytoscape/provenance/internal/BasicProvenanceHandler.java
===================================================================
---
csplugins/trunk/ucsd/mes/provenance-tracker-impl/src/main/java/org/cytoscape/provenance/internal/BasicProvenanceHandler.java
2011-08-31 14:48:10 UTC (rev 26661)
+++
csplugins/trunk/ucsd/mes/provenance-tracker-impl/src/main/java/org/cytoscape/provenance/internal/BasicProvenanceHandler.java
2011-08-31 20:19:38 UTC (rev 26662)
@@ -18,7 +18,7 @@
super(getter, setter, instance, tunable);
}
- public void record() {
+ public void handle() {
Object o;
try {
o = getValue();
Modified:
csplugins/trunk/ucsd/mes/provenance-tracker-impl/src/main/java/org/cytoscape/provenance/internal/ProvenanceHandler.java
===================================================================
---
csplugins/trunk/ucsd/mes/provenance-tracker-impl/src/main/java/org/cytoscape/provenance/internal/ProvenanceHandler.java
2011-08-31 14:48:10 UTC (rev 26661)
+++
csplugins/trunk/ucsd/mes/provenance-tracker-impl/src/main/java/org/cytoscape/provenance/internal/ProvenanceHandler.java
2011-08-31 20:19:38 UTC (rev 26662)
@@ -7,5 +7,4 @@
public interface ProvenanceHandler extends TunableHandler {
- public void record();
}
Modified:
csplugins/trunk/ucsd/mes/provenance-tracker-impl/src/main/java/org/cytoscape/provenance/internal/ProvenanceHandlerFactory.java
===================================================================
---
csplugins/trunk/ucsd/mes/provenance-tracker-impl/src/main/java/org/cytoscape/provenance/internal/ProvenanceHandlerFactory.java
2011-08-31 14:48:10 UTC (rev 26661)
+++
csplugins/trunk/ucsd/mes/provenance-tracker-impl/src/main/java/org/cytoscape/provenance/internal/ProvenanceHandlerFactory.java
2011-08-31 20:19:38 UTC (rev 26662)
@@ -13,74 +13,10 @@
public class ProvenanceHandlerFactory implements
TunableHandlerFactory<ProvenanceHandler> {
public ProvenanceHandler getHandler(final Field field, final Object
instance, final Tunable tunable) {
- final Class<?> type = field.getType();
return new BasicProvenanceHandler(field, instance, tunable);
-/*
- if (type == Boolean.class || type == boolean.class)
- return new BooleanPropHandler(field, instance, tunable);
- else if (type == String.class)
- return new StringPropHandler(field, instance, tunable);
- else if ((type == int.class || type == Integer.class))
- return new IntPropHandler(field, instance, tunable);
- else if ((type == float.class || type == Float.class))
- return new FloatPropHandler(field, instance, tunable);
- else if ((type == long.class || type == Long.class))
- return new LongPropHandler(field, instance, tunable);
- else if (type == Double.class || type == double.class)
- return new DoublePropHandler(field, instance, tunable);
- else if (type == BoundedDouble.class)
- return new BoundedPropHandler<BoundedDouble>(field,
instance, tunable);
- else if (type == BoundedInteger.class)
- return new BoundedPropHandler<BoundedInteger>(field,
instance, tunable);
- else if (type == BoundedLong.class)
- return new BoundedPropHandler<BoundedLong>(field,
instance, tunable);
- else if (type == BoundedFloat.class)
- return new BoundedPropHandler<BoundedFloat>(field,
instance, tunable);
- else if (type == ListSingleSelection.class)
- return new ListSinglePropHandler<Object>(field,
instance, tunable);
- else if (type == ListMultipleSelection.class)
- return new ListMultiplePropHandler<Object>(field,
instance, tunable);
- else if (type == File.class)
- return new FilePropHandler(field, instance, tunable);
- else if (type == URL.class)
- return new URLPropHandler(field, instance, tunable);
- return null;
- */
}
public ProvenanceHandler getHandler(final Method getter, final Method
setter, final Object instance, final Tunable tunable) {
- final Class<?> type = getter.getReturnType();
return new BasicProvenanceHandler(getter, setter, instance,
tunable);
-/*
- if (type == Boolean.class || type == boolean.class)
- return new BooleanPropHandler(getter, setter, instance,
tunable);
- else if (type == String.class)
- return new StringPropHandler(getter, setter, instance,
tunable);
- else if ((type == int.class || type == Integer.class))
- return new IntPropHandler(getter, setter, instance,
tunable);
- else if ((type == float.class || type == Float.class))
- return new FloatPropHandler(getter, setter, instance,
tunable);
- else if ((type == long.class || type == Long.class))
- return new LongPropHandler(getter, setter, instance,
tunable);
- else if (type == Double.class || type == double.class)
- return new DoublePropHandler(getter, setter, instance,
tunable);
- else if (type == BoundedDouble.class)
- return new BoundedPropHandler<BoundedDouble>(getter,
setter, instance, tunable);
- else if (type == BoundedInteger.class)
- return new BoundedPropHandler<BoundedInteger>(getter,
setter, instance, tunable);
- else if (type == BoundedLong.class)
- return new BoundedPropHandler<BoundedLong>(getter,
setter, instance, tunable);
- else if (type == BoundedFloat.class)
- return new BoundedPropHandler<BoundedFloat>(getter,
setter, instance, tunable);
- else if (type == ListSingleSelection.class)
- return new ListSinglePropHandler<Object>(getter,
setter, instance, tunable);
- else if (type == ListMultipleSelection.class)
- return new ListMultiplePropHandler<Object>(getter,
setter, instance, tunable);
- else if (type == File.class)
- return new FilePropHandler(getter, setter, instance,
tunable);
- else if (type == URL.class)
- return new URLPropHandler(getter, setter, instance,
tunable);
- return null;
- */
}
}
Modified:
csplugins/trunk/ucsd/mes/provenance-tracker-impl/src/main/java/org/cytoscape/provenance/internal/ProvenanceInterceptor.java
===================================================================
---
csplugins/trunk/ucsd/mes/provenance-tracker-impl/src/main/java/org/cytoscape/provenance/internal/ProvenanceInterceptor.java
2011-08-31 14:48:10 UTC (rev 26661)
+++
csplugins/trunk/ucsd/mes/provenance-tracker-impl/src/main/java/org/cytoscape/provenance/internal/ProvenanceInterceptor.java
2011-08-31 20:19:38 UTC (rev 26662)
@@ -4,17 +4,18 @@
import javax.swing.JPanel;
-import org.cytoscape.work.spring.SpringTunableInterceptor;
+import org.cytoscape.work.AbstractTunableInterceptor;
+import org.cytoscape.di.util.DIUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class ProvenanceInterceptor extends
SpringTunableInterceptor<ProvenanceHandler> {
+public class ProvenanceInterceptor extends
AbstractTunableInterceptor<ProvenanceHandler> {
private static final Logger logger =
LoggerFactory.getLogger(ProvenanceInterceptor.class);
public ProvenanceInterceptor() {
- super(new ProvenanceHandlerFactory());
+ super();
}
public boolean execUI(Object... pobjs) {
@@ -22,7 +23,7 @@
}
public boolean validateAndWriteBackTunables(Object... pobjs) {
- Object[] objs = convertSpringProxyObjs(pobjs);
+ Object[] objs = DIUtil.stripProxies(pobjs);
for (final Object o : objs) {
System.out.println("PROVENANCE: Execute task: " + o);
if ( !handlerMap.containsKey( o ) ) {
@@ -33,7 +34,7 @@
final Collection<ProvenanceHandler> handlers =
handlerMap.get(o).values();
for (final ProvenanceHandler p : handlers)
- p.record();
+ p.handle();
}
return true;
}
Modified:
csplugins/trunk/ucsd/mes/provenance-tracker-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
csplugins/trunk/ucsd/mes/provenance-tracker-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-08-31 14:48:10 UTC (rev 26661)
+++
csplugins/trunk/ucsd/mes/provenance-tracker-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-08-31 20:19:38 UTC (rev 26662)
@@ -12,4 +12,8 @@
ref="provenanceInterceptor"
interface="org.cytoscape.work.TunableInterceptor">
</osgi:service>
+ <osgi:service id="provenanceHandlerFactoryService"
+ ref="provenanceHandlerFactory"
interface="org.cytoscape.work.TunableHandlerFactory">
+ </osgi:service>
+
</beans>
Modified:
csplugins/trunk/ucsd/mes/provenance-tracker-impl/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
csplugins/trunk/ucsd/mes/provenance-tracker-impl/src/main/resources/META-INF/spring/bundle-context.xml
2011-08-31 14:48:10 UTC (rev 26661)
+++
csplugins/trunk/ucsd/mes/provenance-tracker-impl/src/main/resources/META-INF/spring/bundle-context.xml
2011-08-31 20:19:38 UTC (rev 26662)
@@ -25,9 +25,10 @@
<context:annotation-config/>
<bean id="provenanceInterceptor"
class="org.cytoscape.provenance.internal.ProvenanceInterceptor">
- <!--
- <constructor-arg ref="tunableProperties" />
- -->
</bean>
+ <bean id="provenanceHandlerFactory"
class="org.cytoscape.provenance.internal.ProvenanceHandlerFactory">
+ </bean>
+
+
</beans>
--
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.
