mirror/Spark
3
0
Fork 0
mirror of https://github.com/igniterealtime/Spark.git synced 2025-12-01 12:27:58 +00:00
Code Issues Projects Releases Wiki Activity

fixed another bug with default look&feel

Browse Source 
git-svn-id: http://svn.igniterealtime.org/svn/repos/spark/trunk@12192 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
Wolf Posdorfer
2011-03-28 08:49:54 +00:00
committed by wolf.posdorfer
parent 955207904f
commit b1d7aae6cd
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/java/org/jivesoftware/Spark.java
View File

@ -213,7 +213,7 @@ public final class Spark {
private void loadLookAndFeel() { private void loadLookAndFeel() {
final LocalPreferences preferences = SettingsManager.getLocalPreferences(); final LocalPreferences preferences = SettingsManager.getLocalPreferences();
final String laf; final String laf;
if (preferences.getLookAndFeel().length() > 0 && !Default.getBoolean("LOOK_AND_FEEL_DISABLED")) { if (!Default.getBoolean("LOOK_AND_FEEL_DISABLED")) {
laf = preferences.getLookAndFeel(); laf = preferences.getLookAndFeel();
} else if (Default.getString(Default.DEFAULT_LOOK_AND_FEEL).length() > 0) { } else if (Default.getString(Default.DEFAULT_LOOK_AND_FEEL).length() > 0) {
laf = Default.getString(Default.DEFAULT_LOOK_AND_FEEL); laf = Default.getString(Default.DEFAULT_LOOK_AND_FEEL);

14
src/java/org/jivesoftware/sparkimpl/settings/local/LocalPreferences.java
View File

@ -21,6 +21,7 @@
package org.jivesoftware.sparkimpl.settings.local; package org.jivesoftware.sparkimpl.settings.local;
import org.jivesoftware.Spark; import org.jivesoftware.Spark;
import org.jivesoftware.resource.Default;
import org.jivesoftware.spark.SparkManager; import org.jivesoftware.spark.SparkManager;
import java.io.File; import java.io.File;
import java.util.Date; import java.util.Date;
@ -663,10 +664,15 @@ public class LocalPreferences {
setString("LookAndFeel",laf); setString("LookAndFeel",laf);
} }
public String getLookAndFeel() { public String getLookAndFeel() {
String defaultstring = UIManager.getSystemLookAndFeelClassName(); String defaultstring = "";
return getString("LookAndFeel", defaultstring); try {
} defaultstring = Default.getString("DEFAULT_LOOK_AND_FEEL");
} catch (Exception e) {
defaultstring = UIManager.getSystemLookAndFeelClassName();
}
return getString("LookAndFeel", defaultstring);
}
public void setCheckForBeta(boolean checkForBeta) { public void setCheckForBeta(boolean checkForBeta) {
setBoolean("checkForBeta", checkForBeta); setBoolean("checkForBeta", checkForBeta);