[netbeans] 04/07: [NETBEANS-2348] Less intrustive support for Test Package.
This is an automated email from the ASF dual-hosted git repository.
lkishalmi pushed a commit to branch release110-gradle-patch-1
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit b58d293919be829f088863016240a1e5c1dd0609
Author: Laszlo Kishalmi
AuthorDate: Fri Apr 12 20:00:58 2019 -0700
[NETBEANS-2348] Less intrustive support for Test Package.
---
.../gradle/java/GradleJavaTokenProvider.java | 6 +-
.../modules/gradle/java/JavaActionProvider.java| 65 ++
.../modules/gradle/java/action-mapping.xml | 3 -
.../modules/gradle/ActionProviderImpl.java | 19 +--
4 files changed, 34 insertions(+), 59 deletions(-)
diff --git
a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/GradleJavaTokenProvider.java
b/groovy/gradle.java/src/org/netbeans/modules/gradle/java/GradleJavaTokenProvider.java
index 980c122..87018fb 100644
---
a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/GradleJavaTokenProvider.java
+++
b/groovy/gradle.java/src/org/netbeans/modules/gradle/java/GradleJavaTokenProvider.java
@@ -59,7 +59,6 @@ public class GradleJavaTokenProvider implements
ReplaceTokenProvider {
private static final Set SUPPORTED =
Collections.unmodifiableSet(new HashSet(Arrays.asList(
"selectedClass", //NOI18N
"selectedMethod", //NOI18N
-"selectedPackage", //NOI18N
"affectedBuildTasks" //NOI18N
)));
@@ -97,9 +96,10 @@ public class GradleJavaTokenProvider implements
ReplaceTokenProvider {
relPath).replace('/', '.');
map.put("selectedClass", className); //NOI18N
f = f.getParentFile();
+} else {
+String pkg = sourceSet.relativePath(f).replace('/', '.');
+map.put("selectedClass", pkg + "*"); //NOI18N
}
-String pkg = sourceSet.relativePath(f).replace('/', '.');
-map.put("selectedPackage", pkg); //NOI18N
}
}
}
diff --git
a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/JavaActionProvider.java
b/groovy/gradle.java/src/org/netbeans/modules/gradle/java/JavaActionProvider.java
index 3add6f2..4aab8cb 100644
---
a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/JavaActionProvider.java
+++
b/groovy/gradle.java/src/org/netbeans/modules/gradle/java/JavaActionProvider.java
@@ -47,7 +47,6 @@ import org.openide.util.lookup.ServiceProvider;
@ServiceProvider(service = GradleActionsProvider.class)
public class JavaActionProvider extends DefaultGradleActionsProvider {
-public static final String COMMAND_TEST_SINGLE_PACKAGE =
"test.single.package"; //NOI18N
private static final String GATLING_PLUGIN =
"com.github.lkishalmi.gatling"; //NOI18N
private static final String SIMULATION_POSTFIX = "Simulation.scala";
//NOI18N
@@ -67,7 +66,6 @@ public class JavaActionProvider extends
DefaultGradleActionsProvider {
COMMAND_RUN_SINGLE,
COMMAND_DEBUG_SINGLE,
COMMAND_COMPILE_SINGLE,
-COMMAND_TEST_SINGLE_PACKAGE
};
public JavaActionProvider() {
@@ -86,47 +84,42 @@ public class JavaActionProvider extends
DefaultGradleActionsProvider {
} else {
ret = false;
GradleJavaProject gjp = GradleJavaProject.get(project);
-switch (action) {
-case COMMAND_COMPILE_SINGLE:
-FileBuiltQuery.Status status =
FileBuiltQuery.getStatus(fo);
-ret = status == null || !status.isBuilt();
-break;
-case COMMAND_DEBUG_SINGLE:
-case COMMAND_RUN_SINGLE: {
-if (RunUtils.isAugmentedBuildEnabled(project) &&
(gjp != null)) {
-File f = FileUtil.toFile(fo);
-GradleJavaSourceSet sourceSet =
gjp.containingSourceSet(f);
-if ((sourceSet != null) && fo.isData()) {
-String relPath = sourceSet.relativePath(f);
-if (relPath != null) {
-relPath = relPath.substring(0,
relPath.lastIndexOf('.')).replace('/', '.');
-ret = SourceUtils.isMainClass(relPath,
ClasspathInfo.create(fo), true);
+if ( gjp != null ) {
+switch (action) {
+case COMMAND_COMPILE_SINGLE:
+FileBuiltQuery.Status status =
FileBuiltQuery.getStatus(fo);
+ret = status == null || !status.isBuilt();
+break;
+case COMMAND_DEBUG_SINGLE:
+case
[netbeans] 04/07: [NETBEANS-2348] Less intrustive support for Test Package.
This is an automated email from the ASF dual-hosted git repository.
lkishalmi pushed a commit to branch release110-gradle-patch-1
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit e2dbd2756ab0f03d1e977d168db6519f0bed7dfd
Author: Laszlo Kishalmi
AuthorDate: Fri Apr 12 20:00:58 2019 -0700
[NETBEANS-2348] Less intrustive support for Test Package.
---
.../gradle/java/GradleJavaTokenProvider.java | 6 +-
.../modules/gradle/java/JavaActionProvider.java| 65 ++
.../modules/gradle/java/action-mapping.xml | 3 -
.../modules/gradle/ActionProviderImpl.java | 19 +--
4 files changed, 34 insertions(+), 59 deletions(-)
diff --git
a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/GradleJavaTokenProvider.java
b/groovy/gradle.java/src/org/netbeans/modules/gradle/java/GradleJavaTokenProvider.java
index 980c122..87018fb 100644
---
a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/GradleJavaTokenProvider.java
+++
b/groovy/gradle.java/src/org/netbeans/modules/gradle/java/GradleJavaTokenProvider.java
@@ -59,7 +59,6 @@ public class GradleJavaTokenProvider implements
ReplaceTokenProvider {
private static final Set SUPPORTED =
Collections.unmodifiableSet(new HashSet(Arrays.asList(
"selectedClass", //NOI18N
"selectedMethod", //NOI18N
-"selectedPackage", //NOI18N
"affectedBuildTasks" //NOI18N
)));
@@ -97,9 +96,10 @@ public class GradleJavaTokenProvider implements
ReplaceTokenProvider {
relPath).replace('/', '.');
map.put("selectedClass", className); //NOI18N
f = f.getParentFile();
+} else {
+String pkg = sourceSet.relativePath(f).replace('/', '.');
+map.put("selectedClass", pkg + "*"); //NOI18N
}
-String pkg = sourceSet.relativePath(f).replace('/', '.');
-map.put("selectedPackage", pkg); //NOI18N
}
}
}
diff --git
a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/JavaActionProvider.java
b/groovy/gradle.java/src/org/netbeans/modules/gradle/java/JavaActionProvider.java
index 3add6f2..4aab8cb 100644
---
a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/JavaActionProvider.java
+++
b/groovy/gradle.java/src/org/netbeans/modules/gradle/java/JavaActionProvider.java
@@ -47,7 +47,6 @@ import org.openide.util.lookup.ServiceProvider;
@ServiceProvider(service = GradleActionsProvider.class)
public class JavaActionProvider extends DefaultGradleActionsProvider {
-public static final String COMMAND_TEST_SINGLE_PACKAGE =
"test.single.package"; //NOI18N
private static final String GATLING_PLUGIN =
"com.github.lkishalmi.gatling"; //NOI18N
private static final String SIMULATION_POSTFIX = "Simulation.scala";
//NOI18N
@@ -67,7 +66,6 @@ public class JavaActionProvider extends
DefaultGradleActionsProvider {
COMMAND_RUN_SINGLE,
COMMAND_DEBUG_SINGLE,
COMMAND_COMPILE_SINGLE,
-COMMAND_TEST_SINGLE_PACKAGE
};
public JavaActionProvider() {
@@ -86,47 +84,42 @@ public class JavaActionProvider extends
DefaultGradleActionsProvider {
} else {
ret = false;
GradleJavaProject gjp = GradleJavaProject.get(project);
-switch (action) {
-case COMMAND_COMPILE_SINGLE:
-FileBuiltQuery.Status status =
FileBuiltQuery.getStatus(fo);
-ret = status == null || !status.isBuilt();
-break;
-case COMMAND_DEBUG_SINGLE:
-case COMMAND_RUN_SINGLE: {
-if (RunUtils.isAugmentedBuildEnabled(project) &&
(gjp != null)) {
-File f = FileUtil.toFile(fo);
-GradleJavaSourceSet sourceSet =
gjp.containingSourceSet(f);
-if ((sourceSet != null) && fo.isData()) {
-String relPath = sourceSet.relativePath(f);
-if (relPath != null) {
-relPath = relPath.substring(0,
relPath.lastIndexOf('.')).replace('/', '.');
-ret = SourceUtils.isMainClass(relPath,
ClasspathInfo.create(fo), true);
+if ( gjp != null ) {
+switch (action) {
+case COMMAND_COMPILE_SINGLE:
+FileBuiltQuery.Status status =
FileBuiltQuery.getStatus(fo);
+ret = status == null || !status.isBuilt();
+break;
+case COMMAND_DEBUG_SINGLE:
+case
