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
|
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/SweetHome3D.java
+++ b/src/com/eteks/sweethome3d/SweetHome3D.java
@@ -316,7 +316,6 @@
if (OperatingSystem.isMacOSX()) {
// Bind to application menu
- MacOSXConfiguration.bindToApplicationMenu(this);
}
// Init look and feel afterwards to ensure that Swing takes into account default locale change
--- a/src/com/eteks/sweethome3d/tools/OperatingSystem.java
+++ b/src/com/eteks/sweethome3d/tools/OperatingSystem.java
@@ -25,7 +25,7 @@
import java.util.ResourceBundle;
import java.util.UUID;
-import com.apple.eio.FileManager;
+//import com.apple.eio.FileManager;
import com.eteks.sweethome3d.model.Home;
/**
@@ -166,9 +166,10 @@
*/
public static File getDefaultApplicationFolder() throws IOException {
File userApplicationFolder;
- if (isMacOSX()) {
+/* if (isMacOSX()) {
userApplicationFolder = new File(MacOSXFileManager.getApplicationSupportFolder());
- } else if (isWindows()) {
+ } 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()) {
@@ -189,10 +190,10 @@
* This class requires some classes of <code>com.apple.eio</code> package
* to compile.
*/
- private static class MacOSXFileManager {
+/* 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);
}
- }
+ } */
}
|