From 004d97e2406468f4b0a7539e968c710744f93a8d Mon Sep 17 00:00:00 2001 From: Eclipse PDE Bot Date: Fri, 7 Mar 2025 02:45:48 +0000 Subject: [PATCH 1/2] Perform clean code of ds/org.eclipse.pde.ds.tests --- .../pde/internal/ds/tests/AbstractDSModelTestCase.java | 9 ++++++--- .../pde/internal/ds/tests/DSv10tov11TestCase.java | 3 ++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/AbstractDSModelTestCase.java b/ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/AbstractDSModelTestCase.java index e9700fbe04..b89bf3536d 100644 --- a/ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/AbstractDSModelTestCase.java +++ b/ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/AbstractDSModelTestCase.java @@ -51,8 +51,9 @@ protected void load(boolean addListener) { try { fModel = new DSModel(fDocument, false); fModel.load(); - if (!fModel.isLoaded() || !fModel.isValid()) + if (!fModel.isLoaded() || !fModel.isValid()) { fail("model cannot be loaded"); + } if (addListener) { fListener = new XMLTextChangeListener(fModel.getDocument()); fModel.addModelChangedListener(fListener); @@ -68,8 +69,9 @@ protected void setXMLContents(StringBuilder body, String newline) { sb.append(newline); sb.append(""); sb.append(newline); - if (body != null) + if (body != null) { sb.append(body.toString()); + } sb.append(newline); sb.append(""); sb.append(newline); @@ -78,8 +80,9 @@ protected void setXMLContents(StringBuilder body, String newline) { protected void reload() { TextEdit[] ops = fListener.getTextOperations(); - if (ops.length == 0) + if (ops.length == 0) { return; + } MultiTextEdit multi = new MultiTextEdit(); multi.addChildren(ops); try { diff --git a/ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/DSv10tov11TestCase.java b/ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/DSv10tov11TestCase.java index bf18e43eb0..f5326ed441 100644 --- a/ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/DSv10tov11TestCase.java +++ b/ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/DSv10tov11TestCase.java @@ -41,8 +41,9 @@ protected void setXMLContents(StringBuilder body, String newline) { sb.append(newline); sb.append(""); sb.append(newline); - if (body != null) + if (body != null) { sb.append(body.toString()); + } sb.append(newline); sb.append(""); sb.append(newline); From 1039051a5c3faf5004e7fb77ceb23727036b76c8 Mon Sep 17 00:00:00 2001 From: Eclipse PDE Bot Date: Fri, 7 Mar 2025 02:53:06 +0000 Subject: [PATCH 2/2] Version bump(s) for 4.36 stream --- ds/org.eclipse.pde.ds.tests/META-INF/MANIFEST.MF | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ds/org.eclipse.pde.ds.tests/META-INF/MANIFEST.MF b/ds/org.eclipse.pde.ds.tests/META-INF/MANIFEST.MF index 816084e2c0..c34ac0c470 100644 --- a/ds/org.eclipse.pde.ds.tests/META-INF/MANIFEST.MF +++ b/ds/org.eclipse.pde.ds.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.pde.ds.tests -Bundle-Version: 1.3.300.qualifier +Bundle-Version: 1.3.400.qualifier Bundle-Activator: org.eclipse.pde.internal.ds.tests.Activator Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)", org.eclipse.pde.core;bundle-version="[3.3.0,4.0.0)",