Author: abeld
Date: 2009-03-07 11:28:00 -0800 (Sat, 07 Mar 2009)
New Revision: 16174
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/default-mappings/pom.xml
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/default-mappings/src/main/java/org/cytoscape/vizmap/mappings/ContinuousMapping.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/default-mappings/src/main/java/org/cytoscape/vizmap/mappings/DiscreteMapping.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/default-mappings/src/main/java/org/cytoscape/vizmap/mappings/PassthroughMappingCalculator.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/integration_test/pom.xml
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/integration_test/src/main/java/cytoscape/CyMain.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/integration_test/src/main/resources/META-INF/spring/bundle-context-osgi.xml
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/main/java/org/cytoscape/view/model/CyNetworkView.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/main/java/org/cytoscape/view/model/CyNetworkViewFactory.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/main/java/org/cytoscape/view/model/DependentVisualPropertyCallback.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/main/java/org/cytoscape/view/model/Renderer.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/main/java/org/cytoscape/view/model/View.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/main/java/org/cytoscape/view/model/VisualProperty.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/main/java/org/cytoscape/view/model/VisualPropertyCatalog.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/main/java/org/cytoscape/view/model/events/SubsetChangedEvent.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/main/java/org/cytoscape/view/model/events/SubsetChangedListener.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/main/java/org/cytoscape/view/model/events/SubsetCreatedEvent.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/main/java/org/cytoscape/view/model/events/SubsetCreatedListener.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/main/java/org/cytoscape/view/model/events/SubsetDestroyedEvent.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/main/java/org/cytoscape/view/model/events/SubsetDestroyedListener.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/main/resources/META-INF/spring/bundle-context-osgi.xml
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/test/java/org/cytoscape/viewmodel/internal/EdgeWidthVisualProperty.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/test/java/org/cytoscape/viewmodel/internal/NodeColorVisualProperty.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/test/java/org/cytoscape/viewmodel/internal/ViewTest.java
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
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/src/main/java/org/cytoscape/view/model/events/internal/AbstractSubsetEvent.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/src/main/java/org/cytoscape/view/model/events/internal/SubsetChangedEventImpl.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/src/main/java/org/cytoscape/view/model/events/internal/SubsetCreatedEventImpl.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/src/main/java/org/cytoscape/view/model/events/internal/SubsetDestroyedEventImpl.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/src/main/java/org/cytoscape/view/model/internal/IdFactory.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/src/main/java/org/cytoscape/view/model/internal/RowOrientedNetworkViewFactoryImpl.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/src/main/java/org/cytoscape/view/model/internal/RowOrientedNetworkViewImpl.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/src/main/java/org/cytoscape/view/model/internal/RowOrientedViewImpl.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/src/main/java/org/cytoscape/view/model/internal/VisualPropertyCatalogImpl.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/src/main/resources/META-INF/spring/bundle-context.xml
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/src/test/java/org/cytoscape/viewmodel/internal/EdgeWidthVisualProperty.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/src/test/java/org/cytoscape/viewmodel/internal/NodeColorVisualProperty.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/src/test/java/org/cytoscape/viewmodel/internal/ViewTest.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap/pom.xml
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap/src/main/java/org/cytoscape/vizmap/MappingCalculator.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap/src/main/java/org/cytoscape/vizmap/VisualMappingManager.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap/src/main/java/org/cytoscape/vizmap/VisualStyle.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap/src/main/java/org/cytoscape/vizmap/events/VisualStyleSwitchedEvent.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap/src/main/java/org/cytoscape/vizmap/internal/VisualMappingManagerImpl.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap/src/main/java/org/cytoscape/vizmap/internal/VisualStyleCatalogImpl.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap/src/main/java/org/cytoscape/vizmap/internal/VisualStyleImpl.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap/src/main/resources/META-INF/spring/bundle-context-osgi.xml
Log:
refactored-viewmodel: viewmodel -api and -impl seperation: import and package
lines rewritten in .java files
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-07 18:53:46 UTC (rev 16173)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/default-mappings/pom.xml
2009-03-07 19:28:00 UTC (rev 16174)
@@ -110,7 +110,7 @@
<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/default-mappings/src/main/java/org/cytoscape/vizmap/mappings/ContinuousMapping.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/default-mappings/src/main/java/org/cytoscape/vizmap/mappings/ContinuousMapping.java
2009-03-07 18:53:46 UTC (rev 16173)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/default-mappings/src/main/java/org/cytoscape/vizmap/mappings/ContinuousMapping.java
2009-03-07 19:28:00 UTC (rev 16174)
@@ -45,8 +45,8 @@
import org.cytoscape.model.CyRow;
import org.cytoscape.model.GraphObject;
import org.cytoscape.vizmap.MappingCalculator;
-import org.cytoscape.viewmodel.View;
-import org.cytoscape.viewmodel.VisualProperty;
+import org.cytoscape.view.model.View;
+import org.cytoscape.view.model.VisualProperty;
import org.cytoscape.vizmap.mappings.ContinuousMappingPoint;
import org.cytoscape.vizmap.mappings.interpolators.Interpolator;
import org.cytoscape.vizmap.mappings.interpolators.FlatInterpolator;
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/default-mappings/src/main/java/org/cytoscape/vizmap/mappings/DiscreteMapping.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/default-mappings/src/main/java/org/cytoscape/vizmap/mappings/DiscreteMapping.java
2009-03-07 18:53:46 UTC (rev 16173)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/default-mappings/src/main/java/org/cytoscape/vizmap/mappings/DiscreteMapping.java
2009-03-07 19:28:00 UTC (rev 16174)
@@ -44,8 +44,8 @@
import org.cytoscape.model.CyRow;
import org.cytoscape.model.GraphObject;
-import org.cytoscape.viewmodel.View;
-import org.cytoscape.viewmodel.VisualProperty;
+import org.cytoscape.view.model.View;
+import org.cytoscape.view.model.VisualProperty;
import org.cytoscape.vizmap.MappingCalculator;
import java.util.Map;
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/default-mappings/src/main/java/org/cytoscape/vizmap/mappings/PassthroughMappingCalculator.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/default-mappings/src/main/java/org/cytoscape/vizmap/mappings/PassthroughMappingCalculator.java
2009-03-07 18:53:46 UTC (rev 16173)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/default-mappings/src/main/java/org/cytoscape/vizmap/mappings/PassthroughMappingCalculator.java
2009-03-07 19:28:00 UTC (rev 16174)
@@ -38,7 +38,7 @@
import org.cytoscape.model.*;
-import org.cytoscape.viewmodel.*;
+import org.cytoscape.view.model.*;
import org.cytoscape.vizmap.*;
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-07 18:53:46 UTC (rev 16173)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/integration_test/pom.xml
2009-03-07 19:28:00 UTC (rev 16174)
@@ -167,7 +167,7 @@
<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/integration_test/src/main/java/cytoscape/CyMain.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/integration_test/src/main/java/cytoscape/CyMain.java
2009-03-07 18:53:46 UTC (rev 16173)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/integration_test/src/main/java/cytoscape/CyMain.java
2009-03-07 19:28:00 UTC (rev 16174)
@@ -45,7 +45,7 @@
import org.cytoscape.presentation.NetworkPresentationFactory;
import org.cytoscape.presentation.TextPresentation;
-import org.cytoscape.viewmodel.*;
+import org.cytoscape.view.model.*;
import org.cytoscape.vizmap.*;
import org.cytoscape.vizmap.mappings.*;
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/integration_test/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/integration_test/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2009-03-07 18:53:46 UTC (rev 16173)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/integration_test/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2009-03-07 19:28:00 UTC (rev 16174)
@@ -10,7 +10,7 @@
</osgi:reference>
<osgi:reference id="cyNetworkViewFactoryServiceRef"
- interface="org.cytoscape.viewmodel.CyNetworkViewFactory">
+ interface="org.cytoscape.view.model.CyNetworkViewFactory">
</osgi:reference>
<osgi:reference id="networkPresentationFactoryServiceRef"
@@ -22,6 +22,6 @@
</osgi:reference>
<osgi:reference id="visualPropertyCatalogServiceRef"
- interface="org.cytoscape.viewmodel.VisualPropertyCatalog">
+ interface="org.cytoscape.view.model.VisualPropertyCatalog">
</osgi:reference>
</beans>
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/main/java/org/cytoscape/view/model/CyNetworkView.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/main/java/org/cytoscape/view/model/CyNetworkView.java
2009-03-07 18:53:46 UTC (rev 16173)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/main/java/org/cytoscape/view/model/CyNetworkView.java
2009-03-07 19:28:00 UTC (rev 16174)
@@ -32,7 +32,7 @@
along with this library; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.cytoscape.viewmodel;
+package org.cytoscape.view.model;
import org.cytoscape.model.CyEdge;
import org.cytoscape.model.CyNetwork;
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/main/java/org/cytoscape/view/model/CyNetworkViewFactory.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/main/java/org/cytoscape/view/model/CyNetworkViewFactory.java
2009-03-07 18:53:46 UTC (rev 16173)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/main/java/org/cytoscape/view/model/CyNetworkViewFactory.java
2009-03-07 19:28:00 UTC (rev 16174)
@@ -32,7 +32,7 @@
along with this library; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.cytoscape.viewmodel;
+package org.cytoscape.view.model;
import org.cytoscape.model.CyNetwork;
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/main/java/org/cytoscape/view/model/DependentVisualPropertyCallback.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/main/java/org/cytoscape/view/model/DependentVisualPropertyCallback.java
2009-03-07 18:53:46 UTC (rev 16173)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/main/java/org/cytoscape/view/model/DependentVisualPropertyCallback.java
2009-03-07 19:28:00 UTC (rev 16174)
@@ -32,7 +32,7 @@
along with this library; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.cytoscape.viewmodel;
+package org.cytoscape.view.model;
import java.util.Collection;
import java.util.Set;
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/main/java/org/cytoscape/view/model/Renderer.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/main/java/org/cytoscape/view/model/Renderer.java
2009-03-07 18:53:46 UTC (rev 16173)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/main/java/org/cytoscape/view/model/Renderer.java
2009-03-07 19:28:00 UTC (rev 16174)
@@ -32,7 +32,7 @@
along with this library; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.cytoscape.viewmodel;
+package org.cytoscape.view.model;
import java.util.Set;
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/main/java/org/cytoscape/view/model/View.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/main/java/org/cytoscape/view/model/View.java
2009-03-07 18:53:46 UTC (rev 16173)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/main/java/org/cytoscape/view/model/View.java
2009-03-07 19:28:00 UTC (rev 16174)
@@ -32,7 +32,7 @@
along with this library; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.cytoscape.viewmodel;
+package org.cytoscape.view.model;
import org.cytoscape.model.Identifiable;
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/main/java/org/cytoscape/view/model/VisualProperty.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/main/java/org/cytoscape/view/model/VisualProperty.java
2009-03-07 18:53:46 UTC (rev 16173)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/main/java/org/cytoscape/view/model/VisualProperty.java
2009-03-07 19:28:00 UTC (rev 16174)
@@ -32,7 +32,7 @@
along with this library; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.cytoscape.viewmodel;
+package org.cytoscape.view.model;
/**
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/main/java/org/cytoscape/view/model/VisualPropertyCatalog.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/main/java/org/cytoscape/view/model/VisualPropertyCatalog.java
2009-03-07 18:53:46 UTC (rev 16173)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/main/java/org/cytoscape/view/model/VisualPropertyCatalog.java
2009-03-07 19:28:00 UTC (rev 16174)
@@ -32,7 +32,7 @@
along with this library; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.cytoscape.viewmodel;
+package org.cytoscape.view.model;
import java.util.Collection;
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/main/java/org/cytoscape/view/model/events/SubsetChangedEvent.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/main/java/org/cytoscape/view/model/events/SubsetChangedEvent.java
2009-03-07 18:53:46 UTC (rev 16173)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/main/java/org/cytoscape/view/model/events/SubsetChangedEvent.java
2009-03-07 19:28:00 UTC (rev 16174)
@@ -32,11 +32,11 @@
along with this library; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.cytoscape.viewmodel.events;
+package org.cytoscape.view.model.events;
import org.cytoscape.event.CyEvent;
-import org.cytoscape.viewmodel.CyNetworkView;
+import org.cytoscape.view.model.CyNetworkView;
/**
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/main/java/org/cytoscape/view/model/events/SubsetChangedListener.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/main/java/org/cytoscape/view/model/events/SubsetChangedListener.java
2009-03-07 18:53:46 UTC (rev 16173)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/main/java/org/cytoscape/view/model/events/SubsetChangedListener.java
2009-03-07 19:28:00 UTC (rev 16174)
@@ -32,7 +32,7 @@
along with this library; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.cytoscape.viewmodel.events;
+package org.cytoscape.view.model.events;
import org.cytoscape.event.CyListener;
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/main/java/org/cytoscape/view/model/events/SubsetCreatedEvent.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/main/java/org/cytoscape/view/model/events/SubsetCreatedEvent.java
2009-03-07 18:53:46 UTC (rev 16173)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/main/java/org/cytoscape/view/model/events/SubsetCreatedEvent.java
2009-03-07 19:28:00 UTC (rev 16174)
@@ -32,11 +32,11 @@
along with this library; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.cytoscape.viewmodel.events;
+package org.cytoscape.view.model.events;
import org.cytoscape.event.CyEvent;
-import org.cytoscape.viewmodel.CyNetworkView;
+import org.cytoscape.view.model.CyNetworkView;
/**
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/main/java/org/cytoscape/view/model/events/SubsetCreatedListener.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/main/java/org/cytoscape/view/model/events/SubsetCreatedListener.java
2009-03-07 18:53:46 UTC (rev 16173)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/main/java/org/cytoscape/view/model/events/SubsetCreatedListener.java
2009-03-07 19:28:00 UTC (rev 16174)
@@ -32,7 +32,7 @@
along with this library; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.cytoscape.viewmodel.events;
+package org.cytoscape.view.model.events;
import org.cytoscape.event.CyListener;
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/main/java/org/cytoscape/view/model/events/SubsetDestroyedEvent.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/main/java/org/cytoscape/view/model/events/SubsetDestroyedEvent.java
2009-03-07 18:53:46 UTC (rev 16173)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/main/java/org/cytoscape/view/model/events/SubsetDestroyedEvent.java
2009-03-07 19:28:00 UTC (rev 16174)
@@ -32,11 +32,11 @@
along with this library; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.cytoscape.viewmodel.events;
+package org.cytoscape.view.model.events;
import org.cytoscape.event.CyEvent;
-import org.cytoscape.viewmodel.CyNetworkView;
+import org.cytoscape.view.model.CyNetworkView;
/**
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/main/java/org/cytoscape/view/model/events/SubsetDestroyedListener.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/main/java/org/cytoscape/view/model/events/SubsetDestroyedListener.java
2009-03-07 18:53:46 UTC (rev 16173)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/main/java/org/cytoscape/view/model/events/SubsetDestroyedListener.java
2009-03-07 19:28:00 UTC (rev 16174)
@@ -32,7 +32,7 @@
along with this library; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.cytoscape.viewmodel.events;
+package org.cytoscape.view.model.events;
import org.cytoscape.event.CyListener;
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2009-03-07 18:53:46 UTC (rev 16173)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2009-03-07 19:28:00 UTC (rev 16174)
@@ -8,14 +8,14 @@
<!-- Individual Service -->
<osgi:service id="cyNetworkViewFactoryService"
- ref="cyNetworkViewFactory"
interface="org.cytoscape.viewmodel.CyNetworkViewFactory">
+ ref="cyNetworkViewFactory"
interface="org.cytoscape.view.model.CyNetworkViewFactory">
<osgi:service-properties>
<entry key="service.type" value="factory" />
</osgi:service-properties>
</osgi:service>
<osgi:service id="visualPropertyCatalogService"
- ref="visualPropertyCatalog"
interface="org.cytoscape.viewmodel.VisualPropertyCatalog">
+ ref="visualPropertyCatalog"
interface="org.cytoscape.view.model.VisualPropertyCatalog">
</osgi:service>
<osgi:reference id="cyEventHelperServiceRef"
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/test/java/org/cytoscape/viewmodel/internal/EdgeWidthVisualProperty.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/test/java/org/cytoscape/viewmodel/internal/EdgeWidthVisualProperty.java
2009-03-07 18:53:46 UTC (rev 16173)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/test/java/org/cytoscape/viewmodel/internal/EdgeWidthVisualProperty.java
2009-03-07 19:28:00 UTC (rev 16174)
@@ -32,9 +32,9 @@
along with this library; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.cytoscape.viewmodel.internal;
+package org.cytoscape.view.model.internal;
-import org.cytoscape.viewmodel.*;
+import org.cytoscape.view.model.*;
/**
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/test/java/org/cytoscape/viewmodel/internal/NodeColorVisualProperty.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/test/java/org/cytoscape/viewmodel/internal/NodeColorVisualProperty.java
2009-03-07 18:53:46 UTC (rev 16173)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/test/java/org/cytoscape/viewmodel/internal/NodeColorVisualProperty.java
2009-03-07 19:28:00 UTC (rev 16174)
@@ -32,9 +32,9 @@
along with this library; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.cytoscape.viewmodel.internal;
+package org.cytoscape.view.model.internal;
-import org.cytoscape.viewmodel.*;
+import org.cytoscape.view.model.*;
import java.awt.Color;
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/test/java/org/cytoscape/viewmodel/internal/ViewTest.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/test/java/org/cytoscape/viewmodel/internal/ViewTest.java
2009-03-07 18:53:46 UTC (rev 16173)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/test/java/org/cytoscape/viewmodel/internal/ViewTest.java
2009-03-07 19:28:00 UTC (rev 16174)
@@ -32,15 +32,15 @@
along with this library; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.cytoscape.viewmodel.internal;
+package org.cytoscape.view.model.internal;
import junit.framework.Assert;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.cytoscape.viewmodel.*;
-import org.cytoscape.viewmodel.internal.*;
+import org.cytoscape.view.model.*;
+import org.cytoscape.view.model.internal.*;
import java.awt.Color;
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-07 18:53:46 UTC (rev 16173)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/osgi.bnd
2009-03-07 19:28:00 UTC (rev 16174)
@@ -4,5 +4,4 @@
Spring-Context: META-INF/spring/*.xml
Private-Package:
${bundle.symbolicName}.internal,${bundle.symbolicName}.events.internal
-Export-Package: ${bundle.symbolicName},${bundle.symbolicName}.events,
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-07 18:53:46 UTC (rev 16173)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/pom.xml
2009-03-07 19:28:00 UTC (rev 16174)
@@ -14,7 +14,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.cytoscape</groupId>
- <artifactId>viewmodel</artifactId>
+ <artifactId>viewmodel-impl</artifactId>
<version>1.0-SNAPSHOT</version>
<name>${bundle.symbolicName}</name>
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/src/main/java/org/cytoscape/view/model/events/internal/AbstractSubsetEvent.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/src/main/java/org/cytoscape/view/model/events/internal/AbstractSubsetEvent.java
2009-03-07 18:53:46 UTC (rev 16173)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/src/main/java/org/cytoscape/view/model/events/internal/AbstractSubsetEvent.java
2009-03-07 19:28:00 UTC (rev 16174)
@@ -32,11 +32,11 @@
along with this library; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.cytoscape.viewmodel.events.internal;
+package org.cytoscape.view.model.events.internal;
import org.cytoscape.event.CyEvent;
-import org.cytoscape.viewmodel.CyNetworkView;
+import org.cytoscape.view.model.CyNetworkView;
/**
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/src/main/java/org/cytoscape/view/model/events/internal/SubsetChangedEventImpl.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/src/main/java/org/cytoscape/view/model/events/internal/SubsetChangedEventImpl.java
2009-03-07 18:53:46 UTC (rev 16173)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/src/main/java/org/cytoscape/view/model/events/internal/SubsetChangedEventImpl.java
2009-03-07 19:28:00 UTC (rev 16174)
@@ -32,9 +32,9 @@
along with this library; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.cytoscape.viewmodel.events.internal;
+package org.cytoscape.view.model.events.internal;
-import org.cytoscape.viewmodel.CyNetworkView;
+import org.cytoscape.view.model.CyNetworkView;
/**
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/src/main/java/org/cytoscape/view/model/events/internal/SubsetCreatedEventImpl.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/src/main/java/org/cytoscape/view/model/events/internal/SubsetCreatedEventImpl.java
2009-03-07 18:53:46 UTC (rev 16173)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/src/main/java/org/cytoscape/view/model/events/internal/SubsetCreatedEventImpl.java
2009-03-07 19:28:00 UTC (rev 16174)
@@ -32,9 +32,9 @@
along with this library; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.cytoscape.viewmodel.events.internal;
+package org.cytoscape.view.model.events.internal;
-import org.cytoscape.viewmodel.CyNetworkView;
+import org.cytoscape.view.model.CyNetworkView;
/**
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/src/main/java/org/cytoscape/view/model/events/internal/SubsetDestroyedEventImpl.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/src/main/java/org/cytoscape/view/model/events/internal/SubsetDestroyedEventImpl.java
2009-03-07 18:53:46 UTC (rev 16173)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/src/main/java/org/cytoscape/view/model/events/internal/SubsetDestroyedEventImpl.java
2009-03-07 19:28:00 UTC (rev 16174)
@@ -32,9 +32,9 @@
along with this library; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.cytoscape.viewmodel.events.internal;
+package org.cytoscape.view.model.events.internal;
-import org.cytoscape.viewmodel.CyNetworkView;
+import org.cytoscape.view.model.CyNetworkView;
/**
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/src/main/java/org/cytoscape/view/model/internal/IdFactory.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/src/main/java/org/cytoscape/view/model/internal/IdFactory.java
2009-03-07 18:53:46 UTC (rev 16173)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/src/main/java/org/cytoscape/view/model/internal/IdFactory.java
2009-03-07 19:28:00 UTC (rev 16174)
@@ -32,7 +32,7 @@
along with this library; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.cytoscape.viewmodel.internal;
+package org.cytoscape.view.model.internal;
// note: copy-pasted from org.cytoscape.model.internal
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/src/main/java/org/cytoscape/view/model/internal/RowOrientedNetworkViewFactoryImpl.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/src/main/java/org/cytoscape/view/model/internal/RowOrientedNetworkViewFactoryImpl.java
2009-03-07 18:53:46 UTC (rev 16173)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/src/main/java/org/cytoscape/view/model/internal/RowOrientedNetworkViewFactoryImpl.java
2009-03-07 19:28:00 UTC (rev 16174)
@@ -32,14 +32,14 @@
along with this library; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.cytoscape.viewmodel.internal;
+package org.cytoscape.view.model.internal;
import org.cytoscape.event.CyEventHelper;
import org.cytoscape.model.CyNetwork;
-import org.cytoscape.viewmodel.CyNetworkView;
-import org.cytoscape.viewmodel.CyNetworkViewFactory;
+import org.cytoscape.view.model.CyNetworkView;
+import org.cytoscape.view.model.CyNetworkViewFactory;
import org.osgi.framework.BundleContext;
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/src/main/java/org/cytoscape/view/model/internal/RowOrientedNetworkViewImpl.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/src/main/java/org/cytoscape/view/model/internal/RowOrientedNetworkViewImpl.java
2009-03-07 18:53:46 UTC (rev 16173)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/src/main/java/org/cytoscape/view/model/internal/RowOrientedNetworkViewImpl.java
2009-03-07 19:28:00 UTC (rev 16174)
@@ -32,7 +32,7 @@
along with this library; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.cytoscape.viewmodel.internal;
+package org.cytoscape.view.model.internal;
import org.cytoscape.event.CyEventHelper;
@@ -49,14 +49,14 @@
import org.cytoscape.model.events.AddedNodeEvent;
import org.cytoscape.model.events.AddedNodeListener;
-import org.cytoscape.viewmodel.CyNetworkView;
-import org.cytoscape.viewmodel.View;
-import org.cytoscape.viewmodel.events.SubsetChangedListener;
-import org.cytoscape.viewmodel.events.SubsetCreatedListener;
-import org.cytoscape.viewmodel.events.SubsetDestroyedListener;
-import org.cytoscape.viewmodel.events.internal.SubsetChangedEventImpl;
-import org.cytoscape.viewmodel.events.internal.SubsetCreatedEventImpl;
-import org.cytoscape.viewmodel.events.internal.SubsetDestroyedEventImpl;
+import org.cytoscape.view.model.CyNetworkView;
+import org.cytoscape.view.model.View;
+import org.cytoscape.view.model.events.SubsetChangedListener;
+import org.cytoscape.view.model.events.SubsetCreatedListener;
+import org.cytoscape.view.model.events.SubsetDestroyedListener;
+import org.cytoscape.view.model.events.internal.SubsetChangedEventImpl;
+import org.cytoscape.view.model.events.internal.SubsetCreatedEventImpl;
+import org.cytoscape.view.model.events.internal.SubsetDestroyedEventImpl;
import org.osgi.framework.BundleContext;
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/src/main/java/org/cytoscape/view/model/internal/RowOrientedViewImpl.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/src/main/java/org/cytoscape/view/model/internal/RowOrientedViewImpl.java
2009-03-07 18:53:46 UTC (rev 16173)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/src/main/java/org/cytoscape/view/model/internal/RowOrientedViewImpl.java
2009-03-07 19:28:00 UTC (rev 16174)
@@ -32,10 +32,10 @@
along with this library; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.cytoscape.viewmodel.internal;
+package org.cytoscape.view.model.internal;
-import org.cytoscape.viewmodel.View;
-import org.cytoscape.viewmodel.VisualProperty;
+import org.cytoscape.view.model.View;
+import org.cytoscape.view.model.VisualProperty;
import java.util.HashMap;
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/src/main/java/org/cytoscape/view/model/internal/VisualPropertyCatalogImpl.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/src/main/java/org/cytoscape/view/model/internal/VisualPropertyCatalogImpl.java
2009-03-07 18:53:46 UTC (rev 16173)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/src/main/java/org/cytoscape/view/model/internal/VisualPropertyCatalogImpl.java
2009-03-07 19:28:00 UTC (rev 16174)
@@ -32,14 +32,14 @@
along with this library; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.cytoscape.viewmodel.internal;
+package org.cytoscape.view.model.internal;
-import org.cytoscape.viewmodel.CyNetworkView;
-import org.cytoscape.viewmodel.DependentVisualPropertyCallback;
-import org.cytoscape.viewmodel.Renderer;
-import org.cytoscape.viewmodel.View;
-import org.cytoscape.viewmodel.VisualProperty;
-import org.cytoscape.viewmodel.VisualPropertyCatalog;
+import org.cytoscape.view.model.CyNetworkView;
+import org.cytoscape.view.model.DependentVisualPropertyCallback;
+import org.cytoscape.view.model.Renderer;
+import org.cytoscape.view.model.View;
+import org.cytoscape.view.model.VisualProperty;
+import org.cytoscape.view.model.VisualPropertyCatalog;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2009-03-07 18:53:46 UTC (rev 16173)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2009-03-07 19:28:00 UTC (rev 16174)
@@ -6,19 +6,4 @@
http://www.springframework.org/schema/osgi
http://www.springframework.org/schema/osgi/spring-osgi-1.0.xsd";
default-lazy-init="false">
- <!-- Individual Service -->
- <osgi:service id="cyNetworkViewFactoryService"
- ref="cyNetworkViewFactory"
interface="org.cytoscape.viewmodel.CyNetworkViewFactory">
- <osgi:service-properties>
- <entry key="service.type" value="factory" />
- </osgi:service-properties>
- </osgi:service>
-
- <osgi:service id="visualPropertyCatalogService"
- ref="visualPropertyCatalog"
interface="org.cytoscape.viewmodel.VisualPropertyCatalog">
- </osgi:service>
-
- <osgi:reference id="cyEventHelperServiceRef"
- interface="org.cytoscape.event.CyEventHelper">
- </osgi:reference>
</beans>
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/src/main/resources/META-INF/spring/bundle-context.xml
2009-03-07 18:53:46 UTC (rev 16173)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/src/main/resources/META-INF/spring/bundle-context.xml
2009-03-07 19:28:00 UTC (rev 16174)
@@ -15,12 +15,12 @@
<context:annotation-config/>
- <bean id="cyNetworkViewFactory"
class="org.cytoscape.viewmodel.internal.RowOrientedNetworkViewFactoryImpl">
+ <bean id="cyNetworkViewFactory"
class="org.cytoscape.view.model.internal.RowOrientedNetworkViewFactoryImpl">
<property name="eventHelper" ref="cyEventHelperServiceRef"></property>
<property name="bundleContext" ref="bundleContext"></property>
</bean>
- <bean id="visualPropertyCatalog"
class="org.cytoscape.viewmodel.internal.VisualPropertyCatalogImpl">
+ <bean id="visualPropertyCatalog"
class="org.cytoscape.view.model.internal.VisualPropertyCatalogImpl">
<property name="bundleContext" ref="bundleContext"></property>
</bean>
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/src/test/java/org/cytoscape/viewmodel/internal/EdgeWidthVisualProperty.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/src/test/java/org/cytoscape/viewmodel/internal/EdgeWidthVisualProperty.java
2009-03-07 18:53:46 UTC (rev 16173)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/src/test/java/org/cytoscape/viewmodel/internal/EdgeWidthVisualProperty.java
2009-03-07 19:28:00 UTC (rev 16174)
@@ -32,9 +32,9 @@
along with this library; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.cytoscape.viewmodel.internal;
+package org.cytoscape.view.model.internal;
-import org.cytoscape.viewmodel.*;
+import org.cytoscape.view.model.*;
/**
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/src/test/java/org/cytoscape/viewmodel/internal/NodeColorVisualProperty.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/src/test/java/org/cytoscape/viewmodel/internal/NodeColorVisualProperty.java
2009-03-07 18:53:46 UTC (rev 16173)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/src/test/java/org/cytoscape/viewmodel/internal/NodeColorVisualProperty.java
2009-03-07 19:28:00 UTC (rev 16174)
@@ -32,9 +32,9 @@
along with this library; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.cytoscape.viewmodel.internal;
+package org.cytoscape.view.model.internal;
-import org.cytoscape.viewmodel.*;
+import org.cytoscape.view.model.*;
import java.awt.Color;
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/src/test/java/org/cytoscape/viewmodel/internal/ViewTest.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/src/test/java/org/cytoscape/viewmodel/internal/ViewTest.java
2009-03-07 18:53:46 UTC (rev 16173)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-row-based-impl/src/test/java/org/cytoscape/viewmodel/internal/ViewTest.java
2009-03-07 19:28:00 UTC (rev 16174)
@@ -32,15 +32,15 @@
along with this library; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.cytoscape.viewmodel.internal;
+package org.cytoscape.view.model.internal;
import junit.framework.Assert;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.cytoscape.viewmodel.*;
-import org.cytoscape.viewmodel.internal.*;
+import org.cytoscape.view.model.*;
+import org.cytoscape.view.model.internal.*;
import java.awt.Color;
Modified: cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap/pom.xml
===================================================================
--- cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap/pom.xml
2009-03-07 18:53:46 UTC (rev 16173)
+++ cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap/pom.xml
2009-03-07 19:28:00 UTC (rev 16174)
@@ -109,7 +109,7 @@
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
- <artifactId>viewmodel</artifactId>
+ <artifactId>viewmodel-api</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap/src/main/java/org/cytoscape/vizmap/MappingCalculator.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap/src/main/java/org/cytoscape/vizmap/MappingCalculator.java
2009-03-07 18:53:46 UTC (rev 16173)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap/src/main/java/org/cytoscape/vizmap/MappingCalculator.java
2009-03-07 19:28:00 UTC (rev 16174)
@@ -36,8 +36,8 @@
import org.cytoscape.model.GraphObject;
-import org.cytoscape.viewmodel.View;
-import org.cytoscape.viewmodel.VisualProperty;
+import org.cytoscape.view.model.View;
+import org.cytoscape.view.model.VisualProperty;
/**
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap/src/main/java/org/cytoscape/vizmap/VisualMappingManager.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap/src/main/java/org/cytoscape/vizmap/VisualMappingManager.java
2009-03-07 18:53:46 UTC (rev 16173)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap/src/main/java/org/cytoscape/vizmap/VisualMappingManager.java
2009-03-07 19:28:00 UTC (rev 16174)
@@ -1,6 +1,6 @@
package org.cytoscape.vizmap;
-import org.cytoscape.viewmodel.CyNetworkView;
+import org.cytoscape.view.model.CyNetworkView;
/**
* From pre-3.0 functionality, only 'network->VisualStyle' map remains in here.
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap/src/main/java/org/cytoscape/vizmap/VisualStyle.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap/src/main/java/org/cytoscape/vizmap/VisualStyle.java
2009-03-07 18:53:46 UTC (rev 16173)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap/src/main/java/org/cytoscape/vizmap/VisualStyle.java
2009-03-07 19:28:00 UTC (rev 16174)
@@ -34,8 +34,8 @@
*/
package org.cytoscape.vizmap;
-import org.cytoscape.viewmodel.CyNetworkView;
-import org.cytoscape.viewmodel.VisualProperty;
+import org.cytoscape.view.model.CyNetworkView;
+import org.cytoscape.view.model.VisualProperty;
/**
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap/src/main/java/org/cytoscape/vizmap/events/VisualStyleSwitchedEvent.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap/src/main/java/org/cytoscape/vizmap/events/VisualStyleSwitchedEvent.java
2009-03-07 18:53:46 UTC (rev 16173)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap/src/main/java/org/cytoscape/vizmap/events/VisualStyleSwitchedEvent.java
2009-03-07 19:28:00 UTC (rev 16174)
@@ -36,7 +36,7 @@
import org.cytoscape.event.CyEvent;
-import org.cytoscape.viewmodel.CyNetworkView;
+import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.vizmap.VisualStyle;
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap/src/main/java/org/cytoscape/vizmap/internal/VisualMappingManagerImpl.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap/src/main/java/org/cytoscape/vizmap/internal/VisualMappingManagerImpl.java
2009-03-07 18:53:46 UTC (rev 16173)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap/src/main/java/org/cytoscape/vizmap/internal/VisualMappingManagerImpl.java
2009-03-07 19:28:00 UTC (rev 16174)
@@ -3,7 +3,7 @@
import java.util.HashMap;
import java.util.HashSet;
-import org.cytoscape.viewmodel.CyNetworkView;
+import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.vizmap.VisualMappingManager;
import org.cytoscape.vizmap.VisualStyle;
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap/src/main/java/org/cytoscape/vizmap/internal/VisualStyleCatalogImpl.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap/src/main/java/org/cytoscape/vizmap/internal/VisualStyleCatalogImpl.java
2009-03-07 18:53:46 UTC (rev 16173)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap/src/main/java/org/cytoscape/vizmap/internal/VisualStyleCatalogImpl.java
2009-03-07 19:28:00 UTC (rev 16174)
@@ -40,7 +40,7 @@
import java.util.Set;
import org.cytoscape.event.CyEventHelper;
-import org.cytoscape.viewmodel.VisualPropertyCatalog;
+import org.cytoscape.view.model.VisualPropertyCatalog;
import org.cytoscape.vizmap.VisualStyle;
import org.cytoscape.vizmap.VisualStyleCatalog;
import org.cytoscape.vizmap.events.VisualStyleCreatedListener;
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap/src/main/java/org/cytoscape/vizmap/internal/VisualStyleImpl.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap/src/main/java/org/cytoscape/vizmap/internal/VisualStyleImpl.java
2009-03-07 18:53:46 UTC (rev 16173)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap/src/main/java/org/cytoscape/vizmap/internal/VisualStyleImpl.java
2009-03-07 19:28:00 UTC (rev 16174)
@@ -40,10 +40,10 @@
import org.cytoscape.model.CyNode;
import org.cytoscape.model.GraphObject;
-import org.cytoscape.viewmodel.CyNetworkView;
-import org.cytoscape.viewmodel.View;
-import org.cytoscape.viewmodel.VisualProperty;
-import org.cytoscape.viewmodel.VisualPropertyCatalog;
+import org.cytoscape.view.model.CyNetworkView;
+import org.cytoscape.view.model.View;
+import org.cytoscape.view.model.VisualProperty;
+import org.cytoscape.view.model.VisualPropertyCatalog;
import org.cytoscape.vizmap.MappingCalculator;
import org.cytoscape.vizmap.VisualStyle;
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2009-03-07 18:53:46 UTC (rev 16173)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2009-03-07 19:28:00 UTC (rev 16174)
@@ -18,6 +18,6 @@
</osgi:reference>
<osgi:reference id="visualPropertyCatalogRef"
- interface="org.cytoscape.viewmodel.VisualPropertyCatalog">
+ interface="org.cytoscape.view.model.VisualPropertyCatalog">
</osgi:reference>
</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
-~----------~----~----~----~------~----~------~--~---
