Perform clean code of bundles/org.eclipse.ltk.core.refactoring

Author: eclipse-platform-bot

bundles/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/CategorizedTextEditGroup.java

@@ -31,7 +31,7 @@
  */
 public class CategorizedTextEditGroup extends TextEditGroup {
 
-	private GroupCategorySet fGroupCategories;
+	private final GroupCategorySet fGroupCategories;
 
 	/**
 	 * Creates a new text edit group with the given name and group

bundles/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/Change.java

@@ -183,8 +183,9 @@ public Change getParent() {
 	 * @param parent the parent of this change or <code>null</code>
 	 */
 	/* package */ void setParent(Change parent) {
-		if (parent != null)
+		if (parent != null) {
 			Assert.isTrue(fParent == null);
+		}
 		fParent= parent;
 	}
 
@@ -292,10 +293,12 @@ public Object[] getAffectedObjects() {
 	@Override
 	public <T> T getAdapter(Class<T> adapter) {
 		T result= Platform.getAdapterManager().getAdapter(this, adapter);
-		if (result != null)
+		if (result != null) {
 			return result;
-		if (fParent != null)
+		}
+		if (fParent != null) {
 			return fParent.getAdapter(adapter);
+		}
 		return null;
 	}
 }

bundles/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/CheckConditionsOperation.java

@@ -41,8 +41,8 @@
  */
 public class CheckConditionsOperation implements IWorkspaceRunnable {
 
-	private Refactoring fRefactoring;
-	private int fStyle;
+	private final Refactoring fRefactoring;
+	private final int fStyle;
 	private RefactoringStatus fStatus;
 
 	/** Flag indicating that no conditions will be checked */
@@ -74,16 +74,18 @@ public CheckConditionsOperation(Refactoring refactoring, int style) {
 
 	@Override
 	public void run(IProgressMonitor pm) throws CoreException {
-		if (pm == null)
+		if (pm == null) {
 			pm= new NullProgressMonitor();
+		}
 		try {
 			fStatus= null;
-			if ((fStyle & ALL_CONDITIONS) == ALL_CONDITIONS)
+			if ((fStyle & ALL_CONDITIONS) == ALL_CONDITIONS) {
 				fStatus= fRefactoring.checkAllConditions(pm);
-			else if ((fStyle & INITIAL_CONDITONS) == INITIAL_CONDITONS)
+			} else if ((fStyle & INITIAL_CONDITONS) == INITIAL_CONDITONS) {
 				fStatus= fRefactoring.checkInitialConditions(pm);
-			else if ((fStyle & FINAL_CONDITIONS) == FINAL_CONDITIONS)
+			} else if ((fStyle & FINAL_CONDITIONS) == FINAL_CONDITIONS) {
 				fStatus= fRefactoring.checkFinalConditions(pm);
+			}
 		} finally {
 			pm.done();
 		}
@@ -123,12 +125,13 @@ private boolean checkStyle(int style) {
 	}
 
 	/* package */ int getTicks(RefactoringTickProvider provider) {
-		if ((fStyle & ALL_CONDITIONS) == ALL_CONDITIONS)
+		if ((fStyle & ALL_CONDITIONS) == ALL_CONDITIONS) {
 			return provider.getCheckAllConditionsTicks();
-		else if ((fStyle & INITIAL_CONDITONS) == INITIAL_CONDITONS)
+		} else if ((fStyle & INITIAL_CONDITONS) == INITIAL_CONDITONS) {
 			return provider.getCheckInitialConditionsTicks();
-		else if ((fStyle & FINAL_CONDITIONS) == FINAL_CONDITIONS)
+		} else if ((fStyle & FINAL_CONDITIONS) == FINAL_CONDITIONS) {
 			return provider.getCheckFinalConditionsTicks();
+		}
 		return 0;
 	}
 }

bundles/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/CompositeChange.java

@@ -44,8 +44,8 @@
  */
 public class CompositeChange extends Change {
 
-	private String fName;
-	private List<Change> fChanges;
+	private final String fName;
+	private final List<Change> fChanges;
 	private boolean fIsSynthetic;
 	private Change fUndoUntilException;
 
@@ -269,17 +269,19 @@ public Change perform(IProgressMonitor pm) throws CoreException {
 		try {
 			for (Iterator<Change> iter= fChanges.iterator(); iter.hasNext();) {
 				change= iter.next();
-				if (canceled && !internalProcessOnCancel(change))
+				if (canceled && !internalProcessOnCancel(change)) {
 					continue;
+				}
 
 				if (change.isEnabled()) {
 					Change undoChange= null;
 					try {
 						undoChange= change.perform(sm.split(1));
 					} catch(OperationCanceledException e) {
 						canceled= true;
-						if (!internalContinueOnCancel())
+						if (!internalContinueOnCancel()) {
 							throw e;
+						}
 						undos= null;
 					}
 					if (undos != null) {
@@ -309,8 +311,9 @@ public void handleException(Throwable exception) {
 					}
 				});
 			}
-			if (canceled)
+			if (canceled) {
 				throw new OperationCanceledException();
+			}
 			if (undos != null) {
 				Collections.reverse(undos);
 				return createUndoChange(undos.toArray(new Change[undos.size()]));
@@ -460,13 +463,15 @@ protected Change createUndoChange(Change[] childUndos) {
 
 	@Override
 	public Object[] getAffectedObjects() {
-		if (fChanges.isEmpty())
+		if (fChanges.isEmpty()) {
 			return new Object[0];
+		}
 		List<Object> result= new ArrayList<>();
 		for (Change change : fChanges) {
 			Object[] affectedObjects= change.getAffectedObjects();
-			if (affectedObjects == null)
+			if (affectedObjects == null) {
 				return null;
+			}
 			result.addAll(Arrays.asList(affectedObjects));
 		}
 		return result.toArray();
@@ -486,8 +491,9 @@ public Object getModifiedElement() {
 	public ChangeDescriptor getDescriptor() {
 		for (Change change : fChanges) {
 			final ChangeDescriptor descriptor= change.getDescriptor();
-			if (descriptor != null)
+			if (descriptor != null) {
 				return descriptor;
+			}
 		}
 		return null;
 	}

bundles/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/CreateChangeOperation.java

@@ -51,7 +51,7 @@
  */
 public class CreateChangeOperation implements IWorkspaceRunnable {
 
-	private Refactoring fRefactoring;
+	private final Refactoring fRefactoring;
 
 	private CheckConditionsOperation fCheckConditionOperation;
 	private int fConditionCheckingFailedSeverity;
@@ -146,8 +146,9 @@ public Change getChange() {
 					@Override
 					public final ChangeDescriptor getDescriptor() {
 						String name= fChange.getName();
-						if (name.length() == 0)
+						if (name.length() == 0) {
 							name= RefactoringCoreMessages.CreateChangeOperation_unknown_Refactoring;
+						}
 						UnknownRefactoringDescriptor unknownDescriptor= new UnknownRefactoringDescriptor(name);
 						return new RefactoringChangeDescriptor(unknownDescriptor);
 					}
@@ -167,8 +168,9 @@ public final ChangeDescriptor getDescriptor() {
 	 * @return the status of the condition checking
 	 */
 	public RefactoringStatus getConditionCheckingStatus() {
-		if (fCheckConditionOperation != null)
+		if (fCheckConditionOperation != null) {
 			return fCheckConditionOperation.getStatus();
+		}
 		return null;
 	}
 
@@ -181,8 +183,9 @@ public RefactoringStatus getConditionCheckingStatus() {
 	 * @return the condition checking style
 	 */
 	public int getConditionCheckingStyle() {
-		if (fCheckConditionOperation != null)
+		if (fCheckConditionOperation != null) {
 			return fCheckConditionOperation.getStyle();
+		}
 		return CheckConditionsOperation.NONE;
 	}
 }

bundles/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/DocumentChange.java

@@ -48,7 +48,7 @@
  */
 public class DocumentChange extends TextChange {
 
-	private IDocument fDocument;
+	private final IDocument fDocument;
 	private int fLength;
 
 	/**

bundles/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/FileStatusContext.java

@@ -32,8 +32,8 @@
  */
 public class FileStatusContext extends RefactoringStatusContext {
 
-	private IFile fFile;
-	private IRegion fSourceRegion;
+	private final IFile fFile;
+	private final IRegion fSourceRegion;
 
 	/**
 	 * Creates an status entry context for the given file and source region.

bundles/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/GroupCategory.java

@@ -28,9 +28,9 @@
  */
 public class GroupCategory {
 
-	private String fId;
-	private String fName;
-	private String fDescription;
+	private final String fId;
+	private final String fName;
+	private final String fDescription;
 
 	/**
 	 * Creates a new group category with the given name and
@@ -69,10 +69,12 @@ public String getDescription() {
 
 	@Override
 	public boolean equals(Object obj) {
-		if (this == obj)
+		if (this == obj) {
 			return true;
-		if (obj == null || !getClass().equals(obj.getClass()))
+		}
+		if (obj == null || !getClass().equals(obj.getClass())) {
 			return false;
+		}
 		return fId.equals(((GroupCategory)obj).fId);
 	}
 

bundles/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/GroupCategorySet.java

@@ -65,19 +65,22 @@ public static GroupCategorySet union(GroupCategorySet one, GroupCategorySet two)
 		// for performance we are using identity here. This is
 		// valid since group categories are value objects and
 		// therefore best used as static final fields.
-		if (one == two)
+		if (one == two) {
 			return one;
-		if (one == NONE)
+		}
+		if (one == NONE) {
 			return two;
-		if (two == NONE)
+		}
+		if (two == NONE) {
 			return one;
+		}
 
 		Set<GroupCategory> combined= new HashSet<>(one.asList());
 		combined.addAll(two.asList());
 		return new GroupCategorySet(combined);
 	}
 
-	private List<GroupCategory> fContent;
+	private final List<GroupCategory> fContent;
 
 	private GroupCategorySet() {
 		fContent= Collections.emptyList();
@@ -139,8 +142,9 @@ public boolean contains(GroupCategory category) {
 	 */
 	public boolean containsOneCategory(List<GroupCategory> categories) {
 		for (GroupCategory category : categories) {
-			if(contains(category))
+			if(contains(category)) {
 				return true;
+			}
 		}
 		return false;
 	}