[patch] sweethome3d-5.4-nomacosx.patch

sweethome3d-5.4-nomacosx.patch (text/plain), 3.73 KB, created by Fabio Rossi on 2017-02-10 23:39:25 UTC

Description: Removing jarfiles which contain MacOSX-related classes, build
fails looking for missing classes. This patch fixes it.
Author: Gabriele Giacone <[e-mail]>

--- 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 <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);
     }
-  }
+  } */
 }
--- 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 @@
   <!-- The current version of Sweet Home 3D -->
   <property name="version" value="5.4"/>
 
+  <delete verbose="true" file="src/com/eteks/sweethome3d/MacOSXConfiguration.java"/>
+
   <target name="build"
           description="Builds build/SweetHome3D.jar with all its classes">
     <!-- Compile Sweet Home 3D -->
--- a/src/com/eteks/sweethome3d/SweetHome3D.java.orig	2015-02-03 22:47:42.870231245 +0100
+++ a/src/com/eteks/sweethome3d/SweetHome3D.java	2015-02-03 22:47:56.158231988 +0100
@@ -466,7 +466,7 @@
     }
     if (OperatingSystem.isMacOSX()) {
       // Bind to application menu at last
-      MacOSXConfiguration.bindToApplicationMenu(this);
+      // MacOSXConfiguration.bindToApplicationMenu(this);
     }
 
     // Run everything else in Event Dispatch Thread
@@ -541,7 +541,7 @@
             if (ev.getItem().getName() != null 
                 && home.getName() == null
                 && !home.isRecovered()) {
-              if (OperatingSystem.isMacOSXLionOrSuperior()
+/*              if (OperatingSystem.isMacOSXLionOrSuperior()
                   && OperatingSystem.isJavaVersionGreaterOrEqual("1.7")
                   && MacOSXConfiguration.isWindowFullScreen(getHomeFrame(home))) {
                 // Delay home disposal to avoid Java 3D fatal error
@@ -551,9 +551,9 @@
                       controller.close();
                     }
                   }).start();
-              } else {
+              } else {*/
                 controller.close();
-              }
+/*              }*/
             }
             removeHomesListener(this);
           } else if (ev.getItem() == home && ev.getType() == CollectionEvent.Type.DELETE) {