Perform clean code of team/bundles/org.eclipse.compare.core

Author: eclipse-platform-bot

team/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/LCS.java

@@ -168,8 +168,9 @@ private int lcs_rec(
 	}
 
 	private void worked(SubMonitor subMonitor, int work) {
-		if (subMonitor.isCanceled())
+		if (subMonitor.isCanceled()) {
 			throw new OperationCanceledException();
+		}
 		subMonitor.worked(work);
 	}
 

team/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/TextLineLCS.java

@@ -30,8 +30,9 @@ public TextLineLCS(TextLine[] lines1, TextLine[] lines2) {
 
 	public TextLine[][] getResult() {
 		int length = getLength();
-		if (length == 0)
+		if (length == 0) {
 			return new TextLine[2][0];
+		}
 		TextLine[][] result = new TextLine[2][];
 
 		// compact and shift the result

team/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/DiffProject.java

@@ -39,8 +39,9 @@ public DiffProject(String project) {
 	 */
 	public void add(FilePatch2 diff) {
 		this.fDiffs.add(diff);
-		if (diff.getProject() != this)
+		if (diff.getProject() != this) {
 			diff.setProject(this);
+		}
 	}
 
 	/**

team/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/FileDiffResult.java

@@ -132,8 +132,9 @@ protected List<String> getLines(ReaderCreator content, boolean create) {
 	}
 
 	protected boolean isEmpty(ReaderCreator content) {
-		if (content == null)
+		if (content == null) {
 			return true;
+		}
 		return LineReader.load(content, false).isEmpty();
 	}
 
@@ -170,19 +171,22 @@ public boolean getDiffProblem() {
 	 * @return true if this Diff or any of its children Hunks have a problem, false if it doesn't
 	 */
 	public boolean containsProblems() {
-		if (this.fDiffProblem)
+		if (this.fDiffProblem) {
 			return true;
+		}
 		for (HunkResult result : this.fHunkResults.values()) {
-			if (!result.isOK())
+			if (!result.isOK()) {
 				return true;
+			}
 		}
 		return false;
 	}
 
 	public String getLabel() {
 		String label= getTargetPath().toString();
-		if (this.fDiffProblem)
+		if (this.fDiffProblem) {
 			return NLS.bind(Messages.FileDiffResult_2, new String[] {label, this.fErrorMessage});
+		}
 		return label;
 	}
 
@@ -206,8 +210,9 @@ public List<String> getLines() {
 	 * @return the fuzz factor or <code>-1</code> if no hunks could be matched
 	 */
 	public int calculateFuzz(List<String> lines, IProgressMonitor monitor) {
-		if (monitor == null)
+		if (monitor == null) {
 			monitor = new NullProgressMonitor();
+		}
 		this.fBeforeLines = new ArrayList<>(lines);
 		// TODO: What about deletions?
 		if (this.fDiff.getDiffType(getConfiguration().isReversed()) == FilePatch2.ADDITION) {
@@ -226,8 +231,9 @@ public int calculateFuzz(List<String> lines, IProgressMonitor monitor) {
 			result.setShift(shift);
 			int fuzz = result.calculateFuzz(lines, monitor);
 			shift = result.getShift();
-			if (fuzz > highestFuzz)
+			if (fuzz > highestFuzz) {
 				highestFuzz = fuzz;
+			}
 			monitor.worked(1);
 		}
 		this.fAfterLines = lines;
@@ -252,8 +258,9 @@ public List<Hunk> getFailedHunks() {
 		IHunk[] hunks = this.fDiff.getHunks();
 		for (IHunk hunk : hunks) {
 			HunkResult result = this.fHunkResults.get(hunk);
-			if (result != null && !result.isOK())
+			if (result != null && !result.isOK()) {
 				failedHunks.add(result.getHunk());
+			}
 		}
 		return failedHunks;
 	}

team/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/FilePatch2.java

@@ -80,10 +80,12 @@ public DiffProject getProject() {
 	 * @param diffProject the parent project
 	 */
 	void setProject(DiffProject diffProject) {
-		if (this.fProject == diffProject)
+		if (this.fProject == diffProject) {
 			return;
-		if (this.fProject != null)
+		}
+		if (this.fProject != null) {
 			this.fProject.remove(this);
+		}
 		this.fProject= diffProject;
 	}
 
@@ -95,14 +97,17 @@ void setProject(DiffProject diffProject) {
 	 */
 	public IPath getPath(boolean reverse) {
 		if (getDiffType(reverse) == ADDITION) {
-			if (reverse)
+			if (reverse) {
 				return this.fOldPath;
+			}
 			return this.fNewPath;
 		}
-		if (reverse && this.fNewPath != null)
+		if (reverse && this.fNewPath != null) {
 			return this.fNewPath;
-		if (this.fOldPath != null)
+		}
+		if (this.fOldPath != null) {
 			return this.fOldPath;
+		}
 		return this.fNewPath;
 	}
 
@@ -178,8 +183,9 @@ public int getDiffType(boolean reverse) {
 	 */
 	public IPath getStrippedPath(int strip, boolean reverse) {
 		IPath path= getPath(reverse);
-		if (strip > 0 && strip < path.segmentCount())
+		if (strip > 0 && strip < path.segmentCount()) {
 			path= path.removeFirstSegments(strip);
+		}
 		return path;
 	}
 
@@ -191,10 +197,12 @@ public int segmentCount() {
 		//Update prefix count - go through all of the diffs and find the smallest
 		//path segment contained in all diffs.
 		int length= 99;
-		if (this.fOldPath != null)
+		if (this.fOldPath != null) {
 			length= Math.min(length, this.fOldPath.segmentCount());
-		if (this.fNewPath != null)
+		}
+		if (this.fNewPath != null) {
 			length= Math.min(length, this.fNewPath.segmentCount());
+		}
 		return length;
 	}
 
@@ -212,8 +220,9 @@ public IPath getTargetPath(PatchConfiguration configuration) {
 	}
 
 	public FilePatch2 asRelativeDiff() {
-		if (this.fProject == null)
+		if (this.fProject == null) {
 			return this;
+		}
 		IPath adjustedOldPath = null;
 		if (this.fOldPath != null) {
 			adjustedOldPath = new Path(null, this.fProject.getName()).append(this.fOldPath);