Author: abeld
Date: 2009-03-12 00:10:32 -0700 (Thu, 12 Mar 2009)
New Revision: 16210
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/java/org/cytoscape/view/model/CyNetworkView.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/java/org/cytoscape/view/model/CyNetworkViewFactory.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/java/org/cytoscape/view/model/DependentVisualPropertyCallback.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/java/org/cytoscape/view/model/Renderer.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/java/org/cytoscape/view/model/View.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/java/org/cytoscape/view/model/ViewColumn.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/java/org/cytoscape/view/model/VisualProperty.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/java/org/cytoscape/view/model/VisualPropertyCatalog.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/java/org/cytoscape/view/model/events/SubsetChangedEvent.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/java/org/cytoscape/view/model/events/SubsetChangedListener.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/java/org/cytoscape/view/model/events/SubsetCreatedEvent.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/java/org/cytoscape/view/model/events/SubsetCreatedListener.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/java/org/cytoscape/view/model/events/SubsetDestroyedEvent.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/java/org/cytoscape/view/model/events/SubsetDestroyedListener.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/events/internal/AbstractSubsetEvent.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/events/internal/SubsetChangedEventImpl.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/events/internal/SubsetCreatedEventImpl.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/events/internal/SubsetDestroyedEventImpl.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/internal/ColumnOrientedNetworkViewFactoryImpl.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/internal/ColumnOrientedNetworkViewImpl.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/internal/ColumnOrientedViewColumn.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/internal/ColumnOrientedViewImpl.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/internal/IdFactory.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/internal/VisualPropertyCatalogImpl.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap-api-columns/src/main/java/org/cytoscape/vizmap/MappingCalculator.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap-api-columns/src/main/java/org/cytoscape/vizmap/VisualStyle.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap-api-columns/src/main/java/org/cytoscape/vizmap/events/VisualStyleSwitchedEvent.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap-impl-columns/src/main/java/org/cytoscape/vizmap/internal/VisualStyleCatalogImpl.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap-impl-columns/src/main/java/org/cytoscape/vizmap/internal/VisualStyleImpl.java
Log:
refactored-viewmodel: prepare for merge to core3
seperate column-oriented viewmodel, vizmap into -api and -impl, step 4
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/java/org/cytoscape/view/model/CyNetworkView.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/java/org/cytoscape/view/model/CyNetworkView.java
2009-03-12 07:06:14 UTC (rev 16209)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/java/org/cytoscape/view/model/CyNetworkView.java
2009-03-12 07:10:32 UTC (rev 16210)
@@ -32,13 +32,13 @@
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;
import org.cytoscape.model.CyNode;
import org.cytoscape.model.GraphObject;
-import org.cytoscape.viewmodel.internal.ColumnOrientedViewColumn;
+import org.cytoscape.view.model.internal.ColumnOrientedViewColumn;
import java.util.List;
import java.util.Set;
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/java/org/cytoscape/view/model/CyNetworkViewFactory.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/java/org/cytoscape/view/model/CyNetworkViewFactory.java
2009-03-12 07:06:14 UTC (rev 16209)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/java/org/cytoscape/view/model/CyNetworkViewFactory.java
2009-03-12 07:10:32 UTC (rev 16210)
@@ -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-columns/src/main/java/org/cytoscape/view/model/DependentVisualPropertyCallback.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/java/org/cytoscape/view/model/DependentVisualPropertyCallback.java
2009-03-12 07:06:14 UTC (rev 16209)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/java/org/cytoscape/view/model/DependentVisualPropertyCallback.java
2009-03-12 07:10:32 UTC (rev 16210)
@@ -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-columns/src/main/java/org/cytoscape/view/model/Renderer.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/java/org/cytoscape/view/model/Renderer.java
2009-03-12 07:06:14 UTC (rev 16209)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/java/org/cytoscape/view/model/Renderer.java
2009-03-12 07:10:32 UTC (rev 16210)
@@ -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-columns/src/main/java/org/cytoscape/view/model/View.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/java/org/cytoscape/view/model/View.java
2009-03-12 07:06:14 UTC (rev 16209)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/java/org/cytoscape/view/model/View.java
2009-03-12 07:10:32 UTC (rev 16210)
@@ -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-columns/src/main/java/org/cytoscape/view/model/ViewColumn.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/java/org/cytoscape/view/model/ViewColumn.java
2009-03-12 07:06:14 UTC (rev 16209)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/java/org/cytoscape/view/model/ViewColumn.java
2009-03-12 07:10:32 UTC (rev 16210)
@@ -1,6 +1,6 @@
-package org.cytoscape.viewmodel;
+package org.cytoscape.view.model;
-import org.cytoscape.viewmodel.View;
+import org.cytoscape.view.model.View;
/**
* A column in the viewmodel table
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/java/org/cytoscape/view/model/VisualProperty.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/java/org/cytoscape/view/model/VisualProperty.java
2009-03-12 07:06:14 UTC (rev 16209)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/java/org/cytoscape/view/model/VisualProperty.java
2009-03-12 07:10:32 UTC (rev 16210)
@@ -32,12 +32,12 @@
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;
/**
* FIXME
- * Think of it as a column in the viewmodel table.
+ * Think of it as a column in the view.model table.
*
* Uses String constants as ObjectTypes, ie. to seperate NodeVisualProperties
from EdgeVisualProperties, etc.
* Ideally, we could use Class<? extends View<?>> or something like that, but
unfortunately that is impossible due to type erasure.
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/java/org/cytoscape/view/model/VisualPropertyCatalog.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/java/org/cytoscape/view/model/VisualPropertyCatalog.java
2009-03-12 07:06:14 UTC (rev 16209)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/java/org/cytoscape/view/model/VisualPropertyCatalog.java
2009-03-12 07:10:32 UTC (rev 16210)
@@ -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-columns/src/main/java/org/cytoscape/view/model/events/SubsetChangedEvent.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/java/org/cytoscape/view/model/events/SubsetChangedEvent.java
2009-03-12 07:06:14 UTC (rev 16209)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/java/org/cytoscape/view/model/events/SubsetChangedEvent.java
2009-03-12 07:10:32 UTC (rev 16210)
@@ -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-columns/src/main/java/org/cytoscape/view/model/events/SubsetChangedListener.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/java/org/cytoscape/view/model/events/SubsetChangedListener.java
2009-03-12 07:06:14 UTC (rev 16209)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/java/org/cytoscape/view/model/events/SubsetChangedListener.java
2009-03-12 07:10:32 UTC (rev 16210)
@@ -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-columns/src/main/java/org/cytoscape/view/model/events/SubsetCreatedEvent.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/java/org/cytoscape/view/model/events/SubsetCreatedEvent.java
2009-03-12 07:06:14 UTC (rev 16209)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/java/org/cytoscape/view/model/events/SubsetCreatedEvent.java
2009-03-12 07:10:32 UTC (rev 16210)
@@ -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-columns/src/main/java/org/cytoscape/view/model/events/SubsetCreatedListener.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/java/org/cytoscape/view/model/events/SubsetCreatedListener.java
2009-03-12 07:06:14 UTC (rev 16209)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/java/org/cytoscape/view/model/events/SubsetCreatedListener.java
2009-03-12 07:10:32 UTC (rev 16210)
@@ -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-columns/src/main/java/org/cytoscape/view/model/events/SubsetDestroyedEvent.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/java/org/cytoscape/view/model/events/SubsetDestroyedEvent.java
2009-03-12 07:06:14 UTC (rev 16209)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/java/org/cytoscape/view/model/events/SubsetDestroyedEvent.java
2009-03-12 07:10:32 UTC (rev 16210)
@@ -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-columns/src/main/java/org/cytoscape/view/model/events/SubsetDestroyedListener.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/java/org/cytoscape/view/model/events/SubsetDestroyedListener.java
2009-03-12 07:06:14 UTC (rev 16209)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/java/org/cytoscape/view/model/events/SubsetDestroyedListener.java
2009-03-12 07:10:32 UTC (rev 16210)
@@ -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-impl-columns/src/main/java/org/cytoscape/view/model/events/internal/AbstractSubsetEvent.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/events/internal/AbstractSubsetEvent.java
2009-03-12 07:06:14 UTC (rev 16209)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/events/internal/AbstractSubsetEvent.java
2009-03-12 07:10:32 UTC (rev 16210)
@@ -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-impl-columns/src/main/java/org/cytoscape/view/model/events/internal/SubsetChangedEventImpl.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/events/internal/SubsetChangedEventImpl.java
2009-03-12 07:06:14 UTC (rev 16209)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/events/internal/SubsetChangedEventImpl.java
2009-03-12 07:10:32 UTC (rev 16210)
@@ -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-impl-columns/src/main/java/org/cytoscape/view/model/events/internal/SubsetCreatedEventImpl.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/events/internal/SubsetCreatedEventImpl.java
2009-03-12 07:06:14 UTC (rev 16209)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/events/internal/SubsetCreatedEventImpl.java
2009-03-12 07:10:32 UTC (rev 16210)
@@ -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-impl-columns/src/main/java/org/cytoscape/view/model/events/internal/SubsetDestroyedEventImpl.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/events/internal/SubsetDestroyedEventImpl.java
2009-03-12 07:06:14 UTC (rev 16209)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/events/internal/SubsetDestroyedEventImpl.java
2009-03-12 07:10:32 UTC (rev 16210)
@@ -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-impl-columns/src/main/java/org/cytoscape/view/model/internal/ColumnOrientedNetworkViewFactoryImpl.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/internal/ColumnOrientedNetworkViewFactoryImpl.java
2009-03-12 07:06:14 UTC (rev 16209)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/internal/ColumnOrientedNetworkViewFactoryImpl.java
2009-03-12 07:10:32 UTC (rev 16210)
@@ -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-impl-columns/src/main/java/org/cytoscape/view/model/internal/ColumnOrientedNetworkViewImpl.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/internal/ColumnOrientedNetworkViewImpl.java
2009-03-12 07:06:14 UTC (rev 16209)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/internal/ColumnOrientedNetworkViewImpl.java
2009-03-12 07:10:32 UTC (rev 16210)
@@ -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,15 +49,15 @@
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.VisualProperty;
-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.VisualProperty;
+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-impl-columns/src/main/java/org/cytoscape/view/model/internal/ColumnOrientedViewColumn.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/internal/ColumnOrientedViewColumn.java
2009-03-12 07:06:14 UTC (rev 16209)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/internal/ColumnOrientedViewColumn.java
2009-03-12 07:10:32 UTC (rev 16210)
@@ -1,10 +1,10 @@
-package org.cytoscape.viewmodel.internal;
+package org.cytoscape.view.model.internal;
import java.util.HashMap;
-import org.cytoscape.viewmodel.View;
-import org.cytoscape.viewmodel.ViewColumn;
-import org.cytoscape.viewmodel.VisualProperty;
+import org.cytoscape.view.model.View;
+import org.cytoscape.view.model.ViewColumn;
+import org.cytoscape.view.model.VisualProperty;
/**
* A column in the viewmodel table
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/internal/ColumnOrientedViewImpl.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/internal/ColumnOrientedViewImpl.java
2009-03-12 07:06:14 UTC (rev 16209)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/internal/ColumnOrientedViewImpl.java
2009-03-12 07:10:32 UTC (rev 16210)
@@ -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.internal;
+package org.cytoscape.view.model.internal;
-import org.cytoscape.viewmodel.CyNetworkView;
-import org.cytoscape.viewmodel.View;
-import org.cytoscape.viewmodel.VisualProperty;
+import org.cytoscape.view.model.CyNetworkView;
+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-impl-columns/src/main/java/org/cytoscape/view/model/internal/IdFactory.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/internal/IdFactory.java
2009-03-12 07:06:14 UTC (rev 16209)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/internal/IdFactory.java
2009-03-12 07:10:32 UTC (rev 16210)
@@ -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-impl-columns/src/main/java/org/cytoscape/view/model/internal/VisualPropertyCatalogImpl.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/internal/VisualPropertyCatalogImpl.java
2009-03-12 07:06:14 UTC (rev 16209)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/internal/VisualPropertyCatalogImpl.java
2009-03-12 07:10:32 UTC (rev 16210)
@@ -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/vizmap-api-columns/src/main/java/org/cytoscape/vizmap/MappingCalculator.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap-api-columns/src/main/java/org/cytoscape/vizmap/MappingCalculator.java
2009-03-12 07:06:14 UTC (rev 16209)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap-api-columns/src/main/java/org/cytoscape/vizmap/MappingCalculator.java
2009-03-12 07:10:32 UTC (rev 16210)
@@ -38,9 +38,9 @@
import org.cytoscape.model.GraphObject;
-import org.cytoscape.viewmodel.View;
-import org.cytoscape.viewmodel.ViewColumn;
-import org.cytoscape.viewmodel.VisualProperty;
+import org.cytoscape.view.model.View;
+import org.cytoscape.view.model.ViewColumn;
+import org.cytoscape.view.model.VisualProperty;
/**
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap-api-columns/src/main/java/org/cytoscape/vizmap/VisualStyle.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap-api-columns/src/main/java/org/cytoscape/vizmap/VisualStyle.java
2009-03-12 07:06:14 UTC (rev 16209)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap-api-columns/src/main/java/org/cytoscape/vizmap/VisualStyle.java
2009-03-12 07:10:32 UTC (rev 16210)
@@ -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-api-columns/src/main/java/org/cytoscape/vizmap/events/VisualStyleSwitchedEvent.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap-api-columns/src/main/java/org/cytoscape/vizmap/events/VisualStyleSwitchedEvent.java
2009-03-12 07:06:14 UTC (rev 16209)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap-api-columns/src/main/java/org/cytoscape/vizmap/events/VisualStyleSwitchedEvent.java
2009-03-12 07:10:32 UTC (rev 16210)
@@ -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-impl-columns/src/main/java/org/cytoscape/vizmap/internal/VisualStyleCatalogImpl.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap-impl-columns/src/main/java/org/cytoscape/vizmap/internal/VisualStyleCatalogImpl.java
2009-03-12 07:06:14 UTC (rev 16209)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap-impl-columns/src/main/java/org/cytoscape/vizmap/internal/VisualStyleCatalogImpl.java
2009-03-12 07:10:32 UTC (rev 16210)
@@ -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-impl-columns/src/main/java/org/cytoscape/vizmap/internal/VisualStyleImpl.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap-impl-columns/src/main/java/org/cytoscape/vizmap/internal/VisualStyleImpl.java
2009-03-12 07:06:14 UTC (rev 16209)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap-impl-columns/src/main/java/org/cytoscape/vizmap/internal/VisualStyleImpl.java
2009-03-12 07:10:32 UTC (rev 16210)
@@ -40,11 +40,11 @@
import org.cytoscape.model.CyNode;
import org.cytoscape.model.GraphObject;
-import org.cytoscape.viewmodel.CyNetworkView;
-import org.cytoscape.viewmodel.View;
-import org.cytoscape.viewmodel.ViewColumn;
-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.ViewColumn;
+import org.cytoscape.view.model.VisualProperty;
+import org.cytoscape.view.model.VisualPropertyCatalog;
import org.cytoscape.vizmap.MappingCalculator;
import org.cytoscape.vizmap.VisualStyle;
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
