r29027 - in csplugins/trunk/toronto/rodche/cpathsquared-impl/src/main/java/org/cytoscape/cpathsquared/internal: . task

[cytoscape-noreply64]

Author: rodche
Date: 2012-04-26 17:30:45 -0700 (Thu, 26 Apr 2012)
New Revision: 29027

Modified:
   
csplugins/trunk/toronto/rodche/cpathsquared-impl/src/main/java/org/cytoscape/cpathsquared/internal/CPath2CytoscapeWebService.java
   
csplugins/trunk/toronto/rodche/cpathsquared-impl/src/main/java/org/cytoscape/cpathsquared/internal/task/ExecuteGetRecordByCPathIdTask.java
Log:
updated/fixed according to current api snapshots

Modified: 
csplugins/trunk/toronto/rodche/cpathsquared-impl/src/main/java/org/cytoscape/cpathsquared/internal/CPath2CytoscapeWebService.java
===================================================================
--- 
csplugins/trunk/toronto/rodche/cpathsquared-impl/src/main/java/org/cytoscape/cpathsquared/internal/CPath2CytoscapeWebService.java
   2012-04-27 00:29:46 UTC (rev 29026)
+++ 
csplugins/trunk/toronto/rodche/cpathsquared-impl/src/main/java/org/cytoscape/cpathsquared/internal/CPath2CytoscapeWebService.java
   2012-04-27 00:30:45 UTC (rev 29027)
@@ -3,7 +3,6 @@
 import java.awt.BorderLayout;
 import java.awt.Container;
 import java.awt.Dimension;
-import java.util.Set;
 
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
@@ -15,7 +14,6 @@
 import org.cytoscape.io.webservice.NetworkImportWebServiceClient;
 import org.cytoscape.io.webservice.SearchWebServiceClient;
 import org.cytoscape.io.webservice.swing.AbstractWebServiceGUIClient;
-import org.cytoscape.model.CyNetwork;
 import org.cytoscape.work.Task;
 import org.cytoscape.work.TaskIterator;
 import org.slf4j.Logger;
@@ -27,7 +25,7 @@
  * CPath Web Service, integrated into the Cytoscape Web Services Framework.
  */
 public class CPath2CytoscapeWebService extends AbstractWebServiceGUIClient 
-       implements NetworkImportWebServiceClient, SearchWebServiceClient<Object>
+       implements NetworkImportWebServiceClient, SearchWebServiceClient
 {
     private static final Logger LOGGER = 
LoggerFactory.getLogger(CPath2CytoscapeWebService.class);
        
@@ -41,19 +39,8 @@
        return mainPanel;
     }
     
-    @Override
-    public Set<CyNetwork> getNetworks() {
-       // TODO Auto-generated method stub
-       return null;
-    }
     
     @Override
-    public Object getSearchResult() {
-       // TODO Auto-generated method stub
-       return null;
-    }
-    
-    @Override
     public TaskIterator createTaskIterator(Object query) {
                Task task = new CPath2NetworkImportTask((String) query, 
OutputFormat.BINARY_SIF);
        return new TaskIterator(task);

Modified: 
csplugins/trunk/toronto/rodche/cpathsquared-impl/src/main/java/org/cytoscape/cpathsquared/internal/task/ExecuteGetRecordByCPathIdTask.java
===================================================================
--- 
csplugins/trunk/toronto/rodche/cpathsquared-impl/src/main/java/org/cytoscape/cpathsquared/internal/task/ExecuteGetRecordByCPathIdTask.java
  2012-04-27 00:29:46 UTC (rev 29026)
+++ 
csplugins/trunk/toronto/rodche/cpathsquared-impl/src/main/java/org/cytoscape/cpathsquared/internal/task/ExecuteGetRecordByCPathIdTask.java
  2012-04-27 00:30:45 UTC (rev 29027)
@@ -5,9 +5,11 @@
 import java.io.FileWriter;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import javax.swing.SwingUtilities;
 
@@ -38,6 +40,7 @@
 import org.cytoscape.view.layout.CyLayoutAlgorithmManager;
 import org.cytoscape.view.layout.CyLayoutContext;
 import org.cytoscape.view.model.CyNetworkView;
+import org.cytoscape.view.model.View;
 import org.cytoscape.view.vizmap.VisualStyle;
 import org.cytoscape.work.AbstractTask;
 import org.cytoscape.work.Task;
@@ -167,8 +170,8 @@
                        CyLayoutAlgorithmManager layoutManager = 
CPath2Factory.getCyLayoutAlgorithmManager();
                        CyLayoutAlgorithm<CyLayoutContext> layout = 
layoutManager.getDefaultLayout();
                        CyLayoutContext context = layout.createLayoutContext();
-                       context.setNetworkView(view);
-                       
insertTasksAfterCurrentTask(layout.createTaskIterator(context));
+                       Set<View<CyNode>> nodes = Collections.emptySet();
+                       
insertTasksAfterCurrentTask(layout.createTaskIterator(view, context, nodes));
 
                } catch (IOException e) {
                        throw new Exception("Failed to retrieve records.", e);

-- 
You received this message because you are subscribed to the Google Groups 
"cytoscape-cvs" group.
To post to this group, send email to cytoscape-cvs@googlegroups.com.
To unsubscribe from this group, send email to 
cytoscape-cvs+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/cytoscape-cvs?hl=en.