diff --git a/build.xml b/build.xml index 65796de..88ba593 100644 --- a/build.xml +++ b/build.xml @@ -58,6 +58,7 @@ patches/8260.diff patches/8280.diff patches/8289.diff + patches/8690.diff patches/7893-draft.diff patches/8442-draft.diff patches/8460-draft.diff diff --git a/patches/8690.diff b/patches/8690.diff new file mode 100644 index 0000000..b0ade2d --- /dev/null +++ b/patches/8690.diff @@ -0,0 +1,41 @@ +diff --git a/java/java.file.launcher/src/org/netbeans/modules/java/file/launcher/actions/SingleJavaSourceRunActionProvider.java b/java/java.file.launcher/src/org/netbeans/modules/java/file/launcher/actions/SingleJavaSourceRunActionProvider.java +index 05c9d1ff1ccd..c279d6d7b868 100644 +--- a/java/java.file.launcher/src/org/netbeans/modules/java/file/launcher/actions/SingleJavaSourceRunActionProvider.java ++++ b/java/java.file.launcher/src/org/netbeans/modules/java/file/launcher/actions/SingleJavaSourceRunActionProvider.java +@@ -19,6 +19,7 @@ + package org.netbeans.modules.java.file.launcher.actions; + + import java.nio.charset.Charset; ++import java.util.Locale; + import java.util.Map; + import java.util.WeakHashMap; + import java.util.concurrent.Future; +@@ -55,6 +56,19 @@ public String[] getSupportedActions() { + }; + } + ++ private String getTaskName(String command, String fileName){ ++ if(command == null || command.isEmpty()) return fileName; ++ String action = command.contains(".") ++ ? command.substring(0, command.indexOf('.')) ++ : command; ++ String capitalized = action.substring(0, 1).toUpperCase(Locale.ROOT) ++ + action.substring(1).toLowerCase(Locale.ROOT); ++ String baseName = fileName.contains(".") ++ ? fileName.substring(0, fileName.lastIndexOf('.')) ++ : fileName; ++ return String.format("%s (%s)", capitalized, baseName); ++ } ++ + @NbBundle.Messages({ + "CTL_SingleJavaFile=Running Single Java File" + }) +@@ -91,7 +105,7 @@ public void invokeAction(String command, Lookup context) throws IllegalArgumentE + LaunchProcess process = invokeActionHelper(command, fileObject, params); + ExecutionService exeService = ExecutionService.newService( + process, +- descriptor, fileObject.getNameExt()); ++ descriptor, this.getTaskName(command, fileObject.getNameExt())); + + Future future = exeService.run(); + if (NbPreferences.forModule(JavaPlatformManager.class).getBoolean(SingleSourceFileUtil.GLOBAL_STOP_AND_RUN_OPTION, false)) {