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

Author: eclipse-platform-bot

bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/ChangeManager.java

@@ -91,11 +91,15 @@ protected void removeListener(Object listenerType,
 	}
 
 	protected boolean hasListeners() {
-		if (listenerTypes != null)
-			for (int i = 0; i < listenerTypes.length; i++)
-				if (listenerTypes[i] != DisposeEvent.TYPE)
-					if (listenerLists[i].size() > 0)
+		if (listenerTypes != null) {
+			for (int i = 0; i < listenerTypes.length; i++) {
+				if (listenerTypes[i] != DisposeEvent.TYPE) {
+					if (listenerLists[i].size() > 0) {
 						return true;
+					}
+				}
+			}
+		}
 		return false;
 	}
 

bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/DecoratingObservable.java

@@ -32,7 +32,7 @@ public class DecoratingObservable extends AbstractObservable implements
 
 	private IStaleListener staleListener;
 
-	private boolean disposedDecoratedOnDispose;
+	private final boolean disposedDecoratedOnDispose;
 
 	/**
 	 * Constructs a DecoratingObservable which decorates the given observable.
@@ -97,10 +97,12 @@ protected void handleStaleEvent(StaleEvent event) {
 
 	@Override
 	public boolean equals(Object obj) {
-		if (obj == this)
+		if (obj == this) {
 			return true;
-		if (obj == null)
+		}
+		if (obj == null) {
 			return false;
+		}
 		if (getClass() == obj.getClass()) {
 			DecoratingObservable other = (DecoratingObservable) obj;
 			return Objects.equals(this.decorated, other.decorated);
@@ -119,8 +121,9 @@ public synchronized void dispose() {
 			decorated.removeStaleListener(staleListener);
 		}
 		if (decorated != null) {
-			if (disposedDecoratedOnDispose)
+			if (disposedDecoratedOnDispose) {
 				decorated.dispose();
+			}
 			decorated = null;
 		}
 		staleListener = null;

bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/Diffs.java

@@ -38,7 +38,7 @@
  */
 public class Diffs {
 	private static final class UnmodifiableListDiff<E> extends ListDiff<E> {
-		private ListDiff<? extends E> toWrap;
+		private final ListDiff<? extends E> toWrap;
 
 		public UnmodifiableListDiff(ListDiff<? extends E> diff) {
 			this.toWrap = diff;
@@ -56,7 +56,7 @@ public ListDiffEntry<E>[] getDifferences() {
 	}
 
 	private static final class UnmodifiableSetDiff<E> extends SetDiff<E> {
-		private SetDiff<? extends E> toWrap;
+		private final SetDiff<? extends E> toWrap;
 
 		public UnmodifiableSetDiff(SetDiff<? extends E> diff) {
 			toWrap = diff;
@@ -74,7 +74,7 @@ public Set<E> getRemovals() {
 	}
 
 	private static final class UnmodifiableMapDiff<K, V> extends MapDiff<K, V> {
-		private MapDiff<? extends K, ? extends V> toWrap;
+		private final MapDiff<? extends K, ? extends V> toWrap;
 
 		public UnmodifiableMapDiff(MapDiff<? extends K, ? extends V> diff) {
 			toWrap = diff;
@@ -107,7 +107,7 @@ public V getNewValue(Object key) {
 	}
 
 	private static final class UnmodifiableValueDiff<E> extends ValueDiff<E> {
-		private ValueDiff<? extends E> toWrap;
+		private final ValueDiff<? extends E> toWrap;
 
 		public UnmodifiableValueDiff(ValueDiff<? extends E> diff) {
 			toWrap = diff;

bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/ObservableTracker.java

@@ -198,8 +198,9 @@ public static void setIgnore(boolean ignore) {
 		int newCount = (lastCount == null ? 0 : lastCount.intValue())
 				+ (ignore ? 1 : -1);
 
-		if (newCount < 0)
+		if (newCount < 0) {
 			throw new IllegalStateException("Ignore count is already zero"); //$NON-NLS-1$
+		}
 
 		if (newCount == 0) {
 			currentIgnoreCount.remove();
@@ -250,26 +251,31 @@ private static boolean isIgnore() {
 	 * @param observable the observable whose getter was called
 	 */
 	public static void getterCalled(IObservable observable) {
-		if (observable.isDisposed())
+		if (observable.isDisposed()) {
 			Assert.isTrue(false, "Getter called on disposed observable " //$NON-NLS-1$
 					+ toString(observable));
+		}
 		Realm realm = observable.getRealm();
-		if (!realm.isCurrent())
+		if (!realm.isCurrent()) {
 			Assert.isTrue(false, "Getter called outside realm of observable " //$NON-NLS-1$
 					+ toString(observable));
+		}
 
-		if (isIgnore())
+		if (isIgnore()) {
 			return;
+		}
 
 		Set<IObservable> getterCalledSet = currentGetterCalledSet.get();
 		if (getterCalledSet != null && getterCalledSet.add(observable)) {
 			// If anyone is listening for observable usage...
 			IChangeListener changeListener = currentChangeListener.get();
-			if (changeListener != null)
+			if (changeListener != null) {
 				observable.addChangeListener(changeListener);
+			}
 			IStaleListener staleListener = currentStaleListener.get();
-			if (staleListener != null)
+			if (staleListener != null) {
 				observable.addStaleListener(staleListener);
+			}
 		}
 	}
 
@@ -281,8 +287,9 @@ public static void getterCalled(IObservable observable) {
 	 * @since 1.2
 	 */
 	public static void observableCreated(IObservable observable) {
-		if (isIgnore())
+		if (isIgnore()) {
 			return;
+		}
 		Set<IObservable> observableCreatedSet = currentObservableCreatedSet.get();
 		if (observableCreatedSet != null) {
 			observableCreatedSet.add(observable);

bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/Observables.java

@@ -704,8 +704,9 @@ public static <K, V> IObservableValue<V> observeMapEntry(
 	 */
 	public static <K, V> IObservableValue<V> observeMapEntry(
 			IObservableMap<K, V> map, K key, Object valueType) {
-		if (valueType == null)
+		if (valueType == null) {
 			valueType = map.getValueType();
+		}
 		return new MapEntryObservableValue<>(map, key, valueType);
 	}
 

bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/Realm.java

@@ -305,7 +305,7 @@ protected void syncExec(Runnable runnable) {
 	static class SyncRunnable implements Runnable {
 		boolean hasRun = false;
 
-		private Runnable runnable;
+		private final Runnable runnable;
 
 		SyncRunnable(Runnable runnable) {
 			this.runnable = runnable;

bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/list/AbstractObservableList.java

@@ -314,12 +314,14 @@ public boolean add(E o) {
 	public E move(int oldIndex, int newIndex) {
 		checkRealm();
 		int size = doGetSize();
-		if (oldIndex < 0 || oldIndex >= size)
+		if (oldIndex < 0 || oldIndex >= size) {
 			throw new IndexOutOfBoundsException(
 					"oldIndex: " + oldIndex + ", size:" + size); //$NON-NLS-1$ //$NON-NLS-2$
-		if (newIndex < 0 || newIndex >= size)
+		}
+		if (newIndex < 0 || newIndex >= size) {
 			throw new IndexOutOfBoundsException(
 					"newIndex: " + newIndex + ", size:" + size); //$NON-NLS-1$ //$NON-NLS-2$
+		}
 		E element = remove(oldIndex);
 		add(newIndex, element);
 		return element;

bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/list/ComputedList.java

@@ -183,14 +183,16 @@ private class PrivateInterface implements Runnable, IChangeListener,
 		@Override
 		public void run() {
 			cachedList = calculate();
-			if (cachedList == null)
+			if (cachedList == null) {
 				cachedList = Collections.EMPTY_LIST;
+			}
 		}
 
 		@Override
 		public void handleStale(StaleEvent event) {
-			if (!dirty)
+			if (!dirty) {
 				makeStale();
+			}
 		}
 
 		@Override
@@ -199,7 +201,7 @@ public void handleChange(ChangeEvent event) {
 		}
 	}
 
-	private PrivateInterface privateInterface = new PrivateInterface();
+	private final PrivateInterface privateInterface = new PrivateInterface();
 
 	private Object elementType;
 

bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/list/ListChangeEvent.java

@@ -44,7 +44,7 @@ public class ListChangeEvent<E> extends ObservableEvent {
 	 * Always identical to <code>EventObject.source</code> but the type
 	 * information is maintained.
 	 */
-	private IObservableList<E> typedSource;
+	private final IObservableList<E> typedSource;
 
 	/**
 	 * Creates a new list change event.

bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/list/ListDiff.java

@@ -146,10 +146,11 @@ public void accept(ListDiffVisitor<? super E> visitor) {
 				}
 			}
 
-			if (add)
+			if (add) {
 				visitor.handleAdd(pos, elem);
-			else
+			} else {
 				visitor.handleRemove(pos, elem);
+			}
 		}
 	}
 
@@ -309,8 +310,9 @@ public String toString() {
 			buffer.append("{"); //$NON-NLS-1$
 
 			for (int i = 0; i < differences.length; i++) {
-				if (i > 0)
+				if (i > 0) {
 					buffer.append(", "); //$NON-NLS-1$
+				}
 
 				buffer.append("difference[") //$NON-NLS-1$
 						.append(i)