Author: jm
Date: 2012-03-20 12:42:06 -0700 (Tue, 20 Mar 2012)
New Revision: 28596

Modified:
   core3/cy3/pom.xml
   
core3/samples/trunk/sample05/src/main/java/org/cytoscape/sample/internal/Sample05TaskFactory.java
   
core3/samples/trunk/sample05a/src/main/java/org/cytoscape/sample/internal/Sample05aTaskFactory.java
   
core3/samples/trunk/sample06/src/main/java/org/cytoscape/sample/internal/Sample06TaskFactory.java
   
core3/samples/trunk/sample07/src/main/java/org/cytoscape/sample/internal/CyActivator.java
   
core3/samples/trunk/sample07/src/main/java/org/cytoscape/sample/internal/Sample07TaskFactory.java
   
core3/samples/trunk/sample09/src/main/java/org/cytoscape/sample/internal/CyActivator.java
   
core3/samples/trunk/sample09/src/main/java/org/cytoscape/sample/internal/Sample09TaskFactory.java
   
core3/samples/trunk/sample10/src/main/java/org/cytoscape/sample/internal/CyActivator.java
   
core3/samples/trunk/sample10/src/main/java/org/cytoscape/sample/internal/Sample10TaskFactory.java
   
core3/samples/trunk/sample11/src/main/java/org/cytoscape/sample/internal/Sample11TaskFactory.java
   
core3/samples/trunk/sample12/src/main/java/org/cytoscape/sample/internal/Sample12TaskFactory.java
   
core3/samples/trunk/sample13/src/main/java/org/cytoscape/sample/internal/Sample13.java
   
core3/samples/trunk/sample13/src/main/java/org/cytoscape/sample/internal/UseWebServiceTaskFactory.java
   
core3/samples/trunk/sample18/src/main/java/org/cytoscape/sample/internal/CyActivator.java
   
core3/samples/trunk/sample18/src/main/java/org/cytoscape/sample/internal/MyLayout.java
   
core3/samples/trunk/sample18/src/main/java/org/cytoscape/sample/internal/MyLayoutTask.java
   
core3/samples/trunk/sample20/src/main/java/org/cytoscape/sample/internal/MyNodeViewTaskFactory.java
   
core3/samples/trunk/sample22/src/main/java/org/cytoscape/sample/internal/Sample22TaskFactory.java
Log:
Fixed compile errors with samples; added samples module to pom.xml


Modified: core3/cy3/pom.xml
===================================================================
--- core3/cy3/pom.xml   2012-03-20 18:58:30 UTC (rev 28595)
+++ core3/cy3/pom.xml   2012-03-20 19:42:06 UTC (rev 28596)
@@ -13,5 +13,6 @@
                <module>impl</module>
                <module>support</module>
                <module>gui-distribution</module>
+               <module>samples</module>
        </modules>
 </project> 

Modified: 
core3/samples/trunk/sample05/src/main/java/org/cytoscape/sample/internal/Sample05TaskFactory.java
===================================================================
--- 
core3/samples/trunk/sample05/src/main/java/org/cytoscape/sample/internal/Sample05TaskFactory.java
   2012-03-20 18:58:30 UTC (rev 28595)
+++ 
core3/samples/trunk/sample05/src/main/java/org/cytoscape/sample/internal/Sample05TaskFactory.java
   2012-03-20 19:42:06 UTC (rev 28596)
@@ -3,10 +3,10 @@
 import org.cytoscape.model.CyNetworkFactory;
 import org.cytoscape.model.CyNetworkManager;
 import org.cytoscape.session.CyNetworkNaming;
-import org.cytoscape.work.TaskFactory;
+import org.cytoscape.work.AbstractTaskFactory;
 import org.cytoscape.work.TaskIterator;
 
-public class Sample05TaskFactory implements TaskFactory {
+public class Sample05TaskFactory extends AbstractTaskFactory {
        private final CyNetworkManager netMgr;
        private final CyNetworkFactory cnf;
        private final CyNetworkNaming namingUtil; 

Modified: 
core3/samples/trunk/sample05a/src/main/java/org/cytoscape/sample/internal/Sample05aTaskFactory.java
===================================================================
--- 
core3/samples/trunk/sample05a/src/main/java/org/cytoscape/sample/internal/Sample05aTaskFactory.java
 2012-03-20 18:58:30 UTC (rev 28595)
+++ 
core3/samples/trunk/sample05a/src/main/java/org/cytoscape/sample/internal/Sample05aTaskFactory.java
 2012-03-20 19:42:06 UTC (rev 28596)
@@ -1,10 +1,10 @@
 package org.cytoscape.sample.internal;
 
 import org.cytoscape.app.CyAppAdapter;
-import org.cytoscape.work.TaskFactory;
+import org.cytoscape.work.AbstractTaskFactory;
 import org.cytoscape.work.TaskIterator;
 
-public class Sample05aTaskFactory implements TaskFactory {
+public class Sample05aTaskFactory extends AbstractTaskFactory {
 
        private CyAppAdapter a;
        public Sample05aTaskFactory(CyAppAdapter a){

Modified: 
core3/samples/trunk/sample06/src/main/java/org/cytoscape/sample/internal/Sample06TaskFactory.java
===================================================================
--- 
core3/samples/trunk/sample06/src/main/java/org/cytoscape/sample/internal/Sample06TaskFactory.java
   2012-03-20 18:58:30 UTC (rev 28595)
+++ 
core3/samples/trunk/sample06/src/main/java/org/cytoscape/sample/internal/Sample06TaskFactory.java
   2012-03-20 19:42:06 UTC (rev 28596)
@@ -5,10 +5,10 @@
 import org.cytoscape.session.CyNetworkNaming;
 import org.cytoscape.view.model.CyNetworkViewFactory;
 import org.cytoscape.view.model.CyNetworkViewManager;
-import org.cytoscape.work.TaskFactory;
+import org.cytoscape.work.AbstractTaskFactory;
 import org.cytoscape.work.TaskIterator;
 
-public class Sample06TaskFactory implements TaskFactory {
+public class Sample06TaskFactory extends AbstractTaskFactory {
 
        private final CyNetworkFactory cnf;
        private final CyNetworkViewFactory cnvf;

Modified: 
core3/samples/trunk/sample07/src/main/java/org/cytoscape/sample/internal/CyActivator.java
===================================================================
--- 
core3/samples/trunk/sample07/src/main/java/org/cytoscape/sample/internal/CyActivator.java
   2012-03-20 18:58:30 UTC (rev 28595)
+++ 
core3/samples/trunk/sample07/src/main/java/org/cytoscape/sample/internal/CyActivator.java
   2012-03-20 19:42:06 UTC (rev 28596)
@@ -1,15 +1,11 @@
 package org.cytoscape.sample.internal;
 
-import org.cytoscape.application.CyApplicationManager;
-
 import org.cytoscape.sample.internal.Sample07TaskFactory;
 
-import org.cytoscape.work.TaskFactory;
-
-
 import org.osgi.framework.BundleContext;
 
 import org.cytoscape.service.util.AbstractCyActivator;
+import org.cytoscape.task.NetworkTaskFactory;
 
 import java.util.Properties;
 
@@ -23,16 +19,14 @@
 
        public void start(BundleContext bc) {
 
-               CyApplicationManager cyApplicationManagerService = 
getService(bc,CyApplicationManager.class);
+               Sample07TaskFactory sample07TaskFactory = new 
Sample07TaskFactory();
                
-               Sample07TaskFactory sample07TaskFactory = new 
Sample07TaskFactory(cyApplicationManagerService);
                
-               
                Properties sample07TaskFactoryProps = new Properties();
                sample07TaskFactoryProps.setProperty("preferredMenu","Apps");
                sample07TaskFactoryProps.setProperty("menuGravity","11.0");
                sample07TaskFactoryProps.setProperty("title","Sample 7");
-               registerService(bc,sample07TaskFactory,TaskFactory.class, 
sample07TaskFactoryProps);
+               
registerService(bc,sample07TaskFactory,NetworkTaskFactory.class, 
sample07TaskFactoryProps);
 
                
 

Modified: 
core3/samples/trunk/sample07/src/main/java/org/cytoscape/sample/internal/Sample07TaskFactory.java
===================================================================
--- 
core3/samples/trunk/sample07/src/main/java/org/cytoscape/sample/internal/Sample07TaskFactory.java
   2012-03-20 18:58:30 UTC (rev 28595)
+++ 
core3/samples/trunk/sample07/src/main/java/org/cytoscape/sample/internal/Sample07TaskFactory.java
   2012-03-20 19:42:06 UTC (rev 28596)
@@ -1,18 +1,12 @@
 package org.cytoscape.sample.internal;
 
-import org.cytoscape.application.CyApplicationManager;
+import org.cytoscape.model.CyNetwork;
 import org.cytoscape.task.AbstractNetworkTaskFactory;
 import org.cytoscape.work.TaskIterator;
 
 public class Sample07TaskFactory extends AbstractNetworkTaskFactory {
 
-       private final CyApplicationManager cyApplicationManagerService;
-       
-       public Sample07TaskFactory(CyApplicationManager 
cyApplicationManagerService){
-               this.cyApplicationManagerService = cyApplicationManagerService;
+       public TaskIterator createTaskIterator(CyNetwork network) {
+               return new TaskIterator(new MyTask(network));
        }
-       
-       public TaskIterator createTaskIterator() {
-               return new TaskIterator(new 
MyTask(this.cyApplicationManagerService.getCurrentNetwork()));
-       }
 }

Modified: 
core3/samples/trunk/sample09/src/main/java/org/cytoscape/sample/internal/CyActivator.java
===================================================================
--- 
core3/samples/trunk/sample09/src/main/java/org/cytoscape/sample/internal/CyActivator.java
   2012-03-20 18:58:30 UTC (rev 28595)
+++ 
core3/samples/trunk/sample09/src/main/java/org/cytoscape/sample/internal/CyActivator.java
   2012-03-20 19:42:06 UTC (rev 28596)
@@ -1,15 +1,12 @@
 package org.cytoscape.sample.internal;
 
-import org.cytoscape.application.CyApplicationManager;
-
 import org.cytoscape.sample.internal.Sample09TaskFactory;
 
-import org.cytoscape.work.TaskFactory;
 
-
 import org.osgi.framework.BundleContext;
 
 import org.cytoscape.service.util.AbstractCyActivator;
+import org.cytoscape.task.NetworkViewTaskFactory;
 
 import java.util.Properties;
 
@@ -23,16 +20,14 @@
 
        public void start(BundleContext bc) {
 
-               CyApplicationManager cyApplicationManagerService = 
getService(bc,CyApplicationManager.class);
+               Sample09TaskFactory sample09TaskFactory = new 
Sample09TaskFactory();
                
-               Sample09TaskFactory sample09TaskFactory = new 
Sample09TaskFactory(cyApplicationManagerService);
                
-               
                Properties sample09TaskFactoryProps = new Properties();
                sample09TaskFactoryProps.setProperty("preferredMenu","Apps");
                sample09TaskFactoryProps.setProperty("menuGravity","16.0");
                sample09TaskFactoryProps.setProperty("title","Sample 9");
-               registerService(bc,sample09TaskFactory,TaskFactory.class, 
sample09TaskFactoryProps);
+               
registerService(bc,sample09TaskFactory,NetworkViewTaskFactory.class, 
sample09TaskFactoryProps);
 
                
 

Modified: 
core3/samples/trunk/sample09/src/main/java/org/cytoscape/sample/internal/Sample09TaskFactory.java
===================================================================
--- 
core3/samples/trunk/sample09/src/main/java/org/cytoscape/sample/internal/Sample09TaskFactory.java
   2012-03-20 18:58:30 UTC (rev 28595)
+++ 
core3/samples/trunk/sample09/src/main/java/org/cytoscape/sample/internal/Sample09TaskFactory.java
   2012-03-20 19:42:06 UTC (rev 28596)
@@ -1,20 +1,12 @@
 package org.cytoscape.sample.internal;
 
-import org.cytoscape.application.CyApplicationManager;
 import org.cytoscape.work.TaskIterator;
 import org.cytoscape.task.AbstractNetworkViewTaskFactory;
 import org.cytoscape.view.model.CyNetworkView;
 
 public class Sample09TaskFactory extends AbstractNetworkViewTaskFactory {
 
-       private final CyApplicationManager appMgr;
-       
-       public Sample09TaskFactory(final CyApplicationManager appMgr){
-               this.appMgr = appMgr;
+       public TaskIterator createTaskIterator(CyNetworkView networkView){
+               return new TaskIterator(new Sample09Task(networkView) );
        }
-       
-       public TaskIterator createTaskIterator(){
-               CyNetworkView currView = appMgr.getCurrentNetworkView();
-               return new TaskIterator(new Sample09Task(currView) );
-       }
 }

Modified: 
core3/samples/trunk/sample10/src/main/java/org/cytoscape/sample/internal/CyActivator.java
===================================================================
--- 
core3/samples/trunk/sample10/src/main/java/org/cytoscape/sample/internal/CyActivator.java
   2012-03-20 18:58:30 UTC (rev 28595)
+++ 
core3/samples/trunk/sample10/src/main/java/org/cytoscape/sample/internal/CyActivator.java
   2012-03-20 19:42:06 UTC (rev 28596)
@@ -1,15 +1,12 @@
 package org.cytoscape.sample.internal;
 
-import org.cytoscape.application.CyApplicationManager;
-
 import org.cytoscape.sample.internal.Sample10TaskFactory;
 
-import org.cytoscape.work.TaskFactory;
 
-
 import org.osgi.framework.BundleContext;
 
 import org.cytoscape.service.util.AbstractCyActivator;
+import org.cytoscape.task.NetworkViewTaskFactory;
 
 import java.util.Properties;
 
@@ -23,16 +20,14 @@
 
        public void start(BundleContext bc) {
 
-               CyApplicationManager cyApplicationManagerService = 
getService(bc,CyApplicationManager.class);
+               Sample10TaskFactory sample10TaskFactory = new 
Sample10TaskFactory();
                
-               Sample10TaskFactory sample10TaskFactory = new 
Sample10TaskFactory(cyApplicationManagerService);
                
-               
                Properties sample10TaskFactoryProps = new Properties();
                sample10TaskFactoryProps.setProperty("preferredMenu","Apps");
                sample10TaskFactoryProps.setProperty("menuGravity","11.0");
                sample10TaskFactoryProps.setProperty("title","Sample 10");
-               registerService(bc,sample10TaskFactory,TaskFactory.class, 
sample10TaskFactoryProps);
+               
registerService(bc,sample10TaskFactory,NetworkViewTaskFactory.class, 
sample10TaskFactoryProps);
 
                
 

Modified: 
core3/samples/trunk/sample10/src/main/java/org/cytoscape/sample/internal/Sample10TaskFactory.java
===================================================================
--- 
core3/samples/trunk/sample10/src/main/java/org/cytoscape/sample/internal/Sample10TaskFactory.java
   2012-03-20 18:58:30 UTC (rev 28595)
+++ 
core3/samples/trunk/sample10/src/main/java/org/cytoscape/sample/internal/Sample10TaskFactory.java
   2012-03-20 19:42:06 UTC (rev 28596)
@@ -1,21 +1,13 @@
 package org.cytoscape.sample.internal;
 
-import org.cytoscape.application.CyApplicationManager;
 import org.cytoscape.task.AbstractNetworkViewTaskFactory;
+import org.cytoscape.view.model.CyNetworkView;
 import org.cytoscape.work.TaskIterator;
 
 
 public class Sample10TaskFactory extends AbstractNetworkViewTaskFactory {
 
-       private CyApplicationManager appMgr;
-       
-       public Sample10TaskFactory(CyApplicationManager appMgr) {
-               this.appMgr = appMgr;
-       }
-       
-       public TaskIterator createTaskIterator() {
-               this.view =  this.appMgr.getCurrentNetworkView();       
-               
-               return new TaskIterator(new ZoomTask(this.view));
+       public TaskIterator createTaskIterator(CyNetworkView networkView) {
+               return new TaskIterator(new ZoomTask(networkView));
        } 
 }

Modified: 
core3/samples/trunk/sample11/src/main/java/org/cytoscape/sample/internal/Sample11TaskFactory.java
===================================================================
--- 
core3/samples/trunk/sample11/src/main/java/org/cytoscape/sample/internal/Sample11TaskFactory.java
   2012-03-20 18:58:30 UTC (rev 28595)
+++ 
core3/samples/trunk/sample11/src/main/java/org/cytoscape/sample/internal/Sample11TaskFactory.java
   2012-03-20 19:42:06 UTC (rev 28596)
@@ -4,10 +4,10 @@
 import org.cytoscape.model.CyNetworkManager;
 import org.cytoscape.model.CyTableFactory;
 import org.cytoscape.model.subnetwork.CyRootNetworkManager;
-import org.cytoscape.work.TaskFactory;
+import org.cytoscape.work.AbstractTaskFactory;
 import org.cytoscape.work.TaskIterator;
 
-public class Sample11TaskFactory implements TaskFactory {
+public class Sample11TaskFactory extends AbstractTaskFactory {
        
        private CyTableFactory tableFactory;
        private CyApplicationManager appMgr;

Modified: 
core3/samples/trunk/sample12/src/main/java/org/cytoscape/sample/internal/Sample12TaskFactory.java
===================================================================
--- 
core3/samples/trunk/sample12/src/main/java/org/cytoscape/sample/internal/Sample12TaskFactory.java
   2012-03-20 18:58:30 UTC (rev 28595)
+++ 
core3/samples/trunk/sample12/src/main/java/org/cytoscape/sample/internal/Sample12TaskFactory.java
   2012-03-20 19:42:06 UTC (rev 28596)
@@ -1,11 +1,10 @@
 package org.cytoscape.sample.internal;
 
 import org.cytoscape.application.CyApplicationManager;
-import org.cytoscape.work.TaskFactory;
+import org.cytoscape.work.AbstractTaskFactory;
 import org.cytoscape.work.TaskIterator;
-import org.cytoscape.model.CyNetwork;
 
-public class Sample12TaskFactory implements TaskFactory {
+public class Sample12TaskFactory extends AbstractTaskFactory {
 
        private CyApplicationManager appMgr;
        

Modified: 
core3/samples/trunk/sample13/src/main/java/org/cytoscape/sample/internal/Sample13.java
===================================================================
--- 
core3/samples/trunk/sample13/src/main/java/org/cytoscape/sample/internal/Sample13.java
      2012-03-20 18:58:30 UTC (rev 28595)
+++ 
core3/samples/trunk/sample13/src/main/java/org/cytoscape/sample/internal/Sample13.java
      2012-03-20 19:42:06 UTC (rev 28596)
@@ -25,7 +25,8 @@
        }
        
        public void doSomethingWithClient() {
-               client.createTaskIterator();
+               String query = "p53";
+               client.createTaskIterator(query);
        }
 
 }

Modified: 
core3/samples/trunk/sample13/src/main/java/org/cytoscape/sample/internal/UseWebServiceTaskFactory.java
===================================================================
--- 
core3/samples/trunk/sample13/src/main/java/org/cytoscape/sample/internal/UseWebServiceTaskFactory.java
      2012-03-20 18:58:30 UTC (rev 28595)
+++ 
core3/samples/trunk/sample13/src/main/java/org/cytoscape/sample/internal/UseWebServiceTaskFactory.java
      2012-03-20 19:42:06 UTC (rev 28596)
@@ -1,9 +1,9 @@
 package org.cytoscape.sample.internal;
 
-import org.cytoscape.work.TaskFactory;
+import org.cytoscape.work.AbstractTaskFactory;
 import org.cytoscape.work.TaskIterator;
 
-public class UseWebServiceTaskFactory implements TaskFactory {
+public class UseWebServiceTaskFactory extends AbstractTaskFactory {
 
        private final WebServiceHelper wsh;
        public UseWebServiceTaskFactory(WebServiceHelper wsh){

Modified: 
core3/samples/trunk/sample18/src/main/java/org/cytoscape/sample/internal/CyActivator.java
===================================================================
--- 
core3/samples/trunk/sample18/src/main/java/org/cytoscape/sample/internal/CyActivator.java
   2012-03-20 18:58:30 UTC (rev 28595)
+++ 
core3/samples/trunk/sample18/src/main/java/org/cytoscape/sample/internal/CyActivator.java
   2012-03-20 19:42:06 UTC (rev 28596)
@@ -1,7 +1,5 @@
 package org.cytoscape.sample.internal;
 
-import org.cytoscape.work.undo.UndoSupport;
-
 import org.cytoscape.sample.internal.MyLayout;
 
 import org.cytoscape.view.layout.CyLayoutAlgorithm;
@@ -23,11 +21,9 @@
 
        public void start(BundleContext bc) {
 
-               UndoSupport undoSupportServiceRef = 
getService(bc,UndoSupport.class);
+               MyLayout myLayout = new MyLayout();
                
-               MyLayout myLayout = new MyLayout(undoSupportServiceRef);
                
-               
                Properties myLayoutProps = new Properties();
                myLayoutProps.setProperty("preferredMenu","My Layouts");
                registerService(bc,myLayout,CyLayoutAlgorithm.class, 
myLayoutProps);

Modified: 
core3/samples/trunk/sample18/src/main/java/org/cytoscape/sample/internal/MyLayout.java
===================================================================
--- 
core3/samples/trunk/sample18/src/main/java/org/cytoscape/sample/internal/MyLayout.java
      2012-03-20 18:58:30 UTC (rev 28595)
+++ 
core3/samples/trunk/sample18/src/main/java/org/cytoscape/sample/internal/MyLayout.java
      2012-03-20 19:42:06 UTC (rev 28596)
@@ -1,42 +1,23 @@
 package org.cytoscape.sample.internal;
 
 import org.cytoscape.view.layout.AbstractLayoutAlgorithm;
-import org.cytoscape.view.layout.CyLayoutAlgorithmManager;
 import org.cytoscape.work.TaskIterator;
-import org.cytoscape.work.Tunable;
-import org.cytoscape.work.TunableValidator;
-import org.cytoscape.work.TunableValidator.ValidationState;
-import org.cytoscape.work.undo.UndoSupport;
 
-public class MyLayout extends AbstractLayoutAlgorithm implements 
TunableValidator {
+public class MyLayout extends AbstractLayoutAlgorithm<MyLayoutContext> {
 
        
-       @Tunable(description="Shift X Range")
-       public int XRange = 100; // Default value
-       @Tunable(description="Shift Y Range")
-       public int YRange= 1000;// Default value
-
        /**
         * Creates a new MyLayout object.
         */
-       public MyLayout(UndoSupport un) {
-               super(un,"computer name","human name",true);
+       public MyLayout() {
+               super("computer name","human name",true);
        }
        
-       public ValidationState getValidationState(final Appendable errMsg) {
-               if (XRange <= 100){
-                       return ValidationState.OK;                      
-               }
-               try {
-                       errMsg.append("Xrange must not exceed 100!");
-               } catch (final Exception e) {
-                       /* Intentionally ignored! */
-               }
-               return ValidationState.INVALID;
+       public TaskIterator createTaskIterator(MyLayoutContext context) {
+               return new TaskIterator(new MyLayoutTask(context, getName()));
        }
 
-       public TaskIterator createTaskIterator() {
-               return new TaskIterator(new MyLayoutTask(networkView, 
getName(), selectedOnly, staticNodes, XRange, YRange));
+       public MyLayoutContext createLayoutContext() {
+               return new MyLayoutContext(supportsSelectedOnly(), 
supportsNodeAttributes(), supportsEdgeAttributes());
        }
-
 }

Modified: 
core3/samples/trunk/sample18/src/main/java/org/cytoscape/sample/internal/MyLayoutTask.java
===================================================================
--- 
core3/samples/trunk/sample18/src/main/java/org/cytoscape/sample/internal/MyLayoutTask.java
  2012-03-20 18:58:30 UTC (rev 28595)
+++ 
core3/samples/trunk/sample18/src/main/java/org/cytoscape/sample/internal/MyLayoutTask.java
  2012-03-20 19:42:06 UTC (rev 28596)
@@ -1,10 +1,7 @@
 package org.cytoscape.sample.internal;
 
-import java.util.Set;
-import org.cytoscape.model.CyNetwork;
 import org.cytoscape.model.CyNode;
 import org.cytoscape.view.layout.AbstractBasicLayoutTask;
-import org.cytoscape.view.model.CyNetworkView;
 import org.cytoscape.view.model.View;
 import org.cytoscape.view.model.VisualProperty;
 import org.cytoscape.view.presentation.property.BasicVisualLexicon;
@@ -16,12 +13,11 @@
        private int XRange;
        private int YRange;
        
-       public MyLayoutTask(final CyNetworkView networkView, final String name,
-                         final boolean selectedOnly, final Set<View<CyNode>> 
staticNodes, int XRange, int YRange){
-               super(networkView, name, selectedOnly, staticNodes);
+       public MyLayoutTask(final MyLayoutContext context, final String name){
+               super(name, context);
        
-               this.XRange = XRange;
-               this.YRange = YRange;
+               this.XRange = context.XRange;
+               this.YRange = context.YRange;
 
        }
        

Modified: 
core3/samples/trunk/sample20/src/main/java/org/cytoscape/sample/internal/MyNodeViewTaskFactory.java
===================================================================
--- 
core3/samples/trunk/sample20/src/main/java/org/cytoscape/sample/internal/MyNodeViewTaskFactory.java
 2012-03-20 18:58:30 UTC (rev 28595)
+++ 
core3/samples/trunk/sample20/src/main/java/org/cytoscape/sample/internal/MyNodeViewTaskFactory.java
 2012-03-20 19:42:06 UTC (rev 28596)
@@ -1,11 +1,14 @@
 package org.cytoscape.sample.internal;
 
+import org.cytoscape.model.CyNode;
 import org.cytoscape.task.AbstractNodeViewTaskFactory;
+import org.cytoscape.view.model.CyNetworkView;
+import org.cytoscape.view.model.View;
 import org.cytoscape.work.TaskIterator;
 
 
 public class MyNodeViewTaskFactory extends AbstractNodeViewTaskFactory {
-       public TaskIterator createTaskIterator() {
+       public TaskIterator createTaskIterator(View<CyNode> nodeView, 
CyNetworkView netView) {
                return new TaskIterator(new MyNodeViewTask(nodeView, netView));
        } 
 }

Modified: 
core3/samples/trunk/sample22/src/main/java/org/cytoscape/sample/internal/Sample22TaskFactory.java
===================================================================
--- 
core3/samples/trunk/sample22/src/main/java/org/cytoscape/sample/internal/Sample22TaskFactory.java
   2012-03-20 18:58:30 UTC (rev 28595)
+++ 
core3/samples/trunk/sample22/src/main/java/org/cytoscape/sample/internal/Sample22TaskFactory.java
   2012-03-20 19:42:06 UTC (rev 28596)
@@ -1,10 +1,10 @@
 package org.cytoscape.sample.internal;
 
-import org.cytoscape.work.TaskFactory;
+import org.cytoscape.work.AbstractTaskFactory;
 import org.cytoscape.work.TaskIterator;
 
 
-public class Sample22TaskFactory implements TaskFactory {
+public class Sample22TaskFactory extends AbstractTaskFactory {
 
        public Sample22TaskFactory(){
                

-- 
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.

Reply via email to