Author: kono
Date: 2012-03-02 13:32:35 -0800 (Fri, 02 Mar 2012)
New Revision: 28421
Modified:
core3/impl/trunk/filter-impl/src/main/java/org/cytoscape/filter/internal/filters/view/FilterMainPanel.java
core3/impl/trunk/filter-impl/src/main/java/org/cytoscape/filter/internal/filters/view/FilterSettingPanel.java
core3/impl/trunk/filter-impl/src/main/java/org/cytoscape/filter/internal/filters/view/InteractionFilterPanel.java
core3/impl/trunk/filter-impl/src/main/java/org/cytoscape/filter/internal/filters/view/TopoFilterPanel.java
core3/impl/trunk/filter-impl/src/main/java/org/cytoscape/filter/internal/quickfind/app/QuickFindApp.java
Log:
fixes #725 Confirmed to work without network view.
Modified:
core3/impl/trunk/filter-impl/src/main/java/org/cytoscape/filter/internal/filters/view/FilterMainPanel.java
===================================================================
---
core3/impl/trunk/filter-impl/src/main/java/org/cytoscape/filter/internal/filters/view/FilterMainPanel.java
2012-03-02 21:13:35 UTC (rev 28420)
+++
core3/impl/trunk/filter-impl/src/main/java/org/cytoscape/filter/internal/filters/view/FilterMainPanel.java
2012-03-02 21:32:35 UTC (rev 28421)
@@ -110,7 +110,7 @@
public class FilterMainPanel extends JPanel implements ActionListener,
ItemListener,
SetCurrentNetworkListener, NetworkAddedListener,
NetworkAboutToBeDestroyedListener, SessionLoadedListener, RowsSetListener,
- RowsCreatedListener,
NetworkViewAddedListener, FiltersChangedListener {
+ RowsCreatedListener,
FiltersChangedListener {
// String constants used for separator entries in the attribute combobox
private static final String filtersSeparator = "-- Filters --";
@@ -297,16 +297,11 @@
enableForNetwork();
updateFeedbackTableModel();
- }
-
- @Override
- public void handleEvent(final NetworkViewAddedEvent e) {
- if (!isShowing())
- return;
-
+
updateIndex();
}
+
public void updateFeedbackTableModel(){
SwingUtilities.invokeLater(new Runnable() {
@Override
@@ -545,14 +540,13 @@
}
private void updateIndex() {
- final CyNetworkView currentView =
applicationManager.getCurrentNetworkView();
+ final CyNetwork curNetwork =
applicationManager.getCurrentNetwork();
- if (currentView == null)
+ // Update only when current network is available.
+ if (curNetwork == null)
return;
- final CyNetwork network = currentView.getModel();
- taskManager.execute(new FilterIndexingTaskFactory(quickFind,
network));
-
+ taskManager.execute(new FilterIndexingTaskFactory(quickFind,
curNetwork));
updateCMBAttributes();
}
Modified:
core3/impl/trunk/filter-impl/src/main/java/org/cytoscape/filter/internal/filters/view/FilterSettingPanel.java
===================================================================
---
core3/impl/trunk/filter-impl/src/main/java/org/cytoscape/filter/internal/filters/view/FilterSettingPanel.java
2012-03-02 21:13:35 UTC (rev 28420)
+++
core3/impl/trunk/filter-impl/src/main/java/org/cytoscape/filter/internal/filters/view/FilterSettingPanel.java
2012-03-02 21:32:35 UTC (rev 28421)
@@ -61,6 +61,7 @@
import javax.swing.event.ChangeListener;
import javax.swing.event.MouseInputAdapter;
import javax.swing.text.JTextComponent;
+import javax.swing.text.View;
import org.cytoscape.application.CyApplicationManager;
import org.cytoscape.event.CyEventHelper;
@@ -465,7 +466,9 @@
private void updateView() {
eventHelper.flushPayloadEvents();
- applicationManager.getCurrentNetworkView().updateView();
+ final CyNetworkView view =
applicationManager.getCurrentNetworkView();
+ if(view != null)
+ view.updateView();
}
private void adjustBoundValues(Vector<String> pBoundVect, String
pDataType){
Modified:
core3/impl/trunk/filter-impl/src/main/java/org/cytoscape/filter/internal/filters/view/InteractionFilterPanel.java
===================================================================
---
core3/impl/trunk/filter-impl/src/main/java/org/cytoscape/filter/internal/filters/view/InteractionFilterPanel.java
2012-03-02 21:13:35 UTC (rev 28420)
+++
core3/impl/trunk/filter-impl/src/main/java/org/cytoscape/filter/internal/filters/view/InteractionFilterPanel.java
2012-03-02 21:32:35 UTC (rev 28421)
@@ -58,6 +58,7 @@
import org.cytoscape.filter.internal.filters.model.NodeInteractionFilter;
import org.cytoscape.filter.internal.filters.util.FilterUtil;
import
org.cytoscape.filter.internal.filters.util.WidestStringComboBoxPopupMenuListener;
+import org.cytoscape.view.model.CyNetworkView;
@SuppressWarnings("serial")
@@ -213,7 +214,10 @@
private void updateView() {
eventHelper.flushPayloadEvents();
- applicationManager.getCurrentNetworkView().updateView();
+ final CyNetworkView currentView =
applicationManager.getCurrentNetworkView();
+
+ if (currentView != null)
+ currentView.updateView();
}
/** This method is called from within the constructor to
Modified:
core3/impl/trunk/filter-impl/src/main/java/org/cytoscape/filter/internal/filters/view/TopoFilterPanel.java
===================================================================
---
core3/impl/trunk/filter-impl/src/main/java/org/cytoscape/filter/internal/filters/view/TopoFilterPanel.java
2012-03-02 21:13:35 UTC (rev 28420)
+++
core3/impl/trunk/filter-impl/src/main/java/org/cytoscape/filter/internal/filters/view/TopoFilterPanel.java
2012-03-02 21:32:35 UTC (rev 28421)
@@ -60,6 +60,7 @@
import org.cytoscape.filter.internal.filters.model.TopologyFilter;
import org.cytoscape.filter.internal.filters.util.FilterUtil;
import
org.cytoscape.filter.internal.filters.util.WidestStringComboBoxPopupMenuListener;
+import org.cytoscape.view.model.CyNetworkView;
@@ -207,7 +208,10 @@
private void updateView() {
eventHelper.flushPayloadEvents();
- applicationManager.getCurrentNetworkView().updateView();
+ final CyNetworkView currentView =
applicationManager.getCurrentNetworkView();
+
+ if (currentView != null)
+ currentView.updateView();
}
Modified:
core3/impl/trunk/filter-impl/src/main/java/org/cytoscape/filter/internal/quickfind/app/QuickFindApp.java
===================================================================
---
core3/impl/trunk/filter-impl/src/main/java/org/cytoscape/filter/internal/quickfind/app/QuickFindApp.java
2012-03-02 21:13:35 UTC (rev 28420)
+++
core3/impl/trunk/filter-impl/src/main/java/org/cytoscape/filter/internal/quickfind/app/QuickFindApp.java
2012-03-02 21:32:35 UTC (rev 28421)
@@ -179,7 +179,10 @@
if (index.getIndexType() ==
QuickFind.INDEX_NODES) {
SelectUtil.setSelectedNodeState(network, list, true);
-
applicationManager.getCurrentNetworkView().fitSelected();
+ final CyNetworkView currentView
= applicationManager.getCurrentNetworkView();
+
+ if (currentView != null)
+
currentView.fitSelected();
} else {
SelectUtil.setSelectedEdgeState(network, list, true);
@@ -280,7 +283,10 @@
public void run() {
SelectUtil.setSelectedNodeState(cyNetwork, toBeSelected, true);
SelectUtil.setSelectedNodeState(cyNetwork, toBeUnselected, false);
-
applicationManager.getCurrentNetworkView().updateView();
+ final CyNetworkView currentView =
applicationManager.getCurrentNetworkView();
+
+ if (currentView != null)
+ currentView.updateView();
}
});
}
@@ -312,7 +318,10 @@
public void run() {
SelectUtil.setSelectedEdgeState(cyNetwork, toBeSelected, true);
SelectUtil.setSelectedEdgeState(cyNetwork, toBeUnselected, false);
-
applicationManager.getCurrentNetworkView().updateView();
+ final CyNetworkView currentView =
applicationManager.getCurrentNetworkView();
+
+ if (currentView != null)
+ currentView.updateView();
}
});
}
--
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.
