geertjanw closed pull request #516: [NETBEANS-444] Change all
apple.laf.AquaLookAndFeel to com.apple.laf.AquaLookAndFeel…
URL: https://github.com/apache/incubator-netbeans/pull/516
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/core.startup/src/org/netbeans/core/startup/CLIOptions.java
b/core.startup/src/org/netbeans/core/startup/CLIOptions.java
index 9327f1023..b208b3cae 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 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
index 4bd319685..d9fbeae1e 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 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
index 0e3f1e346..abf2d2162 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 @@ 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
index b777d97ef..ed0f3a276 100644
--- 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
index d2cd9045c..0d1c33e24 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 @@ private 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 0c9ae5788..bb64eba8a 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 @@ 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
index 7a2907aaa..52ecd8d08 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 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
index 08578fe9c..161d8983a 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 @@ 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;
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscr...@netbeans.apache.org
For additional commands, e-mail: notifications-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
