Rename OS X -> macOS

Thanks Apple, for renaming your OS... again.

To be fair, IMHO, the name "macOS" is much better than "OS X". :-)

Author: ctrueden

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-plugins-platforms</artifactId>
-	<version>0.2.2-SNAPSHOT</version>
+	<version>0.3.0-SNAPSHOT</version>
 
 	<name>SciJava Plugins: Platforms</name>
 	<description>Core platform plugins for SciJava applications.</description>

…platforms/osx/OSXAppEventDispatcher.java …forms/macos/MacOSAppEventDispatcher.javasrc/main/java/org/scijava/plugins/platforms/osx/OSXAppEventDispatcher.java renamed to src/main/java/org/scijava/plugins/platforms/macos/MacOSAppEventDispatcher.java src/main/java/org/scijava/plugins/platforms/osx/OSXAppEventDispatcher.java renamed to src/main/java/org/scijava/plugins/platforms/macos/MacOSAppEventDispatcher.java

@@ -28,7 +28,7 @@
  * #L%
  */
 
-package org.scijava.plugins.platforms.osx;
+package org.scijava.plugins.platforms.macos;
 
 import com.apple.eawt.AboutHandler;
 import com.apple.eawt.AppEvent.AboutEvent;
@@ -69,23 +69,23 @@
 import org.scijava.platform.event.AppVisibleEvent;
 
 /**
- * Rebroadcasts OS X application events as ImageJ events.
+ * Rebroadcasts macOS application events as ImageJ events.
  * 
  * @author Curtis Rueden
  */
-public class OSXAppEventDispatcher implements AboutHandler,
+public class MacOSAppEventDispatcher implements AboutHandler,
 	AppForegroundListener, AppHiddenListener, AppReOpenedListener,
 	PreferencesHandler, PrintFilesHandler, QuitHandler, ScreenSleepListener,
 	SystemSleepListener, UserSessionListener, OpenFilesHandler
 {
 
 	private final EventService eventService;
 
-	public OSXAppEventDispatcher(final EventService eventService) {
+	public MacOSAppEventDispatcher(final EventService eventService) {
 		this(Application.getApplication(), eventService);
 	}
 
-	public OSXAppEventDispatcher(final Application app,
+	public MacOSAppEventDispatcher(final Application app,
 		final EventService eventService)
 	{
 		this.eventService = eventService;

…a/plugins/platforms/osx/OSXPlatform.java …ugins/platforms/macos/MacOSPlatform.javasrc/main/java/org/scijava/plugins/platforms/osx/OSXPlatform.java renamed to src/main/java/org/scijava/plugins/platforms/macos/MacOSPlatform.java src/main/java/org/scijava/plugins/platforms/osx/OSXPlatform.java renamed to src/main/java/org/scijava/plugins/platforms/macos/MacOSPlatform.java

@@ -28,7 +28,7 @@
  * #L%
  */
 
-package org.scijava.plugins.platforms.osx;
+package org.scijava.plugins.platforms.macos;
 
 import java.io.IOException;
 import java.net.URL;
@@ -52,17 +52,17 @@
 import org.scijava.plugin.Plugin;
 
 /**
- * A platform implementation for handling Apple OS X platform issues:
+ * A platform implementation for handling Apple macOS platform issues:
  * <ul>
  * <li>Application events are rebroadcast as ImageJ events.</li>
- * <li>OS X screen menu bar is enabled.</li>
+ * <li>macOS screen menu bar is enabled.</li>
  * <li>Special screen menu bar menu items are handled.</li>
  * </ul>
  * 
  * @author Curtis Rueden
  */
-@Plugin(type = Platform.class, name = "OS X")
-public class OSXPlatform extends AbstractPlatform {
+@Plugin(type = Platform.class, name = "macOS")
+public class MacOSPlatform extends AbstractPlatform {
 
 	/** Debugging flag to allow easy toggling of Mac screen menu bar behavior. */
 	private static final boolean SCREEN_MENU = true;
@@ -78,29 +78,29 @@ public class OSXPlatform extends AbstractPlatform {
 
 	@Override
 	public String osName() {
-		return "OS X";
+		return "macOS";
 	}
 
 	@Override
 	public void configure(final PlatformService service) {
 		super.configure(service);
 
-		// use OS X screen menu bar
+		// use macOS screen menu bar
 		if (SCREEN_MENU) System.setProperty("apple.laf.useScreenMenuBar", "true");
 
 		// remove app commands from menu structure
 		if (SCREEN_MENU) removeAppCommandsFromMenu();
 
-		// translate OS X application events into ImageJ events
+		// translate macOS application events into ImageJ events
 		final EventService eventService = getPlatformService().getEventService();
 		try {
-			appEventDispatcher = new OSXAppEventDispatcher(eventService);
+			appEventDispatcher = new MacOSAppEventDispatcher(eventService);
 		}
 		catch (final NoClassDefFoundError e) {
-			// the interfaces implemented by MacOSXAppEventDispatcher might not be
+			// the interfaces implemented by MacOSAppEventDispatcher might not be
 			// available:
 			// - on MacOSX Tiger without recent Java Updates
-			// - on earlier MacOSX versions
+			// - on earlier OS versions
 		}
 
 		// subscribe to relevant window-related events