eliminated old com.apple.eawt.FullScreenUtilities.setWindowCanFullScreen: appears to be unnecessary on newer versions of Mac OS X;
authorwenzelm
Wed, 08 May 2019 18:53:27 +0200
changeset 70247 3e45a3cf1059
parent 70246 7c55ea37fbf7
child 70248 edd3b2e06f90
eliminated old com.apple.eawt.FullScreenUtilities.setWindowCanFullScreen: appears to be unnecessary on newer versions of Mac OS X;
Admin/components/components.sha1
Admin/components/main
src/Doc/JEdit/JEdit.thy
src/Tools/jEdit/patches/macosx
--- a/Admin/components/components.sha1	Wed May 08 16:54:50 2019 +0200
+++ b/Admin/components/components.sha1	Wed May 08 18:53:27 2019 +0200
@@ -156,6 +156,7 @@
 536a38ed527115b4bf2545a2137ec57b6ffad718  jedit_build-20190120.tar.gz
 58b9f03e5ec0b85f8123c31f5d8092dae5803773  jedit_build-20190130.tar.gz
 ec0aded5f2655e2de8bc4427106729e797584f2f  jedit_build-20190224.tar.gz
+1e53598a02ec8d8736b15f480cbe2c84767a7827  jedit_build-20190508.tar.gz
 0bd2bc2d9a491ba5fc8dd99df27c04f11a72e8fa  jfreechart-1.0.14-1.tar.gz
 8122526f1fc362ddae1a328bdbc2152853186fee  jfreechart-1.0.14.tar.gz
 d911f63a5c9b4c7335bb73f805cb1711ce017a84  jfreechart-1.5.0.tar.gz
--- a/Admin/components/main	Wed May 08 16:54:50 2019 +0200
+++ b/Admin/components/main	Wed May 08 18:53:27 2019 +0200
@@ -6,7 +6,7 @@
 e-2.0-2
 isabelle_fonts-20190409
 jdk-11.0.3+7
-jedit_build-20190224
+jedit_build-20190508
 jfreechart-1.5.0
 jortho-1.0-2
 kodkodi-1.5.2-1
--- a/src/Doc/JEdit/JEdit.thy	Wed May 08 16:54:50 2019 +0200
+++ b/src/Doc/JEdit/JEdit.thy	Wed May 08 18:53:27 2019 +0200
@@ -2131,20 +2131,6 @@
 
   \<^bold>\<open>Workaround:\<close> Rebind keys via \<^emph>\<open>Global Options~/ Shortcuts\<close>.
 
-  \<^item> \<^bold>\<open>Problem:\<close> Application startup on Mac OS X emits warnings like as follows:
-{\def\isastylett{\footnotesize\normalfont\ttfamily}
-  @{verbatim [display]
-\<open>WARNING: An illegal reflective access operation has occurred
-WARNING: Illegal reflective access by macosx.MacOSXPlugin to method
-  com.apple.eawt.FullScreenUtilities.setWindowCanFullScreen(java.awt.Window,boolean)
-WARNING: Please consider reporting this to the maintainers of macosx.MacOSXPlugin
-WARNING: Use --illegal-access=warn to enable warnings of further illegal reflective access operations
-WARNING: All illegal access operations will be denied in a future release\<close>}}
-
-  \<^bold>\<open>Workaround:\<close> Ignore these warnings. They merely stem from a private
-  operation provided by Apple that still lacks a public counterpart in
-  OpenJDK 11.
-
   \<^item> \<^bold>\<open>Problem:\<close> The Mac OS X key sequence \<^verbatim>\<open>COMMAND+COMMA\<close> for application
   \<^emph>\<open>Preferences\<close> is in conflict with the jEdit default keyboard shortcut for
   \<^emph>\<open>Incremental Search Bar\<close> (action @{action_ref "quick-search"}).
--- a/src/Tools/jEdit/patches/macosx	Wed May 08 16:54:50 2019 +0200
+++ b/src/Tools/jEdit/patches/macosx	Wed May 08 18:53:27 2019 +0200
@@ -1,6 +1,6 @@
 diff -ru MacOSX-trunk-r24891/build.properties MacOSX-trunk/build.properties
---- MacOSX-trunk-r24891/build.properties	2018-10-20 11:45:32.632681780 +0200
-+++ MacOSX-trunk/build.properties	2018-10-20 13:11:21.039870008 +0200
+--- MacOSX-trunk-r24891/build.properties	2018-10-20 11:45:32.000000000 +0200
++++ MacOSX-trunk/build.properties	2019-05-08 17:07:07.001576716 +0200
 @@ -1,3 +1,6 @@
  build.support=../build-support-trunk
  jedit.install.dir=../jedit-trunk/build
@@ -10,7 +10,7 @@
 +compiler.extdirs=
 diff -ru MacOSX-trunk-r24891/CHANGES.txt MacOSX-trunk/CHANGES.txt
 --- MacOSX-trunk-r24891/CHANGES.txt	2013-09-24 01:12:13.000000000 +0200
-+++ MacOSX-trunk/CHANGES.txt	2018-10-20 15:28:20.068978715 +0200
++++ MacOSX-trunk/CHANGES.txt	2019-05-08 17:07:07.001576716 +0200
 @@ -1,3 +1,6 @@
 +Mac OS X Plugin 1.4 [Makarius]
 +- Updates for Java 9: use java.awt.Desktop instead of old com.apple.eawt.Application / OSXAdapter.
@@ -20,7 +20,7 @@
  - Got rid of alternative dispatcher stuff which was workaround for Java 5 bugs.
 diff -ru MacOSX-trunk-r24891/docs/MacOSX.html MacOSX-trunk/docs/MacOSX.html
 --- MacOSX-trunk-r24891/docs/MacOSX.html	2013-09-19 19:42:51.000000000 +0200
-+++ MacOSX-trunk/docs/MacOSX.html	2018-10-20 15:09:33.726059959 +0200
++++ MacOSX-trunk/docs/MacOSX.html	2019-05-08 17:07:07.001576716 +0200
 @@ -16,8 +16,8 @@
      <td valign="TOP"><strong><font size="+2">jEdit Mac OS X Plugin</font></strong></td>
      <td valign="TOP" align="RIGHT">
@@ -34,7 +34,7 @@
      </td>
 diff -ru MacOSX-trunk-r24891/macosx/MacOSXPlugin.java MacOSX-trunk/macosx/MacOSXPlugin.java
 --- MacOSX-trunk-r24891/macosx/MacOSXPlugin.java	2013-09-20 02:51:27.000000000 +0200
-+++ MacOSX-trunk/macosx/MacOSXPlugin.java	2018-10-20 13:33:25.272004064 +0200
++++ MacOSX-trunk/macosx/MacOSXPlugin.java	2019-05-08 17:25:14.905716526 +0200
 @@ -25,6 +25,7 @@
  //{{{ Imports
  import java.awt.event.InputEvent;
@@ -123,10 +123,58 @@
  		}
  		
  	}
+@@ -198,9 +193,6 @@
+ 		{
+ 			ViewUpdate msg = (ViewUpdate)message;
+ 			refreshProxyIcon(msg.getView());
+-			
+-			if (msg.getWhat() == ViewUpdate.CREATED)
+-				enableFullScreenMode(msg.getView());
+ 		}
+ 		else if(message instanceof EditPaneUpdate)
+ 		{
+@@ -312,26 +304,6 @@
+ 		return jEdit.getBooleanProperty("plugin.MacOSXPlugin.disableOption");
+ 	}
+ 	
+-	public void enableFullScreenMode(View view)
+-	{
+-		if (fullScreenFailed)
+-			return;
+-		
+-		try
+-		{
+-			// FullScreenUtilities.setWindowCanFullScreen(view, true);
+-			Class<?> Util = Class.forName("com.apple.eawt.FullScreenUtilities");
+-			Class arguments[] = new Class[] { java.awt.Window.class, Boolean.TYPE };
+-			Method setWindowCanFullScreen = Util.getMethod("setWindowCanFullScreen", arguments);
+-			setWindowCanFullScreen.invoke(Util, view, true);
+-		}
+-		catch (Exception e)
+-		{
+-			Log.log(Log.DEBUG, this, "Unable to enable OS X native full screen mode: " + e);
+-			fullScreenFailed = true;
+-		}
+-	}
+-
+ 	//{{{ osok() method
+ 	private boolean osok()
+ 	{	
+@@ -344,10 +316,4 @@
+ 
+ 		return true;
+ 	}//}}}
+-
+-	//{{{ Instance variables
+-	
+-	// If unable to enable full screen mode (e.g., running on OSX 10.6 or earlier), don't keep trying
+-	private boolean fullScreenFailed = false;
+-	//}}}
+ }
 Only in MacOSX-trunk-r24891/macosx: OSXAdapter.java
 diff -ru MacOSX-trunk-r24891/MacOSX.props MacOSX-trunk/MacOSX.props
 --- MacOSX-trunk-r24891/MacOSX.props	2013-09-24 01:12:13.000000000 +0200
-+++ MacOSX-trunk/MacOSX.props	2018-10-20 15:20:44.362204710 +0200
++++ MacOSX-trunk/MacOSX.props	2019-05-08 17:07:07.001576716 +0200
 @@ -5,8 +5,8 @@
  # Plugin info
  #