Author: ruschein
Date: 2010-12-09 13:12:23 -0800 (Thu, 09 Dec 2010)
New Revision: 23150

Modified:
   core3/sbml-impl/trunk/pom.xml
   
core3/sbml-impl/trunk/src/main/java/org/cytoscape/sbml/internal/SBMLNetworkViewReader.java
Log:
Updated to track changes in model-api.

Modified: core3/sbml-impl/trunk/pom.xml
===================================================================
--- core3/sbml-impl/trunk/pom.xml       2010-12-09 19:29:50 UTC (rev 23149)
+++ core3/sbml-impl/trunk/pom.xml       2010-12-09 21:12:23 UTC (rev 23150)
@@ -76,12 +76,18 @@
                        <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>org.mockito</groupId>
+                       <artifactId>mockito-all</artifactId>
+                       <version>1.8.1</version>
+                       <scope>test</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.cytoscape</groupId>
+                       <artifactId>model-api</artifactId>
+                       <version>3.0.0-alpha2-SNAPSHOT</version>
+                       <scope>provided</scope>
+               </dependency>
        </dependencies>
        
        <repositories>

Modified: 
core3/sbml-impl/trunk/src/main/java/org/cytoscape/sbml/internal/SBMLNetworkViewReader.java
===================================================================
--- 
core3/sbml-impl/trunk/src/main/java/org/cytoscape/sbml/internal/SBMLNetworkViewReader.java
  2010-12-09 19:29:50 UTC (rev 23149)
+++ 
core3/sbml-impl/trunk/src/main/java/org/cytoscape/sbml/internal/SBMLNetworkViewReader.java
  2010-12-09 21:12:23 UTC (rev 23150)
@@ -177,9 +177,8 @@
        }
 
        private <T> void checkSchema(CyRow attributes, String attributeName, 
Class<T> type) {
-               if (attributes.getType(attributeName) == null) {
+               if 
(attributes.getDataTable().getColumnTypeMap().get(attributeName) == null)
                        attributes.getDataTable().createColumn(attributeName, 
type);
-               }
        }
 
        private static String readString(InputStream source) throws IOException 
{

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