Change all apple.laf.AquaLookAndFeel to com.apple.laf.AquaLookAndFeel…

…. Fixes netbeans-444. (apache#516)
MA6804 · Apr 24, 2018 · cb50f33 · cb50f33
1 parent 08c8028
commit cb50f33
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 9 deletions.
diff --git a/core.startup/src/org/netbeans/core/startup/CLIOptions.java b/core.startup/src/org/netbeans/core/startup/CLIOptions.java
@@ -150,7 +150,7 @@ public final int cli(String[] args) {
                     } else if ("Windows".equals(ui)) {
                         ui = "com.sun.java.swing.plaf.windows.WindowsLookAndFeel";
                     } else if ("Aqua".equals(ui)) {
-                        ui = "apple.laf.AquaLookAndFeel";
+                        ui = "com.apple.laf.AquaLookAndFeel";
                     }
                     uiClass = Class.forName(ui);
                 } catch(ArrayIndexOutOfBoundsException e) {

diff --git a/core.startup/test/unit/src/org/netbeans/core/startup/CLIOptionsTest.java b/core.startup/test/unit/src/org/netbeans/core/startup/CLIOptionsTest.java
@@ -70,7 +70,7 @@ public void testLafId2LafClass () {
         if (Utilities.isMac()) {
             new CLIOptions().cli(new String[] { "--laf", "Aqua" });
             try {
-                assertEquals("Must be MacOS", CLIOptions.uiClass, Class.forName("apple.laf.AquaLookAndFeel"));
+                assertEquals("Must be MacOS", CLIOptions.uiClass, Class.forName("com.apple.laf.AquaLookAndFeel"));
             } catch (ClassNotFoundException exc) {
             }
         }

diff --git a/core.windows/src/org/netbeans/core/windows/options/LafPanel.java b/core.windows/src/org/netbeans/core/windows/options/LafPanel.java
@@ -204,7 +204,7 @@ private LookAndFeelInfo getCurrentLaF() {
         boolean isAqua = "Aqua".equals(UIManager.getLookAndFeel().getID()); //NOI18N
         for( LookAndFeelInfo li : lafs ) {
             if( currentLAFClassName.equals( li.getClassName() ) 
-                    || (isAqua && li.getClassName().contains("apple.laf.AquaLookAndFeel")) ) { //NOI18N
+                    || (isAqua && li.getClassName().contains("com.apple.laf.AquaLookAndFeel")) ) { //NOI18N
                 currentLaf = li;
                 break;
             }
@@ -220,7 +220,7 @@ private LookAndFeelInfo getPreferredLaF() {
         boolean isAqua = "Aqua".equals(UIManager.getLookAndFeel().getID()); //NOI18N
         for( LookAndFeelInfo li : lafs ) {
             if( lafClassName.equals( li.getClassName() )
-                    || (isAqua && li.getClassName().contains("apple.laf.AquaLookAndFeel")) ) { //NOI18N
+                    || (isAqua && li.getClassName().contains("com.apple.laf.AquaLookAndFeel")) ) { //NOI18N
                 currentLaf = li;
                 break;
             }

diff --git a/ide/launcher/macosx/NetBeansLauncher/NBPreferences.m b/ide/launcher/macosx/NetBeansLauncher/NBPreferences.m
@@ -34,7 +34,7 @@ @implementation NBPreferences
 
 #define DEFAULT_LOOKFEEL 0
 #define LOOKFEEL_STRING @"--laf"
-NSString *look_and_feels[]={@"apple.laf.AquaLookAndFeel",@"javax.swing.plaf.metal.MetalLookAndFeel"};
+NSString *look_and_feels[]={@"com.apple.laf.AquaLookAndFeel",@"javax.swing.plaf.metal.MetalLookAndFeel"};
 
 #define DEFAULT_USERDIR @""
 #define USERDIR_STRING @"--userdir"

diff --git a/nbi/engine/src/org/netbeans/installer/utils/UiUtils.java b/nbi/engine/src/org/netbeans/installer/utils/UiUtils.java
@@ -554,7 +554,7 @@ public enum LookAndFeelType {
         MOTIF("motif", "Motif", "com.sun.java.swing.plaf.motif.MotifLookAndFeel"),
         GTK("gtk", "GTK", "com.sun.java.swing.plaf.gtk.GTKLookAndFeel"),
         METAL("metal", "Metal", "javax.swing.plaf.metal.MetalLookAndFeel"),
-        AQUA("aqua", "Aqua", "apple.laf.AquaLookAndFeel"),
+        AQUA("aqua", "Aqua", "com.apple.laf.AquaLookAndFeel"),
         NIMBUS("nimbus", "Nimbus", "com.sun.java.swing.plaf.nimbus.NimbusLookAndFeel"),
         DEFAULT("default", null, null);
 

diff --git a/o.n.swing.plaf/src/org/netbeans/swing/plaf/Startup.java b/o.n.swing.plaf/src/org/netbeans/swing/plaf/Startup.java
@@ -175,7 +175,7 @@ private static String defaultLaF() {
         if (isWindows()) {
             uiClassName = "com.sun.java.swing.plaf.windows.WindowsLookAndFeel"; //NOI18N
         } else if (isMac()) {
-            uiClassName = "apple.laf.AquaLookAndFeel";
+            uiClassName = "com.apple.laf.AquaLookAndFeel";
         } else if (shouldUseMetal()) {
             uiClassName = "javax.swing.plaf.metal.MetalLookAndFeel"; //NOI18N
         } else {

diff --git a/o.n.upgrader/src/org/netbeans/util/Util.java b/o.n.upgrader/src/org/netbeans/util/Util.java
@@ -75,7 +75,7 @@ public static void setDefaultLookAndFeel () {
         if (Utilities.isWindows()) {
             uiClassName = "com.sun.java.swing.plaf.windows.WindowsLookAndFeel"; //NOI18N
         } else if (Utilities.isMac()) {
-            uiClassName = "apple.laf.AquaLookAndFeel"; //NOI18N
+            uiClassName = "com.apple.laf.AquaLookAndFeel"; //NOI18N
         } else if (Utilities.isUnix()) {
             uiClassName = "javax.swing.plaf.metal.MetalLookAndFeel"; //NOI18N
         } else {

diff --git a/openide.explorer/src/org/openide/explorer/propertysheet/PropUtils.java b/openide.explorer/src/org/openide/explorer/propertysheet/PropUtils.java
@@ -1325,7 +1325,7 @@ static int getSavedSortOrder() {
      * cell and its text.  The default is 2, or it can be customized via the
      * UIManager integer key netbeans.ps.textMargin */
     static int getTextMargin() {
-        if ("apple.laf.AquaLookAndFeel".equals(UIManager.getLookAndFeel().getClass().getName())) {
+        if ("com.apple.laf.AquaLookAndFeel".equals(UIManager.getLookAndFeel().getClass().getName())) {
             return 0;
         }