diff --git a/config/checkstyle-checks.xml b/config/checkstyle-checks.xml index f6ed50e72..9fec5a433 100644 --- a/config/checkstyle-checks.xml +++ b/config/checkstyle-checks.xml @@ -640,6 +640,7 @@ + diff --git a/config/suppressions.xml b/config/suppressions.xml index 9d854a31e..642cb42eb 100644 --- a/config/suppressions.xml +++ b/config/suppressions.xml @@ -31,7 +31,7 @@ - + @@ -82,11 +82,11 @@ - + - + @@ -153,7 +153,7 @@ - + diff --git a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/configtypes/ConfigurationType.java b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/configtypes/AbstractConfigurationType.java similarity index 97% rename from net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/configtypes/ConfigurationType.java rename to net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/configtypes/AbstractConfigurationType.java index a9fce07a0..7007a0a66 100644 --- a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/configtypes/ConfigurationType.java +++ b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/configtypes/AbstractConfigurationType.java @@ -44,7 +44,7 @@ * Base implementation of IConfigurationType. * */ -public abstract class ConfigurationType implements IConfigurationType { +public abstract class AbstractConfigurationType implements IConfigurationType { /** The name. */ private String mName; @@ -238,13 +238,13 @@ public void notifyCheckConfigRemoved(ICheckConfiguration checkConfiguration) @Override public boolean equals(Object obj) { - if (obj == null || !(obj instanceof ConfigurationType)) { + if (obj == null || !(obj instanceof AbstractConfigurationType)) { return false; } if (this == obj) { return true; } - ConfigurationType rhs = (ConfigurationType) obj; + AbstractConfigurationType rhs = (AbstractConfigurationType) obj; return mIsCreatable == rhs.mIsCreatable && mIsEditable == rhs.mIsEditable && mIsConfigurable == rhs.mIsConfigurable && Objects.equals(mName, rhs.mName) diff --git a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/configtypes/BuiltInConfigurationType.java b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/configtypes/BuiltInConfigurationType.java index 751a270cc..79ecc1324 100644 --- a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/configtypes/BuiltInConfigurationType.java +++ b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/configtypes/BuiltInConfigurationType.java @@ -38,7 +38,7 @@ * inside the plugin. * */ -public class BuiltInConfigurationType extends ConfigurationType { +public class BuiltInConfigurationType extends AbstractConfigurationType { /** * constant for the contributor key. It stores the id of the plugin which contributes the built in 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 18734824d..6de35f89d 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 @@ -35,7 +35,7 @@ * Implementation of a check configuration that uses an exteral checkstyle configuration file. * */ -public class ExternalFileConfigurationType extends ConfigurationType { +public class ExternalFileConfigurationType extends AbstractConfigurationType { /** Key to access the information if the configuration is protected. */ public static final String KEY_PROTECT_CONFIG = "protect-config-file"; //$NON-NLS-1$ diff --git a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/configtypes/InternalConfigurationType.java b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/configtypes/InternalConfigurationType.java index ede1d105e..3635cd26f 100644 --- a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/configtypes/InternalConfigurationType.java +++ b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/configtypes/InternalConfigurationType.java @@ -37,7 +37,7 @@ * inside the plugin. * */ -public class InternalConfigurationType extends ConfigurationType { +public class InternalConfigurationType extends AbstractConfigurationType { /** * Resolves the location inside the plugins workspace state location. 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 2524ba271..6a4c37975 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 @@ -40,7 +40,7 @@ * Implementation of a check configuration that uses an exteral checkstyle configuration file. * */ -public class ProjectConfigurationType extends ConfigurationType { +public class ProjectConfigurationType extends AbstractConfigurationType { /** Key to access the information if the configuration is protected. */ public static final String KEY_PROTECT_CONFIG = "protect-config-file"; //$NON-NLS-1$ 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 a27019049..d4e0d1c97 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 @@ -59,7 +59,7 @@ * Implementation of a check configuration that uses an exteral checkstyle configuration file. * */ -public class RemoteConfigurationType extends ConfigurationType { +public class RemoteConfigurationType extends AbstractConfigurationType { /** Key to access the information if the configuration should be cached. */ public static final String KEY_CACHE_CONFIG = "cache-file"; //$NON-NLS-1$ diff --git a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/CTransformationClass.java b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/AbstractCTransformationClass.java similarity index 98% rename from net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/CTransformationClass.java rename to net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/AbstractCTransformationClass.java index c0f266ccc..5d248eb42 100644 --- a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/CTransformationClass.java +++ b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/AbstractCTransformationClass.java @@ -31,7 +31,7 @@ * react on a checkstyle-rule. * */ -public abstract class CTransformationClass { +public abstract class AbstractCTransformationClass { /** The eclipse-configuration for this rule. */ private final FormatterConfiguration mFormatterSetting = new FormatterConfiguration(); diff --git a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/FTransformationClass.java b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/AbstractFTransformationClass.java similarity index 98% rename from net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/FTransformationClass.java rename to net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/AbstractFTransformationClass.java index 2f8fbf6a1..465444076 100644 --- a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/FTransformationClass.java +++ b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/AbstractFTransformationClass.java @@ -27,7 +27,7 @@ * react on a formatter-setting. * */ -public abstract class FTransformationClass { +public abstract class AbstractFTransformationClass { /** The checkstyle-configuration for this rule. */ private final CheckstyleSetting mCheckstyleSetting = new CheckstyleSetting(); 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 b4b54d27f..3bed1b784 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 @@ -46,7 +46,7 @@ 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; @@ -98,7 +98,7 @@ private void loadTransformationClasses(final List classnames) try { transformationClass = CheckstylePlugin.getDefault().getAddonExtensionClassLoader() .loadClass(name); - final CTransformationClass transObj = (CTransformationClass) transformationClass.getDeclaredConstructor() + final AbstractCTransformationClass transObj = (AbstractCTransformationClass) transformationClass.getDeclaredConstructor() .newInstance(); transObj.setRule(rule); mTransformationClasses.add(transObj); @@ -129,7 +129,7 @@ public void transformRules() { */ private void loadRuleConfigurations() { FormatterConfiguration settings; - final Iterator it = mTransformationClasses.iterator(); + final Iterator it = mTransformationClasses.iterator(); while (it.hasNext()) { settings = it.next().transformRule(); mFormatterSetting.addConfiguration(settings); 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 dff313c51..297eae78e 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 @@ -37,7 +37,7 @@ */ public class FormatterTransformer { - private final Map> allTransformers; + private final Map> allTransformers; /** * Creates a new instance of class CheckstyleTransformer. @@ -63,7 +63,7 @@ public void transformRules(final String path, Map formatterSetti throws CheckstylePluginException { CheckstyleSetting checkstyleSetting = new CheckstyleSetting(); loadTransformationClasses(formatterSettings).stream() - .map(FTransformationClass::transformRule) + .map(AbstractFTransformationClass::transformRule) .forEach(checkstyleSetting::addSetting); new CheckstyleFileWriter(checkstyleSetting, path); } @@ -74,18 +74,18 @@ public void transformRules(final String path, Map formatterSetti * constructor. * @return */ - private List loadTransformationClasses(Map formatterSettings) + private List loadTransformationClasses(Map formatterSettings) throws CheckstylePluginException { - List targetTransformers = new ArrayList<>(); + 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 FTransformationClass transObj = transformationClass.getDeclaredConstructor() + final AbstractFTransformationClass transObj = transformationClass.getDeclaredConstructor() .newInstance(); transObj.setValue(value); @@ -101,7 +101,7 @@ 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() @@ -113,7 +113,7 @@ private static Map> discoverTransf 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/AvoidStarImportTransformer.java b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/AvoidStarImportTransformer.java index e0d4168d7..4af5a1300 100644 --- a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/AvoidStarImportTransformer.java +++ b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/AvoidStarImportTransformer.java @@ -20,7 +20,7 @@ package net.sf.eclipsecs.core.transformer.ctransformerclasses; -import net.sf.eclipsecs.core.transformer.CTransformationClass; +import net.sf.eclipsecs.core.transformer.AbstractCTransformationClass; import net.sf.eclipsecs.core.transformer.FormatterConfiguration; /** @@ -28,7 +28,7 @@ * eclipse-formatter-rules. * */ -public class AvoidStarImportTransformer extends CTransformationClass { +public class AvoidStarImportTransformer extends AbstractCTransformationClass { @Override public FormatterConfiguration transformRule() { diff --git a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/FileTabCharacterTransformer.java b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/FileTabCharacterTransformer.java index 8d13a4bfb..573ddd690 100644 --- a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/FileTabCharacterTransformer.java +++ b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/FileTabCharacterTransformer.java @@ -20,7 +20,7 @@ package net.sf.eclipsecs.core.transformer.ctransformerclasses; -import net.sf.eclipsecs.core.transformer.CTransformationClass; +import net.sf.eclipsecs.core.transformer.AbstractCTransformationClass; import net.sf.eclipsecs.core.transformer.FormatterConfiguration; /** @@ -28,7 +28,7 @@ * eclipse-formatter-rules. * */ -public class FileTabCharacterTransformer extends CTransformationClass { +public class FileTabCharacterTransformer extends AbstractCTransformationClass { @Override public FormatterConfiguration transformRule() { userFormatterSetting("use_tabs_only_for_leading_indentations", "false"); diff --git a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/FinalLocalVariableTransformer.java b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/FinalLocalVariableTransformer.java index cb24b9332..a997924d7 100644 --- a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/FinalLocalVariableTransformer.java +++ b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/FinalLocalVariableTransformer.java @@ -22,7 +22,7 @@ import java.util.StringTokenizer; -import net.sf.eclipsecs.core.transformer.CTransformationClass; +import net.sf.eclipsecs.core.transformer.AbstractCTransformationClass; import net.sf.eclipsecs.core.transformer.FormatterConfiguration; /** @@ -30,7 +30,7 @@ * eclipse-formatter-rules. * */ -public class FinalLocalVariableTransformer extends CTransformationClass { +public class FinalLocalVariableTransformer extends AbstractCTransformationClass { @Override public FormatterConfiguration transformRule() { String val = getAttribute("tokens"); diff --git a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/FinalParametersTransformer.java b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/FinalParametersTransformer.java index 6fd52ee59..5c1059e70 100644 --- a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/FinalParametersTransformer.java +++ b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/FinalParametersTransformer.java @@ -20,7 +20,7 @@ package net.sf.eclipsecs.core.transformer.ctransformerclasses; -import net.sf.eclipsecs.core.transformer.CTransformationClass; +import net.sf.eclipsecs.core.transformer.AbstractCTransformationClass; import net.sf.eclipsecs.core.transformer.FormatterConfiguration; /** @@ -28,7 +28,7 @@ * eclipse-formatter-rules. * */ -public class FinalParametersTransformer extends CTransformationClass { +public class FinalParametersTransformer extends AbstractCTransformationClass { @Override public FormatterConfiguration transformRule() { // TODO tokens diff --git a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/GenericWhitespaceTransformer.java b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/GenericWhitespaceTransformer.java index bc58b8be8..4c40c134f 100644 --- a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/GenericWhitespaceTransformer.java +++ b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/GenericWhitespaceTransformer.java @@ -20,7 +20,7 @@ package net.sf.eclipsecs.core.transformer.ctransformerclasses; -import net.sf.eclipsecs.core.transformer.CTransformationClass; +import net.sf.eclipsecs.core.transformer.AbstractCTransformationClass; import net.sf.eclipsecs.core.transformer.FormatterConfiguration; /** @@ -28,7 +28,7 @@ * eclipse-formatter-rules. * */ -public class GenericWhitespaceTransformer extends CTransformationClass { +public class GenericWhitespaceTransformer extends AbstractCTransformationClass { @Override public FormatterConfiguration transformRule() { userFormatterSetting("insert_space_before_question_in_wildcard", "do not insert"); diff --git a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/IndentationTransformer.java b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/IndentationTransformer.java index cb40220ac..703ee815a 100644 --- a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/IndentationTransformer.java +++ b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/IndentationTransformer.java @@ -20,7 +20,7 @@ package net.sf.eclipsecs.core.transformer.ctransformerclasses; -import net.sf.eclipsecs.core.transformer.CTransformationClass; +import net.sf.eclipsecs.core.transformer.AbstractCTransformationClass; import net.sf.eclipsecs.core.transformer.FormatterConfiguration; /** @@ -28,7 +28,7 @@ * eclipse-formatter-rules. * */ -public class IndentationTransformer extends CTransformationClass { +public class IndentationTransformer extends AbstractCTransformationClass { @Override public FormatterConfiguration transformRule() { String val = getAttribute("basicOffset"); 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 7a29d8062..b4b24ef05 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 @@ -22,14 +22,14 @@ import java.util.StringTokenizer; -import net.sf.eclipsecs.core.transformer.CTransformationClass; +import net.sf.eclipsecs.core.transformer.AbstractCTransformationClass; import net.sf.eclipsecs.core.transformer.FormatterConfiguration; /** * Wrapperclass for converting the checkstyle-rule LeftCurly to appropriate eclipse-formatter-rules. * */ -public class LeftCurlyTransformer extends CTransformationClass { +public class LeftCurlyTransformer extends AbstractCTransformationClass { @Override public FormatterConfiguration transformRule() { // TODO token LITERAL_SYNCHRONIZED diff --git a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/LineLengthTransformer.java b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/LineLengthTransformer.java index 1a3a00ef2..3fbaf36c7 100644 --- a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/LineLengthTransformer.java +++ b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/LineLengthTransformer.java @@ -20,7 +20,7 @@ package net.sf.eclipsecs.core.transformer.ctransformerclasses; -import net.sf.eclipsecs.core.transformer.CTransformationClass; +import net.sf.eclipsecs.core.transformer.AbstractCTransformationClass; import net.sf.eclipsecs.core.transformer.FormatterConfiguration; /** @@ -28,7 +28,7 @@ * eclipse-formatter-rules. * */ -public class LineLengthTransformer extends CTransformationClass { +public class LineLengthTransformer extends AbstractCTransformationClass { @Override public FormatterConfiguration transformRule() { String val = getAttribute("max"); diff --git a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/MethodParamPadTransformer.java b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/MethodParamPadTransformer.java index 53174ee68..ec6f491ec 100644 --- a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/MethodParamPadTransformer.java +++ b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/MethodParamPadTransformer.java @@ -22,7 +22,7 @@ import java.util.StringTokenizer; -import net.sf.eclipsecs.core.transformer.CTransformationClass; +import net.sf.eclipsecs.core.transformer.AbstractCTransformationClass; import net.sf.eclipsecs.core.transformer.FormatterConfiguration; /** @@ -30,7 +30,7 @@ * eclipse-formatter-rules. * */ -public class MethodParamPadTransformer extends CTransformationClass { +public class MethodParamPadTransformer extends AbstractCTransformationClass { @Override public FormatterConfiguration transformRule() { String val = getAttribute("tokens"); diff --git a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/MissingDeprecatedTransformer.java b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/MissingDeprecatedTransformer.java index 00d17d647..94338bdd3 100644 --- a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/MissingDeprecatedTransformer.java +++ b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/MissingDeprecatedTransformer.java @@ -20,7 +20,7 @@ package net.sf.eclipsecs.core.transformer.ctransformerclasses; -import net.sf.eclipsecs.core.transformer.CTransformationClass; +import net.sf.eclipsecs.core.transformer.AbstractCTransformationClass; import net.sf.eclipsecs.core.transformer.FormatterConfiguration; /** @@ -28,7 +28,7 @@ * eclipse-formatter-rules. * */ -public class MissingDeprecatedTransformer extends CTransformationClass { +public class MissingDeprecatedTransformer extends AbstractCTransformationClass { @Override public FormatterConfiguration transformRule() { useCleanupSetting("add_missing_annotations", "true"); diff --git a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/MissingOverrideTransformer.java b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/MissingOverrideTransformer.java index f4743ab48..ac9bde543 100644 --- a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/MissingOverrideTransformer.java +++ b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/MissingOverrideTransformer.java @@ -20,7 +20,7 @@ package net.sf.eclipsecs.core.transformer.ctransformerclasses; -import net.sf.eclipsecs.core.transformer.CTransformationClass; +import net.sf.eclipsecs.core.transformer.AbstractCTransformationClass; import net.sf.eclipsecs.core.transformer.FormatterConfiguration; /** @@ -28,7 +28,7 @@ * eclipse-formatter-rules. * */ -public class MissingOverrideTransformer extends CTransformationClass { +public class MissingOverrideTransformer extends AbstractCTransformationClass { @Override public FormatterConfiguration transformRule() { useCleanupSetting("add_missing_annotations", "true"); diff --git a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/NeedBracesTransformer.java b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/NeedBracesTransformer.java index 8453b220f..58f00c87f 100644 --- a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/NeedBracesTransformer.java +++ b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/NeedBracesTransformer.java @@ -20,7 +20,7 @@ package net.sf.eclipsecs.core.transformer.ctransformerclasses; -import net.sf.eclipsecs.core.transformer.CTransformationClass; +import net.sf.eclipsecs.core.transformer.AbstractCTransformationClass; import net.sf.eclipsecs.core.transformer.FormatterConfiguration; /** @@ -28,7 +28,7 @@ * eclipse-formatter-rules. * */ -public class NeedBracesTransformer extends CTransformationClass { +public class NeedBracesTransformer extends AbstractCTransformationClass { @Override public FormatterConfiguration transformRule() { diff --git a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/NewlineAtEndOfFileTransformer.java b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/NewlineAtEndOfFileTransformer.java index 47acdda87..9e5220c16 100644 --- a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/NewlineAtEndOfFileTransformer.java +++ b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/NewlineAtEndOfFileTransformer.java @@ -20,14 +20,14 @@ package net.sf.eclipsecs.core.transformer.ctransformerclasses; -import net.sf.eclipsecs.core.transformer.CTransformationClass; +import net.sf.eclipsecs.core.transformer.AbstractCTransformationClass; import net.sf.eclipsecs.core.transformer.FormatterConfiguration; /** * Transforms the "New Line At End Of File" checkstyle rule to the respective formatter setting. * */ -public class NewlineAtEndOfFileTransformer extends CTransformationClass { +public class NewlineAtEndOfFileTransformer extends AbstractCTransformationClass { @Override public FormatterConfiguration transformRule() { diff --git a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/NoWhitespaceAfterTransformer.java b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/NoWhitespaceAfterTransformer.java index a4580c93b..ceee4983c 100644 --- a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/NoWhitespaceAfterTransformer.java +++ b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/NoWhitespaceAfterTransformer.java @@ -22,7 +22,7 @@ import java.util.StringTokenizer; -import net.sf.eclipsecs.core.transformer.CTransformationClass; +import net.sf.eclipsecs.core.transformer.AbstractCTransformationClass; import net.sf.eclipsecs.core.transformer.FormatterConfiguration; /** @@ -30,7 +30,7 @@ * eclipse-formatter-rules. * */ -public class NoWhitespaceAfterTransformer extends CTransformationClass { +public class NoWhitespaceAfterTransformer extends AbstractCTransformationClass { @Override public FormatterConfiguration transformRule() { diff --git a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/NoWhitespaceBeforeTransformer.java b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/NoWhitespaceBeforeTransformer.java index 47ba852a2..f103ae730 100644 --- a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/NoWhitespaceBeforeTransformer.java +++ b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/NoWhitespaceBeforeTransformer.java @@ -20,7 +20,7 @@ package net.sf.eclipsecs.core.transformer.ctransformerclasses; -import net.sf.eclipsecs.core.transformer.CTransformationClass; +import net.sf.eclipsecs.core.transformer.AbstractCTransformationClass; import net.sf.eclipsecs.core.transformer.FormatterConfiguration; /** @@ -28,7 +28,7 @@ * eclipse-formatter-rules. * */ -public class NoWhitespaceBeforeTransformer extends CTransformationClass { +public class NoWhitespaceBeforeTransformer extends AbstractCTransformationClass { @Override public FormatterConfiguration transformRule() { // TODO tokens SEMI DOT diff --git a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/ParenPadTransformer.java b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/ParenPadTransformer.java index c73cae760..f340cfce8 100644 --- a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/ParenPadTransformer.java +++ b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/ParenPadTransformer.java @@ -22,14 +22,14 @@ import java.util.StringTokenizer; -import net.sf.eclipsecs.core.transformer.CTransformationClass; +import net.sf.eclipsecs.core.transformer.AbstractCTransformationClass; import net.sf.eclipsecs.core.transformer.FormatterConfiguration; /** * Wrapperclass for converting the checkstyle-rule ParenPad to appropriate eclipse-formatter-rules. * */ -public class ParenPadTransformer extends CTransformationClass { +public class ParenPadTransformer extends AbstractCTransformationClass { @Override public FormatterConfiguration transformRule() { diff --git a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/RedundantImportTransformer.java b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/RedundantImportTransformer.java index c2519fdaf..e13e7d440 100644 --- a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/RedundantImportTransformer.java +++ b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/RedundantImportTransformer.java @@ -20,7 +20,7 @@ package net.sf.eclipsecs.core.transformer.ctransformerclasses; -import net.sf.eclipsecs.core.transformer.CTransformationClass; +import net.sf.eclipsecs.core.transformer.AbstractCTransformationClass; import net.sf.eclipsecs.core.transformer.FormatterConfiguration; /** @@ -28,7 +28,7 @@ * eclipse-formatter-rules. * */ -public class RedundantImportTransformer extends CTransformationClass { +public class RedundantImportTransformer extends AbstractCTransformationClass { @Override public FormatterConfiguration transformRule() { useCleanupSetting("organize_imports", "true"); diff --git a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/RequireThisTransformer.java b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/RequireThisTransformer.java index 2d18b0379..86e3d874d 100644 --- a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/RequireThisTransformer.java +++ b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/RequireThisTransformer.java @@ -20,7 +20,7 @@ package net.sf.eclipsecs.core.transformer.ctransformerclasses; -import net.sf.eclipsecs.core.transformer.CTransformationClass; +import net.sf.eclipsecs.core.transformer.AbstractCTransformationClass; import net.sf.eclipsecs.core.transformer.FormatterConfiguration; /** @@ -28,7 +28,7 @@ * eclipse-formatter-rules. * */ -public class RequireThisTransformer extends CTransformationClass { +public class RequireThisTransformer extends AbstractCTransformationClass { @Override public FormatterConfiguration transformRule() { useCleanupSetting("always_use_this_for_non_static_field_access", "true"); diff --git a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/RightCurlyTransformer.java b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/RightCurlyTransformer.java index 1dd402b5b..da07b1658 100644 --- a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/RightCurlyTransformer.java +++ b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/RightCurlyTransformer.java @@ -22,7 +22,7 @@ import java.util.StringTokenizer; -import net.sf.eclipsecs.core.transformer.CTransformationClass; +import net.sf.eclipsecs.core.transformer.AbstractCTransformationClass; import net.sf.eclipsecs.core.transformer.FormatterConfiguration; /** @@ -30,7 +30,7 @@ * eclipse-formatter-rules. * */ -public class RightCurlyTransformer extends CTransformationClass { +public class RightCurlyTransformer extends AbstractCTransformationClass { @Override public FormatterConfiguration transformRule() { diff --git a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/TabCharacterTransformer.java b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/TabCharacterTransformer.java index 5a4947402..ce7957544 100644 --- a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/TabCharacterTransformer.java +++ b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/TabCharacterTransformer.java @@ -20,7 +20,7 @@ package net.sf.eclipsecs.core.transformer.ctransformerclasses; -import net.sf.eclipsecs.core.transformer.CTransformationClass; +import net.sf.eclipsecs.core.transformer.AbstractCTransformationClass; import net.sf.eclipsecs.core.transformer.FormatterConfiguration; /** @@ -28,7 +28,7 @@ * eclipse-formatter-rules. * */ -public class TabCharacterTransformer extends CTransformationClass { +public class TabCharacterTransformer extends AbstractCTransformationClass { @Override public FormatterConfiguration transformRule() { diff --git a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/TypecastParenPadTransformer.java b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/TypecastParenPadTransformer.java index d8bbc3c65..07e4196b9 100644 --- a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/TypecastParenPadTransformer.java +++ b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/TypecastParenPadTransformer.java @@ -20,7 +20,7 @@ package net.sf.eclipsecs.core.transformer.ctransformerclasses; -import net.sf.eclipsecs.core.transformer.CTransformationClass; +import net.sf.eclipsecs.core.transformer.AbstractCTransformationClass; import net.sf.eclipsecs.core.transformer.FormatterConfiguration; /** @@ -28,7 +28,7 @@ * eclipse-formatter-rules. * */ -public class TypecastParenPadTransformer extends CTransformationClass { +public class TypecastParenPadTransformer extends AbstractCTransformationClass { @Override public FormatterConfiguration transformRule() { diff --git a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/UnusedImportsTransformer.java b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/UnusedImportsTransformer.java index f16d99fc0..fb99b6444 100644 --- a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/UnusedImportsTransformer.java +++ b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/UnusedImportsTransformer.java @@ -20,7 +20,7 @@ package net.sf.eclipsecs.core.transformer.ctransformerclasses; -import net.sf.eclipsecs.core.transformer.CTransformationClass; +import net.sf.eclipsecs.core.transformer.AbstractCTransformationClass; import net.sf.eclipsecs.core.transformer.FormatterConfiguration; /** @@ -28,7 +28,7 @@ * eclipse-formatter-rules. * */ -public class UnusedImportsTransformer extends CTransformationClass { +public class UnusedImportsTransformer extends AbstractCTransformationClass { @Override public FormatterConfiguration transformRule() { diff --git a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/WhitespaceAfterTransformer.java b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/WhitespaceAfterTransformer.java index e664b7679..189feed55 100644 --- a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/WhitespaceAfterTransformer.java +++ b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ctransformerclasses/WhitespaceAfterTransformer.java @@ -22,7 +22,7 @@ import java.util.StringTokenizer; -import net.sf.eclipsecs.core.transformer.CTransformationClass; +import net.sf.eclipsecs.core.transformer.AbstractCTransformationClass; import net.sf.eclipsecs.core.transformer.FormatterConfiguration; /** @@ -30,7 +30,7 @@ * eclipse-formatter-rules. * */ -public class WhitespaceAfterTransformer extends CTransformationClass { +public class WhitespaceAfterTransformer extends AbstractCTransformationClass { @Override public FormatterConfiguration transformRule() { 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 ba577d534..cca0aacb5 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 @@ -24,7 +24,7 @@ import java.util.List; import java.util.StringTokenizer; -import net.sf.eclipsecs.core.transformer.CTransformationClass; +import net.sf.eclipsecs.core.transformer.AbstractCTransformationClass; import net.sf.eclipsecs.core.transformer.FormatterConfiguration; /** @@ -32,7 +32,7 @@ * eclipse-formatter-rules. * */ -public class WhitespaceAroundTransformer extends CTransformationClass { +public class WhitespaceAroundTransformer extends AbstractCTransformationClass { @Override public FormatterConfiguration transformRule() { diff --git a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ftransformerclasses/MethodInvocationParenTransformer.java b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ftransformerclasses/MethodInvocationParenTransformer.java index b51224e9a..7f574966b 100644 --- a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ftransformerclasses/MethodInvocationParenTransformer.java +++ b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ftransformerclasses/MethodInvocationParenTransformer.java @@ -23,7 +23,7 @@ import java.util.HashMap; import net.sf.eclipsecs.core.transformer.CheckstyleSetting; -import net.sf.eclipsecs.core.transformer.FTransformationClass; +import net.sf.eclipsecs.core.transformer.AbstractFTransformationClass; import net.sf.eclipsecs.core.transformer.FormatterKey; /** @@ -32,7 +32,7 @@ * */ @FormatterKey("insert_space_before_opening_paren_in_method_invocation") -public class MethodInvocationParenTransformer extends FTransformationClass { +public class MethodInvocationParenTransformer extends AbstractFTransformationClass { @Override public CheckstyleSetting transformRule() { final HashMap properties = new HashMap<>(); diff --git a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ftransformerclasses/TabulationCharTransformer.java b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ftransformerclasses/TabulationCharTransformer.java index 87bcdaf85..805903468 100644 --- a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ftransformerclasses/TabulationCharTransformer.java +++ b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/ftransformerclasses/TabulationCharTransformer.java @@ -21,7 +21,7 @@ package net.sf.eclipsecs.core.transformer.ftransformerclasses; import net.sf.eclipsecs.core.transformer.CheckstyleSetting; -import net.sf.eclipsecs.core.transformer.FTransformationClass; +import net.sf.eclipsecs.core.transformer.AbstractFTransformationClass; import net.sf.eclipsecs.core.transformer.FormatterKey; /** @@ -30,7 +30,7 @@ * */ @FormatterKey("tabulation.char") -public class TabulationCharTransformer extends FTransformationClass { +public class TabulationCharTransformer extends AbstractFTransformationClass { @Override public CheckstyleSetting transformRule() { useCheckerModule("FileTabCharacter", null); diff --git a/net.sf.eclipsecs.ui/.project b/net.sf.eclipsecs.ui/.project index 3e343b8d3..53e1762aa 100644 --- a/net.sf.eclipsecs.ui/.project +++ b/net.sf.eclipsecs.ui/.project @@ -21,12 +21,12 @@ - net.sf.eclipsecs.core.CheckstyleBuilder + org.eclipse.pde.ds.core.builder - org.eclipse.pde.ds.core.builder + net.sf.eclipsecs.core.CheckstyleBuilder diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/widgets/ConfigPropertyWidgetAbstractBase.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/widgets/AbstractConfigPropertyWidget.java similarity index 95% rename from net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/widgets/ConfigPropertyWidgetAbstractBase.java rename to net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/widgets/AbstractConfigPropertyWidget.java index 5b8c8fece..8355190ec 100644 --- a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/widgets/ConfigPropertyWidgetAbstractBase.java +++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/widgets/AbstractConfigPropertyWidget.java @@ -34,7 +34,7 @@ /** * Base class for all configuration property input widget classes. */ -public abstract class ConfigPropertyWidgetAbstractBase implements IConfigPropertyWidget { +public abstract class AbstractConfigPropertyWidget implements IConfigPropertyWidget { private ConfigProperty mProp; @@ -42,7 +42,7 @@ public abstract class ConfigPropertyWidgetAbstractBase implements IConfigPropert private Composite mParent; - protected ConfigPropertyWidgetAbstractBase(Composite parent, ConfigProperty prop) { + protected AbstractConfigPropertyWidget(Composite parent, ConfigProperty prop) { mParent = parent; mProp = prop; } diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/widgets/ConfigPropertyWidgetBoolean.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/widgets/ConfigPropertyWidgetBoolean.java index e08fe0258..bf00da118 100644 --- a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/widgets/ConfigPropertyWidgetBoolean.java +++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/widgets/ConfigPropertyWidgetBoolean.java @@ -32,7 +32,7 @@ /** * Boolean configuration widget. */ -public class ConfigPropertyWidgetBoolean extends ConfigPropertyWidgetAbstractBase { +public class ConfigPropertyWidgetBoolean extends AbstractConfigPropertyWidget { private Button mCheckbox; diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/widgets/ConfigPropertyWidgetFile.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/widgets/ConfigPropertyWidgetFile.java index 3bab03501..324574364 100644 --- a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/widgets/ConfigPropertyWidgetFile.java +++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/widgets/ConfigPropertyWidgetFile.java @@ -49,7 +49,7 @@ /** * A string property configuration widget. */ -public class ConfigPropertyWidgetFile extends ConfigPropertyWidgetAbstractBase { +public class ConfigPropertyWidgetFile extends AbstractConfigPropertyWidget { private Composite mContents; diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/widgets/ConfigPropertyWidgetHidden.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/widgets/ConfigPropertyWidgetHidden.java index cfe615ea8..029db3995 100644 --- a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/widgets/ConfigPropertyWidgetHidden.java +++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/widgets/ConfigPropertyWidgetHidden.java @@ -28,7 +28,7 @@ /** * Non-configuration property. */ -public class ConfigPropertyWidgetHidden extends ConfigPropertyWidgetAbstractBase { +public class ConfigPropertyWidgetHidden extends AbstractConfigPropertyWidget { private String mValue = ""; //$NON-NLS-1$ diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/widgets/ConfigPropertyWidgetInteger.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/widgets/ConfigPropertyWidgetInteger.java index 1a6ee23bf..56f67ad19 100644 --- a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/widgets/ConfigPropertyWidgetInteger.java +++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/widgets/ConfigPropertyWidgetInteger.java @@ -34,7 +34,7 @@ /** * A string property configuration widget. */ -public class ConfigPropertyWidgetInteger extends ConfigPropertyWidgetAbstractBase { +public class ConfigPropertyWidgetInteger extends AbstractConfigPropertyWidget { private Text mTextWidget; diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/widgets/ConfigPropertyWidgetMultiCheck.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/widgets/ConfigPropertyWidgetMultiCheck.java index 615a82d3c..e207c5737 100644 --- a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/widgets/ConfigPropertyWidgetMultiCheck.java +++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/widgets/ConfigPropertyWidgetMultiCheck.java @@ -54,7 +54,7 @@ /** * Configuration widget for selecting multiple values with check boxes. */ -public class ConfigPropertyWidgetMultiCheck extends ConfigPropertyWidgetAbstractBase +public class ConfigPropertyWidgetMultiCheck extends AbstractConfigPropertyWidget implements IPreferenceChangeListener { /** Resource bundle containing the token translations. */ diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/widgets/ConfigPropertyWidgetRegex.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/widgets/ConfigPropertyWidgetRegex.java index 0c23b0c9c..a4f9a5b45 100644 --- a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/widgets/ConfigPropertyWidgetRegex.java +++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/widgets/ConfigPropertyWidgetRegex.java @@ -43,7 +43,7 @@ /** * A string property configuration widget. */ -public class ConfigPropertyWidgetRegex extends ConfigPropertyWidgetAbstractBase { +public class ConfigPropertyWidgetRegex extends AbstractConfigPropertyWidget { private final String mDefaultMessage = Messages.ConfigPropertyWidgetRegex_msgRegexTestString; diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/widgets/ConfigPropertyWidgetSingleSelect.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/widgets/ConfigPropertyWidgetSingleSelect.java index a9c212650..387df53bc 100644 --- a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/widgets/ConfigPropertyWidgetSingleSelect.java +++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/widgets/ConfigPropertyWidgetSingleSelect.java @@ -35,7 +35,7 @@ /** * Configuration widget that allows for selecting one value from a set of values. */ -public class ConfigPropertyWidgetSingleSelect extends ConfigPropertyWidgetAbstractBase { +public class ConfigPropertyWidgetSingleSelect extends AbstractConfigPropertyWidget { private Combo mComboItem; diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/widgets/ConfigPropertyWidgetString.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/widgets/ConfigPropertyWidgetString.java index 0d800838e..209e8f2b4 100644 --- a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/widgets/ConfigPropertyWidgetString.java +++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/widgets/ConfigPropertyWidgetString.java @@ -33,7 +33,7 @@ /** * A string property configuration widget. */ -public class ConfigPropertyWidgetString extends ConfigPropertyWidgetAbstractBase { +public class ConfigPropertyWidgetString extends AbstractConfigPropertyWidget { private static final String APOSTROPHE_PLAIN = "'"; private static final String APOSTROPHE_ESCAPED = "''";