You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ge...@apache.org on 2018/04/24 11:06:43 UTC
[incubator-netbeans] branch master updated: Change all
apple.laf.AquaLookAndFeel to com.apple.laf.AquaLookAndFeel. Fixes
netbeans-444. (#516)
This is an automated email from the ASF dual-hosted git repository.
geertjan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new cb50f33 Change all apple.laf.AquaLookAndFeel to com.apple.laf.AquaLookAndFeel. Fixes netbeans-444. (#516)
cb50f33 is described below
commit cb50f33259a042fedf3fd60992eb6dbb2ccd9bb0
Author: Sven Reimers <sv...@users.noreply.github.com>
AuthorDate: Tue Apr 24 13:06:38 2018 +0200
Change all apple.laf.AquaLookAndFeel to com.apple.laf.AquaLookAndFeel. Fixes netbeans-444. (#516)
---
core.startup/src/org/netbeans/core/startup/CLIOptions.java | 2 +-
.../test/unit/src/org/netbeans/core/startup/CLIOptionsTest.java | 2 +-
core.windows/src/org/netbeans/core/windows/options/LafPanel.java | 4 ++--
ide/launcher/macosx/NetBeansLauncher/NBPreferences.m | 2 +-
nbi/engine/src/org/netbeans/installer/utils/UiUtils.java | 2 +-
o.n.swing.plaf/src/org/netbeans/swing/plaf/Startup.java | 2 +-
o.n.upgrader/src/org/netbeans/util/Util.java | 2 +-
.../src/org/openide/explorer/propertysheet/PropUtils.java | 2 +-
8 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/core.startup/src/org/netbeans/core/startup/CLIOptions.java b/core.startup/src/org/netbeans/core/startup/CLIOptions.java
index 9327f10..b208b3c 100644
--- 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 class CLIOptions extends CLIHandler {
} 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
index 4bd3196..d9fbeae 100644
--- 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 class CLIOptionsTest extends NbTestCase {
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
index 0e3f1e3..abf2d21 100644
--- 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 @@ public class LafPanel extends javax.swing.JPanel {
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 @@ public class LafPanel extends javax.swing.JPanel {
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
index b777d97..ed0f3a2 100644
--- a/ide/launcher/macosx/NetBeansLauncher/NBPreferences.m
+++ b/ide/launcher/macosx/NetBeansLauncher/NBPreferences.m
@@ -34,7 +34,7 @@
#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
index d2cd904..0d1c33e 100644
--- 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 final class UiUtils {
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
index 0c9ae57..bb64eba 100644
--- 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 @@ public final class Startup {
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
index 7a2907a..52ecd8d 100644
--- 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 class Util {
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
index 08578fe..161d898 100644
--- a/openide.explorer/src/org/openide/explorer/propertysheet/PropUtils.java
+++ b/openide.explorer/src/org/openide/explorer/propertysheet/PropUtils.java
@@ -1325,7 +1325,7 @@ final class PropUtils {
* 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;
}
--
To stop receiving notification emails like this one, please contact
geertjan@apache.org.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists