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
|
Index: grinvin-core-1.2/org/grinvin/Grinvin.java
===================================================================
--- grinvin-core-1.2.orig/org/grinvin/Grinvin.java 2008-06-28 15:15:26.000000000 +0000
+++ grinvin-core-1.2/org/grinvin/Grinvin.java 2008-07-23 23:02:03.000000000 +0000
@@ -47,7 +47,6 @@
import org.grinvin.logging.Logging;
import org.grinvin.main.actions.LoadWorkspace;
import org.grinvin.main.actions.NewWorkspace;
-import org.grinvin.main.MacOSXHandler;
import org.grinvin.preferences.GrinvinPreferences;
import org.grinvin.preferences.GrinvinPreferences.OsType;
import org.grinvin.preferences.GrinvinPreferences.Preference;
@@ -83,10 +82,6 @@
// install url stream handler
URL.setURLStreamHandlerFactory(new GrinvinURLStreamHandlerFactory());
- // install about handler on Mac OS X
- if (GrinvinPreferences.getInstance().getOsType() == OsType.MAC_OS_X)
- new MacOSXHandler();
-
// don't hide tooltips
ToolTipManager.sharedInstance().setDismissDelay(Integer.MAX_VALUE);
Index: grinvin-core-1.2/org/grinvin/main/MacOSXHandler.java
===================================================================
--- grinvin-core-1.2.orig/org/grinvin/main/MacOSXHandler.java 2008-06-28 15:15:26.000000000 +0000
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,64 +0,0 @@
-/* MacOSXHandler.java
- * =========================================================================
- * This file is part of the GrInvIn project - http://www.grinvin.org
- *
- * Copyright (C) 2005-2008 Universiteit Gent
- *
- * 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 2 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.
- *
- * A copy of the GNU General Public License can be found in the file
- * LICENSE.txt provided with the source distribution of this program (see
- * the META-INF directory in the source jar). This license can also be
- * found on the GNU website at http://www.gnu.org/licenses/gpl.html.
- *
- * If you did not receive a copy of the GNU General Public License along
- * with this program, contact the lead developer, or write to the Free
- * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- */
-
-package org.grinvin.main;
-
-import com.apple.eawt.Application;
-import com.apple.eawt.ApplicationAdapter;
-import com.apple.eawt.ApplicationEvent;
-
-import org.grinvin.about.AboutDialog;
-import org.grinvin.main.actions.Exit;
-
-/**
- * Handle the OSX events.
- */
-public class MacOSXHandler extends Application {
-
- //
- public MacOSXHandler() {
- addApplicationListener(new AboutBoxHandler());
- addApplicationListener(new QuitHandler());
- }
-
- //
- private static class AboutBoxHandler extends ApplicationAdapter {
- @Override
- public void handleAbout(ApplicationEvent event) {
- new AboutDialog().setVisible(true);
- event.setHandled(true);
- }
- }
-
- private static class QuitHandler extends ApplicationAdapter {
- public void handleQuit(ApplicationEvent event) {
- event.setHandled(false);
- Exit.handleExit();
- }
- }
-
-}
Index: grinvin-core-1.2/org/grinvin/preferences/GrinvinPreferences.java
===================================================================
--- grinvin-core-1.2.orig/org/grinvin/preferences/GrinvinPreferences.java 2008-06-28 15:15:26.000000000 +0000
+++ grinvin-core-1.2/org/grinvin/preferences/GrinvinPreferences.java 2008-07-23 23:01:13.000000000 +0000
@@ -27,8 +27,6 @@
package org.grinvin.preferences;
-import com.apple.eio.FileManager;
-
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
@@ -170,12 +168,7 @@
if (key == Preference.GRINVIN_BIN_DIR) {
String defaultValue;
if (osType == OsType.MAC_OS_X) {
- try {
- defaultValue = FileManager.getResource("benzene");
- defaultValue = defaultValue.substring(0,defaultValue.lastIndexOf('/'));
- } catch (FileNotFoundException ex) {
- defaultValue = null;
- }
+ throw new RuntimeException("Invalid Os Type: MAC_OS_X");
} else if (osType == OsType.WINDOWS) {
assert systemPreferences != null : "System preferences not available";
defaultValue = systemPreferences.get(key.getId(), null);
|
