Author: abeld
Date: 2009-03-12 01:07:58 -0700 (Thu, 12 Mar 2009)
New Revision: 16214
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/default-mappings/pom.xml
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/integration_test/pom.xml
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/presentation/pom.xml
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/presentation/src/main/java/org/cytoscape/presentation/NetworkPresentationFactory.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/presentation/src/main/java/org/cytoscape/presentation/TextNodeRenderer.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/presentation/src/main/java/org/cytoscape/presentation/internal/AdjMatrixTextRenderer.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/presentation/src/main/java/org/cytoscape/presentation/internal/DiscreteVisualProperty.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/presentation/src/main/java/org/cytoscape/presentation/internal/NetworkPresentationFactoryImpl.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/presentation/src/main/java/org/cytoscape/presentation/internal/RendererActivator.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/presentation/src/main/java/org/cytoscape/presentation/internal/TextNodeRendererImpl.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/presentation/src/main/java/org/cytoscape/presentation/internal/VisualPropertyImpl.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/run-row-oriented.sh
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/osgi.bnd
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/pom.xml
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/osgi.bnd
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/pom.xml
Log:
refactored-viewmodel: some changes for seperating row-based viewmodel, vizmap
into -api and -impl
Note that since a column-based approach will be used, these most likely won't
actually be used, but I don't want to leave them around un-checked-in.
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/default-mappings/pom.xml
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/default-mappings/pom.xml
2009-03-12 07:57:45 UTC (rev 16213)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/default-mappings/pom.xml
2009-03-12 08:07:58 UTC (rev 16214)
@@ -116,7 +116,7 @@
<dependency>
<groupId>org.cytoscape</groupId>
- <artifactId>vizmap</artifactId>
+ <artifactId>vizmap-api</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/integration_test/pom.xml
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/integration_test/pom.xml
2009-03-12 07:57:45 UTC (rev 16213)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/integration_test/pom.xml
2009-03-12 08:07:58 UTC (rev 16214)
@@ -173,7 +173,7 @@
<dependency>
<groupId>org.cytoscape</groupId>
- <artifactId>vizmap</artifactId>
+ <artifactId>vizmap-api</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/presentation/pom.xml
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/presentation/pom.xml
2009-03-12 07:57:45 UTC (rev 16213)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/presentation/pom.xml
2009-03-12 08:07:58 UTC (rev 16214)
@@ -104,13 +104,13 @@
<dependencies>
<dependency>
<groupId>org.cytoscape</groupId>
- <artifactId>model</artifactId>
+ <artifactId>model-api</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
- <artifactId>viewmodel</artifactId>
+ <artifactId>viewmodel-api</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/presentation/src/main/java/org/cytoscape/presentation/NetworkPresentationFactory.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/presentation/src/main/java/org/cytoscape/presentation/NetworkPresentationFactory.java
2009-03-12 07:57:45 UTC (rev 16213)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/presentation/src/main/java/org/cytoscape/presentation/NetworkPresentationFactory.java
2009-03-12 08:07:58 UTC (rev 16214)
@@ -35,7 +35,7 @@
package org.cytoscape.presentation;
-import org.cytoscape.viewmodel.CyNetworkView;
+import org.cytoscape.view.model.CyNetworkView;
/**
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/presentation/src/main/java/org/cytoscape/presentation/TextNodeRenderer.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/presentation/src/main/java/org/cytoscape/presentation/TextNodeRenderer.java
2009-03-12 07:57:45 UTC (rev 16213)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/presentation/src/main/java/org/cytoscape/presentation/TextNodeRenderer.java
2009-03-12 08:07:58 UTC (rev 16214)
@@ -35,9 +35,9 @@
package org.cytoscape.presentation;
-import org.cytoscape.viewmodel.Renderer;
-import org.cytoscape.viewmodel.View;
-import org.cytoscape.viewmodel.VisualProperty;
+import org.cytoscape.view.model.Renderer;
+import org.cytoscape.view.model.View;
+import org.cytoscape.view.model.VisualProperty;
import java.util.Set;
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/presentation/src/main/java/org/cytoscape/presentation/internal/AdjMatrixTextRenderer.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/presentation/src/main/java/org/cytoscape/presentation/internal/AdjMatrixTextRenderer.java
2009-03-12 07:57:45 UTC (rev 16213)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/presentation/src/main/java/org/cytoscape/presentation/internal/AdjMatrixTextRenderer.java
2009-03-12 08:07:58 UTC (rev 16214)
@@ -42,10 +42,10 @@
import org.cytoscape.model.CyNode;
import org.cytoscape.presentation.TextNodeRenderer;
import org.cytoscape.presentation.TextPresentation;
-import org.cytoscape.viewmodel.CyNetworkView;
-import org.cytoscape.viewmodel.Renderer;
-import org.cytoscape.viewmodel.View;
-import org.cytoscape.viewmodel.VisualProperty;
+import org.cytoscape.view.model.CyNetworkView;
+import org.cytoscape.view.model.Renderer;
+import org.cytoscape.view.model.View;
+import org.cytoscape.view.model.VisualProperty;
import org.osgi.framework.BundleContext;
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/presentation/src/main/java/org/cytoscape/presentation/internal/DiscreteVisualProperty.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/presentation/src/main/java/org/cytoscape/presentation/internal/DiscreteVisualProperty.java
2009-03-12 07:57:45 UTC (rev 16213)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/presentation/src/main/java/org/cytoscape/presentation/internal/DiscreteVisualProperty.java
2009-03-12 08:07:58 UTC (rev 16214)
@@ -35,8 +35,8 @@
package org.cytoscape.presentation.internal;
-import org.cytoscape.viewmodel.DependentVisualPropertyCallback;
-import org.cytoscape.viewmodel.VisualProperty;
+import org.cytoscape.view.model.DependentVisualPropertyCallback;
+import org.cytoscape.view.model.VisualProperty;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/presentation/src/main/java/org/cytoscape/presentation/internal/NetworkPresentationFactoryImpl.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/presentation/src/main/java/org/cytoscape/presentation/internal/NetworkPresentationFactoryImpl.java
2009-03-12 07:57:45 UTC (rev 16213)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/presentation/src/main/java/org/cytoscape/presentation/internal/NetworkPresentationFactoryImpl.java
2009-03-12 08:07:58 UTC (rev 16214)
@@ -39,7 +39,7 @@
import org.cytoscape.presentation.NetworkPresentationFactory;
import org.cytoscape.presentation.SwingPresentation;
import org.cytoscape.presentation.TextPresentation;
-import org.cytoscape.viewmodel.CyNetworkView;
+import org.cytoscape.view.model.CyNetworkView;
import org.osgi.framework.BundleContext;
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/presentation/src/main/java/org/cytoscape/presentation/internal/RendererActivator.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/presentation/src/main/java/org/cytoscape/presentation/internal/RendererActivator.java
2009-03-12 07:57:45 UTC (rev 16213)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/presentation/src/main/java/org/cytoscape/presentation/internal/RendererActivator.java
2009-03-12 08:07:58 UTC (rev 16214)
@@ -39,7 +39,7 @@
import java.util.Set;
import org.cytoscape.presentation.TextNodeRenderer;
-import org.cytoscape.viewmodel.Renderer;
+import org.cytoscape.view.model.Renderer;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/presentation/src/main/java/org/cytoscape/presentation/internal/TextNodeRendererImpl.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/presentation/src/main/java/org/cytoscape/presentation/internal/TextNodeRendererImpl.java
2009-03-12 07:57:45 UTC (rev 16213)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/presentation/src/main/java/org/cytoscape/presentation/internal/TextNodeRendererImpl.java
2009-03-12 08:07:58 UTC (rev 16214)
@@ -38,9 +38,9 @@
import org.cytoscape.presentation.TextNodeRenderer;
-import org.cytoscape.viewmodel.Renderer;
-import org.cytoscape.viewmodel.View;
-import org.cytoscape.viewmodel.VisualProperty;
+import org.cytoscape.view.model.Renderer;
+import org.cytoscape.view.model.View;
+import org.cytoscape.view.model.VisualProperty;
import java.util.HashSet;
import java.util.Set;
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/presentation/src/main/java/org/cytoscape/presentation/internal/VisualPropertyImpl.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/presentation/src/main/java/org/cytoscape/presentation/internal/VisualPropertyImpl.java
2009-03-12 07:57:45 UTC (rev 16213)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/presentation/src/main/java/org/cytoscape/presentation/internal/VisualPropertyImpl.java
2009-03-12 08:07:58 UTC (rev 16214)
@@ -36,13 +36,13 @@
package org.cytoscape.presentation.internal;
-import org.cytoscape.viewmodel.DependentVisualPropertyCallback;
-import org.cytoscape.viewmodel.VisualProperty;
+import org.cytoscape.view.model.DependentVisualPropertyCallback;
+import org.cytoscape.view.model.VisualProperty;
/**
* FIXME
- * Think of it as a column in the viewmodel table.
+ * Think of it as a column in the view.model table.
* @param <T> DOCUMENT ME!
*/
public class VisualPropertyImpl<T> implements VisualProperty<T> {
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/run-row-oriented.sh
===================================================================
--- cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/run-row-oriented.sh
2009-03-12 07:57:45 UTC (rev 16213)
+++ cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/run-row-oriented.sh
2009-03-12 08:07:58 UTC (rev 16214)
@@ -2,14 +2,22 @@
set -e
-cd viewmodel
+cd viewmodel-api
mvn clean install
cd ..
-cd vizmap
+cd viewmodel-row-based-impl
mvn clean install
cd ..
+cd vizmap-api
+mvn clean install
+cd ..
+
+cd vizmap-impl
+mvn clean install
+cd ..
+
cd presentation
mvn clean install
cd ..
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/osgi.bnd
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/osgi.bnd
2009-03-12 07:57:45 UTC (rev 16213)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/osgi.bnd
2009-03-12 08:07:58 UTC (rev 16214)
@@ -3,5 +3,5 @@
#-----------------------------------------------------------------
Spring-Context: META-INF/spring/*.xml
-Export-Package: ${bundle.symbolicName},${bundle.symbolicName}.events,
+Export-Package: ${bundle.namespace},${bundle.namespace}.events,
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/pom.xml
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/pom.xml
2009-03-12 07:57:45 UTC (rev 16213)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/pom.xml
2009-03-12 08:07:58 UTC (rev 16214)
@@ -8,8 +8,8 @@
</parent>
<properties>
- <bundle.symbolicName>org.cytoscape.viewmodel</bundle.symbolicName>
- <bundle.namespace>org.cytoscape.viewmodel</bundle.namespace>
+ <bundle.symbolicName>org.cytoscape.viewmodel-api</bundle.symbolicName>
+ <bundle.namespace>org.cytoscape.view.model</bundle.namespace>
</properties>
<modelVersion>4.0.0</modelVersion>
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/osgi.bnd
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/osgi.bnd
2009-03-12 07:57:45 UTC (rev 16213)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/osgi.bnd
2009-03-12 08:07:58 UTC (rev 16214)
@@ -3,5 +3,5 @@
#-----------------------------------------------------------------
Spring-Context: META-INF/spring/*.xml
-Private-Package:
${bundle.symbolicName}.internal,${bundle.symbolicName}.events.internal
+Private-Package:
${bundle.namespace}.internal,${bundle.namespace}.events.internal
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/pom.xml
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/pom.xml
2009-03-12 07:57:45 UTC (rev 16213)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/pom.xml
2009-03-12 08:07:58 UTC (rev 16214)
@@ -9,7 +9,7 @@
<properties>
<bundle.symbolicName>org.cytoscape.viewmodel</bundle.symbolicName>
- <bundle.namespace>org.cytoscape.viewmodel</bundle.namespace>
+ <bundle.namespace>org.cytoscape.view.model</bundle.namespace>
</properties>
<modelVersion>4.0.0</modelVersion>
@@ -107,6 +107,11 @@
<artifactId>model</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>viewmodel-api</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.osgi</groupId>
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
