Merge pull request #4689 from sdedic/oci/vulnerability_count
Changed wording of the vulnerability scan message.
diff --git a/ide/editor.codetemplates/src/org/netbeans/lib/editor/codetemplates/CodeTemplateInsertHandler.java b/ide/editor.codetemplates/src/org/netbeans/lib/editor/codetemplates/CodeTemplateInsertHandler.java
index cb15ca4..5d7f36c 100644
--- a/ide/editor.codetemplates/src/org/netbeans/lib/editor/codetemplates/CodeTemplateInsertHandler.java
+++ b/ide/editor.codetemplates/src/org/netbeans/lib/editor/codetemplates/CodeTemplateInsertHandler.java
@@ -515,7 +515,7 @@
return false;
}
TextSync last = removed.get(removed.size()-1).activeTextSync();
- return last.isCaretMarker() && last.isCompletionInvoke();
+ return last != null && last.isCaretMarker() && last.isCompletionInvoke();
}
void release() {
diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/save/Reformatter.java b/java/java.source.base/src/org/netbeans/modules/java/source/save/Reformatter.java
index 35b1f39..941da1c 100644
--- a/java/java.source.base/src/org/netbeans/modules/java/source/save/Reformatter.java
+++ b/java/java.source.base/src/org/netbeans/modules/java/source/save/Reformatter.java
@@ -1151,7 +1151,7 @@
newline();
else
space();
- } else {
+ } else if (sp.getStartPosition(root, mods) != sp.getStartPosition(root, node.getType())) {
space();
}
} else if (afterAnnotation) {
diff --git a/java/java.source.base/test/unit/src/org/netbeans/modules/java/source/save/FormatingTest.java b/java/java.source.base/test/unit/src/org/netbeans/modules/java/source/save/FormatingTest.java
index a55ea97..a7b245a 100644
--- a/java/java.source.base/test/unit/src/org/netbeans/modules/java/source/save/FormatingTest.java
+++ b/java/java.source.base/test/unit/src/org/netbeans/modules/java/source/save/FormatingTest.java
@@ -6099,6 +6099,61 @@
reformat(doc, content, golden);
}
+ public void testTryWithResources() throws Exception {
+ testFile = new File(getWorkDir(), "Test.java");
+ TestUtilities.copyStringToFile(testFile, "");
+ FileObject testSourceFO = FileUtil.toFileObject(testFile);
+ DataObject testSourceDO = DataObject.find(testSourceFO);
+ EditorCookie ec = (EditorCookie) testSourceDO.getCookie(EditorCookie.class);
+ final Document doc = ec.openDocument();
+ doc.putProperty(Language.class, JavaTokenId.language());
+
+ String content
+ = "package hierbas.del.litoral;\n\n"
+ + "public class Test {\n\n"
+ + " public static void main(String[] args) {\n"
+ + " try (PrintStream out = System.out) {\n"
+ + " System.out.println(\"TEST\");\n"
+ + " } catch (Exception e) {\n"
+ + " System.out.println(\"CATCH\");\n"
+ + " } finally {\n"
+ + " System.out.println(\"FINALLY\");\n"
+ + " }\n"
+ + " }\n"
+ + "}\n";
+ String golden
+ = "package hierbas.del.litoral;\n\n"
+ + "public class Test {\n\n"
+ + " public static void main(String[] args) {\n"
+ + " try (PrintStream out = System.out) {\n"
+ + " System.out.println(\"TEST\");\n"
+ + " } catch (Exception e) {\n"
+ + " System.out.println(\"CATCH\");\n"
+ + " } finally {\n"
+ + " System.out.println(\"FINALLY\");\n"
+ + " }\n"
+ + " }\n"
+ + "}\n";
+ reformat(doc, content, golden);
+
+ content = "package hierbas.del.litoral;\n\n"
+ + "public class Test {\n\n"
+ + " public static void main(String[] args) {\n"
+ + " try ( final PrintStream out = System.out) {\n"
+ + " System.out.println(\"TEST\");\n"
+ + " }\n"
+ + " }\n"
+ + "}\n";
+ golden = "package hierbas.del.litoral;\n\n"
+ + "public class Test {\n\n"
+ + " public static void main(String[] args) {\n"
+ + " try (final PrintStream out = System.out) {\n"
+ + " System.out.println(\"TEST\");\n"
+ + " }\n"
+ + " }\n"
+ + "}\n";
+ reformat(doc, content, golden);
+ }
public void testSynchronizedBlockAfterFor() throws Exception {
testFile = new File(getWorkDir(), "Test.java");
diff --git a/java/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/Utilities.java b/java/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/Utilities.java
index b0accad..431f68a 100644
--- a/java/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/Utilities.java
+++ b/java/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/Utilities.java
@@ -1083,7 +1083,7 @@
final JavaPlatformManager man = JavaPlatformManager.getDefault();
if (select.getSpecification().getVersion() != null) {
for (JavaPlatform p : JavaPlatformManager.getDefault().getInstalledPlatforms()) {
- if (!"j2se".equals(p.getSpecification().getName()) || p.getSpecification().getVersion() == null) continue;
+ if (!p.isValid() || !"j2se".equals(p.getSpecification().getName()) || p.getSpecification().getVersion() == null) continue;
if (p.getSpecification().getVersion().compareTo(select.getSpecification().getVersion()) > 0) {
select = p;
}
