Author: rozagh
Date: 2012-08-31 10:52:16 -0700 (Fri, 31 Aug 2012)
New Revision: 30304
Removed:
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/events/NetworkViewChangedEvent.java
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/events/NetworkViewChangedListener.java
Modified:
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/NetworkViewManager.java
Log:
fixes #934 removed the NetworkViewChangedEvent and Listener interface and its
implementation in NetworkViewMnagaer.
Deleted:
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/events/NetworkViewChangedEvent.java
===================================================================
---
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/events/NetworkViewChangedEvent.java
2012-08-31 15:53:59 UTC (rev 30303)
+++
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/events/NetworkViewChangedEvent.java
2012-08-31 17:52:16 UTC (rev 30304)
@@ -1,25 +0,0 @@
-package org.cytoscape.view.model.events;
-
-import java.util.Collection;
-
-import org.cytoscape.event.AbstractCyPayloadEvent;
-import org.cytoscape.model.CyNetwork;
-import org.cytoscape.view.model.CyNetworkView;
-
-/**
- * Fired to indicated that a {@link CyNetworkView} has been modified in some
way.
- * @CyAPI.Final.Class
- */
-public final class NetworkViewChangedEvent extends
AbstractCyPayloadEvent<CyNetworkView, ViewChangeRecord<CyNetwork>> {
-
- /**
- * Constructor.
- * @param source The network view that has changed.
- * @param networkViewChanges A collection of view change records that
describe the changes made to the
- * network view.
- */
- public NetworkViewChangedEvent(CyNetworkView source,
Collection<ViewChangeRecord<CyNetwork>> networkViewChanges) {
- super(source, NetworkViewChangedListener.class,
networkViewChanges);
- }
-
-}
Deleted:
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/events/NetworkViewChangedListener.java
===================================================================
---
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/events/NetworkViewChangedListener.java
2012-08-31 15:53:59 UTC (rev 30303)
+++
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/events/NetworkViewChangedListener.java
2012-08-31 17:52:16 UTC (rev 30304)
@@ -1,17 +0,0 @@
-package org.cytoscape.view.model.events;
-
-import org.cytoscape.event.CyListener;
-
-/**
- * Listener for {@linkplain NetworkViewChangedEvent}.
- * @CyAPI.Spi.Interface
- */
-public interface NetworkViewChangedListener extends CyListener {
-
- /**
- * Process event.
- *
- * @param e the {@link NetworkViewChangedEvent} to be handled.
- */
- void handleEvent(NetworkViewChangedEvent e);
-}
Modified:
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/NetworkViewManager.java
===================================================================
---
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/NetworkViewManager.java
2012-08-31 15:53:59 UTC (rev 30303)
+++
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/NetworkViewManager.java
2012-08-31 17:52:16 UTC (rev 30304)
@@ -75,8 +75,6 @@
import org.cytoscape.view.model.events.NetworkViewAboutToBeDestroyedListener;
import org.cytoscape.view.model.events.NetworkViewAddedEvent;
import org.cytoscape.view.model.events.NetworkViewAddedListener;
-import org.cytoscape.view.model.events.NetworkViewChangedEvent;
-import org.cytoscape.view.model.events.NetworkViewChangedListener;
import org.cytoscape.view.model.events.ViewChangeRecord;
import org.cytoscape.view.presentation.RenderingEngine;
import org.cytoscape.view.presentation.RenderingEngineFactory;
@@ -95,7 +93,7 @@
*/
public class NetworkViewManager extends InternalFrameAdapter implements
NetworkViewAddedListener,
NetworkViewAboutToBeDestroyedListener,
SetCurrentNetworkViewListener, SetCurrentNetworkListener,
- NetworkViewChangedListener, RowsSetListener,
VisualStyleChangedListener {
+ RowsSetListener, VisualStyleChangedListener {
private static final Logger logger =
LoggerFactory.getLogger(NetworkViewManager.class);
@@ -459,48 +457,7 @@
iframe.setVisible(true);
}
- @Override
- public void handleEvent(final NetworkViewChangedEvent e) {
- final Collection<ViewChangeRecord<CyNetwork>> records =
e.getPayloadCollection();
- SwingUtilities.invokeLater(new Runnable() {
- @Override
- public void run() {
- updateInternalFrame(records);
- }
- });
- }
-
- private final void updateInternalFrame(final
Collection<ViewChangeRecord<CyNetwork>> records) {
- for (final ViewChangeRecord<CyNetwork> record : records) {
- CyNetworkView view = (CyNetworkView)(record.getView());
- JInternalFrame iframe =
presentationContainerMap.get(view);
- if ( iframe == null )
- return;
-
- if
(record.getVisualProperty().equals(BasicVisualLexicon.NETWORK_WIDTH)) {
- int w = ((Double) record.getValue()).intValue();
- int h = iframe.getSize().height;
- updateNetworkSize(view, w, h);
- } else if
(record.getVisualProperty().equals(BasicVisualLexicon.NETWORK_HEIGHT)) {
- int w = iframe.getSize().width;
- int h = ((Double) record.getValue()).intValue();
- updateNetworkSize(view, w, h);
- } else if
(record.getVisualProperty().equals(BasicVisualLexicon.NETWORK_TITLE)) {
- updateNetworkTitle(view);
- }
- }
- }
-
- private void updateNetworkTitle(CyNetworkView view) {
- JInternalFrame frame = presentationContainerMap.get(view);
- if (frame != null) {
- final String title = getTitle(view);
- frame.setTitle(title);
- frame.repaint();
- }
- }
-
private String getTitle(CyNetworkView view) {
String title =
view.getVisualProperty(BasicVisualLexicon.NETWORK_TITLE);
--
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.
