You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by ol...@apache.org on 2009/11/30 16:01:21 UTC
svn commit: r885440 - in /cayenne/main/trunk:
framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Main.java
modeler/cayenne-modeler-mac-ext/src/main/java/org/apache/cayenne/modeler/MacOSXMain.java
Author: oltka
Date: Mon Nov 30 15:01:20 2009
New Revision: 885440
URL: http://svn.apache.org/viewvc?rev=885440&view=rev
Log:
CAY-1314
* for MacOS
Modified:
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Main.java
cayenne/main/trunk/modeler/cayenne-modeler-mac-ext/src/main/java/org/apache/cayenne/modeler/MacOSXMain.java
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Main.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Main.java?rev=885440&r1=885439&r2=885440&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Main.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Main.java Mon Nov 30 15:01:20 2009
@@ -94,7 +94,9 @@
Preferences lastProjFilesPref = ModelerPreferences.getLastProjFilesPref();
Vector<String> arr = ModelerPreferences.getLastProjFiles();
- return new File((String) arr.get(0));
+ if(arr.size()>0){
+ return new File((String) arr.get(0));
+ }
}
return null;
}
Modified: cayenne/main/trunk/modeler/cayenne-modeler-mac-ext/src/main/java/org/apache/cayenne/modeler/MacOSXMain.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/modeler/cayenne-modeler-mac-ext/src/main/java/org/apache/cayenne/modeler/MacOSXMain.java?rev=885440&r1=885439&r2=885440&view=diff
==============================================================================
--- cayenne/main/trunk/modeler/cayenne-modeler-mac-ext/src/main/java/org/apache/cayenne/modeler/MacOSXMain.java (original)
+++ cayenne/main/trunk/modeler/cayenne-modeler-mac-ext/src/main/java/org/apache/cayenne/modeler/MacOSXMain.java Mon Nov 30 15:01:20 2009
@@ -68,10 +68,9 @@
}
protected String getLookAndFeelName() {
-
if (isMacOSX()) {
- ModelerPreferences prefs = ModelerPreferences.getPreferences();
- return prefs.getString(
+ Preferences prefs = ModelerPreferences.getEditorPreferences();
+ return prefs.get(
ModelerPreferences.EDITOR_LAFNAME,
MacOSXMain.DEFAULT_LAF_OSX_NAME);
}
@@ -81,8 +80,8 @@
protected String getThemeName() {
if (isMacOSX()) {
- ModelerPreferences prefs = ModelerPreferences.getPreferences();
- return prefs.getString(
+ Preferences prefs = ModelerPreferences.getEditorPreferences();
+ return prefs.get(
ModelerPreferences.EDITOR_THEMENAME,
MacOSXMain.DEFAULT_THEME_OSX_NAME);
}
@@ -90,4 +89,5 @@
return super.getThemeName();
}
}
+
}