Skip to content

Commit 97e38eb

Browse files
eclipse-platform-boteclipse-platform-bot
committed
Perform clean code of ua/org.eclipse.ui.cheatsheets
1 parent 22084fa commit 97e38eb

37 files changed

+360
-210
lines changed

‎ua/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/cheatsheets/CheatSheetExtensionFactory.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,9 @@ public CheatSheetExtensionFactory() {
5454

5555
@Override
5656
public Object create() throws CoreException {
57-
if (HELP_MENU_ACTION.equals(id))
57+
if (HELP_MENU_ACTION.equals(id)) {
5858
return configure(new CheatSheetHelpMenuAction());
59+
}
5960
throw new CoreException(new Status(IStatus.ERROR,
6061
"org.eclipse.ui.cheatsheets", //$NON-NLS-1$
6162
0, "Unknown id in data argument for " + getClass(), null)); //$NON-NLS-1$
@@ -64,12 +65,13 @@ public Object create() throws CoreException {
6465
@Override
6566
public void setInitializationData(IConfigurationElement config,
6667
String propertyName, Object data) throws CoreException {
67-
if (data instanceof String)
68+
if (data instanceof String) {
6869
id = (String) data;
69-
else
70+
} else {
7071
throw new CoreException(new Status(IStatus.ERROR,
7172
PlatformUI.PLUGIN_ID, 0,
7273
"Data argument must be a String for " + getClass(), null)); //$NON-NLS-1$
74+
}
7375
this.config = config;
7476
this.propertyName = propertyName;
7577
}

‎ua/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/CheatSheetHistory.java‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,9 @@ public IStatus restoreState(IMemento memento) {
6161
for (int i = 0; i < children.length && i < DEFAULT_DEPTH; i++) {
6262
CheatSheetElement element =
6363
reg.findCheatSheet(children[i].getID());
64-
if (element != null)
64+
if (element != null) {
6565
history.add(element);
66+
}
6667
}
6768
return new Status(IStatus.OK,ICheatSheetResource.CHEAT_SHEET_PLUGIN_ID,0,ICheatSheetResource.EMPTY_STRING,null);
6869
}
@@ -80,14 +81,16 @@ public IStatus saveState(IMemento memento) {
8081

8182
public void add(String id) {
8283
CheatSheetElement element = reg.findCheatSheet(id);
83-
if (element != null)
84+
if (element != null) {
8485
add(element);
86+
}
8587
}
8688

8789
public void add(CheatSheetElement element) {
8890
// Avoid duplicates
89-
if (history.contains(element))
91+
if (history.contains(element)) {
9092
return;
93+
}
9194

9295
// If the shortcut list will be too long, remove oldest ones
9396
int size = history.size();
@@ -114,8 +117,9 @@ public void refreshFromRegistry() {
114117
}
115118
}
116119

117-
if (change)
120+
if (change) {
118121
fireChange();
122+
}
119123
}
120124

121125
/**
@@ -129,11 +133,13 @@ public void refreshFromRegistry() {
129133
*/
130134
public int copyItems(List<CheatSheetElement> dest, int destStart, int count) {
131135
int itemCount = count;
132-
if (itemCount > history.size())
136+
if (itemCount > history.size()) {
133137
itemCount = history.size();
138+
}
134139

135-
for (int i = 0; i < itemCount; i++)
140+
for (int i = 0; i < itemCount; i++) {
136141
dest.add(destStart + i, history.get(i));
142+
}
137143

138144
return itemCount;
139145
}

‎ua/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/CheatSheetPlugin.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,9 @@ private File getCheatSheetStateFile(String filename) {
121121
* Logs an Error message with an exception.
122122
*/
123123
public static synchronized void logError(String message, Throwable ex) {
124-
if (message == null)
124+
if (message == null) {
125125
message = ""; //$NON-NLS-1$
126+
}
126127
CheatSheetPlugin.getPlugin().getLog().error(message, ex);
127128
}
128129

‎ua/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/CheatsheetSearchParticipant.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,9 @@ public Set<String> getAllDocuments(String locale) {
4848
ICheatSheetResource.CHEAT_SHEET_PLUGIN_ID + '.'
4949
+ CheatSheetRegistryReader.CHEAT_SHEET_CONTENT);
5050
for (IConfigurationElement element : elements) {
51-
if (!element.getName().equals(CheatSheetRegistryReader.TAG_CHEATSHEET))
51+
if (!element.getName().equals(CheatSheetRegistryReader.TAG_CHEATSHEET)) {
5252
continue;
53+
}
5354
String fileName = element.getAttribute(CheatSheetRegistryReader.ATT_CONTENTFILE);
5455
String id = element.getAttribute("id"); //$NON-NLS-1$
5556
String pluginId = element.getContributor().getName();

‎ua/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/actions/CheatSheetMenu.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,9 @@ public int compare(CheatSheetElement ob1, CheatSheetElement ob2) {
7777
public CheatSheetMenu() {
7878
super("LaunchCheatSheetMenu"); //$NON-NLS-1$
7979

80-
if (reg == null)
80+
if (reg == null) {
8181
reg = CheatSheetRegistryReader.getInstance();
82+
}
8283

8384
showActive(true);
8485
}

‎ua/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/AbstractOverlayIcon.java‎

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,16 @@ public AbstractOverlayIcon(ImageDescriptor[][] overlays) {
3535

3636
public AbstractOverlayIcon(ImageDescriptor[][] overlays, Point size) {
3737
fOverlays = overlays;
38-
if (size != null)
38+
if (size != null) {
3939
fSize = size;
40-
else
40+
} else {
4141
fSize = new Point(DEFAULT_WIDTH, DEFAULT_HEIGHT);
42+
}
4243
}
4344
protected void drawBottomLeft(ImageDescriptor[] overlays) {
44-
if (overlays == null)
45+
if (overlays == null) {
4546
return;
47+
}
4648
int length = overlays.length;
4749
int x = 0;
4850
for (int i = 0; i < 3; i++) {
@@ -54,8 +56,9 @@ protected void drawBottomLeft(ImageDescriptor[] overlays) {
5456
}
5557
}
5658
protected void drawBottomRight(ImageDescriptor[] overlays) {
57-
if (overlays == null)
59+
if (overlays == null) {
5860
return;
61+
}
5962
int length = overlays.length;
6063
int x = getSize().x;
6164
for (int i = 2; i >= 0; i--) {
@@ -74,22 +77,27 @@ protected void drawCompositeImage(int width, int height) {
7477
ImageData base = getBaseImageData();
7578
drawImage(base, 0, 0);
7679
if (fOverlays != null) {
77-
if (fOverlays.length > 0)
80+
if (fOverlays.length > 0) {
7881
drawTopRight(fOverlays[0]);
82+
}
7983

80-
if (fOverlays.length > 1)
84+
if (fOverlays.length > 1) {
8185
drawBottomRight(fOverlays[1]);
86+
}
8287

83-
if (fOverlays.length > 2)
88+
if (fOverlays.length > 2) {
8489
drawBottomLeft(fOverlays[2]);
90+
}
8591

86-
if (fOverlays.length > 3)
92+
if (fOverlays.length > 3) {
8793
drawTopLeft(fOverlays[3]);
94+
}
8895
}
8996
}
9097
protected void drawTopLeft(ImageDescriptor[] overlays) {
91-
if (overlays == null)
98+
if (overlays == null) {
9299
return;
100+
}
93101
int length = overlays.length;
94102
int x = 0;
95103
for (int i = 0; i < 3; i++) {
@@ -101,8 +109,9 @@ protected void drawTopLeft(ImageDescriptor[] overlays) {
101109
}
102110
}
103111
protected void drawTopRight(ImageDescriptor[] overlays) {
104-
if (overlays == null)
112+
if (overlays == null) {
105113
return;
114+
}
106115
int length = overlays.length;
107116
int x = getSize().x;
108117
for (int i = 2; i >= 0; i--) {

‎ua/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/OverlayIcon.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,9 @@ public OverlayIcon(ImageDescriptor base, ImageDescriptor[][] overlays,
3030
Point size) {
3131
super(overlays, size);
3232
fBase = base;
33-
if (fBase == null)
33+
if (fBase == null) {
3434
fBase = ImageDescriptor.getMissingImageDescriptor();
35+
}
3536
}
3637

3738
@Override

‎ua/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/ResetTaskAction.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@ public ResetTaskAction(ICompositeCheatSheetTask task) {
4444
@Override
4545
public void run() {
4646
AbstractTask[] restartTasks = TaskStateUtilities.getRestartTasks(task);
47-
if (restartTasks.length == 0) return;
47+
if (restartTasks.length == 0) {
48+
return;
49+
}
4850
TreeLabelProvider labelProvider = new TreeLabelProvider();
4951
ConfirmRestartDialog dlg = new ConfirmRestartDialog(
5052
PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), restartTasks, labelProvider);

‎ua/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/TreeContentProvider.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,9 @@ public Object[] getChildren(Object parentElement) {
2727
final Object[] rootTask = {((ICompositeCheatSheet) parentElement).getRootTask()};
2828
return rootTask;
2929
}
30-
if (parentElement instanceof ITaskGroup)
30+
if (parentElement instanceof ITaskGroup) {
3131
return ((ITaskGroup) parentElement).getSubtasks();
32+
}
3233
return new Object[0];
3334
}
3435

@@ -42,10 +43,12 @@ public Object getParent(Object element) {
4243

4344
@Override
4445
public boolean hasChildren(Object element) {
45-
if (element instanceof ICompositeCheatSheet)
46+
if (element instanceof ICompositeCheatSheet) {
4647
return true;
47-
if (element instanceof ITaskGroup)
48+
}
49+
if (element instanceof ITaskGroup) {
4850
return ((ITaskGroup) element).getSubtasks().length > 0;
51+
}
4952
return false;
5053
}
5154

‎ua/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/TreeExplorerMenu.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,14 @@ public TreeExplorerMenu(TaskExplorer explorer) {
4444
protected void fillContextMenu(IMenuManager manager) {
4545
ISelection selection = explorer.getSelectionProvider().getSelection();
4646
ICompositeCheatSheetTask selectedTask = null;
47-
if (selection instanceof IStructuredSelection) {
48-
IStructuredSelection structuredSelection = (IStructuredSelection)selection;
47+
if (selection instanceof IStructuredSelection structuredSelection) {
4948
if (structuredSelection.size() == 1) {
5049
selectedTask = (ICompositeCheatSheetTask)(structuredSelection).getFirstElement();
5150
}
5251
}
53-
if (selectedTask == null) return;
52+
if (selectedTask == null) {
53+
return;
54+
}
5455

5556
// Start
5657
StartAction startAction = new StartAction(selectedTask);

0 commit comments

Comments
 (0)