Author: kono
Date: 2010-09-16 18:26:43 -0700 (Thu, 16 Sep 2010)
New Revision: 21914
Removed:
core3/viewmodel-impl/branches/vp-tree/src/main/java/org/cytoscape/view/model/internal/MinimalVisualLexicon.java
core3/viewmodel-impl/branches/vp-tree/src/test/java/org/cytoscape/view/model/VisualLexiconTest.java
Modified:
core3/viewmodel-impl/branches/vp-tree/pom.xml
core3/viewmodel-impl/branches/vp-tree/src/integration/java/org/cytoscape/view/ITViewModelImpl.java
core3/viewmodel-impl/branches/vp-tree/src/main/java/org/cytoscape/view/model/internal/EdgeViewImpl.java
core3/viewmodel-impl/branches/vp-tree/src/main/java/org/cytoscape/view/model/internal/NetworkViewImpl.java
core3/viewmodel-impl/branches/vp-tree/src/main/java/org/cytoscape/view/model/internal/NodeViewImpl.java
core3/viewmodel-impl/branches/vp-tree/src/main/java/org/cytoscape/view/model/internal/ViewImpl.java
core3/viewmodel-impl/branches/vp-tree/src/main/resources/META-INF/spring/bundle-context-osgi.xml
core3/viewmodel-impl/branches/vp-tree/src/main/resources/META-INF/spring/bundle-context.xml
Log:
Refactored version of VP tree. VisualLexicons are moved to presentation layer.
Modified: core3/viewmodel-impl/branches/vp-tree/pom.xml
===================================================================
--- core3/viewmodel-impl/branches/vp-tree/pom.xml 2010-09-17 01:25:47 UTC
(rev 21913)
+++ core3/viewmodel-impl/branches/vp-tree/pom.xml 2010-09-17 01:26:43 UTC
(rev 21914)
@@ -32,17 +32,17 @@
RCP applications -->
</resources>
<plugins>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <version>2.4.1</version>
- <configuration>
- <filesets>
- <fileset>
- <directory>${basedir}/eclipse_config</directory>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.4.1</version>
+ <configuration>
+ <filesets>
+ <fileset>
+
<directory>${basedir}/eclipse_config</directory>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified:
core3/viewmodel-impl/branches/vp-tree/src/integration/java/org/cytoscape/view/ITViewModelImpl.java
===================================================================
---
core3/viewmodel-impl/branches/vp-tree/src/integration/java/org/cytoscape/view/ITViewModelImpl.java
2010-09-17 01:25:47 UTC (rev 21913)
+++
core3/viewmodel-impl/branches/vp-tree/src/integration/java/org/cytoscape/view/ITViewModelImpl.java
2010-09-17 01:26:43 UTC (rev 21914)
@@ -2,7 +2,6 @@
import org.cytoscape.integration.AbstractIntegrationTester;
import org.cytoscape.view.model.CyNetworkViewFactory;
-import org.cytoscape.view.model.VisualLexiconManager;
/**
* Integration test for viewmodel-impl bundle.
@@ -23,9 +22,9 @@
"org.cytoscape, viewmodel-api,
1.0-SNAPSHOT",
"org.cytoscape, viewmodel-impl,
1.0-SNAPSHOT", },
new String[] {
- "lexiconManager",
"cyNetworkViewFactory" },
+ "cyNetworkViewFactory" },
new Class[] {
- VisualLexiconManager.class,
CyNetworkViewFactory.class },
+ CyNetworkViewFactory.class },
new String[] { "org.cytoscape.view.model" }
);
}
Modified:
core3/viewmodel-impl/branches/vp-tree/src/main/java/org/cytoscape/view/model/internal/EdgeViewImpl.java
===================================================================
---
core3/viewmodel-impl/branches/vp-tree/src/main/java/org/cytoscape/view/model/internal/EdgeViewImpl.java
2010-09-17 01:25:47 UTC (rev 21913)
+++
core3/viewmodel-impl/branches/vp-tree/src/main/java/org/cytoscape/view/model/internal/EdgeViewImpl.java
2010-09-17 01:26:43 UTC (rev 21914)
@@ -3,8 +3,8 @@
import org.cytoscape.event.CyEventHelper;
import org.cytoscape.model.CyEdge;
import org.cytoscape.view.model.CyNetworkView;
-import org.cytoscape.view.model.EdgeViewChangeMicroListener;
import org.cytoscape.view.model.VisualProperty;
+import org.cytoscape.view.model.events.EdgeViewChangeMicroListener;
public class EdgeViewImpl extends ViewImpl<CyEdge> {
Deleted:
core3/viewmodel-impl/branches/vp-tree/src/main/java/org/cytoscape/view/model/internal/MinimalVisualLexicon.java
===================================================================
---
core3/viewmodel-impl/branches/vp-tree/src/main/java/org/cytoscape/view/model/internal/MinimalVisualLexicon.java
2010-09-17 01:25:47 UTC (rev 21913)
+++
core3/viewmodel-impl/branches/vp-tree/src/main/java/org/cytoscape/view/model/internal/MinimalVisualLexicon.java
2010-09-17 01:26:43 UTC (rev 21914)
@@ -1,17 +0,0 @@
-package org.cytoscape.view.model.internal;
-
-import org.cytoscape.view.model.BasicVisualLexicon;
-import org.cytoscape.view.model.visualproperties.NullVisualProperty;
-
-/**
- * VisualLexicon only with a root node.
- * @author kono
- *
- */
-public class MinimalVisualLexicon extends BasicVisualLexicon {
-
- public MinimalVisualLexicon() {
- super(new NullVisualProperty("ROOT_OF_EVRYTHING", "Root Visual
Property"));
- }
-
-}
Modified:
core3/viewmodel-impl/branches/vp-tree/src/main/java/org/cytoscape/view/model/internal/NetworkViewImpl.java
===================================================================
---
core3/viewmodel-impl/branches/vp-tree/src/main/java/org/cytoscape/view/model/internal/NetworkViewImpl.java
2010-09-17 01:25:47 UTC (rev 21913)
+++
core3/viewmodel-impl/branches/vp-tree/src/main/java/org/cytoscape/view/model/internal/NetworkViewImpl.java
2010-09-17 01:26:43 UTC (rev 21914)
@@ -20,13 +20,13 @@
import org.cytoscape.model.events.AddedNodeEvent;
import org.cytoscape.model.events.AddedNodeListener;
import org.cytoscape.view.model.CyNetworkView;
-import org.cytoscape.view.model.NetworkViewChangeMicroListener;
import org.cytoscape.view.model.View;
import org.cytoscape.view.model.VisualProperty;
import org.cytoscape.view.model.events.AddedEdgeViewEvent;
import org.cytoscape.view.model.events.AddedNodeViewEvent;
import org.cytoscape.view.model.events.FitContentEvent;
import org.cytoscape.view.model.events.FitSelectedEvent;
+import org.cytoscape.view.model.events.NetworkViewChangeMicroListener;
import org.cytoscape.view.model.events.NetworkViewChangedEvent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified:
core3/viewmodel-impl/branches/vp-tree/src/main/java/org/cytoscape/view/model/internal/NodeViewImpl.java
===================================================================
---
core3/viewmodel-impl/branches/vp-tree/src/main/java/org/cytoscape/view/model/internal/NodeViewImpl.java
2010-09-17 01:25:47 UTC (rev 21913)
+++
core3/viewmodel-impl/branches/vp-tree/src/main/java/org/cytoscape/view/model/internal/NodeViewImpl.java
2010-09-17 01:26:43 UTC (rev 21914)
@@ -3,8 +3,8 @@
import org.cytoscape.event.CyEventHelper;
import org.cytoscape.model.CyNode;
import org.cytoscape.view.model.CyNetworkView;
-import org.cytoscape.view.model.NodeViewChangeMicroListener;
import org.cytoscape.view.model.VisualProperty;
+import org.cytoscape.view.model.events.NodeViewChangeMicroListener;
public class NodeViewImpl extends ViewImpl<CyNode> {
Modified:
core3/viewmodel-impl/branches/vp-tree/src/main/java/org/cytoscape/view/model/internal/ViewImpl.java
===================================================================
---
core3/viewmodel-impl/branches/vp-tree/src/main/java/org/cytoscape/view/model/internal/ViewImpl.java
2010-09-17 01:25:47 UTC (rev 21913)
+++
core3/viewmodel-impl/branches/vp-tree/src/main/java/org/cytoscape/view/model/internal/ViewImpl.java
2010-09-17 01:26:43 UTC (rev 21914)
@@ -6,8 +6,8 @@
import org.cytoscape.event.CyEventHelper;
import org.cytoscape.model.SUIDFactory;
import org.cytoscape.view.model.View;
-import org.cytoscape.view.model.NodeViewChangeMicroListener;
import org.cytoscape.view.model.VisualProperty;
+import org.cytoscape.view.model.events.NodeViewChangeMicroListener;
/**
Modified:
core3/viewmodel-impl/branches/vp-tree/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/viewmodel-impl/branches/vp-tree/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2010-09-17 01:25:47 UTC (rev 21913)
+++
core3/viewmodel-impl/branches/vp-tree/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2010-09-17 01:26:43 UTC (rev 21914)
@@ -18,17 +18,17 @@
</osgi:service-properties>
</osgi:service>
- <osgi:service id="visualLexiconManagerService" ref="lexiconManager"
+ <!--<osgi:service id="visualLexiconManagerService" ref="lexiconManager"
interface="org.cytoscape.view.model.VisualLexiconManager">
<osgi:service-properties>
<entry key="service.type" value="objectFacade" />
</osgi:service-properties>
</osgi:service>
- <!-- Define OSGi Service Listener -->
+ Define OSGi Service Listener
<osgi:set id="renderers"
interface="org.cytoscape.view.model.VisualLexicon"
cardinality="0..N">
<osgi:listener bind-method="addVisualLexicon"
unbind-method="removeVisualLexicon"
ref="lexiconManager" />
</osgi:set>
-</beans>
+--></beans>
Modified:
core3/viewmodel-impl/branches/vp-tree/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/viewmodel-impl/branches/vp-tree/src/main/resources/META-INF/spring/bundle-context.xml
2010-09-17 01:25:47 UTC (rev 21913)
+++
core3/viewmodel-impl/branches/vp-tree/src/main/resources/META-INF/spring/bundle-context.xml
2010-09-17 01:26:43 UTC (rev 21914)
@@ -6,7 +6,7 @@
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context-2.5.xsd";>
-
+
<import resource="bundle-context-osgi.xml" />
<context:annotation-config />
@@ -17,13 +17,5 @@
<constructor-arg ref="cyEventHelperServiceRef" />
<constructor-arg ref="cyServiceRegistrarRef" />
</bean>
-
-
- <bean id="minimalLexicon"
class="org.cytoscape.view.model.internal.MinimalVisualLexicon" />
- <!-- Catalog object of available VP. This will be exported as service.
-->
- <bean id="lexiconManager"
class="org.cytoscape.view.model.internal.VisualLexiconManagerImpl">
- <constructor-arg ref="minimalLexicon" />
- </bean>
-
</beans>
Deleted:
core3/viewmodel-impl/branches/vp-tree/src/test/java/org/cytoscape/view/model/VisualLexiconTest.java
===================================================================
---
core3/viewmodel-impl/branches/vp-tree/src/test/java/org/cytoscape/view/model/VisualLexiconTest.java
2010-09-17 01:25:47 UTC (rev 21913)
+++
core3/viewmodel-impl/branches/vp-tree/src/test/java/org/cytoscape/view/model/VisualLexiconTest.java
2010-09-17 01:26:43 UTC (rev 21914)
@@ -1,47 +0,0 @@
-package org.cytoscape.view.model;
-
-
-import static org.junit.Assert.*;
-
-import java.util.Set;
-
-import org.cytoscape.view.model.internal.MinimalVisualLexicon;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-public class VisualLexiconTest {
-
- private VisualLexicon minimalLex;
- private VisualLexicon twoDLex;
- private VisualLexicon threeDLex;
-
- @Before
- public void setUp() throws Exception {
- minimalLex = new MinimalVisualLexicon();
- twoDLex = new TwoDVisualLexicon();
- threeDLex = new ThreeDVisualLexicon();
- }
-
- @After
- public void tearDown() throws Exception {
- }
-
- @Test
- public void testLexiconInstances() {
- assertNotNull(minimalLex);
- assertNotNull(twoDLex);
- assertNotNull(threeDLex);
- }
-
- @Test
- public void testMinimalLexicon() {
- final Set<VisualProperty<?>> all =
minimalLex.getAllVisualProperties();
-
- assertEquals(1, all.size());
- assertEquals(38, twoDLex.getAllVisualProperties().size());
- minimalLex.mergeLexicon(twoDLex);
- assertEquals(39, minimalLex.getAllVisualProperties().size());
- }
-
-}
--
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.
