Author: mes
Date: 2010-10-28 17:40:40 -0700 (Thu, 28 Oct 2010)
New Revision: 22639
Modified:
core3/io-impl/trunk/pom.xml
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/GenericReaderManager.java
Log:
updated dependencies
Modified: core3/io-impl/trunk/pom.xml
===================================================================
--- core3/io-impl/trunk/pom.xml 2010-10-29 00:15:24 UTC (rev 22638)
+++ core3/io-impl/trunk/pom.xml 2010-10-29 00:40:40 UTC (rev 22639)
@@ -73,62 +73,59 @@
</build>
<dependencies>
- <!-- For Testing -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>viewmodel-api</artifactId>
+ <version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
- <artifactId>model-impl</artifactId>
+ <artifactId>model-api</artifactId>
<version>1.0-SNAPSHOT</version>
- <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_core</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- <optional>true</optional>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>event-api</artifactId>
+ <version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_compendium</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- <optional>true</optional>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>layout-api</artifactId>
+ <version>1.0-SNAPSHOT</version>
</dependency>
-
<dependency>
<groupId>org.cytoscape</groupId>
- <artifactId>viewmodel-api</artifactId>
+ <artifactId>io-api</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
- <artifactId>model-api</artifactId>
+ <artifactId>work-api</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
- <artifactId>event-api</artifactId>
+ <artifactId>core-task-api</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
- <artifactId>layout-api</artifactId>
+ <artifactId>session-api</artifactId>
<version>1.0-SNAPSHOT</version>
+ <scope>provided</scope>
</dependency>
-
<dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>property-api</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>com.lowagie.text</groupId>
<artifactId>com.springsource.com.lowagie.text
</artifactId>
<version>2.0.8</version>
</dependency>
-
<dependency>
<groupId>org.freehep</groupId>
<artifactId>freehep-graphicsio-pdf</artifactId>
@@ -189,43 +186,20 @@
<artifactId>freehep-xml</artifactId>
<version>2.0.1</version>
</dependency>
-
<dependency>
- <groupId>org.springframework.osgi</groupId>
- <artifactId>spring-osgi-test</artifactId>
- <version>${spring.osgi.version}</version>
- <scope>test</scope>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>2.2.1</version>
</dependency>
-
+ <!-- For Testing -->
<dependency>
- <groupId>org.cytoscape</groupId>
- <artifactId>io-api</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
- <artifactId>work-api</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.cytoscape</groupId>
- <artifactId>core-task-api</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.cytoscape</groupId>
- <artifactId>session-api</artifactId>
- <version>1.0-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.cytoscape</groupId>
- <artifactId>property-api</artifactId>
- <version>1.0-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.cytoscape</groupId>
<artifactId>test-support</artifactId>
<version>1.0-SNAPSHOT</version>
<scope>test</scope>
@@ -236,16 +210,5 @@
<version>1.8.1</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>2.2.1</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>${spring.version}</version>
- <scope>provided</scope>
- </dependency>
</dependencies>
</project>
Modified:
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/GenericReaderManager.java
===================================================================
---
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/GenericReaderManager.java
2010-10-29 00:15:24 UTC (rev 22638)
+++
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/GenericReaderManager.java
2010-10-29 00:40:40 UTC (rev 22639)
@@ -16,9 +16,6 @@
import org.slf4j.LoggerFactory;
import org.slf4j.Logger;
-import org.springframework.core.InfrastructureProxy;
-
-
public class GenericReaderManager<T extends InputStreamTaskFactory, R extends
Task> {
protected final DataCategory category;
protected final Set<T> factories;
@@ -40,13 +37,8 @@
if (factory == null)
logger.warn("Specified factory is null!");
else if (factory.getCyFileFilter().getDataCategory() ==
category) {
- final Object f;
- if (factory instanceof InfrastructureProxy)
- f =
((InfrastructureProxy)factory).getWrappedObject();
- else
- f = factory;
-
- logger.info("adding IO taskFactory (factory = " + f +
", category = " + category + ")");
+ logger.info("adding IO taskFactory (factory = " +
factory +
+ ", category = " + category + ")");
factories.add(factory);
}
}
--
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.
