Author: kono
Date: 2011-01-24 12:14:40 -0800 (Mon, 24 Jan 2011)
New Revision: 23569
Removed:
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/RenderingEngineFactoryManager.java
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/events/RenderingEngineFactoryAddedEvent.java
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/events/RenderingEngineFactoryAddedListener.java
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/internal/RenderingEngineFactoryManagerImpl.java
Modified:
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/RenderingEngineManager.java
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/internal/RenderingEngineManagerImpl.java
core3/presentation-api/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
core3/presentation-api/trunk/src/main/resources/META-INF/spring/bundle-context.xml
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/EditorManagerImpl.java
core3/vizmap-gui-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi-vizmapper.xml
core3/vizmap-impl/trunk/impl/src/main/java/org/cytoscape/view/vizmap/internal/VisualLexiconManager.java
core3/vizmap-impl/trunk/impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
Log:
RenderingEngineFactoryManager removed. If a bundle needs
RenderingEngineFactories, it should be done by Spring DM's <osgi:set> statement.
Deleted:
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/RenderingEngineFactoryManager.java
===================================================================
---
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/RenderingEngineFactoryManager.java
2011-01-24 00:58:13 UTC (rev 23568)
+++
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/RenderingEngineFactoryManager.java
2011-01-24 20:14:40 UTC (rev 23569)
@@ -1,29 +0,0 @@
-package org.cytoscape.view.presentation;
-
-import java.util.Collection;
-
-/**
- * Manager object for RenderingEngineFactories.
- * This will be exported as a service and users can access all rendering
engine factories through this interface.
- *
- */
-public interface RenderingEngineFactoryManager {
-
- /**
- * Provides all RenderingEngineFactories.
- *
- * @return all registered factories.
- */
- Collection<RenderingEngineFactory<?>> getAllRenderingEngineFactories();
-
-
- /**
- * Get a specific rendering engine factory object.
- *
- * @param factoryID metadata for the factory. This is a metadata in
Spring config file. This is unique.
- *
- * @return rendering engine factory if available.
- */
- RenderingEngineFactory<?> getRenderingEngine(final String factoryID);
-
-}
Modified:
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/RenderingEngineManager.java
===================================================================
---
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/RenderingEngineManager.java
2011-01-24 00:58:13 UTC (rev 23568)
+++
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/RenderingEngineManager.java
2011-01-24 20:14:40 UTC (rev 23569)
@@ -3,6 +3,7 @@
import java.util.Collection;
import org.cytoscape.view.model.View;
+import org.cytoscape.view.model.VisualLexicon;
/**
* Manager for {@linkplain RenderingEngine} objects. All RenderingEngine
objects
@@ -14,6 +15,14 @@
*
*/
public interface RenderingEngineManager {
+
+ /**
+ * Provide default Visual Lexicon from a default engine factory.
+ * In current implementation, this is always DING's lexicon.
+ *
+ * @return default visual lexicon.
+ */
+ VisualLexicon getDefaultVisualLexicon();
/**
* Get a rendering engine for the given view model.
Deleted:
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/events/RenderingEngineFactoryAddedEvent.java
===================================================================
---
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/events/RenderingEngineFactoryAddedEvent.java
2011-01-24 00:58:13 UTC (rev 23568)
+++
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/events/RenderingEngineFactoryAddedEvent.java
2011-01-24 20:14:40 UTC (rev 23569)
@@ -1,34 +0,0 @@
-package org.cytoscape.view.presentation.events;
-
-import org.cytoscape.event.AbstractCyEvent;
-import org.cytoscape.view.presentation.RenderingEngine;
-import org.cytoscape.view.presentation.RenderingEngineFactory;
-import org.cytoscape.view.presentation.RenderingEngineFactoryManager;
-
-public final class RenderingEngineFactoryAddedEvent extends
- AbstractCyEvent<RenderingEngineFactoryManager> {
-
- private final RenderingEngineFactory<?> factory;
-
- /**
- * Create an event for newly created presentation.
- *
- * @param source manager holding reference to this new rendering engine
- * @param engine New {@linkplain RenderingEngine} just created.
- */
- public RenderingEngineFactoryAddedEvent(final
RenderingEngineFactoryManager source,
- final RenderingEngineFactory<?> factory) {
- super(source, RenderingEngineFactoryAddedListener.class);
- this.factory = factory;
- }
-
- /**
- * Get new rendering engine.
- *
- * @return new rendering engine.
- */
- public RenderingEngineFactory<?> getRenderingEngineFactory() {
- return this.factory;
- }
-
-}
Deleted:
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/events/RenderingEngineFactoryAddedListener.java
===================================================================
---
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/events/RenderingEngineFactoryAddedListener.java
2011-01-24 00:58:13 UTC (rev 23568)
+++
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/events/RenderingEngineFactoryAddedListener.java
2011-01-24 20:14:40 UTC (rev 23569)
@@ -1,15 +0,0 @@
-package org.cytoscape.view.presentation.events;
-
-import org.cytoscape.event.CyListener;
-
-public interface RenderingEngineFactoryAddedListener extends CyListener {
-
- /**
- * Listener can extract source RenderingEngine object in this method.
This
- * is mainly for {@linkplain RenderingEngineManager}.
- *
- * @param e
- * an event object which contains source RenderingEngine.
- */
- void handleEvent(final RenderingEngineFactoryAddedEvent e);
-}
Deleted:
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/internal/RenderingEngineFactoryManagerImpl.java
===================================================================
---
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/internal/RenderingEngineFactoryManagerImpl.java
2011-01-24 00:58:13 UTC (rev 23568)
+++
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/internal/RenderingEngineFactoryManagerImpl.java
2011-01-24 20:14:40 UTC (rev 23569)
@@ -1,69 +0,0 @@
-package org.cytoscape.view.presentation.internal;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.cytoscape.event.CyEventHelper;
-import org.cytoscape.view.presentation.RenderingEngineFactory;
-import org.cytoscape.view.presentation.RenderingEngineFactoryManager;
-import org.cytoscape.view.presentation.events.RenderingEngineFactoryAddedEvent;
-
-public class RenderingEngineFactoryManagerImpl implements
- RenderingEngineFactoryManager {
-
- private static final String FACTORY_ID_TAG = "id";
-
- private final Map<String, RenderingEngineFactory<?>> factoryMap;
-
- private final CyEventHelper eventHelper;
-
- public RenderingEngineFactoryManagerImpl(final CyEventHelper
eventHelper) {
- factoryMap = new HashMap<String, RenderingEngineFactory<?>>();
- this.eventHelper = eventHelper;
- }
-
- @Override
- public Collection<RenderingEngineFactory<?>>
getAllRenderingEngineFactories() {
- return factoryMap.values();
- }
-
- @Override
- public RenderingEngineFactory<?> getRenderingEngine(String factoryID) {
- return this.factoryMap.get(factoryID);
- }
-
- 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);
-
- eventHelper.fireSynchronousEvent(new
RenderingEngineFactoryAddedEvent(this, factory));
-
- System.out.println("\n\nAdding Rendering Engine Factory: " +
id);
- }
-
- 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;
-
- }
-
-}
Modified:
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/internal/RenderingEngineManagerImpl.java
===================================================================
---
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/internal/RenderingEngineManagerImpl.java
2011-01-24 00:58:13 UTC (rev 23568)
+++
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/internal/RenderingEngineManagerImpl.java
2011-01-24 20:14:40 UTC (rev 23569)
@@ -5,19 +5,30 @@
import java.util.Map;
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;
public class RenderingEngineManagerImpl implements RenderingEngineManager {
private final Map<View<?>, RenderingEngine<?>> renderingEngineMap;
+
+ private static final String FACTORY_ID_TAG = "id";
+ private static final String DEFAULT_FACTORY_ID = "ding";
+
+ private VisualLexicon defaultLexicon;
+ private final Map<String, RenderingEngineFactory<?>> factoryMap;
+
+
/**
* Create an instance of rendering engine manager. This implementation
* listens to Presentation events and update its map based on them.
*/
public RenderingEngineManagerImpl() {
this.renderingEngineMap = new HashMap<View<?>,
RenderingEngine<?>>();
+ this.factoryMap = new HashMap<String,
RenderingEngineFactory<?>>();
}
/**
@@ -36,8 +47,6 @@
@Override
public void addRenderingEngine(final RenderingEngine<?>
renderingEngine) {
-
- System.out.println("##Adding Engine 0: ");
final View<?> viewModel = renderingEngine.getViewModel();
this.renderingEngineMap.put(viewModel, renderingEngine);
}
@@ -45,9 +54,55 @@
@Override
public void removeRenderingEngine(RenderingEngine<?> renderingEngine) {
-
final View<?> viewModel = renderingEngine.getViewModel();
this.renderingEngineMap.remove(viewModel);
}
+
+ @Override
+ public VisualLexicon getDefaultVisualLexicon() {
+ if(defaultLexicon == null)
+ throw new IllegalStateException("Lexicon is not ready
yet.");
+
+ return this.defaultLexicon;
+ }
+
+
+ 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();
+ System.out.println("Default Lexicon found: " + id);
+ }
+
+ System.out.println("\n\nRendering Engine Factory added: " + id);
+ }
+
+ 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;
+
+ }
+
}
Modified:
core3/presentation-api/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/presentation-api/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-01-24 00:58:13 UTC (rev 23568)
+++
core3/presentation-api/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-01-24 20:14:40 UTC (rev 23569)
@@ -16,18 +16,12 @@
</osgi:service-properties>
</osgi:service>
- <osgi:service id="renderingEngineFactoryManagerService"
- ref="renderingEngineFactoryManager"
interface="org.cytoscape.view.presentation.RenderingEngineFactoryManager">
- <osgi:service-properties>
- <entry key="service.type" value="manager" />
- </osgi:service-properties>
- </osgi:service>
-
+
<osgi:set id="renderingEngineFactorySet"
interface="org.cytoscape.view.presentation.RenderingEngineFactory"
cardinality="0..N">
<osgi:listener bind-method="addRenderingEngineFactory"
- unbind-method="removeRenderingEngineFactory"
ref="renderingEngineFactoryManager" />
+ unbind-method="removeRenderingEngineFactory"
ref="renderingEngineManager" />
</osgi:set>
</beans>
Modified:
core3/presentation-api/trunk/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/presentation-api/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2011-01-24 00:58:13 UTC (rev 23568)
+++
core3/presentation-api/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2011-01-24 20:14:40 UTC (rev 23569)
@@ -13,10 +13,5 @@
<bean id="renderingEngineManager"
class="org.cytoscape.view.presentation.internal.RenderingEngineManagerImpl">
</bean>
-
- <bean id="renderingEngineFactoryManager"
-
class="org.cytoscape.view.presentation.internal.RenderingEngineFactoryManagerImpl">
- <constructor-arg ref="cyEventHelperServiceRef" />
- </bean>
</beans>
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/EditorManagerImpl.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/EditorManagerImpl.java
2011-01-24 00:58:13 UTC (rev 23568)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/EditorManagerImpl.java
2011-01-24 20:14:40 UTC (rev 23569)
@@ -55,8 +55,7 @@
import org.cytoscape.view.model.Range;
import org.cytoscape.view.model.VisualLexicon;
import org.cytoscape.view.model.VisualProperty;
-import org.cytoscape.view.presentation.events.RenderingEngineFactoryAddedEvent;
-import
org.cytoscape.view.presentation.events.RenderingEngineFactoryAddedListener;
+import org.cytoscape.view.presentation.RenderingEngineFactory;
import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.view.vizmap.gui.editor.EditorManager;
import org.cytoscape.view.vizmap.gui.editor.ListEditor;
@@ -72,7 +71,7 @@
/**
*
*/
-public class EditorManagerImpl implements EditorManager,
RenderingEngineFactoryAddedListener {
+public class EditorManagerImpl implements EditorManager {
private static final Logger logger = LoggerFactory
.getLogger(EditorManagerImpl.class);
@@ -362,12 +361,15 @@
}
}
}
- @Override
- public void handleEvent(RenderingEngineFactoryAddedEvent e) {
+
+
+ public void addRenderingEngineFactory(RenderingEngineFactory<?>
factory, Map props) {
-
- final VisualLexicon lexicon =
e.getRenderingEngineFactory().getVisualLexicon();
+ final VisualLexicon lexicon = factory.getVisualLexicon();
buildDiscreteEditors(lexicon);
-
}
+
+ public void removeRenderingEngineFactory(RenderingEngineFactory<?>
factory, Map props) {
+ // TODO: clean up state when rendering engines are removed.
+ }
}
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
2011-01-24 00:58:13 UTC (rev 23568)
+++
core3/vizmap-gui-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi-vizmapper.xml
2011-01-24 20:14:40 UTC (rev 23569)
@@ -249,6 +249,13 @@
<osgi:listener bind-method="addDependency"
unbind-method="removeDependency" ref="dependencyTable"
/>
+ </osgi:set>
+
+ <osgi:set id="renderingEngineFactorySet"
+
interface="org.cytoscape.view.presentation.RenderingEngineFactory"
+ cardinality="0..N">
+ <osgi:listener bind-method="addRenderingEngineFactory"
+ unbind-method="removeRenderingEngineFactory"
ref="editorManager" />
</osgi:set>
</beans>
Modified:
core3/vizmap-impl/trunk/impl/src/main/java/org/cytoscape/view/vizmap/internal/VisualLexiconManager.java
===================================================================
---
core3/vizmap-impl/trunk/impl/src/main/java/org/cytoscape/view/vizmap/internal/VisualLexiconManager.java
2011-01-24 00:58:13 UTC (rev 23568)
+++
core3/vizmap-impl/trunk/impl/src/main/java/org/cytoscape/view/vizmap/internal/VisualLexiconManager.java
2011-01-24 20:14:40 UTC (rev 23569)
@@ -2,16 +2,15 @@
import java.util.Collection;
import java.util.HashSet;
+import java.util.Map;
import java.util.Set;
import org.cytoscape.view.model.VisualLexicon;
import org.cytoscape.view.model.VisualProperty;
-import org.cytoscape.view.presentation.events.RenderingEngineFactoryAddedEvent;
-import
org.cytoscape.view.presentation.events.RenderingEngineFactoryAddedListener;
+import org.cytoscape.view.presentation.RenderingEngineFactory;
import org.cytoscape.view.presentation.property.TwoDVisualLexicon;
-public class VisualLexiconManager implements
- RenderingEngineFactoryAddedListener {
+public class VisualLexiconManager {
private final Set<VisualLexicon> lexiconSet;
@@ -25,7 +24,6 @@
nodeVPs = new HashSet<VisualProperty<?>>();
edgeVPs = new HashSet<VisualProperty<?>>();
networkVPs = new HashSet<VisualProperty<?>>();
-
}
public Collection<VisualProperty<?>> getNodeVisualProperties() {
@@ -44,12 +42,12 @@
return this.lexiconSet;
}
- @Override
- public void handleEvent(RenderingEngineFactoryAddedEvent e) {
+
+ public void addRenderingEngineFactory(RenderingEngineFactory<?>
factory, Map props) {
-
lexiconSet.add(e.getRenderingEngineFactory().getVisualLexicon());
+ lexiconSet.add(factory.getVisualLexicon());
- final VisualLexicon lexicon =
e.getRenderingEngineFactory().getVisualLexicon();
+ final VisualLexicon lexicon = factory.getVisualLexicon();
System.out.println("\n\n\n\n### Got New lexicon: " + lexicon);
@@ -66,5 +64,9 @@
networkVPs.add(vp);
}
}
+
+ public void removeRenderingEngineFactory(RenderingEngineFactory<?>
factory, Map props) {
+ // TODO: cleanup
+ }
}
Modified:
core3/vizmap-impl/trunk/impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/vizmap-impl/trunk/impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-01-24 00:58:13 UTC (rev 23568)
+++
core3/vizmap-impl/trunk/impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-01-24 20:14:40 UTC (rev 23569)
@@ -16,7 +16,6 @@
interface="org.cytoscape.view.vizmap.VisualStyleFactory">
</osgi:service>
- <osgi:service id="visualLexiconManagerService"
ref="visualLexiconManager" auto-export="interfaces" />
<!-- Export Visual Style Serializer as an OSGi Service -->
<osgi:service id="visualStyleSerializerService"
ref="visualStyleSerializer"
@@ -26,5 +25,12 @@
<!-- Import Services -->
<osgi:reference id="cyEventHelperServiceRef"
interface="org.cytoscape.event.CyEventHelper" />
+ <osgi:set id="renderingEngineFactorySet"
+
interface="org.cytoscape.view.presentation.RenderingEngineFactory"
+ cardinality="0..N">
+ <osgi:listener bind-method="addRenderingEngineFactory"
+ unbind-method="removeRenderingEngineFactory"
ref="visualLexiconManager" />
+ </osgi:set>
+
</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.
