Author: mes Date: 2011-01-27 16:31:45 -0800 (Thu, 27 Jan 2011) New Revision: 23691
Added: core3/presentation-api/tags/presentation-api-3.0.0-alpha2/ core3/presentation-api/tags/presentation-api-3.0.0-alpha2/pom.xml core3/presentation-api/tags/presentation-api-3.0.0-alpha2/src/main/java/org/cytoscape/view/presentation/internal/RenderingEngineManagerImpl.java Removed: core3/presentation-api/tags/presentation-api-3.0.0-alpha2/pom.xml core3/presentation-api/tags/presentation-api-3.0.0-alpha2/src/main/java/org/cytoscape/view/presentation/internal/RenderingEngineManagerImpl.java Log: [maven-release-plugin] copy for tag presentation-api-3.0.0-alpha2 Copied: core3/presentation-api/tags/presentation-api-3.0.0-alpha2 (from rev 23614, core3/presentation-api/trunk) Deleted: core3/presentation-api/tags/presentation-api-3.0.0-alpha2/pom.xml =================================================================== --- core3/presentation-api/trunk/pom.xml 2011-01-25 22:04:16 UTC (rev 23614) +++ core3/presentation-api/tags/presentation-api-3.0.0-alpha2/pom.xml 2011-01-28 00:31:45 UTC (rev 23691) @@ -1,110 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - - <parent> - <artifactId>parent</artifactId> - <groupId>org.cytoscape</groupId> - <version>3.0.0-alpha3</version> - </parent> - - <properties> - <bundle.symbolicName>org.cytoscape.presentation-api</bundle.symbolicName> - <bundle.namespace>org.cytoscape.view.presentation</bundle.namespace> - </properties> - - <modelVersion>4.0.0</modelVersion> - <groupId>org.cytoscape</groupId> - <artifactId>presentation-api</artifactId> - <version>3.0.0-alpha2-SNAPSHOT</version> - - <name>${bundle.symbolicName} [${bundle.namespace}]</name> - - <packaging>bundle</packaging> - - <scm> - <connection>scm:svn:http://chianti.ucsd.edu/svn/core3/presentation-api/trunk</connection> - <developerConnection>scm:svn:svn+ssh://grenache.ucsd.edu/cellar/common/svn/core3/presentation-api/trunk</developerConnection> - <url>http://chianti.ucsd.edu/svn/core3/presentation-api/trunk</url> - </scm> - - <build> - <resources> - <resource> - <directory>src/main/resources</directory> - </resource> - <!-- | example additional resource entries, useful when building Eclipse - RCP applications --> - <resource> - <directory>.</directory> - <includes> - <include>plugin.xml</include> - <include>plugin.properties</include> - <include>icons/**</include> - </includes> - </resource> - </resources> - <plugins> - <plugin> - <groupId>org.ops4j</groupId> - <artifactId>maven-pax-plugin</artifactId> - <version>1.4</version> - <!-- | enable improved OSGi compilation support for the bundle life-cycle. - | to switch back to the standard bundle life-cycle, move this setting | down - to the maven-bundle-plugin section --> - <extensions>true</extensions> - </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <version>${maven-bundle-plugin.version}</version> - <!-- | the following instructions build a simple set of public/private - classes into an OSGi bundle --> - <configuration> - <instructions> - <Bundle-SymbolicName>${bundle.symbolicName}</Bundle-SymbolicName> - <Bundle-Version>${pom.version}</Bundle-Version> - <!-- | assume public classes are in the top package, and private classes - are under ".internal" --> - <Export-Package>!${bundle.namespace}.internal.*,${bundle.namespace}.*;version="${pom.version}"</Export-Package> - <Private-Package>${bundle.namespace}.internal.*</Private-Package> - <!-- | each module can override these defaults in their osgi.bnd file --> - <_include>-osgi.bnd</_include> - </instructions> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - - <dependencies> - <dependency> - <groupId>org.cytoscape</groupId> - <artifactId>viewmodel-api</artifactId> - <version>3.0.0-alpha3-SNAPSHOT</version> - </dependency> - - <!-- For Testing --> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>${junit.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <version>1.8.1</version> - <scope>test</scope> - </dependency> - </dependencies> -</project> Copied: core3/presentation-api/tags/presentation-api-3.0.0-alpha2/pom.xml (from rev 23690, core3/presentation-api/trunk/pom.xml) =================================================================== --- core3/presentation-api/tags/presentation-api-3.0.0-alpha2/pom.xml (rev 0) +++ core3/presentation-api/tags/presentation-api-3.0.0-alpha2/pom.xml 2011-01-28 00:31:45 UTC (rev 23691) @@ -0,0 +1,110 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + + <parent> + <artifactId>parent</artifactId> + <groupId>org.cytoscape</groupId> + <version>3.0.0-alpha4</version> + </parent> + + <properties> + <bundle.symbolicName>org.cytoscape.presentation-api</bundle.symbolicName> + <bundle.namespace>org.cytoscape.view.presentation</bundle.namespace> + </properties> + + <modelVersion>4.0.0</modelVersion> + <groupId>org.cytoscape</groupId> + <artifactId>presentation-api</artifactId> + <version>3.0.0-alpha2</version> + + <name>${bundle.symbolicName} [${bundle.namespace}]</name> + + <packaging>bundle</packaging> + + <scm> + <connection>scm:svn:http://chianti.ucsd.edu/svn/core3/presentation-api/tags/presentation-api-3.0.0-alpha2</connection> + <developerConnection>scm:svn:svn+ssh://grenache.ucsd.edu/cellar/common/svn/core3/presentation-api/tags/presentation-api-3.0.0-alpha2</developerConnection> + <url>http://chianti.ucsd.edu/svn/core3/presentation-api/tags/presentation-api-3.0.0-alpha2</url> + </scm> + + <build> + <resources> + <resource> + <directory>src/main/resources</directory> + </resource> + <!-- | example additional resource entries, useful when building Eclipse + RCP applications --> + <resource> + <directory>.</directory> + <includes> + <include>plugin.xml</include> + <include>plugin.properties</include> + <include>icons/**</include> + </includes> + </resource> + </resources> + <plugins> + <plugin> + <groupId>org.ops4j</groupId> + <artifactId>maven-pax-plugin</artifactId> + <version>1.4</version> + <!-- | enable improved OSGi compilation support for the bundle life-cycle. + | to switch back to the standard bundle life-cycle, move this setting | down + to the maven-bundle-plugin section --> + <extensions>true</extensions> + </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>${maven-bundle-plugin.version}</version> + <!-- | the following instructions build a simple set of public/private + classes into an OSGi bundle --> + <configuration> + <instructions> + <Bundle-SymbolicName>${bundle.symbolicName}</Bundle-SymbolicName> + <Bundle-Version>${pom.version}</Bundle-Version> + <!-- | assume public classes are in the top package, and private classes + are under ".internal" --> + <Export-Package>!${bundle.namespace}.internal.*,${bundle.namespace}.*;version="${pom.version}"</Export-Package> + <Private-Package>${bundle.namespace}.internal.*</Private-Package> + <!-- | each module can override these defaults in their osgi.bnd file --> + <_include>-osgi.bnd</_include> + </instructions> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>test-jar</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>org.cytoscape</groupId> + <artifactId>viewmodel-api</artifactId> + <version>3.0.0-alpha3</version> + </dependency> + + <!-- For Testing --> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${junit.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-all</artifactId> + <version>1.8.1</version> + <scope>test</scope> + </dependency> + </dependencies> +</project> Deleted: core3/presentation-api/tags/presentation-api-3.0.0-alpha2/src/main/java/org/cytoscape/view/presentation/internal/RenderingEngineManagerImpl.java =================================================================== --- core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/internal/RenderingEngineManagerImpl.java 2011-01-25 22:04:16 UTC (rev 23614) +++ core3/presentation-api/tags/presentation-api-3.0.0-alpha2/src/main/java/org/cytoscape/view/presentation/internal/RenderingEngineManagerImpl.java 2011-01-28 00:31:45 UTC (rev 23691) @@ -1,108 +0,0 @@ -package org.cytoscape.view.presentation.internal; - -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; - -import org.cytoscape.view.model.View; -import org.cytoscape.view.model.VisualLexicon; -import org.cytoscape.view.presentation.RenderingEngine; -import org.cytoscape.view.presentation.RenderingEngineFactory; -import org.cytoscape.view.presentation.RenderingEngineManager; - -public class RenderingEngineManagerImpl implements RenderingEngineManager { - - private final Map<View<?>, RenderingEngine<?>> renderingEngineMap; - - private static final String FACTORY_ID_TAG = "id"; - private static final String DEFAULT_FACTORY_ID = "ding"; - - private VisualLexicon defaultLexicon; - - private final Map<String, RenderingEngineFactory<?>> factoryMap; - - - /** - * Create an instance of rendering engine manager. This implementation - * listens to Presentation events and update its map based on them. - */ - public RenderingEngineManagerImpl() { - this.renderingEngineMap = new HashMap<View<?>, RenderingEngine<?>>(); - this.factoryMap = new HashMap<String, RenderingEngineFactory<?>>(); - } - - /** - * This method never returns null. - */ - @Override - public RenderingEngine<?> getRendringEngine(final View<?> viewModel) { - return renderingEngineMap.get(viewModel); - } - - @Override - public Collection<RenderingEngine<?>> getAllRenderingEngines() { - return renderingEngineMap.values(); - } - - - @Override - public void addRenderingEngine(final RenderingEngine<?> renderingEngine) { - final View<?> viewModel = renderingEngine.getViewModel(); - this.renderingEngineMap.put(viewModel, renderingEngine); - } - - - @Override - public void removeRenderingEngine(RenderingEngine<?> renderingEngine) { - final View<?> viewModel = renderingEngine.getViewModel(); - this.renderingEngineMap.remove(viewModel); - } - - - @Override - public VisualLexicon getDefaultVisualLexicon() { - if(defaultLexicon == null) - throw new IllegalStateException("Lexicon is not ready yet."); - - return this.defaultLexicon; - } - - - public void addRenderingEngineFactory( - final RenderingEngineFactory<?> factory, Map metadata) { - final Object idObject = metadata.get(FACTORY_ID_TAG); - - if (idObject == null) - throw new IllegalArgumentException( - "Could not add factory: ID metadata is missing for RenderingEngineFactory."); - - final String id = idObject.toString(); - - this.factoryMap.put(id, factory); - - // Register default lexicon - if(id.equals(DEFAULT_FACTORY_ID)) { - defaultLexicon = factory.getVisualLexicon(); - System.out.println("Default Lexicon found: " + id); - } - - System.out.println("\n\nRendering Engine Factory added: " + id); - } - - public void removeRenderingEngineFactory( - final RenderingEngineFactory<?> factory, Map metadata) { - final Object idObject = metadata.get(FACTORY_ID_TAG); - - if (idObject == null) - throw new IllegalArgumentException( - "Could not remove factory: ID metadata is missing for RenderingEngineFactory."); - - final String id = idObject.toString(); - - RenderingEngineFactory<?> toBeRemoved = this.factoryMap.remove(id); - - toBeRemoved = null; - - } - -} Copied: core3/presentation-api/tags/presentation-api-3.0.0-alpha2/src/main/java/org/cytoscape/view/presentation/internal/RenderingEngineManagerImpl.java (from rev 23615, core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/internal/RenderingEngineManagerImpl.java) =================================================================== --- core3/presentation-api/tags/presentation-api-3.0.0-alpha2/src/main/java/org/cytoscape/view/presentation/internal/RenderingEngineManagerImpl.java (rev 0) +++ core3/presentation-api/tags/presentation-api-3.0.0-alpha2/src/main/java/org/cytoscape/view/presentation/internal/RenderingEngineManagerImpl.java 2011-01-28 00:31:45 UTC (rev 23691) @@ -0,0 +1,106 @@ +package org.cytoscape.view.presentation.internal; + +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; + +import org.cytoscape.view.model.View; +import org.cytoscape.view.model.VisualLexicon; +import org.cytoscape.view.presentation.RenderingEngine; +import org.cytoscape.view.presentation.RenderingEngineFactory; +import org.cytoscape.view.presentation.RenderingEngineManager; + +public class RenderingEngineManagerImpl implements RenderingEngineManager { + + private final Map<View<?>, RenderingEngine<?>> renderingEngineMap; + + private static final String FACTORY_ID_TAG = "id"; + private static final String DEFAULT_FACTORY_ID = "ding"; + + private VisualLexicon defaultLexicon; + + private final Map<String, RenderingEngineFactory<?>> factoryMap; + + + /** + * Create an instance of rendering engine manager. This implementation + * listens to Presentation events and update its map based on them. + */ + public RenderingEngineManagerImpl() { + this.renderingEngineMap = new HashMap<View<?>, RenderingEngine<?>>(); + this.factoryMap = new HashMap<String, RenderingEngineFactory<?>>(); + } + + /** + * This method never returns null. + */ + @Override + public RenderingEngine<?> getRendringEngine(final View<?> viewModel) { + return renderingEngineMap.get(viewModel); + } + + @Override + public Collection<RenderingEngine<?>> getAllRenderingEngines() { + return renderingEngineMap.values(); + } + + + @Override + public void addRenderingEngine(final RenderingEngine<?> renderingEngine) { + final View<?> viewModel = renderingEngine.getViewModel(); + this.renderingEngineMap.put(viewModel, renderingEngine); + } + + + @Override + public void removeRenderingEngine(RenderingEngine<?> renderingEngine) { + final View<?> viewModel = renderingEngine.getViewModel(); + this.renderingEngineMap.remove(viewModel); + } + + + @Override + public VisualLexicon getDefaultVisualLexicon() { + if(defaultLexicon == null) + throw new IllegalStateException("Lexicon is not ready yet."); + + return this.defaultLexicon; + } + + + public void addRenderingEngineFactory( + final RenderingEngineFactory<?> factory, Map metadata) { + final Object idObject = metadata.get(FACTORY_ID_TAG); + + if (idObject == null) + throw new IllegalArgumentException( + "Could not add factory: ID metadata is missing for RenderingEngineFactory."); + + final String id = idObject.toString(); + + this.factoryMap.put(id, factory); + + // Register default lexicon + if(id.equals(DEFAULT_FACTORY_ID)) { + defaultLexicon = factory.getVisualLexicon(); + } + + } + + public void removeRenderingEngineFactory( + final RenderingEngineFactory<?> factory, Map metadata) { + final Object idObject = metadata.get(FACTORY_ID_TAG); + + if (idObject == null) + throw new IllegalArgumentException( + "Could not remove factory: ID metadata is missing for RenderingEngineFactory."); + + final String id = idObject.toString(); + + RenderingEngineFactory<?> toBeRemoved = this.factoryMap.remove(id); + + toBeRemoved = null; + + } + +} -- 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.
