Author: clopes
Date: 2012-06-04 09:56:49 -0700 (Mon, 04 Jun 2012)
New Revision: 29437
Modified:
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/BirdsEyeViewHandler.java
Log:
Fixed a NPE
Modified:
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/BirdsEyeViewHandler.java
===================================================================
---
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/BirdsEyeViewHandler.java
2012-06-04 14:34:36 UTC (rev 29436)
+++
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/BirdsEyeViewHandler.java
2012-06-04 16:56:49 UTC (rev 29437)
@@ -122,24 +122,31 @@
}
private final void updateBEV(final RenderingEngine<CyNetwork>
newEngine) {
- final CyNetworkView newViewModel = (CyNetworkView)
newEngine.getViewModel();
-
- JPanel presentationPanel = presentationMap.get(newViewModel);
-
- if (presentationPanel == null) {
- logger.debug("Creating new BEV for network SUID: " +
newViewModel.getModel().getSUID());
- presentationPanel = new JPanel();
- viewToEngineMap.put(newViewModel,
bevFactory.createRenderingEngine(presentationPanel, newViewModel));
- presentationMap.put((CyNetworkView) newViewModel,
presentationPanel);
+ JPanel presentationPanel = null;
+
+ if (newEngine != null) {
+ final CyNetworkView newViewModel = (CyNetworkView)
newEngine.getViewModel();
+ presentationPanel = presentationMap.get(newViewModel);
+
+ if (presentationPanel == null) {
+ logger.debug("Creating new BEV for network
SUID: " + newViewModel.getModel().getSUID());
+ presentationPanel = new JPanel();
+ viewToEngineMap.put(newViewModel,
bevFactory.createRenderingEngine(presentationPanel, newViewModel));
+ presentationMap.put((CyNetworkView)
newViewModel, presentationPanel);
+ }
+
+ final Dimension currentPanelSize = bevPanel.getSize();
+ bevPanel.setLayout(new BorderLayout());
+ presentationPanel.setSize(currentPanelSize);
+ presentationPanel.setPreferredSize(currentPanelSize);
}
- final Dimension currentPanelSize = bevPanel.getSize();
- bevPanel.setLayout(new BorderLayout());
- presentationPanel.setSize(currentPanelSize);
- presentationPanel.setPreferredSize(currentPanelSize);
bevPanel.removeAll();
- bevPanel.add(presentationPanel, BorderLayout.CENTER);
- bevPanel.updateUI();
+
+ if (presentationPanel != null)
+ bevPanel.add(presentationPanel, BorderLayout.CENTER);
+
+ bevPanel.repaint();
}
@Override
--
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.
