From: <ez...@us...> - 2012-10-13 23:02:22
|
Revision: 22368 http://jedit.svn.sourceforge.net/jedit/?rev=22368&view=rev Author: ezust Date: 2012-10-13 23:02:16 +0000 (Sat, 13 Oct 2012) Log Message: ----------- Merge req# 3572848: correctly determine whether Look and Feel did change Modified Paths: -------------- jEdit/branches/5.0.x/doc/CHANGES.txt jEdit/branches/5.0.x/org/gjt/sp/jedit/jEdit.java Property Changed: ---------------- jEdit/branches/5.0.x/ Property changes on: jEdit/branches/5.0.x ___________________________________________________________________ Modified: svn:mergeinfo - /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:21791-21792,21800-21801,21816,21880,21917,21933,21965-21966,21974,21981,21998-22000,22055,22077,22085-22086,22088,22108,22169,22192,22230-22231,22264,22273,22276,22361,22363-22364 + /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:21791-21792,21800-21801,21816,21880,21917,21933,21965-21966,21974,21981,21998-22000,22055,22077,22085-22086,22088,22108,22169,22192,22230-22231,22264,22272-22273,22276,22361,22363-22364 Modified: jEdit/branches/5.0.x/doc/CHANGES.txt =================================================================== --- jEdit/branches/5.0.x/doc/CHANGES.txt 2012-10-13 22:25:04 UTC (rev 22367) +++ jEdit/branches/5.0.x/doc/CHANGES.txt 2012-10-13 23:02:16 UTC (rev 22368) @@ -5,12 +5,11 @@ {{{ Version 5.0pre2 Thanks to Jarek Czekalski, Eric Le Lay, Matthieu Casanova, Tom Power, Malathi, -Thomas Meyer, Vladimir Avondin, and Alan Ezust for contributing to this release. +Thomas Meyer, Vladimir Avondin, Björn "Vampire" Kautler, and Alan Ezust for +contributing to this release. {{{ Bug fixes -- Fix broken keymap properties (Björn "Vampire" Kautler) - - Fixed a number of scrollbar bugs related to undo, multiline cut, soft-wrap, and folding. (Patch#3567959, Bugs #2832769, #2998294, and #3193168 - Thomas Meyer) @@ -24,16 +23,13 @@ - Fixed the StandaloneTextArea that cannot load keymaps (#3562023 Matthieu Casanova) -- The .jedit/modes/catalog is now written using UTF-8 instead of default - OS encoding (#3560800 Matthieu Casanova) - - Fix a case where a NPE occurs when removing a plugin (#3557441 Matthieu Casanova) - Recognizing "Extra word characters" in "Whole word" option in searches (bug #3522497, patch #3543524 Malathi) -- The macro Display_Abbreviations is broken (#3539691 Matthieu Casanova) +- The macro Display_Abbreviations was broken (#3539691 Matthieu Casanova) - Fix pressing return in parent files of the VFS browser that do not browse the selected folder as it should (patch #3543499 by Eric Le Lay) @@ -46,13 +42,25 @@ }}} {{{ UI +- Fix broken keymap properties (Björn "Vampire" Kautler) + - Added russian localization (patch #3544154 Vladimir Avdonin) }}} +{{{ Miscellaneous +- Correctly determine whether Look and Feel did change to not touch it if it + stays the same as this might cause delays and Exceptions. + (Björn "Vampire" Kautler) + +- The .jedit/modes/catalog is now written using UTF-8 instead of default + OS encoding (#3560800 Matthieu Casanova) + }}} +}}} + {{{ Version 5.0pre1 Thanks to Björn "Vampire" Kautler, Nathan Gray, Evan Wright, Alan Ezust, Dale Modified: jEdit/branches/5.0.x/org/gjt/sp/jedit/jEdit.java =================================================================== --- jEdit/branches/5.0.x/org/gjt/sp/jedit/jEdit.java 2012-10-13 22:25:04 UTC (rev 22367) +++ jEdit/branches/5.0.x/org/gjt/sp/jedit/jEdit.java 2012-10-13 23:02:16 UTC (rev 22368) @@ -34,6 +34,9 @@ import org.gjt.sp.jedit.View.ViewConfig; import org.gjt.sp.jedit.bsh.UtilEvalError; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import javax.swing.*; import java.awt.event.*; import java.io.*; @@ -3709,10 +3712,12 @@ if (lfOld != null) sLfOld = lfOld.getClass().getName(); - if (isStartupDone() && sLfOld != null && sLfOld.equals(lf)) + // do not change anything if Look and Feel did not change + if (isStartupDone() && getPLAFClassName(lf).equals(sLfOld)) { return; } + Font primaryFont = jEdit.getFontProperty( "metal.primary.font"); if(primaryFont != null) @@ -3755,18 +3760,7 @@ try { - if(lf != null && lf.length() != 0) - UIManager.setLookAndFeel(lf); - else if(OperatingSystem.isMacOS()) - { - UIManager.setLookAndFeel(UIManager - .getSystemLookAndFeelClassName()); - } - else - { - UIManager.setLookAndFeel(UIManager - .getCrossPlatformLookAndFeelClassName()); - } + UIManager.setLookAndFeel(getPLAFClassName(lf)); } catch(Exception e) { @@ -3859,6 +3853,23 @@ } //}}} + @Nonnull + private static String getPLAFClassName(@Nullable String lf) + { + if (lf != null && lf.length() != 0) + { + return lf; + } + else if(OperatingSystem.isMacOS()) + { + return UIManager.getSystemLookAndFeelClassName(); + } + else + { + return UIManager.getCrossPlatformLookAndFeelClassName(); + } + } + //{{{ getNextUntitledBufferId() method public static int getNextUntitledBufferId() { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |