Author: mes
Date: 2010-10-26 10:08:21 -0700 (Tue, 26 Oct 2010)
New Revision: 22438
Modified:
core3/psi-mi-impl/trunk/.classpath
core3/psi-mi-impl/trunk/src/main/java/org/cytoscape/psi_mi/internal/cyto_mapper/MapToCytoscape.java
core3/psi-mi-impl/trunk/src/test/java/org/cytoscape/psi_mi/internal/plugin/PsiMiCyFileFilterTest.java
Log:
fixed CyRow updates
Modified: core3/psi-mi-impl/trunk/.classpath
===================================================================
--- core3/psi-mi-impl/trunk/.classpath 2010-10-26 16:16:54 UTC (rev 22437)
+++ core3/psi-mi-impl/trunk/.classpath 2010-10-26 17:08:21 UTC (rev 22438)
@@ -4,6 +4,7 @@
<classpathentry excluding="**" kind="src" output="target/classes"
path="src/main/resources"/>
<classpathentry kind="src" output="target/test-classes"
path="src/test/java"/>
<classpathentry excluding="**" kind="src" output="target/test-classes"
path="src/test/resources"/>
+ <classpathentry kind="src" path="target/generated-sources/jaxb"/>
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
<classpathentry kind="con"
path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
Modified:
core3/psi-mi-impl/trunk/src/main/java/org/cytoscape/psi_mi/internal/cyto_mapper/MapToCytoscape.java
===================================================================
---
core3/psi-mi-impl/trunk/src/main/java/org/cytoscape/psi_mi/internal/cyto_mapper/MapToCytoscape.java
2010-10-26 16:16:54 UTC (rev 22437)
+++
core3/psi-mi-impl/trunk/src/main/java/org/cytoscape/psi_mi/internal/cyto_mapper/MapToCytoscape.java
2010-10-26 17:08:21 UTC (rev 22438)
@@ -565,7 +565,7 @@
if (attrObject instanceof String) {
String object;
- if (!attributes.contains(key, String.class)) {
+ if (!attributes.isSet(key, String.class)) {
attributes.getDataTable().createColumn(key, String.class);
object = null;
} else {
@@ -611,7 +611,7 @@
}
private <T> void addAttribute(CyRow attributes, String name, T value) {
- if (!attributes.contains(name, value.getClass())) {
+ if (!attributes.isSet(name, value.getClass())) {
attributes.getDataTable().createColumn(name,
value.getClass());
}
attributes.set(name, value);
Modified:
core3/psi-mi-impl/trunk/src/test/java/org/cytoscape/psi_mi/internal/plugin/PsiMiCyFileFilterTest.java
===================================================================
---
core3/psi-mi-impl/trunk/src/test/java/org/cytoscape/psi_mi/internal/plugin/PsiMiCyFileFilterTest.java
2010-10-26 16:16:54 UTC (rev 22437)
+++
core3/psi-mi-impl/trunk/src/test/java/org/cytoscape/psi_mi/internal/plugin/PsiMiCyFileFilterTest.java
2010-10-26 17:08:21 UTC (rev 22438)
@@ -45,21 +45,21 @@
@Test
public void testAcceptPsiMi1() throws Exception {
File file = new
File("src/test/resources/testData/psi_sample1.xml");
- assertTrue(filter.accept(new FileInputStream(file),
DataCategory.NETWORK));
- assertTrue(filter.accept(file.toURI(), DataCategory.NETWORK));
+ assertTrue(filter.accepts(new FileInputStream(file),
DataCategory.NETWORK));
+ assertTrue(filter.accepts(file.toURI(), DataCategory.NETWORK));
}
@Test
public void testAcceptPsiMi25() throws Exception {
File file = new
File("src/test/resources/testData/psi_sample_2_5_2.xml");
- assertTrue(filter.accept(new FileInputStream(file),
DataCategory.NETWORK));
- assertTrue(filter.accept(file.toURI(), DataCategory.NETWORK));
+ assertTrue(filter.accepts(new FileInputStream(file),
DataCategory.NETWORK));
+ assertTrue(filter.accepts(file.toURI(), DataCategory.NETWORK));
}
@Test
public void testAcceptRandomXml() throws Exception {
File file = new
File("src/test/resources/testData/galFiltered.xgmml");
- assertFalse(filter.accept(new FileInputStream(file),
DataCategory.NETWORK));
- assertFalse(filter.accept(file.toURI(), DataCategory.NETWORK));
+ assertFalse(filter.accepts(new FileInputStream(file),
DataCategory.NETWORK));
+ assertFalse(filter.accepts(file.toURI(), DataCategory.NETWORK));
}
}
--
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.
