This is an automated email from the ASF dual-hosted git repository.
neilcsmith pushed a commit to branch delivery
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/delivery by this push:
new 8012879 fixed wrong nb-javac module name so that it can be installed.
new 677372e Merge pull request #3575 from
mbien/nb-javac-libname-fix_delivery
8012879 is described below
commit 8012879df5b272c0c3c818b11db695ea54e4c112
Author: Michael Bien <[email protected]>
AuthorDate: Wed Feb 9 01:36:15 2022 +0100
fixed wrong nb-javac module name so that it can be installed.
---
.../netbeans/modules/java/j2semodule/ui/customizer/Bundle.properties | 2 +-
.../netbeans/modules/java/j2seproject/ui/customizer/Bundle.properties | 2 +-
.../src/org/netbeans/modules/java/source/JBrowseModule.java | 4 ++--
.../maven/src/org/netbeans/modules/maven/customizer/Bundle.properties | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git
a/java/java.j2semodule/src/org/netbeans/modules/java/j2semodule/ui/customizer/Bundle.properties
b/java/java.j2semodule/src/org/netbeans/modules/java/j2semodule/ui/customizer/Bundle.properties
index aa60c2c..078a809 100644
---
a/java/java.j2semodule/src/org/netbeans/modules/java/j2semodule/ui/customizer/Bundle.properties
+++
b/java/java.j2semodule/src/org/netbeans/modules/java/j2semodule/ui/customizer/Bundle.properties
@@ -601,7 +601,7 @@ ACSD_librariesLocation=Folder containing location of the
library definition file
ACSD_jButtonEdit=Edit classpath items
ACSD_BuildJarAfterCompile=Build JAR after compiling option
LBL_CustomizeRun_Enable_Quick_Run=Enable Quick Run
-CustomizerCompile.CompileOnSave=Compile on &Save (requires nb-javac plugin)
+CustomizerCompile.CompileOnSave=Compile on &Save
AD_CustomizerCompile.CompileOnSave=If selected, files are compiled when you
save them. This option saves you time when you run or debug your application in
the IDE.
LBL_CompileOnSaveDescription=<html>If selected, files are compiled when you
save them.<br>\
This option saves you time when you run or debug your application in the
IDE.<br>\
diff --git
a/java/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/Bundle.properties
b/java/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/Bundle.properties
index 9cb2102..acf0a8a 100644
---
a/java/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/Bundle.properties
+++
b/java/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/Bundle.properties
@@ -601,7 +601,7 @@ ACSD_librariesLocation=Folder containing location of the
library definition file
ACSD_jButtonEdit=Edit classpath items
ACSD_BuildJarAfterCompile=Build JAR after compiling option
LBL_CustomizeRun_Enable_Quick_Run=Enable Quick Run
-CustomizerCompile.CompileOnSave=Compile on &Save (requires nb-javac plugin)
+CustomizerCompile.CompileOnSave=Compile on &Save
AD_CustomizerCompile.CompileOnSave=If selected, files are compiled when you
save them. This option saves you time when you run or debug your application in
the IDE.
LBL_CompileOnSaveDescription=<html>If selected, files are compiled when you
save them.<br>\
This option saves you time when you run or debug your application in the
IDE.<br>\
diff --git
a/java/java.source/src/org/netbeans/modules/java/source/JBrowseModule.java
b/java/java.source/src/org/netbeans/modules/java/source/JBrowseModule.java
index 9776a42..f6410ab 100644
--- a/java/java.source/src/org/netbeans/modules/java/source/JBrowseModule.java
+++ b/java/java.source/src/org/netbeans/modules/java/source/JBrowseModule.java
@@ -83,7 +83,7 @@ public class JBrowseModule extends ModuleInstall {
Dialog[] d = new Dialog[1];
DialogDescriptor dd = new
DialogDescriptor(Bundle.DESC_FeaturesLimited(), Bundle.TITLE_FeaturesLimited(),
true, new Object[] {install, DialogDescriptor.CANCEL_OPTION}, install,
DialogDescriptor.DEFAULT_ALIGN, HelpCtx.DEFAULT_HELP, evt -> {
if (install.equals(evt.getActionCommand())) {
-
PluginManager.installSingle("org.netbeans.lib.nbjavac", Bundle.DN_nbjavac());
+
PluginManager.installSingle("org.netbeans.libs.nbjavacapi",
Bundle.DN_nbjavac());
}
d[0].setVisible(false);
});
@@ -92,7 +92,7 @@ public class JBrowseModule extends ModuleInstall {
} catch (HeadlessException ex) {
Exceptions.printStackTrace(Exceptions.attachSeverity(ex, Level.FINE));
}
- prefs.putBoolean(KEY_WARNING_SHOWN, true);
+// prefs.putBoolean(KEY_WARNING_SHOWN, true); // show
warning on every boot until fixed
}
});
});
diff --git
a/java/maven/src/org/netbeans/modules/maven/customizer/Bundle.properties
b/java/maven/src/org/netbeans/modules/maven/customizer/Bundle.properties
index 510cca1..c1a962a 100644
--- a/java/maven/src/org/netbeans/modules/maven/customizer/Bundle.properties
+++ b/java/maven/src/org/netbeans/modules/maven/customizer/Bundle.properties
@@ -142,7 +142,7 @@ HINT_ApplicationCoS=<html>Classes compiled with the Compile
on Save feature in t
RunJarPanel.lblConfiguration.text=&Configuration:
ActionMappings.txtPackagings.text=
ActionMappings.lblPackagings.text=Supported Packagings:
-CompilePanel.cbCompileOnSave.text=Compile on &Save (requires nb-javac plugin)
+CompilePanel.cbCompileOnSave.text=Compile on &Save
CompilePanel.btnLearnMore.text=<html><a href="">Learn More about Compile On
Save feature in Maven projects</a></html>
ActionMappings.jButton1.text=Show in Toolbar
RunJarPanel.txtVMOptions.AccessibleContext.accessibleDescription=VM options
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
