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,7 @@ import java.util.Timer;
import java.util.TimerTask;
import java.util.UUID;
-import com.apple.eio.FileManager;
+//import com.apple.eio.FileManager;
import com.eteks.sweethome3d.model.Home;
/**
@@ -410,9 +410,10 @@ public class OperatingSystem {
*/
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()) {
@@ -433,10 +434,10 @@ public class OperatingSystem {
* This class requires some classes of com.apple.eio
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);
}
- }
+ } */
}
--- a/src/com/eteks/sweethome3d/SweetHome3D.java
+++ b/src/com/eteks/sweethome3d/SweetHome3D.java
@@ -466,7 +466,6 @@ public class SweetHome3D extends HomeApp
}
if (OperatingSystem.isMacOSX()) {
// Bind to application menu at last
- MacOSXConfiguration.bindToApplicationMenu(this);
}
// Run everything else in Event Dispatch Thread
--- a/src/com/eteks/sweethome3d/HomeFramePane.java
+++ b/src/com/eteks/sweethome3d/HomeFramePane.java
@@ -123,7 +123,7 @@ public class HomeFramePane extends JRoot
homeFrame.setIconImage(frameImages.get(0));
}
if (OperatingSystem.isMacOSXLionOrSuperior()) {
- MacOSXConfiguration.installToolBar(this);
+// MacOSXConfiguration.installToolBar(this);
}
updateFrameTitle(homeFrame, this.home, this.application);
// Change component orientation
--- a/build.xml
+++ b/build.xml
@@ -32,6 +32,8 @@
+
+