Author: paperwing
Date: 2011-06-26 06:12:55 -0700 (Sun, 26 Jun 2011)
New Revision: 25943
Modified:
csplugins/trunk/toronto/jm/paperwing-build/patches/presentation-impl/RenderingEngineManagerImpl.java.patch
csplugins/trunk/toronto/jm/paperwing-build/patches/swing-application-impl/NetworkViewManager.java.patch
csplugins/trunk/toronto/jm/paperwing-build/patches/swing-application-impl/bundle-context-osgi.xml.patch
csplugins/trunk/toronto/jm/paperwing-build/patches/swing-application-impl/bundle-context.xml.patch
csplugins/trunk/toronto/jm/paperwing-build/patches/vizmap-gui-impl/BypassManager.java.patch
csplugins/trunk/toronto/jm/paperwing-build/patches/vizmap-gui-impl/bundle-context-osgi-vizmapper.xml.patch
Log:
updated patches, changed patch versioning info
Modified:
csplugins/trunk/toronto/jm/paperwing-build/patches/presentation-impl/RenderingEngineManagerImpl.java.patch
===================================================================
---
csplugins/trunk/toronto/jm/paperwing-build/patches/presentation-impl/RenderingEngineManagerImpl.java.patch
2011-06-25 22:39:21 UTC (rev 25942)
+++
csplugins/trunk/toronto/jm/paperwing-build/patches/presentation-impl/RenderingEngineManagerImpl.java.patch
2011-06-26 13:12:55 UTC (rev 25943)
@@ -1,6 +1,6 @@
Index:
src/main/java/org/cytoscape/view/presentation/internal/RenderingEngineManagerImpl.java
===================================================================
----
src/main/java/org/cytoscape/view/presentation/internal/RenderingEngineManagerImpl.java
(revision 25894)
+---
src/main/java/org/cytoscape/view/presentation/internal/RenderingEngineManagerImpl.java
(revision 25942)
+++
src/main/java/org/cytoscape/view/presentation/internal/RenderingEngineManagerImpl.java
(working copy)
@@ -15,7 +15,7 @@
private final Map<View<?>, RenderingEngine<?>> renderingEngineMap;
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-25 22:39:21 UTC (rev 25942)
+++
csplugins/trunk/toronto/jm/paperwing-build/patches/swing-application-impl/NetworkViewManager.java.patch
2011-06-26 13:12:55 UTC (rev 25943)
@@ -1,7 +1,7 @@
Index: src/main/java/org/cytoscape/internal/view/NetworkViewManager.java
===================================================================
---- 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
+--- src/main/java/org/cytoscape/internal/view/NetworkViewManager.java
(revision 25942)
++++ src/main/java/org/cytoscape/internal/view/NetworkViewManager.java
(working copy)
@@ -124,7 +124,7 @@
// TODO: for now, use this as default. But in the future, we should
provide
Modified:
csplugins/trunk/toronto/jm/paperwing-build/patches/swing-application-impl/bundle-context-osgi.xml.patch
===================================================================
---
csplugins/trunk/toronto/jm/paperwing-build/patches/swing-application-impl/bundle-context-osgi.xml.patch
2011-06-25 22:39:21 UTC (rev 25942)
+++
csplugins/trunk/toronto/jm/paperwing-build/patches/swing-application-impl/bundle-context-osgi.xml.patch
2011-06-26 13:12:55 UTC (rev 25943)
@@ -1,9 +1,9 @@
Index: src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---- src/main/resources/META-INF/spring/bundle-context-osgi.xml 2011-06-21
05:51:36.143000000 -0400
-+++ src/main/resources/META-INF/spring/bundle-context-osgi.xml 2011-06-21
07:50:08.281446200 -0400
-@@ -34,14 +34,14 @@
- interface="org.cytoscape.model.CyTableRowUpdateService" />
+--- src/main/resources/META-INF/spring/bundle-context-osgi.xml (revision 25942)
++++ src/main/resources/META-INF/spring/bundle-context-osgi.xml (working copy)
+@@ -31,14 +31,14 @@
+ interface="org.cytoscape.work.swing.GUITaskManager" />
<!-- Rendering Engine factory for main network views -->
- <osgi:reference id="dingRenderingEngineFactoryServiceRef"
Modified:
csplugins/trunk/toronto/jm/paperwing-build/patches/swing-application-impl/bundle-context.xml.patch
===================================================================
---
csplugins/trunk/toronto/jm/paperwing-build/patches/swing-application-impl/bundle-context.xml.patch
2011-06-25 22:39:21 UTC (rev 25942)
+++
csplugins/trunk/toronto/jm/paperwing-build/patches/swing-application-impl/bundle-context.xml.patch
2011-06-26 13:12:55 UTC (rev 25943)
@@ -1,8 +1,8 @@
Index: src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---- src/main/resources/META-INF/spring/bundle-context.xml 2011-06-20
22:58:52.766000000 -0400
-+++ src/main/resources/META-INF/spring/bundle-context.xml 2011-06-20
07:17:38.468000000 -0400
-@@ -88,7 +88,7 @@
+--- src/main/resources/META-INF/spring/bundle-context.xml (revision 25942)
++++ src/main/resources/META-INF/spring/bundle-context.xml (working copy)
+@@ -87,7 +87,7 @@
<bean name="birdsEyeViewHandler"
class="org.cytoscape.internal.view.BirdsEyeViewHandler">
<constructor-arg ref="cyApplicationManagerServiceRef" />
<constructor-arg ref="networkViewManager" />
Modified:
csplugins/trunk/toronto/jm/paperwing-build/patches/vizmap-gui-impl/BypassManager.java.patch
===================================================================
---
csplugins/trunk/toronto/jm/paperwing-build/patches/vizmap-gui-impl/BypassManager.java.patch
2011-06-25 22:39:21 UTC (rev 25942)
+++
csplugins/trunk/toronto/jm/paperwing-build/patches/vizmap-gui-impl/BypassManager.java.patch
2011-06-26 13:12:55 UTC (rev 25943)
@@ -16,7 +16,7 @@
public void addBypass(RenderingEngineFactory<?> factory, Map props) {
- if (props.containsValue("ding") == false)
-+ if (props.containsValue(DEF_RENDERER) == false)
++ if (props.containsValue("wind") == false)
return;
final VisualLexicon lexicon = factory.getVisualLexicon();
Modified:
csplugins/trunk/toronto/jm/paperwing-build/patches/vizmap-gui-impl/bundle-context-osgi-vizmapper.xml.patch
===================================================================
---
csplugins/trunk/toronto/jm/paperwing-build/patches/vizmap-gui-impl/bundle-context-osgi-vizmapper.xml.patch
2011-06-25 22:39:21 UTC (rev 25942)
+++
csplugins/trunk/toronto/jm/paperwing-build/patches/vizmap-gui-impl/bundle-context-osgi-vizmapper.xml.patch
2011-06-26 13:12:55 UTC (rev 25943)
@@ -1,7 +1,7 @@
Index: src/main/resources/META-INF/spring/bundle-context-osgi-vizmapper.xml
===================================================================
---- src/main/resources/META-INF/spring/bundle-context-osgi-vizmapper.xml
2011-06-21 05:51:51.462000000 -0400
-+++ src/main/resources/META-INF/spring/bundle-context-osgi-vizmapper.xml
2011-06-20 07:00:59.933000000 -0400
+--- src/main/resources/META-INF/spring/bundle-context-osgi-vizmapper.xml
(revision 25942)
++++ src/main/resources/META-INF/spring/bundle-context-osgi-vizmapper.xml
(working copy)
@@ -53,12 +53,12 @@
interface="org.cytoscape.view.vizmap.VisualStyleFactory" />
@@ -19,12 +19,3 @@
<!-- Visual Mapping Manager Service -->
<osgi:reference id="vmmServiceRef"
-@@ -271,6 +271,6 @@
- <osgi:listener bind-method="addBypass"
- unbind-method="removeBypass" ref="bypassManager" />
- </osgi:set>
--
--
-+
-+
- </beans>
--
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.
