1 diff -ru MacOSX-trunk-r24891/build.properties MacOSX-trunk/build.properties |
1 diff -ru MacOSX-trunk-r24891/build.properties MacOSX-trunk/build.properties |
2 --- MacOSX-trunk-r24891/build.properties 2018-10-20 11:45:32.632681780 +0200 |
2 --- MacOSX-trunk-r24891/build.properties 2018-10-20 11:45:32.000000000 +0200 |
3 +++ MacOSX-trunk/build.properties 2018-10-20 13:11:21.039870008 +0200 |
3 +++ MacOSX-trunk/build.properties 2019-05-08 17:07:07.001576716 +0200 |
4 @@ -1,3 +1,6 @@ |
4 @@ -1,3 +1,6 @@ |
5 build.support=../build-support-trunk |
5 build.support=../build-support-trunk |
6 jedit.install.dir=../jedit-trunk/build |
6 jedit.install.dir=../jedit-trunk/build |
7 install.dir=${jedit.install.dir}/jars |
7 install.dir=${jedit.install.dir}/jars |
8 +compiler.target=1.9 |
8 +compiler.target=1.9 |
9 +compiler.source=1.9 |
9 +compiler.source=1.9 |
10 +compiler.extdirs= |
10 +compiler.extdirs= |
11 diff -ru MacOSX-trunk-r24891/CHANGES.txt MacOSX-trunk/CHANGES.txt |
11 diff -ru MacOSX-trunk-r24891/CHANGES.txt MacOSX-trunk/CHANGES.txt |
12 --- MacOSX-trunk-r24891/CHANGES.txt 2013-09-24 01:12:13.000000000 +0200 |
12 --- MacOSX-trunk-r24891/CHANGES.txt 2013-09-24 01:12:13.000000000 +0200 |
13 +++ MacOSX-trunk/CHANGES.txt 2018-10-20 15:28:20.068978715 +0200 |
13 +++ MacOSX-trunk/CHANGES.txt 2019-05-08 17:07:07.001576716 +0200 |
14 @@ -1,3 +1,6 @@ |
14 @@ -1,3 +1,6 @@ |
15 +Mac OS X Plugin 1.4 [Makarius] |
15 +Mac OS X Plugin 1.4 [Makarius] |
16 +- Updates for Java 9: use java.awt.Desktop instead of old com.apple.eawt.Application / OSXAdapter. |
16 +- Updates for Java 9: use java.awt.Desktop instead of old com.apple.eawt.Application / OSXAdapter. |
17 + |
17 + |
18 Mac OS X Plugin 1.3 [Alan Ezust] |
18 Mac OS X Plugin 1.3 [Alan Ezust] |
19 - Updates for Java 7 and jEdit 5.2 |
19 - Updates for Java 7 and jEdit 5.2 |
20 - Got rid of alternative dispatcher stuff which was workaround for Java 5 bugs. |
20 - Got rid of alternative dispatcher stuff which was workaround for Java 5 bugs. |
21 diff -ru MacOSX-trunk-r24891/docs/MacOSX.html MacOSX-trunk/docs/MacOSX.html |
21 diff -ru MacOSX-trunk-r24891/docs/MacOSX.html MacOSX-trunk/docs/MacOSX.html |
22 --- MacOSX-trunk-r24891/docs/MacOSX.html 2013-09-19 19:42:51.000000000 +0200 |
22 --- MacOSX-trunk-r24891/docs/MacOSX.html 2013-09-19 19:42:51.000000000 +0200 |
23 +++ MacOSX-trunk/docs/MacOSX.html 2018-10-20 15:09:33.726059959 +0200 |
23 +++ MacOSX-trunk/docs/MacOSX.html 2019-05-08 17:07:07.001576716 +0200 |
24 @@ -16,8 +16,8 @@ |
24 @@ -16,8 +16,8 @@ |
25 <td valign="TOP"><strong><font size="+2">jEdit Mac OS X Plugin</font></strong></td> |
25 <td valign="TOP"><strong><font size="+2">jEdit Mac OS X Plugin</font></strong></td> |
26 <td valign="TOP" align="RIGHT"> |
26 <td valign="TOP" align="RIGHT"> |
27 <font size="-1"> |
27 <font size="-1"> |
28 - <strong>Version 1.3 </strong> |
28 - <strong>Version 1.3 </strong> |
32 <br/> $Date: 2013-09-19 17:42:51 +0000 (Thu, 19 Sep 2013) $ |
32 <br/> $Date: 2013-09-19 17:42:51 +0000 (Thu, 19 Sep 2013) $ |
33 </font> |
33 </font> |
34 </td> |
34 </td> |
35 diff -ru MacOSX-trunk-r24891/macosx/MacOSXPlugin.java MacOSX-trunk/macosx/MacOSXPlugin.java |
35 diff -ru MacOSX-trunk-r24891/macosx/MacOSXPlugin.java MacOSX-trunk/macosx/MacOSXPlugin.java |
36 --- MacOSX-trunk-r24891/macosx/MacOSXPlugin.java 2013-09-20 02:51:27.000000000 +0200 |
36 --- MacOSX-trunk-r24891/macosx/MacOSXPlugin.java 2013-09-20 02:51:27.000000000 +0200 |
37 +++ MacOSX-trunk/macosx/MacOSXPlugin.java 2018-10-20 13:33:25.272004064 +0200 |
37 +++ MacOSX-trunk/macosx/MacOSXPlugin.java 2019-05-08 17:25:14.905716526 +0200 |
38 @@ -25,6 +25,7 @@ |
38 @@ -25,6 +25,7 @@ |
39 //{{{ Imports |
39 //{{{ Imports |
40 import java.awt.event.InputEvent; |
40 import java.awt.event.InputEvent; |
41 |
41 |
42 +import java.awt.Desktop; |
42 +import java.awt.Desktop; |
121 - Log.log(Log.ERROR, this, "Cannot open non-existing file: " + filepath); |
121 - Log.log(Log.ERROR, this, "Cannot open non-existing file: " + filepath); |
122 + Log.log(Log.ERROR, this, "Cannot open non-existing file: " + file.getPath()); |
122 + Log.log(Log.ERROR, this, "Cannot open non-existing file: " + file.getPath()); |
123 } |
123 } |
124 |
124 |
125 } |
125 } |
|
126 @@ -198,9 +193,6 @@ |
|
127 { |
|
128 ViewUpdate msg = (ViewUpdate)message; |
|
129 refreshProxyIcon(msg.getView()); |
|
130 - |
|
131 - if (msg.getWhat() == ViewUpdate.CREATED) |
|
132 - enableFullScreenMode(msg.getView()); |
|
133 } |
|
134 else if(message instanceof EditPaneUpdate) |
|
135 { |
|
136 @@ -312,26 +304,6 @@ |
|
137 return jEdit.getBooleanProperty("plugin.MacOSXPlugin.disableOption"); |
|
138 } |
|
139 |
|
140 - public void enableFullScreenMode(View view) |
|
141 - { |
|
142 - if (fullScreenFailed) |
|
143 - return; |
|
144 - |
|
145 - try |
|
146 - { |
|
147 - // FullScreenUtilities.setWindowCanFullScreen(view, true); |
|
148 - Class<?> Util = Class.forName("com.apple.eawt.FullScreenUtilities"); |
|
149 - Class arguments[] = new Class[] { java.awt.Window.class, Boolean.TYPE }; |
|
150 - Method setWindowCanFullScreen = Util.getMethod("setWindowCanFullScreen", arguments); |
|
151 - setWindowCanFullScreen.invoke(Util, view, true); |
|
152 - } |
|
153 - catch (Exception e) |
|
154 - { |
|
155 - Log.log(Log.DEBUG, this, "Unable to enable OS X native full screen mode: " + e); |
|
156 - fullScreenFailed = true; |
|
157 - } |
|
158 - } |
|
159 - |
|
160 //{{{ osok() method |
|
161 private boolean osok() |
|
162 { |
|
163 @@ -344,10 +316,4 @@ |
|
164 |
|
165 return true; |
|
166 }//}}} |
|
167 - |
|
168 - //{{{ Instance variables |
|
169 - |
|
170 - // If unable to enable full screen mode (e.g., running on OSX 10.6 or earlier), don't keep trying |
|
171 - private boolean fullScreenFailed = false; |
|
172 - //}}} |
|
173 } |
126 Only in MacOSX-trunk-r24891/macosx: OSXAdapter.java |
174 Only in MacOSX-trunk-r24891/macosx: OSXAdapter.java |
127 diff -ru MacOSX-trunk-r24891/MacOSX.props MacOSX-trunk/MacOSX.props |
175 diff -ru MacOSX-trunk-r24891/MacOSX.props MacOSX-trunk/MacOSX.props |
128 --- MacOSX-trunk-r24891/MacOSX.props 2013-09-24 01:12:13.000000000 +0200 |
176 --- MacOSX-trunk-r24891/MacOSX.props 2013-09-24 01:12:13.000000000 +0200 |
129 +++ MacOSX-trunk/MacOSX.props 2018-10-20 15:20:44.362204710 +0200 |
177 +++ MacOSX-trunk/MacOSX.props 2019-05-08 17:07:07.001576716 +0200 |
130 @@ -5,8 +5,8 @@ |
178 @@ -5,8 +5,8 @@ |
131 # Plugin info |
179 # Plugin info |
132 # |
180 # |
133 plugin.macosx.MacOSXPlugin.name=Mac OS X Support |
181 plugin.macosx.MacOSXPlugin.name=Mac OS X Support |
134 -plugin.macosx.MacOSXPlugin.author=Seph Soliman, Alan Ezust |
182 -plugin.macosx.MacOSXPlugin.author=Seph Soliman, Alan Ezust |