Perform clean code of bundles/org.eclipse.core.databinding

Author: eclipse-platform-bot

bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/AggregateValidationStatus.java

@@ -59,8 +59,8 @@ public final class AggregateValidationStatus extends ComputedValue<IStatus> {
 	 */
 	public static final int MAX_SEVERITY = 2;
 
-	private int strategy;
-	private IObservableCollection<? extends ValidationStatusProvider> validationStatusProviders;
+	private final int strategy;
+	private final IObservableCollection<? extends ValidationStatusProvider> validationStatusProviders;
 
 	/**
 	 * Creates a new aggregate validation status observable for the given data

bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/Binding.java

@@ -60,10 +60,12 @@ public Binding(IObservable target, IObservable model) {
 	 */
 	public final void init(DataBindingContext context) {
 		this.context = context;
-		if (target.isDisposed())
+		if (target.isDisposed()) {
 			throw new IllegalArgumentException("Target observable is disposed"); //$NON-NLS-1$
-		if (model.isDisposed())
+		}
+		if (model.isDisposed()) {
 			throw new IllegalArgumentException("Model observable is disposed"); //$NON-NLS-1$
+		}
 		this.disposeListener = event -> {
 			if (context != null) {
 				context.getValidationRealm().exec(Binding.this::dispose);

bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/DataBindingContext.java

@@ -107,7 +107,7 @@ public class DataBindingContext {
 
 	private IObservableMap<Binding, IStatus> validationStatusMap;
 
-	private Realm validationRealm;
+	private final Realm validationRealm;
 
 	/**
 	 * Creates a data binding context, using the current default realm for the
@@ -358,12 +358,14 @@ public final <T, M> Binding bindSet(
 			IObservableSet<M> modelObservableSet,
 			UpdateSetStrategy<? super T, ? extends M> targetToModel,
 			UpdateSetStrategy<? super M, ? extends T> modelToTarget) {
-		if (targetToModel == null)
+		if (targetToModel == null) {
 			targetToModel = createTargetToModelUpdateSetStrategy(
 					targetObservableSet, modelObservableSet);
-		if (modelToTarget == null)
+		}
+		if (modelToTarget == null) {
 			modelToTarget = createModelToTargetUpdateSetStrategy(
 					modelObservableSet, targetObservableSet);
+		}
 		targetToModel.fillDefaults(targetObservableSet, modelObservableSet);
 		modelToTarget.fillDefaults(modelObservableSet, targetObservableSet);
 		SetBinding<? super M, ? extends T> result = new SetBinding<>(targetObservableSet,

bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/ObservablesManager.java

@@ -35,9 +35,9 @@
  */
 public class ObservablesManager {
 
-	private Set<IObservable> managedObservables = new IdentitySet<>();
-	private Set<IObservable> excludedObservables = new IdentitySet<>();
-	private Map<DataBindingContext, ManagerEntry> contexts = new HashMap<>();
+	private final Set<IObservable> managedObservables = new IdentitySet<>();
+	private final Set<IObservable> excludedObservables = new IdentitySet<>();
+	private final Map<DataBindingContext, ManagerEntry> contexts = new HashMap<>();
 
 	/**
 	 * Create a new observables manager.

bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/UpdateStrategy.java

@@ -82,22 +82,23 @@
 	private static Map<Pair, Object> converterMap;
 
 	private static Class<?> autoboxed(Class<?> clazz) {
-		if (clazz == Float.TYPE)
+		if (clazz == Float.TYPE) {
 			return Float.class;
-		else if (clazz == Double.TYPE)
+		} else if (clazz == Double.TYPE) {
 			return Double.class;
-		else if (clazz == Short.TYPE)
+		} else if (clazz == Short.TYPE) {
 			return Short.class;
-		else if (clazz == Integer.TYPE)
+		} else if (clazz == Integer.TYPE) {
 			return Integer.class;
-		else if (clazz == Long.TYPE)
+		} else if (clazz == Long.TYPE) {
 			return Long.class;
-		else if (clazz == Byte.TYPE)
+		} else if (clazz == Byte.TYPE) {
 			return Byte.class;
-		else if (clazz == Boolean.TYPE)
+		} else if (clazz == Boolean.TYPE) {
 			return Boolean.class;
-		else if (clazz == Character.TYPE)
+		} else if (clazz == Character.TYPE) {
 			return Character.class;
+		}
 		return clazz;
 	}
 
@@ -154,8 +155,7 @@ final protected void checkAssignable(Object toType, Object fromType,
 			Object converterOrClassname = converterMap.get(key);
 			if (converterOrClassname instanceof IConverter) {
 				return (IConverter<?, ?>) converterOrClassname;
-			} else if (converterOrClassname instanceof String) {
-				String classname = (String) converterOrClassname;
+			} else if (converterOrClassname instanceof String classname) {
 				Class<?> converterClass;
 				try {
 					converterClass = Class.forName(classname);

bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/UpdateValueStrategy.java

@@ -487,7 +487,7 @@ protected IStatus doSet(IObservableValue<? super D> observableValue, D value) {
 
 	private static class ValidatorRegistry {
 
-		private Map<Pair, IValidator<?>> validators = new HashMap<>();
+		private final Map<Pair, IValidator<?>> validators = new HashMap<>();
 
 		/**
 		 * Adds the system-provided validators to the current validator
@@ -553,8 +553,9 @@ private void associate(Object fromClass, Object toClass, IValidator<?> validator
 		 */
 		private IValidator<?> get(Object fromClass, Object toClass) {
 			IValidator<?> result = validators.get(new Pair(fromClass, toClass));
-			if (result != null)
+			if (result != null) {
 				return result;
+			}
 			if (fromClass != null && toClass != null && fromClass == toClass) {
 				return value -> Status.OK_STATUS;
 			}

bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/conversion/Converter.java

@@ -28,8 +28,8 @@
  */
 public abstract class Converter<F, T> implements IConverter<F, T> {
 
-	private Object fromType;
-	private Object toType;
+	private final Object fromType;
+	private final Object toType;
 
 	/**
 	 * @param fromType type of source values

bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/validation/MultiValidator.java

@@ -160,7 +160,7 @@ public void handleStale(StaleEvent staleEvent) {
 		}
 	}
 
-	private DependencyListener dependencyListener = new DependencyListener();
+	private final DependencyListener dependencyListener = new DependencyListener();
 
 	/**
 	 * Constructs a MultiValidator on the default realm.
@@ -247,8 +247,9 @@ class ValidationRunnable implements Runnable {
 			public void run() {
 				try {
 					validationResult = validate();
-					if (validationResult == null)
+					if (validationResult == null) {
 						validationResult = ValidationStatus.ok();
+					}
 				} catch (RuntimeException e) {
 					// Usually an NPE as dependencies are init'ed
 					validationResult = ValidationStatus

bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/validation/ValidationStatus.java

@@ -122,12 +122,15 @@ public int hashCode() {
 	 */
 	@Override
 	public boolean equals(Object obj) {
-		if (this == obj)
+		if (this == obj) {
 			return true;
-		if (obj == null)
+		}
+		if (obj == null) {
 			return false;
-		if (getClass() != obj.getClass())
+		}
+		if (getClass() != obj.getClass()) {
 			return false;
+		}
 		final ValidationStatus other = (ValidationStatus) obj;
 
 		return getSeverity() == other.getSeverity() && Objects.equals(getMessage(), other.getMessage())

bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/BindingStatus.java

@@ -84,12 +84,15 @@ public int hashCode() {
 
 	@Override
 	public boolean equals(Object obj) {
-		if (this == obj)
+		if (this == obj) {
 			return true;
-		if (obj == null)
+		}
+		if (obj == null) {
 			return false;
-		if (getClass() != obj.getClass())
+		}
+		if (getClass() != obj.getClass()) {
 			return false;
+		}
 		final BindingStatus other = (BindingStatus) obj;
 		return Arrays.equals(getChildren(), other.getChildren());
 	}