Skip to content

Commit 8473e6b

Browse files
vogellaakurtakov
vogella
authored and
akurtakov
committed
Refactor debug conditionals for improved readability in content assist
classes Using JDT clean-up "Convert control statement bodies to block"
1 parent e9f86a5 commit 8473e6b

29 files changed

+667
-345
lines changed

‎bundles/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/AbstractControlContentAssistSubjectAdapter.java‎

Lines changed: 36 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,9 @@ public AbstractControlContentAssistSubjectAdapter() {
9999
public void addKeyListener(KeyListener keyListener) {
100100
fKeyListeners.add(keyListener);
101101

102-
if (DEBUG)
102+
if (DEBUG) {
103103
System.out.println("AbstractControlContentAssistSubjectAdapter#addKeyListener()"); //$NON-NLS-1$
104+
}
104105

105106
installControlListener();
106107
}
@@ -110,8 +111,9 @@ public void removeKeyListener(KeyListener keyListener) {
110111
boolean deleted= fKeyListeners.remove(keyListener);
111112

112113
if (DEBUG) {
113-
if (!deleted)
114+
if (!deleted) {
114115
System.out.println("removeKeyListener -> wasn't here"); //$NON-NLS-1$
116+
}
115117
System.out.println("AbstractControlContentAssistSubjectAdapter#removeKeyListener() -> " + fKeyListeners.size()); //$NON-NLS-1$
116118
}
117119

@@ -127,8 +129,9 @@ public boolean supportsVerifyKeyListener() {
127129
public boolean appendVerifyKeyListener(final VerifyKeyListener verifyKeyListener) {
128130
fVerifyKeyListeners.add(verifyKeyListener);
129131

130-
if (DEBUG)
132+
if (DEBUG) {
131133
System.out.println("AbstractControlContentAssistSubjectAdapter#appendVerifyKeyListener() -> " + fVerifyKeyListeners.size()); //$NON-NLS-1$
134+
}
132135

133136
installControlListener();
134137
return true;
@@ -138,8 +141,9 @@ public boolean appendVerifyKeyListener(final VerifyKeyListener verifyKeyListener
138141
public boolean prependVerifyKeyListener(final VerifyKeyListener verifyKeyListener) {
139142
fVerifyKeyListeners.add(0, verifyKeyListener);
140143

141-
if (DEBUG)
144+
if (DEBUG) {
142145
System.out.println("AbstractControlContentAssistSubjectAdapter#prependVerifyKeyListener() -> " + fVerifyKeyListeners.size()); //$NON-NLS-1$
146+
}
143147

144148
installControlListener();
145149
return true;
@@ -149,17 +153,19 @@ public boolean prependVerifyKeyListener(final VerifyKeyListener verifyKeyListene
149153
public void removeVerifyKeyListener(VerifyKeyListener verifyKeyListener) {
150154
fVerifyKeyListeners.remove(verifyKeyListener);
151155

152-
if (DEBUG)
156+
if (DEBUG) {
153157
System.out.println("AbstractControlContentAssistSubjectAdapter#removeVerifyKeyListener() -> " + fVerifyKeyListeners.size()); //$NON-NLS-1$
158+
}
154159

155160
uninstallControlListener();
156161
}
157162

158163
@Override
159164
public void setEventConsumer(IEventConsumer eventConsumer) {
160165
// this is not supported
161-
if (DEBUG)
166+
if (DEBUG) {
162167
System.out.println("AbstractControlContentAssistSubjectAdapter#setEventConsumer()"); //$NON-NLS-1$
168+
}
163169
}
164170

165171
@Override
@@ -172,38 +178,44 @@ public String getLineDelimiter() {
172178
* passing them to {@link #fVerifyKeyListeners} and {@link #fKeyListeners}.
173179
*/
174180
private void installControlListener() {
175-
if (DEBUG)
181+
if (DEBUG) {
176182
System.out.println("AbstractControlContentAssistSubjectAdapter#installControlListener() -> k: " + fKeyListeners.size() + ", v: " + fVerifyKeyListeners.size()); //$NON-NLS-1$ //$NON-NLS-2$
183+
}
177184

178-
if (fControlListener != null)
185+
if (fControlListener != null) {
179186
return;
187+
}
180188

181189
fControlListener= new Listener() {
182190
@Override
183191
public void handleEvent(Event e) {
184-
if (! getControl().isFocusControl())
192+
if (! getControl().isFocusControl()) {
185193
return; //SWT.TRAVERSE_MNEMONIC events can also come in to inactive widgets
194+
}
186195
VerifyEvent verifyEvent= new VerifyEvent(e);
187196
KeyEvent keyEvent= new KeyEvent(e);
188197
switch (e.type) {
189198
case SWT.Traverse :
190199

191-
if (DEBUG)
200+
if (DEBUG) {
192201
dump("before traverse", e, verifyEvent); //$NON-NLS-1$
202+
}
193203

194204
verifyEvent.doit= true;
195205
for (VerifyKeyListener verifyKeyListener : fVerifyKeyListeners) {
196206
verifyKeyListener.verifyKey(verifyEvent);
197207
if (! verifyEvent.doit) {
198208
e.detail= SWT.TRAVERSE_NONE;
199209
e.doit= true;
200-
if (DEBUG)
210+
if (DEBUG) {
201211
dump("traverse eaten by verify", e, verifyEvent); //$NON-NLS-1$
212+
}
202213
return;
203214
}
204215

205-
if (DEBUG)
216+
if (DEBUG) {
206217
dump("traverse OK", e, verifyEvent); //$NON-NLS-1$
218+
}
207219
}
208220
break;
209221

@@ -212,14 +224,16 @@ public void handleEvent(Event e) {
212224
verifyKeyListener.verifyKey(verifyEvent);
213225
if (! verifyEvent.doit) {
214226
e.doit= verifyEvent.doit;
215-
if (DEBUG)
227+
if (DEBUG) {
216228
dump("keyDown eaten by verify", e, verifyEvent); //$NON-NLS-1$
229+
}
217230
return;
218231
}
219232
}
220233

221-
if (DEBUG)
234+
if (DEBUG) {
222235
dump("keyDown OK", e, verifyEvent); //$NON-NLS-1$
236+
}
223237

224238
for (KeyListener keyListener : fKeyListeners) {
225239
keyListener.keyPressed(keyEvent);
@@ -263,8 +277,9 @@ private String hex(int i) {
263277
getControl().addListener(SWT.Traverse, fControlListener);
264278
getControl().addListener(SWT.KeyDown, fControlListener);
265279

266-
if (DEBUG)
280+
if (DEBUG) {
267281
System.out.println("AbstractControlContentAssistSubjectAdapter#installControlListener() - installed"); //$NON-NLS-1$
282+
}
268283
}
269284

270285
/**
@@ -275,17 +290,19 @@ private String hex(int i) {
275290
private void uninstallControlListener() {
276291
if (fControlListener == null || fKeyListeners.size() + fVerifyKeyListeners.size() != 0) {
277292

278-
if (DEBUG)
293+
if (DEBUG) {
279294
System.out.println("AbstractControlContentAssistSubjectAdapter#uninstallControlListener() -> k: " + fKeyListeners.size() + ", v: " + fVerifyKeyListeners.size()); //$NON-NLS-1$ //$NON-NLS-2$
295+
}
280296

281297
return;
282298
}
283299
getControl().removeListener(SWT.Traverse, fControlListener);
284300
getControl().removeListener(SWT.KeyDown, fControlListener);
285301
fControlListener= null;
286302

287-
if (DEBUG)
303+
if (DEBUG) {
288304
System.out.println("AbstractControlContentAssistSubjectAdapter#uninstallControlListener() - done"); //$NON-NLS-1$
305+
}
289306
}
290307

291308
/**
@@ -349,8 +366,9 @@ public void setContentAssistCueProvider(final ILabelProvider labelProvider) {
349366
ILabelProviderListener listener= event -> {
350367
fControlDecoration.setDescriptionText(labelProvider.getText(getControl()));
351368
Image image= labelProvider.getImage(getControl());
352-
if (image == null)
369+
if (image == null) {
353370
image= getDefaultCueImage();
371+
}
354372
fControlDecoration.setImage(image);
355373
};
356374
labelProvider.addListener(listener);

‎bundles/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ComboContentAssistSubjectAdapter.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,8 @@ public boolean addSelectionListener(final SelectionListener selectionListener) {
168168
public void removeSelectionListener(SelectionListener selectionListener) {
169169
fCombo.removeSelectionListener(selectionListener);
170170
Listener listener= fModifyListeners.get(selectionListener);
171-
if (listener != null)
171+
if (listener != null) {
172172
fCombo.removeListener(SWT.Modify, listener);
173+
}
173174
}
174175
}

‎bundles/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/SubjectControlContextInformationValidator.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,9 @@ public boolean isContextInformationValid(int offset) {
6565
IContextInformation[] infos= ((ISubjectControlContentAssistProcessor)fProcessor).computeContextInformation(fContentAssistSubjectControl, offset);
6666
if (infos != null && infos.length > 0) {
6767
for (IContextInformation info : infos) {
68-
if (fContextInformation.equals(info))
68+
if (fContextInformation.equals(info)) {
6969
return true;
70+
}
7071
}
7172
}
7273
}

‎bundles/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/TextContentAssistSubjectAdapter.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,8 @@ public boolean addSelectionListener(final SelectionListener selectionListener) {
151151
public void removeSelectionListener(SelectionListener selectionListener) {
152152
fText.removeSelectionListener(selectionListener);
153153
Listener listener= fModifyListeners.get(selectionListener);
154-
if (listener != null)
154+
if (listener != null) {
155155
fText.removeListener(SWT.Modify, listener);
156+
}
156157
}
157158
}

‎bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/InformationControlReplacer.java‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,11 @@ public void replaceInformationControl(IInformationControlCreator informationPres
8989

9090
try {
9191
fIsReplacing= true;
92-
if (! fDelayedInformationSet)
92+
if (! fDelayedInformationSet) {
9393
fReplacableInformation= information;
94-
else
94+
} else {
9595
takeFocus= true; // delayed input has been set, so the original info control must have been focused
96+
}
9697
fContentBounds= contentBounds;
9798
fReplaceableArea= subjectArea;
9899

@@ -117,8 +118,9 @@ protected void computeInformation() {
117118
return;
118119
}
119120

120-
if (DEBUG)
121+
if (DEBUG) {
121122
System.out.println("InformationControlReplacer: no active replaceable"); //$NON-NLS-1$
123+
}
122124
}
123125

124126
/**
@@ -136,10 +138,11 @@ public void showInformationControl(Rectangle subjectArea, Object information) {
136138
// Caveat: some IInformationControls fail unless setSizeConstraints(..) is called with concrete values
137139
informationControl.setSizeConstraints(controlBounds.width, controlBounds.height);
138140

139-
if (informationControl instanceof IInformationControlExtension2)
141+
if (informationControl instanceof IInformationControlExtension2) {
140142
((IInformationControlExtension2) informationControl).setInput(information);
141-
else
143+
} else {
142144
informationControl.setInformation(information.toString());
145+
}
143146

144147
// need to recompute the bounds because trim might have changed based on input
145148
controlBounds= computeBoundsFromContent(informationControl, fContentBounds);

‎bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/NonDeletingPositionUpdater.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,9 @@ public void update(DocumentEvent event) {
5757

5858
Position position= positions[i];
5959

60-
if (position.isDeleted())
60+
if (position.isDeleted()) {
6161
continue;
62+
}
6263

6364
int offset= position.getOffset();
6465
int length= position.getLength();

0 commit comments

Comments
 (0)