Author: kono
Date: 2012-05-01 18:27:16 -0700 (Tue, 01 May 2012)
New Revision: 29072
Added:
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/events/FitContentListener.java
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/events/FitSelectedListener.java
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/events/UpdateNetworkPresentationListener.java
Removed:
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/events/FitContentEventListener.java
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/events/FitSelectedEventListener.java
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/events/UpdateNetworkPresentationEventListener.java
Modified:
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/events/FitContentEvent.java
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/events/FitSelectedEvent.java
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/events/UpdateNetworkPresentationEvent.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/BirdsEyeView.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DGraphView.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DingNavigationRenderingEngineFactory.java
Log:
Events had bee renamed for naming consistency.
Modified:
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/events/FitContentEvent.java
===================================================================
---
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/events/FitContentEvent.java
2012-05-02 00:51:44 UTC (rev 29071)
+++
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/events/FitContentEvent.java
2012-05-02 01:27:16 UTC (rev 29072)
@@ -23,6 +23,6 @@
* @param source network view to be fitted to the container.
*/
public FitContentEvent(final CyNetworkView source) {
- super(source, FitContentEventListener.class);
+ super(source, FitContentListener.class);
}
}
Deleted:
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/events/FitContentEventListener.java
===================================================================
---
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/events/FitContentEventListener.java
2012-05-02 00:51:44 UTC (rev 29071)
+++
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/events/FitContentEventListener.java
2012-05-02 01:27:16 UTC (rev 29072)
@@ -1,19 +0,0 @@
-package org.cytoscape.view.model.events;
-
-import org.cytoscape.event.CyListener;
-
-/**
- * Listener for {@linkplain FitContentEvent}.
- *
- * @author kono
- * @CyAPI.Spi.Interface
- */
-public interface FitContentEventListener extends CyListener {
-
- /**
- * Process the event. Usually, this handler will fire event to the
presentation layer and invoke the redraw method in the rendering engine.
- *
- * @param e
- */
- public void handleEvent(FitContentEvent e);
-}
Copied:
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/events/FitContentListener.java
(from rev 28983,
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/events/FitContentEventListener.java)
===================================================================
---
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/events/FitContentListener.java
(rev 0)
+++
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/events/FitContentListener.java
2012-05-02 01:27:16 UTC (rev 29072)
@@ -0,0 +1,18 @@
+package org.cytoscape.view.model.events;
+
+import org.cytoscape.event.CyListener;
+
+/**
+ * Listener for {@linkplain FitContentEvent}.
+ *
+ * @CyAPI.Spi.Interface
+ */
+public interface FitContentListener extends CyListener {
+
+ /**
+ * Process the event. Usually, this handler will fire event to the
presentation layer and invoke the redraw method in the rendering engine.
+ *
+ * @param e
+ */
+ public void handleEvent(FitContentEvent e);
+}
Modified:
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/events/FitSelectedEvent.java
===================================================================
---
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/events/FitSelectedEvent.java
2012-05-02 00:51:44 UTC (rev 29071)
+++
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/events/FitSelectedEvent.java
2012-05-02 01:27:16 UTC (rev 29072)
@@ -25,6 +25,6 @@
* @param source target network view for fitting.
*/
public FitSelectedEvent(final CyNetworkView source) {
- super(source, FitSelectedEventListener.class);
+ super(source, FitSelectedListener.class);
}
}
Deleted:
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/events/FitSelectedEventListener.java
===================================================================
---
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/events/FitSelectedEventListener.java
2012-05-02 00:51:44 UTC (rev 29071)
+++
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/events/FitSelectedEventListener.java
2012-05-02 01:27:16 UTC (rev 29072)
@@ -1,19 +0,0 @@
-package org.cytoscape.view.model.events;
-
-import org.cytoscape.event.CyListener;
-
-/**
- * Listener for {@linkplain FitSelectedEvent}.
- *
- * @author kono
- * @CyAPI.Spi.Interface
- */
-public interface FitSelectedEventListener extends CyListener {
-
- /**
- * Fit the selected nodes/edges to the current container. Usually this
fires another event to the presentation layer.
- *
- * @param e Event containing target network view.
- */
- public void handleEvent(FitSelectedEvent e);
-}
Copied:
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/events/FitSelectedListener.java
(from rev 28983,
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/events/FitSelectedEventListener.java)
===================================================================
---
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/events/FitSelectedListener.java
(rev 0)
+++
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/events/FitSelectedListener.java
2012-05-02 01:27:16 UTC (rev 29072)
@@ -0,0 +1,18 @@
+package org.cytoscape.view.model.events;
+
+import org.cytoscape.event.CyListener;
+
+/**
+ * Listener for {@linkplain FitSelectedEvent}.
+ *
+ * @CyAPI.Spi.Interface
+ */
+public interface FitSelectedListener extends CyListener {
+
+ /**
+ * Fit the selected nodes/edges to the current container. Usually this
fires another event to the presentation layer.
+ *
+ * @param e Event containing target network view.
+ */
+ public void handleEvent(FitSelectedEvent e);
+}
Modified:
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/events/UpdateNetworkPresentationEvent.java
===================================================================
---
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/events/UpdateNetworkPresentationEvent.java
2012-05-02 00:51:44 UTC (rev 29071)
+++
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/events/UpdateNetworkPresentationEvent.java
2012-05-02 01:27:16 UTC (rev 29072)
@@ -29,6 +29,6 @@
* associated with this view-model use this event.
*/
public UpdateNetworkPresentationEvent(final CyNetworkView source) {
- super(source, UpdateNetworkPresentationEventListener.class);
+ super(source, UpdateNetworkPresentationListener.class);
}
}
Deleted:
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/events/UpdateNetworkPresentationEventListener.java
===================================================================
---
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/events/UpdateNetworkPresentationEventListener.java
2012-05-02 00:51:44 UTC (rev 29071)
+++
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/events/UpdateNetworkPresentationEventListener.java
2012-05-02 01:27:16 UTC (rev 29072)
@@ -1,20 +0,0 @@
-package org.cytoscape.view.model.events;
-
-import org.cytoscape.event.CyListener;
-
-/**
- * Listener for {@linkplain UpdateNetworkPresentationEvent}. Usually,
- * presentation layer objects implements this event handler and redraw the
- * presentation (visualization) once it catches this event.
- * @CyAPI.Spi.Interface
- */
-public interface UpdateNetworkPresentationEventListener extends CyListener {
-
- /**
- * Listener implementing this method will redraw the presentation if
necessary.
- *
- * @param e
- * Event containing target network view-model.
- */
- public void handleEvent(UpdateNetworkPresentationEvent e);
-}
Copied:
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/events/UpdateNetworkPresentationListener.java
(from rev 28983,
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/events/UpdateNetworkPresentationEventListener.java)
===================================================================
---
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/events/UpdateNetworkPresentationListener.java
(rev 0)
+++
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/events/UpdateNetworkPresentationListener.java
2012-05-02 01:27:16 UTC (rev 29072)
@@ -0,0 +1,20 @@
+package org.cytoscape.view.model.events;
+
+import org.cytoscape.event.CyListener;
+
+/**
+ * Listener for {@linkplain UpdateNetworkPresentationEvent}. Usually,
+ * presentation layer objects implements this event handler and redraw the
+ * presentation (visualization) once it catches this event.
+ * @CyAPI.Spi.Interface
+ */
+public interface UpdateNetworkPresentationListener extends CyListener {
+
+ /**
+ * Listener implementing this method will redraw the presentation if
necessary.
+ *
+ * @param e
+ * Event containing target network view-model.
+ */
+ public void handleEvent(UpdateNetworkPresentationEvent e);
+}
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/BirdsEyeView.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/BirdsEyeView.java
2012-05-02 00:51:44 UTC (rev 29071)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/BirdsEyeView.java
2012-05-02 01:27:16 UTC (rev 29072)
@@ -62,14 +62,14 @@
import org.cytoscape.view.model.VisualLexicon;
import org.cytoscape.view.model.VisualProperty;
import org.cytoscape.view.model.events.UpdateNetworkPresentationEvent;
-import org.cytoscape.view.model.events.UpdateNetworkPresentationEventListener;
+import org.cytoscape.view.model.events.UpdateNetworkPresentationListener;
import org.cytoscape.view.presentation.RenderingEngine;
/**
* Swing component to display overview of the network.
*
*/
-public class BirdsEyeView extends Component implements
RenderingEngine<CyNetwork>, UpdateNetworkPresentationEventListener {
+public class BirdsEyeView extends Component implements
RenderingEngine<CyNetwork>, UpdateNetworkPresentationListener {
private final static long serialVersionUID = 1202416511863994L;
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DGraphView.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DGraphView.java
2012-05-02 00:51:44 UTC (rev 29071)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DGraphView.java
2012-05-02 01:27:16 UTC (rev 29072)
@@ -127,9 +127,9 @@
import org.cytoscape.view.model.events.AddedEdgeViewsEvent;
import org.cytoscape.view.model.events.AddedNodeViewsEvent;
import org.cytoscape.view.model.events.FitContentEvent;
-import org.cytoscape.view.model.events.FitContentEventListener;
+import org.cytoscape.view.model.events.FitContentListener;
import org.cytoscape.view.model.events.FitSelectedEvent;
-import org.cytoscape.view.model.events.FitSelectedEventListener;
+import org.cytoscape.view.model.events.FitSelectedListener;
import org.cytoscape.view.model.events.UpdateNetworkPresentationEvent;
import org.cytoscape.view.presentation.RenderingEngine;
import org.cytoscape.view.presentation.property.BasicVisualLexicon;
@@ -152,7 +152,7 @@
*/
public class DGraphView extends AbstractDViewModel<CyNetwork> implements
CyNetworkView, RenderingEngine<CyNetwork>,
GraphView, Printable, AddedEdgesListener, AddedNodesListener,
AboutToRemoveEdgesListener,
- AboutToRemoveNodesListener, FitContentEventListener,
FitSelectedEventListener {
+ AboutToRemoveNodesListener, FitContentListener,
FitSelectedListener {
private static final Logger logger =
LoggerFactory.getLogger(DGraphView.class);
@@ -1146,6 +1146,7 @@
*/
@Override
public void updateView() {
+ //System.out.println("%% Update view called");
final long start = System.currentTimeMillis();
cyEventHelper.flushPayloadEvents();
m_networkCanvas.repaint();
@@ -1158,7 +1159,7 @@
setVisualProperty(BasicVisualLexicon.NETWORK_WIDTH,(double)imageWidth);
setVisualProperty(BasicVisualLexicon.NETWORK_HEIGHT,(double)imageHeight);
}
- logger.debug("Repaint finished in " +
(System.currentTimeMillis() - start) + " msec.");
+ //System.out.println("Repaint finished in " +
(System.currentTimeMillis() - start) + " msec.");
// Fire for updating other presentations.
cyEventHelper.fireEvent(new
UpdateNetworkPresentationEvent(this));
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DingNavigationRenderingEngineFactory.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DingNavigationRenderingEngineFactory.java
2012-05-02 00:51:44 UTC (rev 29071)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DingNavigationRenderingEngineFactory.java
2012-05-02 01:27:16 UTC (rev 29072)
@@ -13,7 +13,7 @@
import org.cytoscape.view.model.View;
import org.cytoscape.view.model.VisualLexicon;
import org.cytoscape.view.model.events.UpdateNetworkPresentationEvent;
-import org.cytoscape.view.model.events.UpdateNetworkPresentationEventListener;
+import org.cytoscape.view.model.events.UpdateNetworkPresentationListener;
import org.cytoscape.view.presentation.RenderingEngine;
import org.cytoscape.view.presentation.RenderingEngineFactory;
import org.cytoscape.view.presentation.RenderingEngineManager;
--
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.
