Author: jm
Date: 2011-01-14 11:50:54 -0800 (Fri, 14 Jan 2011)
New Revision: 23461
Modified:
core3/filter-impl/trunk/src/main/java/org/cytoscape/filter/internal/filters/view/FilterMainPanel.java
core3/filter-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
Log:
Ported some session-loading event handling
Modified:
core3/filter-impl/trunk/src/main/java/org/cytoscape/filter/internal/filters/view/FilterMainPanel.java
===================================================================
---
core3/filter-impl/trunk/src/main/java/org/cytoscape/filter/internal/filters/view/FilterMainPanel.java
2011-01-14 18:31:51 UTC (rev 23460)
+++
core3/filter-impl/trunk/src/main/java/org/cytoscape/filter/internal/filters/view/FilterMainPanel.java
2011-01-14 19:50:54 UTC (rev 23461)
@@ -96,6 +96,8 @@
import org.cytoscape.model.events.NetworkDestroyedEvent;
import org.cytoscape.model.events.NetworkDestroyedListener;
import org.cytoscape.session.CyApplicationManager;
+import org.cytoscape.session.events.SessionLoadedEvent;
+import org.cytoscape.session.events.SessionLoadedListener;
import org.cytoscape.session.events.SetCurrentNetworkViewEvent;
import org.cytoscape.session.events.SetCurrentNetworkViewListener;
import org.cytoscape.util.swing.DropDownMenuButton;
@@ -109,7 +111,8 @@
*
*/
public class FilterMainPanel extends JPanel implements ActionListener,
- ItemListener, PropertyChangeListener,
SetCurrentNetworkViewListener, NetworkAddedListener, NetworkDestroyedListener {
+ ItemListener, PropertyChangeListener,
SetCurrentNetworkViewListener,
+ NetworkAddedListener, NetworkDestroyedListener,
SessionLoadedListener {
// String constants used for seperator entries in the attribute combobox
private static final String filtersSeperator = "-- Filters --";
@@ -204,57 +207,13 @@
// theSettingPanel.refreshIndicesForWidgets();
// }
// }
-// if
(e.getPropertyName().equalsIgnoreCase(CytoscapeDesktop.NETWORK_VIEW_FOCUSED))
-// {
-// // If FilterPanel is not selected, do nothing
-// if (cmbSelectFilter.getSelectedItem() == null) {
-// return;
-// }
-//
-// //Refresh indices for UI widgets after network switch
-// CompositeFilter selectedFilter = (CompositeFilter)
cmbSelectFilter.getSelectedItem();
-//
selectedFilter.setNetwork(applicationManager.getCurrentNetwork());
-// FilterSettingPanel theSettingPanel=
filter2SettingPanelMap.get(selectedFilter);
-// theSettingPanel.refreshIndicesForWidgets();
-// }
-//
-// //Enable/disable select/deselect buttons
-// if
(e.getPropertyName().equalsIgnoreCase(Cytoscape.NETWORK_CREATED)
-// ||
e.getPropertyName().equalsIgnoreCase(Cytoscape.NETWORK_DESTROYED)
-//
||e.getPropertyName().equalsIgnoreCase(Cytoscape.NETWORK_LOADED)){
-// enableForNetwork();
-// }
-//
-// // For turning off listener during session loading
-//
if(e.getPropertyName().equals(Integer.toString(Cytoscape.SESSION_OPENED))) {
-// return; //ignore = true;
-// }
-//
-// if (e.getPropertyName().equals(Cytoscape.NETWORK_CREATED)
-// || e.getPropertyName().equals(Cytoscape.NETWORK_DESTROYED)
-// ||
e.getPropertyName().equals(Cytoscape.NETWORK_TITLE_MODIFIED)) {
-// updateFeedbackTableModel();
-// }
-//
-// if (
e.getPropertyName().equalsIgnoreCase(CytoscapeDesktop.NETWORK_VIEW_FOCUSED)
-// || e.getPropertyName().equals(Cytoscape.SESSION_LOADED)
-// ||
e.getPropertyName().equals(Cytoscape.CYTOSCAPE_INITIALIZED)
-// ||
e.getPropertyName().equals(CytoscapeDesktop.NETWORK_VIEWS_SELECTED)) {
-//
-// if (currentNetwork != null) {
-// currentNetwork.removeSelectEventListener(this);
-// }
-//
-// // Change the target network
-// currentNetwork = Cytoscape.getCurrentNetwork();
-//
-// if (currentNetwork != null) {
-// currentNetwork.addSelectEventListener(this);
-// updateFeedbackTableModel();
-// }
-// }
}
+ @Override
+ public void handleEvent(SessionLoadedEvent e) {
+ updateFeedbackTableModel();
+ }
+
public void handleNetworkFocused(CyNetworkView view) {
if (view == null) {
return;
Modified:
core3/filter-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/filter-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-01-14 18:31:51 UTC (rev 23460)
+++
core3/filter-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-01-14 19:50:54 UTC (rev 23461)
@@ -20,6 +20,7 @@
<osgi:service id="filterPanelService" ref="filterMainPanel">
<osgi:interfaces>
<value>org.cytoscape.session.events.SetCurrentNetworkViewListener</value>
+
<value>org.cytoscape.session.events.SessionLoadedListener</value>
<value>org.cytoscape.model.events.NetworkAddedListener</value>
<value>org.cytoscape.model.events.NetworkDestroyedListener</value>
</osgi:interfaces>
--
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.
