Skip to content

Commit 31cf93a

Browse files
CalixteCalixte
committed
Issue #451: add UseEnhancedSwitch to checkstyle config
1 parent c57f7bf commit 31cf93a

9 files changed

Lines changed: 98 additions & 226 deletions

File tree

‎config/checkstyle-checks.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -509,6 +509,7 @@
509509
<module name="UnnecessarySemicolonInEnumeration"/>
510510
<module name="UnnecessarySemicolonInTryWithResources"/>
511511
<module name="UnusedLocalVariable"/>
512+
<module name="UseEnhancedSwitch"/>
512513
<module name="UnusedCatchParameterShouldBeUnnamed">
513514
<property name="severity" value="ignore"/>
514515
</module>

‎net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/CheckConfigurationConfigureDialog.java‎

Lines changed: 9 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -949,31 +949,16 @@ public Image getColumnImage(Object element, int columnIndex) {
949949

950950
@Override
951951
public String getColumnText(Object element, int columnIndex) {
952-
String text = null;
953-
954-
if (element instanceof Module) {
955-
956-
Module module = (Module) element;
957-
switch (columnIndex) {
958-
959-
case 0:
960-
text = "";
961-
break;
962-
case 1:
963-
text = module.getName() != null ? module.getName() : "";
964-
break;
965-
case 2:
966-
text = module.getSeverity() != null ? module.getSeverity().toXmlValue() : "";
967-
break;
968-
case 3:
969-
text = module.getComment() != null ? module.getComment() : "";
970-
break;
971-
default:
972-
text = "";
973-
break;
974-
}
952+
if (element instanceof Module module) {
953+
return switch (columnIndex) {
954+
case 0 -> "";
955+
case 1 -> module.getName() != null ? module.getName() : "";
956+
case 2 -> module.getSeverity() != null ? module.getSeverity().toXmlValue() : "";
957+
case 3 -> module.getComment() != null ? module.getComment() : "";
958+
default -> "";
959+
};
975960
}
976-
return text;
961+
return null;
977962
}
978963

979964
@Override

‎net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/CheckConfigurationWorkingSetEditor.java‎

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -578,24 +578,18 @@ public String getColumnText(Object element, int columnIndex) {
578578

579579
@Override
580580
public Image getColumnImage(Object element, int columnIndex) {
581-
Image image = null;
582-
switch (columnIndex) {
583-
case 0:
584-
image = getImage(element);
585-
break;
586-
case 3:
581+
return switch (columnIndex) {
582+
case 0 -> getImage(element);
583+
case 3 -> {
587584
ICheckConfiguration cfg = (ICheckConfiguration) element;
588-
if (mWorkingSet instanceof GlobalCheckConfigurationWorkingSet) {
589-
590-
if (((GlobalCheckConfigurationWorkingSet) mWorkingSet).getDefaultCheckConfig() == cfg) {
591-
image = CheckstyleUIPluginImages.TICK_ICON.getImage();
592-
}
585+
if (mWorkingSet instanceof GlobalCheckConfigurationWorkingSet workingSet
586+
&& workingSet.getDefaultCheckConfig() == cfg) {
587+
yield CheckstyleUIPluginImages.TICK_ICON.getImage();
593588
}
594-
break;
595-
default:
596-
break;
597-
}
598-
return image;
589+
yield null;
590+
}
591+
default -> null;
592+
};
599593
}
600594

601595
@Override

‎net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/widgets/ConfigPropertyWidgetFactory.java‎

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -64,27 +64,17 @@ public static IConfigPropertyWidget createWidget(Composite parent, ConfigPropert
6464

6565
private static IConfigPropertyWidget getWidgetForConfigPropertyType(Composite parent,
6666
ConfigProperty prop, ConfigPropertyType type) {
67-
switch (type) {
68-
case STRING:
69-
return new ConfigPropertyWidgetString(parent, prop);
70-
case STRING_ARRAY:
71-
return new ConfigPropertyWidgetStringArray(parent, prop);
72-
case INTEGER:
73-
return new ConfigPropertyWidgetInteger(parent, prop);
74-
case SINGLE_SELECT:
75-
return new ConfigPropertyWidgetSingleSelect(parent, prop);
76-
case BOOLEAN:
77-
return new ConfigPropertyWidgetBoolean(parent, prop);
78-
case MULTI_CHECK:
79-
return new ConfigPropertyWidgetMultiCheck(parent, prop);
80-
case HIDDEN:
81-
return new ConfigPropertyWidgetHidden(parent, prop);
82-
case FILE:
83-
return new ConfigPropertyWidgetFile(parent, prop);
84-
case REGEX:
85-
return new ConfigPropertyWidgetRegex(parent, prop);
86-
default:
87-
return new ConfigPropertyWidgetString(parent, prop);
88-
}
67+
return switch (type) {
68+
case STRING -> new ConfigPropertyWidgetString(parent, prop);
69+
case STRING_ARRAY -> new ConfigPropertyWidgetStringArray(parent, prop);
70+
case INTEGER -> new ConfigPropertyWidgetInteger(parent, prop);
71+
case SINGLE_SELECT -> new ConfigPropertyWidgetSingleSelect(parent, prop);
72+
case BOOLEAN -> new ConfigPropertyWidgetBoolean(parent, prop);
73+
case MULTI_CHECK -> new ConfigPropertyWidgetMultiCheck(parent, prop);
74+
case HIDDEN -> new ConfigPropertyWidgetHidden(parent, prop);
75+
case FILE -> new ConfigPropertyWidgetFile(parent, prop);
76+
case REGEX -> new ConfigPropertyWidgetRegex(parent, prop);
77+
default -> new ConfigPropertyWidgetString(parent, prop);
78+
};
8979
}
9080
}

‎net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/properties/ComplexFileSetsEditor.java‎

Lines changed: 10 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -306,30 +306,17 @@ class FileSetLabelProvider extends LabelProvider implements ITableLabelProvider
306306

307307
@Override
308308
public String getColumnText(Object element, int columnIndex) {
309-
String result = element.toString();
310-
if (element instanceof FileSet) {
311-
FileSet fileSet = (FileSet) element;
312-
switch (columnIndex) {
313-
case 0:
314-
result = new String();
315-
break;
316-
317-
case 1:
318-
result = fileSet.getName();
319-
break;
320-
321-
case 2:
322-
result = fileSet.getCheckConfig() != null
323-
? mCheckConfigLabelProvider.getText(fileSet.getCheckConfig())
324-
: ""; //$NON-NLS-1$
325-
break;
326-
327-
default:
328-
break;
329-
}
330-
309+
if (element instanceof FileSet fileSet) {
310+
return switch (columnIndex) {
311+
case 0 -> new String();
312+
case 1 -> fileSet.getName();
313+
case 2 -> fileSet.getCheckConfig() != null
314+
? mCheckConfigLabelProvider.getText(fileSet.getCheckConfig())
315+
: "";
316+
default -> element.toString();
317+
};
331318
}
332-
return result;
319+
return element.toString();
333320
}
334321

335322
@Override

‎net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/properties/FileSetEditDialog.java‎

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -654,23 +654,14 @@ class FileMatchPatternLabelProvider extends LabelProvider implements ITableLabel
654654

655655
@Override
656656
public String getColumnText(Object element, int columnIndex) {
657-
String result = element.toString();
658-
if (element instanceof FileMatchPattern) {
659-
FileMatchPattern pattern = (FileMatchPattern) element;
660-
switch (columnIndex) {
661-
case 0:
662-
result = new String();
663-
break;
664-
665-
case 1:
666-
result = pattern.getMatchPattern();
667-
break;
668-
669-
default:
670-
break;
671-
}
657+
if (element instanceof FileMatchPattern pattern) {
658+
return switch (columnIndex) {
659+
case 0 -> new String();
660+
case 1 -> pattern.getMatchPattern();
661+
default -> element.toString();
662+
};
672663
}
673-
return result;
664+
return element.toString();
674665
}
675666

676667
@Override

‎net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/properties/marker/MarkerPropertyPage.java‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -146,16 +146,12 @@ private void createDescriptionText(final Composite composite, RuleIdentity ruleI
146146
*/
147147
public static Image getSeverityImage(int severity) {
148148
ISharedImages sharedImages = PlatformUI.getWorkbench().getSharedImages();
149-
switch (severity) {
150-
case IMarker.SEVERITY_ERROR:
151-
return sharedImages.getImage(ISharedImages.IMG_OBJS_ERROR_TSK);
152-
case IMarker.SEVERITY_WARNING:
153-
return sharedImages.getImage(ISharedImages.IMG_OBJS_WARN_TSK);
154-
case IMarker.SEVERITY_INFO:
155-
return sharedImages.getImage(ISharedImages.IMG_OBJS_INFO_TSK);
156-
default:
157-
return null;
158-
}
149+
return switch (severity) {
150+
case IMarker.SEVERITY_ERROR -> sharedImages.getImage(ISharedImages.IMG_OBJS_ERROR_TSK);
151+
case IMarker.SEVERITY_WARNING -> sharedImages.getImage(ISharedImages.IMG_OBJS_WARN_TSK);
152+
case IMarker.SEVERITY_INFO -> sharedImages.getImage(ISharedImages.IMG_OBJS_INFO_TSK);
153+
default -> null;
154+
};
159155
}
160156

161157
}

‎net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/stats/views/MarkerStatsView.java‎

Lines changed: 27 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -566,22 +566,11 @@ private class MasterViewMultiProvider extends LabelProvider
566566
@Override
567567
public String getColumnText(Object obj, int index) {
568568
MarkerStat stat = (MarkerStat) obj;
569-
String text = null;
570-
571-
switch (index) {
572-
case 1:
573-
text = stat.getIdentifiant();
574-
break;
575-
case 2:
576-
text = Integer.toString(stat.getCount());
577-
break;
578-
579-
default:
580-
text = ""; //$NON-NLS-1$
581-
break;
582-
}
583-
584-
return text;
569+
return switch (index) {
570+
case 1 -> stat.getIdentifiant();
571+
case 2 -> Integer.toString(stat.getCount());
572+
default -> "";
573+
};
585574
}
586575

587576
@Override
@@ -607,25 +596,12 @@ public Image getColumnImage(Object obj, int index) {
607596
@Override
608597
public Comparable<?> getComparableValue(Object element, int colIndex) {
609598
MarkerStat stat = (MarkerStat) element;
610-
Comparable<?> comparable = null;
611-
612-
switch (colIndex) {
613-
case 0:
614-
comparable = Integer.valueOf(stat.getMaxSeverity() * -1);
615-
break;
616-
case 1:
617-
comparable = stat.getIdentifiant();
618-
break;
619-
case 2:
620-
comparable = Integer.valueOf(stat.getCount());
621-
break;
622-
623-
default:
624-
comparable = ""; //$NON-NLS-1$
625-
break;
626-
}
627-
628-
return comparable;
599+
return switch (colIndex) {
600+
case 0 -> Integer.valueOf(stat.getMaxSeverity() * -1);
601+
case 1 -> stat.getIdentifiant();
602+
case 2 -> Integer.valueOf(stat.getCount());
603+
default -> "";
604+
};
629605
}
630606

631607
@Override
@@ -654,33 +630,19 @@ private class DetailViewMultiProvider extends LabelProvider
654630
@Override
655631
public String getColumnText(Object obj, int index) {
656632
IMarker marker = (IMarker) obj;
657-
String text = null;
658-
659633
try {
660-
switch (index) {
661-
case 1:
662-
text = marker.getResource().getName();
663-
break;
664-
case 2:
665-
text = marker.getResource().getParent().getFullPath().toString();
666-
break;
667-
case 3:
668-
text = Objects.toString(marker.getAttribute(IMarker.LINE_NUMBER), "");
669-
break;
670-
case 4:
671-
text = Objects.toString(marker.getAttribute(IMarker.MESSAGE), "");
672-
break;
673-
default:
674-
text = ""; //$NON-NLS-1$
675-
break;
676-
}
634+
return switch (index) {
635+
case 1 -> marker.getResource().getName();
636+
case 2 -> marker.getResource().getParent().getFullPath().toString();
637+
case 3 -> Objects.toString(marker.getAttribute(IMarker.LINE_NUMBER), "");
638+
case 4 -> Objects.toString(marker.getAttribute(IMarker.MESSAGE), "");
639+
default -> "";
640+
};
677641
} catch (Exception ex) {
678642
// Can't do anything: let's put a default value
679-
text = Messages.MarkerStatsView_unknownProblem;
680643
CheckstyleLog.log(ex);
644+
return Messages.MarkerStatsView_unknownProblem;
681645
}
682-
683-
return text;
684646
}
685647

686648
@Override
@@ -706,30 +668,14 @@ public Image getColumnImage(Object obj, int index) {
706668
@Override
707669
public Comparable<?> getComparableValue(Object element, int colIndex) {
708670
IMarker marker = (IMarker) element;
709-
Comparable<?> comparable = null;
710-
711-
switch (colIndex) {
712-
case 0:
713-
comparable = Integer.valueOf(marker.getAttribute(IMarker.SEVERITY, Integer.MAX_VALUE) * -1);
714-
break;
715-
case 1:
716-
comparable = marker.getResource().getName();
717-
break;
718-
case 2:
719-
comparable = marker.getResource().getParent().getFullPath().toString();
720-
break;
721-
case 3:
722-
comparable = Integer.valueOf(marker.getAttribute(IMarker.LINE_NUMBER, Integer.MAX_VALUE));
723-
break;
724-
case 4:
725-
comparable = marker.getAttribute(IMarker.MESSAGE, "");
726-
break;
727-
default:
728-
comparable = ""; //$NON-NLS-1$
729-
break;
730-
}
731-
732-
return comparable;
671+
return switch (colIndex) {
672+
case 0 -> Integer.valueOf(marker.getAttribute(IMarker.SEVERITY, Integer.MAX_VALUE) * -1);
673+
case 1 -> marker.getResource().getName();
674+
case 2 -> marker.getResource().getParent().getFullPath().toString();
675+
case 3 -> Integer.valueOf(marker.getAttribute(IMarker.LINE_NUMBER, Integer.MAX_VALUE));
676+
case 4 -> marker.getAttribute(IMarker.MESSAGE, "");
677+
default -> "";
678+
};
733679
}
734680

735681
@Override

0 commit comments

Comments
 (0)