Author: paperwing
Date: 2011-07-27 08:00:40 -0700 (Wed, 27 Jul 2011)
New Revision: 26281
Added:
csplugins/trunk/toronto/jm/paperwing-build/patches/presentation-impl/bundle-context.xml.patch
Modified:
csplugins/trunk/toronto/jm/paperwing-build/patches/presentation-impl/RenderingEngineManagerImpl.java.patch
Log:
updated patches for rendering manager impl, for the events portion to fire
events as described by the api
Modified:
csplugins/trunk/toronto/jm/paperwing-build/patches/presentation-impl/RenderingEngineManagerImpl.java.patch
===================================================================
---
csplugins/trunk/toronto/jm/paperwing-build/patches/presentation-impl/RenderingEngineManagerImpl.java.patch
2011-07-27 13:00:28 UTC (rev 26280)
+++
csplugins/trunk/toronto/jm/paperwing-build/patches/presentation-impl/RenderingEngineManagerImpl.java.patch
2011-07-27 15:00:40 UTC (rev 26281)
@@ -1,8 +1,22 @@
Index:
src/main/java/org/cytoscape/view/presentation/internal/RenderingEngineManagerImpl.java
===================================================================
----
src/main/java/org/cytoscape/view/presentation/internal/RenderingEngineManagerImpl.java
(revision 25942)
+---
src/main/java/org/cytoscape/view/presentation/internal/RenderingEngineManagerImpl.java
(revision 26266)
+++
src/main/java/org/cytoscape/view/presentation/internal/RenderingEngineManagerImpl.java
(working copy)
-@@ -15,7 +15,7 @@
+@@ -4,37 +4,46 @@
+ import java.util.HashMap;
+ import java.util.Map;
+
++import org.cytoscape.event.CyEventHelper;
+ import org.cytoscape.view.model.View;
+ import org.cytoscape.view.model.VisualLexicon;
+ import org.cytoscape.view.presentation.RenderingEngine;
+ import org.cytoscape.view.presentation.RenderingEngineFactory;
+ import org.cytoscape.view.presentation.RenderingEngineManager;
++import
org.cytoscape.view.presentation.events.RenderingEngineAboutToBeRemovedEvent;
++import org.cytoscape.view.presentation.events.RenderingEngineAddedEvent;
+
+ public class RenderingEngineManagerImpl implements RenderingEngineManager {
+
private final Map<View<?>, RenderingEngine<?>> renderingEngineMap;
private static final String FACTORY_ID_TAG = "id";
@@ -11,3 +25,49 @@
private VisualLexicon defaultLexicon;
+ private final Map<String, RenderingEngineFactory<?>> factoryMap;
+-
+
++ private CyEventHelper cyEventHelper;
++
+ /**
+ * Create an instance of rendering engine manager. This implementation
+ * listens to Presentation events and update its map based on them.
+ */
+- public RenderingEngineManagerImpl() {
++ public RenderingEngineManagerImpl(CyEventHelper cyEventHelper) {
+ this.renderingEngineMap = new HashMap<View<?>,
RenderingEngine<?>>();
+ this.factoryMap = new HashMap<String,
RenderingEngineFactory<?>>();
++
++ this.cyEventHelper = cyEventHelper;
++
++ System.out.println("Updated renderingEngineManager found");
+ }
+
+ /**
+ * This method never returns null.
+ */
+ @Override
++ // TODO: name should be getRenderingEngine for correct spelling
+ public RenderingEngine<?> getRendringEngine(final View<?> viewModel) {
+ return renderingEngineMap.get(viewModel);
+ }
+@@ -49,12 +58,18 @@
+ public void addRenderingEngine(final RenderingEngine<?>
renderingEngine) {
+ final View<?> viewModel = renderingEngine.getViewModel();
+ this.renderingEngineMap.put(viewModel, renderingEngine);
++
++ cyEventHelper.fireEvent(new RenderingEngineAddedEvent(this,
renderingEngine));
+ }
+
+
+ @Override
+ public void removeRenderingEngine(RenderingEngine<?> renderingEngine) {
+ final View<?> viewModel = renderingEngine.getViewModel();
++
++ // Event fired before actual removal
++ cyEventHelper.fireEvent(new
RenderingEngineAboutToBeRemovedEvent(this, renderingEngine));
++
+ this.renderingEngineMap.remove(viewModel);
+ }
+
Added:
csplugins/trunk/toronto/jm/paperwing-build/patches/presentation-impl/bundle-context.xml.patch
===================================================================
---
csplugins/trunk/toronto/jm/paperwing-build/patches/presentation-impl/bundle-context.xml.patch
(rev 0)
+++
csplugins/trunk/toronto/jm/paperwing-build/patches/presentation-impl/bundle-context.xml.patch
2011-07-27 15:00:40 UTC (rev 26281)
@@ -0,0 +1,12 @@
+Index: src/main/resources/META-INF/spring/bundle-context.xml
+===================================================================
+--- src/main/resources/META-INF/spring/bundle-context.xml (revision 26266)
++++ src/main/resources/META-INF/spring/bundle-context.xml (working copy)
+@@ -12,6 +12,7 @@
+ <!-- Rendering Engine Manager service bean -->
+ <bean id="renderingEngineManager"
+
class="org.cytoscape.view.presentation.internal.RenderingEngineManagerImpl">
++ <constructor-arg ref="cyEventHelperServiceRef" />
+ </bean>
+
+ </beans>
--
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.
