Skip to content

Commit f1633b7

Browse files
eclipse-platform-botakurtakov
eclipse-platform-bot
authored and
akurtakov
committed
Perform clean code of bundles/org.eclipse.e4.ui.workbench.renderers.swt
1 parent cfa49de commit f1633b7

31 files changed

+429
-388
lines changed

‎bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/internal/workbench/renderers/swt/AbstractTableInformationControl.java‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,9 @@ protected class NamePatternFilter extends ViewerFilter {
6464
public boolean select(Viewer viewer, Object parentElement,
6565
Object element) {
6666
SearchPattern matcher = getMatcher();
67-
if (matcher == null || !(viewer instanceof TableViewer)) {
67+
if (matcher == null || !(viewer instanceof TableViewer tableViewer)) {
6868
return true;
6969
}
70-
TableViewer tableViewer = (TableViewer) viewer;
71-
7270
String matchName = ((ILabelProvider) tableViewer.getLabelProvider())
7371
.getText(element);
7472

@@ -251,12 +249,14 @@ public void mouseMove(MouseEvent e) {
251249
e.doit = true;
252250
{
253251
int n1 = table.getItemCount();
254-
if (n1 == 0)
252+
if (n1 == 0) {
255253
return;
254+
}
256255

257256
int i1 = table.getSelectionIndex() + 1;
258-
if (i1 >= n1)
257+
if (i1 >= n1) {
259258
i1 = 0;
259+
}
260260
table.setSelection(i1);
261261
}
262262
break;
@@ -266,12 +266,14 @@ public void mouseMove(MouseEvent e) {
266266
e.doit = true;
267267
{
268268
int n2 = table.getItemCount();
269-
if (n2 == 0)
269+
if (n2 == 0) {
270270
return;
271+
}
271272

272273
int i2 = table.getSelectionIndex() - 1;
273-
if (i2 < 0)
274+
if (i2 < 0) {
274275
i2 = n2 - 1;
276+
}
275277
table.setSelection(i2);
276278
}
277279
break;

‎bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/internal/workbench/renderers/swt/BasicPartList.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public class BasicPartList extends AbstractTableInformationControl {
4545

4646
private class BasicStackListLabelProvider extends ColumnLabelProvider {
4747

48-
private Font boldFont;
48+
private final Font boldFont;
4949

5050
public BasicStackListLabelProvider() {
5151
Font font = Display.getDefault().getSystemFont();
@@ -58,8 +58,7 @@ public BasicStackListLabelProvider() {
5858

5959
@Override
6060
public Font getFont(Object element) {
61-
if (element instanceof MPart) {
62-
MPart part = (MPart) element;
61+
if (element instanceof MPart part) {
6362
CTabItem item = renderer.findItemForPart(part);
6463
if (item != null && !item.isShowing()) {
6564
return boldFont;
@@ -118,8 +117,7 @@ public BasicPartList(Shell parent, int shellStyle, int treeStyler,
118117
getTableViewer().setComparator(new ViewerComparator() {
119118
@Override
120119
public int category(Object element) {
121-
if (element instanceof MPart) {
122-
MPart part = (MPart) element;
120+
if (element instanceof MPart part) {
123121
CTabItem item = BasicPartList.this.renderer.findItemForPart(part);
124122
if (item != null && !item.isShowing()) {
125123
return -1;
@@ -186,8 +184,7 @@ protected boolean deleteSelectedElement(Object selectedElement) {
186184
if (selectedElement == null) {
187185
selectedElement = getSelectedElement();
188186
}
189-
if (selectedElement instanceof MPart) {
190-
MPart part = (MPart) selectedElement;
187+
if (selectedElement instanceof MPart part) {
191188
if (partService.savePart(part, true)) {
192189
partService.hidePart(part);
193190
}

‎bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/AbstractContributionItem.java‎

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -181,10 +181,9 @@ private Image getDisabledImage(String iconURI, LocalResourceManager resourceMana
181181
}
182182

183183
protected void updateIcons() {
184-
if (!(widget instanceof Item)) {
184+
if (!(widget instanceof Item item)) {
185185
return;
186186
}
187-
Item item = (Item) widget;
188187
String iconURI = modelItem.getIconURI() != null ? modelItem.getIconURI() : ""; //$NON-NLS-1$
189188
String disabledURI = getDisabledIconURI(modelItem);
190189
Object disabledData = item.getData(DISABLED_URI);
@@ -213,7 +212,7 @@ protected void updateIcons() {
213212

214213
private String getDisabledIconURI(MItem toolItem) {
215214
Object obj = toolItem.getTransientData().get(IPresentationEngine.DISABLED_ICON_IMAGE_KEY);
216-
return obj instanceof String ? (String) obj : ""; //$NON-NLS-1$
215+
return obj instanceof String s ? s : ""; //$NON-NLS-1$
217216
}
218217

219218
protected void disposeOldImages() {
@@ -246,8 +245,7 @@ public void setParent(IContributionManager parent) {
246245
IMenuManager menuMgr = (IMenuManager) getParent();
247246
menuMgr.removeMenuListener(menuListener);
248247
}
249-
if (parent instanceof IMenuManager) {
250-
IMenuManager menuMgr = (IMenuManager) parent;
248+
if (parent instanceof IMenuManager menuMgr) {
251249
menuMgr.addMenuListener(menuListener);
252250
}
253251
super.setParent(parent);
@@ -262,12 +260,13 @@ public void fill(Menu menu, int index) {
262260
return;
263261
}
264262
int style = SWT.PUSH;
265-
if (modelItem.getType() == ItemType.PUSH)
263+
if (modelItem.getType() == ItemType.PUSH) {
266264
style = SWT.PUSH;
267-
else if (modelItem.getType() == ItemType.CHECK)
265+
} else if (modelItem.getType() == ItemType.CHECK) {
268266
style = SWT.CHECK;
269-
else if (modelItem.getType() == ItemType.RADIO)
267+
} else if (modelItem.getType() == ItemType.RADIO) {
270268
style = SWT.RADIO;
269+
}
271270
MenuItem item = null;
272271
if (index >= 0) {
273272
item = new MenuItem(menu, style, index);
@@ -311,12 +310,13 @@ public void fill(ToolBar parent, int index) {
311310
isDropdown = menu != null;
312311
}
313312
int style = SWT.PUSH;
314-
if (isDropdown)
313+
if (isDropdown) {
315314
style = SWT.DROP_DOWN;
316-
else if (modelItem.getType() == ItemType.CHECK)
315+
} else if (modelItem.getType() == ItemType.CHECK) {
317316
style = SWT.CHECK;
318-
else if (modelItem.getType() == ItemType.RADIO)
317+
} else if (modelItem.getType() == ItemType.RADIO) {
319318
style = SWT.RADIO;
319+
}
320320
ToolItem item = null;
321321
if (index >= 0) {
322322
item = new ToolItem(parent, style, index);
@@ -396,8 +396,7 @@ protected Menu getMenu(final MMenu mmenu, ToolItem toolItem) {
396396
obj = ((IContextFunction) obj).compute(lclContext, null);
397397
RenderedElementUtil.setContributionManager(mmenu, obj);
398398
}
399-
if (obj instanceof IMenuCreator) {
400-
final IMenuCreator creator = (IMenuCreator) obj;
399+
if (obj instanceof final IMenuCreator creator) {
401400
final Menu menu = creator.getMenu(toolItem.getParent().getShell());
402401
if (menu != null) {
403402
toolItem.addDisposeListener(e -> {
@@ -504,11 +503,13 @@ protected Listener getItemListener() {
504503
}
505504

506505
protected void handleHelpRequest() {
507-
if (helpService == null)
506+
if (helpService == null) {
508507
return;
508+
}
509509
String helpContextId = getModel().getPersistedState().get(EHelpService.HELP_CONTEXT_ID);
510-
if (helpContextId != null)
510+
if (helpContextId != null) {
511511
helpService.displayHelp(helpContextId);
512+
}
512513
}
513514

514515
protected abstract void handleWidgetDispose(Event event);
@@ -560,12 +561,14 @@ protected ToolItemUpdater getUpdater() {
560561

561562

562563
protected void updateItemEnablement() {
563-
if (!(modelItem.getWidget() instanceof ToolItem))
564+
if (!(modelItem.getWidget() instanceof ToolItem)) {
564565
return;
566+
}
565567

566568
ToolItem widget = (ToolItem) modelItem.getWidget();
567-
if (widget == null || widget.isDisposed())
569+
if (widget == null || widget.isDisposed()) {
568570
return;
571+
}
569572

570573
SafeRunner.run(getUpdateRunner());
571574
}

‎bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/AreaRenderer.java‎

Lines changed: 33 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -47,23 +47,26 @@ public class AreaRenderer extends SWTPartRenderer {
4747
@Inject
4848
private IEventBroker eventBroker;
4949

50-
private EventHandler itemUpdater = event -> {
50+
private final EventHandler itemUpdater = event -> {
5151
// Ensure that this event is for a MArea
52-
if (!(event.getProperty(UIEvents.EventTags.ELEMENT) instanceof MArea))
52+
if (!(event.getProperty(UIEvents.EventTags.ELEMENT) instanceof MArea)) {
5353
return;
54+
}
5455

5556
MArea areaModel = (MArea) event
5657
.getProperty(UIEvents.EventTags.ELEMENT);
5758

58-
if (!(areaModel.getWidget() instanceof CTabFolder))
59+
if (!(areaModel.getWidget() instanceof CTabFolder)) {
5960
return;
61+
}
6062

6163
CTabFolder ctf = (CTabFolder) areaModel.getWidget();
6264
CTabItem areaItem = ctf.getItem(0);
6365

6466
// No widget == nothing to update
65-
if (areaItem == null)
67+
if (areaItem == null) {
6668
return;
69+
}
6770

6871
String attName = (String) event
6972
.getProperty(UIEvents.EventTags.ATTNAME);
@@ -78,24 +81,27 @@ public class AreaRenderer extends SWTPartRenderer {
7881
}
7982
};
8083

81-
private EventHandler widgetListener = new EventHandler() {
84+
private final EventHandler widgetListener = new EventHandler() {
8285
@Override
8386
public void handleEvent(Event event) {
8487
final MUIElement changedElement = (MUIElement) event
8588
.getProperty(EventTags.ELEMENT);
86-
if (!(changedElement instanceof MPartStack))
89+
if (!(changedElement instanceof MPartStack)) {
8790
return;
91+
}
8892

8993
MArea areaModel = findArea(changedElement);
90-
if (areaModel != null)
94+
if (areaModel != null) {
9195
synchCTFState(areaModel);
96+
}
9297
}
9398

9499
private MArea findArea(MUIElement element) {
95100
MUIElement parent = element.getParent();
96101
while (parent != null) {
97-
if (parent instanceof MArea)
102+
if (parent instanceof MArea) {
98103
return (MArea) parent;
104+
}
99105
parent = parent.getParent();
100106
}
101107
return null;
@@ -116,10 +122,9 @@ void contextDisposed() {
116122

117123
@Override
118124
public Object createWidget(final MUIElement element, Object parent) {
119-
if (!(element instanceof MArea) || !(parent instanceof Composite))
125+
if (!(element instanceof MArea) || !(parent instanceof Composite parentComp)) {
120126
return null;
121-
122-
Composite parentComp = (Composite) parent;
127+
}
123128

124129
Composite areaComp = new Composite(parentComp, SWT.NONE);
125130
areaComp.setLayout(new FillLayout());
@@ -129,12 +134,13 @@ public Object createWidget(final MUIElement element, Object parent) {
129134

130135
private void ensureCTF(MArea areaModel, List<MPartStack> stacks) {
131136
Object widget = areaModel.getWidget();
132-
if (widget instanceof CTabFolder)
137+
if (widget instanceof CTabFolder) {
133138
return;
134-
if (!(widget instanceof Composite))
139+
}
140+
if (!(widget instanceof Composite curComp)) {
135141
return;
142+
}
136143
// if not assigned to CTabFolder but any other Composite create CTabFolder
137-
Composite curComp = (Composite) widget;
138144
Composite parentComp = curComp.getParent();
139145
CTabFolder ctf = new CTabFolder(parentComp, SWT.BORDER | SWT.SINGLE);
140146
// don't paint the split editor area tab highlighted, it looks ugly
@@ -169,12 +175,15 @@ private void ensureCTF(MArea areaModel, List<MPartStack> stacks) {
169175
}
170176

171177
CTabItem cti = new CTabItem(ctf, SWT.NONE);
172-
if (areaModel.getLabel() != null)
178+
if (areaModel.getLabel() != null) {
173179
cti.setText(areaModel.getLocalizedLabel());
174-
if (areaModel.getTooltip() != null)
180+
}
181+
if (areaModel.getTooltip() != null) {
175182
cti.setToolTipText(areaModel.getLocalizedTooltip());
176-
if (areaModel.getIconURI() != null)
183+
}
184+
if (areaModel.getIconURI() != null) {
177185
cti.setImage(getImage(areaModel));
186+
}
178187

179188
curComp.setParent(ctf);
180189
cti.setControl(curComp);
@@ -219,15 +228,17 @@ private void synchCTFState(MArea areaModel) {
219228
List<MPartStack> stacks = findDirectStacks(areaModel);
220229
int count = 0;
221230
for (MPartStack stack : stacks) {
222-
if (stack.isToBeRendered())
231+
if (stack.isToBeRendered()) {
223232
count++;
233+
}
224234
}
225235

226236
// If there's more than one stack visible we use a CTF
227-
if (count > 1)
237+
if (count > 1) {
228238
ensureCTF(areaModel, stacks);
229-
else
239+
} else {
230240
ensureComposite(areaModel, stacks);
241+
}
231242
}
232243

233244
private List<MPartStack> findDirectStacks(MPartSashContainer root) {
@@ -246,10 +257,10 @@ private List<MPartStack> findDirectStacks(MPartSashContainer root) {
246257
public Object getUIContainer(MUIElement element) {
247258
MUIElement parentElement = element.getParent();
248259

249-
if (!(parentElement instanceof MArea))
260+
if (!(parentElement instanceof MArea areaModel)) {
250261
return null;
262+
}
251263

252-
MArea areaModel = (MArea) parentElement;
253264
synchCTFState(areaModel);
254265

255266
if (areaModel.getWidget() instanceof CTabFolder) {

‎bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/CSSEngineHelper.java‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,9 @@ private void initialize() {
5454
* @return the margin in pixels
5555
*/
5656
public int getMarginBottom(int defaultValue) {
57-
if (style == null)
57+
if (style == null) {
5858
return defaultValue;
59+
}
5960
return getPxValue(
6061
style.getPropertyCSSValue("margin-bottom"), defaultValue); //$NON-NLS-1$
6162
}
@@ -67,8 +68,9 @@ public int getMarginBottom(int defaultValue) {
6768
* @return the margin in pixels
6869
*/
6970
public int getMarginTop(int defaultValue) {
70-
if (style == null)
71+
if (style == null) {
7172
return defaultValue;
73+
}
7274
return getPxValue(style.getPropertyCSSValue("margin-top"), defaultValue); //$NON-NLS-1$
7375
}
7476

@@ -79,8 +81,9 @@ public int getMarginTop(int defaultValue) {
7981
* @return the margin in pixels
8082
*/
8183
public int getMarginLeft(int defaultValue) {
82-
if (style == null)
84+
if (style == null) {
8385
return defaultValue;
86+
}
8487
return getPxValue(
8588
style.getPropertyCSSValue("margin-left"), defaultValue); //$NON-NLS-1$
8689
}
@@ -92,8 +95,9 @@ public int getMarginLeft(int defaultValue) {
9295
* @return the margin in pixels
9396
*/
9497
public int getMarginRight(int defaultValue) {
95-
if (style == null)
98+
if (style == null) {
9699
return defaultValue;
100+
}
97101
return getPxValue(
98102
style.getPropertyCSSValue("margin-right"), defaultValue); //$NON-NLS-1$
99103
}

0 commit comments

Comments
 (0)