Author: Christian Lopes
Date: 2011-06-13 08:46:12 -0700 (Mon, 13 Jun 2011)
New Revision: 25720
Removed:
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/VisualStyleSerializer.java
core3/vizmap-api/trunk/src/main/resources/xsd/
core3/vizmap-api/trunk/src/test/java/org/cytoscape/view/vizmap/AbstractVisualStyleSerializerTest.java
Modified:
core3/vizmap-api/trunk/osgi.bnd
core3/vizmap-api/trunk/pom.xml
Log:
Removed VisualStyleSerializer and the Vizmap JAXB model (moved them to io-impl).
Modified: core3/vizmap-api/trunk/osgi.bnd
===================================================================
--- core3/vizmap-api/trunk/osgi.bnd 2011-06-13 15:01:06 UTC (rev 25719)
+++ core3/vizmap-api/trunk/osgi.bnd 2011-06-13 15:46:12 UTC (rev 25720)
@@ -2,5 +2,5 @@
# Use this file to add customized Bnd instructions for the bundle
#-----------------------------------------------------------------
-Export-Package:
${bundle.namespace},${bundle.namespace}.events,${bundle.namespace}.model
+Export-Package: ${bundle.namespace},${bundle.namespace}.events
Modified: core3/vizmap-api/trunk/pom.xml
===================================================================
--- core3/vizmap-api/trunk/pom.xml 2011-06-13 15:01:06 UTC (rev 25719)
+++ core3/vizmap-api/trunk/pom.xml 2011-06-13 15:46:12 UTC (rev 25720)
@@ -16,7 +16,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.cytoscape</groupId>
<artifactId>vizmap-api</artifactId>
- <version>3.0.0-alpha5-SNAPSHOT</version>
+ <version>3.0.0-alpha6-SNAPSHOT</version>
<name>${bundle.symbolicName} (VizMap API Bundle)</name>
@@ -85,29 +85,6 @@
</instructions>
</configuration>
</plugin>
- <plugin>
- <groupId>org.jvnet.jaxb2.maven2</groupId>
- <artifactId>maven-jaxb2-plugin</artifactId>
- <version>0.7.4</version>
- <executions>
- <execution>
- <id>vizmap</id>
- <goals>
- <goal>generate</goal>
- </goals>
- <configuration>
-
<schemaDirectory>src/main/resources/xsd</schemaDirectory>
- <schemaIncludes>
- <include>vizmap.xsd</include>
- </schemaIncludes>
-
<generatePackage>org.cytoscape.view.vizmap.model</generatePackage>
- <verbose>true</verbose>
- <removeOldOutput>false</removeOldOutput>
- <forceRegenerate>true</forceRegenerate>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
Deleted:
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/VisualStyleSerializer.java
===================================================================
---
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/VisualStyleSerializer.java
2011-06-13 15:01:06 UTC (rev 25719)
+++
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/VisualStyleSerializer.java
2011-06-13 15:46:12 UTC (rev 25720)
@@ -1,67 +0,0 @@
-/*
- Copyright (c) 2010, 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.vizmap;
-
-import java.util.Collection;
-
-import org.cytoscape.view.vizmap.model.Vizmap;
-
-/**
- * This is a utility interface used for converting collections of
- * VisualStyle objects into serializable Properties objects and vice
- * versa.
- */
-public interface VisualStyleSerializer {
-
- /**
- * This method creates a serializable Properties object based
- * on the provided collection of visual styles.
- * @param styles The collection of VisualStyles that you wish to
- * convert into a serializable Properties object.
- * @return A Properties object that contains a representation
- * of the collection of visual styles.
- */
- Vizmap createVizmap(Collection<VisualStyle> styles);
-
- /**
- * This method creates a collection of VisualStyle objects based
- * on the provided Properties object.
- * @param props A properties object containing a representation
- * of VisualStyles.
- * @return A collection of VisualStyle objects created from the
- * provided Properties object.
- */
- Collection<VisualStyle> createVisualStyles(Vizmap vizmap);
-}
Deleted:
core3/vizmap-api/trunk/src/test/java/org/cytoscape/view/vizmap/AbstractVisualStyleSerializerTest.java
===================================================================
---
core3/vizmap-api/trunk/src/test/java/org/cytoscape/view/vizmap/AbstractVisualStyleSerializerTest.java
2011-06-13 15:01:06 UTC (rev 25719)
+++
core3/vizmap-api/trunk/src/test/java/org/cytoscape/view/vizmap/AbstractVisualStyleSerializerTest.java
2011-06-13 15:46:12 UTC (rev 25720)
@@ -1,34 +0,0 @@
-package org.cytoscape.view.vizmap;
-
-
-import static org.junit.Assert.assertNotNull;
-
-import java.util.ArrayList;
-
-import org.cytoscape.view.vizmap.model.Vizmap;
-import org.junit.Test;
-
-public abstract class AbstractVisualStyleSerializerTest {
-
- protected VisualStyleSerializer serializer;
-
- @Test
- public void testVisualStyleCollectionNotNullForNullVizmap() throws
Exception {
- assertNotNull(serializer.createVisualStyles(null));
- }
-
- @Test
- public void testVisualStyleCollectionNotNullForEmptyVizmap() throws
Exception {
- assertNotNull(serializer.createVisualStyles(new Vizmap()));
- }
-
- @Test
- public void testVizmapNotNullForNullVS() throws Exception {
- assertNotNull(serializer.createVizmap(null));
- }
-
- @Test
- public void testVizmapNotNullForEmptyVS() throws Exception {
- assertNotNull(serializer.createVizmap(new
ArrayList<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.
