Author: Srinivasarao
Date: 2009-08-14 01:15:20 -0700 (Fri, 14 Aug 2009)
New Revision: 17817
Added:
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/filter/
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/filter/EdgeInteractionFilter.java
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/filter/NodeInteractionFilter.java
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/filter/TopologyFilter.java
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/filter/TopologyPanel.java
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/tasks/
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/tasks/HideUtils.java
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/tasks/IndexAndSearchTaskImpl.java
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/tasks/SelectUtils.java
csplugins/trunk/soc/srinivasarao/search-ui/src/test/java/org/
csplugins/trunk/soc/srinivasarao/search-ui/src/test/java/org/cytoscape/
csplugins/trunk/soc/srinivasarao/search-ui/src/test/java/org/cytoscape/search/
csplugins/trunk/soc/srinivasarao/search-ui/src/test/java/org/cytoscape/search/internal/
Removed:
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/IndexAndSearchTaskImpl.java
csplugins/trunk/soc/srinivasarao/search-ui/src/main/test/org/cytoscape/search/internal/
Modified:
csplugins/trunk/soc/srinivasarao/search-ui/osgi.bnd
csplugins/trunk/soc/srinivasarao/search-ui/pom.xml
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/MainPanel.java
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/SearchPanel.java
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/SearchPanelImpl.java
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/SearchPluginImpl.java
csplugins/trunk/soc/srinivasarao/search-ui/src/main/resources/META-INF/spring/bundle-context-osgi.xml
csplugins/trunk/soc/srinivasarao/search-ui/src/main/resources/META-INF/spring/bundle-context.xml
Log:
Modified: csplugins/trunk/soc/srinivasarao/search-ui/osgi.bnd
===================================================================
--- csplugins/trunk/soc/srinivasarao/search-ui/osgi.bnd 2009-08-14 03:41:35 UTC
(rev 17816)
+++ csplugins/trunk/soc/srinivasarao/search-ui/osgi.bnd 2009-08-14 08:15:20 UTC
(rev 17817)
@@ -3,4 +3,4 @@
#-----------------------------------------------------------------
Import-Package: *
-Export-Package: ${bundle.namespace}.ui,${bundle.namespace}.ui.event
+Export-Package:
${bundle.namespace}.ui,${bundle.namespace}.ui.event,${bundle.namespace}.ui.filter,${bundle.namespace}.ui.tasks
Modified: csplugins/trunk/soc/srinivasarao/search-ui/pom.xml
===================================================================
--- csplugins/trunk/soc/srinivasarao/search-ui/pom.xml 2009-08-14 03:41:35 UTC
(rev 17816)
+++ csplugins/trunk/soc/srinivasarao/search-ui/pom.xml 2009-08-14 08:15:20 UTC
(rev 17817)
@@ -68,10 +68,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <!-- <configuration>
+ <configuration>
<skip>true</skip>
</configuration>
- -->
</plugin>
</plugins>
</build>
@@ -178,6 +177,11 @@
<artifactId>session-impl</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>cytoscape</groupId>
+ <artifactId>application</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
</dependencies>
</project>
Deleted:
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/IndexAndSearchTaskImpl.java
===================================================================
---
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/IndexAndSearchTaskImpl.java
2009-08-14 03:41:35 UTC (rev 17816)
+++
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/IndexAndSearchTaskImpl.java
2009-08-14 08:15:20 UTC (rev 17817)
@@ -1,211 +0,0 @@
-/*
- Copyright (c) 2006, 2007, The Cytoscape Consortium (www.cytoscape.org)
-
- The Cytoscape Consortium is:
- - Institute for Systems Biology
- - University of California San Diego
- - Memorial Sloan-Kettering Cancer Center
- - Institut Pasteur
- - Agilent Technologies
-
- This library is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published
- by the Free Software Foundation; either version 2.1 of the License, or
- any later version.
-
- This library is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF
- MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. The software and
- documentation provided hereunder is on an "as is" basis, and the
- Institute for Systems Biology and the Whitehead Institute
- have no obligations to provide maintenance, support,
- updates, enhancements or modifications. In no event shall the
- Institute for Systems Biology and the Whitehead Institute
- be liable to any party for direct, indirect, special,
- incidental or consequential damages, including lost profits, arising
- out of the use of this software and its documentation, even if the
- Institute for Systems Biology and the Whitehead Institute
- have been advised of the possibility of such damage. See
- the GNU Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- 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.search.ui;
-
-import java.util.ArrayList;
-import org.apache.lucene.store.RAMDirectory;
-
-import org.cytoscape.search.*;
-import org.cytoscape.search.internal.EnhancedSearchFactoryImpl;
-import org.cytoscape.search.internal.EnhancedSearchIndexImpl;
-import org.cytoscape.search.internal.EnhancedSearchQueryImpl;
-import org.cytoscape.model.CyEdge;
-import org.cytoscape.model.CyNetwork;
-import org.cytoscape.model.CyNode;
-import org.cytoscape.work.TaskMonitor;
-
-public class IndexAndSearchTaskImpl implements IndexAndSearchTask {
-
- private CyNetwork network;
- private String query;
- private TaskMonitor taskMonitor;
- private boolean interrupted = false;
-
- /**
- * Constructor.
- *
- * @param network
- * Network to execute query on.
- * @param query
- * Query string.
- */
- public IndexAndSearchTaskImpl(CyNetwork network, String query) {
- this.network = network;
- this.query = query;
- }
-
- /**
- * Executes Task: IndexAndSearch
- */
- public void run(TaskMonitor tm) {
- this.taskMonitor = tm;
-
- EnhancedSearchFactoryImpl esf = new EnhancedSearchFactoryImpl();
- final EnhancedSearch enhancedSearch = esf
- .getGlobalEnhancedSearchInstance();
-
- // Index the given network or use existing index
- RAMDirectory idx = null;
-
- String status = enhancedSearch.getNetworkIndexStatus(network);
- if (status == EnhancedSearch.INDEX_SET) {
- idx = enhancedSearch.getNetworkIndex(network);
- } else {
- taskMonitor.setStatusMessage("Indexing network");
- EnhancedSearchIndex indexHandler = new
EnhancedSearchIndexImpl(
- network);
- idx = indexHandler.getIndex();
- enhancedSearch.setNetworkIndex(network, idx);
-
- if (interrupted) {
- return;
- }
- }
-
- // Execute query
- taskMonitor.setStatusMessage("Executing query");
- EnhancedSearchQuery queryHandler = new
EnhancedSearchQueryImpl(idx,
- network);
- queryHandler.executeQuery(query);
-
- if (interrupted) {
- return;
- }
-
- int hitCount = queryHandler.getHitCount();
- if (hitCount == 0) {
- System.out.println("No hits. ");
- return;
- }
- System.out.println("There are " + hitCount + " hits.");
- taskMonitor.setStatusMessage("Displaying " + hitCount + "
hits");
-
- int numCompleted = 0;
- ArrayList<CyNode> nodeList = queryHandler.getNodeHits();
- numCompleted = 50;
- ArrayList<CyEdge> edgeList = queryHandler.getEdgeHits();
-
- int percentCompleted = (numCompleted * 100 / hitCount);
- taskMonitor.setProgress(percentCompleted);
-
- }
-
- /**
- * DOCUMENT ME!
- */
- public void halt() {
- this.interrupted = true;
- }
-
- public void cancel() {
- this.interrupted = true;
- }
-
- /**
- * Sets the TaskMonitor.
- *
- * @param taskMonitor
- * TaskMonitor Object.
- * @throws IllegalThreadStateException
- * Illegal Thread State.
- */
- public void setTaskMonitor(TaskMonitor taskMonitor)
- throws IllegalThreadStateException {
- this.taskMonitor = taskMonitor;
- }
-
- /**
- * Gets Title of Task.
- *
- * @return Title of Task.
- */
- public String getTitle() {
- return "Searching the network";
- }
-
- public void run() {
- System.out.println("I am in IndexandSearchTask");
- EnhancedSearchFactoryImpl esf = new EnhancedSearchFactoryImpl();
- final EnhancedSearch enhancedSearch = esf
- .getGlobalEnhancedSearchInstance();
-
- // Index the given network or use existing index
- RAMDirectory idx = null;
-
- String status = enhancedSearch.getNetworkIndexStatus(network);
- if (status == EnhancedSearch.INDEX_SET) {
- idx = enhancedSearch.getNetworkIndex(network);
- } else {
- // taskMonitor.setStatusMessage("Indexing network");
- EnhancedSearchIndex indexHandler = new
EnhancedSearchIndexImpl(
- network);
- idx = indexHandler.getIndex();
- enhancedSearch.setNetworkIndex(network, idx);
-
- if (interrupted) {
- return;
- }
- }
-
- // Execute query
- // taskMonitor.setStatusMessage("Executing query");
- EnhancedSearchQuery queryHandler = new
EnhancedSearchQueryImpl(idx,
- network);
- queryHandler.executeQuery(query);
-
- if (interrupted) {
- return;
- }
-
- int hitCount = queryHandler.getHitCount();
- if (hitCount == 0) {
- System.out.println("No hits. ");
- return;
- }
- System.out.println("There are " + hitCount + " hits.");
- // taskMonitor.setStatusMessage("Displaying " + hitCount + "
hits");
-
- int numCompleted = 0;
- ArrayList<CyNode> nodeList = queryHandler.getNodeHits();
- numCompleted = 50;
- ArrayList<CyEdge> edgeList = queryHandler.getEdgeHits();
-
- int percentCompleted = (numCompleted * 100 / hitCount);
- // taskMonitor.setProgress(percentCompleted);
-
- }
-
-}
\ No newline at end of file
Modified:
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/MainPanel.java
===================================================================
---
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/MainPanel.java
2009-08-14 03:41:35 UTC (rev 17816)
+++
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/MainPanel.java
2009-08-14 08:15:20 UTC (rev 17817)
@@ -23,8 +23,6 @@
import org.cytoscape.session.CyNetworkManager;
-import cytoscape.Cytoscape;
-
public class MainPanel extends JPanel {
private static final long serialVersionUID = 1L;
@@ -165,6 +163,7 @@
if (selectButton == null) {
selectButton = new JRadioButton();
selectButton.setText("Select");
+ selectButton.setActionCommand("Select");
}
return selectButton;
}
@@ -178,6 +177,7 @@
if (showButton == null) {
showButton = new JRadioButton();
showButton.setText("Show");
+ showButton.setActionCommand("Show");
}
return showButton;
}
@@ -191,6 +191,7 @@
if (hideButton == null) {
hideButton = new JRadioButton();
hideButton.setText("Hide");
+ hideButton.setActionCommand("Hide");
}
return hideButton;
}
@@ -307,6 +308,7 @@
public String getResult() {
String res = resultGroup.getSelection().getActionCommand();
+ System.out.println("In getresult:" + res);
return res;
}
Modified:
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/SearchPanel.java
===================================================================
---
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/SearchPanel.java
2009-08-14 03:41:35 UTC (rev 17816)
+++
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/SearchPanel.java
2009-08-14 08:15:20 UTC (rev 17817)
@@ -2,6 +2,8 @@
import javax.swing.JPanel;
+import org.cytoscape.work.TaskManager;
+
public abstract class SearchPanel extends JPanel {
/**
@@ -20,5 +22,7 @@
abstract public MainPanel getmainPanel();
abstract public void initattrPanel();
+
+ abstract public void setTaskManager(TaskManager tm);
}
Modified:
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/SearchPanelImpl.java
===================================================================
---
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/SearchPanelImpl.java
2009-08-14 03:41:35 UTC (rev 17816)
+++
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/SearchPanelImpl.java
2009-08-14 08:15:20 UTC (rev 17817)
@@ -15,8 +15,10 @@
import org.cytoscape.model.CyNetwork;
import org.cytoscape.search.EnhancedSearch;
import org.cytoscape.search.internal.EnhancedSearchFactoryImpl;
+import org.cytoscape.search.ui.tasks.IndexAndSearchTaskImpl;
import org.cytoscape.search.util.AttributeTypes;
import org.cytoscape.session.CyNetworkManager;
+import org.cytoscape.work.TaskManager;
public class SearchPanelImpl extends SearchPanel {
@@ -28,6 +30,7 @@
private JSplitPane split = null;
private String[] nodeattrList;
private String[] edgeattrList;
+ private TaskManager taskmanager;
/**
* This is the default constructor
@@ -38,6 +41,10 @@
initialize();
}
+ public void setTaskManager(TaskManager tm) {
+ this.taskmanager = tm;
+ }
+
/**
* This method initializes this
*
@@ -147,9 +154,9 @@
}
// Define a new IndexAndSearchTask
- IndexAndSearchTaskImpl task = new
IndexAndSearchTaskImpl(
- currNetwork, query);
- task.run();
+ IndexAndSearchTaskImpl task = new
IndexAndSearchTaskImpl(netmgr,
+ query);
+ taskmanager.execute(task);
// Execute the task via the task manager
// tm.execute(task);
}
Modified:
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/SearchPluginImpl.java
===================================================================
---
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/SearchPluginImpl.java
2009-08-14 03:41:35 UTC (rev 17816)
+++
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/SearchPluginImpl.java
2009-08-14 08:15:20 UTC (rev 17817)
@@ -4,22 +4,29 @@
import org.cytoscape.session.CyNetworkManager;
+import org.cytoscape.work.TaskManager;
+
import cytoscape.view.CySwingApplication;
-public class SearchPluginImpl implements SearchPlugin{
+public class SearchPluginImpl implements SearchPlugin {
private CySwingApplication desktop;
private CyNetworkManager netmgr;
-
- public SearchPluginImpl(CySwingApplication desk, CyNetworkManager nm) {
+ private TaskManager taskmanager;
+
+ public SearchPluginImpl(CySwingApplication desk, CyNetworkManager nm,
+ TaskManager tm) {
this.desktop = desk;
this.netmgr = nm;
+ this.taskmanager = tm;
initPanel();
System.out.println("I am in SearchPlugin of search-ui");
}
public void initPanel() {
+
SearchPanel esp = SearchPanelFactory.getGlobalInstance(netmgr);
- desktop.getCytoPanel(SwingConstants.WEST).add("Query
Builder",esp);
+ esp.setTaskManager(taskmanager);
+ desktop.getCytoPanel(SwingConstants.WEST).add("Query Builder",
esp);
}
}
Added:
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/filter/EdgeInteractionFilter.java
===================================================================
---
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/filter/EdgeInteractionFilter.java
(rev 0)
+++
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/filter/EdgeInteractionFilter.java
2009-08-14 08:15:20 UTC (rev 17817)
@@ -0,0 +1,149 @@
+package org.cytoscape.search.ui.filter;
+
+import java.awt.Dimension;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+
+import javax.swing.JCheckBox;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+
+public class EdgeInteractionFilter extends JPanel {
+
+ private static final long serialVersionUID = 1L;
+ private JLabel filterLabel = null;
+ private JPanel filterPanel = null;
+ private JLabel jLabel1 = null;
+ private JLabel jLabel2 = null;
+ private JCheckBox sourceBox = null;
+ private JCheckBox targetBox = null;
+ private JLabel jLabel3 = null;
+ private JTextField queryField = null;
+
+ /**
+ * This is the default constructor
+ */
+ public EdgeInteractionFilter() {
+ super();
+ initialize();
+ }
+
+ /**
+ * This method initializes this
+ *
+ * @return void
+ */
+ private void initialize() {
+ GridBagConstraints gridBagConstraints7 = new
GridBagConstraints();
+ gridBagConstraints7.gridy = 1;
+ gridBagConstraints7.gridx = 0;
+ GridBagConstraints gridBagConstraints = new
GridBagConstraints();
+ gridBagConstraints.gridy = 0;
+ gridBagConstraints.gridx = 0;
+ gridBagConstraints.fill = GridBagConstraints.HORIZONTAL;
+ filterLabel = new JLabel();
+ filterLabel.setText("Edge Interaction Filter");
+ filterLabel.addMouseListener(new java.awt.event.MouseAdapter() {
+ public void mouseClicked(java.awt.event.MouseEvent e) {
+ if (filterPanel.isVisible()) {
+ filterPanel.setVisible(false);
+ } else {
+ filterPanel.setVisible(true);
+ }
+ }
+ });
+ this.setSize(373, 239);
+ this.setLayout(new GridBagLayout());
+ this.add(filterLabel, gridBagConstraints);
+ this.add(getFilterPanel(), gridBagConstraints7);
+ }
+
+ /**
+ * This method initializes filterPanel
+ *
+ * @return javax.swing.JPanel
+ */
+ private JPanel getFilterPanel() {
+ if (filterPanel == null) {
+ GridBagConstraints gridBagConstraints6 = new
GridBagConstraints();
+ gridBagConstraints6.fill = GridBagConstraints.VERTICAL;
+ gridBagConstraints6.gridy = 2;
+ gridBagConstraints6.weightx = 1.0;
+ gridBagConstraints6.gridx = 2;
+
+ GridBagConstraints gridBagConstraints5 = new
GridBagConstraints();
+ gridBagConstraints5.gridx = 0;
+ gridBagConstraints5.gridy = 2;
+ gridBagConstraints5.gridwidth = 2;
+ jLabel3 = new JLabel();
+ jLabel3.setText("which match the query");
+ GridBagConstraints gridBagConstraints4 = new
GridBagConstraints();
+ gridBagConstraints4.gridx = 3;
+ gridBagConstraints4.gridy = 1;
+ GridBagConstraints gridBagConstraints3 = new
GridBagConstraints();
+ gridBagConstraints3.gridx = 2;
+ gridBagConstraints3.gridy = 1;
+ GridBagConstraints gridBagConstraints2 = new
GridBagConstraints();
+ gridBagConstraints2.gridx = 1;
+ gridBagConstraints2.gridy = 1;
+ jLabel2 = new JLabel();
+ jLabel2.setText("with a node");
+ GridBagConstraints gridBagConstraints1 = new
GridBagConstraints();
+ gridBagConstraints1.gridx = 0;
+ gridBagConstraints1.gridy = 0;
+ jLabel1 = new JLabel();
+ jLabel1.setText("Select nodes");
+ filterPanel = new JPanel();
+ filterPanel.setLayout(new GridBagLayout());
+ filterPanel.add(jLabel1, gridBagConstraints1);
+ filterPanel.add(jLabel2, gridBagConstraints2);
+ filterPanel.add(getSourceBox(), gridBagConstraints3);
+ filterPanel.add(getTargetBox(), gridBagConstraints4);
+ filterPanel.add(jLabel3, gridBagConstraints5);
+ filterPanel.add(getQueryField(), gridBagConstraints6);
+ filterPanel.setVisible(false);
+ }
+ return filterPanel;
+ }
+
+ /**
+ * This method initializes sourceBox
+ *
+ * @return javax.swing.JCheckBox
+ */
+ private JCheckBox getSourceBox() {
+ if (sourceBox == null) {
+ sourceBox = new JCheckBox();
+ sourceBox.setText("source");
+ }
+ return sourceBox;
+ }
+
+ /**
+ * This method initializes targetBox
+ *
+ * @return javax.swing.JCheckBox
+ */
+ private JCheckBox getTargetBox() {
+ if (targetBox == null) {
+ targetBox = new JCheckBox();
+ targetBox.setText("target");
+ }
+ return targetBox;
+ }
+
+ /**
+ * This method initializes queryField
+ *
+ * @return javax.swing.JTextField
+ */
+ private JTextField getQueryField() {
+ if (queryField == null) {
+ queryField = new JTextField();
+ queryField.setPreferredSize(new Dimension(40, 10));
+ }
+ return queryField;
+ }
+
+} // @jve:decl-index=0:visual-constraint="10,10"
Added:
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/filter/NodeInteractionFilter.java
===================================================================
---
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/filter/NodeInteractionFilter.java
(rev 0)
+++
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/filter/NodeInteractionFilter.java
2009-08-14 08:15:20 UTC (rev 17817)
@@ -0,0 +1,154 @@
+package org.cytoscape.search.ui.filter;
+
+import java.awt.Dimension;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+
+import javax.swing.JCheckBox;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+
+public class NodeInteractionFilter extends JPanel {
+
+ private static final long serialVersionUID = 1L;
+ private JLabel filterLabel = null;
+ private JPanel filterPanel = null;
+ private JLabel jLabel1 = null;
+ private JLabel jLabel2 = null;
+ private JCheckBox sourceBox = null;
+ private JCheckBox targetBox = null;
+ private JLabel jLabel3 = null;
+ private JLabel jLabel4 = null;
+ private JTextField queryField = null;
+
+ /**
+ * This is the default constructor
+ */
+ public NodeInteractionFilter() {
+ super();
+ initialize();
+ }
+
+ /**
+ * This method initializes this
+ *
+ * @return void
+ */
+ private void initialize() {
+ GridBagConstraints gridBagConstraints2 = new
GridBagConstraints();
+ gridBagConstraints2.gridy = 1;
+ gridBagConstraints2.gridx = 0;
+ GridBagConstraints gridBagConstraints1 = new
GridBagConstraints();
+ gridBagConstraints1.gridy = 0;
+ gridBagConstraints1.gridx = 0;
+ gridBagConstraints1.fill = GridBagConstraints.HORIZONTAL;
+ filterLabel = new JLabel();
+ filterLabel.setText("NodeInteractionFilter");
+ filterLabel.addMouseListener(new java.awt.event.MouseAdapter() {
+ public void mouseClicked(java.awt.event.MouseEvent e) {
+ if (filterPanel.isVisible()) {
+ filterPanel.setVisible(false);
+ } else {
+ filterPanel.setVisible(true);
+ }
+ }
+ });
+ this.setSize(425, 456);
+ this.setLayout(new GridBagLayout());
+ this.add(filterLabel, gridBagConstraints1);
+ this.add(getFilterPanel(), gridBagConstraints2);
+ }
+
+ /**
+ * This method initializes filterPanel
+ *
+ * @return javax.swing.JPanel
+ */
+ private JPanel getFilterPanel() {
+ if (filterPanel == null) {
+ GridBagConstraints gridBagConstraints12 = new
GridBagConstraints();
+ gridBagConstraints12.fill = GridBagConstraints.BOTH;
+ gridBagConstraints12.gridy = 3;
+ gridBagConstraints12.weightx = 1.0;
+ gridBagConstraints12.gridx = 2;
+ GridBagConstraints gridBagConstraints11 = new
GridBagConstraints();
+ gridBagConstraints11.gridx = 0;
+ gridBagConstraints11.gridy = 3;
+ gridBagConstraints11.gridwidth = 2;
+ jLabel4 = new JLabel();
+ jLabel4.setText("and which match the query");
+ GridBagConstraints gridBagConstraints10 = new
GridBagConstraints();
+ gridBagConstraints10.gridx = 0;
+ gridBagConstraints10.gridy = 2;
+ jLabel3 = new JLabel();
+ jLabel3.setText("of atleast one edge");
+ GridBagConstraints gridBagConstraints9 = new
GridBagConstraints();
+ gridBagConstraints9.gridx = 3;
+ gridBagConstraints9.gridy = 1;
+ GridBagConstraints gridBagConstraints8 = new
GridBagConstraints();
+ gridBagConstraints8.gridx = 2;
+ gridBagConstraints8.gridy = 1;
+ GridBagConstraints gridBagConstraints7 = new
GridBagConstraints();
+ gridBagConstraints7.gridx = 1;
+ gridBagConstraints7.gridy = 1;
+ jLabel2 = new JLabel();
+ jLabel2.setText("which are the");
+ GridBagConstraints gridBagConstraints = new
GridBagConstraints();
+ gridBagConstraints.gridx = 0;
+ gridBagConstraints.gridy = 0;
+ jLabel1 = new JLabel();
+ jLabel1.setText("Select nodes");
+ filterPanel = new JPanel();
+ filterPanel.setLayout(new GridBagLayout());
+ filterPanel.add(jLabel1, gridBagConstraints);
+ filterPanel.add(jLabel2, gridBagConstraints7);
+ filterPanel.add(getSourceBox(), gridBagConstraints8);
+ filterPanel.add(getTargetBox(), gridBagConstraints9);
+ filterPanel.add(jLabel3, gridBagConstraints10);
+ filterPanel.add(jLabel4, gridBagConstraints11);
+ filterPanel.add(getQueryField(), gridBagConstraints12);
+ }
+ return filterPanel;
+ }
+
+ /**
+ * This method initializes sourceBox
+ *
+ * @return javax.swing.JCheckBox
+ */
+ private JCheckBox getSourceBox() {
+ if (sourceBox == null) {
+ sourceBox = new JCheckBox();
+ sourceBox.setText("source");
+ }
+ return sourceBox;
+ }
+
+ /**
+ * This method initializes targetBox
+ *
+ * @return javax.swing.JCheckBox
+ */
+ private JCheckBox getTargetBox() {
+ if (targetBox == null) {
+ targetBox = new JCheckBox();
+ targetBox.setText("target");
+ }
+ return targetBox;
+ }
+
+ /**
+ * This method initializes queryField
+ *
+ * @return javax.swing.JTextField
+ */
+ private JTextField getQueryField() {
+ if (queryField == null) {
+ queryField = new JTextField();
+ queryField.setPreferredSize(new Dimension(40, 10));
+ }
+ return queryField;
+ }
+
+} // @jve:decl-index=0:visual-constraint="10,10"
Added:
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/filter/TopologyFilter.java
===================================================================
---
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/filter/TopologyFilter.java
(rev 0)
+++
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/filter/TopologyFilter.java
2009-08-14 08:15:20 UTC (rev 17817)
@@ -0,0 +1,149 @@
+package org.cytoscape.search.ui.filter;
+
+import java.awt.GridBagLayout;
+import javax.swing.JPanel;
+import java.awt.Dimension;
+import javax.swing.JLabel;
+import java.awt.GridBagConstraints;
+import java.awt.Rectangle;
+import javax.swing.JTextField;
+
+public class TopologyFilter extends JPanel {
+
+ private static final long serialVersionUID = 1L;
+ private JLabel filterLabel = null;
+ private JPanel jPanel = null;
+ private JLabel jLabel = null;
+ private JLabel jLabel1 = null;
+ private JTextField neighbourField = null;
+ private JLabel jLabel2 = null;
+ private JLabel jLabel3 = null;
+ private JTextField queryField = null;
+ private JTextField distanceField = null;
+ private JLabel jLabel4 = null;
+
+ /**
+ * This is the default constructor
+ */
+ public TopologyFilter() {
+ super();
+ initialize();
+ }
+
+ /**
+ * This method initializes this
+ *
+ * @return void
+ */
+ private void initialize() {
+ GridBagConstraints gridBagConstraints = new
GridBagConstraints();
+ gridBagConstraints.gridx = 0;
+ gridBagConstraints.gridy = 0;
+ filterLabel = new JLabel();
+ filterLabel.setText("TopologyFilter");
+ filterLabel.setBounds(new Rectangle(17, 22, 257, 47));
+ this.setSize(462, 383);
+ this.setLayout(null);
+ this.add(filterLabel, null);
+ this.add(getJPanel(), null);
+ }
+
+ /**
+ * This method initializes jPanel
+ *
+ * @return javax.swing.JPanel
+ */
+ private JPanel getJPanel() {
+ if (jPanel == null) {
+ GridBagConstraints gridBagConstraints8 = new
GridBagConstraints();
+ gridBagConstraints8.gridx = 3;
+ gridBagConstraints8.gridy = 1;
+ jLabel4 = new JLabel();
+ jLabel4.setText("neighbours");
+ GridBagConstraints gridBagConstraints7 = new
GridBagConstraints();
+ gridBagConstraints7.fill = GridBagConstraints.VERTICAL;
+ gridBagConstraints7.gridy = 2;
+ gridBagConstraints7.weightx = 1.0;
+ gridBagConstraints7.gridx = 2;
+ GridBagConstraints gridBagConstraints6 = new
GridBagConstraints();
+ gridBagConstraints6.fill = GridBagConstraints.VERTICAL;
+ gridBagConstraints6.gridy = 3;
+ gridBagConstraints6.weightx = 1.0;
+ gridBagConstraints6.gridx = 2;
+ GridBagConstraints gridBagConstraints5 = new
GridBagConstraints();
+ gridBagConstraints5.gridx = 1;
+ gridBagConstraints5.gridy = 3;
+ jLabel3 = new JLabel();
+ jLabel3.setText("and which match the query");
+ GridBagConstraints gridBagConstraints4 = new
GridBagConstraints();
+ gridBagConstraints4.gridx = 1;
+ gridBagConstraints4.gridy = 2;
+ jLabel2 = new JLabel();
+ jLabel2.setText("within distance");
+ GridBagConstraints gridBagConstraints3 = new
GridBagConstraints();
+ gridBagConstraints3.fill = GridBagConstraints.VERTICAL;
+ gridBagConstraints3.gridy = 1;
+ gridBagConstraints3.weightx = 1.0;
+ gridBagConstraints3.gridx = 2;
+ GridBagConstraints gridBagConstraints2 = new
GridBagConstraints();
+ gridBagConstraints2.gridx = 1;
+ gridBagConstraints2.gridy = 1;
+ jLabel1 = new JLabel();
+ jLabel1.setText("with atleast");
+ GridBagConstraints gridBagConstraints1 = new
GridBagConstraints();
+ gridBagConstraints1.gridx = 0;
+ gridBagConstraints1.gridy = 0;
+ jLabel = new JLabel();
+ jLabel.setText("Select nodes");
+ jPanel = new JPanel();
+ jPanel.setLayout(new GridBagLayout());
+ jPanel.setBounds(new Rectangle(18, 82, 439, 265));
+ jPanel.add(jLabel, gridBagConstraints1);
+ jPanel.add(jLabel1, gridBagConstraints2);
+ jPanel.add(getNeighbourField(), gridBagConstraints3);
+ jPanel.add(jLabel2, gridBagConstraints4);
+ jPanel.add(jLabel3, gridBagConstraints5);
+ jPanel.add(getQueryField(), gridBagConstraints6);
+ jPanel.add(getDistanceField(), gridBagConstraints7);
+ jPanel.add(jLabel4, gridBagConstraints8);
+ }
+ return jPanel;
+ }
+
+ /**
+ * This method initializes neighbourField
+ *
+ * @return javax.swing.JTextField
+ */
+ private JTextField getNeighbourField() {
+ if (neighbourField == null) {
+ neighbourField = new JTextField();
+ }
+ return neighbourField;
+ }
+
+ /**
+ * This method initializes queryField
+ *
+ * @return javax.swing.JTextField
+ */
+ private JTextField getQueryField() {
+ if (queryField == null) {
+ queryField = new JTextField();
+ }
+ return queryField;
+ }
+
+ /**
+ * This method initializes distanceField
+ *
+ * @return javax.swing.JTextField
+ */
+ private JTextField getDistanceField() {
+ if (distanceField == null) {
+ distanceField = new JTextField();
+ }
+ return distanceField;
+ }
+
+} // @jve:decl-index=0:visual-constraint="10,10"
Added:
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/filter/TopologyPanel.java
===================================================================
---
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/filter/TopologyPanel.java
(rev 0)
+++
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/filter/TopologyPanel.java
2009-08-14 08:15:20 UTC (rev 17817)
@@ -0,0 +1,29 @@
+package org.cytoscape.search.ui.filter;
+
+import java.awt.GridBagLayout;
+import javax.swing.JPanel;
+import java.awt.Dimension;
+
+public class TopologyPanel extends JPanel {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * This is the default constructor
+ */
+ public TopologyPanel() {
+ super();
+ initialize();
+ }
+
+ /**
+ * This method initializes this
+ *
+ * @return void
+ */
+ private void initialize() {
+ this.setSize(309, 538);
+ this.setLayout(new GridBagLayout());
+ }
+
+} // @jve:decl-index=0:visual-constraint="194,17"
Added:
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/tasks/HideUtils.java
===================================================================
---
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/tasks/HideUtils.java
(rev 0)
+++
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/tasks/HideUtils.java
2009-08-14 08:15:20 UTC (rev 17817)
@@ -0,0 +1,36 @@
+package org.cytoscape.search.ui.tasks;
+
+import static
org.cytoscape.view.presentation.property.TwoDVisualLexicon.EDGE_VISIBLE;
+import static
org.cytoscape.view.presentation.property.TwoDVisualLexicon.NODE_VISIBLE;
+
+import java.util.Collection;
+
+import org.cytoscape.model.CyEdge;
+import org.cytoscape.model.CyNode;
+import org.cytoscape.view.model.CyNetworkView;
+
+abstract class HideUtils {
+
+ static void setVisibleNodes(Collection<CyNode> nodes, boolean visible,
+ CyNetworkView view) {
+ for (CyNode n : nodes) {
+ if (view != null) {
+
view.getNodeView(n).setVisualProperty(NODE_VISIBLE, visible);
+
+ for (CyNode n2 :
n.getNeighborList(CyEdge.Type.ANY))
+ for (CyEdge e :
view.getSource().getConnectingEdgeList(n,
+ n2, CyEdge.Type.ANY))
+
view.getEdgeView(e).setVisualProperty(EDGE_VISIBLE,
+ visible);
+ }
+ }
+ }
+
+ static void setVisibleEdges(Collection<CyEdge> edges, boolean visible,
+ CyNetworkView view) {
+ for (CyEdge e : edges) {
+ if (view != null)
+
view.getEdgeView(e).setVisualProperty(EDGE_VISIBLE, visible);
+ }
+ }
+}
Copied:
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/tasks/IndexAndSearchTaskImpl.java
(from rev 17717,
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/IndexAndSearchTaskImpl.java)
===================================================================
---
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/tasks/IndexAndSearchTaskImpl.java
(rev 0)
+++
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/tasks/IndexAndSearchTaskImpl.java
2009-08-14 08:15:20 UTC (rev 17817)
@@ -0,0 +1,199 @@
+/*
+ Copyright (c) 2006, 2007, The Cytoscape Consortium (www.cytoscape.org)
+
+ The Cytoscape Consortium is:
+ - Institute for Systems Biology
+ - University of California San Diego
+ - Memorial Sloan-Kettering Cancer Center
+ - Institut Pasteur
+ - Agilent Technologies
+
+ This library is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published
+ by the Free Software Foundation; either version 2.1 of the License, or
+ any later version.
+
+ This library is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF
+ MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. The software and
+ documentation provided hereunder is on an "as is" basis, and the
+ Institute for Systems Biology and the Whitehead Institute
+ have no obligations to provide maintenance, support,
+ updates, enhancements or modifications. In no event shall the
+ Institute for Systems Biology and the Whitehead Institute
+ be liable to any party for direct, indirect, special,
+ incidental or consequential damages, including lost profits, arising
+ out of the use of this software and its documentation, even if the
+ Institute for Systems Biology and the Whitehead Institute
+ have been advised of the possibility of such damage. See
+ the GNU Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ 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.search.ui.tasks;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.lucene.store.RAMDirectory;
+
+import org.cytoscape.search.*;
+import org.cytoscape.search.internal.EnhancedSearchFactoryImpl;
+import org.cytoscape.search.internal.EnhancedSearchIndexImpl;
+import org.cytoscape.search.internal.EnhancedSearchQueryImpl;
+import org.cytoscape.search.ui.SearchPanelFactory;
+import org.cytoscape.session.CyNetworkManager;
+import org.cytoscape.model.CyEdge;
+import org.cytoscape.model.CyNetwork;
+import org.cytoscape.model.CyNode;
+import org.cytoscape.view.model.CyNetworkView;
+import org.cytoscape.work.TaskMonitor;
+
+public class IndexAndSearchTaskImpl implements IndexAndSearchTask {
+
+ private CyNetworkManager netmgr;
+ private String query = null;
+ private TaskMonitor taskMonitor;
+ private boolean interrupted = false;
+
+ /**
+ * Constructor.
+ *
+ * @param network
+ * Network to execute query on.
+ * @param query
+ * Query string.
+ */
+ public IndexAndSearchTaskImpl(CyNetworkManager nm, String query) {
+ this.netmgr = nm;
+ this.query = query;
+ }
+
+ /**
+ * Executes Task: IndexAndSearch
+ */
+ public void run(TaskMonitor tm) {
+ this.taskMonitor = tm;
+ final CyNetwork network = netmgr.getCurrentNetwork();
+ System.out.println("I am in IndexandSearchTask Service");
+ EnhancedSearchFactoryImpl esf = new EnhancedSearchFactoryImpl();
+ final EnhancedSearch enhancedSearch = esf
+ .getGlobalEnhancedSearchInstance();
+
+ // Index the given network or use existing index
+ RAMDirectory idx = null;
+
+ String status = enhancedSearch.getNetworkIndexStatus(network);
+ if (status == EnhancedSearch.INDEX_SET) {
+ idx = enhancedSearch.getNetworkIndex(network);
+ } else {
+ taskMonitor.setStatusMessage("Indexing network");
+ EnhancedSearchIndex indexHandler = new
EnhancedSearchIndexImpl(
+ network);
+ idx = indexHandler.getIndex();
+ enhancedSearch.setNetworkIndex(network, idx);
+
+ if (interrupted) {
+ return;
+ }
+ }
+
+ // Execute query
+ taskMonitor.setStatusMessage("Executing query");
+ EnhancedSearchQuery queryHandler = new
EnhancedSearchQueryImpl(idx,
+ network);
+ queryHandler.executeQuery(query);
+
+ if (interrupted) {
+ return;
+ }
+
+ int hitCount = queryHandler.getHitCount();
+ if (hitCount == 0) {
+ System.out.println("No hits. ");
+ return;
+ }
+ System.out.println("There are " + hitCount + " hits.");
+ taskMonitor.setStatusMessage("Displaying " + hitCount + "
hits");
+
+ int numCompleted = 0;
+ ArrayList<CyNode> nodeList = queryHandler.getNodeHits();
+ numCompleted = 50;
+ ArrayList<CyEdge> edgeList = queryHandler.getEdgeHits();
+
+ int percentCompleted = (numCompleted * 100 / hitCount);
+ taskMonitor.setProgress(percentCompleted);
+
+ String result = SearchPanelFactory.getGlobalInstance(netmgr)
+ .getmainPanel().getResult();
+ System.out.println("Selected Option: " + result);
+
+ CyNetworkView view = netmgr.getCurrentNetworkView();
+ if (result.equals("Select")) {
+ SelectUtils.setSelectedNodes(nodeList, true);
+ SelectUtils.setSelectedEdges(edgeList, true);
+
+ if (view != null) {
+ view.updateView();
+ }
+
+ } else if (result.equals("Show")) {
+ if (view != null) {
+ List<CyNode> compnodelist =
network.getNodeList();
+ for (CyNode n : nodeList) {
+ compnodelist.remove(n);
+ }
+ HideUtils.setVisibleNodes(compnodelist, false,
view);
+
+ List<CyEdge> compedgelist =
network.getEdgeList();
+ for (CyEdge e : edgeList) {
+ compedgelist.remove(e);
+ }
+ HideUtils.setVisibleEdges(compedgelist, false,
view);
+ }
+
+ } else {
+ if (view != null) {
+ HideUtils.setVisibleNodes(nodeList, false,
view);
+ HideUtils.setVisibleEdges(edgeList, false,
view);
+ }
+ }
+
+ }
+
+ /**
+ * DOCUMENT ME!
+ */
+ public void halt() {
+ this.interrupted = true;
+ }
+
+ public void cancel() {
+ this.interrupted = true;
+ }
+
+ /**
+ * Sets the TaskMonitor.
+ *
+ * @param taskMonitor
+ * TaskMonitor Object.
+ * @throws IllegalThreadStateException
+ * Illegal Thread State.
+ */
+ public void setTaskMonitor(TaskMonitor taskMonitor)
+ throws IllegalThreadStateException {
+ this.taskMonitor = taskMonitor;
+ }
+
+ /**
+ * Gets Title of Task.
+ *
+ * @return Title of Task.
+ */
+ public String getTitle() {
+ return "Searching the network";
+ }
+}
\ No newline at end of file
Property changes on:
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/tasks/IndexAndSearchTaskImpl.java
___________________________________________________________________
Name: svn:mergeinfo
+
Added:
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/tasks/SelectUtils.java
===================================================================
---
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/tasks/SelectUtils.java
(rev 0)
+++
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/tasks/SelectUtils.java
2009-08-14 08:15:20 UTC (rev 17817)
@@ -0,0 +1,22 @@
+package org.cytoscape.search.ui.tasks;
+
+import org.cytoscape.model.CyNode;
+import org.cytoscape.model.CyEdge;
+
+import java.util.Collection;
+
+abstract class SelectUtils {
+
+ static void setSelectedNodes(Collection<CyNode> nodes, boolean select) {
+ for (CyNode n : nodes) {
+ n.attrs().set("selected", select);
+ }
+ }
+
+ static void setSelectedEdges(Collection<CyEdge> edges, boolean select) {
+ for (CyEdge e : edges) {
+ e.attrs().set("selected", select);
+ }
+ }
+
+}
Modified:
csplugins/trunk/soc/srinivasarao/search-ui/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
csplugins/trunk/soc/srinivasarao/search-ui/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2009-08-14 03:41:35 UTC (rev 17816)
+++
csplugins/trunk/soc/srinivasarao/search-ui/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2009-08-14 08:15:20 UTC (rev 17817)
@@ -57,7 +57,8 @@
<osgi:reference id="cytoscapeDesktopServiceRef"
interface="cytoscape.view.CySwingApplication" />
- <osgi:reference id="EnhancedSearchService"
interface="org.cytoscape.search.EnhancedSearch">
- </osgi:reference>
+ <osgi:reference id="EnhancedSearchService"
interface="org.cytoscape.search.EnhancedSearch" />
+ <osgi:reference id="taskManagerServiceRef"
interface="org.cytoscape.work.TaskManager" />
+
</beans>
Modified:
csplugins/trunk/soc/srinivasarao/search-ui/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
csplugins/trunk/soc/srinivasarao/search-ui/src/main/resources/META-INF/spring/bundle-context.xml
2009-08-14 03:41:35 UTC (rev 17816)
+++
csplugins/trunk/soc/srinivasarao/search-ui/src/main/resources/META-INF/spring/bundle-context.xml
2009-08-14 08:15:20 UTC (rev 17817)
@@ -14,6 +14,7 @@
<bean name="SearchPlugin"
class="org.cytoscape.search.ui.SearchPluginImpl">
<constructor-arg ref="cytoscapeDesktopServiceRef" />
<constructor-arg ref="cyNetworkManagerServiceRef" />
+ <constructor-arg ref="taskManagerServiceRef" />
</bean>
<bean name="SearchPanelEventHandlerImpl"
Copied:
csplugins/trunk/soc/srinivasarao/search-ui/src/test/java/org/cytoscape/search/internal
(from rev 17717,
csplugins/trunk/soc/srinivasarao/search-ui/src/main/test/org/cytoscape/search/internal)
Property changes on:
csplugins/trunk/soc/srinivasarao/search-ui/src/test/java/org/cytoscape/search/internal
___________________________________________________________________
Name: svn:mergeinfo
+
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
