Author: kono
Date: 2011-08-11 18:37:18 -0700 (Thu, 11 Aug 2011)
New Revision: 26539
Removed:
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/CytoscapeShutdown.java
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/CytoscapeVersion.java
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/events/CytoscapeShutdownEvent.java
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/events/CytoscapeShutdownListener.java
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/events/CytoscapeStartEvent.java
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/events/CytoscapeStartListener.java
Modified:
core3/api/trunk/swing-application-api/pom.xml
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/AbstractCyAction.java
Log:
Other bundles had been refactored to use new application-api.
Modified: core3/api/trunk/swing-application-api/pom.xml
===================================================================
--- core3/api/trunk/swing-application-api/pom.xml 2011-08-12 01:36:45 UTC
(rev 26538)
+++ core3/api/trunk/swing-application-api/pom.xml 2011-08-12 01:37:18 UTC
(rev 26539)
@@ -12,9 +12,9 @@
</properties>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.cytoscape</groupId>
<artifactId>swing-application-api</artifactId>
<name>Cytoscape Swing Application API</name>
+
<packaging>bundle</packaging>
<build>
@@ -80,6 +80,11 @@
<artifactId>session-api</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>application-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
</project>
Modified:
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/AbstractCyAction.java
===================================================================
---
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/AbstractCyAction.java
2011-08-12 01:36:45 UTC (rev 26538)
+++
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/AbstractCyAction.java
2011-08-12 01:37:18 UTC (rev 26539)
@@ -37,10 +37,10 @@
import javax.swing.event.MenuEvent;
import javax.swing.event.PopupMenuEvent;
+import org.cytoscape.application.CyApplicationManager;
import org.cytoscape.model.CyEdge;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNode;
-import org.cytoscape.session.CyApplicationManager;
import org.cytoscape.view.model.CyNetworkView;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Deleted:
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/CytoscapeShutdown.java
===================================================================
---
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/CytoscapeShutdown.java
2011-08-12 01:36:45 UTC (rev 26538)
+++
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/CytoscapeShutdown.java
2011-08-12 01:37:18 UTC (rev 26539)
@@ -1,52 +0,0 @@
-
-/*
- File: CytoscapeShutdown.java
-
- Copyright (c) 2006, The Cytoscape Consortium (www.cytoscape.org)
-
- The Cytoscape Consortium is:
- - Institute for Systems Biology
- - University of California San Diego
- - Memorial Sloan-Kettering Cancer Center
- - Institut Pasteur
- - Agilent Technologies
-
- This library is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published
- by the Free Software Foundation; either version 2.1 of the License, or
- any later version.
-
- This library is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF
- MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. The software and
- documentation provided hereunder is on an "as is" basis, and the
- Institute for Systems Biology and the Whitehead Institute
- have no obligations to provide maintenance, support,
- updates, enhancements or modifications. In no event shall the
- Institute for Systems Biology and the Whitehead Institute
- be liable to any party for direct, indirect, special,
- incidental or consequential damages, including lost profits, arising
- out of the use of this software and its documentation, even if the
- Institute for Systems Biology and the Whitehead Institute
- have been advised of the possibility of such damage. See
- the GNU Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- 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.application.swing;
-
-/**
- * A service that will shutdown Cytoscape cleanly. Will fire a
- * CytoscapeShutdownEvent such that all CytoscapeShutdownListener will be
- * notified before actually shutting down.
- */
-public interface CytoscapeShutdown {
- /**
- * Calling this method indicates that the application should shutdown.
- * @param retVal The return value with which to (eventually)
- * call {@link System#exit} with.
- */
- void exit(int retVal);
-}
Deleted:
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/CytoscapeVersion.java
===================================================================
---
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/CytoscapeVersion.java
2011-08-12 01:36:45 UTC (rev 26538)
+++
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/CytoscapeVersion.java
2011-08-12 01:37:18 UTC (rev 26539)
@@ -1,107 +0,0 @@
-/*
- File: CytoscapeVersion.java
-
- Copyright (c) 2006, The Cytoscape Consortium (www.cytoscape.org)
-
- The Cytoscape Consortium is:
- - Institute for Systems Biology
- - University of California San Diego
- - Memorial Sloan-Kettering Cancer Center
- - Institut Pasteur
- - Agilent Technologies
-
- This library is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published
- by the Free Software Foundation; either version 2.1 of the License, or
- any later version.
-
- This library is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF
- MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. The software and
- documentation provided hereunder is on an "as is" basis, and the
- Institute for Systems Biology and the Whitehead Institute
- have no obligations to provide maintenance, support,
- updates, enhancements or modifications. In no event shall the
- Institute for Systems Biology and the Whitehead Institute
- be liable to any party for direct, indirect, special,
- incidental or consequential damages, including lost profits, arising
- out of the use of this software and its documentation, even if the
- Institute for Systems Biology and the Whitehead Institute
- have been advised of the possibility of such damage. See
- the GNU Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- 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.application.swing;
-
-/**
- * An interface providing access to version information about this
- * version of the Cytoscape application. Cytoscape strives to follow
- * the <a href="http://semver.org";>Semantic Versioning</a> standard
- * to ensure comprehensible backwards compatibility versioning.
- */
-public interface CytoscapeVersion {
-
- /**
- * The string used to identify the Property containing the version
number.
- */
- public static final String VERSION_PROPERTY_NAME =
"cytoscape.version.number";
-
- /**
- * The regular expression used to test the property version string.
- */
- public static final String VERSION_REGEX =
"^(\\d+)\\.(\\d+)\\.(\\d+)([\\-\\.\\w]*)$";
-
- /**
- * The full version as a string, for example "3.2.5-alpha".
- */
- public String getVersion();
-
- /**
- * The first of the three numbers defining the version of the
- * software, meaning "3" if the version is "3.2.5". This number
- * changes only for comprehensive software changes and while APIs
- * may be similar between versions, they are not guaranteed to be
- * compatible.
- * @return The integer describing the major version of this application.
- */
- public int getMajorVersion();
-
-
- /**
- * The second of the three numbers defining the version of the
- * software, meaning "2" if the version is "3.2.5". This number
- * changes as new functionality or a new API is added to the software.
- * Minor version APIs are guaranteed to be backwards compatibile for
- * all previous versions within the major version (i.e. version 3.2
- * will be completely compatible with all 3.1.x, and 3.0.x code).
- * @return The integer describing the minor version of this application.
- */
- public int getMinorVersion();
-
-
- /**
- * The third of the three numbers defining the version of the
- * software, meaning "5" if the version is "3.2.5". This number
- * changes as bug fixes are made but no new features or APIs are
- * added. Bug fix versions contain NO NEW FEATRURES!
- * Bug fix version APIs are guaranteed to be backwards
- * compatibile for all previous versions within the major version
- * (i.e. version 3.2.5 will be completely compatible with all 3.x
- * versions of the code).
- * @return The integer describing the bug fix version of this
application.
- */
- public int getBugFixVersion();
-
- /**
- * Any text following the last digit of the bug fix version. If
- * the version is 3.0.2-beta1 then the qualifier will be "-beta1".
- * Final (stable) versions of the application should not include any
- * qualifying information. All qualifying text indicates a pre-release,
- * an unstable release, or unfinished release.
- * @return Any text following the last digit of the bug fix version.
- */
- public String getQualifier();
-}
Deleted:
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/events/CytoscapeShutdownEvent.java
===================================================================
---
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/events/CytoscapeShutdownEvent.java
2011-08-12 01:36:45 UTC (rev 26538)
+++
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/events/CytoscapeShutdownEvent.java
2011-08-12 01:37:18 UTC (rev 26539)
@@ -1,55 +0,0 @@
-
-package org.cytoscape.application.swing.events;
-
-import org.cytoscape.event.AbstractCyEvent;
-
-/**
- * An event fired immediately before Cytoscape will be shutdown. This
- * event provides methods for listeners processing this event to
- * abort the shutdown. This event should only be fired synchronously
- * to allow all listeners time to clean up.
- */
-public final class CytoscapeShutdownEvent extends AbstractCyEvent<Object> {
-
- private String reason;
-
- /**
- * Constructor.
- * @param source The object firing this event.
- */
- public CytoscapeShutdownEvent(final Object source) {
- super(source, CytoscapeShutdownListener.class);
- reason = null;
- }
-
- /**
- * A callback to the firing class that allows a listener to
- * abort the shutdown. This can cause conflicts if abused.
- * @param why A user comprehensible message describing why the shutdown
- * was aborted.
- */
- public void abortShutdown(final String why) {
- if ( why == null || why.equals("") )
- return;
-
- reason = why;
- }
-
- /**
- * Returns the reason that the application should not be shut down.
- * @return The reason that the application should not be shut down.
- */
- public String whyNot() {
- return reason;
- }
-
- /**
- * Returns true if no reason is provided to abort the shutdown and false
- * if anyone processing this event wants to prevent shutdown.
- * @return true if no reason is provided to abort the shutdown and false
- * if anyone processing this event wants to prevent shutdown.
- */
- public boolean actuallyShutdown() {
- return (reason == null || reason.length() <= 0);
- }
-}
Deleted:
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/events/CytoscapeShutdownListener.java
===================================================================
---
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/events/CytoscapeShutdownListener.java
2011-08-12 01:36:45 UTC (rev 26538)
+++
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/events/CytoscapeShutdownListener.java
2011-08-12 01:37:18 UTC (rev 26539)
@@ -1,16 +0,0 @@
-
-package org.cytoscape.application.swing.events;
-
-import org.cytoscape.event.CyListener;
-
-/**
- * The listener for the CytoscapeShutdownEvent.
- */
-public interface CytoscapeShutdownListener extends CyListener {
-
- /**
- * Process the specified event.
- * @param e The event being processed.
- */
- public void handleEvent(CytoscapeShutdownEvent e);
-}
Deleted:
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/events/CytoscapeStartEvent.java
===================================================================
---
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/events/CytoscapeStartEvent.java
2011-08-12 01:36:45 UTC (rev 26538)
+++
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/events/CytoscapeStartEvent.java
2011-08-12 01:37:18 UTC (rev 26539)
@@ -1,20 +0,0 @@
-
-package org.cytoscape.application.swing.events;
-
-import org.cytoscape.event.AbstractCyEvent;
-
-/**
- * An event fired after Cytoscape startup mostly complete (but not necessarily
100 percent).
- * This event is fired in the plugin-impl bundle, which depends on many
Cytoscape bundles.
- * Warning: There is no guarantee that this event is fired after all bundles
are start-up.
- */
-public final class CytoscapeStartEvent extends AbstractCyEvent<Object> {
-
- /**
- * Constructor.
- * @param source The object firing this event.
- */
- public CytoscapeStartEvent(final Object source) {
- super(source, CytoscapeStartListener.class);
- }
-}
Deleted:
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/events/CytoscapeStartListener.java
===================================================================
---
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/events/CytoscapeStartListener.java
2011-08-12 01:36:45 UTC (rev 26538)
+++
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/events/CytoscapeStartListener.java
2011-08-12 01:37:18 UTC (rev 26539)
@@ -1,16 +0,0 @@
-
-package org.cytoscape.application.swing.events;
-
-import org.cytoscape.event.CyListener;
-
-/**
- * The listener for the CytoscapeStartEvent.
- */
-public interface CytoscapeStartListener extends CyListener {
-
- /**
- * Process the specified event.
- * @param e The event being processed.
- */
- public void handleEvent(CytoscapeStartEvent e);
-}
--
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.
