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
|
Description: Removing jarfiles which contain MacOSX-related classes, build
fails looking for missing classes. This patch fixes it.
Author: Gabriele Giacone <1o5g4r8o@gmail.com>
--- a/src/com/eteks/sweethome3d/tools/OperatingSystem.java
+++ b/src/com/eteks/sweethome3d/tools/OperatingSystem.java
@@ -33,7 +33,6 @@ import java.util.Timer;
import java.util.TimerTask;
import java.util.UUID;
-import com.apple.eio.FileManager;
import com.eteks.sweethome3d.model.Home;
/**
@@ -432,9 +431,12 @@ public class OperatingSystem {
*/
public static File getDefaultApplicationFolder() throws IOException {
File userApplicationFolder;
+/*
if (isMacOSX()) {
userApplicationFolder = new File(MacOSXFileManager.getApplicationSupportFolder());
} else if (isWindows()) {
+ */
+ if (isWindows()) {
userApplicationFolder = new File(System.getProperty("user.home"), "Application Data");
// If user Application Data directory doesn't exist, use user home
if (!userApplicationFolder.exists()) {
@@ -455,10 +457,12 @@ public class OperatingSystem {
* This class requires some classes of <code>com.apple.eio</code> package
* to compile.
*/
+/*
private static class MacOSXFileManager {
public static String getApplicationSupportFolder() throws IOException {
// Find application support folder (0x61737570) for user domain (-32763)
return FileManager.findFolder((short)-32763, 0x61737570);
}
}
+ */
}
--- a/src/com/eteks/sweethome3d/SweetHome3D.java
+++ b/src/com/eteks/sweethome3d/SweetHome3D.java
@@ -464,10 +464,12 @@ public class SweetHome3D extends HomeApp
// Too bad we can't retrieve homes to recover
ex.printStackTrace();
}
+/*
if (OperatingSystem.isMacOSX()) {
// Bind to application menu at last
MacOSXConfiguration.bindToApplicationMenu(this);
}
+ */
// Run everything else in Event Dispatch Thread
EventQueue.invokeLater(new Runnable() {
@@ -542,8 +544,7 @@ public class SweetHome3D extends HomeApp
&& home.getName() == null
&& !home.isRecovered()) {
if (OperatingSystem.isMacOSXLionOrSuperior()
- && OperatingSystem.isJavaVersionGreaterOrEqual("1.7")
- && MacOSXConfiguration.isWindowFullScreen(getHomeFrame(home))) {
+ && OperatingSystem.isJavaVersionGreaterOrEqual("1.7")) {
// Delay home disposal to avoid Java 3D fatal error
new Timer(3000, new ActionListener() {
public void actionPerformed(ActionEvent ev) {
--- a/src/com/eteks/sweethome3d/HomeFramePane.java
+++ b/src/com/eteks/sweethome3d/HomeFramePane.java
@@ -122,9 +122,11 @@ public class HomeFramePane extends JRoot
// Call setIconImage available in previous versions
homeFrame.setIconImage(frameImages.get(0));
}
+/*
if (OperatingSystem.isMacOSXLionOrSuperior()) {
MacOSXConfiguration.installToolBar(this);
}
+ */
updateFrameTitle(homeFrame, this.home, this.application);
// Change component orientation
applyComponentOrientation(ComponentOrientation.getOrientation(Locale.getDefault()));
|
