Author: kono
Date: 2011-03-02 16:09:22 -0800 (Wed, 02 Mar 2011)
New Revision: 24297
Modified:
core3/swing-application-impl/trunk/src/main/java/org/cytoscape/internal/view/BirdsEyeViewHandler.java
core3/swing-application-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
Log:
Birds Eye View bug fixed. Panel will be removed when view is deleted.
Modified:
core3/swing-application-impl/trunk/src/main/java/org/cytoscape/internal/view/BirdsEyeViewHandler.java
===================================================================
---
core3/swing-application-impl/trunk/src/main/java/org/cytoscape/internal/view/BirdsEyeViewHandler.java
2011-03-02 23:57:26 UTC (rev 24296)
+++
core3/swing-application-impl/trunk/src/main/java/org/cytoscape/internal/view/BirdsEyeViewHandler.java
2011-03-03 00:09:22 UTC (rev 24297)
@@ -50,11 +50,8 @@
import org.cytoscape.model.CyNetwork;
import org.cytoscape.session.CyApplicationManager;
-import org.cytoscape.session.events.SetCurrentNetworkEvent;
import org.cytoscape.session.events.SetCurrentRenderingEngineEvent;
import org.cytoscape.session.events.SetCurrentRenderingEngineListener;
-import org.cytoscape.view.model.CyNetworkView;
-import org.cytoscape.view.model.CyNetworkViewManager;
import org.cytoscape.view.model.events.NetworkViewDestroyedEvent;
import org.cytoscape.view.model.events.NetworkViewDestroyedListener;
import org.cytoscape.view.presentation.RenderingEngine;
@@ -69,8 +66,9 @@
public class BirdsEyeViewHandler implements SetCurrentRenderingEngineListener,
NetworkViewDestroyedListener {
- private static final Logger logger =
LoggerFactory.getLogger(BirdsEyeViewHandler.class);
-
+ private static final Logger logger = LoggerFactory
+ .getLogger(BirdsEyeViewHandler.class);
+
private static final Dimension DEF_PANEL_SIZE = new Dimension(280, 280);
private static final Color DEF_BACKGROUND_COLOR = Color.WHITE;
@@ -78,13 +76,13 @@
private final RenderingEngineFactory<CyNetwork> bevFactory;
private FrameListener frameListener = new FrameListener();
-
+
private final NetworkViewManager networkViewManager;
+ private final Container bevPanel;
- private final Container bevPanel;
-
private RenderingEngine<CyNetwork> engine;
+ private final CyApplicationManager appManager;
/**
* Creates a new BirdsEyeViewHandler object.
@@ -92,9 +90,11 @@
* @param desktopPane
* The JDesktopPane of the NetworkViewManager. Can be null.
*/
- public BirdsEyeViewHandler(final NetworkViewManager viewmgr,
+ public BirdsEyeViewHandler(final CyApplicationManager appManager,
+ final NetworkViewManager viewmgr,
final RenderingEngineFactory<CyNetwork> defaultFactory)
{
-
+
+ this.appManager = appManager;
this.networkViewManager = viewmgr;
this.bevPanel = new JPanel();
@@ -103,20 +103,11 @@
this.bevPanel.setBackground(DEF_BACKGROUND_COLOR);
this.bevFactory = defaultFactory;
-
+
final JDesktopPane desktopPane = viewmgr.getDesktopPane();
desktopPane.addComponentListener(new DesktopListener());
}
-
- @Override public void handleEvent(NetworkViewDestroyedEvent e) {
- // logger.debug("!!!!!!!!!! NetworkViewDestroyedEvent
+++++++++++");
- // // Cleanup the visualization container
- // bevPanel.removeAll();
- // RenderingEngine<CyNetwork> engine =
bevFactory.render(bevPanel,
- // appMgr.getCurrentNetworkView());
- }
-
private void setFocus() {
final JDesktopPane desktopPane =
networkViewManager.getDesktopPane();
if (desktopPane == null)
@@ -176,4 +167,14 @@
bevPanel.repaint();
}
+
+ @Override
+ public void handleEvent(NetworkViewDestroyedEvent e) {
+ logger.debug("!!!!!!!!!! NetworkViewDestroyedEvent
+++++++++++");
+ // Cleanup the visualization container
+ if (appManager.getCurrentNetworkView() == null) {
+ bevPanel.removeAll();
+ bevPanel.repaint();
+ }
+ }
}
Modified:
core3/swing-application-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/swing-application-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2011-03-02 23:57:26 UTC (rev 24296)
+++
core3/swing-application-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2011-03-03 00:09:22 UTC (rev 24297)
@@ -83,6 +83,7 @@
</bean>
<bean name="birdsEyeViewHandler"
class="org.cytoscape.internal.view.BirdsEyeViewHandler">
+ <constructor-arg ref="cyApplicationManagerServiceRef" />
<constructor-arg ref="networkViewManager" />
<constructor-arg
ref="dingNavigationPresentationFactoryServiceRef" />
</bean>
--
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.
