Author: paperwing
Date: 2012-02-17 14:06:48 -0800 (Fri, 17 Feb 2012)
New Revision: 28317
Modified:
csplugins/trunk/toronto/yuedong/multi_renderer/impl/presentation-impl/src/main/java/org/cytoscape/view/presentation/internal/CyActivator.java
csplugins/trunk/toronto/yuedong/multi_renderer/impl/presentation-impl/src/main/java/org/cytoscape/view/presentation/internal/RenderingEngineManagerImpl.java
Log:
In process of removing factory manager functionality from the current
RenderingEngineManager. Functionality seems to be used by vizmap-gui-impl
indirectly via OSGi; calls to the addRenderingEngineFactory method in
RenderingEngineManagerImpl cannot be found directly via Eclipse's "open call
hierarchy" feature
Modified:
csplugins/trunk/toronto/yuedong/multi_renderer/impl/presentation-impl/src/main/java/org/cytoscape/view/presentation/internal/CyActivator.java
===================================================================
---
csplugins/trunk/toronto/yuedong/multi_renderer/impl/presentation-impl/src/main/java/org/cytoscape/view/presentation/internal/CyActivator.java
2012-02-17 20:06:47 UTC (rev 28316)
+++
csplugins/trunk/toronto/yuedong/multi_renderer/impl/presentation-impl/src/main/java/org/cytoscape/view/presentation/internal/CyActivator.java
2012-02-17 22:06:48 UTC (rev 28317)
@@ -25,7 +25,7 @@
renderingEngineManagerProps.setProperty("service.type","manager");
registerService(bc,renderingEngineManager,RenderingEngineManager.class,
renderingEngineManagerProps);
-
registerServiceListener(bc,renderingEngineManager,"addRenderingEngineFactory","removeRenderingEngineFactory",RenderingEngineFactory.class);
+//
registerServiceListener(bc,renderingEngineManager,"addRenderingEngineFactory","removeRenderingEngineFactory",RenderingEngineFactory.class);
ExternalRendererManager externalRendererManager = new
ExternalRendererManagerImpl();
Properties externalRendererManagerProps = new Properties();
Modified:
csplugins/trunk/toronto/yuedong/multi_renderer/impl/presentation-impl/src/main/java/org/cytoscape/view/presentation/internal/RenderingEngineManagerImpl.java
===================================================================
---
csplugins/trunk/toronto/yuedong/multi_renderer/impl/presentation-impl/src/main/java/org/cytoscape/view/presentation/internal/RenderingEngineManagerImpl.java
2012-02-17 20:06:47 UTC (rev 28316)
+++
csplugins/trunk/toronto/yuedong/multi_renderer/impl/presentation-impl/src/main/java/org/cytoscape/view/presentation/internal/RenderingEngineManagerImpl.java
2012-02-17 22:06:48 UTC (rev 28317)
@@ -72,39 +72,39 @@
}
- public void addRenderingEngineFactory(
- final RenderingEngineFactory<?> factory, Map metadata) {
- final Object idObject = metadata.get(FACTORY_ID_TAG);
+// public void addRenderingEngineFactory(
+// final RenderingEngineFactory<?> factory, Map metadata) {
+// final Object idObject = metadata.get(FACTORY_ID_TAG);
+//
+// if (idObject == null)
+// throw new IllegalArgumentException(
+// "Could not add factory: ID metadata is
missing for RenderingEngineFactory.");
+//
+// final String id = idObject.toString();
+//
+// this.factoryMap.put(id, factory);
+//
+// // Register default lexicon
+// if(id.equals(DEFAULT_FACTORY_ID))
+// defaultLexicon = factory.getVisualLexicon();
+//
+// logger.debug("New engine registered: " + factory.getClass());
+// }
+//
+// public void removeRenderingEngineFactory(
+// final RenderingEngineFactory<?> factory, Map metadata) {
+// final Object idObject = metadata.get(FACTORY_ID_TAG);
+//
+// if (idObject == null)
+// throw new IllegalArgumentException(
+// "Could not remove factory: ID metadata
is missing for RenderingEngineFactory.");
+//
+// final String id = idObject.toString();
+//
+// RenderingEngineFactory<?> toBeRemoved =
this.factoryMap.remove(id);
+//
+// toBeRemoved = null;
+//
+// }
- if (idObject == null)
- throw new IllegalArgumentException(
- "Could not add factory: ID metadata is
missing for RenderingEngineFactory.");
-
- final String id = idObject.toString();
-
- this.factoryMap.put(id, factory);
-
- // Register default lexicon
- if(id.equals(DEFAULT_FACTORY_ID))
- defaultLexicon = factory.getVisualLexicon();
-
- logger.debug("New engine registered: " + factory.getClass());
- }
-
- public void removeRenderingEngineFactory(
- final RenderingEngineFactory<?> factory, Map metadata) {
- final Object idObject = metadata.get(FACTORY_ID_TAG);
-
- if (idObject == null)
- throw new IllegalArgumentException(
- "Could not remove factory: ID metadata
is missing for RenderingEngineFactory.");
-
- final String id = idObject.toString();
-
- RenderingEngineFactory<?> toBeRemoved =
this.factoryMap.remove(id);
-
- toBeRemoved = null;
-
- }
-
}
--
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.
