You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2008/04/22 09:34:43 UTC
svn commit: r650400 - in /cayenne/main/trunk/framework/cayenne-modeler: ./
src/main/java/org/apache/cayenne/modeler/
src/main/java/org/apache/cayenne/modeler/util/
Author: aadamchik
Date: Tue Apr 22 00:34:37 2008
New Revision: 650400
URL: http://svn.apache.org/viewvc?rev=650400&view=rev
Log:
CAY-1026 Drop commons-lang dependency
Added:
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/OperatingSystem.java
Modified:
cayenne/main/trunk/framework/cayenne-modeler/pom.xml
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerFrame.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/BrowserControl.java
Modified: cayenne/main/trunk/framework/cayenne-modeler/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/pom.xml?rev=650400&r1=650399&r2=650400&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/pom.xml (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/pom.xml Tue Apr 22 00:34:37 2008
@@ -45,11 +45,6 @@
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
-
- <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerFrame.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerFrame.java?rev=650400&r1=650399&r2=650400&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerFrame.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerFrame.java Tue Apr 22 00:34:37 2008
@@ -80,8 +80,8 @@
import org.apache.cayenne.modeler.event.QueryDisplayEvent;
import org.apache.cayenne.modeler.event.QueryDisplayListener;
import org.apache.cayenne.modeler.util.CayenneAction;
+import org.apache.cayenne.modeler.util.OperatingSystem;
import org.apache.cayenne.modeler.util.RecentFileMenu;
-import org.apache.commons.lang.SystemUtils;
/**
* Main frame of CayenneModeler. Responsibilities include coordination of
@@ -120,7 +120,7 @@
JMenu toolMenu = new JMenu("Tools");
JMenu helpMenu = new JMenu("Help");
- if (!SystemUtils.IS_OS_MAC_OSX) {
+ if (OperatingSystem.getOS() != OperatingSystem.MAC_OS_X) {
fileMenu.setMnemonic(KeyEvent.VK_F);
projectMenu.setMnemonic(KeyEvent.VK_P);
toolMenu.setMnemonic(KeyEvent.VK_T);
@@ -143,7 +143,7 @@
fileMenu.add(recentFileMenu);
// Mac OS X doesn't use File->Exit, it uses CayenneModeler->Quit (command-Q)
- if (!SystemUtils.IS_OS_MAC_OSX) {
+ if (OperatingSystem.getOS() != OperatingSystem.MAC_OS_X) {
fileMenu.addSeparator();
fileMenu.add(getAction(ExitAction.getActionName()).buildMenu());
}
@@ -169,14 +169,15 @@
toolMenu.add(getAction(GenerateCodeAction.getActionName()).buildMenu());
toolMenu.add(getAction(GenerateDBAction.getActionName()).buildMenu());
toolMenu.add(getAction(MigrateAction.getActionName()).buildMenu());
+
// Mac OS X has it's own Preferences menu item under the application menu
- if (!SystemUtils.IS_OS_MAC_OSX) {
+ if (OperatingSystem.getOS() != OperatingSystem.MAC_OS_X) {
toolMenu.addSeparator();
toolMenu.add(getAction(ConfigurePreferencesAction.getActionName()).buildMenu());
}
// Mac OS X "About CayenneModeler" appears under the application menu, per Apple GUI standards
- if (!SystemUtils.IS_OS_MAC_OSX)
+ if (OperatingSystem.getOS() != OperatingSystem.MAC_OS_X)
helpMenu.add(getAction(AboutAction.getActionName()).buildMenu());
helpMenu.add(getAction(DocumentationAction.getActionName()).buildMenu());
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/BrowserControl.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/BrowserControl.java?rev=650400&r1=650399&r2=650400&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/BrowserControl.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/BrowserControl.java Tue Apr 22 00:34:37 2008
@@ -21,8 +21,6 @@
import java.lang.reflect.Method;
-import org.apache.commons.lang.SystemUtils;
-
/**
* Opens a URL in the system default browser.
*
@@ -50,12 +48,12 @@
// http://www.centerkey.com/java/browser/myapp/BareBonesBrowserLaunch.java
public static void displayURL(String url) {
try {
- if (SystemUtils.IS_OS_WINDOWS) {
+ if (OperatingSystem.getOS() == OperatingSystem.WINDOWS) {
// cmd = 'rundll32 url.dll,FileProtocolHandler http://...'
String cmd = WIN_PATH + " " + WIN_FLAG + " " + url;
Runtime.getRuntime().exec(cmd);
}
- else if (SystemUtils.IS_OS_MAC_OSX) {
+ else if (OperatingSystem.getOS() == OperatingSystem.MAC_OS_X) {
Class<?> fileManager = Class.forName("com.apple.eio.FileManager");
Method openURL = fileManager.getDeclaredMethod("openURL", new Class[] {String.class});
openURL.invoke(null, new Object[] {url});
Added: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/OperatingSystem.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/OperatingSystem.java?rev=650400&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/OperatingSystem.java (added)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/OperatingSystem.java Tue Apr 22 00:34:37 2008
@@ -0,0 +1,55 @@
+/*****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ ****************************************************************/
+package org.apache.cayenne.modeler.util;
+
+/**
+ * An enum that provides high-level information about the host OS.
+ *
+ * @author Andrus Adamchik
+ * @since 3.0
+ */
+public enum OperatingSystem {
+
+ MAC_OS_X, WINDOWS, OTHER;
+
+ private static final OperatingSystem os;
+
+ static {
+ String osName = System.getProperty("os.name");
+
+ if (osName == null) {
+ os = OTHER;
+ }
+ else {
+ if (osName.startsWith("Windows")) {
+ os = WINDOWS;
+ }
+ else if (osName.startsWith("Mac OS X")) {
+ os = MAC_OS_X;
+ }
+ else {
+ os = OTHER;
+ }
+ }
+ }
+
+ public static OperatingSystem getOS() {
+ return os;
+ }
+}