Author: ruschein
Date: 2011-08-23 12:53:34 -0700 (Tue, 23 Aug 2011)
New Revision: 26627
Added:
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/undo/
Removed:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/undo/
Modified:
core3/impl/trunk/core-task-impl/pom.xml
core3/impl/trunk/core-task-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
core3/impl/trunk/core-task-impl/src/main/resources/META-INF/spring/bundle-context.xml
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/undo/RedoAction.java
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/undo/UndoAction.java
core3/impl/trunk/swing-application-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
core3/impl/trunk/swing-application-impl/src/main/resources/META-INF/spring/bundle-context.xml
Log:
Closes Redmine Bug #356.
Modified: core3/impl/trunk/core-task-impl/pom.xml
===================================================================
--- core3/impl/trunk/core-task-impl/pom.xml 2011-08-23 16:43:55 UTC (rev
26626)
+++ core3/impl/trunk/core-task-impl/pom.xml 2011-08-23 19:53:34 UTC (rev
26627)
@@ -93,10 +93,6 @@
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
- <artifactId>swing-application-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.cytoscape</groupId>
<artifactId>model-api</artifactId>
</dependency>
<dependency>
Modified:
core3/impl/trunk/core-task-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-08-23 16:43:55 UTC (rev 26626)
+++
core3/impl/trunk/core-task-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-08-23 19:53:34 UTC (rev 26627)
@@ -86,10 +86,6 @@
interface="org.cytoscape.io.write.CyTableWriterManager" />
<!-- now register our services -->
- <osgi:service id="undoActionService" ref="undoAction"
- interface="org.cytoscape.application.swing.CyAction" />
- <osgi:service id="redoActionService" ref="redoAction"
- interface="org.cytoscape.application.swing.CyAction" />
<osgi:service id="loadNetworkFileTaskFactoryService"
ref="loadNetworkFileTaskFactory"
interface="org.cytoscape.work.TaskFactory">
Modified:
core3/impl/trunk/core-task-impl/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/resources/META-INF/spring/bundle-context.xml
2011-08-23 16:43:55 UTC (rev 26626)
+++
core3/impl/trunk/core-task-impl/src/main/resources/META-INF/spring/bundle-context.xml
2011-08-23 19:53:34 UTC (rev 26627)
@@ -23,16 +23,6 @@
<context:annotation-config />
- <bean id="undoAction"
class="org.cytoscape.task.internal.undo.UndoAction">
- <constructor-arg ref="undoSupportServiceRef" />
- <constructor-arg ref="cyApplicationManagerServiceRef" />
- </bean>
-
- <bean id="redoAction"
class="org.cytoscape.task.internal.undo.RedoAction">
- <constructor-arg ref="undoSupportServiceRef" />
- <constructor-arg ref="cyApplicationManagerServiceRef" />
- </bean>
-
<bean id="loadAttrsFileTaskFactory"
class="org.cytoscape.task.internal.loaddatatable.LoadAttributesFileTaskFactoryImpl">
<constructor-arg ref="cyDataTableReaderManagerServiceRef" />
Modified:
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/undo/RedoAction.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/undo/RedoAction.java
2011-08-23 00:42:09 UTC (rev 26625)
+++
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/undo/RedoAction.java
2011-08-23 19:53:34 UTC (rev 26627)
@@ -27,7 +27,7 @@
along with this library; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.cytoscape.task.internal.undo;
+package org.cytoscape.internal.undo;
import java.awt.Toolkit;
Modified:
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/undo/UndoAction.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/undo/UndoAction.java
2011-08-23 00:42:09 UTC (rev 26625)
+++
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/undo/UndoAction.java
2011-08-23 19:53:34 UTC (rev 26627)
@@ -27,7 +27,7 @@
along with this library; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.cytoscape.task.internal.undo;
+package org.cytoscape.internal.undo;
import java.awt.Toolkit;
Modified:
core3/impl/trunk/swing-application-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/impl/trunk/swing-application-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-08-23 16:43:55 UTC (rev 26626)
+++
core3/impl/trunk/swing-application-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-08-23 19:53:34 UTC (rev 26627)
@@ -88,18 +88,12 @@
<!-- define services that application provides -->
- <!-- <osgi:service id="proxyHandlerService" ref="proxyHandler"> -->
- <!-- <osgi:interfaces> -->
- <!-- <value>cytoscape.util.ProxyHandler</value> -->
- <!-- <value>cytoscape.events.PreferencesUpdatedListener -->
- <!-- </value> -->
- <!-- </osgi:interfaces> -->
- <!-- </osgi:service> -->
-
-
+ <osgi:service id="undoActionService" ref="undoAction"
+ interface="org.cytoscape.application.swing.CyAction" />
+ <osgi:service id="redoActionService" ref="redoAction"
+ interface="org.cytoscape.application.swing.CyAction" />
<osgi:reference id="openBrowserServiceRef"
interface="org.cytoscape.util.swing.OpenBrowser" />
-
<osgi:service id="printActionService" ref="printAction"
interface="org.cytoscape.application.swing.CyAction" />
<osgi:service id="exitActionService" ref="exitAction"
Modified:
core3/impl/trunk/swing-application-impl/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/impl/trunk/swing-application-impl/src/main/resources/META-INF/spring/bundle-context.xml
2011-08-23 16:43:55 UTC (rev 26626)
+++
core3/impl/trunk/swing-application-impl/src/main/resources/META-INF/spring/bundle-context.xml
2011-08-23 19:53:34 UTC (rev 26627)
@@ -23,6 +23,16 @@
<context:annotation-config />
+ <bean id="undoAction" class="org.cytoscape.internal.undo.UndoAction">
+ <constructor-arg ref="undoSupportServiceRef" />
+ <constructor-arg ref="cyApplicationManagerServiceRef" />
+ </bean>
+
+ <bean id="redoAction" class="org.cytoscape.internal.undo.RedoAction">
+ <constructor-arg ref="undoSupportServiceRef" />
+ <constructor-arg ref="cyApplicationManagerServiceRef" />
+ </bean>
+
<bean name="configDirPropertyWriter"
class="org.cytoscape.internal.shutdown.ConfigDirPropertyWriter">
<constructor-arg ref="taskManagerServiceRef" />
<constructor-arg ref="propertyWriterManagerRef" />
--
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.
