This is an automated email from the ASF dual-hosted git repository.
lkishalmi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new e7545a9284 Better Gradle Project Creation Wizard
e7545a9284 is described below
commit e7545a928426991d6120f4609266c1b2f6f2c023
Author: Laszlo Kishalmi
AuthorDate: Wed Apr 10 19:37:33 2024 -0700
Better Gradle Project Creation Wizard
---
extide/gradle/manifest.mf | 1 +
extide/gradle/nbproject/project.properties | 3 +-
.../execute/EscapeProcessingOutputStream.java | 2 +-
.../gradle/execute/GradlePlainEscapeProcessor.java | 67 +---
.../modules/gradle/newproject/Bundle.properties| 10 +
.../modules/gradle/newproject/GradleInitPanel.java | 69
.../gradle/newproject/GradleInitPanelVisual.form | 236 +
.../gradle/newproject/GradleInitPanelVisual.java | 384 +
.../gradle/newproject/NewProjectSettings.java | 76
.../gradle/output/GradleProcessorFactory.java | 132 ---
.../spi/newproject/BaseGradleWizardIterator.java | 7 +-
.../gradle/spi/newproject/GradleInitWizard.java| 231 +
.../gradle/spi/newproject/TemplateOperation.java | 45 ++-
.../gradle/output/GradleProcessorFactoryTest.java | 52 +--
java/gradle.java/nbproject/project.xml | 2 +-
.../newproject/SimpleApplicationProjectWizard.java | 83 -
.../newproject/SimpleLibraryProjectWizard.java | 57 ---
.../modules/gradle/java/newproject/Wizards.java| 78 +
18 files changed, 1254 insertions(+), 281 deletions(-)
diff --git a/extide/gradle/manifest.mf b/extide/gradle/manifest.mf
index 4588b852e9..396a65a814 100644
--- a/extide/gradle/manifest.mf
+++ b/extide/gradle/manifest.mf
@@ -3,4 +3,5 @@ AutoUpdate-Show-In-Client: true
OpenIDE-Module: org.netbeans.modules.gradle/2
OpenIDE-Module-Layer: org/netbeans/modules/gradle/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/gradle/Bundle.properties
+OpenIDE-Module-Java-Dependencies: Java > 17
OpenIDE-Module-Specification-Version: 2.40
diff --git a/extide/gradle/nbproject/project.properties
b/extide/gradle/nbproject/project.properties
index 54dab6898e..8666db6808 100644
--- a/extide/gradle/nbproject/project.properties
+++ b/extide/gradle/nbproject/project.properties
@@ -17,7 +17,8 @@
file.reference.netbeans-gradle-tooling.jar=release/modules/gradle/netbeans-gradle-tooling.jar
is.autoload=true
-javac.source=1.8
+javac.source=17
+javac.target=17
javac.compilerargs=-Xlint -Xlint:-serial
javadoc.arch=${basedir}/arch.xml
javadoc.apichanges=${basedir}/apichanges.xml
diff --git
a/extide/gradle/src/org/netbeans/modules/gradle/execute/EscapeProcessingOutputStream.java
b/extide/gradle/src/org/netbeans/modules/gradle/execute/EscapeProcessingOutputStream.java
index b6deb583b2..98e60c67cb 100644
---
a/extide/gradle/src/org/netbeans/modules/gradle/execute/EscapeProcessingOutputStream.java
+++
b/extide/gradle/src/org/netbeans/modules/gradle/execute/EscapeProcessingOutputStream.java
@@ -32,7 +32,7 @@ import org.openide.util.RequestProcessor;
*
* @author Laszlo Kishalmi
*/
-class EscapeProcessingOutputStream extends OutputStream {
+public class EscapeProcessingOutputStream extends OutputStream {
private static final RequestProcessor RP = new
RequestProcessor(EscapeProcessingOutputStream.class);
diff --git
a/extide/gradle/src/org/netbeans/modules/gradle/execute/GradlePlainEscapeProcessor.java
b/extide/gradle/src/org/netbeans/modules/gradle/execute/GradlePlainEscapeProcessor.java
index 924b5ad290..ccd562fdfb 100644
---
a/extide/gradle/src/org/netbeans/modules/gradle/execute/GradlePlainEscapeProcessor.java
+++
b/extide/gradle/src/org/netbeans/modules/gradle/execute/GradlePlainEscapeProcessor.java
@@ -28,9 +28,8 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
import org.netbeans.api.project.Project;
+import org.netbeans.modules.gradle.output.GradleProcessorFactory;
import org.openide.util.Lookup;
import org.openide.windows.IOColorPrint;
import org.openide.windows.IOColors;
@@ -57,13 +56,20 @@ public class GradlePlainEscapeProcessor implements
EscapeProcessor {
public GradlePlainEscapeProcessor(InputOutput io, RunConfig cfg, boolean
error) {
this.io = io;
output = new IODisplayer();
-Project prj = cfg.getProject();
-if (prj != null) {
-processorsFromLookup(prj.getLookup(), cfg);
+if (cfg != null) {
+Project prj = cfg.getProject();
+if (prj != null) {
+processorsFromLookup(prj.getLookup(), cfg);
+}
}
outType = error ? ERROR : OUTPUT;
-processors.add(TASK_LINE_PROCESSOR);
-