Author: paperwing
Date: 2011-06-23 08:59:33 -0700 (Thu, 23 Jun 2011)
New Revision: 25895
Modified:
csplugins/trunk/toronto/jm/paperwing-build/patches/paperwing-impl/pom.xml.patch
csplugins/trunk/toronto/jm/paperwing-build/patches/swing-application-impl/NetworkViewManager.java.patch
Log:
updated swing-application-impl, vizmap-gui-impl patches, added
presentation-impl patch
Modified:
csplugins/trunk/toronto/jm/paperwing-build/patches/paperwing-impl/pom.xml.patch
===================================================================
---
csplugins/trunk/toronto/jm/paperwing-build/patches/paperwing-impl/pom.xml.patch
2011-06-23 02:02:50 UTC (rev 25894)
+++
csplugins/trunk/toronto/jm/paperwing-build/patches/paperwing-impl/pom.xml.patch
2011-06-23 15:59:33 UTC (rev 25895)
@@ -1,24 +1,14 @@
Index: pom.xml
===================================================================
---- pom.xml (revision 25757)
+--- pom.xml (revision 25765)
+++ pom.xml (working copy)
-@@ -5,7 +5,7 @@
- <parent>
- <groupId>org.cytoscape</groupId>
- <artifactId>parent</artifactId>
-- <version>3.0.0-alpha6-SNAPSHOT</version>
-+ <version>3.0.0-alpha8-SNAPSHOT</version>
- </parent>
- <properties>
-
<bundle.symbolicName>org.cytoscape.paperwing-impl</bundle.symbolicName>
@@ -20,355 +20,24 @@
<dependencies>
<dependency>
<groupId>cytoscape-temp</groupId>
- <artifactId>gluegen-gl</artifactId>
-- <version>2.0-b23-20110303</version>
+ <artifactId>jogl</artifactId>
-+ <version>2.0-b398</version>
+ <version>2.0-b23-20110303</version>
</dependency>
- <dependency>
- <groupId>cytoscape-temp</groupId>
Modified:
csplugins/trunk/toronto/jm/paperwing-build/patches/swing-application-impl/NetworkViewManager.java.patch
===================================================================
---
csplugins/trunk/toronto/jm/paperwing-build/patches/swing-application-impl/NetworkViewManager.java.patch
2011-06-23 02:02:50 UTC (rev 25894)
+++
csplugins/trunk/toronto/jm/paperwing-build/patches/swing-application-impl/NetworkViewManager.java.patch
2011-06-23 15:59:33 UTC (rev 25895)
@@ -1,13 +1,13 @@
Index: src/main/java/org/cytoscape/internal/view/NetworkViewManager.java
===================================================================
---- src/main/java/org/cytoscape/internal/view/NetworkViewManager.java
(revision 25654)
-+++ src/main/java/org/cytoscape/internal/view/NetworkViewManager.java
(working copy)
-@@ -184,7 +184,7 @@
- throw new IllegalArgumentException("Renderer ID is
null.");
+--- src/main/java/org/cytoscape/internal/view/NetworkViewManager.java
2011-06-22 07:41:30.742000000 -0400
++++ src/main/java/org/cytoscape/internal/view/NetworkViewManager.java
2011-06-22 08:39:28.721191500 -0400
+@@ -124,7 +124,7 @@
- factories.put(rendererID.toString(), factory);
-- if (currentRenderingEngineFactory == null &&
rendererID.equals(DEFAULT_PRESENTATION)) {
-+ if (currentRenderingEngineFactory == null) {
- currentRenderingEngineFactory = factory;
- logger.info(rendererID + " is registered as the default
rendering engine.");
- }
+ // TODO: for now, use this as default. But in the future, we should
provide
+ // UI to select presentation.
+- private static final String DEFAULT_PRESENTATION = "ding";
++ private static final String DEFAULT_PRESENTATION = "wind";
+
+ private final Map<CyTable, CyNetwork> nameTables;
+ private final CyNetworkViewManager networkViewManager;
--
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.
