You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by gr...@apache.org on 2014/09/04 00:11:40 UTC
[45/52] [abbrv] git commit: Change to allow Launcher to compile with
AppleJavaExtensions v1.4
Change to allow Launcher to compile with AppleJavaExtensions v1.4
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/ac68da74
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/ac68da74
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/ac68da74
Branch: refs/heads/two-dot-o-push-notifications
Commit: ac68da74f1146698a2099b0e68b13bf64913dc0d
Parents: e433064
Author: Dave Johnson <sn...@apache.org>
Authored: Wed Sep 3 08:49:28 2014 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Wed Sep 3 08:49:28 2014 -0400
----------------------------------------------------------------------
.../apache/usergrid/launcher/AppleUtils.java | 21 +++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/ac68da74/stack/launcher/src/main/java/org/apache/usergrid/launcher/AppleUtils.java
----------------------------------------------------------------------
diff --git a/stack/launcher/src/main/java/org/apache/usergrid/launcher/AppleUtils.java b/stack/launcher/src/main/java/org/apache/usergrid/launcher/AppleUtils.java
index bea8104..a09b720 100644
--- a/stack/launcher/src/main/java/org/apache/usergrid/launcher/AppleUtils.java
+++ b/stack/launcher/src/main/java/org/apache/usergrid/launcher/AppleUtils.java
@@ -18,7 +18,7 @@ package org.apache.usergrid.launcher;
import javax.swing.ImageIcon;
-import javax.swing.JOptionPane;
+//import javax.swing.JOptionPane;
public class AppleUtils {
@@ -27,13 +27,16 @@ public class AppleUtils {
com.apple.eawt.Application macApp = com.apple.eawt.Application.getApplication();
macApp.setDockIconImage( new ImageIcon( App.class.getResource( "dock_icon.png" ) ).getImage() );
- macApp.setAboutHandler( new com.apple.eawt.AboutHandler() {
- @Override
- public void handleAbout( com.apple.eawt.AppEvent.AboutEvent evt ) {
- JOptionPane.showMessageDialog( null,
- "Apache Usergrid Standalone Server Launcher\nApache Software Foundation",
- "About Apache Usergrid Launcher", JOptionPane.INFORMATION_MESSAGE );
- }
- } );
+ // commented out to allow launcher to compile with the old AppleJavaExcentions 1.4
+ // (because that is the newest version available via Maven)
+
+// macApp.setAboutHandler( new com.apple.eawt.AboutHandler() {
+// @Override
+// public void handleAbout( com.apple.eawt.AppEvent.AboutEvent evt ) {
+// JOptionPane.showMessageDialog( null,
+// "Apache Usergrid Standalone Server Launcher\nApache Software Foundation",
+// "About Apache Usergrid Launcher", JOptionPane.INFORMATION_MESSAGE );
+// }
+// } );
}
}