Author: rodche
Date: 2012-02-28 16:55:15 -0800 (Tue, 28 Feb 2012)
New Revision: 28394
Modified:
core3/gui-distribution/trunk/features/src/main/resources/features.xml
core3/impl/trunk/biopax-impl/pom.xml
core3/impl/trunk/biopax-impl/src/main/java/org/cytoscape/biopax/internal/view/BioPaxContainer.java
core3/impl/trunk/cpath2-impl/pom.xml
Log:
Switched to paxtools v4.1.1 release (BioPAX read performance fix)
Modified: core3/gui-distribution/trunk/features/src/main/resources/features.xml
===================================================================
--- core3/gui-distribution/trunk/features/src/main/resources/features.xml
2012-02-29 00:10:10 UTC (rev 28393)
+++ core3/gui-distribution/trunk/features/src/main/resources/features.xml
2012-02-29 00:55:15 UTC (rev 28394)
@@ -45,8 +45,8 @@
<bundle
start-level="103">mvn:cytoscape-temp/collections-generic/4.01</bundle>
<bundle
start-level="103">mvn:org.apache.commons/com.springsource.org.apache.commons.lang/2.4.0</bundle>
<bundle
start-level="103">mvn:org.apache.commons/com.springsource.org.apache.commons.httpclient/3.1.0</bundle>
- <bundle start-level="103">mvn:cytoscape-temp/paxtools-core/4.0.1</bundle>
- <bundle
start-level="103">mvn:cytoscape-temp/biopax-converter/4.0.1</bundle>
+ <bundle start-level="103">mvn:cytoscape-temp/paxtools-core/4.1.1</bundle>
+ <bundle
start-level="103">mvn:cytoscape-temp/biopax-converter/4.1.1</bundle>
<bundle
start-level="103">mvn:com.googlecode.guava-osgi/guava-osgi/9.0.0</bundle>
<bundle
start-level="103">mvn:org.apache.commons/com.springsource.org.apache.commons.io/1.4.0</bundle>
Modified: core3/impl/trunk/biopax-impl/pom.xml
===================================================================
--- core3/impl/trunk/biopax-impl/pom.xml 2012-02-29 00:10:10 UTC (rev
28393)
+++ core3/impl/trunk/biopax-impl/pom.xml 2012-02-29 00:55:15 UTC (rev
28394)
@@ -52,12 +52,12 @@
<dependency>
<groupId>cytoscape-temp</groupId>
<artifactId>paxtools-core</artifactId>
- <version>4.0.1</version>
+ <version>4.1.1</version>
</dependency>
<dependency>
<groupId>cytoscape-temp</groupId>
<artifactId>biopax-converter</artifactId>
- <version>4.0.1</version>
+ <version>4.1.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified:
core3/impl/trunk/biopax-impl/src/main/java/org/cytoscape/biopax/internal/view/BioPaxContainer.java
===================================================================
---
core3/impl/trunk/biopax-impl/src/main/java/org/cytoscape/biopax/internal/view/BioPaxContainer.java
2012-02-29 00:10:10 UTC (rev 28393)
+++
core3/impl/trunk/biopax-impl/src/main/java/org/cytoscape/biopax/internal/view/BioPaxContainer.java
2012-02-29 00:55:15 UTC (rev 28394)
@@ -138,6 +138,9 @@
public void showLegend() {
CardLayout cl = (CardLayout)(cards.getLayout());
CyNetwork network = applicationManager.getCurrentNetwork();
+ if(network == null)
+ return;
+
CyRow row = network.getRow(network);
Boolean isBioPaxNetwork = row.get(BioPaxMapper.BIOPAX_NETWORK,
Boolean.class);
if (isBioPaxNetwork != null) {
Modified: core3/impl/trunk/cpath2-impl/pom.xml
===================================================================
--- core3/impl/trunk/cpath2-impl/pom.xml 2012-02-29 00:10:10 UTC (rev
28393)
+++ core3/impl/trunk/cpath2-impl/pom.xml 2012-02-29 00:55:15 UTC (rev
28394)
@@ -57,13 +57,13 @@
<dependency>
<groupId>cytoscape-temp</groupId>
<artifactId>paxtools-core</artifactId>
- <version>4.0.1</version>
+ <version>4.1.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>cytoscape-temp</groupId>
<artifactId>biopax-converter</artifactId>
- <version>4.0.1</version>
+ <version>4.1.1</version>
<scope>provided</scope>
</dependency>
<dependency>
--
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.
