Skip to content

Commit c59dec8

Browse files
committed
Rename uses of "Mac OS X" to just "OS X"
As of OS X 10.8 "Mountain Lion", Apple has completely dropped the "Mac" prefix from their OS X line of operating systems: http://www.macrumors.com/2012/02/16/apple-officially-drops-mac-name-from-os-x-mountain-lion/ 3.6 years later, we follow suit!
1 parent 8b8eda6 commit c59dec8

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</parent>
1111

1212
<artifactId>scijava-plugins-platforms</artifactId>
13-
<version>0.1.4-SNAPSHOT</version>
13+
<version>0.2.0-SNAPSHOT</version>
1414

1515
<name>SciJava Plugins: Platforms</name>
1616
<description>Core platform plugins for SciJava applications.</description>

src/main/java/org/scijava/plugins/platforms/macosx/MacOSXAppEventDispatcher.java renamed to src/main/java/org/scijava/plugins/platforms/osx/OSXAppEventDispatcher.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
* #L%
2929
*/
3030

31-
package org.scijava.plugins.platforms.macosx;
31+
package org.scijava.plugins.platforms.osx;
3232

3333
import com.apple.eawt.AboutHandler;
3434
import com.apple.eawt.AppEvent.AboutEvent;
@@ -69,23 +69,23 @@
6969
import org.scijava.platform.event.AppVisibleEvent;
7070

7171
/**
72-
* Rebroadcasts Mac OS X application events as ImageJ events.
72+
* Rebroadcasts OS X application events as ImageJ events.
7373
*
7474
* @author Curtis Rueden
7575
*/
76-
public class MacOSXAppEventDispatcher implements AboutHandler,
76+
public class OSXAppEventDispatcher implements AboutHandler,
7777
AppForegroundListener, AppHiddenListener, AppReOpenedListener,
7878
PreferencesHandler, PrintFilesHandler, QuitHandler, ScreenSleepListener,
7979
SystemSleepListener, UserSessionListener, OpenFilesHandler
8080
{
8181

8282
private final EventService eventService;
8383

84-
public MacOSXAppEventDispatcher(final EventService eventService) {
84+
public OSXAppEventDispatcher(final EventService eventService) {
8585
this(Application.getApplication(), eventService);
8686
}
8787

88-
public MacOSXAppEventDispatcher(final Application app,
88+
public OSXAppEventDispatcher(final Application app,
8989
final EventService eventService)
9090
{
9191
this.eventService = eventService;

src/main/java/org/scijava/plugins/platforms/macosx/MacOSXPlatform.java renamed to src/main/java/org/scijava/plugins/platforms/osx/OSXPlatform.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
* #L%
2929
*/
3030

31-
package org.scijava.plugins.platforms.macosx;
31+
package org.scijava.plugins.platforms.osx;
3232

3333
import java.io.IOException;
3434
import java.net.URL;
@@ -52,17 +52,17 @@
5252
import org.scijava.plugin.Plugin;
5353

5454
/**
55-
* A platform implementation for handling Mac OS X platform issues:
55+
* A platform implementation for handling Apple OS X platform issues:
5656
* <ul>
5757
* <li>Application events are rebroadcast as ImageJ events.</li>
58-
* <li>Mac OS X screen menu bar is enabled.</li>
58+
* <li>OS X screen menu bar is enabled.</li>
5959
* <li>Special screen menu bar menu items are handled.</li>
6060
* </ul>
6161
*
6262
* @author Curtis Rueden
6363
*/
64-
@Plugin(type = Platform.class, name = "Mac OS X")
65-
public class MacOSXPlatform extends AbstractPlatform {
64+
@Plugin(type = Platform.class, name = "OS X")
65+
public class OSXPlatform extends AbstractPlatform {
6666

6767
/** Debugging flag to allow easy toggling of Mac screen menu bar behavior. */
6868
private static final boolean SCREEN_MENU = true;
@@ -78,23 +78,23 @@ public class MacOSXPlatform extends AbstractPlatform {
7878

7979
@Override
8080
public String osName() {
81-
return "Mac OS X";
81+
return "OS X";
8282
}
8383

8484
@Override
8585
public void configure(final PlatformService service) {
8686
super.configure(service);
8787

88-
// use Mac OS X screen menu bar
88+
// use OS X screen menu bar
8989
if (SCREEN_MENU) System.setProperty("apple.laf.useScreenMenuBar", "true");
9090

9191
// remove app commands from menu structure
9292
if (SCREEN_MENU) removeAppCommandsFromMenu();
9393

94-
// translate Mac OS X application events into ImageJ events
94+
// translate OS X application events into ImageJ events
9595
final EventService eventService = getPlatformService().getEventService();
9696
try {
97-
appEventDispatcher = new MacOSXAppEventDispatcher(eventService);
97+
appEventDispatcher = new OSXAppEventDispatcher(eventService);
9898
}
9999
catch (final NoClassDefFoundError e) {
100100
// the interfaces implemented by MacOSXAppEventDispatcher might not be

0 commit comments

Comments
 (0)