Attachment #513726 for bug #209696

Lines 33-38 Link Here

(-)./build.xml.orig (+2 lines)
33	<!-- The current version of Sweet Home 3D -->	33	<!-- The current version of Sweet Home 3D -->
34	<property name="version" value="5.6"/>	34	<property name="version" value="5.6"/>
35		35
		36	<delete verbose="true" file="src/com/eteks/sweethome3d/MacOSXConfiguration.java"/>
		37
36	<target name="build"	38	<target name="build"
37	description="Builds build/SweetHome3D.jar with all its classes">	39	description="Builds build/SweetHome3D.jar with all its classes">
38	<!-- Compile Sweet Home 3D -->	40	<!-- Compile Sweet Home 3D -->




    }
    if (OperatingSystem.isMacOSX()) {
      // Bind to application menu at last
      // MacOSXConfiguration.bindToApplicationMenu(this);
    }

    // Run everything else in Event Dispatch Thread

        // except for bundles under macOS 10.13
        System.setProperty("apple.laf.useScreenMenuBar", 
            String.valueOf(OperatingSystem.compareVersions(System.getProperty("os.version"), "10.13") < 0
                /*|| MacOSXConfiguration.isScreenMenuBarSupported()*/));
      }
      // Force the use of Quartz under Mac OS X for better Java 2D rendering performance
      System.setProperty("apple.awt.graphics.UseQuartz", "true");

            if (ev.getItem().getName() != null 
                && home.getName() == null
                && !home.isRecovered()) {
/*              if (OperatingSystem.isMacOSXLionOrSuperior()
                  && OperatingSystem.isJavaVersionGreaterOrEqual("1.7")
                  && MacOSXConfiguration.isWindowFullScreen(getHomeFrame(home))) {
                // Delay home disposal to avoid Java 3D fatal error

                      controller.close();
                    }
                  }).start();
              } else {*/
                controller.close();
/*              }*/
            }
            removeHomesListener(this);
          } else if (ev.getItem() == home && ev.getType() == CollectionEvent.Type.DELETE) {

Lines 124-130 Link Here

(-)./src/com/eteks/sweethome3d/HomeFramePane.java.orig (-1 / +1 lines)
124	homeFrame.setIconImage(frameImages.get(0));	124	homeFrame.setIconImage(frameImages.get(0));
125	}	125	}
126	if (OperatingSystem.isMacOSXLionOrSuperior()) {	126	if (OperatingSystem.isMacOSXLionOrSuperior()) {
127	MacOSXConfiguration.installToolBar(this);	127	// MacOSXConfiguration.installToolBar(this);
128	}	128	}
129	updateFrameTitle(homeFrame, this.home, this.application);	129	updateFrameTitle(homeFrame, this.home, this.application);
130	// Change component orientation	130	// Change component orientation




import java.util.TimerTask;
import java.util.UUID;

//import com.apple.eio.FileManager;
import com.eteks.sweethome3d.model.Home;

/**

   */
  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()) {

   * 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);
    }
  } */
}

Return to bug 209696

Lines 486-492 Link Here

(-)./src/com/eteks/sweethome3d/SweetHome3D.java.orig (-5 / +5 lines)
486	}	486	}
487	if (OperatingSystem.isMacOSX()) {	487	if (OperatingSystem.isMacOSX()) {
488	// Bind to application menu at last	488	// Bind to application menu at last
489	MacOSXConfiguration.bindToApplicationMenu(this);	489	// MacOSXConfiguration.bindToApplicationMenu(this);
490	}	490	}
491		491
492	// Run everything else in Event Dispatch Thread	492	// Run everything else in Event Dispatch Thread
Lines 522-528 Link Here
522	// except for bundles under macOS 10.13	522	// except for bundles under macOS 10.13
523	System.setProperty("apple.laf.useScreenMenuBar",	523	System.setProperty("apple.laf.useScreenMenuBar",
524	String.valueOf(OperatingSystem.compareVersions(System.getProperty("os.version"), "10.13") < 0	524	String.valueOf(OperatingSystem.compareVersions(System.getProperty("os.version"), "10.13") < 0
525	\|\| MacOSXConfiguration.isScreenMenuBarSupported()));	525	/\|\| MacOSXConfiguration.isScreenMenuBarSupported()/));
526	}	526	}
527	// Force the use of Quartz under Mac OS X for better Java 2D rendering performance	527	// Force the use of Quartz under Mac OS X for better Java 2D rendering performance
528	System.setProperty("apple.awt.graphics.UseQuartz", "true");	528	System.setProperty("apple.awt.graphics.UseQuartz", "true");
Lines 597-603 Link Here
597	if (ev.getItem().getName() != null	597	if (ev.getItem().getName() != null
598	&& home.getName() == null	598	&& home.getName() == null
599	&& !home.isRecovered()) {	599	&& !home.isRecovered()) {
600	if (OperatingSystem.isMacOSXLionOrSuperior()	600	/* if (OperatingSystem.isMacOSXLionOrSuperior()
601	&& OperatingSystem.isJavaVersionGreaterOrEqual("1.7")	601	&& OperatingSystem.isJavaVersionGreaterOrEqual("1.7")
602	&& MacOSXConfiguration.isWindowFullScreen(getHomeFrame(home))) {	602	&& MacOSXConfiguration.isWindowFullScreen(getHomeFrame(home))) {
603	// Delay home disposal to avoid Java 3D fatal error	603	// Delay home disposal to avoid Java 3D fatal error
Lines 607-615 Link Here
607	controller.close();	607	controller.close();
608	}	608	}
609	}).start();	609	}).start();
610	} else {	610	} else {*/
611	controller.close();	611	controller.close();
612	}	612	/* }*/
613	}	613	}
614	removeHomesListener(this);	614	removeHomesListener(this);
615	} else if (ev.getItem() == home && ev.getType() == CollectionEvent.Type.DELETE) {	615	} else if (ev.getItem() == home && ev.getType() == CollectionEvent.Type.DELETE) {

Lines 33-39 Link Here

(-)./src/com/eteks/sweethome3d/tools/OperatingSystem.java.orig (-5 / +6 lines)
33	import java.util.TimerTask;	33	import java.util.TimerTask;
34	import java.util.UUID;	34	import java.util.UUID;
35		35
36	import com.apple.eio.FileManager;	36	//import com.apple.eio.FileManager;
37	import com.eteks.sweethome3d.model.Home;	37	import com.eteks.sweethome3d.model.Home;
38		38
39	/**	39	/**
Lines 434-442 Link Here
434	*/	434	*/
435	public static File getDefaultApplicationFolder() throws IOException {	435	public static File getDefaultApplicationFolder() throws IOException {
436	File userApplicationFolder;	436	File userApplicationFolder;
437	if (isMacOSX()) {	437	/* if (isMacOSX()) {
438	userApplicationFolder = new File(MacOSXFileManager.getApplicationSupportFolder());	438	userApplicationFolder = new File(MacOSXFileManager.getApplicationSupportFolder());
439	} else if (isWindows()) {	439	} else if (isWindows()) { */
		440	if (isWindows()) {
440	userApplicationFolder = new File(System.getProperty("user.home"), "Application Data");	441	userApplicationFolder = new File(System.getProperty("user.home"), "Application Data");
441	// If user Application Data directory doesn't exist, use user home	442	// If user Application Data directory doesn't exist, use user home
442	if (!userApplicationFolder.exists()) {	443	if (!userApplicationFolder.exists()) {
Lines 457-466 Link Here
457	* This class requires some classes of <code>com.apple.eio</code> package	458	* This class requires some classes of <code>com.apple.eio</code> package
458	* to compile.	459	* to compile.
459	*/	460	*/
460	private static class MacOSXFileManager {	461	/* private static class MacOSXFileManager {
461	public static String getApplicationSupportFolder() throws IOException {	462	public static String getApplicationSupportFolder() throws IOException {
462	// Find application support folder (0x61737570) for user domain (-32763)	463	// Find application support folder (0x61737570) for user domain (-32763)
463	return FileManager.findFolder((short)-32763, 0x61737570);	464	return FileManager.findFolder((short)-32763, 0x61737570);
464	}	465	}
465	}	466	} */
466	}	467	}