Author: kono
Date: 2012-05-22 14:01:57 -0700 (Tue, 22 May 2012)
New Revision: 29319
Added:
core3/impl/trunk/session-impl/integration-test/src/test/resources/testData/session2x/v252Session.cys
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DNodeView.java
core3/impl/trunk/pom.xml
core3/impl/trunk/session-impl/integration-test/pom.xml
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/Cy2SimpleSessionLodingTest.java
core3/impl/trunk/vizmap-impl/impl/src/main/java/org/cytoscape/view/vizmap/internal/mappings/PassthroughMappingImpl.java
core3/impl/trunk/work-impl/pom.xml
Log:
fixed build problems in integration tests.
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DNodeView.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DNodeView.java
2012-05-22 21:00:52 UTC (rev 29318)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DNodeView.java
2012-05-22 21:01:57 UTC (rev 29319)
@@ -1203,7 +1203,7 @@
} else if (vp == BasicVisualLexicon.NODE_Y_LOCATION) {
setYPosition(((Number) value).doubleValue());
} else if (vp == DVisualLexicon.NODE_TOOLTIP) {
- setToolTip((String) value);
+ setToolTip(value.toString());
} else if (vp == BasicVisualLexicon.NODE_LABEL_COLOR) {
final Color labelColor = (Color) value;
final int opacity = ((Color)getTextPaint()).getAlpha();
Modified: core3/impl/trunk/pom.xml
===================================================================
--- core3/impl/trunk/pom.xml 2012-05-22 21:00:52 UTC (rev 29318)
+++ core3/impl/trunk/pom.xml 2012-05-22 21:01:57 UTC (rev 29319)
@@ -58,7 +58,8 @@
<module>webservice-biomart-client-impl</module>
<module>webservice-impl</module>
<module>webservice-ncbi-client-impl</module>
- <!-- <module>work-headless-impl</module> -->
+ <module>work-headless-impl</module>
+ <module>work-impl</module>
<module>work-swing-impl</module>
<module>application-impl</module>
<module>webservice-psicquic-client-impl</module>
Modified: core3/impl/trunk/session-impl/integration-test/pom.xml
===================================================================
--- core3/impl/trunk/session-impl/integration-test/pom.xml 2012-05-22
21:00:52 UTC (rev 29318)
+++ core3/impl/trunk/session-impl/integration-test/pom.xml 2012-05-22
21:01:57 UTC (rev 29319)
@@ -73,6 +73,19 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>work-swing-impl</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>work-impl</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
<!-- Pax Exam Dependencies -->
@@ -169,11 +182,6 @@
<scope>test</scope>
</dependency>
-
-
-
-
-
<dependency>
<groupId>org.ops4j.pax.logging</groupId>
<artifactId>pax-logging-api</artifactId>
Modified:
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/Cy2SimpleSessionLodingTest.java
===================================================================
---
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/Cy2SimpleSessionLodingTest.java
2012-05-22 21:00:52 UTC (rev 29318)
+++
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/Cy2SimpleSessionLodingTest.java
2012-05-22 21:01:57 UTC (rev 29319)
@@ -19,8 +19,8 @@
@Before
public void setup() throws Exception {
-// sessionFile = new
File("./src/test/resources/testData/session3x/", "smallSession.cys");
-// checkBasicConfiguration();
+ sessionFile = new
File("./src/test/resources/testData/session3x/", "smallSession.cys");
+ checkBasicConfiguration();
}
@Test
Added:
core3/impl/trunk/session-impl/integration-test/src/test/resources/testData/session2x/v252Session.cys
===================================================================
(Binary files differ)
Property changes on:
core3/impl/trunk/session-impl/integration-test/src/test/resources/testData/session2x/v252Session.cys
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified:
core3/impl/trunk/vizmap-impl/impl/src/main/java/org/cytoscape/view/vizmap/internal/mappings/PassthroughMappingImpl.java
===================================================================
---
core3/impl/trunk/vizmap-impl/impl/src/main/java/org/cytoscape/view/vizmap/internal/mappings/PassthroughMappingImpl.java
2012-05-22 21:00:52 UTC (rev 29318)
+++
core3/impl/trunk/vizmap-impl/impl/src/main/java/org/cytoscape/view/vizmap/internal/mappings/PassthroughMappingImpl.java
2012-05-22 21:01:57 UTC (rev 29319)
@@ -97,7 +97,7 @@
value = (K) sb.toString();
} else {
- value = row.get(attrName, attrType);
+ value = row.get(attrName, (Class<? extends K>)
attrClass);
}
final V converted = convertToValue(value);
Modified: core3/impl/trunk/work-impl/pom.xml
===================================================================
--- core3/impl/trunk/work-impl/pom.xml 2012-05-22 21:00:52 UTC (rev 29318)
+++ core3/impl/trunk/work-impl/pom.xml 2012-05-22 21:01:57 UTC (rev 29319)
@@ -13,7 +13,6 @@
</properties>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.cytoscape</groupId>
<artifactId>work-impl</artifactId>
<name>${bundle.symbolicName}</name>
--
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.
