Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Vogel2019-09-05 06:00:43 -0400
committerKarsten Thoms2019-09-16 18:00:39 -0400
commit23762eaa5cbadc8a9b3271ecb4c65e309a5eb7d0 (patch)
treef05ce26b77705ea7b7ee887ce576bef4442f374e
parentbb023c36e3964193edf7f82e8fee3478f33b30cc (diff)
downloadeclipse.platform.team-23762eaa5cbadc8a9b3271ecb4c65e309a5eb7d0.tar.gz
eclipse.platform.team-23762eaa5cbadc8a9b3271ecb4c65e309a5eb7d0.tar.xz
eclipse.platform.team-23762eaa5cbadc8a9b3271ecb4c65e309a5eb7d0.zip
Removing ; behind //$NON-NLS-1$; to make Sonar happierI20190918-0300I20190917-1800
See https://community.sonarsource.com/t/sonarlint-for-eclipse-report-wrong-warning-for-this-block-of-commented-out-lines-of-code-should-be-removed/11036 Also version updates included Change-Id: I3c911a062f6b20e6b66cec7d9d81ca692a36c8a4 Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com> Also-by: Karsten Thoms <karsten.thoms@itemis.de>
-rw-r--r--bundles/org.eclipse.compare.core/META-INF/MANIFEST.MF2
-rw-r--r--bundles/org.eclipse.compare.core/pom.xml2
-rw-r--r--bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/Hunk.java8
3 files changed, 5 insertions, 7 deletions
diff --git a/bundles/org.eclipse.compare.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.compare.core/META-INF/MANIFEST.MF
index 2c4329b52..6c5e184c2 100644
--- a/bundles/org.eclipse.compare.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.compare.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.compare.core
-Bundle-Version: 3.6.600.qualifier
+Bundle-Version: 3.6.700.qualifier
Bundle-Activator: org.eclipse.compare.internal.core.ComparePlugin
Bundle-Vendor: %providerName
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)"
diff --git a/bundles/org.eclipse.compare.core/pom.xml b/bundles/org.eclipse.compare.core/pom.xml
index b1c9532d7..f03ccb2bb 100644
--- a/bundles/org.eclipse.compare.core/pom.xml
+++ b/bundles/org.eclipse.compare.core/pom.xml
@@ -19,6 +19,6 @@
</parent>
<groupId>org.eclipse.compare</groupId>
<artifactId>org.eclipse.compare.core</artifactId>
- <version>3.6.600-SNAPSHOT</version>
+ <version>3.6.700-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/Hunk.java b/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/Hunk.java
index 3a4f3dae8..a62f8e730 100644
--- a/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/Hunk.java
+++ b/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/Hunk.java
@@ -17,9 +17,7 @@ import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
-import org.eclipse.compare.patch.IFilePatchResult;
-import org.eclipse.compare.patch.IHunk;
-import org.eclipse.compare.patch.PatchConfiguration;
+import org.eclipse.compare.patch.*;
import org.eclipse.core.runtime.Assert;
/**
@@ -362,7 +360,7 @@ public class Hunk implements IHunk {
&& contextLines.size() >= fuzz
&& !checkPrecedingContextLines(configuration, lines,
fuzz, pos, contextLines))
- Assert.isTrue(false, "doPatch: preceding context lines don't match, even though fuzz factor has been used"); //$NON-NLS-1$;
+ Assert.isTrue(false, "doPatch: preceding context lines don't match, even though fuzz factor has been used"); //$NON-NLS-1$
// else if there is less or equal context line to the fuzz
// factor we ignore them all and treat as matching
@@ -381,7 +379,7 @@ public class Hunk implements IHunk {
&& contextLines.size() >= fuzz
&& !checkPrecedingContextLines(configuration, lines,
fuzz, pos, contextLines))
- Assert.isTrue(false, "doPatch: preceding context lines don't match, even though fuzz factor has been used"); //$NON-NLS-1$;
+ Assert.isTrue(false, "doPatch: preceding context lines don't match, even though fuzz factor has been used"); //$NON-NLS-1$
precedingLinesChecked = true;
contextLines.clear();

Back to the top