Author: kono
Date: 2010-08-04 16:02:35 -0700 (Wed, 04 Aug 2010)
New Revision: 21205
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewEditorImpl.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewPanelImpl.java
core3/vizmap-gui-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi-vizmapper.xml
Log:
Presentation module classes are renamed for consistency.
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewEditorImpl.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewEditorImpl.java
2010-08-04 23:01:19 UTC (rev 21204)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewEditorImpl.java
2010-08-04 23:02:35 UTC (rev 21205)
@@ -607,7 +607,7 @@
RenderingEngine presentation = cyNetworkManager
.getCurrentPresentation();
- icon = presentation.getDefaultIcon(vp);
+ icon = presentation.createIcon(vp);
}
setText(vp.getDisplayName() + " = "
+ selectedStyle.getDefaultValue(vp));
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewPanelImpl.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewPanelImpl.java
2010-08-04 23:01:19 UTC (rev 21204)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewPanelImpl.java
2010-08-04 23:02:35 UTC (rev 21205)
@@ -49,7 +49,7 @@
import org.cytoscape.model.CyNode;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.model.CyNetworkViewFactory;
-import org.cytoscape.view.presentation.PresentationFactory;
+import org.cytoscape.view.presentation.RenderingEngineFactory;
import org.cytoscape.view.vizmap.VisualStyle;
import org.cytoscape.view.vizmap.gui.DefaultViewPanel;
import org.cytoscape.view.vizmap.gui.event.SelectedVisualStyleSwitchedEvent;
@@ -94,7 +94,7 @@
private CyNetworkViewFactory cyNetworkViewFactory;
// For setting presentation (rendered canvas) to this panel
- private PresentationFactory presentationFactory;
+ private RenderingEngineFactory presentationFactory;
/**
* Creates a new DefaultViewPanel object.
@@ -105,7 +105,7 @@
* DOCUMENT ME!
*/
public DefaultViewPanelImpl(CyNetworkFactory cyNetworkFactory,
- CyNetworkViewFactory cyNetworkViewFactory,
PresentationFactory presentationFactory) {
+ CyNetworkViewFactory cyNetworkViewFactory,
RenderingEngineFactory presentationFactory) {
this.cyNetworkViewFactory = cyNetworkViewFactory;
this.cyNetworkFactory = cyNetworkFactory;
this.presentationFactory = presentationFactory;
@@ -173,7 +173,7 @@
// TODO: is this correct???
this.removeAll();
- presentationFactory.addPresentation(this, dummyview);
+ presentationFactory.render(this, dummyview);
//canvas.setLocation(PADDING / 2, PADDING / 2);
//vs.apply(dummyview);
Modified:
core3/vizmap-gui-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi-vizmapper.xml
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi-vizmapper.xml
2010-08-04 23:01:19 UTC (rev 21204)
+++
core3/vizmap-gui-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi-vizmapper.xml
2010-08-04 23:02:35 UTC (rev 21205)
@@ -38,7 +38,7 @@
<!-- Presentation Factory -->
<osgi:reference id="presentationFactoryServiceRef"
- interface="org.cytoscape.view.presentation.PresentationFactory"
/>
+
interface="org.cytoscape.view.presentation.RenderingEngineFactory" />
<!-- Reference to the network factory service -->
<osgi:reference id="cyNetworkFactoryServiceRef"
--
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.
