[netbeans] 03/07: [NETBEANS-2348] Added 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 6ffcaba12406d67b86a50164fac147921f14a2ab
Author: Laszlo Kishalmi
AuthorDate: Sat Apr 6 10:55:46 2019 -0700
[NETBEANS-2348] Added support for 'Test Package'.
---
.../gradle/java/GradleJavaTokenProvider.java | 32 ++
.../modules/gradle/java/JavaActionProvider.java| 30 +---
.../modules/gradle/java/action-mapping.xml | 3 ++
.../modules/gradle/ActionProviderImpl.java | 19 +++--
.../gradle/execute/GradleDaemonExecutor.java | 4 +--
5 files changed, 62 insertions(+), 26 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 d396a45..980c122 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
@@ -57,11 +57,12 @@ import org.openide.util.Lookup;
public class GradleJavaTokenProvider implements ReplaceTokenProvider {
private static final Set SUPPORTED =
Collections.unmodifiableSet(new HashSet(Arrays.asList(
-"selectedClass",
-"selectedMethod",
-"affectedBuildTasks"
+"selectedClass", //NOI18N
+"selectedMethod", //NOI18N
+"selectedPackage", //NOI18N
+"affectedBuildTasks" //NOI18N
)));
-
+
final Project project;
public GradleJavaTokenProvider(Project project) {
@@ -76,22 +77,29 @@ public class GradleJavaTokenProvider implements
ReplaceTokenProvider {
@Override
public Map createReplacements(String action, Lookup
context) {
Map ret = new HashMap<>();
-processSelectedClass(ret, context);
+processSelectedPackageAndClass(ret, context);
processSelectedMethod(ret, context);
processSourceSets(ret, context);
return ret;
}
-private void processSelectedClass(final Map map, Lookup
context) {
+private void processSelectedPackageAndClass(final Map map,
Lookup context) {
FileObject fo = RunUtils.extractFileObjectfromLookup(context);
GradleJavaProject gjp = GradleJavaProject.get(project);
if ((gjp != null) && (fo != null)) {
File f = FileUtil.toFile(fo);
GradleJavaSourceSet sourceSet = gjp.containingSourceSet(f);
-if (sourceSet != null) {
-String relPath = sourceSet.relativePath(f);
-String className = relPath.substring(0,
relPath.lastIndexOf('.')).replace('/', '.');
-map.put("selectedClass", className);
+if (sourceSet != null) {
+if (f.isFile()) {
+String relPath = sourceSet.relativePath(f);
+String className = (relPath.lastIndexOf('.') > 0 ?
+relPath.substring(0, relPath.lastIndexOf('.')) :
+relPath).replace('/', '.');
+map.put("selectedClass", className); //NOI18N
+f = f.getParentFile();
+}
+String pkg = sourceSet.relativePath(f).replace('/', '.');
+map.put("selectedPackage", pkg); //NOI18N
}
}
}
@@ -102,7 +110,7 @@ public class GradleJavaTokenProvider implements
ReplaceTokenProvider {
String methodName = method != null ? method.getMethodName() : null;
if (fo != null) {
String selectedMethod = evaluateSingleMethod(fo, methodName);
- map.put("selectedMethod", selectedMethod);
+ map.put("selectedMethod", selectedMethod); //NOI18N
}
}
@@ -125,7 +133,7 @@ public class GradleJavaTokenProvider implements
ReplaceTokenProvider {
for (String task : buildTasks) {
tasks.append(task).append(' ');
}
-map.put("affectedBuildTasks", tasks.toString());
+map.put("affectedBuildTasks", tasks.toString()); //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 305c786..3add6f2 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
@@ -25,6 +25,7 @@ import org.netbeans.modules.gradle.java.api.GradleJavaProject;
import org.netbeans.modules.gradle.java.api.GradleJavaSourceSet;
import org.netbeans.modules.gradle.spi.actions.DefaultGradleActionsProvider;
import org.netbeans.modules.gradle.spi.actions.GradleActions
[netbeans] 03/07: [NETBEANS-2348] Added 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 152d90d3f2630a98a19476b7b287794ceb525b1c
Author: Laszlo Kishalmi
AuthorDate: Sat Apr 6 10:55:46 2019 -0700
[NETBEANS-2348] Added support for 'Test Package'.
---
.../gradle/java/GradleJavaTokenProvider.java | 32 ++
.../modules/gradle/java/JavaActionProvider.java| 30 +---
.../modules/gradle/java/action-mapping.xml | 3 ++
.../modules/gradle/ActionProviderImpl.java | 19 +++--
.../gradle/execute/GradleDaemonExecutor.java | 4 +--
5 files changed, 62 insertions(+), 26 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 d396a45..980c122 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
@@ -57,11 +57,12 @@ import org.openide.util.Lookup;
public class GradleJavaTokenProvider implements ReplaceTokenProvider {
private static final Set SUPPORTED =
Collections.unmodifiableSet(new HashSet(Arrays.asList(
-"selectedClass",
-"selectedMethod",
-"affectedBuildTasks"
+"selectedClass", //NOI18N
+"selectedMethod", //NOI18N
+"selectedPackage", //NOI18N
+"affectedBuildTasks" //NOI18N
)));
-
+
final Project project;
public GradleJavaTokenProvider(Project project) {
@@ -76,22 +77,29 @@ public class GradleJavaTokenProvider implements
ReplaceTokenProvider {
@Override
public Map createReplacements(String action, Lookup
context) {
Map ret = new HashMap<>();
-processSelectedClass(ret, context);
+processSelectedPackageAndClass(ret, context);
processSelectedMethod(ret, context);
processSourceSets(ret, context);
return ret;
}
-private void processSelectedClass(final Map map, Lookup
context) {
+private void processSelectedPackageAndClass(final Map map,
Lookup context) {
FileObject fo = RunUtils.extractFileObjectfromLookup(context);
GradleJavaProject gjp = GradleJavaProject.get(project);
if ((gjp != null) && (fo != null)) {
File f = FileUtil.toFile(fo);
GradleJavaSourceSet sourceSet = gjp.containingSourceSet(f);
-if (sourceSet != null) {
-String relPath = sourceSet.relativePath(f);
-String className = relPath.substring(0,
relPath.lastIndexOf('.')).replace('/', '.');
-map.put("selectedClass", className);
+if (sourceSet != null) {
+if (f.isFile()) {
+String relPath = sourceSet.relativePath(f);
+String className = (relPath.lastIndexOf('.') > 0 ?
+relPath.substring(0, relPath.lastIndexOf('.')) :
+relPath).replace('/', '.');
+map.put("selectedClass", className); //NOI18N
+f = f.getParentFile();
+}
+String pkg = sourceSet.relativePath(f).replace('/', '.');
+map.put("selectedPackage", pkg); //NOI18N
}
}
}
@@ -102,7 +110,7 @@ public class GradleJavaTokenProvider implements
ReplaceTokenProvider {
String methodName = method != null ? method.getMethodName() : null;
if (fo != null) {
String selectedMethod = evaluateSingleMethod(fo, methodName);
- map.put("selectedMethod", selectedMethod);
+ map.put("selectedMethod", selectedMethod); //NOI18N
}
}
@@ -125,7 +133,7 @@ public class GradleJavaTokenProvider implements
ReplaceTokenProvider {
for (String task : buildTasks) {
tasks.append(task).append(' ');
}
-map.put("affectedBuildTasks", tasks.toString());
+map.put("affectedBuildTasks", tasks.toString()); //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 305c786..3add6f2 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
@@ -25,6 +25,7 @@ import org.netbeans.modules.gradle.java.api.GradleJavaProject;
import org.netbeans.modules.gradle.java.api.GradleJavaSourceSet;
import org.netbeans.modules.gradle.spi.actions.DefaultGradleActionsProvider;
import org.netbeans.modules.gradle.spi.actions.GradleActions
