Author: jm
Date: 2012-01-09 12:06:54 -0800 (Mon, 09 Jan 2012)
New Revision: 27953
Modified:
core3/impl/trunk/swing-application-impl/pom.xml
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/CyActivator.java
Log:
References #559: Disabled OS X-specific code until we can find a cross platform
solution
Modified: core3/impl/trunk/swing-application-impl/pom.xml
===================================================================
--- core3/impl/trunk/swing-application-impl/pom.xml 2012-01-09 19:01:13 UTC
(rev 27952)
+++ core3/impl/trunk/swing-application-impl/pom.xml 2012-01-09 20:06:54 UTC
(rev 27953)
@@ -128,11 +128,14 @@
<version>1.0</version>
</dependency>
+ <!-- Temporarily disabled: See ticket #559 -->
+ <!--
<dependency>
<groupId>com.apple.developer</groupId>
<artifactId>AppleJavaExtensions</artifactId>
<version>1.6</version>
<scope>compile</scope>
</dependency>
+ -->
</dependencies>
</project>
Modified:
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/CyActivator.java
===================================================================
---
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/CyActivator.java
2012-01-09 19:01:13 UTC (rev 27952)
+++
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/CyActivator.java
2012-01-09 20:06:54 UTC (rev 27953)
@@ -126,13 +126,6 @@
import org.cytoscape.work.swing.undo.SwingUndoSupport;
import org.osgi.framework.BundleContext;
-import com.apple.eawt.AboutHandler;
-import com.apple.eawt.AppEvent.AboutEvent;
-import com.apple.eawt.AppEvent.QuitEvent;
-import com.apple.eawt.Application;
-import com.apple.eawt.QuitHandler;
-import com.apple.eawt.QuitResponse;
-
/**
*
*/
@@ -299,11 +292,12 @@
registerService(bc, cytoPanelEastAction, CyAction.class, new
Properties());
registerService(bc, cytoPanelSouthWestAction, CyAction.class,
new Properties());
- if (isMac()) {
- registerMacMenuHandlers(cytoscapeShutdownServiceRef,
submenuTaskManagerServiceRef, aboutDialogFactory);
- } else {
+ // Temporarily disabled: See ticket #559
+// if (isMac()) {
+// registerMacMenuHandlers(cytoscapeShutdownServiceRef,
submenuTaskManagerServiceRef, aboutDialogFactory);
+// } else {
registerService(bc, exitAction, CyAction.class, new
Properties());
- }
+// }
Properties helpContentsTaskFactoryProps = new Properties();
helpContentsTaskFactoryProps.setProperty("preferredMenu",
"Help");
@@ -412,6 +406,8 @@
}
private void registerMacMenuHandlers(final CyShutdown shutdown, final
TaskManager<?, ?> taskManager, final TaskFactory aboutTaskFactory) {
+ // Temporarily disabled: See ticket #559
+ /*
Application application = Application.getApplication();
application.setQuitHandler(new QuitHandler() {
@Override
@@ -425,6 +421,7 @@
taskManager.execute(aboutTaskFactory);
}
});
+ */
}
private boolean isMac() {
--
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.
