Author: kono
Date: 2009-03-12 14:52:22 -0700 (Thu, 12 Mar 2009)
New Revision: 16247
Removed:
core3/viewmodel-impl/trunk/src/main/java/org/cytoscape/view/model/internal/IdFactory.java
Modified:
core3/viewmodel-impl/trunk/src/main/java/org/cytoscape/view/model/internal/ColumnOrientedViewImpl.java
Log:
IdFactory is replaced by Model's SUIDFactory.
Modified:
core3/viewmodel-impl/trunk/src/main/java/org/cytoscape/view/model/internal/ColumnOrientedViewImpl.java
===================================================================
---
core3/viewmodel-impl/trunk/src/main/java/org/cytoscape/view/model/internal/ColumnOrientedViewImpl.java
2009-03-12 21:37:59 UTC (rev 16246)
+++
core3/viewmodel-impl/trunk/src/main/java/org/cytoscape/view/model/internal/ColumnOrientedViewImpl.java
2009-03-12 21:52:22 UTC (rev 16247)
@@ -34,13 +34,11 @@
*/
package org.cytoscape.view.model.internal;
-import org.cytoscape.view.model.CyNetworkView;
+import org.cytoscape.model.SUIDFactory;
import org.cytoscape.view.model.View;
import org.cytoscape.view.model.VisualProperty;
-import java.util.HashMap;
-
/**
* The base interface that defines the methods used to set visual properties
* for nodes, edges, and networks.
@@ -59,7 +57,7 @@
* @param source DOCUMENT ME!
*/
public ColumnOrientedViewImpl(final S source, final
ColumnOrientedNetworkViewImpl networkView) {
- suid = IdFactory.getNextSUID();
+ suid = SUIDFactory.getNextSUID();
this.source = source;
this.networkView = networkView;
}
Deleted:
core3/viewmodel-impl/trunk/src/main/java/org/cytoscape/view/model/internal/IdFactory.java
===================================================================
---
core3/viewmodel-impl/trunk/src/main/java/org/cytoscape/view/model/internal/IdFactory.java
2009-03-12 21:37:59 UTC (rev 16246)
+++
core3/viewmodel-impl/trunk/src/main/java/org/cytoscape/view/model/internal/IdFactory.java
2009-03-12 21:52:22 UTC (rev 16247)
@@ -1,48 +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.view.model.internal;
-
-
-// note: copy-pasted from org.cytoscape.model.internal
-final class IdFactory {
- private static long count = 1;
-
- private IdFactory() {
- }
-
- static synchronized long getNextSUID() {
- return count++;
- }
-}
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
