From: <ez...@us...> - 2013-09-18 18:57:03
|
Revision: 23180 http://jedit.svn.sourceforge.net/jedit/?rev=23180&view=rev Author: ezust Date: 2013-09-18 18:56:56 +0000 (Wed, 18 Sep 2013) Log Message: ----------- updates for JDK 1.7 Modified Paths: -------------- plugins/MacOSX/trunk/MacOSX.props plugins/MacOSX/trunk/macosx/MacOSXPlugin.java plugins/MacOSX/trunk/macosx/MacOSXPluginOptionPane.java Modified: plugins/MacOSX/trunk/MacOSX.props =================================================================== --- plugins/MacOSX/trunk/MacOSX.props 2013-09-17 21:46:33 UTC (rev 23179) +++ plugins/MacOSX/trunk/MacOSX.props 2013-09-18 18:56:56 UTC (rev 23180) @@ -8,7 +8,7 @@ # plugin.macosx.MacOSXPlugin.name=Mac OS X Support plugin.macosx.MacOSXPlugin.author=Seph Soliman -plugin.macosx.MacOSXPlugin.version=1.2 +plugin.macosx.MacOSXPlugin.version=1.3 plugin.macosx.MacOSXPlugin.docs=docs/MacOSX.html plugin.macosx.MacOSXPlugin.description=Provides better MacOS X integration through features such as better CMD-key mapping, drag-and-drop from Finder and more. plugin.macosx.MacOSXPlugin.longdescription=description.html @@ -16,8 +16,8 @@ # # Dependencies # -plugin.macosx.MacOSXPlugin.depend.0=jedit 04.04.99.02 -plugin.macosx.MacOSXPlugin.depend.1=jdk 1.5.0 +plugin.macosx.MacOSXPlugin.depend.0=jedit 05.02.01.00 +plugin.macosx.MacOSXPlugin.depend.1=jdk 1.7 MacOSXPlugin.depend.os.name=Mac OS X MacOSXPlugin.depend.mrj.version=99 Modified: plugins/MacOSX/trunk/macosx/MacOSXPlugin.java =================================================================== --- plugins/MacOSX/trunk/macosx/MacOSXPlugin.java 2013-09-17 21:46:33 UTC (rev 23179) +++ plugins/MacOSX/trunk/macosx/MacOSXPlugin.java 2013-09-18 18:56:56 UTC (rev 23180) @@ -297,19 +297,12 @@ public static void setDisableOption(boolean state) { jEdit.setBooleanProperty("plugin.MacOSXPlugin.disableOption", state); - Debug.ALT_KEY_PRESSED_DISABLED = state; } public static boolean getDisableOption() { // This is a public variable, so it can be changed at any time - boolean state = Debug.ALT_KEY_PRESSED_DISABLED; - if (jEdit.getBooleanProperty("plugin.MacOSXPlugin.disableOption") != state) - { - jEdit.setBooleanProperty("plugin.MacOSXPlugin.disableOption", state); - } - - return state; + return jEdit.getBooleanProperty("plugin.MacOSXPlugin.disableOption"); } public void enableFullScreenMode(View view) Modified: plugins/MacOSX/trunk/macosx/MacOSXPluginOptionPane.java =================================================================== --- plugins/MacOSX/trunk/macosx/MacOSXPluginOptionPane.java 2013-09-17 21:46:33 UTC (rev 23179) +++ plugins/MacOSX/trunk/macosx/MacOSXPluginOptionPane.java 2013-09-18 18:56:56 UTC (rev 23180) @@ -34,7 +34,7 @@ { public MacOSXPluginOptionPane() { - super("macosx"); + super("MacOSXPlugin"); } //{{{ _init() method @@ -55,7 +55,7 @@ altDispatcher = new JCheckBox(jEdit.getProperty( "options.MacOSXPlugin.altDispatcher")); altDispatcher.setSelected(MacOSXPlugin.getAlternativeDispatcher()); - addComponent(altDispatcher); + // addComponent(altDispatcher); disableOption = new JCheckBox(jEdit.getProperty( "options.MacOSXPlugin.disableOption")); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |