Author: mes
Date: 2011-01-21 14:29:09 -0800 (Fri, 21 Jan 2011)
New Revision: 23555
Modified:
core3/task-testing-impl/trunk/src/main/java/org/cytoscape/internal/test/InfiniteTask.java
core3/task-testing-impl/trunk/src/main/java/org/cytoscape/internal/test/InfiniteTaskFactory.java
core3/task-testing-impl/trunk/src/main/java/org/cytoscape/internal/test/tunables/TunablesTestTask.java
core3/task-testing-impl/trunk/src/main/java/org/cytoscape/internal/test/tunables/TunablesTestTask2.java
core3/task-testing-impl/trunk/src/main/java/org/cytoscape/internal/test/tunables/TunablesTestTask3.java
core3/task-testing-impl/trunk/src/main/java/org/cytoscape/internal/test/tunables/TunablesTestTaskFactory.java
core3/task-testing-impl/trunk/src/main/java/org/cytoscape/internal/test/tunables/TunablesTestTaskFactory2.java
core3/task-testing-impl/trunk/src/main/java/org/cytoscape/internal/test/tunables/TunablesTestTaskFactory3.java
core3/task-testing-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
core3/task-testing-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
Log:
moved tasks in here from other bundles
Modified:
core3/task-testing-impl/trunk/src/main/java/org/cytoscape/internal/test/InfiniteTask.java
===================================================================
---
core3/task-testing-impl/trunk/src/main/java/org/cytoscape/internal/test/InfiniteTask.java
2011-01-21 21:59:09 UTC (rev 23554)
+++
core3/task-testing-impl/trunk/src/main/java/org/cytoscape/internal/test/InfiniteTask.java
2011-01-21 22:29:09 UTC (rev 23555)
@@ -1,5 +1,5 @@
-package org.cytoscape.task.internal.tests;
+package org.cytoscape.internal.test;
import org.cytoscape.work.AbstractTask;
Modified:
core3/task-testing-impl/trunk/src/main/java/org/cytoscape/internal/test/InfiniteTaskFactory.java
===================================================================
---
core3/task-testing-impl/trunk/src/main/java/org/cytoscape/internal/test/InfiniteTaskFactory.java
2011-01-21 21:59:09 UTC (rev 23554)
+++
core3/task-testing-impl/trunk/src/main/java/org/cytoscape/internal/test/InfiniteTaskFactory.java
2011-01-21 22:29:09 UTC (rev 23555)
@@ -1,5 +1,5 @@
-package org.cytoscape.task.internal.tests;
+package org.cytoscape.internal.test;
import org.cytoscape.work.TaskIterator;
import org.cytoscape.work.TaskFactory;
Modified:
core3/task-testing-impl/trunk/src/main/java/org/cytoscape/internal/test/tunables/TunablesTestTask.java
===================================================================
---
core3/task-testing-impl/trunk/src/main/java/org/cytoscape/internal/test/tunables/TunablesTestTask.java
2011-01-21 21:59:09 UTC (rev 23554)
+++
core3/task-testing-impl/trunk/src/main/java/org/cytoscape/internal/test/tunables/TunablesTestTask.java
2011-01-21 22:29:09 UTC (rev 23555)
@@ -27,7 +27,7 @@
along with this library; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.cytoscape.task.internal.tests.tunables;
+package org.cytoscape.internal.test.tunables;
import java.io.File;
Modified:
core3/task-testing-impl/trunk/src/main/java/org/cytoscape/internal/test/tunables/TunablesTestTask2.java
===================================================================
---
core3/task-testing-impl/trunk/src/main/java/org/cytoscape/internal/test/tunables/TunablesTestTask2.java
2011-01-21 21:59:09 UTC (rev 23554)
+++
core3/task-testing-impl/trunk/src/main/java/org/cytoscape/internal/test/tunables/TunablesTestTask2.java
2011-01-21 22:29:09 UTC (rev 23555)
@@ -27,7 +27,7 @@
along with this library; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.cytoscape.task.internal.tests.tunables;
+package org.cytoscape.internal.test.tunables;
import java.io.File;
Modified:
core3/task-testing-impl/trunk/src/main/java/org/cytoscape/internal/test/tunables/TunablesTestTask3.java
===================================================================
---
core3/task-testing-impl/trunk/src/main/java/org/cytoscape/internal/test/tunables/TunablesTestTask3.java
2011-01-21 21:59:09 UTC (rev 23554)
+++
core3/task-testing-impl/trunk/src/main/java/org/cytoscape/internal/test/tunables/TunablesTestTask3.java
2011-01-21 22:29:09 UTC (rev 23555)
@@ -27,7 +27,7 @@
along with this library; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.cytoscape.task.internal.tests.tunables;
+package org.cytoscape.internal.test.tunables;
import java.io.File;
Modified:
core3/task-testing-impl/trunk/src/main/java/org/cytoscape/internal/test/tunables/TunablesTestTaskFactory.java
===================================================================
---
core3/task-testing-impl/trunk/src/main/java/org/cytoscape/internal/test/tunables/TunablesTestTaskFactory.java
2011-01-21 21:59:09 UTC (rev 23554)
+++
core3/task-testing-impl/trunk/src/main/java/org/cytoscape/internal/test/tunables/TunablesTestTaskFactory.java
2011-01-21 22:29:09 UTC (rev 23555)
@@ -27,7 +27,7 @@
along with this library; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.cytoscape.task.internal.tests.tunables;
+package org.cytoscape.internal.test.tunables;
import org.cytoscape.work.TaskFactory;
Modified:
core3/task-testing-impl/trunk/src/main/java/org/cytoscape/internal/test/tunables/TunablesTestTaskFactory2.java
===================================================================
---
core3/task-testing-impl/trunk/src/main/java/org/cytoscape/internal/test/tunables/TunablesTestTaskFactory2.java
2011-01-21 21:59:09 UTC (rev 23554)
+++
core3/task-testing-impl/trunk/src/main/java/org/cytoscape/internal/test/tunables/TunablesTestTaskFactory2.java
2011-01-21 22:29:09 UTC (rev 23555)
@@ -27,7 +27,7 @@
along with this library; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.cytoscape.task.internal.tests.tunables;
+package org.cytoscape.internal.test.tunables;
import java.io.File;
Modified:
core3/task-testing-impl/trunk/src/main/java/org/cytoscape/internal/test/tunables/TunablesTestTaskFactory3.java
===================================================================
---
core3/task-testing-impl/trunk/src/main/java/org/cytoscape/internal/test/tunables/TunablesTestTaskFactory3.java
2011-01-21 21:59:09 UTC (rev 23554)
+++
core3/task-testing-impl/trunk/src/main/java/org/cytoscape/internal/test/tunables/TunablesTestTaskFactory3.java
2011-01-21 22:29:09 UTC (rev 23555)
@@ -27,7 +27,7 @@
along with this library; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.cytoscape.task.internal.tests.tunables;
+package org.cytoscape.internal.test.tunables;
import org.cytoscape.work.TaskFactory;
Modified:
core3/task-testing-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/task-testing-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-01-21 21:59:09 UTC (rev 23554)
+++
core3/task-testing-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-01-21 22:29:09 UTC (rev 23555)
@@ -21,4 +21,39 @@
interface="org.cytoscape.application.swing.CyAction" />
<osgi:service id="multiTunableActionService" ref="multiTunableAction"
interface="org.cytoscape.application.swing.CyAction" />
+
+ <osgi:service id="tunablesTestTaskFactoryService"
ref="tunablesTestTaskFactory"
+ interface="org.cytoscape.work.TaskFactory">
+ <osgi:service-properties>
+ <entry key="title" value="Tunable Task Test..." />
+ <entry key="preferredMenu" value="Help" />
+ </osgi:service-properties>
+ </osgi:service>
+
+ <osgi:service id="tunablesTestTaskFactoryService2"
ref="tunablesTestTaskFactory2"
+ interface="org.cytoscape.work.TaskFactory">
+ <osgi:service-properties>
+ <entry key="title" value="Tunable Factory Test..." />
+ <entry key="preferredMenu" value="Help" />
+ <entry key="cytoPanelComponentTitle" value="Tunable Factory Test"
/>
+ </osgi:service-properties>
+ </osgi:service>
+
+ <osgi:service id="tunablesTestTaskFactoryService3"
ref="tunablesTestTaskFactory3"
+ interface="org.cytoscape.work.TaskFactory">
+ <osgi:service-properties>
+ <entry key="title" value="Complex Tunable Test..." />
+ <entry key="preferredMenu" value="Help" />
+ <entry key="cytoPanelComponentTitle" value="Complex Tunable Test"
/>
+ </osgi:service-properties>
+ </osgi:service>
+
+ <osgi:service id="infiniteTaskFactoryService" ref="infiniteTaskFactory"
+ interface="org.cytoscape.work.TaskFactory">
+ <osgi:service-properties>
+ <entry key="title" value="Infinite Test..." />
+ <entry key="preferredMenu" value="Help" />
+ </osgi:service-properties>
+ </osgi:service>
+
</beans>
Modified:
core3/task-testing-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/task-testing-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2011-01-21 21:59:09 UTC (rev 23554)
+++
core3/task-testing-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2011-01-21 22:29:09 UTC (rev 23555)
@@ -25,17 +25,33 @@
<bean id="waitAction" class="org.cytoscape.internal.test.WaitAction">
<constructor-arg ref="cyApplicationManagerServiceRef" />
- <constructor-arg ref="guiTaskManagerServiceRef" />
+ <constructor-arg ref="taskManagerServiceRef" />
</bean>
<bean id="waitValueAction"
class="org.cytoscape.internal.test.WaitValueAction">
<constructor-arg ref="cyApplicationManagerServiceRef" />
- <constructor-arg ref="guiTaskManagerServiceRef" />
+ <constructor-arg ref="taskManagerServiceRef" />
</bean>
<bean id="multiTunableAction"
class="org.cytoscape.internal.test.MultiTunableAction">
<constructor-arg ref="cyApplicationManagerServiceRef" />
- <constructor-arg ref="guiTaskManagerServiceRef" />
+ <constructor-arg ref="taskManagerServiceRef" />
</bean>
+ <bean id="tunablesTestTaskFactory"
+ class="org.cytoscape.internal.test.tunables.TunablesTestTaskFactory">
+ </bean>
+
+ <bean id="tunablesTestTaskFactory2"
+
class="org.cytoscape.internal.test.tunables.TunablesTestTaskFactory2">
+ </bean>
+
+ <bean id="tunablesTestTaskFactory3"
+
class="org.cytoscape.internal.test.tunables.TunablesTestTaskFactory3">
+ </bean>
+
+ <bean id="infiniteTaskFactory"
+ class="org.cytoscape.internal.test.InfiniteTaskFactory">
+ </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.
