Skip to content

Commit bc78a0b

Browse files
eclipse-platform-botakurtakov
eclipse-platform-bot
authored and
akurtakov
committed
Perform clean code of bundles/org.eclipse.jface.databinding
1 parent 7dce6ab commit bc78a0b

File tree

64 files changed

+453
-257
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+453
-257
lines changed

‎bundles/org.eclipse.jface.databinding/src/org/eclipse/jface/databinding/dialog/DialogPageSupport.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -213,9 +213,7 @@ private boolean currentStatusHasException() {
213213
if (currentStatus.getException() != null) {
214214
hasException = true;
215215
}
216-
if (currentStatus instanceof MultiStatus) {
217-
MultiStatus multiStatus = (MultiStatus) currentStatus;
218-
216+
if (currentStatus instanceof MultiStatus multiStatus) {
219217
for (int i = 0; i < multiStatus.getChildren().length; i++) {
220218
IStatus status = multiStatus.getChildren()[i];
221219
if (status.getException() != null) {
@@ -233,8 +231,7 @@ private boolean currentStatusHasException() {
233231
protected void handleStatusException() {
234232
if (currentStatus.getException() != null) {
235233
logThrowable(currentStatus.getException());
236-
} else if (currentStatus instanceof MultiStatus) {
237-
MultiStatus multiStatus = (MultiStatus) currentStatus;
234+
} else if (currentStatus instanceof MultiStatus multiStatus) {
238235
for (int i = 0; i < multiStatus.getChildren().length; i++) {
239236
IStatus status = multiStatus.getChildren()[i];
240237
if (status.getException() != null) {
@@ -260,8 +257,9 @@ private void logThrowable(Throwable throwable) {
260257
* may have attached.
261258
*/
262259
public void dispose() {
263-
if (aggregateStatusProvider != null)
260+
if (aggregateStatusProvider != null) {
264261
aggregateStatusProvider.dispose();
262+
}
265263
if (dbc != null && !uiChanged) {
266264
for (ValidationStatusProvider provider : dbc.getValidationStatusProviders()) {
267265
provider.getTargets().removeListChangeListener(validationStatusProviderTargetsListener);

‎bundles/org.eclipse.jface.databinding/src/org/eclipse/jface/databinding/dialog/TitleAreaDialogSupport.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,9 @@ private void handleUIChanged() {
167167
}
168168

169169
private void handleStatusChanged() {
170-
if (dialog.getShell() == null || dialog.getShell().isDisposed())
170+
if (dialog.getShell() == null || dialog.getShell().isDisposed()) {
171171
return;
172+
}
172173
String message = messageProvider.getMessage(currentStatusProvider);
173174
int type = messageProvider.getMessageType(currentStatusProvider);
174175
if (type == IMessageProvider.ERROR) {
@@ -188,9 +189,7 @@ private boolean currentStatusHasException() {
188189
if (currentStatus.getException() != null) {
189190
hasException = true;
190191
}
191-
if (currentStatus instanceof MultiStatus) {
192-
MultiStatus multiStatus = (MultiStatus) currentStatus;
193-
192+
if (currentStatus instanceof MultiStatus multiStatus) {
194193
for (int i = 0; i < multiStatus.getChildren().length; i++) {
195194
IStatus status = multiStatus.getChildren()[i];
196195
if (status.getException() != null) {
@@ -209,8 +208,7 @@ private boolean currentStatusHasException() {
209208
private void handleStatusException() {
210209
if (currentStatus.getException() != null) {
211210
logThrowable(currentStatus.getException());
212-
} else if (currentStatus instanceof MultiStatus) {
213-
MultiStatus multiStatus = (MultiStatus) currentStatus;
211+
} else if (currentStatus instanceof MultiStatus multiStatus) {
214212
for (int i = 0; i < multiStatus.getChildren().length; i++) {
215213
IStatus status = multiStatus.getChildren()[i];
216214
if (status.getException() != null) {
@@ -236,8 +234,9 @@ private void logThrowable(Throwable throwable) {
236234
* it may have attached.
237235
*/
238236
public void dispose() {
239-
if (aggregateStatusProvider != null)
237+
if (aggregateStatusProvider != null) {
240238
aggregateStatusProvider.dispose();
239+
}
241240
if (dbc != null && !uiChanged) {
242241
for (ValidationStatusProvider provider : dbc.getValidationStatusProviders()) {
243242
IObservableList<IObservable> targets = provider.getTargets();

‎bundles/org.eclipse.jface.databinding/src/org/eclipse/jface/databinding/fieldassist/ControlDecorationSupport.java‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -374,17 +374,19 @@ private ControlDecorationSupport(IObservableValue<IStatus> validationStatus,
374374
targets.addDisposeListener(disposeListener);
375375
targets.addListChangeListener(targetsChangeListener);
376376

377-
for (IObservable target : targets)
377+
for (IObservable target : targets) {
378378
targetAdded(target);
379+
}
379380

380381
statusChanged(validationStatus.getValue());
381382
}
382383

383384
private void targetAdded(IObservable target) {
384385
Control control = findControl(target);
385-
if (control != null)
386+
if (control != null) {
386387
targetDecorations.add(new TargetDecoration(target,
387388
new ControlDecoration(control, position, composite)));
389+
}
388390
}
389391

390392
private void targetRemoved(IObservable target) {
@@ -400,8 +402,9 @@ private void targetRemoved(IObservable target) {
400402
private Control findControl(IObservable target) {
401403
if (target instanceof ISWTObservable) {
402404
Widget widget = ((ISWTObservable) target).getWidget();
403-
if (widget instanceof Control)
405+
if (widget instanceof Control) {
404406
return (Control) widget;
407+
}
405408
}
406409

407410
if (target instanceof IViewerObservable) {
@@ -413,14 +416,16 @@ private Control findControl(IObservable target) {
413416
IObservable decorated = ((IDecoratingObservable) target)
414417
.getDecorated();
415418
Control control = findControl(decorated);
416-
if (control != null)
419+
if (control != null) {
417420
return control;
421+
}
418422
}
419423

420424
if (target instanceof IObserving) {
421425
Object observed = ((IObserving) target).getObserved();
422-
if (observed instanceof IObservable)
426+
if (observed instanceof IObservable) {
423427
return findControl((IObservable) observed);
428+
}
424429
}
425430

426431
return null;

‎bundles/org.eclipse.jface.databinding/src/org/eclipse/jface/databinding/fieldassist/ControlDecorationUpdater.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,9 @@ protected String getDescriptionText(IStatus status) {
7979
* the given status.
8080
*/
8181
protected Image getImage(IStatus status) {
82-
if (status == null)
82+
if (status == null) {
8383
return null;
84+
}
8485

8586
String fieldDecorationID = null;
8687
switch (status.getSeverity()) {

‎bundles/org.eclipse.jface.databinding/src/org/eclipse/jface/databinding/swt/DisplayRealm.java‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public static Realm getRealm(final Display display) {
4848
}
4949
}
5050

51-
private Display display;
51+
private final Display display;
5252

5353
private DisplayRealm(Display display) {
5454
this.display = display;
@@ -82,12 +82,15 @@ public int hashCode() {
8282

8383
@Override
8484
public boolean equals(Object obj) {
85-
if (this == obj)
85+
if (this == obj) {
8686
return true;
87-
if (obj == null)
87+
}
88+
if (obj == null) {
8889
return false;
89-
if (getClass() != obj.getClass())
90+
}
91+
if (getClass() != obj.getClass()) {
9092
return false;
93+
}
9194
final DisplayRealm other = (DisplayRealm) obj;
9295
return Objects.equals(display, other.display);
9396
}

‎bundles/org.eclipse.jface.databinding/src/org/eclipse/jface/databinding/swt/WidgetValueProperty.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,9 @@ public WidgetValueProperty(int[] changeEvents, int[] staleEvents) {
9696

9797
@Override
9898
public INativePropertyListener<S> adaptListener(ISimplePropertyListener<S, ValueDiff<? extends T>> listener) {
99-
if (changeEvents == null && staleEvents == null)
99+
if (changeEvents == null && staleEvents == null) {
100100
return null;
101+
}
101102
return new WidgetListener<>(this, listener, changeEvents, staleEvents);
102103
}
103104

‎bundles/org.eclipse.jface.databinding/src/org/eclipse/jface/databinding/viewers/ListeningLabelProvider.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
*/
2626
public abstract class ListeningLabelProvider<E> extends ViewerLabelProvider {
2727

28-
private ISetChangeListener<E> listener = event -> {
28+
private final ISetChangeListener<E> listener = event -> {
2929
for (E element : event.diff.getAdditions()) {
3030
addListenerTo(element);
3131
}
@@ -34,7 +34,7 @@ public abstract class ListeningLabelProvider<E> extends ViewerLabelProvider {
3434
}
3535
};
3636

37-
private IObservableSet<E> items;
37+
private final IObservableSet<E> items;
3838

3939
/**
4040
* @param itemsThatNeedLabels the managed elements

‎bundles/org.eclipse.jface.databinding/src/org/eclipse/jface/databinding/viewers/ObservableListContentProvider.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,9 @@ protected void removeCollectionChangeListener(IObservableCollection<E> collectio
8080

8181
@Override
8282
public void handleListChange(ListChangeEvent<? extends E> event) {
83-
if (isViewerDisposed())
83+
if (isViewerDisposed()) {
8484
return;
85+
}
8586

8687
// Determine which elements were added and removed
8788
final Set<E> knownElementAdditions = ViewerElementSet.withComparer(comparer);
@@ -118,8 +119,9 @@ public void handleReplace(int index, E oldElement, E newElement) {
118119
realizedElements.removeAll(knownElementRemovals);
119120
}
120121

121-
if (suspendRedraw[0])
122+
if (suspendRedraw[0]) {
122123
viewer.getControl().setRedraw(false);
124+
}
123125
try {
124126
event.diff.accept(new ListDiffVisitor<E>() {
125127
@Override
@@ -143,8 +145,9 @@ public void handleMove(int oldIndex, int newIndex, E element) {
143145
}
144146
});
145147
} finally {
146-
if (suspendRedraw[0])
148+
if (suspendRedraw[0]) {
147149
viewer.getControl().setRedraw(true);
150+
}
148151
}
149152

150153
if (realizedElements != null) {

‎bundles/org.eclipse.jface.databinding/src/org/eclipse/jface/databinding/viewers/ObservableListTreeContentProvider.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,9 @@ public ListChangeListener(E parentElement) {
6969

7070
@Override
7171
public void handleListChange(ListChangeEvent<? extends E> event) {
72-
if (isViewerDisposed())
72+
if (isViewerDisposed()) {
7373
return;
74+
}
7475

7576
// Determine which elements are being added and removed
7677
final Set<E> localKnownElementAdditions = ViewerElementSet.withComparer(comparer);
@@ -117,8 +118,9 @@ public void handleReplace(int index, E oldElement, E newElement) {
117118
getOrCreateNode(element).addParent(parentElement);
118119
}
119120

120-
if (suspendRedraw[0])
121+
if (suspendRedraw[0]) {
121122
viewer.getControl().setRedraw(false);
123+
}
122124
try {
123125
ListDiffVisitor<Object> viewerUpdateVisitor = new ListDiffVisitor<>() {
124126
@Override
@@ -147,8 +149,9 @@ public void handleMove(int oldIndex, int newIndex,
147149
};
148150
event.diff.accept(viewerUpdateVisitor);
149151
} finally {
150-
if (suspendRedraw[0])
152+
if (suspendRedraw[0]) {
151153
viewer.getControl().setRedraw(true);
154+
}
152155
}
153156

154157
for (E element : localKnownElementRemovals) {

‎bundles/org.eclipse.jface.databinding/src/org/eclipse/jface/databinding/viewers/ObservableSetContentProvider.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,21 +67,24 @@ protected void removeCollectionChangeListener(IObservableCollection<E> collectio
6767
@SuppressWarnings("unchecked")
6868
@Override
6969
public void handleSetChange(SetChangeEvent<? extends E> event) {
70-
if (isViewerDisposed())
70+
if (isViewerDisposed()) {
7171
return;
72+
}
7273

7374
Set<? extends E> removals = event.diff.getRemovals();
7475
Set<? extends E> additions = event.diff.getAdditions();
7576

7677
knownElements.addAll(additions);
77-
if (realizedElements != null)
78+
if (realizedElements != null) {
7879
realizedElements.removeAll(removals);
80+
}
7981

8082
viewerUpdater.remove((E[]) removals.toArray());
8183
viewerUpdater.add((E[]) additions.toArray());
8284

83-
if (realizedElements != null)
85+
if (realizedElements != null) {
8486
realizedElements.addAll(additions);
87+
}
8588
knownElements.removeAll(removals);
8689
}
8790
}

0 commit comments

Comments
 (0)