Author: abeld
Date: 2009-03-12 00:56:28 -0700 (Thu, 12 Mar 2009)
New Revision: 16212
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/column-oriented-presentation/pom.xml
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/column-oriented-presentation/src/main/java/org/cytoscape/presentation/NetworkPresentationFactory.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/column-oriented-presentation/src/main/java/org/cytoscape/presentation/TextNodeRenderer.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/column-oriented-presentation/src/main/java/org/cytoscape/presentation/internal/AdjMatrixTextRenderer.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/column-oriented-presentation/src/main/java/org/cytoscape/presentation/internal/DiscreteVisualProperty.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/column-oriented-presentation/src/main/java/org/cytoscape/presentation/internal/NetworkPresentationFactoryImpl.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/column-oriented-presentation/src/main/java/org/cytoscape/presentation/internal/RendererActivator.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/column-oriented-presentation/src/main/java/org/cytoscape/presentation/internal/TextNodeRendererImpl.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/column-oriented-presentation/src/main/java/org/cytoscape/presentation/internal/VisualPropertyImpl.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/run-column-oriented.sh
Log:
refactored-viewmodel: try to do integration testing -- not much success
apparently everything compiles, and integration-testing does launch,
but it doesn't appear to run anything.
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/column-oriented-presentation/pom.xml
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/column-oriented-presentation/pom.xml
2009-03-12 07:43:52 UTC (rev 16211)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/column-oriented-presentation/pom.xml
2009-03-12 07:56:28 UTC (rev 16212)
@@ -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/column-oriented-presentation/src/main/java/org/cytoscape/presentation/NetworkPresentationFactory.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/column-oriented-presentation/src/main/java/org/cytoscape/presentation/NetworkPresentationFactory.java
2009-03-12 07:43:52 UTC (rev 16211)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/column-oriented-presentation/src/main/java/org/cytoscape/presentation/NetworkPresentationFactory.java
2009-03-12 07:56:28 UTC (rev 16212)
@@ -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/column-oriented-presentation/src/main/java/org/cytoscape/presentation/TextNodeRenderer.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/column-oriented-presentation/src/main/java/org/cytoscape/presentation/TextNodeRenderer.java
2009-03-12 07:43:52 UTC (rev 16211)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/column-oriented-presentation/src/main/java/org/cytoscape/presentation/TextNodeRenderer.java
2009-03-12 07:56:28 UTC (rev 16212)
@@ -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/column-oriented-presentation/src/main/java/org/cytoscape/presentation/internal/AdjMatrixTextRenderer.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/column-oriented-presentation/src/main/java/org/cytoscape/presentation/internal/AdjMatrixTextRenderer.java
2009-03-12 07:43:52 UTC (rev 16211)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/column-oriented-presentation/src/main/java/org/cytoscape/presentation/internal/AdjMatrixTextRenderer.java
2009-03-12 07:56:28 UTC (rev 16212)
@@ -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/column-oriented-presentation/src/main/java/org/cytoscape/presentation/internal/DiscreteVisualProperty.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/column-oriented-presentation/src/main/java/org/cytoscape/presentation/internal/DiscreteVisualProperty.java
2009-03-12 07:43:52 UTC (rev 16211)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/column-oriented-presentation/src/main/java/org/cytoscape/presentation/internal/DiscreteVisualProperty.java
2009-03-12 07:56:28 UTC (rev 16212)
@@ -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/column-oriented-presentation/src/main/java/org/cytoscape/presentation/internal/NetworkPresentationFactoryImpl.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/column-oriented-presentation/src/main/java/org/cytoscape/presentation/internal/NetworkPresentationFactoryImpl.java
2009-03-12 07:43:52 UTC (rev 16211)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/column-oriented-presentation/src/main/java/org/cytoscape/presentation/internal/NetworkPresentationFactoryImpl.java
2009-03-12 07:56:28 UTC (rev 16212)
@@ -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/column-oriented-presentation/src/main/java/org/cytoscape/presentation/internal/RendererActivator.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/column-oriented-presentation/src/main/java/org/cytoscape/presentation/internal/RendererActivator.java
2009-03-12 07:43:52 UTC (rev 16211)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/column-oriented-presentation/src/main/java/org/cytoscape/presentation/internal/RendererActivator.java
2009-03-12 07:56:28 UTC (rev 16212)
@@ -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/column-oriented-presentation/src/main/java/org/cytoscape/presentation/internal/TextNodeRendererImpl.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/column-oriented-presentation/src/main/java/org/cytoscape/presentation/internal/TextNodeRendererImpl.java
2009-03-12 07:43:52 UTC (rev 16211)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/column-oriented-presentation/src/main/java/org/cytoscape/presentation/internal/TextNodeRendererImpl.java
2009-03-12 07:56:28 UTC (rev 16212)
@@ -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/column-oriented-presentation/src/main/java/org/cytoscape/presentation/internal/VisualPropertyImpl.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/column-oriented-presentation/src/main/java/org/cytoscape/presentation/internal/VisualPropertyImpl.java
2009-03-12 07:43:52 UTC (rev 16211)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/column-oriented-presentation/src/main/java/org/cytoscape/presentation/internal/VisualPropertyImpl.java
2009-03-12 07:56:28 UTC (rev 16212)
@@ -36,8 +36,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;
/**
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/run-column-oriented.sh
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/run-column-oriented.sh
2009-03-12 07:43:52 UTC (rev 16211)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/run-column-oriented.sh
2009-03-12 07:56:28 UTC (rev 16212)
@@ -2,19 +2,31 @@
set -e
-cd column-oriented-viewmodel
+cd viewmodel-api-columns
mvn clean install
cd ..
-cd column-oriented-vizmap
+cd viewmodel-impl-columns
mvn clean install
cd ..
-cd presentation
+cd vizmap-api-columns
mvn clean install
cd ..
+cd vizmap-impl-columns
+mvn clean install
+cd ..
+
+cd column-oriented-presentation
+mvn clean install
+cd ..
+
+#cd default-mappings
+#mvn clean install
+#cd ..
+
cd column-oriented-integration_test
mvn clean install
mvn pax:run
-cd ..
\ No newline at end of file
+cd ..
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
