diff --git a/config/checkstyle-checks.xml b/config/checkstyle-checks.xml index 35ca7b521..00e2bb8c9 100644 --- a/config/checkstyle-checks.xml +++ b/config/checkstyle-checks.xml @@ -250,6 +250,12 @@ + + + + + diff --git a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/CheckstylePlugin.java b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/CheckstylePlugin.java index fb1737dd4..e17851aaa 100644 --- a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/CheckstylePlugin.java +++ b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/CheckstylePlugin.java @@ -43,7 +43,7 @@ public class CheckstylePlugin extends Plugin { public static final String PLUGIN_ID = "net.sf.eclipsecs.core"; //$NON-NLS-1$ /** Extension point id for Checkstyle addon providers. */ - private static final String ADDON_PROVIDER_EXT_PT_ID = PLUGIN_ID + ".checkstyleAddonProvider"; //$NON-NLS-1$ + private static final String ADDON_PROVIDER_EXT_PT_ID = PLUGIN_ID + ".checkstyleAddonProvider"; /** * Platform Locale. @@ -70,7 +70,7 @@ public void start(BundleContext context) throws Exception { ADDON_PROVIDER_EXT_PT_ID); try { - Logger checkstyleErrorLog = Logger.getLogger("com.puppycrawl.tools.checkstyle.ExceptionLog"); //$NON-NLS-1$ + Logger checkstyleErrorLog = Logger.getLogger("com.puppycrawl.tools.checkstyle.ExceptionLog"); checkstyleErrorLog.addHandler(new EclipseLogHandler(this)); checkstyleErrorLog.setLevel(Level.ALL); diff --git a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/CheckstylePluginPrefs.java b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/CheckstylePluginPrefs.java index 116b2b91b..7b59a6e8e 100644 --- a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/CheckstylePluginPrefs.java +++ b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/CheckstylePluginPrefs.java @@ -50,7 +50,7 @@ public class CheckstylePluginPrefs extends AbstractPreferenceInitializer { * Preference name indicating if the number of checkstyle warning generated per file should be * limited. */ - public static final String PREF_LIMIT_MARKERS_PER_RESOURCE = "limit.markers.per.resource"; //$NON-NLS-1$ + public static final String PREF_LIMIT_MARKERS_PER_RESOURCE = "limit.markers.per.resource"; /** * Preference name for the preference that stores the limit of markers per resource. diff --git a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/builder/CheckstyleBuilder.java b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/builder/CheckstyleBuilder.java index 3087b8f36..987a28914 100644 --- a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/builder/CheckstyleBuilder.java +++ b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/builder/CheckstyleBuilder.java @@ -65,7 +65,7 @@ public class CheckstyleBuilder extends IncrementalProjectBuilder { /** Eclipse extension point ID for the builder. */ - public static final String BUILDER_ID = CheckstylePlugin.PLUGIN_ID + ".CheckstyleBuilder"; //$NON-NLS-1$ + public static final String BUILDER_ID = CheckstylePlugin.PLUGIN_ID + ".CheckstyleBuilder"; /** * Run the Checkstyle builder on all open projects in the workspace. @@ -305,8 +305,8 @@ private Map resolveAudits( * @throws CoreException * an unexpected error occurred */ - private Collection getResources(final IResourceDelta delta, final List filters) - throws CoreException { + private Collection getResources(final IResourceDelta delta, + final List filters) throws CoreException { List resources = new ArrayList<>(); @@ -356,8 +356,8 @@ private Collection getResources(final IResourceDelta delta, final Lis * @throws CoreException * an unexpected error occurred */ - private Collection getResources(final IContainer container, final List filters) - throws CoreException { + private Collection getResources(final IContainer container, + final List filters) throws CoreException { List resources = new ArrayList<>(); diff --git a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/builder/CheckstyleMarker.java b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/builder/CheckstyleMarker.java index 6d6078ee6..e9bb274c0 100644 --- a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/builder/CheckstyleMarker.java +++ b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/builder/CheckstyleMarker.java @@ -30,7 +30,7 @@ */ public final class CheckstyleMarker { /** ID for the CheckstyleMarker. */ - public static final String MARKER_ID = CheckstylePlugin.PLUGIN_ID + ".CheckstyleMarker"; //$NON-NLS-1$ + public static final String MARKER_ID = CheckstylePlugin.PLUGIN_ID + ".CheckstyleMarker"; /** Module name key in marker attributes. */ public static final String MODULE_NAME = "ModuleName"; //$NON-NLS-1$ diff --git a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/CheckConfigurationTester.java b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/CheckConfigurationTester.java index 9d722008d..9a0f45cf3 100644 --- a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/CheckConfigurationTester.java +++ b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/CheckConfigurationTester.java @@ -56,8 +56,8 @@ private CheckConfigurationTester() { * @throws CheckstylePluginException * most likely the configuration file could not be found */ - public static List getUnresolvedProperties(CheckConfiguration checkConfiguration) - throws CheckstylePluginException { + public static List getUnresolvedProperties( + CheckConfiguration checkConfiguration) throws CheckstylePluginException { CheckstyleConfigurationFile configFile = checkConfiguration.getCheckstyleConfiguration(); diff --git a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/CheckConfigurationWorkingCopy.java b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/CheckConfigurationWorkingCopy.java index b99357285..f470a5026 100644 --- a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/CheckConfigurationWorkingCopy.java +++ b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/CheckConfigurationWorkingCopy.java @@ -114,7 +114,8 @@ public CheckConfigurationWorkingCopy(ConfigurationType configType, CheckConfigurationWorkingSet workingSet, boolean global) { mWorkingSet = workingSet; - mCheckConfiguration = new DefaultCheckConfiguration(null, null, null, configType, global, null, null); + mCheckConfiguration = new DefaultCheckConfiguration(null, null, null, configType, global, null, + null); } /** diff --git a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/ConfigurationReader.java b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/ConfigurationReader.java index 9ad69c6a3..9cfc0f9ed 100644 --- a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/ConfigurationReader.java +++ b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/ConfigurationReader.java @@ -123,8 +123,8 @@ private ConfigurationReader() { } /** - * Reads the checkstyle configuration from the given stream and returns a list of all modules within - * this configuration. + * Reads the checkstyle configuration from the given stream and returns a list of all modules + * within this configuration. * * @param input * the stream the configuration is loaded from diff --git a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/ConfigurationWriter.java b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/ConfigurationWriter.java index 7bd1762a7..2bbdb76f5 100644 --- a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/ConfigurationWriter.java +++ b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/ConfigurationWriter.java @@ -92,9 +92,8 @@ public static void write(OutputStream out, List modules, CheckConfigurat String lineSeperator = System.lineSeparator(); - String comment = lineSeperator - + " This configuration file was written by the eclipse-cs plugin configuration editor" //$NON-NLS-1$ - + lineSeperator; + String comment = lineSeperator + " This configuration file was written by " + + "the eclipse-cs plugin configuration editor" + lineSeperator; doc.addComment(comment); // write out name and description as comment @@ -231,12 +230,11 @@ private static Element writeModule(Module module, Branch parent) { * @return the list of child modules */ private static List getChildModules(Module module, List remainingModules) { - List childModules = new ArrayList<>(); for (Module tmp : remainingModules) { - - String parentInternalName = module != null ? module.getMetaData().identity().internalName() : null; + String parentInternalName = module != null ? module.getMetaData().identity().internalName() + : null; String childParent = tmp.getMetaData().identity().parent(); // only the checker module has no parent diff --git a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/DefaultCheckConfiguration.java b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/DefaultCheckConfiguration.java index 7839d5a8f..bc6cfa121 100644 --- a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/DefaultCheckConfiguration.java +++ b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/DefaultCheckConfiguration.java @@ -83,8 +83,8 @@ public class DefaultCheckConfiguration extends AbstractCheckConfiguration { * @param additionalData * a map of additional data for this configuration */ - public DefaultCheckConfiguration(final String name, final String location, final String description, - final ConfigurationType type, final boolean global, + public DefaultCheckConfiguration(final String name, final String location, + final String description, final ConfigurationType type, final boolean global, final List properties, final Map additionalData) { mName = name; mLocation = location; diff --git a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/XmlTags.java b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/XmlTags.java index c2a4fc400..0298ec323 100644 --- a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/XmlTags.java +++ b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/XmlTags.java @@ -143,10 +143,11 @@ public final class XmlTags { public static final String TREEWALKER_MODULE = "TreeWalker"; //$NON-NLS-1$ /** Constant for the name of the SuppressionCommentFiler module. */ - public static final String SUPRESSIONCOMMENTFILTER_MODULE = "SuppressionCommentFilter"; //$NON-NLS-1$ + public static final String SUPRESSIONCOMMENTFILTER_MODULE = "SuppressionCommentFilter"; /** Constant for the name of the SuppressWithNearbyCommentFilter module. */ - public static final String SUPRESSWITHNEARBYCOMMENTFILTER_MODULE = "SuppressWithNearbyCommentFilter"; //$NON-NLS-1$ + public static final String SUPRESSWITHNEARBYCOMMENTFILTER_MODULE = + "SuppressWithNearbyCommentFilter"; /** Constant for the name of the SuppressWarningsHolder module. */ public static final String SUPPRESSWARNINGSHOLDER_MODULE = "SuppressWarningsHolder"; //$NON-NLS-1$ diff --git a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/configtypes/ExternalFileConfigurationType.java b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/configtypes/ExternalFileConfigurationType.java index 3333a2bdd..cbadfacf7 100644 --- a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/configtypes/ExternalFileConfigurationType.java +++ b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/configtypes/ExternalFileConfigurationType.java @@ -95,7 +95,8 @@ public boolean isConfigurable(CheckConfiguration checkConfiguration) { boolean isConfigurable = true; - boolean isProtected = Boolean.parseBoolean(checkConfiguration.getAdditionalData().get(KEY_PROTECT_CONFIG)); + boolean isProtected = Boolean + .parseBoolean(checkConfiguration.getAdditionalData().get(KEY_PROTECT_CONFIG)); isConfigurable = !isProtected; if (!isProtected) { diff --git a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/configtypes/ProjectConfigurationType.java b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/configtypes/ProjectConfigurationType.java index 407ebe83a..5b0b4107b 100644 --- a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/configtypes/ProjectConfigurationType.java +++ b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/configtypes/ProjectConfigurationType.java @@ -62,7 +62,8 @@ protected URL resolveLocation(CheckConfiguration checkConfiguration) throws IOEx public boolean isConfigurable(CheckConfiguration checkConfiguration) { boolean isConfigurable = true; - boolean isProtected = Boolean.parseBoolean(checkConfiguration.getAdditionalData().get(KEY_PROTECT_CONFIG)); + boolean isProtected = Boolean + .parseBoolean(checkConfiguration.getAdditionalData().get(KEY_PROTECT_CONFIG)); isConfigurable = !isProtected; if (!isProtected) { diff --git a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/configtypes/RemoteConfigurationType.java b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/configtypes/RemoteConfigurationType.java index 4e827ed27..9237df9bf 100644 --- a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/configtypes/RemoteConfigurationType.java +++ b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/configtypes/RemoteConfigurationType.java @@ -66,7 +66,7 @@ public class RemoteConfigurationType extends AbstractConfigurationType { public static final String KEY_CACHE_FILE_LOCATION = "cache-file-location"; //$NON-NLS-1$ /** Key to access the path of the cached property file. */ - public static final String KEY_CACHE_PROPS_FILE_LOCATION = "cache-props-file-location"; //$NON-NLS-1$ + public static final String KEY_CACHE_PROPS_FILE_LOCATION = "cache-props-file-location"; /** Key to access the username. */ public static final String KEY_USERNAME = "username"; //$NON-NLS-1$ @@ -83,7 +83,8 @@ public class RemoteConfigurationType extends AbstractConfigurationType { public CheckstyleConfigurationFile getCheckstyleConfiguration( CheckConfiguration checkConfiguration) throws CheckstylePluginException { - boolean useCacheFile = Boolean.parseBoolean(checkConfiguration.getAdditionalData().get(KEY_CACHE_CONFIG)); + boolean useCacheFile = Boolean + .parseBoolean(checkConfiguration.getAdditionalData().get(KEY_CACHE_CONFIG)); CheckstyleConfigurationFile data = new CheckstyleConfigurationFile(); @@ -187,7 +188,8 @@ public void notifyCheckConfigRemoved(CheckConfiguration checkConfiguration) RemoteConfigAuthenticator .removeCachedAuthInfo(checkConfiguration.getResolvedConfigurationFileUrl()); - boolean useCacheFile = Boolean.parseBoolean(checkConfiguration.getAdditionalData().get(KEY_CACHE_CONFIG)); + boolean useCacheFile = Boolean + .parseBoolean(checkConfiguration.getAdditionalData().get(KEY_CACHE_CONFIG)); if (useCacheFile) { // remove the cached configuration file from the workspace metadata @@ -442,9 +444,9 @@ private static String getSecureStoragePath(URL resolvedCheckConfigurationUrl) String urlHash = null; try { - MessageDigest digest = MessageDigest.getInstance("MD5"); - byte[] hash = digest.digest(resolvedCheckConfigurationUrl.toExternalForm().getBytes("UTF-8")); + byte[] hash = digest + .digest(resolvedCheckConfigurationUrl.toExternalForm().getBytes("UTF-8")); urlHash = EncodingUtils.encodeBase64(hash); urlHash = urlHash.replace('/', '_'); diff --git a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/meta/CheckUtil.java b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/meta/CheckUtil.java index fbddef20b..0050213cd 100644 --- a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/meta/CheckUtil.java +++ b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/meta/CheckUtil.java @@ -45,7 +45,8 @@ public static String getModifiableTokens(String checkName) { String result = null; if (AbstractJavadocCheck.class.isAssignableFrom(checkResult.getClass())) { final AbstractJavadocCheck javadocCheck = (AbstractJavadocCheck) checkResult; - final List modifiableJavadocTokens = subtractTokens(javadocCheck.getAcceptableJavadocTokens(), + final List modifiableJavadocTokens = subtractTokens( + javadocCheck.getAcceptableJavadocTokens(), javadocCheck.getRequiredJavadocTokens()); result = getTokens(JavadocUtil::getTokenName, modifiableJavadocTokens); } @@ -85,7 +86,8 @@ private static List subtractTokens(int[] tokens, int... requiredTokens) .collect(Collectors.toList()); } - private static String getTokens(Function function, List modifiableTokens) { + private static String getTokens(Function function, + List modifiableTokens) { return modifiableTokens.stream() .map(function::apply) .collect(Collectors.joining(",")); diff --git a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/meta/CheckstyleMetadataAdapter.java b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/meta/CheckstyleMetadataAdapter.java index c4375644d..9ebf27aac 100644 --- a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/meta/CheckstyleMetadataAdapter.java +++ b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/meta/CheckstyleMetadataAdapter.java @@ -84,7 +84,8 @@ public List loadRuleMetadata( final String ruleDescription = thirdPartyGroups.get(lookupKey).get("description"); final int rulePriority = Integer.parseInt(thirdPartyGroups.get(lookupKey) .get("priority")); - group = new RuleGroupMetadata(ruleGroupName, ruleGroupName, ruleDescription, false, rulePriority); + group = new RuleGroupMetadata(ruleGroupName, ruleGroupName, ruleDescription, false, + rulePriority); groups.put(ruleGroupName, group); } } @@ -106,7 +107,8 @@ private RuleMetadata createRuleMetadata(RuleGroupMetadata group, ModuleDetails m final String[] packageTokens = moduleDetails.getParent().split(DOT_PATTERN); List alternativeNames = List.of(moduleDetails.getFullQualifiedName()); List properties = moduleDetails.getProperties().stream() - .map(modulePropertyDetails -> createPropertyConfig(moduleDetails, modulePropertyDetails)) + .map(modulePropertyDetails -> createPropertyConfig(moduleDetails, + modulePropertyDetails)) .toList(); RuleMetadata ruleMeta = new RuleMetadata( new RuleIdentity(moduleDetails.getName(), moduleDetails.getName(), @@ -163,7 +165,8 @@ private ConfigPropertyMetadata createPropertyConfig(ModuleDetails moduleDetails, resultList.forEach(modifiedConfigPropertyMetadata.getPropertyEnumeration()::add); } else if (dataType == ConfigPropertyType.MULTI_CHECK) { String result = CheckUtil.getModifiableTokens(moduleDetails.getName()); - Collections.addAll(modifiedConfigPropertyMetadata.getPropertyEnumeration(), result.split(",")); + Collections.addAll(modifiedConfigPropertyMetadata.getPropertyEnumeration(), + result.split(",")); } return modifiedConfigPropertyMetadata; @@ -198,7 +201,8 @@ private static List getEnumValues(String className) { * {@code sThirdPartyRuleGroupMap}. * @param thirdPartyGroups */ - private static String findLookupKey(Map> thirdPartyGroups, String packageName) { + private static String findLookupKey(Map> thirdPartyGroups, + String packageName) { final String[] packageTokens = packageName.split(DOT_PATTERN); List prefixList = new ArrayList<>(); String lookupKey = packageTokens[0]; diff --git a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/meta/MetadataFactory.java b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/meta/MetadataFactory.java index 696685d55..917a4d763 100644 --- a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/meta/MetadataFactory.java +++ b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/meta/MetadataFactory.java @@ -167,14 +167,17 @@ private static void registerAlternativeNames(RuleMetadata ruleMetadata) { } /** - * Create repository of Module Details from checkstyle metadata and third party extension checks metadata. + * Create repository of Module Details from checkstyle metadata and third party extension checks + * metadata. */ private static void createMetadataMap() { - List moduleDetails = XmlMetaReader.readAllModulesIncludingThirdPartyIfAny(sPackageNameSet.toArray(new String[0])); + List moduleDetails = XmlMetaReader + .readAllModulesIncludingThirdPartyIfAny(sPackageNameSet.toArray(new String[0])); if (moduleDetails.isEmpty()) { CheckstyleLog.log(null, "Cannot read module details"); } - moduleDetails.forEach(moduleDetail -> sModuleDetailsRepo.put(moduleDetail.getName(), moduleDetail)); + moduleDetails + .forEach(moduleDetail -> sModuleDetailsRepo.put(moduleDetail.getName(), moduleDetail)); } /** @@ -446,15 +449,16 @@ private static ResourceBundle getMetadataI18nBundle(String metadataFile, ResourceBundle resourceBundle; String bundle = metadataFile.substring(0, metadataFile.length() - 4).replace('/', '.'); try { - resourceBundle = ResourceBundle.getBundle(bundle, CheckstylePlugin.getPlatformLocale(), classLoader); + resourceBundle = ResourceBundle.getBundle(bundle, CheckstylePlugin.getPlatformLocale(), + classLoader); } catch (MissingResourceException ex) { resourceBundle = null; } return resourceBundle; } - private static void parseMetadata(InputStream metadataStream, ResourceBundle metadataBundle, String groupId) - throws DocumentException, CheckstylePluginException { + private static void parseMetadata(InputStream metadataStream, ResourceBundle metadataBundle, + String groupId) throws DocumentException, CheckstylePluginException { Collection groups = MetadataXmlReader.parseMetadata(metadataStream, metadataBundle, groupId); groups.forEach( diff --git a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/meta/MetadataXmlReader.java b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/meta/MetadataXmlReader.java index ab1f3242a..40143b85a 100644 --- a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/meta/MetadataXmlReader.java +++ b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/meta/MetadataXmlReader.java @@ -99,8 +99,9 @@ public static Collection parseMetadata(InputStream metadataSt return groups.values(); } - private static List processModules(Element groupElement, RuleGroupMetadata groupMetadata, - ResourceBundle metadataBundle) throws CheckstylePluginException { + private static List processModules(Element groupElement, + RuleGroupMetadata groupMetadata, ResourceBundle metadataBundle) + throws CheckstylePluginException { List modules = new ArrayList<>(); List moduleElements = groupElement.elements(XmlTags.RULE_METADATA_TAG); @@ -120,7 +121,7 @@ private static List processModules(Element groupElement, RuleGroup : null; boolean hidden = Boolean.parseBoolean(moduleEl.attributeValue(XmlTags.HIDDEN_TAG)); boolean hasSeverity = !"false".equals(moduleEl.attributeValue(XmlTags.HAS_SEVERITY_TAG)); - boolean deletable = !"false".equals(moduleEl.attributeValue(XmlTags.DELETABLE_TAG)); //$NON-NLS-1$ + boolean deletable = !"false".equals(moduleEl.attributeValue(XmlTags.DELETABLE_TAG)); boolean isSingleton = Boolean.parseBoolean(moduleEl.attributeValue(XmlTags.IS_SINGLETON_TAG)); // process description @@ -204,7 +205,8 @@ private static List processProperties(Element moduleElem if (OptionProvider.class.isAssignableFrom(providerClass)) { - OptionProvider provider = (OptionProvider) providerClass.getDeclaredConstructor().newInstance(); + OptionProvider provider = (OptionProvider) providerClass.getDeclaredConstructor() + .newInstance(); property.getPropertyEnumeration().addAll(provider.getOptions()); } else if (Enum.class.isAssignableFrom(providerClass)) { diff --git a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/meta/RuleGroupMetadata.java b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/meta/RuleGroupMetadata.java index 1492c0d71..a82d0a72b 100644 --- a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/meta/RuleGroupMetadata.java +++ b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/meta/RuleGroupMetadata.java @@ -48,7 +48,8 @@ public class RuleGroupMetadata { /** The list of modules belonging to the group. */ private List mRuleMetadata = new LinkedList<>(); - RuleGroupMetadata(String groupId, String groupName, String groupDesc, boolean hidden, int priority) { + RuleGroupMetadata(String groupId, String groupName, String groupDesc, boolean hidden, + int priority) { mGroupId = groupId; mGroupName = groupName; mDescription = groupDesc; diff --git a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/meta/RuleIdentity.java b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/meta/RuleIdentity.java index 33e8ead4e..ac6acf0ff 100644 --- a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/meta/RuleIdentity.java +++ b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/meta/RuleIdentity.java @@ -22,7 +22,7 @@ import java.util.List; -public record RuleIdentity(String ruleName, String internalName, String parent, RuleGroupMetadata group, - String description, List alternativeNames) { +public record RuleIdentity(String ruleName, String internalName, String parent, + RuleGroupMetadata group, String description, List alternativeNames) { } diff --git a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/savefilter/SaveFilters.java b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/savefilter/SaveFilters.java index 2628a91e3..6ca908343 100644 --- a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/savefilter/SaveFilters.java +++ b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/savefilter/SaveFilters.java @@ -39,7 +39,7 @@ public final class SaveFilters { /** constant for the extension point id. */ - private static final String FILTER_EXTENSION_POINT = CheckstylePlugin.PLUGIN_ID + ".saveFilters"; //$NON-NLS-1$ + private static final String FILTER_EXTENSION_POINT = CheckstylePlugin.PLUGIN_ID + ".saveFilters"; /** constant for the class attribute. */ private static final String ATTR_CLASS = "class"; //$NON-NLS-1$ diff --git a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/jobs/AbstractCheckJob.java b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/jobs/AbstractCheckJob.java index 3c48b22a5..19e32359e 100644 --- a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/jobs/AbstractCheckJob.java +++ b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/jobs/AbstractCheckJob.java @@ -24,8 +24,8 @@ import org.eclipse.core.runtime.jobs.ISchedulingRule; /** - * Super class of all jobs that invoke Checkstyle. Avoids concurrent invocations and styles the progress UI. - * + * Super class of all jobs that invoke Checkstyle. + * Avoids concurrent invocations and styles the progress UI. */ public abstract class AbstractCheckJob extends WorkspaceJob implements ISchedulingRule { /** diff --git a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/jobs/TransformFormatterRulesJob.java b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/jobs/TransformFormatterRulesJob.java index 361f7e57c..135379aca 100644 --- a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/jobs/TransformFormatterRulesJob.java +++ b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/jobs/TransformFormatterRulesJob.java @@ -79,8 +79,8 @@ public IStatus runInWorkspace(final IProgressMonitor monitor) throws CoreExcepti FormatterTransformer transformer = new FormatterTransformer(); transformer.transformRules(projectPath + "/test-checkstyle.xml", formatterSettings); } catch (CheckstylePluginException ex) { - throw new CoreException(new Status(IStatus.ERROR, CheckstylePlugin.PLUGIN_ID, IStatus.ERROR, - ex.getMessage(), ex)); + throw new CoreException(new Status(IStatus.ERROR, CheckstylePlugin.PLUGIN_ID, + IStatus.ERROR, ex.getMessage(), ex)); } status = Status.OK_STATUS; } diff --git a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/nature/CheckstyleNature.java b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/nature/CheckstyleNature.java index f13182e7a..653266751 100644 --- a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/nature/CheckstyleNature.java +++ b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/nature/CheckstyleNature.java @@ -44,7 +44,7 @@ public class CheckstyleNature implements IProjectNature { /** ID for the Checkstyle project nature. */ - public static final String NATURE_ID = CheckstylePlugin.PLUGIN_ID + ".CheckstyleNature"; //$NON-NLS-1$ + public static final String NATURE_ID = CheckstylePlugin.PLUGIN_ID + ".CheckstyleNature"; /** The project. */ private IProject mProject; diff --git a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/projectconfig/PluginFilters.java b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/projectconfig/PluginFilters.java index 6521bcdc3..95f6be05c 100644 --- a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/projectconfig/PluginFilters.java +++ b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/projectconfig/PluginFilters.java @@ -38,7 +38,7 @@ public final class PluginFilters { /** constant for the extension point id. */ - private static final String FILTER_EXTENSION_POINT = "net.sf.eclipsecs.core.filters"; //$NON-NLS-1$ + private static final String FILTER_EXTENSION_POINT = "net.sf.eclipsecs.core.filters"; /** constant for the name attribute. */ private static final String ATTR_NAME = "name"; //$NON-NLS-1$ diff --git a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/projectconfig/ProjectConfigurationFactory.java b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/projectconfig/ProjectConfigurationFactory.java index 2effa5d74..7db2ce3fb 100644 --- a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/projectconfig/ProjectConfigurationFactory.java +++ b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/projectconfig/ProjectConfigurationFactory.java @@ -195,8 +195,8 @@ private static ProjectConfiguration getProjectConfiguration(InputStream input, I List fileSets = getFileSets(root, checkConfigs); List filters = getFilters(root); - return new DefaultProjectConfiguration(project, checkConfigs, fileSets, filters, useSimpleConfig, - syncFormatter); + return new DefaultProjectConfiguration(project, checkConfigs, fileSets, filters, + useSimpleConfig, syncFormatter); } private static List getLocalCheckConfigs(Element root, IProject project) { @@ -288,7 +288,8 @@ private static List getFileSets(Element root, for (Element patternEl : patternElements) { FileMatchPattern pattern = new FileMatchPattern( patternEl.attributeValue(XmlTags.MATCH_PATTERN_TAG)); - pattern.setIsIncludePattern(Boolean.parseBoolean(patternEl.attributeValue(XmlTags.INCLUDE_PATTERN_TAG))); + pattern.setIsIncludePattern( + Boolean.parseBoolean(patternEl.attributeValue(XmlTags.INCLUDE_PATTERN_TAG))); patterns.add(pattern); } fileSet.setFileMatchPatterns(patterns); @@ -306,7 +307,8 @@ private static List getFilters(Element root) { List filterElements = root.elements(XmlTags.FILTER_TAG); for (Element filterEl : filterElements) { - AuditFilter filter = PluginFilters.getByInternalName(filterEl.attributeValue(XmlTags.NAME_TAG)); + AuditFilter filter = PluginFilters + .getByInternalName(filterEl.attributeValue(XmlTags.NAME_TAG)); // guard against unknown/retired filters if (filter != null) { diff --git a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/CheckstyleFileWriter.java b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/CheckstyleFileWriter.java index 49c12731d..bd4ff2e31 100644 --- a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/CheckstyleFileWriter.java +++ b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/CheckstyleFileWriter.java @@ -107,8 +107,8 @@ private static void writeModules(final HashMap> * @param properties * A HashMap containing all properties. */ - private static void writeProperty(final HashMap properties, final OutputStream outStream) - throws IOException { + private static void writeProperty(final HashMap properties, + final OutputStream outStream) throws IOException { final Iterator propit = properties.keySet().iterator(); String prop; diff --git a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/CheckstyleTransformer.java b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/CheckstyleTransformer.java index d0ed0067b..bc880cd68 100644 --- a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/CheckstyleTransformer.java +++ b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/CheckstyleTransformer.java @@ -45,7 +45,8 @@ public class CheckstyleTransformer { /** * The list with all TransformationClass-instances loaded in method loadTransformationClasses(). */ - private final List mTransformationClasses = new ArrayList<>(); + private final List mTransformationClasses = + new ArrayList<>(); private IProject mProject; @@ -97,7 +98,8 @@ private void loadTransformationClasses(final List classnames) try { transformationClass = CheckstylePlugin.getDefault().getAddonExtensionClassLoader() .loadClass(name); - final AbstractCheckstyleTransformationClass transObj = (AbstractCheckstyleTransformationClass) transformationClass.getDeclaredConstructor() + final AbstractCheckstyleTransformationClass transObj = + (AbstractCheckstyleTransformationClass) transformationClass.getDeclaredConstructor() .newInstance(); transObj.setRule(rule); mTransformationClasses.add(transObj); diff --git a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/FormatterTransformer.java b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/FormatterTransformer.java index a5eac9246..51299fc0b 100644 --- a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/FormatterTransformer.java +++ b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/FormatterTransformer.java @@ -73,19 +73,20 @@ public void transformRules(final String path, Map formatterSetti * constructor. * @return */ - private List loadTransformationClasses(Map formatterSettings) - throws CheckstylePluginException { + private List loadTransformationClasses( + Map formatterSettings) throws CheckstylePluginException { List targetTransformers = new ArrayList<>(); for (Map.Entry entry : formatterSettings.entrySet()) { String rule = entry.getKey(); String value = entry.getValue(); - Class transformationClass = allTransformers.get(rule); + Class transformationClass = allTransformers + .get(rule); if (transformationClass != null) { try { - final AbstractFormatterTransformationClass transObj = transformationClass.getDeclaredConstructor() - .newInstance(); + final AbstractFormatterTransformationClass transObj = transformationClass + .getDeclaredConstructor().newInstance(); transObj.setValue(value); @@ -100,7 +101,8 @@ private List loadTransformationClasses(Map } @SuppressWarnings("unchecked") - private static Map> discoverTransformers() { + private static Map> + discoverTransformers() { String formatterKeyAnnotation = FormatterKey.class.getName(); ClassLoader loader = CheckstylePlugin.getDefault().getAddonExtensionClassLoader(); try (ScanResult scanResult = new ClassGraph() @@ -112,7 +114,8 @@ private static Map classInfo -> "org.eclipse.jdt.core.formatter." + classInfo.getAnnotationInfo(formatterKeyAnnotation) .getParameterValues().getValue("value"), - classInfo -> (Class) classInfo.loadClass())); + classInfo -> (Class) classInfo + .loadClass())); } } } diff --git a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/LeftCurlyTransformer.java b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/LeftCurlyTransformer.java index c28ed76a1..2d5b9922c 100644 --- a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/LeftCurlyTransformer.java +++ b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/LeftCurlyTransformer.java @@ -27,16 +27,17 @@ import net.sf.eclipsecs.core.transformer.FormatterConfiguration; /** - * Wrapper class for converting the checkstyle-rule LeftCurly to appropriate eclipse-formatter-rules. - * + * Wrapper class for converting the checkstyle-rule LeftCurly to appropriate + * eclipse-formatter-rules. */ public class LeftCurlyTransformer extends AbstractCheckstyleTransformationClass { @Override public FormatterConfiguration transformRule() { String tokens = getAttribute("tokens"); if (tokens == null) { - tokens = "CLASS_DEF, CTOR_DEF, INTERFACE_DEF, METHOD_DEF, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, " - + "LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE"; + tokens = "CLASS_DEF, CTOR_DEF, INTERFACE_DEF, METHOD_DEF, LITERAL_CATCH, LITERAL_DO, " + + "LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_SYNCHRONIZED, " + + "LITERAL_TRY, LITERAL_WHILE"; } String option = switch (getAttribute("option")) { @@ -58,8 +59,9 @@ public FormatterConfiguration transformRule() { "brace_position_for_type_declaration"); case "CTOR_DEF" -> List.of("brace_position_for_constructor_declaration"); case "METHOD_DEF" -> List.of("brace_position_for_method_declaration"); - case "LITERAL_DO", "LITERAL_ELSE", "LITERAL_FOR", "LITERAL_IF", "LITERAL_WHILE", "LITERAL_CATCH", - "LITERAL_FINALLY", "LITERAL_TRY", "LITERAL_SYNCHRONIZED" -> List.of("brace_position_for_block"); + case "LITERAL_DO", "LITERAL_ELSE", "LITERAL_FOR", "LITERAL_IF", "LITERAL_WHILE", + "LITERAL_CATCH", "LITERAL_FINALLY", "LITERAL_TRY", "LITERAL_SYNCHRONIZED" -> List.of( + "brace_position_for_block"); case "LITERAL_SWITCH" -> List.of("brace_position_for_switch"); default -> Collections.emptyList(); }; diff --git a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/WhitespaceAroundTransformer.java b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/WhitespaceAroundTransformer.java index 1d34b5f0d..f84f18d1d 100644 --- a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/WhitespaceAroundTransformer.java +++ b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/WhitespaceAroundTransformer.java @@ -36,13 +36,14 @@ public class WhitespaceAroundTransformer extends AbstractCheckstyleTransformatio public FormatterConfiguration transformRule() { String tokens = getAttribute("tokens"); if (tokens == null) { - tokens = "ARRAY_INIT, ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, " - + "COLON, DIV, DIV_ASSIGN, DO_WHILE, ELLIPSIS, EQUAL, GE, GENERIC_END, GENERIC_START, GT, LAMBDA, " - + "LAND, LCURLY, LE, LITERAL_ASSERT, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, " - + "LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_TRY, " - + "LITERAL_WHEN, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, " - + "PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN, " - + "TYPE_EXTENSION_AND, WILDCARD_TYPE"; + tokens = "ARRAY_INIT, ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, " + + "BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, DO_WHILE, ELLIPSIS, EQUAL, GE, GENERIC_END, " + + "GENERIC_START, GT, LAMBDA, LAND, LCURLY, LE, LITERAL_ASSERT, LITERAL_CATCH, " + + "LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, " + + "LITERAL_RETURN, LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHEN, " + + "LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, " + + "PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN, STAR, " + + "STAR_ASSIGN, TYPE_EXTENSION_AND, WILDCARD_TYPE"; } for (String token : tokens.split("\\s*,\\s*")) { diff --git a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/util/XmlUtil.java b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/util/XmlUtil.java index 5b74a2bdc..d5750163d 100644 --- a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/util/XmlUtil.java +++ b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/util/XmlUtil.java @@ -88,7 +88,8 @@ public InputSource resolveEntity(String publicId, String systemId) throws SAXExc if (mPublic2InternalDtdMap.containsKey(publicId)) { final String dtdResourceName = mPublic2InternalDtdMap.get(publicId); - final InputStream dtdInputStream = getClass().getClassLoader().getResourceAsStream(dtdResourceName); + final InputStream dtdInputStream = getClass().getClassLoader() + .getResourceAsStream(dtdResourceName); if (dtdInputStream == null) { // -@cs[IllegalInstantiation] SAXException is in the overridden method signature throw new SAXException("Unable to load internal dtd " + dtdResourceName); //$NON-NLS-1$ diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/ApplicationStartedHandler.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/ApplicationStartedHandler.java index fc56048d8..a0481ebe4 100644 --- a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/ApplicationStartedHandler.java +++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/ApplicationStartedHandler.java @@ -82,18 +82,17 @@ private void registerListener() { @Override public void run() { for (IWorkbenchWindow window : workbench.getWorkbenchWindows()) { - if (window != null) { - // collect open editors and have then run against Checkstyle if appropriate - // add already opened files to the filter - bugfix for 2923044 - Set parts = Arrays.stream(window.getPages()) - .map(IWorkbenchPage::getEditorReferences) - .flatMap(Arrays::stream) - .collect(Collectors.toSet()); - mPartListener.partsOpened(parts); - // remove listener first for safety, we don't want to register the same listener twice accidently - window.getPartService().removePartListener(mPartListener); - window.getPartService().addPartListener(mPartListener); - } + // collect open editors and have then run against Checkstyle if appropriate + // add already opened files to the filter - bugfix for 2923044 + Set parts = Arrays.stream(window.getPages()) + .map(IWorkbenchPage::getEditorReferences) + .flatMap(Arrays::stream) + .collect(Collectors.toSet()); + mPartListener.partsOpened(parts); + // remove listener first for safety, + // we don't want to register the same listener twice accidently + window.getPartService().removePartListener(mPartListener); + window.getPartService().addPartListener(mPartListener); } workbench.addWindowListener(mWindowListener); } diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/CheckstyleUiPluginImages.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/CheckstyleUiPluginImages.java index 4293dfef4..94d79a04e 100644 --- a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/CheckstyleUiPluginImages.java +++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/CheckstyleUiPluginImages.java @@ -55,8 +55,8 @@ public enum CheckstyleUiPluginImages { /** Image descriptor for the add correction icon. */ CORRECTION_ADD(() -> AbstractUIPlugin.imageDescriptorFromPlugin(CheckstyleUiPlugin.PLUGIN_ID, "icons/add_correction.png")), - CORRECTION_ADD_BRACES(() -> AbstractUIPlugin.imageDescriptorFromPlugin(CheckstyleUiPlugin.PLUGIN_ID, - "icons/correction_cast.png")), + CORRECTION_ADD_BRACES(() -> AbstractUIPlugin + .imageDescriptorFromPlugin(CheckstyleUiPlugin.PLUGIN_ID, "icons/correction_cast.png")), /** Image descriptor for the change correction icon. */ CORRECTION_CHANGE(() -> AbstractUIPlugin.imageDescriptorFromPlugin(CheckstyleUiPlugin.PLUGIN_ID, "icons/correction_change.png")), @@ -82,12 +82,14 @@ public enum CheckstyleUiPluginImages { MODULEGROUP_ICON(() -> AbstractUIPlugin.imageDescriptorFromPlugin(CheckstyleUiPlugin.PLUGIN_ID, "icons/modulegroup.gif")), /** Image descriptor for the ticked module group icon. */ - MODULEGROUP_TICKED_ICON(() -> new DecorationOverlayIcon(MODULEGROUP_ICON.getImageDescriptor(), CHECKED_OVERLAY.getImageDescriptor(), IDecoration.TOP_LEFT)), + MODULEGROUP_TICKED_ICON(() -> new DecorationOverlayIcon(MODULEGROUP_ICON.getImageDescriptor(), + CHECKED_OVERLAY.getImageDescriptor(), IDecoration.TOP_LEFT)), /** Image descriptor for the module icon. */ MODULE_ICON(() -> AbstractUIPlugin.imageDescriptorFromPlugin(CheckstyleUiPlugin.PLUGIN_ID, "icons/module.gif")), /** Image descriptor for the ticked module icon. */ - MODULE_TICKED_ICON(() -> new DecorationOverlayIcon(MODULE_ICON.getImageDescriptor(), CHECKED_OVERLAY.getImageDescriptor(), IDecoration.TOP_LEFT)), + MODULE_TICKED_ICON(() -> new DecorationOverlayIcon(MODULE_ICON.getImageDescriptor(), + CHECKED_OVERLAY.getImageDescriptor(), IDecoration.TOP_LEFT)), /** Image descriptor for the refresh icon. */ REFRESH_ICON(() -> ResourceLocator.imageDescriptorFromBundle("org.eclipse.search", "platform:/plugin/org.eclipse.search/icons/full/elcl16/refresh.png") diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/CheckstyleUiPluginPrefs.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/CheckstyleUiPluginPrefs.java index 7989a1d53..8c06828d7 100644 --- a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/CheckstyleUiPluginPrefs.java +++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/CheckstyleUiPluginPrefs.java @@ -72,7 +72,8 @@ public class CheckstyleUiPluginPrefs extends AbstractPreferenceInitializer { * Preference name indicating the minimum amount of lines that is used for the * checker analysis. */ - public static final String PREF_DUPLICATED_CODE_MIN_LINES = "checker.strictDuplicatedCode.minLines"; //$NON-NLS-1$ + public static final String PREF_DUPLICATED_CODE_MIN_LINES = + "checker.strictDuplicatedCode.minLines"; /** * Default value for the minimum amount of lines that is used for the checker diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/actions/ConfigureProjectFromBluePrintAction.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/actions/ConfigureProjectFromBluePrintAction.java index 92147bdfe..01effe276 100644 --- a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/actions/ConfigureProjectFromBluePrintAction.java +++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/actions/ConfigureProjectFromBluePrintAction.java @@ -154,7 +154,8 @@ public IStatus runInWorkspace(IProgressMonitor monitor) { // add local configurations from blueprint for (CheckConfiguration localConfig : bluePrintLocalConfigs) { - CheckConfigurationWorkingCopy newCopy = checkConfigsWorkingSet.newWorkingCopy(localConfig); + CheckConfigurationWorkingCopy newCopy = checkConfigsWorkingSet + .newWorkingCopy(localConfig); checkConfigsWorkingSet.addCheckConfiguration(newCopy); } @@ -167,8 +168,8 @@ public IStatus runInWorkspace(IProgressMonitor monitor) { } status = Status.OK_STATUS; } catch (CheckstylePluginException ex) { - status = new Status(IStatus.ERROR, CheckstyleUiPlugin.PLUGIN_ID, IStatus.OK, ex.getMessage(), - ex); + status = new Status(IStatus.ERROR, CheckstyleUiPlugin.PLUGIN_ID, IStatus.OK, + ex.getMessage(), ex); } return status; } diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/AvailableModulesViewer.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/AvailableModulesViewer.java index c041d446d..4739059a1 100644 --- a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/AvailableModulesViewer.java +++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/AvailableModulesViewer.java @@ -84,9 +84,9 @@ public AvailableModulesViewer(Composite parent, int style, treeViewer.getViewer().addDoubleClickListener(event -> { IStructuredSelection selection = (IStructuredSelection) event.getSelection(); Object element = selection.getFirstElement(); - if (element instanceof RuleGroupMetadata) { - treeViewer.getViewer().setExpandedState(element, !treeViewer.getViewer().getExpandedState(element)); + treeViewer.getViewer().setExpandedState(element, + !treeViewer.getViewer().getExpandedState(element)); } else if (configurable) { newModule((IStructuredSelection) event.getSelection()); } 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 0df6ae4a8..d515a4db4 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 @@ -166,7 +166,8 @@ protected Control createButtonBar(Composite parent) { Button mBtnOpenModuleOnAdd = new Button(composite, SWT.CHECK); mBtnOpenModuleOnAdd.setText(Messages.CheckConfigurationConfigureDialog_btnOpenModuleOnAdd); - GridDataFactory.swtDefaults().align(SWT.BEGINNING, SWT.CENTER).indent(5, 0).applyTo(mBtnOpenModuleOnAdd); + GridDataFactory.swtDefaults().align(SWT.BEGINNING, SWT.CENTER).indent(5, 0) + .applyTo(mBtnOpenModuleOnAdd); // Init the translate tokens preference mBtnOpenModuleOnAdd.setSelection( diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/CheckConfigurationConfigureDialogView.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/CheckConfigurationConfigureDialogView.java index a47376246..34004a749 100644 --- a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/CheckConfigurationConfigureDialogView.java +++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/CheckConfigurationConfigureDialogView.java @@ -23,7 +23,6 @@ import java.util.List; import java.util.function.BiConsumer; import java.util.function.Consumer; -import java.util.regex.Pattern; import org.eclipse.jface.layout.GridDataFactory; import org.eclipse.jface.layout.GridLayoutFactory; @@ -41,12 +40,11 @@ import net.sf.eclipsecs.ui.Messages; import net.sf.eclipsecs.ui.config.AvailableModulesViewer.AvailableModulesViewerLabelProvider; import net.sf.eclipsecs.ui.config.ConfiguredModules.ConfiguredModulesCallbacks; +import net.sf.eclipsecs.ui.util.HtmlUtil; import net.sf.eclipsecs.ui.util.InternalBrowser; public final class CheckConfigurationConfigureDialogView extends Composite { - private static final Pattern PATTERN_INLINE_CODE = Pattern.compile(Pattern.quote("{@code ") + "([^}]*?)" + Pattern.quote("}")); - private final Browser mBrowserDescription; private final AvailableModulesViewer availableModulesViewer; private final ConfiguredModules configuredModules; @@ -120,26 +118,7 @@ private void changeAvailableModuleSelection(Object selection) { description = rule.identity().description(); configuredModules.setCurrentGroup(rule.identity().group()); } - setBrowserDescription(getDescriptionHtml(description)); - } - - /** - * Convert a module description to HTML for use with a browser component. - * @param description module description - * @return HTML converted description - */ - public static String getDescriptionHtml(String description) { - StringBuilder buf = new StringBuilder(); - buf.append(""); - buf.append(description != null ? convertInlineCodeTags(description) - : Messages.CheckConfigurationConfigureDialog_txtNoDescription); - buf.append(""); - return buf.toString(); - } - - private static String convertInlineCodeTags(String html) { - return PATTERN_INLINE_CODE.matcher(html).replaceAll("$1"); + setBrowserDescription(HtmlUtil.getDescriptionHtml(description)); } public static final record CheckConfigurationConfigureDialogViewCallbacks( diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/CheckConfigurationLabelProvider.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/CheckConfigurationLabelProvider.java index cf02ec446..ba2b535c3 100644 --- a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/CheckConfigurationLabelProvider.java +++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/CheckConfigurationLabelProvider.java @@ -32,7 +32,8 @@ */ public class CheckConfigurationLabelProvider extends LabelProvider { - public static final CheckConfigurationLabelProvider INSTANCE = new CheckConfigurationLabelProvider(); + public static final CheckConfigurationLabelProvider INSTANCE = + new CheckConfigurationLabelProvider(); protected CheckConfigurationLabelProvider() { diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/CheckConfigurationPropertiesDialog.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/CheckConfigurationPropertiesDialog.java index dccd61956..b87d7411f 100644 --- a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/CheckConfigurationPropertiesDialog.java +++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/CheckConfigurationPropertiesDialog.java @@ -147,7 +147,8 @@ protected Control createDialogArea(Composite parent) { Composite composite = (Composite) super.createDialogArea(parent); - dialogView = new CheckConfigurationPropertiesDialogView(composite, SWT.NULL, this::changeSelectedConfigurationType); + dialogView = new CheckConfigurationPropertiesDialogView(composite, SWT.NULL, + this::changeSelectedConfigurationType); GridDataFactory.create(GridData.FILL_BOTH).applyTo(dialogView); return composite; @@ -177,7 +178,8 @@ protected Control createButtonBar(Composite parent) { mBtnProperties = new Button(composite, SWT.PUSH); mBtnProperties.setText(Messages.CheckConfigurationPropertiesDialog_btnAdditionalProps); - GridDataFactory.swtDefaults().align(SWT.BEGINNING, SWT.CENTER).indent(5, 0).applyTo(mBtnProperties); + GridDataFactory.swtDefaults().align(SWT.BEGINNING, SWT.CENTER).indent(5, 0) + .applyTo(mBtnProperties); mBtnProperties.addSelectionListener(SelectionListener.widgetSelectedAdapter(event -> { try { @@ -209,7 +211,8 @@ protected void okPressed() { // Check if the configuration is valid mCheckConfig = mConfigurationEditor.getEditedWorkingCopy(); - int numUnresolvedProps = CheckConfigurationTester.getUnresolvedProperties(mCheckConfig).size(); + int numUnresolvedProps = CheckConfigurationTester.getUnresolvedProperties(mCheckConfig) + .size(); if (numUnresolvedProps > 0) { diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/CheckConfigurationPropertiesDialogView.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/CheckConfigurationPropertiesDialogView.java index fca7e9d8a..f95e263f6 100644 --- a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/CheckConfigurationPropertiesDialogView.java +++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/CheckConfigurationPropertiesDialogView.java @@ -60,7 +60,8 @@ public CheckConfigurationPropertiesDialogView(Composite parent, int style, // layouts GC graphics = new GC(lblConfigType); int nameSize = graphics.textExtent(Messages.CheckConfigurationPropertiesDialog_lblName).x; - int locationsSize = graphics.textExtent(Messages.CheckConfigurationPropertiesDialog_lblLocation).x; + int locationsSize = graphics + .textExtent(Messages.CheckConfigurationPropertiesDialog_lblLocation).x; int max = Math.max(nameSize, locationsSize); graphics.dispose(); diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/CheckConfigurationViewerSorter.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/CheckConfigurationViewerSorter.java index fa95600a1..e2d1b31dd 100644 --- a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/CheckConfigurationViewerSorter.java +++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/CheckConfigurationViewerSorter.java @@ -30,7 +30,8 @@ */ public final class CheckConfigurationViewerSorter extends ViewerComparator { - public static final CheckConfigurationViewerSorter INSTANCE = new CheckConfigurationViewerSorter(); + public static final CheckConfigurationViewerSorter INSTANCE = + new CheckConfigurationViewerSorter(); private CheckConfigurationViewerSorter() { 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 78d4b79a6..412d81a86 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 @@ -81,7 +81,8 @@ public CheckConfigurationWorkingSetEditor(Composite parent, int style, boolean global = mWorkingSet instanceof GlobalCheckConfigurationWorkingSet; - editorView = new CheckConfigurationWorkingSetEditorView(this, SWT.NONE, mWorkingSet.getWorkingCopies(), global, + editorView = new CheckConfigurationWorkingSetEditorView(this, SWT.NONE, + mWorkingSet.getWorkingCopies(), global, new ButtonBarActions(this::addCheckConfig, this::editCheckConfig, this::configureCheckConfig, this::copyCheckConfig, this::removeCheckConfig, this::setDefaultCheckConfig, this::exportCheckstyleCheckConfig), @@ -102,8 +103,8 @@ private boolean isDefaultConfig(CheckConfigurationWorkingCopy config) { * Create a new Check configuration. */ private void addCheckConfig() { - CheckConfigurationPropertiesDialog dialog = new CheckConfigurationPropertiesDialog(getShell(), null, - mWorkingSet); + CheckConfigurationPropertiesDialog dialog = new CheckConfigurationPropertiesDialog(getShell(), + null, mWorkingSet); dialog.setBlockOnOpen(true); if (Window.OK == dialog.open()) { @@ -144,8 +145,10 @@ private void configureCheckConfig() { dialog.setBlockOnOpen(true); dialog.open(); } catch (CheckstylePluginException ex) { - CheckstyleUiPlugin.warningDialog(getShell(), NLS.bind(Messages.errorCannotResolveCheckLocation, - config.getLocation(), config.getName()), ex); + CheckstyleUiPlugin.warningDialog(getShell(), + NLS.bind(Messages.errorCannotResolveCheckLocation, config.getLocation(), + config.getName()), + ex); } } } @@ -159,8 +162,8 @@ private void copyCheckConfig() { try { // Open the properties dialog to change default name and description - CheckConfigurationPropertiesDialog dialog = new CheckConfigurationPropertiesDialog(getShell(), - null, mWorkingSet); + CheckConfigurationPropertiesDialog dialog = new CheckConfigurationPropertiesDialog( + getShell(), null, mWorkingSet); dialog.setTemplateConfiguration(sourceConfig); dialog.setBlockOnOpen(true); @@ -200,7 +203,8 @@ private void removeCheckConfig() { editorView.setConfigs(mWorkingSet.getWorkingCopies()); } else { - MessageDialog.openInformation(getShell(), Messages.CheckstylePreferencePage_titleCantDelete, + MessageDialog.openInformation(getShell(), + Messages.CheckstylePreferencePage_titleCantDelete, NLS.bind(Messages.CheckstylePreferencePage_msgCantDelete, checkConfig.getName())); } } diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/CheckConfigurationWorkingSetEditorConfigTable.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/CheckConfigurationWorkingSetEditorConfigTable.java index 47267a5cc..9bbef8078 100644 --- a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/CheckConfigurationWorkingSetEditorConfigTable.java +++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/CheckConfigurationWorkingSetEditorConfigTable.java @@ -42,9 +42,9 @@ public final class CheckConfigurationWorkingSetEditorConfigTable extends Composi private final TableViewer tableViewer; - public CheckConfigurationWorkingSetEditorConfigTable(Composite parent, int style, boolean useDefaultColumn, - CheckConfigurationWorkingCopy[] configs, ConfigurationLabelProvider multiProvider, - Runnable configureCheckConfig, + public CheckConfigurationWorkingSetEditorConfigTable(Composite parent, int style, + boolean useDefaultColumn, CheckConfigurationWorkingCopy[] configs, + ConfigurationLabelProvider multiProvider, Runnable configureCheckConfig, Consumer handleSelectionChanged) { super(parent, style); setLayout(new FillLayout()); diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/CheckConfigurationWorkingSetEditorView.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/CheckConfigurationWorkingSetEditorView.java index 968d92294..bb6620a51 100644 --- a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/CheckConfigurationWorkingSetEditorView.java +++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/CheckConfigurationWorkingSetEditorView.java @@ -123,7 +123,7 @@ private void handleSelectionChanged(CheckConfigurationWorkingCopy config, boolean configSelected = config != null; if (configSelected) { mConfigurationDescription - .setText(config.getDescription() != null ? config.getDescription() : ""); //$NON-NLS-1$ + .setText(config.getDescription() != null ? config.getDescription() : ""); if (global) { try { diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/ConfiguredModules.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/ConfiguredModules.java index afb8fe416..90a045302 100644 --- a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/ConfiguredModules.java +++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/ConfiguredModules.java @@ -57,8 +57,9 @@ public ConfiguredModules(Composite parent, int style, boolean configurable, GridLayoutFactory.fillDefaults().applyTo(configuredModulesGroup); configuredModulesGroup.setText("\0"); - this.table = new ConfiguredModulesTable(configuredModulesGroup, SWT.NONE, new RuleGroupModuleFilter(), configurable, - new TableCheckStateProvider(configurable), callbacks, modules); + this.table = new ConfiguredModulesTable(configuredModulesGroup, SWT.NONE, + new RuleGroupModuleFilter(), configurable, new TableCheckStateProvider(configurable), + callbacks, modules); GridDataFactory.fillDefaults().grab(true, true).applyTo(table); Runnable removeModule = () -> callbacks.removeModule.accept(table.getSelectedModules()); diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/ConfiguredModulesTable.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/ConfiguredModulesTable.java index f05f0e162..24842fd55 100644 --- a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/ConfiguredModulesTable.java +++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/ConfiguredModulesTable.java @@ -47,6 +47,7 @@ import net.sf.eclipsecs.ui.CheckstyleUiPlugin; import net.sf.eclipsecs.ui.Messages; import net.sf.eclipsecs.ui.config.ConfiguredModules.ConfiguredModulesCallbacks; +import net.sf.eclipsecs.ui.util.HtmlUtil; import net.sf.eclipsecs.ui.util.table.TableComparableProvider; import net.sf.eclipsecs.ui.util.table.TableSettingsProvider; import net.sf.eclipsecs.ui.util.table.TableViewerEnhancer; @@ -56,8 +57,8 @@ public final class ConfiguredModulesTable extends Composite { private final CheckboxTableViewer tableViewer; public ConfiguredModulesTable(Composite parent, int style, ViewerFilter ruleGroupModuleFilter, - boolean configurable, ICheckStateProvider checkStateProvider, ConfiguredModulesCallbacks callbacks, - List modules) { + boolean configurable, ICheckStateProvider checkStateProvider, + ConfiguredModulesCallbacks callbacks, List modules) { super(parent, style); GridLayoutFactory.fillDefaults().applyTo(this); @@ -76,7 +77,7 @@ public ConfiguredModulesTable(Composite parent, int style, ViewerFilter ruleGrou description = meta.identity().description(); } } - callbacks.updateDescription().accept(CheckConfigurationConfigureDialogView.getDescriptionHtml(description)); + callbacks.updateDescription().accept(HtmlUtil.getDescriptionHtml(description)); }); tableViewer.addCheckStateListener(event -> { if (configurable) { diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/ResolvablePropertiesDialog.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/ResolvablePropertiesDialog.java index 0221cc05f..64da359c6 100644 --- a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/ResolvablePropertiesDialog.java +++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/ResolvablePropertiesDialog.java @@ -146,7 +146,8 @@ protected Control createButtonBar(Composite parent) { Button mBtnFind = new Button(composite, SWT.PUSH); mBtnFind.setText(Messages.ResolvablePropertiesDialog_btnFind); GridDataFactory.swtDefaults().align(SWT.BEGINNING, SWT.CENTER).indent(5, 0).applyTo(mBtnFind); - mBtnFind.addSelectionListener(SelectionListener.widgetSelectedAdapter(event -> findPropertyItems())); + mBtnFind.addSelectionListener( + SelectionListener.widgetSelectedAdapter(event -> findPropertyItems())); Control buttonBar = super.createButtonBar(composite); GridDataFactory.create(GridData.FILL_HORIZONTAL).align(SWT.END, SWT.CENTER).applyTo(buttonBar); diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/ResolvablePropertyEditDialog.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/ResolvablePropertyEditDialog.java index 8d7d34055..9d7d8afff 100644 --- a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/ResolvablePropertyEditDialog.java +++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/ResolvablePropertyEditDialog.java @@ -86,7 +86,7 @@ protected Control createDialogArea(Composite parent) { lblName.setText(Messages.ResolvablePropertyEditDialog_lblName); mTxtName = new Text(dialog, SWT.SINGLE | SWT.BORDER); GridDataFactory.create(GridData.FILL_HORIZONTAL).applyTo(mTxtName); - mTxtName.setText(mProperty.getPropertyName() != null ? mProperty.getPropertyName() : ""); //$NON-NLS-1$ + mTxtName.setText(mProperty.getPropertyName() != null ? mProperty.getPropertyName() : ""); Label lblValue = new Label(dialog, SWT.NULL); lblValue.setText(Messages.ResolvablePropertyEditDialog_lblValue); diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/RuleConfigurationEditDialog.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/RuleConfigurationEditDialog.java index f51894bd1..aa2d65d07 100644 --- a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/RuleConfigurationEditDialog.java +++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/RuleConfigurationEditDialog.java @@ -87,10 +87,12 @@ protected Control createDialogArea(Composite parent) { TabFolder mMainTab = new TabFolder(composite, SWT.NULL); GridDataFactory.create(GridData.FILL_BOTH).applyTo(mMainTab); - generalSettings = new RuleConfigurationEditDialogGeneralSettings(mMainTab, SWT.NULL, mRule, mReadonly); + generalSettings = new RuleConfigurationEditDialogGeneralSettings(mMainTab, SWT.NULL, mRule, + mReadonly); GridDataFactory.create(GridData.FILL_BOTH).applyTo(generalSettings); - advancedSettings = new RuleConfigurationEditDialogAdvancedSettings(mMainTab, SWT.NULL, mRule, mReadonly); + advancedSettings = new RuleConfigurationEditDialogAdvancedSettings(mMainTab, SWT.NULL, mRule, + mReadonly); GridDataFactory.create(GridData.FILL_BOTH).applyTo(advancedSettings); TabItem mainItem = new TabItem(mMainTab, SWT.NULL); diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/RuleConfigurationEditDialogAdvancedSettings.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/RuleConfigurationEditDialogAdvancedSettings.java index debeb2a08..a821cda16 100644 --- a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/RuleConfigurationEditDialogAdvancedSettings.java +++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/RuleConfigurationEditDialogAdvancedSettings.java @@ -47,7 +47,8 @@ public final class RuleConfigurationEditDialogAdvancedSettings extends Composite private final Text mIdText; private final Map mCustomMessages; - public RuleConfigurationEditDialogAdvancedSettings(Composite parent, int style, Module rule, boolean readonly) { + public RuleConfigurationEditDialogAdvancedSettings(Composite parent, int style, Module rule, + boolean readonly) { super(parent, style); GridLayoutFactory.swtDefaults().numColumns(2).applyTo(this); diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/configtypes/BuiltInConfigurationEditor.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/configtypes/BuiltInConfigurationEditor.java index 447b09057..753cbbb22 100644 --- a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/configtypes/BuiltInConfigurationEditor.java +++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/configtypes/BuiltInConfigurationEditor.java @@ -97,7 +97,8 @@ public Control createEditorControl(Composite parent, final Shell shell) { mDescription = new Text(contents, SWT.LEFT | SWT.WRAP | SWT.MULTI | SWT.BORDER | SWT.VERTICAL); mDescription.setEditable(false); - GridDataFactory.create(GridData.FILL_BOTH).span(2, 1).hint(300, 100).grab(true, true).applyTo(mDescription); + GridDataFactory.create(GridData.FILL_BOTH).span(2, 1).hint(300, 100).grab(true, true) + .applyTo(mDescription); if (mWorkingCopy.getName() != null) { mConfigName.setText(mWorkingCopy.getName()); diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/configtypes/ConfigurationTypesUi.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/configtypes/ConfigurationTypesUi.java index 400947082..08ebfb6a8 100644 --- a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/configtypes/ConfigurationTypesUi.java +++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/configtypes/ConfigurationTypesUi.java @@ -62,7 +62,8 @@ public final class ConfigurationTypesUi { private static final String ATTR_ICON = "icon"; //$NON-NLS-1$ /** the configuration types configured to the extension point. */ - private static final Map> CONFIGURATION_TYPE_EDITORS; + private static final Map> + CONFIGURATION_TYPE_EDITORS; /** Map of icon paths for the configuration types. */ private static final Map CONFIGURATION_TYPE_ICONS; diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/configtypes/ExternalFileConfigurationEditorView.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/configtypes/ExternalFileConfigurationEditorView.java index e0de7481a..e14837009 100644 --- a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/configtypes/ExternalFileConfigurationEditorView.java +++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/configtypes/ExternalFileConfigurationEditorView.java @@ -61,7 +61,8 @@ public ExternalFileConfigurationEditorView(Composite parent, int style) { GridDataFactory.swtDefaults().span(2, 1).applyTo(lblDescription); mDescription = new Text(this, SWT.LEFT | SWT.WRAP | SWT.MULTI | SWT.BORDER | SWT.VERTICAL); - GridDataFactory.create(GridData.FILL_BOTH).span(2, 1).hint(300, 100).grab(true, true).applyTo(mDescription); + GridDataFactory.create(GridData.FILL_BOTH).span(2, 1).hint(300, 100).grab(true, true) + .applyTo(mDescription); Group advancedGroup = new Group(this, SWT.NULL); advancedGroup.setText(Messages.RemoteConfigurationEditor_titleAdvancedOptions); @@ -112,7 +113,8 @@ private static Text createLocationSection(Composite parent, Shell shell) { Composite locationComposite = new Composite(parent, SWT.NULL); GridDataFactory.create(GridData.FILL_HORIZONTAL).applyTo(locationComposite); - GridLayoutFactory.swtDefaults().numColumns(2).equalWidth(false).margins(0, 0).applyTo(locationComposite); + GridLayoutFactory.swtDefaults().numColumns(2).equalWidth(false).margins(0, 0) + .applyTo(locationComposite); Text location = new Text(locationComposite, SWT.LEFT | SWT.SINGLE | SWT.BORDER); GridDataFactory.create(GridData.FILL_HORIZONTAL).applyTo(location); diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/configtypes/InternalConfigurationEditor.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/configtypes/InternalConfigurationEditor.java index 6b5c242a1..125d466e5 100644 --- a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/configtypes/InternalConfigurationEditor.java +++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/configtypes/InternalConfigurationEditor.java @@ -130,7 +130,7 @@ public CheckConfigurationWorkingCopy getEditedWorkingCopy() throws CheckstylePlu if (mWorkingCopy.getLocation() == null) { - String location = "internal_config_" + System.currentTimeMillis() + ".xml"; //$NON-NLS-1$ //$NON-NLS-2$ + String location = "internal_config_" + System.currentTimeMillis() + ".xml"; try { mWorkingCopy.setLocation(location); } catch (CheckstylePluginException ex) { diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/configtypes/InternalConfigurationEditorView.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/configtypes/InternalConfigurationEditorView.java index 458a7fee2..90e5d42d0 100644 --- a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/configtypes/InternalConfigurationEditorView.java +++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/configtypes/InternalConfigurationEditorView.java @@ -63,11 +63,13 @@ public InternalConfigurationEditorView(Composite parent, int style, Runnable imp GridDataFactory.swtDefaults().span(2, 1).applyTo(lblDescription); mDescription = new Text(this, SWT.LEFT | SWT.WRAP | SWT.MULTI | SWT.BORDER | SWT.VERTICAL); - GridDataFactory.create(GridData.FILL_BOTH).span(2, 1).hint(300, 100).grab(true, true).applyTo(mDescription); + GridDataFactory.create(GridData.FILL_BOTH).span(2, 1).hint(300, 100).grab(true, true) + .applyTo(mDescription); Button mBtnImport = new Button(this, SWT.PUSH); mBtnImport.setText(Messages.InternalConfigurationEditor_btnImport); - GridDataFactory.swtDefaults().span(2, 1).align(GridData.END, GridData.CENTER).applyTo(mBtnImport); + GridDataFactory.swtDefaults().span(2, 1).align(GridData.END, GridData.CENTER) + .applyTo(mBtnImport); mBtnImport.addSelectionListener(SelectionListener.widgetSelectedAdapter( event -> importConfig.run())); diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/configtypes/ProjectConfigurationEditor.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/configtypes/ProjectConfigurationEditor.java index b582cb81d..c61e3ef91 100644 --- a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/configtypes/ProjectConfigurationEditor.java +++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/configtypes/ProjectConfigurationEditor.java @@ -191,7 +191,8 @@ public CheckConfigurationWorkingCopy getEditedWorkingCopy() throws CheckstylePlu throw ex; } - CheckConfigurationWorkingSet workingSet = mCheckConfigDialog.getCheckConfigurationWorkingSet(); + CheckConfigurationWorkingSet workingSet = mCheckConfigDialog + .getCheckConfigurationWorkingSet(); IPath tmp = IPath.fromOSString(location); boolean isFirstPartProject = ResourcesPlugin.getWorkspace().getRoot() .getProject(tmp.segment(0)).exists(); @@ -201,8 +202,8 @@ public CheckConfigurationWorkingCopy getEditedWorkingCopy() throws CheckstylePlu .append(location).toString(); mLocation.setText(location); } else if (!isFirstPartProject && workingSet instanceof GlobalCheckConfigurationWorkingSet) { - throw new CheckstylePluginException(NLS - .bind(Messages.ProjectConfigurationEditor_msgNoProjectInWorkspace, tmp.segment(0)), ex); + throw new CheckstylePluginException(NLS.bind( + Messages.ProjectConfigurationEditor_msgNoProjectInWorkspace, tmp.segment(0)), ex); } if (ensureFileExists(location)) { diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/configtypes/RemoteConfigurationEditor.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/configtypes/RemoteConfigurationEditor.java index 00aae9c87..9b397db5d 100644 --- a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/configtypes/RemoteConfigurationEditor.java +++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/configtypes/RemoteConfigurationEditor.java @@ -110,7 +110,8 @@ public Control createEditorControl(Composite parent, final Shell shell) { GridDataFactory.swtDefaults().span(2, 1).applyTo(lblDescription); mDescription = new Text(contents, SWT.LEFT | SWT.WRAP | SWT.MULTI | SWT.BORDER | SWT.VERTICAL); - GridDataFactory.create(GridData.FILL_BOTH).span(2, 1).hint(300, 100).grab(true, true).applyTo(mDescription); + GridDataFactory.create(GridData.FILL_BOTH).span(2, 1).hint(300, 100).grab(true, true) + .applyTo(mDescription); createCredentialsGroup(contents); diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/widgets/ConfigPropertyWidgetStringArray.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/widgets/ConfigPropertyWidgetStringArray.java index bc33d81f0..7a82f8e01 100644 --- a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/widgets/ConfigPropertyWidgetStringArray.java +++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/widgets/ConfigPropertyWidgetStringArray.java @@ -51,7 +51,9 @@ public String getValue() { } /** - * Normalize array properties to be separated by a comma and a blank for better readability of the plain config file + * Normalize array properties to be separated by a comma and a blank for better readability of the + * plain config file + * * @return text with normalized separators */ private String normalizeSeparator(String text) { diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/preferences/CheckstylePreferencePage.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/preferences/CheckstylePreferencePage.java index 264da8134..48f9b43a8 100644 --- a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/preferences/CheckstylePreferencePage.java +++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/preferences/CheckstylePreferencePage.java @@ -78,7 +78,8 @@ public Control createContents(Composite ancestor) { Control header = new CheckstylePreferencePageHeader(ancestor, SWT.NONE); GridDataFactory.fillDefaults().applyTo(header); - this.generalSettings = new CheckstylePreferencePageGeneralSettings(ancestor, SWT.NONE, () -> mRebuildAll = true); + this.generalSettings = new CheckstylePreferencePageGeneralSettings(ancestor, SWT.NONE, + () -> mRebuildAll = true); GridDataFactory.fillDefaults().applyTo(generalSettings); final Composite configComposite = createCheckConfigContents(ancestor); diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/preferences/CheckstylePreferencePageGeneralSettings.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/preferences/CheckstylePreferencePageGeneralSettings.java index 07f8b0fd2..2afc35b22 100644 --- a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/preferences/CheckstylePreferencePageGeneralSettings.java +++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/preferences/CheckstylePreferencePageGeneralSettings.java @@ -48,8 +48,8 @@ public final class CheckstylePreferencePageGeneralSettings extends Composite { private static final String DEFAULT_LANGUAGE = "default"; - private static final List SUPPORTED_LANGUAGES = List.of(DEFAULT_LANGUAGE, "de", "en", "es", - "fi", "fr", "ja", "pt", "tr", "zh"); + private static final List SUPPORTED_LANGUAGES = List.of(DEFAULT_LANGUAGE, "de", "en", + "es", "fi", "fr", "ja", "pt", "tr", "zh"); private static final String[] LANGUAGE_ITEMS = SUPPORTED_LANGUAGES.stream().map(code -> { String displayLang; if (code == DEFAULT_LANGUAGE) { @@ -70,7 +70,8 @@ public final class CheckstylePreferencePageGeneralSettings extends Composite { private final Text mTxtMarkerLimit; private final Button mBackgroundFullBuild; - public CheckstylePreferencePageGeneralSettings(Composite parent, int style, Runnable setRebuildAll) { + public CheckstylePreferencePageGeneralSettings(Composite parent, int style, + Runnable setRebuildAll) { super(parent, style); setLayout(new FillLayout()); @@ -127,7 +128,8 @@ public CheckstylePreferencePageGeneralSettings(Composite parent, int style, Runn // Create the "Run Checkstyle in background on full builds" check box. // final Composite backgroundFullBuildComposite = new Composite(group, SWT.NULL); - GridLayoutFactory.swtDefaults().numColumns(2).margins(0, 0).applyTo(backgroundFullBuildComposite); + GridLayoutFactory.swtDefaults().numColumns(2).margins(0, 0) + .applyTo(backgroundFullBuildComposite); mBackgroundFullBuild = makeButton(backgroundFullBuildComposite, SWT.CHECK, Messages.CheckstylePreferencePage_txtBackgroundFullBuild0, @@ -179,7 +181,8 @@ private static Combo createLanguageSetting(Group group) { Combo languageIf = new Combo(langComposite, SWT.READ_ONLY); languageIf.setItems(LANGUAGE_ITEMS); final String lang = CheckstylePluginPrefs.getString(CheckstylePluginPrefs.PREF_LOCALE_LANGUAGE); - final int selectedLang = SUPPORTED_LANGUAGES.indexOf(lang == null || lang.isEmpty() ? DEFAULT_LANGUAGE : lang); + final int selectedLang = SUPPORTED_LANGUAGES + .indexOf(lang == null || lang.isEmpty() ? DEFAULT_LANGUAGE : lang); if (selectedLang != -1) { languageIf.select(selectedLang); } diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/preferences/CheckstylePreferencePageHeader.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/preferences/CheckstylePreferencePageHeader.java index c1dbc04cd..49f6ffc88 100644 --- a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/preferences/CheckstylePreferencePageHeader.java +++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/preferences/CheckstylePreferencePageHeader.java @@ -33,14 +33,16 @@ public class CheckstylePreferencePageHeader extends Composite { - private static final String CHECKSTYLE_VERSION = Main.class.getPackage().getImplementationVersion(); + private static final String CHECKSTYLE_VERSION = Main.class.getPackage() + .getImplementationVersion(); public CheckstylePreferencePageHeader(Composite parent, int style) { super(parent, style); RowLayoutFactory.fillDefaults().applyTo(this); Link link = new Link(this, SWT.NONE); - var text = NLS.bind(Messages.CheckstylePreferencePage_version, "" + CHECKSTYLE_VERSION + ""); + var text = NLS.bind(Messages.CheckstylePreferencePage_version, + "" + CHECKSTYLE_VERSION + ""); text = text.replace("Checkstyle", "Checkstyle"); link.setText(text); link.addListener(SWT.Selection, this::linkClicked); diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/properties/CheckConfigurationContentProvider.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/properties/CheckConfigurationContentProvider.java index d6e277dba..cd738f5ea 100644 --- a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/properties/CheckConfigurationContentProvider.java +++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/properties/CheckConfigurationContentProvider.java @@ -37,7 +37,8 @@ */ public final class CheckConfigurationContentProvider implements IStructuredContentProvider { - public static final CheckConfigurationContentProvider INSTANCE = new CheckConfigurationContentProvider(); + public static final CheckConfigurationContentProvider INSTANCE = + new CheckConfigurationContentProvider(); private CheckConfigurationContentProvider() { 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 4a73eb98b..c23dfe8f6 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 @@ -144,7 +144,8 @@ private void changeEnabledState(CheckStateChangedEvent event) { /** * Provides the labels for the FileSet list display. */ - public static final class FileSetLabelProvider extends LabelProvider implements ITableLabelProvider { + public static final class FileSetLabelProvider extends LabelProvider + implements ITableLabelProvider { public static final FileSetLabelProvider INSTANCE = new FileSetLabelProvider(); diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/properties/ComplexFileSetsEditorView.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/properties/ComplexFileSetsEditorView.java index 82e0fc34a..ba0216203 100644 --- a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/properties/ComplexFileSetsEditorView.java +++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/properties/ComplexFileSetsEditorView.java @@ -50,7 +50,8 @@ public ComplexFileSetsEditorView(Composite parent, int style, composite.setText(Messages.ComplexFileSetsEditor_titleAdvancedFilesetEditor); GridLayoutFactory.swtDefaults().numColumns(2).applyTo(composite); - mViewer = new ComplexFileSetsEditorTableView(composite, SWT.NONE, changeEnabledState, editFileSet, mFileSets); + mViewer = new ComplexFileSetsEditorTableView(composite, SWT.NONE, changeEnabledState, + editFileSet, mFileSets); GridDataFactory.fillDefaults().grab(true, true).applyTo(mViewer); // @@ -64,10 +65,12 @@ public ComplexFileSetsEditorView(Composite parent, int style, mAddButton.addListener(SWT.Selection, event -> addFileSet.run()); Button mEditButton = createPushButton(buttons, Messages.ComplexFileSetsEditor_btnEdit); - mEditButton.addListener(SWT.Selection, event -> editFileSet.accept(mViewer.getSelectedFileSet())); + mEditButton.addListener(SWT.Selection, + event -> editFileSet.accept(mViewer.getSelectedFileSet())); Button mRemoveButton = createPushButton(buttons, Messages.ComplexFileSetsEditor_btnRemove); - mRemoveButton.addListener(SWT.Selection, event -> removeFileSet.accept(mViewer.getSelectedFileSet())); + mRemoveButton.addListener(SWT.Selection, + event -> removeFileSet.accept(mViewer.getSelectedFileSet())); } public void refresh() { diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/properties/FileMatchPatternControl.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/properties/FileMatchPatternControl.java index 2e439a7aa..d98fdeaa7 100644 --- a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/properties/FileMatchPatternControl.java +++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/properties/FileMatchPatternControl.java @@ -38,7 +38,8 @@ public final class FileMatchPatternControl extends Composite { private final FileMatchPatternTable table; - public FileMatchPatternControl(Composite parent, int style, FileMatchPatternControlCallbacks callbacks) { + public FileMatchPatternControl(Composite parent, int style, + FileMatchPatternControlCallbacks callbacks) { super(parent, style); GridLayoutFactory.fillDefaults().applyTo(this); @@ -89,7 +90,8 @@ public void setInput(List fileMatchPatterns) { * the label for the new button * @return the newly-created button */ - private static Button createPushButton(Composite parent, String label, Runnable selectionListener) { + private static Button createPushButton(Composite parent, String label, + Runnable selectionListener) { Button button = new Button(parent, SWT.PUSH); button.setText(label); GridDataFactory.swtDefaults().align(SWT.FILL, SWT.CENTER).applyTo(button); diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/properties/FileMatchPatternTable.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/properties/FileMatchPatternTable.java index a1bd7e0bd..a7e67f05e 100644 --- a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/properties/FileMatchPatternTable.java +++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/properties/FileMatchPatternTable.java @@ -46,7 +46,8 @@ public final class FileMatchPatternTable extends Composite { private final CheckboxTableViewer mPatternViewer; - public FileMatchPatternTable(Composite parent, int style, FileMatchPatternControlCallbacks callbacks) { + public FileMatchPatternTable(Composite parent, int style, + FileMatchPatternControlCallbacks callbacks) { super(parent, style); GridLayoutFactory.fillDefaults().applyTo(this); @@ -131,9 +132,11 @@ public Image getColumnImage(Object element, int columnIndex) { } } - private static final class FileMatchPatternTableCheckStateProvider implements ICheckStateProvider { + private static final class FileMatchPatternTableCheckStateProvider + implements ICheckStateProvider { - private static final FileMatchPatternTableCheckStateProvider INSTANCE = new FileMatchPatternTableCheckStateProvider(); + private static final FileMatchPatternTableCheckStateProvider INSTANCE = + new FileMatchPatternTableCheckStateProvider(); private FileMatchPatternTableCheckStateProvider() { 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 a1e4843c7..a323417e8 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 @@ -189,7 +189,8 @@ private void addFileMatchPattern() { private void editFileMatchPattern(FileMatchPattern pattern) { if (pattern != null) { - FileMatchPatternEditDialog dialog = new FileMatchPatternEditDialog(getShell(), pattern.clone()); + FileMatchPatternEditDialog dialog = new FileMatchPatternEditDialog(getShell(), + pattern.clone()); if (Window.OK == dialog.open()) { @@ -240,7 +241,8 @@ private void refreshMatchArea() { } private void configureFileSetConfig() { - CheckConfigurationWorkingCopy config = (CheckConfigurationWorkingCopy) mFileSet.getCheckConfig(); + CheckConfigurationWorkingCopy config = (CheckConfigurationWorkingCopy) mFileSet + .getCheckConfig(); if (config != null) { try { config.getCheckstyleConfiguration(); diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/properties/FilterSettings.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/properties/FilterSettings.java index 29e7eb106..ce5a597b2 100644 --- a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/properties/FilterSettings.java +++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/properties/FilterSettings.java @@ -101,7 +101,8 @@ private CheckboxTableViewer createFilterList(Group group, IProject project) { filterList.setLabelProvider(new FilterListLabelProvider()); filterList.setContentProvider(ArrayContentProvider.getInstance()); filterList.setCheckStateProvider(new FilterListCheckStateProvider()); - filterList.addDoubleClickListener(event -> openFilterEditor(event.getSelection(), filterList, project)); + filterList.addDoubleClickListener( + event -> openFilterEditor(event.getSelection(), filterList, project)); filterList.addCheckStateListener(event -> { if (event.getElement() instanceof AuditFilter filter) { if (filter.isReadonly()) { @@ -120,7 +121,8 @@ private CheckboxTableViewer createFilterList(Group group, IProject project) { * @param selection * the selection */ - private void openFilterEditor(ISelection selection, CheckboxTableViewer filterList, IProject project) { + private void openFilterEditor(ISelection selection, CheckboxTableViewer filterList, + IProject project) { if (selection instanceof IStructuredSelection structuredSelection) { if (structuredSelection.getFirstElement() instanceof AuditFilter filterDef) { try { diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/properties/SimpleFileSetsEditorView.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/properties/SimpleFileSetsEditorView.java index c226ea704..a6383beec 100644 --- a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/properties/SimpleFileSetsEditorView.java +++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/properties/SimpleFileSetsEditorView.java @@ -42,8 +42,8 @@ public final class SimpleFileSetsEditorView extends Composite { private final ComboViewer mComboViewer; - public SimpleFileSetsEditorView(Composite parent, int style, Runnable manageConfig, FileSet mDefaultFileSet, - PropertyPageContext propertyPageContext) { + public SimpleFileSetsEditorView(Composite parent, int style, Runnable manageConfig, + FileSet mDefaultFileSet, PropertyPageContext propertyPageContext) { super(parent, style); GridLayoutFactory.fillDefaults().applyTo(this); @@ -61,8 +61,8 @@ public SimpleFileSetsEditorView(Composite parent, int style, Runnable manageConf Button mBtnManageConfigs = new Button(configArea, SWT.PUSH); mBtnManageConfigs.setText(Messages.SimpleFileSetsEditor_btnManageConfigs); - mBtnManageConfigs - .addSelectionListener(SelectionListener.widgetSelectedAdapter(event -> manageConfig.run())); + mBtnManageConfigs.addSelectionListener( + SelectionListener.widgetSelectedAdapter(event -> manageConfig.run())); GridDataFactory.fillDefaults().applyTo(mBtnManageConfigs); // Description @@ -76,13 +76,10 @@ public SimpleFileSetsEditorView(Composite parent, int style, Runnable manageConf .applyTo(mTxtConfigDescription); mComboViewer.addSelectionChangedListener(event -> { - CheckConfiguration config = (CheckConfiguration) event.getStructuredSelection().getFirstElement(); - if (config != null) { - mDefaultFileSet.setCheckConfig(config); - mTxtConfigDescription.setText(config.getDescription() != null ? config.getDescription() : ""); - } else { - mComboViewer.setSelection(new StructuredSelection(mComboViewer.getElementAt(0))); - } + CheckConfiguration config = (CheckConfiguration) event.getStructuredSelection() + .getFirstElement(); + mDefaultFileSet.setCheckConfig(config); + mTxtConfigDescription.setText(config.getDescription() != null ? config.getDescription() : ""); propertyPageContext.updateButtons(); }); diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/properties/filter/PluginFilterEditors.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/properties/filter/PluginFilterEditors.java index 45890de46..615be0018 100644 --- a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/properties/filter/PluginFilterEditors.java +++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/properties/filter/PluginFilterEditors.java @@ -39,7 +39,7 @@ public final class PluginFilterEditors { /** constant for the extension point id. */ - private static final String FILTER_EXTENSION_POINT = "net.sf.eclipsecs.ui.filtereditors"; //$NON-NLS-1$ + private static final String FILTER_EXTENSION_POINT = "net.sf.eclipsecs.ui.filtereditors"; /** constant for the name attribute. */ private static final String ATTR_FILTER = "filter"; //$NON-NLS-1$ 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 0d6708add..d0ab23463 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 @@ -42,7 +42,7 @@ import net.sf.eclipsecs.core.util.CheckstyleLog; import net.sf.eclipsecs.ui.CheckstyleUiPluginImages; import net.sf.eclipsecs.ui.Messages; -import net.sf.eclipsecs.ui.config.CheckConfigurationConfigureDialogView; +import net.sf.eclipsecs.ui.util.HtmlUtil; /** * Property page for checkstyle markers. @@ -133,7 +133,7 @@ private void createDescriptionText(final Composite composite, RuleIdentity ruleI gridData.horizontalSpan = 3; Browser browserDescription = new Browser(composite, SWT.BORDER); browserDescription.setLayoutData(gridData); - browserDescription.setText(CheckConfigurationConfigureDialogView + browserDescription.setText(HtmlUtil .getDescriptionHtml(ruleIdentity.description())); } diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/quickfixes/AstQuickfixExecutor.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/quickfixes/AstQuickfixExecutor.java index 1e91fdf74..ba0422d91 100644 --- a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/quickfixes/AstQuickfixExecutor.java +++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/quickfixes/AstQuickfixExecutor.java @@ -70,7 +70,8 @@ public static final void run(IMarker marker, JavaUI.openInEditor(compilationUnit); bufferManager.connect(path, LocationKind.IFILE, null); - ITextFileBuffer textFileBuffer = bufferManager.getTextFileBuffer(path, LocationKind.IFILE); + ITextFileBuffer textFileBuffer = bufferManager.getTextFileBuffer(path, + LocationKind.IFILE); IDocument document = textFileBuffer.getDocument(); Optional markerStart = getOffset(textFileBuffer, marker); @@ -89,7 +90,8 @@ public static final void run(IMarker marker, // rewrite all recorded changes to the document var wasDirtyBefore = textFileBuffer.isDirty(); - ast.rewrite(document, compilationUnit.getJavaProject().getOptions(true)).apply(document); + ast.rewrite(document, compilationUnit.getJavaProject().getOptions(true)) + .apply(document); // commit changes to underlying file if (!wasDirtyBefore) { diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/quickfixes/CheckstyleQuickfixes.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/quickfixes/CheckstyleQuickfixes.java index 29513e041..73ff3002f 100644 --- a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/quickfixes/CheckstyleQuickfixes.java +++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/quickfixes/CheckstyleQuickfixes.java @@ -76,7 +76,8 @@ public Collection getQuickfixes() { private Collection readRegistry() { List result = new ArrayList<>(); IExtensionRegistry registry = Platform.getExtensionRegistry(); - IConfigurationElement[] elements = registry.getConfigurationElementsFor(QUICKFIX_EXTENSION_POINT); + IConfigurationElement[] elements = registry + .getConfigurationElementsFor(QUICKFIX_EXTENSION_POINT); for (IConfigurationElement element : elements) { var module = element.getAttribute(EXTENSION_MODULE_ATTRIBUTE); if (StringUtils.isNotBlank(module)) { @@ -99,7 +100,8 @@ private CheckstyleMarkerResolution toClass(IConfigurationElement element) { resolution = (CheckstyleMarkerResolution) extension; } } catch (CoreException ex) { - CheckstyleLog.log(ex, "cannot create quickfix for " + element.getAttribute(EXTENSION_CLASS_ATTRIBUTE)); + CheckstyleLog.log(ex, + "cannot create quickfix for " + element.getAttribute(EXTENSION_CLASS_ATTRIBUTE)); } return resolution; } diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/quickfixes/FixCheckstyleMarkersJob.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/quickfixes/FixCheckstyleMarkersJob.java index c37de8925..b32fdfecd 100644 --- a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/quickfixes/FixCheckstyleMarkersJob.java +++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/quickfixes/FixCheckstyleMarkersJob.java @@ -72,7 +72,8 @@ public IStatus runInUIThread(IProgressMonitor monitor) { } status = Status.OK_STATUS; } catch (CoreException ex) { - status = new Status(IStatus.ERROR, CheckstyleUiPlugin.PLUGIN_ID, IStatus.OK, ex.getMessage(), ex); + status = new Status(IStatus.ERROR, CheckstyleUiPlugin.PLUGIN_ID, IStatus.OK, ex.getMessage(), + ex); } return status; diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/quickfixes/MarkerHelpContextProvider.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/quickfixes/MarkerHelpContextProvider.java index d79350674..2f74d4e53 100644 --- a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/quickfixes/MarkerHelpContextProvider.java +++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/quickfixes/MarkerHelpContextProvider.java @@ -55,7 +55,8 @@ public String getHelpContextForMarker(IMarker marker) { String helpContext = null; String module = getModule(marker); if (module.endsWith(CHECK_SUFFIX)) { - helpContext = PLUGIN_PREFIX + StringUtils.removeEnd(StringUtils.substringAfterLast(module, '.'), CHECK_SUFFIX); + helpContext = PLUGIN_PREFIX + + StringUtils.removeEnd(StringUtils.substringAfterLast(module, '.'), CHECK_SUFFIX); } return helpContext; } @@ -67,7 +68,8 @@ private String getModule(IMarker marker) { @Override public boolean hasHelpContextForMarker(IMarker marker) { // regex rules don't provide useful help for understanding and fixing an issue - return CheckstyleMarker.isCheckstyleMarker(marker) && !getModule(marker).startsWith(REGEXP_PACKAGE); + return CheckstyleMarker.isCheckstyleMarker(marker) + && !getModule(marker).startsWith(REGEXP_PACKAGE); } @Override diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/quickfixes/coding/ExplicitInitializationQuickfix.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/quickfixes/coding/ExplicitInitializationQuickfix.java index f6c6751bd..576728aca 100644 --- a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/quickfixes/coding/ExplicitInitializationQuickfix.java +++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/quickfixes/coding/ExplicitInitializationQuickfix.java @@ -70,7 +70,8 @@ private void retrieveFieldName(final IMarker marker) { in.close(); final String snippet = new String(buffer, resource.getCharset()); mFieldName = snippet.substring(0, snippet.indexOf('=')).trim(); - } catch (final CoreException | IOException | IndexOutOfBoundsException | ClassCastException | NullPointerException ex) { + } catch (final CoreException | IOException | IndexOutOfBoundsException | ClassCastException + | NullPointerException ex) { handleRetrieveFieldNameException(ex); } } diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/quickfixes/design/DesignForExtensionQuickfix.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/quickfixes/design/DesignForExtensionQuickfix.java index 4ee5876bc..b2dcf7019 100644 --- a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/quickfixes/design/DesignForExtensionQuickfix.java +++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/quickfixes/design/DesignForExtensionQuickfix.java @@ -59,7 +59,8 @@ public boolean visit(MethodDeclaration node) { Modifier finalModifier = node.getAST().newModifier(ModifierKeyword.FINAL_KEYWORD); node.modifiers().add(finalModifier); // reorder modifiers into their correct order - List reorderedModifiers = ModifierOrderQuickfix.reOrderModifiers(node.modifiers()); + List reorderedModifiers = ModifierOrderQuickfix + .reOrderModifiers(node.modifiers()); node.modifiers().clear(); node.modifiers().addAll(reorderedModifiers); } diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/quickfixes/modifier/Messages.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/quickfixes/modifier/Messages.java index 9fe78220b..4c0d5bc5b 100644 --- a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/quickfixes/modifier/Messages.java +++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/quickfixes/modifier/Messages.java @@ -32,7 +32,7 @@ public final class Messages extends NLS { public static String RedundantModifierQuickfix_label; - private static final String BUNDLE_NAME = "net.sf.eclipsecs.ui.quickfixes.modifier.messages"; //$NON-NLS-1$ + private static final String BUNDLE_NAME = "net.sf.eclipsecs.ui.quickfixes.modifier.messages"; static { // initialize resource bundle 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 a99c8b876..603b7283d 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 @@ -167,7 +167,8 @@ public IMarker[] findMarkers(IProgressMonitor mon) throws CoreException { * the dialog settings * @param focusResource */ - public static CheckstyleMarkerFilter restoreState(IDialogSettings dialogSettings, IResource[] focusResource) { + public static CheckstyleMarkerFilter restoreState(IDialogSettings dialogSettings, + IResource[] focusResource) { IDialogSettings settings = dialogSettings.getSection(TAG_DIALOG_SECTION); boolean enabled = findSetting(settings, TAG_ENABLED) @@ -279,7 +280,8 @@ private List findCheckstyleMarkers(IResource[] resources, int depth, List markers = new ArrayList<>(); for (IResource resource : resources) { if (resource.isAccessible()) { - markers.addAll(Arrays.asList(resource.findMarkers(CheckstyleMarker.MARKER_ID, true, depth))); + markers.addAll( + Arrays.asList(resource.findMarkers(CheckstyleMarker.MARKER_ID, true, depth))); } } Stream filteredMarkers = markers.stream(); diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/stats/views/internal/CheckstyleMarkerFilterDialogView.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/stats/views/internal/CheckstyleMarkerFilterDialogView.java index 26d6c7e9f..e2b5d05b8 100644 --- a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/stats/views/internal/CheckstyleMarkerFilterDialogView.java +++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/stats/views/internal/CheckstyleMarkerFilterDialogView.java @@ -93,7 +93,8 @@ private void updateControlState() { mBtnEditRegex.setEnabled(mChkFilterEnabled.getSelection()); } - public void set(boolean enabled, int onResource, boolean selectBySeverity, int severity, boolean filterByRegex) { + public void set(boolean enabled, int onResource, boolean selectBySeverity, int severity, + boolean filterByRegex) { mChkFilterEnabled.setSelection(enabled); resourceFilterGroup.setFromFilter(onResource, selectBySeverity, severity); mChkSelectByRegex.setSelection(filterByRegex); diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/stats/views/internal/CheckstyleMarkerFilterResourceFilterGroup.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/stats/views/internal/CheckstyleMarkerFilterResourceFilterGroup.java index baf50ddb9..25d8f069f 100644 --- a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/stats/views/internal/CheckstyleMarkerFilterResourceFilterGroup.java +++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/stats/views/internal/CheckstyleMarkerFilterResourceFilterGroup.java @@ -103,7 +103,8 @@ public CheckstyleMarkerFilterResourceFilterGroup(Composite parent, int style, Messages.CheckstyleMarkerFilterDialog_btnSeverityError, GridDataFactory.swtDefaults()); mChkSeverityWarning = createButton(severityGroup, SWT.CHECK, - Messages.CheckstyleMarkerFilterDialog_btnSeverityWarning, GridDataFactory.swtDefaults()); + Messages.CheckstyleMarkerFilterDialog_btnSeverityWarning, + GridDataFactory.swtDefaults()); mChkSeverityInfo = createButton(severityGroup, SWT.CHECK, Messages.CheckstyleMarkerFilterDialog_btnSeverityInfo, GridDataFactory.swtDefaults()); @@ -180,7 +181,8 @@ public boolean getSelectBySeverity() { return mChkSeverityEnabled.getSelection(); } - private static Button createButton(Composite parent, int style, String text, GridDataFactory gridDataFactory) { + private static Button createButton(Composite parent, int style, String text, + GridDataFactory gridDataFactory) { Button button = new Button(parent, style); button.setText(text); gridDataFactory.applyTo(button); diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/util/HtmlUtil.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/util/HtmlUtil.java new file mode 100644 index 000000000..9e4fccf73 --- /dev/null +++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/util/HtmlUtil.java @@ -0,0 +1,56 @@ +//============================================================================ +// +// Copyright (C) 2003-2023 the original author or authors. +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +// +//============================================================================ + +package net.sf.eclipsecs.ui.util; + +import java.util.regex.Pattern; + +import net.sf.eclipsecs.ui.Messages; + +/** + * Utility class for HTML formatting operations. + */ +public final class HtmlUtil { + + private static final Pattern PATTERN_INLINE_CODE = Pattern + .compile(Pattern.quote("{@code ") + "([^}]*?)" + Pattern.quote("}")); + + private HtmlUtil() { + } + + /** + * Convert a module description to HTML for use with a browser component. + * @param description module description + * @return HTML converted description + */ + public static String getDescriptionHtml(String description) { + StringBuilder buf = new StringBuilder(); + buf.append(""); + buf.append(description != null ? convertInlineCodeTags(description) + : Messages.CheckConfigurationConfigureDialog_txtNoDescription); + buf.append(""); + return buf.toString(); + } + + private static String convertInlineCodeTags(String html) { + return PATTERN_INLINE_CODE.matcher(html).replaceAll("$1"); + } +} diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/util/InternalBrowser.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/util/InternalBrowser.java index f42f97478..7cf9cef10 100644 --- a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/util/InternalBrowser.java +++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/util/InternalBrowser.java @@ -44,7 +44,8 @@ private InternalBrowser() { */ public static final void openLinkInExternalBrowser(String url) { try { - final IWebBrowser browser = PlatformUI.getWorkbench().getBrowserSupport().createBrowser(IWorkbenchBrowserSupport.AS_EXTERNAL, null, null, null); + final IWebBrowser browser = PlatformUI.getWorkbench().getBrowserSupport() + .createBrowser(IWorkbenchBrowserSupport.AS_EXTERNAL, null, null, null); browser.openURL(new URL(url)); } catch (PartInitException | MalformedURLException ex) { CheckstyleLog.log(ex); diff --git a/net.sf.eclipsecs.ui/test/net/sf/eclipsecs/ui/quickfixes/AbstractQuickfixTestCase.java b/net.sf.eclipsecs.ui/test/net/sf/eclipsecs/ui/quickfixes/AbstractQuickfixTestCase.java index 6d417dd06..932306c3f 100644 --- a/net.sf.eclipsecs.ui/test/net/sf/eclipsecs/ui/quickfixes/AbstractQuickfixTestCase.java +++ b/net.sf.eclipsecs.ui/test/net/sf/eclipsecs/ui/quickfixes/AbstractQuickfixTestCase.java @@ -50,8 +50,8 @@ public abstract class AbstractQuickfixTestCase { protected final void testQuickfix(final String testDataXml, final AbstractASTResolution quickfix) throws Exception { try (InputStream stream = getClass().getResourceAsStream(testDataXml)) { - assertThat(stream).withFailMessage(() -> "Cannot find resource " + testDataXml + " in package " - + getClass().getPackage().getName()).isNotNull(); + assertThat(stream).withFailMessage(() -> "Cannot find resource " + testDataXml + + " in package " + getClass().getPackage().getName()).isNotNull(); testQuickfix(stream, quickfix); } } @@ -84,7 +84,9 @@ private void testQuickfix(InputStream testdataStream, AbstractASTResolution quic TextEdit edit = compUnit.rewrite(doc, options); edit.apply(doc); - String trailingSpaceRemoved = doc.get().lines().map(String::stripTrailing).collect(Collectors.joining("\n")); + String trailingSpaceRemoved = doc.get().lines() + .map(String::stripTrailing) + .collect(Collectors.joining("\n")); assertThat(trailingSpaceRemoved).isEqualTo(testdata[i].result); }