Author: abeld
Date: 2009-03-12 00:06:14 -0700 (Thu, 12 Mar 2009)
New Revision: 16209
Added:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/java/org/cytoscape/view/
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/java/org/cytoscape/view/model/
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/
Removed:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/java/org/cytoscape/view/model/events/internal/
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/java/org/cytoscape/view/model/internal/
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/java/org/cytoscape/viewmodel/
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/CyNetworkView.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/CyNetworkViewFactory.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/DependentVisualPropertyCallback.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/Renderer.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/View.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/ViewColumn.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/VisualProperty.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/VisualPropertyCatalog.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/events/SubsetChangedEvent.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/events/SubsetChangedListener.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/events/SubsetCreatedEvent.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/events/SubsetCreatedListener.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/events/SubsetDestroyedEvent.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-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/viewmodel/
Log:
refactored-viewmodel: prepare for merge to core3
seperate column-oriented viewmodel, vizmap into -api and -impl, step 3
Copied:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/java/org/cytoscape/view/model
(from rev 16207,
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/java/org/cytoscape/viewmodel)
Property changes on:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/java/org/cytoscape/view/model
___________________________________________________________________
Name: svn:mergeinfo
+
Copied:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model
(from rev 16207,
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/viewmodel)
Property changes on:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/CyNetworkView.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/viewmodel/CyNetworkView.java
2009-03-12 06:56:58 UTC (rev 16207)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/CyNetworkView.java
2009-03-12 07:06:14 UTC (rev 16209)
@@ -1,145 +0,0 @@
-/*
- Copyright (c) 2008, The Cytoscape Consortium (www.cytoscape.org)
-
- The Cytoscape Consortium is:
- - Institute for Systems Biology
- - University of California San Diego
- - Memorial Sloan-Kettering Cancer Center
- - Institut Pasteur
- - Agilent Technologies
-
- This library is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published
- by the Free Software Foundation; either version 2.1 of the License, or
- any later version.
-
- This library is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF
- MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. The software and
- documentation provided hereunder is on an "as is" basis, and the
- Institute for Systems Biology and the Whitehead Institute
- have no obligations to provide maintenance, support,
- updates, enhancements or modifications. In no event shall the
- Institute for Systems Biology and the Whitehead Institute
- be liable to any party for direct, indirect, special,
- incidental or consequential damages, including lost profits, arising
- out of the use of this software and its documentation, even if the
- Institute for Systems Biology and the Whitehead Institute
- have been advised of the possibility of such damage. See
- the GNU Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- 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;
-
-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 java.util.List;
-import java.util.Set;
-
-
-/**
- * Contains the visual representation of a Network.
- */
-public interface CyNetworkView {
- /**
- * Returns the network this view was created for. The network is
immutable for this
- * view, so there is no way to set it.
- *
- * @return DOCUMENT ME!
- */
- CyNetwork getNetwork();
-
- /**
- * Returns a View for a specified Node.
- *
- * @param n DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- View<CyNode> getCyNodeView(CyNode n);
-
- /**
- * Returns a list of Views for all CyNodes in the network.
- *
- * @return DOCUMENT ME!
- */
- List<View<CyNode>> getCyNodeViews();
-
- /**
- * Returns a View for a specified Edge.
- *
- * @param n DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- View<CyEdge> getCyEdgeView(CyEdge n);
-
- /**
- * Returns a list of Views for all CyEdges in the network.
- *
- * @return DOCUMENT ME!
- */
- List<View<CyEdge>> getCyEdgeViews();
-
- /**
- * Returns the view for this Network.
- * i.e. returns the object that stores the Network VisualProperty values
- *
- * @return DOCUMENT ME!
- */
- View<CyNetwork> getNetworkView();
-
- /**
- * Returns a list of all View including those for Nodes, Edges, and
Network.
- *
- * @return DOCUMENT ME!
- */
- List<View<?extends GraphObject>> getAllViews();
-
- <T> ViewColumn<T> getColumn(final VisualProperty<T> vp);
- /**
- * Returns the given subset.
- *
- * @param name name of the subset to return
- * @return the subset
- */
- Set<View<?extends GraphObject>> getSubset(String name);
-
- /**
- * If subset already exists, replaces it with given Set.
- *
- * @param name name of the subset
- * @param subset the Views the subset will contain
- */
- void createSubset(String name, Set<View<?extends GraphObject>> subset);
-
- /**
- * DOCUMENT ME!
- *
- * @param name DOCUMENT ME!
- * @param toAdd DOCUMENT ME!
- */
- void addToSubset(String name, Set<View<?extends GraphObject>> toAdd);
-
- /**
- * DOCUMENT ME!
- *
- * @param name DOCUMENT ME!
- * @param toRemove DOCUMENT ME!
- */
- void removeFromSubset(String name, Set<View<?extends GraphObject>>
toRemove);
-
- /**
- * DOCUMENT ME!
- *
- * @param name DOCUMENT ME!
- */
- void deleteSubset(String name);
-}
Deleted:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/CyNetworkViewFactory.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/viewmodel/CyNetworkViewFactory.java
2009-03-12 06:56:58 UTC (rev 16207)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/CyNetworkViewFactory.java
2009-03-12 07:06:14 UTC (rev 16209)
@@ -1,49 +0,0 @@
-/*
- Copyright (c) 2008, The Cytoscape Consortium (www.cytoscape.org)
-
- The Cytoscape Consortium is:
- - Institute for Systems Biology
- - University of California San Diego
- - Memorial Sloan-Kettering Cancer Center
- - Institut Pasteur
- - Agilent Technologies
-
- This library is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published
- by the Free Software Foundation; either version 2.1 of the License, or
- any later version.
-
- This library is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF
- MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. The software and
- documentation provided hereunder is on an "as is" basis, and the
- Institute for Systems Biology and the Whitehead Institute
- have no obligations to provide maintenance, support,
- updates, enhancements or modifications. In no event shall the
- Institute for Systems Biology and the Whitehead Institute
- be liable to any party for direct, indirect, special,
- incidental or consequential damages, including lost profits, arising
- out of the use of this software and its documentation, even if the
- Institute for Systems Biology and the Whitehead Institute
- have been advised of the possibility of such damage. See
- the GNU Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- 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;
-
-import org.cytoscape.model.CyNetwork;
-
-
-/**
- *
- */
-public interface CyNetworkViewFactory {
- /** Create a NetworkView.
- * @param network for which the CyNetworkView is to be created
- * @return the CyNetworkView
- */
- CyNetworkView getNetworkViewFor(CyNetwork network);
-}
Deleted:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/DependentVisualPropertyCallback.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/viewmodel/DependentVisualPropertyCallback.java
2009-03-12 06:56:58 UTC (rev 16207)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/DependentVisualPropertyCallback.java
2009-03-12 07:06:14 UTC (rev 16209)
@@ -1,52 +0,0 @@
-/*
- Copyright (c) 2008, The Cytoscape Consortium (www.cytoscape.org)
-
- The Cytoscape Consortium is:
- - Institute for Systems Biology
- - University of California San Diego
- - Memorial Sloan-Kettering Cancer Center
- - Institut Pasteur
- - Agilent Technologies
-
- This library is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published
- by the Free Software Foundation; either version 2.1 of the License, or
- any later version.
-
- This library is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF
- MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. The software and
- documentation provided hereunder is on an "as is" basis, and the
- Institute for Systems Biology and the Whitehead Institute
- have no obligations to provide maintenance, support,
- updates, enhancements or modifications. In no event shall the
- Institute for Systems Biology and the Whitehead Institute
- be liable to any party for direct, indirect, special,
- incidental or consequential damages, including lost profits, arising
- out of the use of this software and its documentation, even if the
- Institute for Systems Biology and the Whitehead Institute
- have been advised of the possibility of such damage. See
- the GNU Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- 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;
-
-import java.util.Collection;
-import java.util.Set;
-
-
-/**
- *
- */
-public abstract class DependentVisualPropertyCallback {
- /** Called when mapping results change.
- * @param views the views for which the filtering is to be done
- * @param currentVisualProperties the current list of VisualProperties
- * @return the set of VisualProperties to hide (most likely subset of
currentVisualProperties)
- */
- public abstract Set<VisualProperty<?>> changed(Collection<? extends
View<?>> views,
- Collection<? extends
VisualProperty<?>> currentVisualProperties);
-}
Deleted:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/Renderer.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/viewmodel/Renderer.java
2009-03-12 06:56:58 UTC (rev 16207)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/Renderer.java
2009-03-12 07:06:14 UTC (rev 16209)
@@ -1,70 +0,0 @@
-/*
- Copyright (c) 2008, The Cytoscape Consortium (www.cytoscape.org)
-
- The Cytoscape Consortium is:
- - Institute for Systems Biology
- - University of California San Diego
- - Memorial Sloan-Kettering Cancer Center
- - Institut Pasteur
- - Agilent Technologies
-
- This library is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published
- by the Free Software Foundation; either version 2.1 of the License, or
- any later version.
-
- This library is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF
- MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. The software and
- documentation provided hereunder is on an "as is" basis, and the
- Institute for Systems Biology and the Whitehead Institute
- have no obligations to provide maintenance, support,
- updates, enhancements or modifications. In no event shall the
- Institute for Systems Biology and the Whitehead Institute
- be liable to any party for direct, indirect, special,
- incidental or consequential damages, including lost profits, arising
- out of the use of this software and its documentation, even if the
- Institute for Systems Biology and the Whitehead Institute
- have been advised of the possibility of such damage. See
- the GNU Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- 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;
-
-import java.util.Set;
-
-
-/**
- * Should be implemented as a service.
- * 'Renderer' is simply anything that provides VisualProperties.
- * With a 'VisualProperties as annotations' this won't be needed.
- */
-public interface Renderer {
- /**
- * Returns the Set of VisualPropertys supported by this Renderer.
- *
- * @return DOCUMENT ME!
- */
- Set<VisualProperty<?>> getVisualProperties();
-
- /**
- * Given a String, returns a VisualProperty object.
- *
- * @param s DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- VisualProperty<?> parseVisualProperty(String s);
-
- /**
- * Returns a string suitable for parsing by
{Renderer#parseVisualProperty(String s)}.
- *
- * @param vp DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- String getVisualPropertyString(VisualProperty<?> vp);
-}
Deleted:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/View.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/viewmodel/View.java
2009-03-12 06:56:58 UTC (rev 16207)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/View.java
2009-03-12 07:06:14 UTC (rev 16209)
@@ -1,87 +0,0 @@
-/*
- Copyright (c) 2008, The Cytoscape Consortium (www.cytoscape.org)
-
- The Cytoscape Consortium is:
- - Institute for Systems Biology
- - University of California San Diego
- - Memorial Sloan-Kettering Cancer Center
- - Institut Pasteur
- - Agilent Technologies
-
- This library is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published
- by the Free Software Foundation; either version 2.1 of the License, or
- any later version.
-
- This library is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF
- MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. The software and
- documentation provided hereunder is on an "as is" basis, and the
- Institute for Systems Biology and the Whitehead Institute
- have no obligations to provide maintenance, support,
- updates, enhancements or modifications. In no event shall the
- Institute for Systems Biology and the Whitehead Institute
- be liable to any party for direct, indirect, special,
- incidental or consequential damages, including lost profits, arising
- out of the use of this software and its documentation, even if the
- Institute for Systems Biology and the Whitehead Institute
- have been advised of the possibility of such damage. See
- the GNU Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- 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;
-
-import org.cytoscape.model.Identifiable;
-
-
-/**
- * The base interface that defines the methods used to set visual properties
- * for nodes, edges, and networks.
- *
- * Think of it as a row in the viewmodel table.
- *
- * @param <S> the base (model-level) object for which this is a View. For
example, CyNode or CyEdge
- */
-public interface View<S> extends Identifiable {
- /**
- * @param <T> DOCUMENT ME!
- * @param vp the VisualProperty
- * @param o DOCUMENT ME!
- */
- <T> void setVisualProperty(VisualProperty<T> vp, T o);
- /**
- * @param <T> DOCUMENT ME!
- * @param vp the VisualProperty
- * @return DOCUMENT ME!
- */
- <T> T getVisualProperty(VisualProperty<T> vp);
- /**
- * @param <T> DOCUMENT ME!
- * @param vp the VisualProperty
- * @param value DOCUMENT ME!
- */
- <T> void setLockedValue(VisualProperty<T> vp, T value);
-
- /**
- * @param vp the VisualProperty
- * @return true if current VisualProperty value is locked
- */
- boolean isValueLocked(VisualProperty<?> vp);
-
- /**
- * Clear value lock for given VisualProperty.
- *
- * @param vp the VisualProperty
- */
- void clearValueLock(VisualProperty<?> vp);
-
- /**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- S getSource();
-}
Deleted:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/ViewColumn.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/viewmodel/ViewColumn.java
2009-03-12 06:56:58 UTC (rev 16207)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/ViewColumn.java
2009-03-12 07:06:14 UTC (rev 16209)
@@ -1,49 +0,0 @@
-package org.cytoscape.viewmodel;
-
-import org.cytoscape.viewmodel.View;
-
-/**
- * A column in the viewmodel table
- * @param <T> the data type of the VisualProperty this belongs to
- */
-public interface ViewColumn<T> {
-
- Class<T> getDataType();
- /**
- *
- * @param view the "row" value of which to return
- * @return the value
- */
- T getValue(View<?> view);
-
- void setValue(View<?> view, T value);
-
- /**
- * Remove the value stored for the given view.
- *
- * This is needed to allow reverting the value for a given view to "the
default value, whatever that is".
- *
- * @param view the View for which to clear the value
- */
- void clearValue(View<?> view);
- /**
- * Used by VisualStyle.apply to set the per-VisualStyle default value
- * @param value the per-VisualStyle default value
- */
- void setDefaultValue(T value);
-
- void setLockedValue(final View<?> view, final T value);
-
- /**
- * @param vp the VisualProperty
- * @return true if current VisualProperty value is locked
- */
- boolean isValueLocked(final View<?> view);
-
- /**
- * Clear value lock for given VisualProperty.
- *
- * @param vp the VisualProperty
- */
- void clearValueLock(final View<?> view);
-}
Deleted:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/VisualProperty.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/viewmodel/VisualProperty.java
2009-03-12 06:56:58 UTC (rev 16207)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/VisualProperty.java
2009-03-12 07:06:14 UTC (rev 16209)
@@ -1,103 +0,0 @@
-/*
- Copyright (c) 2008, The Cytoscape Consortium (www.cytoscape.org)
-
- The Cytoscape Consortium is:
- - Institute for Systems Biology
- - University of California San Diego
- - Memorial Sloan-Kettering Cancer Center
- - Institut Pasteur
- - Agilent Technologies
-
- This library is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published
- by the Free Software Foundation; either version 2.1 of the License, or
- any later version.
-
- This library is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF
- MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. The software and
- documentation provided hereunder is on an "as is" basis, and the
- Institute for Systems Biology and the Whitehead Institute
- have no obligations to provide maintenance, support,
- updates, enhancements or modifications. In no event shall the
- Institute for Systems Biology and the Whitehead Institute
- be liable to any party for direct, indirect, special,
- incidental or consequential damages, including lost profits, arising
- out of the use of this software and its documentation, even if the
- Institute for Systems Biology and the Whitehead Institute
- have been advised of the possibility of such damage. See
- the GNU Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- 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;
-
-
-/**
- * FIXME
- * Think of it as a column in the viewmodel 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.
- *
- * @param <T> the dataType of the VisualProperty, ie. what kind of objects are
the values
- */
-public interface VisualProperty<T> {
- /**
- * Canonical ObjectType string for CyNode.
- */
- String NODE = "NODE";
- /**
- * Canonical ObjectType string for CyEdge.
- */
- String EDGE = "EDGE";
- /**
- * Canonical ObjectType string for CyNetwork.
- */
- String NETWORK = "NETWORK";
-
- /**
- * Returns what type of objects this VisualProperty stores values for.
- * canonical values are VisualProperty.NODE, etc.
- *
- * @return the string describing the object type
- */
- String getObjectType();
-
- /**
- * The type of object represented by this property.
- *
- * @return DOCUMENT ME!
- */
- Class<T> getType();
-
- /**
- * The default value of this property.
- *
- * @return DOCUMENT ME!
- */
- T getDefault();
-
- /**
- * Used for hashes identifying this property.
- *
- * @return DOCUMENT ME!
- */
- String getID();
-
- /**
- * For presentation to humans.
- *
- * @return DOCUMENT ME!
- */
- String getName();
-
- /**
- *
- *
- * @return callback, or null if there isn't one
- */
- DependentVisualPropertyCallback dependentVisualPropertyCallback();
-}
Deleted:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/VisualPropertyCatalog.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/viewmodel/VisualPropertyCatalog.java
2009-03-12 06:56:58 UTC (rev 16207)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/VisualPropertyCatalog.java
2009-03-12 07:06:14 UTC (rev 16209)
@@ -1,107 +0,0 @@
-/*
- Copyright (c) 2008, The Cytoscape Consortium (www.cytoscape.org)
-
- The Cytoscape Consortium is:
- - Institute for Systems Biology
- - University of California San Diego
- - Memorial Sloan-Kettering Cancer Center
- - Institut Pasteur
- - Agilent Technologies
-
- This library is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published
- by the Free Software Foundation; either version 2.1 of the License, or
- any later version.
-
- This library is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF
- MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. The software and
- documentation provided hereunder is on an "as is" basis, and the
- Institute for Systems Biology and the Whitehead Institute
- have no obligations to provide maintenance, support,
- updates, enhancements or modifications. In no event shall the
- Institute for Systems Biology and the Whitehead Institute
- be liable to any party for direct, indirect, special,
- incidental or consequential damages, including lost profits, arising
- out of the use of this software and its documentation, even if the
- Institute for Systems Biology and the Whitehead Institute
- have been advised of the possibility of such damage. See
- the GNU Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- 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;
-
-import java.util.Collection;
-
-
-/**
- *
- */
-public interface VisualPropertyCatalog {
- /**
- * DOCUMENT ME!
- *
- * @param renderer DOCUMENT ME!
- */
- void addVisualPropertiesOfRenderer(Renderer renderer);
-
- /**
- * DOCUMENT ME!
- *
- * @param name DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- VisualProperty<?> getVisualProperty(String name);
-
- /**
- * Returns the collection of all defined VisualProperties. Note that
not all
- * of these will be actually in use. For showing in a UI, use of ... is
- * recommended ... FIXME
- *
- * @return the Collection of all defined VisualProperties
- */
- Collection<VisualProperty<?>> collectionOfVisualProperties();
-
- /**
- * DOCUMENT ME!
- *
- * @param objectType DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- Collection<VisualProperty<?>> collectionOfVisualProperties(String
objectType);
-
- /**
- * DOCUMENT ME!
- *
- * @param networkview DOCUMENT ME!
- * @param objectType DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- Collection<VisualProperty<?>>
collectionOfVisualProperties(CyNetworkView networkview,
- String
objectType);
-
- /**
- * Returns the collection of all those VisualProperties that are in use
for
- * the given GraphObjects. I.e. these are the VisualProperties, for
which
- * setting a value will actually change the displayed graph.
- *
- * Note: returns the same as collectionOfVisualProperties() if
- * arg is null.
- *
- * Note: using VisualProperty.GraphObjectType.NETWORK for objectType is
not
- * really useful. For network VPs, use
collectionOfVisualProperties(VisualProperty.GraphObjectType
- * objectType) instead.
- *
- * @param views for which the filtering is to be done
- * @param objectType for which to filter
- * @return VisualProperties, filtered with the DependentVisualProperty
callbacks
- */
- Collection<VisualProperty<?>> collectionOfVisualProperties(Collection<?
extends View<?>> views,
- String
objectType);
-}
Deleted:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/events/SubsetChangedEvent.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/viewmodel/events/SubsetChangedEvent.java
2009-03-12 06:56:58 UTC (rev 16207)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/events/SubsetChangedEvent.java
2009-03-12 07:06:14 UTC (rev 16209)
@@ -1,52 +0,0 @@
-/*
- Copyright (c) 2008, The Cytoscape Consortium (www.cytoscape.org)
-
- The Cytoscape Consortium is:
- - Institute for Systems Biology
- - University of California San Diego
- - Memorial Sloan-Kettering Cancer Center
- - Institut Pasteur
- - Agilent Technologies
-
- This library is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published
- by the Free Software Foundation; either version 2.1 of the License, or
- any later version.
-
- This library is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF
- MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. The software and
- documentation provided hereunder is on an "as is" basis, and the
- Institute for Systems Biology and the Whitehead Institute
- have no obligations to provide maintenance, support,
- updates, enhancements or modifications. In no event shall the
- Institute for Systems Biology and the Whitehead Institute
- be liable to any party for direct, indirect, special,
- incidental or consequential damages, including lost profits, arising
- out of the use of this software and its documentation, even if the
- Institute for Systems Biology and the Whitehead Institute
- have been advised of the possibility of such damage. See
- the GNU Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- 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;
-
-import org.cytoscape.event.CyEvent;
-
-import org.cytoscape.viewmodel.CyNetworkView;
-
-
-/**
- * DOCUMENT ME!
- */
-public interface SubsetChangedEvent extends CyEvent<String> {
- /**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- CyNetworkView getNetworkView();
-}
Deleted:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/events/SubsetChangedListener.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/viewmodel/events/SubsetChangedListener.java
2009-03-12 06:56:58 UTC (rev 16207)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/events/SubsetChangedListener.java
2009-03-12 07:06:14 UTC (rev 16209)
@@ -1,49 +0,0 @@
-/*
- Copyright (c) 2008, The Cytoscape Consortium (www.cytoscape.org)
-
- The Cytoscape Consortium is:
- - Institute for Systems Biology
- - University of California San Diego
- - Memorial Sloan-Kettering Cancer Center
- - Institut Pasteur
- - Agilent Technologies
-
- This library is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published
- by the Free Software Foundation; either version 2.1 of the License, or
- any later version.
-
- This library is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF
- MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. The software and
- documentation provided hereunder is on an "as is" basis, and the
- Institute for Systems Biology and the Whitehead Institute
- have no obligations to provide maintenance, support,
- updates, enhancements or modifications. In no event shall the
- Institute for Systems Biology and the Whitehead Institute
- be liable to any party for direct, indirect, special,
- incidental or consequential damages, including lost profits, arising
- out of the use of this software and its documentation, even if the
- Institute for Systems Biology and the Whitehead Institute
- have been advised of the possibility of such damage. See
- the GNU Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- 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;
-
-import org.cytoscape.event.CyListener;
-
-
-/**
- * DOCUMENT ME!
- */
-public interface SubsetChangedListener extends CyListener {
- /**
- * DOCUMENT ME!
- * @param e the event object
- */
- void handleEvent(SubsetChangedEvent e);
-}
Deleted:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/events/SubsetCreatedEvent.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/viewmodel/events/SubsetCreatedEvent.java
2009-03-12 06:56:58 UTC (rev 16207)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/events/SubsetCreatedEvent.java
2009-03-12 07:06:14 UTC (rev 16209)
@@ -1,52 +0,0 @@
-/*
- Copyright (c) 2008, The Cytoscape Consortium (www.cytoscape.org)
-
- The Cytoscape Consortium is:
- - Institute for Systems Biology
- - University of California San Diego
- - Memorial Sloan-Kettering Cancer Center
- - Institut Pasteur
- - Agilent Technologies
-
- This library is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published
- by the Free Software Foundation; either version 2.1 of the License, or
- any later version.
-
- This library is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF
- MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. The software and
- documentation provided hereunder is on an "as is" basis, and the
- Institute for Systems Biology and the Whitehead Institute
- have no obligations to provide maintenance, support,
- updates, enhancements or modifications. In no event shall the
- Institute for Systems Biology and the Whitehead Institute
- be liable to any party for direct, indirect, special,
- incidental or consequential damages, including lost profits, arising
- out of the use of this software and its documentation, even if the
- Institute for Systems Biology and the Whitehead Institute
- have been advised of the possibility of such damage. See
- the GNU Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- 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;
-
-import org.cytoscape.event.CyEvent;
-
-import org.cytoscape.viewmodel.CyNetworkView;
-
-
-/**
- * DOCUMENT ME!
- */
-public interface SubsetCreatedEvent extends CyEvent<String> {
- /**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- CyNetworkView getNetworkView();
-}
Deleted:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/events/SubsetCreatedListener.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/viewmodel/events/SubsetCreatedListener.java
2009-03-12 06:56:58 UTC (rev 16207)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/events/SubsetCreatedListener.java
2009-03-12 07:06:14 UTC (rev 16209)
@@ -1,49 +0,0 @@
-/*
- Copyright (c) 2008, The Cytoscape Consortium (www.cytoscape.org)
-
- The Cytoscape Consortium is:
- - Institute for Systems Biology
- - University of California San Diego
- - Memorial Sloan-Kettering Cancer Center
- - Institut Pasteur
- - Agilent Technologies
-
- This library is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published
- by the Free Software Foundation; either version 2.1 of the License, or
- any later version.
-
- This library is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF
- MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. The software and
- documentation provided hereunder is on an "as is" basis, and the
- Institute for Systems Biology and the Whitehead Institute
- have no obligations to provide maintenance, support,
- updates, enhancements or modifications. In no event shall the
- Institute for Systems Biology and the Whitehead Institute
- be liable to any party for direct, indirect, special,
- incidental or consequential damages, including lost profits, arising
- out of the use of this software and its documentation, even if the
- Institute for Systems Biology and the Whitehead Institute
- have been advised of the possibility of such damage. See
- the GNU Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- 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;
-
-import org.cytoscape.event.CyListener;
-
-
-/**
- * DOCUMENT ME!
- */
-public interface SubsetCreatedListener extends CyListener {
- /**
- * DOCUMENT ME!
- * @param e the event object
- */
- void handleEvent(SubsetCreatedEvent e);
-}
Deleted:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/events/SubsetDestroyedEvent.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/viewmodel/events/SubsetDestroyedEvent.java
2009-03-12 06:56:58 UTC (rev 16207)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/events/SubsetDestroyedEvent.java
2009-03-12 07:06:14 UTC (rev 16209)
@@ -1,52 +0,0 @@
-/*
- Copyright (c) 2008, The Cytoscape Consortium (www.cytoscape.org)
-
- The Cytoscape Consortium is:
- - Institute for Systems Biology
- - University of California San Diego
- - Memorial Sloan-Kettering Cancer Center
- - Institut Pasteur
- - Agilent Technologies
-
- This library is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published
- by the Free Software Foundation; either version 2.1 of the License, or
- any later version.
-
- This library is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF
- MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. The software and
- documentation provided hereunder is on an "as is" basis, and the
- Institute for Systems Biology and the Whitehead Institute
- have no obligations to provide maintenance, support,
- updates, enhancements or modifications. In no event shall the
- Institute for Systems Biology and the Whitehead Institute
- be liable to any party for direct, indirect, special,
- incidental or consequential damages, including lost profits, arising
- out of the use of this software and its documentation, even if the
- Institute for Systems Biology and the Whitehead Institute
- have been advised of the possibility of such damage. See
- the GNU Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- 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;
-
-import org.cytoscape.event.CyEvent;
-
-import org.cytoscape.viewmodel.CyNetworkView;
-
-
-/**
- * DOCUMENT ME!
- */
-public interface SubsetDestroyedEvent extends CyEvent<String> {
- /**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- CyNetworkView getNetworkView();
-}
Deleted:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-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/viewmodel/events/SubsetDestroyedListener.java
2009-03-12 06:56:58 UTC (rev 16207)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/java/org/cytoscape/view/model/events/SubsetDestroyedListener.java
2009-03-12 07:06:14 UTC (rev 16209)
@@ -1,49 +0,0 @@
-/*
- Copyright (c) 2008, The Cytoscape Consortium (www.cytoscape.org)
-
- The Cytoscape Consortium is:
- - Institute for Systems Biology
- - University of California San Diego
- - Memorial Sloan-Kettering Cancer Center
- - Institut Pasteur
- - Agilent Technologies
-
- This library is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published
- by the Free Software Foundation; either version 2.1 of the License, or
- any later version.
-
- This library is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF
- MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. The software and
- documentation provided hereunder is on an "as is" basis, and the
- Institute for Systems Biology and the Whitehead Institute
- have no obligations to provide maintenance, support,
- updates, enhancements or modifications. In no event shall the
- Institute for Systems Biology and the Whitehead Institute
- be liable to any party for direct, indirect, special,
- incidental or consequential damages, including lost profits, arising
- out of the use of this software and its documentation, even if the
- Institute for Systems Biology and the Whitehead Institute
- have been advised of the possibility of such damage. See
- the GNU Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- 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;
-
-import org.cytoscape.event.CyListener;
-
-
-/**
- * DOCUMENT ME!
- */
-public interface SubsetDestroyedListener extends CyListener {
- /**
- * DOCUMENT ME!
- * @param e the event object
- */
- void handleEvent(SubsetDestroyedEvent e);
-}
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
