Author: ruschein
Date: 2010-10-13 10:12:50 -0700 (Wed, 13 Oct 2010)
New Revision: 22225
Modified:
core3/io-impl/trunk/pom.xml
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/GenericReaderManager.java
Log:
Improved logging and removed confusing warnings.
Modified: core3/io-impl/trunk/pom.xml
===================================================================
--- core3/io-impl/trunk/pom.xml 2010-10-12 22:56:17 UTC (rev 22224)
+++ core3/io-impl/trunk/pom.xml 2010-10-13 17:12:50 UTC (rev 22225)
@@ -240,18 +240,22 @@
<version>1.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <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.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ <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-12 22:56:17 UTC (rev 22224)
+++
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/GenericReaderManager.java
2010-10-13 17:12:50 UTC (rev 22225)
@@ -16,7 +16,9 @@
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;
@@ -35,11 +37,18 @@
*/
@SuppressWarnings("unchecked")
public void addInputStreamTaskFactory(T factory, Map props) {
- if ( factory != null &&
factory.getCyFileFilter().getDataCategory() == category ) {
- logger.info("adding IO taskFactory ");
+ 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 + ")");
factories.add(factory);
- } else
- logger.warn("Specified factory is null or has wrong
DataCategory (" + category + ")");
+ }
}
/**
--
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.
