Skip to content

Issue #451: add UseEnhancedSwitch to checkstyle config #981

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Calixte merged 1 commit into from
May 10, 2026
Merged

Issue #451: add UseEnhancedSwitch to checkstyle config #981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions config/checkstyle-checks.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,6 +509,7 @@
<module name="UnnecessarySemicolonInEnumeration"/>
<module name="UnnecessarySemicolonInTryWithResources"/>
<module name="UnusedLocalVariable"/>
<module name="UseEnhancedSwitch"/>
<module name="UnusedCatchParameterShouldBeUnnamed">
<property name="severity" value="ignore"/>
</module>
Expand Down
33 changes: 9 additions & 24 deletions net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/CheckConfigurationConfigureDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -949,31 +949,16 @@ public Image getColumnImage(Object element, int columnIndex) {

@Override
public String getColumnText(Object element, int columnIndex) {
String text = null;

if (element instanceof Module) {

Module module = (Module) element;
switch (columnIndex) {

case 0:
text = "";
break;
case 1:
text = module.getName() != null ? module.getName() : "";
break;
case 2:
text = module.getSeverity() != null ? module.getSeverity().toXmlValue() : "";
break;
case 3:
text = module.getComment() != null ? module.getComment() : "";
break;
default:
text = "";
break;
}
if (element instanceof Module module) {
return switch (columnIndex) {
case 0 -> "";
case 1 -> module.getName() != null ? module.getName() : "";
case 2 -> module.getSeverity() != null ? module.getSeverity().toXmlValue() : "";
case 3 -> module.getComment() != null ? module.getComment() : "";
default -> "";
};
}
return text;
return null;
}

@Override
Expand Down
26 changes: 10 additions & 16 deletions net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/CheckConfigurationWorkingSetEditor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,24 +578,18 @@ public String getColumnText(Object element, int columnIndex) {

@Override
public Image getColumnImage(Object element, int columnIndex) {
Image image = null;
switch (columnIndex) {
case 0:
image = getImage(element);
break;
case 3:
return switch (columnIndex) {
case 0 -> getImage(element);
case 3 -> {
ICheckConfiguration cfg = (ICheckConfiguration) element;
if (mWorkingSet instanceof GlobalCheckConfigurationWorkingSet) {

if (((GlobalCheckConfigurationWorkingSet) mWorkingSet).getDefaultCheckConfig() == cfg) {
image = CheckstyleUIPluginImages.TICK_ICON.getImage();
}
if (mWorkingSet instanceof GlobalCheckConfigurationWorkingSet workingSet
&& workingSet.getDefaultCheckConfig() == cfg) {
yield CheckstyleUIPluginImages.TICK_ICON.getImage();
}
break;
default:
break;
}
return image;
yield null;
}
default -> null;
};
}

@Override
Expand Down
34 changes: 12 additions & 22 deletions net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/widgets/ConfigPropertyWidgetFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,27 +64,17 @@ public static IConfigPropertyWidget createWidget(Composite parent, ConfigPropert

private static IConfigPropertyWidget getWidgetForConfigPropertyType(Composite parent,
ConfigProperty prop, ConfigPropertyType type) {
switch (type) {
case STRING:
return new ConfigPropertyWidgetString(parent, prop);
case STRING_ARRAY:
return new ConfigPropertyWidgetStringArray(parent, prop);
case INTEGER:
return new ConfigPropertyWidgetInteger(parent, prop);
case SINGLE_SELECT:
return new ConfigPropertyWidgetSingleSelect(parent, prop);
case BOOLEAN:
return new ConfigPropertyWidgetBoolean(parent, prop);
case MULTI_CHECK:
return new ConfigPropertyWidgetMultiCheck(parent, prop);
case HIDDEN:
return new ConfigPropertyWidgetHidden(parent, prop);
case FILE:
return new ConfigPropertyWidgetFile(parent, prop);
case REGEX:
return new ConfigPropertyWidgetRegex(parent, prop);
default:
return new ConfigPropertyWidgetString(parent, prop);
}
return switch (type) {
case STRING -> new ConfigPropertyWidgetString(parent, prop);
case STRING_ARRAY -> new ConfigPropertyWidgetStringArray(parent, prop);
case INTEGER -> new ConfigPropertyWidgetInteger(parent, prop);
case SINGLE_SELECT -> new ConfigPropertyWidgetSingleSelect(parent, prop);
case BOOLEAN -> new ConfigPropertyWidgetBoolean(parent, prop);
case MULTI_CHECK -> new ConfigPropertyWidgetMultiCheck(parent, prop);
case HIDDEN -> new ConfigPropertyWidgetHidden(parent, prop);
case FILE -> new ConfigPropertyWidgetFile(parent, prop);
case REGEX -> new ConfigPropertyWidgetRegex(parent, prop);
default -> new ConfigPropertyWidgetString(parent, prop);
};
}
}
33 changes: 10 additions & 23 deletions net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/properties/ComplexFileSetsEditor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,30 +306,17 @@ class FileSetLabelProvider extends LabelProvider implements ITableLabelProvider

@Override
public String getColumnText(Object element, int columnIndex) {
String result = element.toString();
if (element instanceof FileSet) {
FileSet fileSet = (FileSet) element;
switch (columnIndex) {
case 0:
result = new String();
break;

case 1:
result = fileSet.getName();
break;

case 2:
result = fileSet.getCheckConfig() != null
? mCheckConfigLabelProvider.getText(fileSet.getCheckConfig())
: ""; //$NON-NLS-1$
break;

default:
break;
}

if (element instanceof FileSet fileSet) {
return switch (columnIndex) {
case 0 -> new String();
case 1 -> fileSet.getName();
case 2 -> fileSet.getCheckConfig() != null
? mCheckConfigLabelProvider.getText(fileSet.getCheckConfig())
: "";
default -> element.toString();
};
}
return result;
return element.toString();
}

@Override
Expand Down
23 changes: 7 additions & 16 deletions net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/properties/FileSetEditDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -654,23 +654,14 @@ class FileMatchPatternLabelProvider extends LabelProvider implements ITableLabel

@Override
public String getColumnText(Object element, int columnIndex) {
String result = element.toString();
if (element instanceof FileMatchPattern) {
FileMatchPattern pattern = (FileMatchPattern) element;
switch (columnIndex) {
case 0:
result = new String();
break;

case 1:
result = pattern.getMatchPattern();
break;

default:
break;
}
if (element instanceof FileMatchPattern pattern) {
return switch (columnIndex) {
case 0 -> new String();
case 1 -> pattern.getMatchPattern();
default -> element.toString();
};
}
return result;
return element.toString();
}

@Override
Expand Down
16 changes: 6 additions & 10 deletions net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/properties/marker/MarkerPropertyPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,16 +146,12 @@ private void createDescriptionText(final Composite composite, RuleIdentity ruleI
*/
public static Image getSeverityImage(int severity) {
ISharedImages sharedImages = PlatformUI.getWorkbench().getSharedImages();
switch (severity) {
case IMarker.SEVERITY_ERROR:
return sharedImages.getImage(ISharedImages.IMG_OBJS_ERROR_TSK);
case IMarker.SEVERITY_WARNING:
return sharedImages.getImage(ISharedImages.IMG_OBJS_WARN_TSK);
case IMarker.SEVERITY_INFO:
return sharedImages.getImage(ISharedImages.IMG_OBJS_INFO_TSK);
default:
return null;
}
return switch (severity) {
case IMarker.SEVERITY_ERROR -> sharedImages.getImage(ISharedImages.IMG_OBJS_ERROR_TSK);
case IMarker.SEVERITY_WARNING -> sharedImages.getImage(ISharedImages.IMG_OBJS_WARN_TSK);
case IMarker.SEVERITY_INFO -> sharedImages.getImage(ISharedImages.IMG_OBJS_INFO_TSK);
default -> null;
};
}

}
108 changes: 27 additions & 81 deletions net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/stats/views/MarkerStatsView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,22 +566,11 @@ private class MasterViewMultiProvider extends LabelProvider
@Override
public String getColumnText(Object obj, int index) {
MarkerStat stat = (MarkerStat) obj;
String text = null;

switch (index) {
case 1:
text = stat.getIdentifiant();
break;
case 2:
text = Integer.toString(stat.getCount());
break;

default:
text = ""; //$NON-NLS-1$
break;
}

return text;
return switch (index) {
case 1 -> stat.getIdentifiant();
case 2 -> Integer.toString(stat.getCount());
default -> "";
};
}

@Override
Expand All @@ -607,25 +596,12 @@ public Image getColumnImage(Object obj, int index) {
@Override
public Comparable<?> getComparableValue(Object element, int colIndex) {
MarkerStat stat = (MarkerStat) element;
Comparable<?> comparable = null;

switch (colIndex) {
case 0:
comparable = Integer.valueOf(stat.getMaxSeverity() * -1);
break;
case 1:
comparable = stat.getIdentifiant();
break;
case 2:
comparable = Integer.valueOf(stat.getCount());
break;

default:
comparable = ""; //$NON-NLS-1$
break;
}

return comparable;
return switch (colIndex) {
case 0 -> Integer.valueOf(stat.getMaxSeverity() * -1);
case 1 -> stat.getIdentifiant();
case 2 -> Integer.valueOf(stat.getCount());
default -> "";
};
}

@Override
Expand Down Expand Up @@ -654,33 +630,19 @@ private class DetailViewMultiProvider extends LabelProvider
@Override
public String getColumnText(Object obj, int index) {
IMarker marker = (IMarker) obj;
String text = null;

try {
switch (index) {
case 1:
text = marker.getResource().getName();
break;
case 2:
text = marker.getResource().getParent().getFullPath().toString();
break;
case 3:
text = Objects.toString(marker.getAttribute(IMarker.LINE_NUMBER), "");
break;
case 4:
text = Objects.toString(marker.getAttribute(IMarker.MESSAGE), "");
break;
default:
text = ""; //$NON-NLS-1$
break;
}
return switch (index) {
case 1 -> marker.getResource().getName();
case 2 -> marker.getResource().getParent().getFullPath().toString();
case 3 -> Objects.toString(marker.getAttribute(IMarker.LINE_NUMBER), "");
case 4 -> Objects.toString(marker.getAttribute(IMarker.MESSAGE), "");
default -> "";
};
} catch (Exception ex) {
// Can't do anything: let's put a default value
text = Messages.MarkerStatsView_unknownProblem;
CheckstyleLog.log(ex);
return Messages.MarkerStatsView_unknownProblem;
}

return text;
}

@Override
Expand All @@ -706,30 +668,14 @@ public Image getColumnImage(Object obj, int index) {
@Override
public Comparable<?> getComparableValue(Object element, int colIndex) {
IMarker marker = (IMarker) element;
Comparable<?> comparable = null;

switch (colIndex) {
case 0:
comparable = Integer.valueOf(marker.getAttribute(IMarker.SEVERITY, Integer.MAX_VALUE) * -1);
break;
case 1:
comparable = marker.getResource().getName();
break;
case 2:
comparable = marker.getResource().getParent().getFullPath().toString();
break;
case 3:
comparable = Integer.valueOf(marker.getAttribute(IMarker.LINE_NUMBER, Integer.MAX_VALUE));
break;
case 4:
comparable = marker.getAttribute(IMarker.MESSAGE, "");
break;
default:
comparable = ""; //$NON-NLS-1$
break;
}

return comparable;
return switch (colIndex) {
case 0 -> Integer.valueOf(marker.getAttribute(IMarker.SEVERITY, Integer.MAX_VALUE) * -1);
case 1 -> marker.getResource().getName();
case 2 -> marker.getResource().getParent().getFullPath().toString();
case 3 -> Integer.valueOf(marker.getAttribute(IMarker.LINE_NUMBER, Integer.MAX_VALUE));
case 4 -> marker.getAttribute(IMarker.MESSAGE, "");
default -> "";
};
}

@Override
Expand Down
Loading
Loading