diff --git a/config/checkstyle-checks.xml b/config/checkstyle-checks.xml index f37f7634a..1e484f463 100644 --- a/config/checkstyle-checks.xml +++ b/config/checkstyle-checks.xml @@ -509,6 +509,7 @@ + diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/CheckConfigurationConfigureDialog.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/CheckConfigurationConfigureDialog.java index 9ba09eecf..8bfdc58a7 100644 --- a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/CheckConfigurationConfigureDialog.java +++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/CheckConfigurationConfigureDialog.java @@ -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 diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/CheckConfigurationWorkingSetEditor.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/CheckConfigurationWorkingSetEditor.java index ac5e79894..5da15ccea 100644 --- a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/CheckConfigurationWorkingSetEditor.java +++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/CheckConfigurationWorkingSetEditor.java @@ -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 diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/widgets/ConfigPropertyWidgetFactory.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/widgets/ConfigPropertyWidgetFactory.java index 34c40943b..8015f6a62 100644 --- a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/widgets/ConfigPropertyWidgetFactory.java +++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/widgets/ConfigPropertyWidgetFactory.java @@ -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); + }; } } diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/properties/ComplexFileSetsEditor.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/properties/ComplexFileSetsEditor.java index f9341d12c..626c22037 100644 --- a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/properties/ComplexFileSetsEditor.java +++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/properties/ComplexFileSetsEditor.java @@ -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 diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/properties/FileSetEditDialog.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/properties/FileSetEditDialog.java index 2d626f9fa..58ca81a54 100644 --- a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/properties/FileSetEditDialog.java +++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/properties/FileSetEditDialog.java @@ -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 diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/properties/marker/MarkerPropertyPage.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/properties/marker/MarkerPropertyPage.java index f34fd9d38..c3044eda1 100644 --- a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/properties/marker/MarkerPropertyPage.java +++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/properties/marker/MarkerPropertyPage.java @@ -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; + }; } } diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/stats/views/MarkerStatsView.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/stats/views/MarkerStatsView.java index dc8273130..377c97c70 100644 --- a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/stats/views/MarkerStatsView.java +++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/stats/views/MarkerStatsView.java @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/stats/views/internal/CheckstyleMarkerFilter.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/stats/views/internal/CheckstyleMarkerFilter.java index e680d005d..87264f7b9 100644 --- a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/stats/views/internal/CheckstyleMarkerFilter.java +++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/stats/views/internal/CheckstyleMarkerFilter.java @@ -129,48 +129,30 @@ public CheckstyleMarkerFilter withFocusResources(IResource[] resources) { */ public IMarker[] findMarkers(IProgressMonitor mon) throws CoreException { - List unfiltered = Collections.emptyList(); + List unfiltered; if (enabled) { - switch (onResource) { - case ON_ANY_RESOURCE: { - unfiltered = findCheckstyleMarkers( - new IResource[] { ResourcesPlugin.getWorkspace().getRoot() }, - IResource.DEPTH_INFINITE, mon); - break; - } - case ON_SELECTED_RESOURCE_ONLY: { - unfiltered = findCheckstyleMarkers(focusResources, IResource.DEPTH_ZERO, mon); - break; - } - case ON_SELECTED_RESOURCE_AND_CHILDREN: { - unfiltered = findCheckstyleMarkers(focusResources, IResource.DEPTH_INFINITE, mon); - break; - } - case ON_ANY_RESOURCE_OF_SAME_PROJECT: { - unfiltered = findCheckstyleMarkers(getProjects(focusResources).toArray(new IResource[0]), - IResource.DEPTH_INFINITE, mon); - break; - } - case ON_WORKING_SET: { - unfiltered = findCheckstyleMarkers(getResourcesInWorkingSet(workingSet), - IResource.DEPTH_INFINITE, mon); - break; - } - default: { - break; - } - } + unfiltered = switch (onResource) { + case ON_ANY_RESOURCE -> findCheckstyleMarkers( + new IResource[] { ResourcesPlugin.getWorkspace().getRoot() }, + IResource.DEPTH_INFINITE, mon); + case ON_SELECTED_RESOURCE_ONLY -> findCheckstyleMarkers(focusResources, + IResource.DEPTH_ZERO, mon); + case ON_SELECTED_RESOURCE_AND_CHILDREN -> findCheckstyleMarkers(focusResources, + IResource.DEPTH_INFINITE, mon); + case ON_ANY_RESOURCE_OF_SAME_PROJECT -> findCheckstyleMarkers( + getProjects(focusResources).toArray(new IResource[0]), IResource.DEPTH_INFINITE, + mon); + case ON_WORKING_SET -> findCheckstyleMarkers(getResourcesInWorkingSet(workingSet), + IResource.DEPTH_INFINITE, mon); + default -> Collections.emptyList(); + }; } else { unfiltered = findCheckstyleMarkers( new IResource[] { ResourcesPlugin.getWorkspace().getRoot() }, IResource.DEPTH_INFINITE, mon); } - if (unfiltered == null) { - unfiltered = Collections.emptyList(); - } - return unfiltered.toArray(new IMarker[unfiltered.size()]); }