Author: kono
Date: 2009-04-29 11:25:08 -0700 (Wed, 29 Apr 2009)
New Revision: 16703
Modified:
core3/vizmap-impl/trunk/src/main/java/org/cytoscape/view/vizmap/internal/VisualMappingManagerImpl.java
core3/vizmap-impl/trunk/src/main/java/org/cytoscape/view/vizmap/internal/VisualStyleImpl.java
core3/vizmap-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
core3/vizmap-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
Log:
Fixed to support RootVisualLexicon.
Modified:
core3/vizmap-impl/trunk/src/main/java/org/cytoscape/view/vizmap/internal/VisualMappingManagerImpl.java
===================================================================
---
core3/vizmap-impl/trunk/src/main/java/org/cytoscape/view/vizmap/internal/VisualMappingManagerImpl.java
2009-04-29 18:24:28 UTC (rev 16702)
+++
core3/vizmap-impl/trunk/src/main/java/org/cytoscape/view/vizmap/internal/VisualMappingManagerImpl.java
2009-04-29 18:25:08 UTC (rev 16703)
@@ -34,11 +34,16 @@
*/
package org.cytoscape.view.vizmap.internal;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
import org.cytoscape.event.CyEventHelper;
-
import org.cytoscape.view.model.CyNetworkView;
+import org.cytoscape.view.model.RootVisualLexicon;
import org.cytoscape.view.model.VisualProperty;
-import org.cytoscape.view.model.VisualPropertyCatalog;
import org.cytoscape.view.vizmap.VisualMappingFunction;
import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.view.vizmap.VisualStyle;
@@ -47,13 +52,7 @@
import org.cytoscape.view.vizmap.internal.events.VisualStyleCreatedEventImpl;
import org.cytoscape.view.vizmap.internal.events.VisualStyleDestroyedEventImpl;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
/**
*
*/
@@ -61,23 +60,23 @@
private final Map<CyNetworkView, VisualStyle> vsForNetwork;
private final Set<VisualStyle> visualStyles;
private CyEventHelper cyEventHelper;
- private VisualPropertyCatalog vpCatalog;
-
+ private RootVisualLexicon rootLexicon;
+
/**
*
* @param h
* DOCUMENT ME!
*/
public VisualMappingManagerImpl(final CyEventHelper eventHelper,
- final VisualPropertyCatalog vpCatalog) {
+ final RootVisualLexicon rootLexicon) {
if (eventHelper == null)
throw new IllegalArgumentException("CyEventHelper
cannot be null");
- if (vpCatalog == null)
+ if (rootLexicon == null)
throw new IllegalArgumentException("vpCatalog cannot be
null");
this.cyEventHelper = eventHelper;
- this.vpCatalog = vpCatalog;
+ this.rootLexicon = rootLexicon;
visualStyles = new HashSet<VisualStyle>();
vsForNetwork = new HashMap<CyNetworkView, VisualStyle>();
@@ -115,7 +114,7 @@
* @return DOCUMENT ME!
*/
public VisualStyle copyVisualStyle(VisualStyle originalVS) {
- final VisualStyle copyVS = new VisualStyleImpl(vpCatalog, new
String(originalVS.getTitle()));
+ final VisualStyle copyVS = new VisualStyleImpl(rootLexicon, new
String(originalVS.getTitle()));
// TODO: copy everything! This is incomplete
Collection<VisualMappingFunction<?, ?>> allMapping =
originalVS.getAllVisualMappingFunctions();
@@ -143,7 +142,7 @@
* @return DOCUMENT ME!
*/
public VisualStyle createVisualStyle(String title) {
- final VisualStyle newVS = new VisualStyleImpl(vpCatalog, title);
+ final VisualStyle newVS = new VisualStyleImpl(rootLexicon,
title);
visualStyles.add(newVS);
cyEventHelper.fireSynchronousEvent(new
VisualStyleCreatedEventImpl(newVS),
VisualStyleCreatedListener.class);
@@ -172,4 +171,9 @@
public Collection<VisualStyle> getAllVisualStyles() {
return visualStyles;
}
+
+ public RootVisualLexicon getRendererCatalog() {
+ // TODO Auto-generated method stub
+ return null;
+ }
}
Modified:
core3/vizmap-impl/trunk/src/main/java/org/cytoscape/view/vizmap/internal/VisualStyleImpl.java
===================================================================
---
core3/vizmap-impl/trunk/src/main/java/org/cytoscape/view/vizmap/internal/VisualStyleImpl.java
2009-04-29 18:24:28 UTC (rev 16702)
+++
core3/vizmap-impl/trunk/src/main/java/org/cytoscape/view/vizmap/internal/VisualStyleImpl.java
2009-04-29 18:25:08 UTC (rev 16703)
@@ -34,6 +34,10 @@
*/
package org.cytoscape.view.vizmap.internal;
+import static org.cytoscape.model.GraphObject.EDGE;
+import static org.cytoscape.model.GraphObject.NETWORK;
+import static org.cytoscape.model.GraphObject.NODE;
+
import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
@@ -45,50 +49,49 @@
import org.cytoscape.model.CyNode;
import org.cytoscape.model.GraphObject;
import org.cytoscape.view.model.CyNetworkView;
+import org.cytoscape.view.model.RootVisualLexicon;
import org.cytoscape.view.model.View;
import org.cytoscape.view.model.ViewColumn;
+import org.cytoscape.view.model.VisualLexicon;
import org.cytoscape.view.model.VisualProperty;
-import org.cytoscape.view.model.VisualPropertyCatalog;
import org.cytoscape.view.vizmap.VisualMappingFunction;
import org.cytoscape.view.vizmap.VisualStyle;
-import static org.cytoscape.model.GraphObject.*;
-
/**
*/
public class VisualStyleImpl implements VisualStyle {
private Map<VisualProperty<?>, VisualMappingFunction<?, ?>> mappings;
private Map<VisualProperty<?>, Object> perVSDefaults;
- private VisualPropertyCatalog vpCatalog;
+ private RootVisualLexicon rootLexicon;
private static final String DEFAULT_TITLE = "?";
private String title;
/**
* Creates a new VisualStyleImpl object.
*
- * @param vpCatalog DOCUMENT ME!
+ * @param rootLexicon DOCUMENT ME!
*/
- public VisualStyleImpl(final VisualPropertyCatalog vpCatalog) {
- this(vpCatalog, null);
+ public VisualStyleImpl(final RootVisualLexicon rootLexicon) {
+ this(rootLexicon, null);
}
/**
* Creates a new VisualStyleImpl object.
*
* @param eventHelper DOCUMENT ME!
- * @param vpCatalog DOCUMENT ME!
+ * @param rootLexicon DOCUMENT ME!
*/
- public VisualStyleImpl(final VisualPropertyCatalog vpCatalog, final
String title) {
- if (vpCatalog == null)
- throw new NullPointerException("vpCatalog is null");
+ public VisualStyleImpl(final RootVisualLexicon rootLexicon, final
String title) {
+ if (rootLexicon == null)
+ throw new NullPointerException("rootLexicon is null");
if (title == null)
this.title = DEFAULT_TITLE;
else
this.title = title;
- this.vpCatalog = vpCatalog;
+ this.rootLexicon = rootLexicon;
mappings = new HashMap<VisualProperty<?>,
VisualMappingFunction<?, ?>>();
perVSDefaults = new HashMap<VisualProperty<?>, Object>();
}
@@ -164,11 +167,11 @@
final List<View<CyEdge>> edgeviews = view.getEdgeViews();
applyImpl(view, nodeviews,
- vpCatalog.collectionOfVisualProperties(nodeviews,
NODE));
+ rootLexicon.getVisualProperties(nodeviews, NODE));
applyImpl(view, edgeviews,
- vpCatalog.collectionOfVisualProperties(edgeviews,
EDGE));
+ rootLexicon.getVisualProperties(edgeviews, EDGE));
applyImpl(view, Arrays.asList((View<CyNetwork>) view),
- vpCatalog.collectionOfVisualProperties(NETWORK));
+ rootLexicon.getVisualProperties(NETWORK));
}
// note: can't use applyImpl(List<View<?>>views ... ) because that does
not compile
@@ -244,4 +247,9 @@
return mappings.values();
}
+ public VisualLexicon getRenderer() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
}
Modified:
core3/vizmap-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/vizmap-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2009-04-29 18:24:28 UTC (rev 16702)
+++
core3/vizmap-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2009-04-29 18:25:08 UTC (rev 16703)
@@ -5,11 +5,6 @@
http://www.springframework.org/schema/osgi
http://www.springframework.org/schema/osgi/spring-osgi-1.0.xsd";
default-lazy-init="false">
- <!-- Export Visual Style Catalog as OSGi service -->
- <osgi:service id="visualStyleCatalogService" ref="visualStyleCatalog"
- interface="org.cytoscape.view.vizmap.VisualStyleCatalog">
- </osgi:service>
-
<osgi:service id="visualMappingManagerService"
ref="visualMappingManager"
interface="org.cytoscape.view.vizmap.VisualMappingManager">
</osgi:service>
@@ -17,6 +12,6 @@
<!-- Import Services -->
<osgi:reference id="cyEventHelperServiceRef"
interface="org.cytoscape.event.CyEventHelper" />
- <osgi:reference id="visualPropertyCatalogRef"
- interface="org.cytoscape.view.model.VisualPropertyCatalog" />
+ <osgi:reference id="rootVisualLexiconRef"
+ interface="org.cytoscape.view.model.RootVisualLexicon" />
</beans>
Modified:
core3/vizmap-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/vizmap-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2009-04-29 18:24:28 UTC (rev 16702)
+++
core3/vizmap-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2009-04-29 18:25:08 UTC (rev 16703)
@@ -16,12 +16,11 @@
<context:annotation-config />
- <bean id="visualStyleCatalog"
class="org.cytoscape.view.vizmap.internal.VisualStyleCatalogImpl">
+ <bean id="visualMappingManager"
+
class="org.cytoscape.view.vizmap.internal.VisualMappingManagerImpl">
<constructor-arg ref="cyEventHelperServiceRef" />
- <constructor-arg ref="visualPropertyCatalogRef" />
+ <constructor-arg ref="rootVisualLexiconRef" />
</bean>
- <bean id="visualMappingManager"
class="org.cytoscape.view.vizmap.internal.VisualMappingManagerImpl">
- </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
-~----------~----~----~----~------~----~------~--~---
