Author: mes
Date: 2011-07-06 09:22:54 -0700 (Wed, 06 Jul 2011)
New Revision: 26061

Modified:
   core3/io-impl/trunk/pom.xml
   
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/util/UnrecognizedVisualPropertyManager.java
Log:
fixed compile issues

Modified: core3/io-impl/trunk/pom.xml
===================================================================
--- core3/io-impl/trunk/pom.xml 2011-07-06 16:19:30 UTC (rev 26060)
+++ core3/io-impl/trunk/pom.xml 2011-07-06 16:22:54 UTC (rev 26061)
@@ -150,12 +150,6 @@
                        <artifactId>property-api</artifactId>
                        <version>3.0.0-alpha4</version>
                </dependency>
-               <dependency>
-                       <groupId>org.cytoscape</groupId>
-                       <artifactId>default-mappings</artifactId>
-                       <version>3.0.0-alpha4-SNAPSHOT</version>
-               </dependency>
-
                <!-- 3rd party libraries -->
                <!-- <dependency>
                        <groupId>com.itextpdf</groupId>

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
  2011-07-06 16:19:30 UTC (rev 26060)
+++ 
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/GenericReaderManager.java
  2011-07-06 16:22:54 UTC (rev 26061)
@@ -64,7 +64,7 @@
         */
        public R getReader(URI uri, String inputName) {
                
-               logger.debug("Number of factories: " + factories.size());
+               logger.debug("Number of tunableHandlerFactories: " + 
factories.size());
                for (T factory : factories) {
                        
                        final CyFileFilter cff = factory.getCyFileFilter();

Modified: 
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/util/UnrecognizedVisualPropertyManager.java
===================================================================
--- 
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/util/UnrecognizedVisualPropertyManager.java
     2011-07-06 16:19:30 UTC (rev 26060)
+++ 
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/util/UnrecognizedVisualPropertyManager.java
     2011-07-06 16:22:54 UTC (rev 26061)
@@ -2,7 +2,7 @@
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Set;
+import java.util.Collection;
 
 import org.cytoscape.model.CyEdge;
 import org.cytoscape.model.CyNode;
@@ -64,7 +64,7 @@
                        rendererTbl = rendererTablesMap.get(netView.getSUID());
                }
 
-               Set<CyRow> rendererRows = 
rendererTbl.getMatchingRows("att_name", attName);
+               Collection<CyRow> rendererRows = 
rendererTbl.getMatchingRows("att_name", attName);
                String targetType = getTargetType(view);
                Long rendererId = null;
 
@@ -111,7 +111,7 @@
 
                if (rendererTbl != null && vpTbl != null) {
                        String targetType = getTargetType(view);
-                       Set<CyRow> rows = vpTbl.getMatchingRows("target_id", 
view.getSUID());
+                       Collection<CyRow> rows = 
vpTbl.getMatchingRows("target_id", view.getSUID());
 
                        for (CyRow r : rows) {
                                // also make sure the target type is the same

-- 
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.

Reply via email to