Author: Srinivasarao
Date: 2009-08-11 11:28:04 -0700 (Tue, 11 Aug 2009)
New Revision: 17771
Added:
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/event/
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/event/HistoryHandler.java
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/event/SearchPanelEventHandlerImpl.java
Modified:
csplugins/trunk/soc/srinivasarao/search-ui/osgi.bnd
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/BasicDraggablePanel.java
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/RootPanel.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-11 17:33:45 UTC
(rev 17770)
+++ csplugins/trunk/soc/srinivasarao/search-ui/osgi.bnd 2009-08-11 18:28:04 UTC
(rev 17771)
@@ -3,4 +3,4 @@
#-----------------------------------------------------------------
Import-Package: *
-Export-Package: ${bundle.namespace},${bundle.namespace}.ui
+Export-Package: ${bundle.namespace}.ui,${bundle.namespace}.ui.event
Modified:
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/BasicDraggablePanel.java
===================================================================
---
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/BasicDraggablePanel.java
2009-08-11 17:33:45 UTC (rev 17770)
+++
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/BasicDraggablePanel.java
2009-08-11 18:28:04 UTC (rev 17771)
@@ -95,7 +95,7 @@
if (dataflavor == null) {
dataflavor = new DataFlavor(
DataFlavor.javaJVMLocalObjectMimeType
- +
";class=org.cytoscape.search.internal.BasicDraggablePanel");
+ +
";class=org.cytoscape.search.ui.BasicDraggablePanel");
}
return dataflavor;
}
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-11 17:33:45 UTC (rev 17770)
+++
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/MainPanel.java
2009-08-11 18:28:04 UTC (rev 17771)
@@ -240,7 +240,6 @@
orButton.setActionCommand("OR");
orButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
-
Cytoscape.getSwingPropertyChangeSupport().firePropertyChange(Cytoscape.NETWORK_LOADED,null,null);
if (orButton.isSelected()) {
SearchPanelFactory.getGlobalInstance(netmgr)
.updateSearchField();
Modified:
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/RootPanel.java
===================================================================
---
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/RootPanel.java
2009-08-11 17:33:45 UTC (rev 17770)
+++
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/RootPanel.java
2009-08-11 18:28:04 UTC (rev 17771)
@@ -57,7 +57,12 @@
public CyNetworkManager getNetworkManager() {
return netmgr;
}
-
+
+ public void clearAll(){
+ list.clear();
+ this.removeAll();
+ }
+
public void relayout() {
GridBagConstraints gc = new GridBagConstraints();
gc.gridx = 0;
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-11 17:33:45 UTC (rev 17770)
+++
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/SearchPanel.java
2009-08-11 18:28:04 UTC (rev 17771)
@@ -15,4 +15,10 @@
abstract public void clearAll();
+ abstract public RootPanel getattrPanel();
+
+ abstract public MainPanel getmainPanel();
+
+ abstract public void initattrPanel();
+
}
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-11 17:33:45 UTC (rev 17770)
+++
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/SearchPanelImpl.java
2009-08-11 18:28:04 UTC (rev 17771)
@@ -3,8 +3,6 @@
import java.awt.Dimension;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -20,11 +18,8 @@
import org.cytoscape.search.util.AttributeTypes;
import org.cytoscape.session.CyNetworkManager;
-import cytoscape.Cytoscape;
+public class SearchPanelImpl extends SearchPanel {
-public class SearchPanelImpl extends SearchPanel implements
- PropertyChangeListener {
-
private static final long serialVersionUID = 1L;
private CyNetworkManager netmgr = null;
private MainPanel mp;
@@ -41,32 +36,8 @@
super();
this.netmgr = nm;
initialize();
- initListeners();
}
- private void initListeners() {
- System.out.println("I am init listeners");
-
Cytoscape.getSwingPropertyChangeSupport().addPropertyChangeListener(
- this);
- NetworkModifiedListener nml = new NetworkModifiedListener();
-
Cytoscape.getPropertyChangeSupport().addPropertyChangeListener(nml);
- System.out.println("Listeners are initiated");
- if (Cytoscape.getSwingPropertyChangeSupport()
- .getPropertyChangeListeners() != null) {
- System.out.println("Number of listeners for Network
Creation:"
- +
Cytoscape.getSwingPropertyChangeSupport()
-
.getPropertyChangeListeners().length);
- if (Cytoscape.getSwingPropertyChangeSupport()
-
.getPropertyChangeListeners()[0].equals(this)) {
- System.out.println("Yeah");
- }
- if (Cytoscape.getPropertyChangeSupport()
-
.getPropertyChangeListeners()[0].equals(nml)) {
-
System.out.println("YahooooooooooOO!!!!!!!!!!!!");
- }
- }
- }
-
/**
* This method initializes this
*
@@ -85,6 +56,19 @@
g1.anchor = GridBagConstraints.NORTHWEST;
mp = new MainPanel(netmgr);
attrPanel = new RootPanel(netmgr);
+ initattrPanel();
+ jsp = new JScrollPane(attrPanel);
+ split = new JSplitPane();
+ split.setOrientation(JSplitPane.VERTICAL_SPLIT);
+ split.setTopComponent(mp);
+ split.setBottomComponent(jsp);
+ split.setMinimumSize(new Dimension(280, 200));
+ this.add(split, g1);
+
+ }
+
+ public void initattrPanel() {
+
CyNetwork net = netmgr.getCurrentNetwork();
if (net != null) {
CyDataTable nodetable = net.getCyDataTables("NODE").get(
@@ -139,16 +123,16 @@
}
}
- jsp = new JScrollPane(attrPanel);
- split = new JSplitPane();
- split.setOrientation(JSplitPane.VERTICAL_SPLIT);
- split.setTopComponent(mp);
- split.setBottomComponent(jsp);
- split.setMinimumSize(new Dimension(280, 200));
- this.add(split, g1);
+ }
+ public RootPanel getattrPanel() {
+ return attrPanel;
}
+ public MainPanel getmainPanel() {
+ return mp;
+ }
+
public void performSearch(boolean reindex) {
String query = mp.getQuery();
System.out.println(query);
@@ -239,33 +223,4 @@
}
}
- @Override
- public void propertyChange(PropertyChangeEvent event) {
- // TODO Auto-generated method stub
- System.out.println("I am in property change listener");
- if (event.getPropertyName() != null) {
- String propertyname = event.getPropertyName();
- if (propertyname.equals(Cytoscape.NETWORK_CREATED)) {
- System.out.println("Network Created");
- } else if
(propertyname.equals(Cytoscape.NETWORK_LOADED)) {
- System.out.println("Network Loaded");
- } else if
(propertyname.equals(Cytoscape.NETWORK_MODIFIED)) {
- System.out.println("Network Modified");
- }
- }
- }
}
-
-class NetworkModifiedListener implements PropertyChangeListener {
-
- public NetworkModifiedListener() {
- System.out.println("I am in Network Modified Listener
Initialization");
- }
-
- @Override
- public void propertyChange(PropertyChangeEvent event) {
- // TODO Auto-generated method stub
- System.out.println("I am in Network Modified Listener");
- }
-
-}
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-11 17:33:45 UTC (rev 17770)
+++
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/SearchPluginImpl.java
2009-08-11 18:28:04 UTC (rev 17771)
@@ -20,6 +20,6 @@
public void initPanel() {
SearchPanel esp = SearchPanelFactory.getGlobalInstance(netmgr);
- desktop.getCytoPanel(SwingConstants.EAST).add("Query
Builder",esp);
+ desktop.getCytoPanel(SwingConstants.WEST).add("Query
Builder",esp);
}
}
Added:
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/event/HistoryHandler.java
===================================================================
---
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/event/HistoryHandler.java
(rev 0)
+++
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/event/HistoryHandler.java
2009-08-11 18:28:04 UTC (rev 17771)
@@ -0,0 +1,25 @@
+package org.cytoscape.search.ui.event;
+
+import org.cytoscape.session.SessionLoadedEvent;
+import org.cytoscape.session.SessionLoadedListener;
+import org.cytoscape.session.SessionSavedEvent;
+import org.cytoscape.session.SessionSavedListener;
+
+public class HistoryHandler implements SessionLoadedListener,
+ SessionSavedListener {
+
+ void init() {
+ // register the listeners
+ //
cytoscape.Cytoscape.getPropertyChangeSupport().addPropertyChangeListener(this)
+ }
+
+ public void handleEvent(SessionSavedEvent e) {
+ // save the search history here
+ System.out.println("Session Saved");
+ }
+
+ public void handleEvent(SessionLoadedEvent e) {
+ // restore session here
+ System.out.println("Session Loaded");
+ }
+}
Added:
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/event/SearchPanelEventHandlerImpl.java
===================================================================
---
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/event/SearchPanelEventHandlerImpl.java
(rev 0)
+++
csplugins/trunk/soc/srinivasarao/search-ui/src/main/java/org/cytoscape/search/ui/event/SearchPanelEventHandlerImpl.java
2009-08-11 18:28:04 UTC (rev 17771)
@@ -0,0 +1,81 @@
+package org.cytoscape.search.ui.event;
+
+import org.cytoscape.search.EnhancedSearch;
+import org.cytoscape.search.ui.RootPanel;
+import org.cytoscape.search.ui.SearchPanelFactory;
+import org.cytoscape.session.CyNetworkManager;
+import org.cytoscape.session.events.NetworkAboutToBeDestroyedEvent;
+import org.cytoscape.session.events.NetworkAboutToBeDestroyedListener;
+import org.cytoscape.session.events.NetworkAddedEvent;
+import org.cytoscape.session.events.NetworkAddedListener;
+import org.cytoscape.session.events.NetworkViewAboutToBeDestroyedEvent;
+import org.cytoscape.session.events.NetworkViewAboutToBeDestroyedListener;
+import org.cytoscape.session.events.NetworkViewAddedEvent;
+import org.cytoscape.session.events.NetworkViewAddedListener;
+import org.cytoscape.session.events.SetCurrentNetworkEvent;
+import org.cytoscape.session.events.SetCurrentNetworkListener;
+import org.cytoscape.session.events.SetCurrentNetworkViewEvent;
+import org.cytoscape.session.events.SetCurrentNetworkViewListener;
+
+public class SearchPanelEventHandlerImpl implements NetworkAddedListener,
+ NetworkViewAddedListener, SetCurrentNetworkListener,
+ SetCurrentNetworkViewListener,
NetworkAboutToBeDestroyedListener,
+ NetworkViewAboutToBeDestroyedListener {
+
+ private CyNetworkManager netmgr;
+ private EnhancedSearch es;
+
+ public SearchPanelEventHandlerImpl(CyNetworkManager nm, EnhancedSearch
es) {
+ this.netmgr = nm;
+ this.es = es;
+ }
+
+ @Override
+ public void handleEvent(NetworkAddedEvent event) {
+ // TODO Auto-generated method stub
+ if (es.getNetworkIndexStatus(event.getNetwork()) !=
EnhancedSearch.INDEX_SET
+ && es.getNetworkIndexStatus(event.getNetwork())
!= EnhancedSearch.REINDEX)
+ es.addNetwork(event.getNetwork());
+ }
+
+ @Override
+ public void handleEvent(NetworkViewAddedEvent event) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void handleEvent(SetCurrentNetworkEvent event) {
+ RootPanel attrPanel =
SearchPanelFactory.getGlobalInstance(netmgr)
+ .getattrPanel();
+ attrPanel.clearAll();
+ SearchPanelFactory.getGlobalInstance(netmgr).initattrPanel();
+ if (netmgr.getCurrentNetwork() != null) {
+
SearchPanelFactory.getGlobalInstance(netmgr).getmainPanel()
+ .enableSearch();
+ }
+ }
+
+ @Override
+ public void handleEvent(SetCurrentNetworkViewEvent event) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void handleEvent(NetworkAboutToBeDestroyedEvent event) {
+ // TODO Auto-generated method stub
+ es.removeNetworkIndex(event.getNetwork());
+
SearchPanelFactory.getGlobalInstance(netmgr).getmainPanel().setEnabled(
+ false);
+
+ }
+
+ @Override
+ public void handleEvent(NetworkViewAboutToBeDestroyedEvent event) {
+ // TODO Auto-generated method stub
+ if
(event.getNetworkView().equals(netmgr.getCurrentNetworkView()))
+
SearchPanelFactory.getGlobalInstance(netmgr).getmainPanel()
+ .setEnabled(false);
+ }
+}
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-11 17:33:45 UTC (rev 17770)
+++
csplugins/trunk/soc/srinivasarao/search-ui/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2009-08-11 18:28:04 UTC (rev 17771)
@@ -19,7 +19,34 @@
interface="org.cytoscape.search.ui.SearchPlugin">
</osgi:service>
+ <osgi:service id="SearchPanelEventHandlerService"
ref="SearchPanelEventHandlerImpl">
+ <osgi:interfaces>
+ <value>org.cytoscape.session.events.NetworkAddedListener
+ </value>
+
<value>org.cytoscape.session.events.SetCurrentNetworkListener
+ </value>
+
<value>org.cytoscape.session.events.SetCurrentNetworkViewListener
+ </value>
+
<value>org.cytoscape.session.events.NetworkViewAddedListener
+ </value>
+ <value>
+
org.cytoscape.session.events.NetworkAboutToBeDestroyedListener
+ </value>
+ <value>
+
org.cytoscape.session.events.NetworkViewAboutToBeDestroyedListener
+ </value>
+ </osgi:interfaces>
+ </osgi:service>
+ <osgi:service id="HistoryHandlerService" ref="HistoryHandler">
+ <osgi:interfaces>
+ <value>org.cytoscape.session.SessionLoadedListener
+ </value>
+ <value>org.cytoscape.session.SessionSavedListener
+ </value>
+ </osgi:interfaces>
+ </osgi:service>
+
<!-- Import Services -->
<osgi:reference id="cyNetworkManagerServiceRef"
@@ -30,4 +57,7 @@
<osgi:reference id="cytoscapeDesktopServiceRef"
interface="cytoscape.view.CySwingApplication" />
+ <osgi:reference id="EnhancedSearchService"
interface="org.cytoscape.search.EnhancedSearch">
+ </osgi:reference>
+
</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-11 17:33:45 UTC (rev 17770)
+++
csplugins/trunk/soc/srinivasarao/search-ui/src/main/resources/META-INF/spring/bundle-context.xml
2009-08-11 18:28:04 UTC (rev 17771)
@@ -1,17 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd";
- default-lazy-init="false">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd";
+ default-lazy-init="false">
- <!-- regular spring configuration file defining the beans for this
- bundle. We've kept the osgi definitions in a separate
- configuration file so that this file can easily be used
- for integration testing outside of an OSGi environment -->
+ <!--
+ regular spring configuration file defining the beans for this
bundle.
+ We've kept the osgi definitions in a separate configuration
file so
+ that this file can easily be used for integration testing
outside of
+ an OSGi environment
+ -->
- <bean name="SearchPlugin" class="org.cytoscape.search.ui.SearchPluginImpl" >
+ <bean name="SearchPlugin"
class="org.cytoscape.search.ui.SearchPluginImpl">
<constructor-arg ref="cytoscapeDesktopServiceRef" />
<constructor-arg ref="cyNetworkManagerServiceRef" />
- </bean>
-
+ </bean>
+
+ <bean name="SearchPanelEventHandlerImpl"
+
class="org.cytoscape.search.ui.event.SearchPanelEventHandlerImpl">
+ <constructor-arg ref="cyNetworkManagerServiceRef" />
+ <constructor-arg ref="EnhancedSearchService" />
+ </bean>
+
+ <bean name="HistoryHandler"
class="org.cytoscape.search.ui.event.HistoryHandler">
+ </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
-~----------~----~----~----~------~----~------~--~---
