Skip to content

Commit d2ed9d5

Browse files
EcljpseB0Tjukzi
EcljpseB0T
authored and
jukzi
committed
team: fix "The switch statement should have a default case"
adding a lot of IllegalArgumentException for unexpected states
1 parent ee75f74 commit d2ed9d5

30 files changed

+126
-139
lines changed

‎debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/RemoveBreakpointAction.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,9 @@ public void run(IAction action) {
102102
if(prompted) {
103103
MessageDialogWithToggle mdwt = MessageDialogWithToggle.openYesNoQuestion(getView().getSite().getShell(), ActionMessages.RemoveBreakpointAction_0,
104104
ActionMessages.RemoveBreakpointAction_1, ActionMessages.RemoveAllBreakpointsAction_3, !prompted, null, null);
105-
if(mdwt.getReturnCode() == IDialogConstants.NO_ID) {
105+
if (mdwt.getReturnCode() != IDialogConstants.YES_ID) {
106106
deleteAll = false;
107-
}
108-
else {
107+
} else {
109108
store.setValue(IDebugPreferenceConstants.PREF_PROMPT_REMOVE_BREAKPOINTS_FROM_CONTAINER, !mdwt.getToggleState());
110109
deleteAll = true;
111110
}

‎team/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -628,6 +628,8 @@ void updateCursor(Control c, int dir) {
628628
cursor= fHSashCursor;
629629
}
630630
break;
631+
default:
632+
throw new IllegalArgumentException(Integer.toString(dir));
631633
}
632634
if (cursor != null)
633635
c.setCursor(cursor);
@@ -744,7 +746,7 @@ protected boolean doSave(Object newInput, Object oldInput) {
744746
setLeftDirty(false);
745747
setRightDirty(false);
746748
break;
747-
case 2:
749+
default:
748750
throw new ViewerSwitchingCancelled();
749751
}
750752
} else {
@@ -1378,7 +1380,7 @@ protected void handleCompareInputChange() {
13781380
case 0:
13791381
flushContent(input, null);
13801382
break;
1381-
case 1:
1383+
default:
13821384
setLeftDirty(false);
13831385
setRightDirty(false);
13841386
break;

‎team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -303,9 +303,7 @@ public void stop(BundleContext context) throws Exception {
303303
super.stop(context);
304304

305305
if (fgDisposeOnShutdownImages != null) {
306-
Iterator<Image> i= fgDisposeOnShutdownImages.iterator();
307-
while (i.hasNext()) {
308-
Image img= i.next();
306+
for (Image img : fgDisposeOnShutdownImages) {
309307
if (!img.isDisposed())
310308
img.dispose();
311309
}
@@ -808,10 +806,8 @@ public IStreamMerger createStreamMerger(IContentType type) {
808806

809807
public ViewerDescriptor[] findStructureViewerDescriptor(Viewer oldViewer,
810808
ICompareInput input, CompareConfiguration configuration) {
811-
if (input == null)
812-
return null;
813809
// we don't show the structure of additions or deletions
814-
if (input == null || input.getLeft() == null || input.getRight() == null)
810+
if ((input == null) || input == null || input.getLeft() == null || input.getRight() == null)
815811
return null;
816812

817813
Set<ViewerDescriptor> result = new LinkedHashSet<>();
@@ -895,9 +891,7 @@ public CompareFilterDescriptor[] findCompareFilters(Object in) {
895891
return new CompareFilterDescriptor[0];
896892
}
897893
Set<CompareFilterDescriptor> result = new LinkedHashSet<>();
898-
Iterator<Object> ctIterator = contentTypes.iterator();
899-
while (ctIterator.hasNext()) {
900-
Object ct = ctIterator.next();
894+
for (Object ct : contentTypes) {
901895
if (ct instanceof IContentType) {
902896
List<CompareFilterDescriptor> list = fCompareFilters.searchAll((IContentType) ct);
903897
if (list != null)
@@ -1179,8 +1173,9 @@ private static boolean isHomogenous(String[] types) {
11791173
return types[0].equals(types[1]);
11801174
case 3:
11811175
return types[0].equals(types[1]) && types[1].equals(types[2]);
1176+
default:
1177+
return false;
11821178
}
1183-
return false;
11841179
}
11851180

11861181
/*
@@ -1237,8 +1232,9 @@ private static IContentType getCommonType(ICompareInput input) {
12371232
result= s0[i];
12381233
}
12391234
return result;
1235+
default:
1236+
return null;
12401237
}
1241-
return null;
12421238
}
12431239

12441240
private static IContentType[] toFullPath(IContentType ct) {
@@ -1511,10 +1507,8 @@ String findContentTypeNameOrType(ICompareInput input, ViewerDescriptor vd, Compa
15111507
}
15121508

15131509
String findStructureTypeNameOrType(ICompareInput input, ViewerDescriptor vd, CompareConfiguration cc) {
1514-
if (input == null)
1515-
return null;
15161510
// We don't show the structure of additions or deletions
1517-
if (input == null || input.getLeft() == null || input.getRight() == null)
1511+
if ((input == null) || input == null || input.getLeft() == null || input.getRight() == null)
15181512
return null;
15191513

15201514
// Content type search

‎team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/DocumentMerger.java

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -172,22 +172,13 @@ public String changeType() {
172172
}
173173

174174
public Image getImage() {
175-
int code= Differencer.CHANGE;
176-
switch (fDirection) {
177-
case RangeDifference.RIGHT:
178-
code+= getCompareConfiguration().isMirrored() ? Differencer.RIGHT : Differencer.LEFT;
179-
break;
180-
case RangeDifference.LEFT:
181-
code+= getCompareConfiguration().isMirrored() ? Differencer.LEFT : Differencer.RIGHT ;
182-
break;
183-
case RangeDifference.ANCESTOR:
184-
case RangeDifference.CONFLICT:
185-
code+= Differencer.CONFLICTING;
186-
break;
187-
}
188-
if (code != 0)
189-
return getCompareConfiguration().getImage(code);
190-
return null;
175+
int code = Differencer.CHANGE + switch (fDirection) {
176+
case RangeDifference.RIGHT -> getCompareConfiguration().isMirrored() ? Differencer.RIGHT : Differencer.LEFT;
177+
case RangeDifference.LEFT -> getCompareConfiguration().isMirrored() ? Differencer.LEFT : Differencer.RIGHT;
178+
case RangeDifference.ANCESTOR, RangeDifference.CONFLICT -> Differencer.CONFLICTING;
179+
default -> 0;
180+
};
181+
return getCompareConfiguration().getImage(code);
191182
}
192183

193184
Position createPosition(IDocument doc, Position range, int start, int end) {
@@ -1103,6 +1094,8 @@ public int findInsertionPoint(Diff diff, char type) {
11031094
if (diff.fRightPos != null)
11041095
return diff.fRightPos.offset;
11051096
break;
1097+
default:
1098+
throw new IllegalArgumentException(Character.toString(type));
11061099
}
11071100
}
11081101
return 0;
@@ -1232,6 +1225,9 @@ public boolean copy(Diff diff, boolean leftToRight) {
12321225
} else
12331226
s= fromDoc.get(fromStart, fromLen);
12341227
break;
1228+
default:
1229+
// for example ERROR
1230+
break;
12351231
}
12361232
if (s != null) {
12371233
toDoc.replace(toStart, toLen, s);

‎team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/DecoratorOverlayIcon.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,11 @@ public DecoratorOverlayIcon(Image baseImage,
5353

5454
/**
5555
* Draw the overlays for the receiver.
56-
* @param overlaysArray the overlay images
5756
*/
58-
protected void drawOverlays(ImageDescriptor[] overlaysArray) {
57+
private void drawOverlays() {
5958

6059
for (int i = 0; i < overlays.length; i++) {
61-
ImageDescriptor overlay = overlaysArray[i];
60+
ImageDescriptor overlay = overlays[i];
6261
if (overlay == null) {
6362
continue;
6463
}
@@ -82,6 +81,9 @@ protected void drawOverlays(ImageDescriptor[] overlaysArray) {
8281
drawImage(overlayData, size.x - overlayData.width, size.y
8382
- overlayData.height);
8483
break;
84+
default:
85+
// UNDERLAY
86+
break;
8587
}
8688
}
8789
}
@@ -114,7 +116,7 @@ protected void drawCompositeImage(int width, int height) {
114116
drawImage(underlay.getImageData(), 0, 0);
115117
}
116118
drawImage(base.getImageData(), 0, 0);
117-
drawOverlays(overlays);
119+
drawOverlays();
118120
}
119121

120122
@Override

‎team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/InputPatchPage.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,9 @@ public void shellActivated(ShellEvent e) {
125125
case WORKSPACE:
126126
fShowError= (!fTreeViewer.getSelection().isEmpty());
127127
break;
128+
default:
129+
// CLIPBOARD
130+
break;
128131
}
129132
updateWidgetEnablements();
130133
}
@@ -946,6 +949,8 @@ private void setInputButtonState(int state) {
946949
fUseURLButton.setSelection(false);
947950
fUseWorkspaceButton.setSelection(true);
948951
break;
952+
default:
953+
throw new IllegalArgumentException(Integer.toString(state));
949954
}
950955

951956
setEnablePatchFile(state == FILE);

‎team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchTargetPage.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ public IWizardPage getNextPage() {
129129
// contains only a patch for a single file
130130
if (!fPatcher.isWorkspacePatch() && fPatcher.getTarget() instanceof IFile && fPatcher.getDiffs().length > 1) {
131131
InputPatchPage inputPage = (InputPatchPage) getWizard().getPage(InputPatchPage.INPUTPATCHPAGE_NAME);
132-
String source = ""; //$NON-NLS-1$
132+
String source;
133133
switch (inputPage.getInputMethod()) {
134134
case InputPatchPage.CLIPBOARD :
135135
source = PatchMessages.InputPatchPage_Clipboard_title;
@@ -142,6 +142,9 @@ public IWizardPage getNextPage() {
142142
case InputPatchPage.WORKSPACE :
143143
source = PatchMessages.InputPatchPage_WorkspacePatch_title;
144144
break;
145+
default: // URL
146+
source = ""; //$NON-NLS-1$
147+
break;
145148
}
146149
String format = PatchMessages.InputPatchPage_SingleFileError_format;
147150
String message = MessageFormat.format(format, source);

‎team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/Patcher.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import java.util.Arrays;
2525
import java.util.HashMap;
2626
import java.util.HashSet;
27-
import java.util.Iterator;
2827
import java.util.List;
2928
import java.util.Map;
3029
import java.util.Set;
@@ -217,6 +216,8 @@ public void countLines() {
217216
case '-':
218217
removedLines++;
219218
continue;
219+
default:
220+
break;
220221
}
221222
}
222223
}
@@ -250,10 +251,8 @@ else if (fTarget instanceof IFile) {
250251
for (i= 0; i < fDiffs.length; i++) {
251252
FilePatch2 diff= fDiffs[i];
252253
if (isEnabled(diff)) {
253-
switch (diff.getDiffType(isReversed())) {
254-
case FilePatch2.CHANGE:
254+
if (diff.getDiffType(isReversed()) == FilePatch2.CHANGE) {
255255
list.add(createPath(container, getPath(diff)));
256-
break;
257256
}
258257
}
259258
}
@@ -305,6 +304,8 @@ else if (fTarget instanceof IFile) {
305304
store(LineReader.createString(isPreserveLineDelimeters(), result), file, SubMonitor.convert(pm, workTicks));
306305
workTicks-= WORK_UNIT;
307306
break;
307+
default:
308+
throw new IllegalArgumentException(Integer.toString(type));
308309
}
309310

310311
if (isGenerateRejectFile() && failed.size() > 0) {
@@ -421,9 +422,7 @@ public static String getRejected(List<Hunk> failedHunks) {
421422

422423
String lineSeparator= System.getProperty("line.separator"); //$NON-NLS-1$
423424
StringBuilder sb= new StringBuilder();
424-
Iterator<Hunk> iter= failedHunks.iterator();
425-
while (iter.hasNext()) {
426-
Hunk hunk= iter.next();
425+
for (Hunk hunk : failedHunks) {
427426
sb.append(hunk.getRejectedDescription());
428427
sb.append(lineSeparator);
429428
sb.append(hunk.getContent());

‎team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/WorkspacePatcher.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,8 @@ public void applyAll(IProgressMonitor pm, IFileValidator validator) throws CoreE
140140
store(LineReader.createString(isPreserveLineDelimeters(), result), file, SubMonitor.convert(pm, workTicks));
141141
workTicks -= WORK_UNIT;
142142
break;
143+
default:
144+
throw new IllegalArgumentException(Integer.toString(type));
143145
}
144146

145147
if (isGenerateRejectFile() && failed.size() > 0) {

‎team/bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/SyncInfo.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -364,6 +364,7 @@ public String toString() {
364364
* @param kind the sync kind obtained from a <code>SyncInfo</code>
365365
* @return a displayable string that describes the kind
366366
*/
367+
@SuppressWarnings("incomplete-switch")
367368
public static String kindToString(int kind) {
368369
String label = ""; //$NON-NLS-1$
369370
if(kind==IN_SYNC) {

0 commit comments

Comments
 (0)