Author: kono
Date: 2010-08-04 16:03:26 -0700 (Wed, 04 Aug 2010)
New Revision: 21207
Modified:
cytoscape3/trunk/application/src/main/java/cytoscape/internal/actions/PrintAction.java
cytoscape3/trunk/application/src/main/java/cytoscape/internal/view/BirdsEyeViewHandler.java
cytoscape3/trunk/application/src/main/java/cytoscape/internal/view/NetworkViewManager.java
cytoscape3/trunk/application/src/main/resources/META-INF/spring/bundle-context-osgi.xml
Log:
Presentation module classes are renamed for consistency.
Modified:
cytoscape3/trunk/application/src/main/java/cytoscape/internal/actions/PrintAction.java
===================================================================
---
cytoscape3/trunk/application/src/main/java/cytoscape/internal/actions/PrintAction.java
2010-08-04 23:03:04 UTC (rev 21206)
+++
cytoscape3/trunk/application/src/main/java/cytoscape/internal/actions/PrintAction.java
2010-08-04 23:03:26 UTC (rev 21207)
@@ -91,7 +91,7 @@
engine.setProperties(props);
- printJob.setPrintable(engine.getPrintable());
+ printJob.setPrintable(engine.createPrintable());
if (printJob.printDialog()) {
try {
Modified:
cytoscape3/trunk/application/src/main/java/cytoscape/internal/view/BirdsEyeViewHandler.java
===================================================================
---
cytoscape3/trunk/application/src/main/java/cytoscape/internal/view/BirdsEyeViewHandler.java
2010-08-04 23:03:04 UTC (rev 21206)
+++
cytoscape3/trunk/application/src/main/java/cytoscape/internal/view/BirdsEyeViewHandler.java
2010-08-04 23:03:26 UTC (rev 21207)
@@ -46,7 +46,7 @@
import javax.swing.JPanel;
import org.cytoscape.view.presentation.NavigationPresentation;
-import org.cytoscape.view.presentation.PresentationFactory;
+import org.cytoscape.view.presentation.RenderingEngineFactory;
import org.cytoscape.session.CyNetworkManager;
import org.cytoscape.session.events.NetworkViewDestroyedEvent;
@@ -69,14 +69,14 @@
FrameListener frameListener = new FrameListener();
final NetworkViewManager viewmgr;
final CyNetworkManager netmgr;
- final PresentationFactory prefact;
+ final RenderingEngineFactory prefact;
final Component bevHolder;
/**
* Creates a new BirdsEyeViewHandler object.
* @param desktopPane The JDesktopPane of the NetworkViewManager. Can
be null.
*/
- BirdsEyeViewHandler(final NetworkViewManager viewmgr, final
CyNetworkManager netmgr, PresentationFactory defaultFactory) {
+ BirdsEyeViewHandler(final NetworkViewManager viewmgr, final
CyNetworkManager netmgr, RenderingEngineFactory defaultFactory) {
this.viewmgr = viewmgr;
this.netmgr = netmgr;
Modified:
cytoscape3/trunk/application/src/main/java/cytoscape/internal/view/NetworkViewManager.java
===================================================================
---
cytoscape3/trunk/application/src/main/java/cytoscape/internal/view/NetworkViewManager.java
2010-08-04 23:03:04 UTC (rev 21206)
+++
cytoscape3/trunk/application/src/main/java/cytoscape/internal/view/NetworkViewManager.java
2010-08-04 23:03:26 UTC (rev 21207)
@@ -62,7 +62,7 @@
import org.cytoscape.session.events.SetCurrentNetworkViewEvent;
import org.cytoscape.session.events.SetCurrentNetworkViewListener;
import org.cytoscape.view.model.CyNetworkView;
-import org.cytoscape.view.presentation.PresentationFactory;
+import org.cytoscape.view.presentation.RenderingEngineFactory;
import org.cytoscape.view.presentation.RenderingEngine;
import cytoscape.view.CyHelpBroker;
@@ -93,9 +93,9 @@
private CyHelpBroker help;
// Supports multiple presentations
- private Map<String, PresentationFactory> factories;
+ private Map<String, RenderingEngineFactory> factories;
- private PresentationFactory currentPresentationFactory;
+ private RenderingEngineFactory currentPresentationFactory;
//TODO: discuss the name and key of props.
private static final String ID = "id";
@@ -113,7 +113,7 @@
*/
public NetworkViewManager(CyNetworkManager netmgr, Properties props,
CyHelpBroker help) {
- this.factories = new HashMap<String, PresentationFactory>();
+ this.factories = new HashMap<String, RenderingEngineFactory>();
this.netmgr = netmgr;
this.props = props;
@@ -139,7 +139,7 @@
* @param factory
* @param props
*/
- public void addPresentationFactory(PresentationFactory factory, Map
props) {
+ public void addPresentationFactory(RenderingEngineFactory factory, Map
props) {
System.out.print("\n\n\n Adding New Rendering Engine
>>>>>>>>>>");
Object rendererID = props.get(ID);
@@ -155,7 +155,7 @@
System.out.println(">>>> New Rendering Engine is Available: " +
rendererID +"\n\n\n");
}
- public void removePresentationFactory(PresentationFactory factory, Map
props) {
+ public void removePresentationFactory(RenderingEngineFactory factory,
Map props) {
factories.remove(props.get(ID));
}
@@ -373,7 +373,7 @@
desktopPane.add(iframe);
// iframe.setContentPane(
view.getContainer(iframe.getLayeredPane()) );
- this.presentationMap.put(view.getSource().getSUID(),
this.currentPresentationFactory.addPresentation(iframe, view));
+ this.presentationMap.put(view.getSource().getSUID(),
this.currentPresentationFactory.render(iframe, view));
iframe.pack();
Modified:
cytoscape3/trunk/application/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
cytoscape3/trunk/application/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2010-08-04 23:03:04 UTC (rev 21206)
+++
cytoscape3/trunk/application/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2010-08-04 23:03:26 UTC (rev 21207)
@@ -18,7 +18,7 @@
interface="org.cytoscape.view.presentation.PresentationManager"
/>
-->
<osgi:reference id="dingPresentationFactoryServiceRef"
- interface="org.cytoscape.view.presentation.PresentationFactory"
+
interface="org.cytoscape.view.presentation.RenderingEngineFactory"
filter="(id=ding)" />
<osgi:reference id="tunableInterceptorServiceRef"
@@ -163,7 +163,7 @@
<!-- presentation factory -->
<osgi:set id="presentationFactorySet"
- interface="org.cytoscape.view.presentation.PresentationFactory"
+
interface="org.cytoscape.view.presentation.RenderingEngineFactory"
cardinality="0..N">
<osgi:listener bind-method="addPresentationFactory"
unbind-method="removePresentationFactory"
ref="networkViewManager" />
--
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.
