1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
|
Author: Andreas Tille <tille@debian.org>
Last-Update: Tue, 11 Oct 2016 20:08:16 +0200
Description: We are not building for Apple
--- a/src/jloda/gui/AppleStuff.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/**
- * AppleStuff.java
- * Copyright (C) 2016 Daniel H. Huson
- *
- * (Some files contain contributions from other authors, who are then mentioned separately.)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-package jloda.gui;
-
-
-import com.apple.eawt.*;
-
-import javax.swing.*;
-
-/**
- * Apple specific stuff
- * Daniel Huson, 3.2014
- */
-public class AppleStuff {
- static private AppleStuff instance;
- private final Application application;
- private boolean isQuitDefined;
- private boolean isAboutDefined;
- private boolean isPreferencesDefined;
-
- /**
- * constructor
- */
- private AppleStuff() {
- application = Application.getApplication();
- }
-
- /**
- * get instance
- *
- * @return instance
- */
- public static AppleStuff getInstance() {
- if (instance == null)
- instance = new AppleStuff();
- return instance;
- }
-
- /**
- * sets the quit action
- *
- * @param action
- */
- public void setQuitAction(final Action action) {
- isQuitDefined = true;
- application.setQuitHandler(new QuitHandler() {
- @Override
- public void handleQuitRequestWith(AppEvent.QuitEvent quitEvent, QuitResponse quitResponse) {
- action.actionPerformed(null);
- quitResponse.cancelQuit();
- }
- });
- }
-
- /**
- * set the about action
- *
- * @param action
- */
- public void setAboutAction(final Action action) {
- isAboutDefined = true;
- application.setAboutHandler(new AboutHandler() {
- @Override
- public void handleAbout(AppEvent.AboutEvent aboutEvent) {
- action.actionPerformed(null);
- }
- });
- }
-
- public void setPreferencesAction(final Action action) {
- isPreferencesDefined = true;
- application.setPreferencesHandler(new PreferencesHandler() {
- @Override
- public void handlePreferences(AppEvent.PreferencesEvent preferencesEvent) {
- action.actionPerformed(null);
- }
- });
- }
-
- public boolean isQuitDefined() {
- return isQuitDefined;
- }
-
- public boolean isAboutDefined() {
- return isAboutDefined;
- }
-
- public boolean isPreferencesDefined() {
- return isPreferencesDefined;
- }
-
-}
--- a/src/jloda/gui/commands/MenuCreator.java
+++ b/src/jloda/gui/commands/MenuCreator.java
@@ -19,7 +19,6 @@
*/
package jloda.gui.commands;
-import jloda.gui.AppleStuff;
import jloda.gui.IMenuModifier;
import jloda.util.MenuMnemonics;
import jloda.util.ProgramProperties;
@@ -146,7 +145,7 @@ public class MenuCreator {
switch (label) {
case "Quit": {
final Action action = createAction(command);
- AppleStuff.getInstance().setQuitAction(action);
+ /* AppleStuff.getInstance().setQuitAction(action); */
if (menu.getItemCount() > 0 && menu.getItem(menu.getItemCount() - 1) == null) {
skipNextSeparator = true;
}
@@ -156,7 +155,7 @@ public class MenuCreator {
case "About":
case "About...": {
final Action action = createAction(command);
- AppleStuff.getInstance().setAboutAction(action);
+ /* AppleStuff.getInstance().setAboutAction(action); */
if (menu.getItemCount() > 0 && menu.getItem(menu.getItemCount() - 1) == null) {
skipNextSeparator = true;
}
@@ -166,7 +165,7 @@ public class MenuCreator {
case "Preferences":
case "Preferences...": {
final Action action = createAction(command);
- AppleStuff.getInstance().setPreferencesAction(action);
+ /* AppleStuff.getInstance().setPreferencesAction(action); */
if (menu.getItemCount() > 0 && menu.getItem(menu.getItemCount() - 1) == null) {
skipNextSeparator = true;
}
|
