Skip to content

Commit f2e4996

Browse files
CalixteCalixte
committed
Issue #440: resolves EnumValueName and UniformEnumConstantName
1 parent 2ccb47b commit f2e4996

10 files changed

Lines changed: 94 additions & 58 deletions

File tree

‎net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/ConfigurationReader.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,9 +203,9 @@ private static void addProperties(final Element moduleEl, final Module module) {
203203
if (XMLTags.SEVERITY_TAG.equals(name) && (module.getMetaData() != null)
204204
&& module.getMetaData().hasSeverity()) {
205205
try {
206-
module.setSeverity(Severity.valueOf(value));
206+
module.setSeverity(Severity.fromXmlValue(value));
207207
} catch (final IllegalArgumentException ex) {
208-
module.setSeverity(Severity.inherit);
208+
module.setSeverity(Severity.INHERIT);
209209
}
210210
} else if (XMLTags.ID_TAG.equals(name)) {
211211
module.setId(Strings.emptyToNull(value));
@@ -252,7 +252,7 @@ private static void addMetadata(final Element moduleEl, final Module module) {
252252
if (XMLTags.COMMENT_ID.equals(name)) {
253253
module.setComment(value);
254254
} else if (XMLTags.LAST_ENABLED_SEVERITY_ID.equals(name)) {
255-
module.setLastEnabledSeverity(Severity.valueOf(value));
255+
module.setLastEnabledSeverity(Severity.fromXmlValue(value));
256256
} else {
257257
module.getCustomMetaData().put(name, value);
258258
}

‎net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/ConfigurationWriter.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,11 +159,11 @@ private static void writeModule(Module module, Branch parent, Severity parentSev
159159

160160
// Write severity only if it differs from the parents severity
161161
Severity severity = parentSeverity;
162-
if (module.getSeverity() != null && Severity.inherit != module.getSeverity()) {
162+
if (module.getSeverity() != null && Severity.INHERIT != module.getSeverity()) {
163163

164164
Element propertyEl = moduleEl.addElement(XMLTags.PROPERTY_TAG);
165165
propertyEl.addAttribute(XMLTags.NAME_TAG, XMLTags.SEVERITY_TAG);
166-
propertyEl.addAttribute(XMLTags.VALUE_TAG, module.getSeverity().name());
166+
propertyEl.addAttribute(XMLTags.VALUE_TAG, module.getSeverity().toXmlValue());
167167

168168
// set the parent severity for child modules
169169
severity = module.getSeverity();
@@ -211,7 +211,7 @@ private static void writeModule(Module module, Branch parent, Severity parentSev
211211

212212
Element metaEl = moduleEl.addElement(XMLTags.METADATA_TAG);
213213
metaEl.addAttribute(XMLTags.NAME_TAG, XMLTags.LAST_ENABLED_SEVERITY_ID);
214-
metaEl.addAttribute(XMLTags.VALUE_TAG, module.getLastEnabledSeverity().name());
214+
metaEl.addAttribute(XMLTags.VALUE_TAG, module.getLastEnabledSeverity().toXmlValue());
215215
}
216216

217217
// write child modules recursively

‎net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/Module.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public class Module implements Cloneable {
6161
private String id;
6262

6363
/** the severity level. */
64-
private Severity mSeverityLevel = Severity.inherit;
64+
private Severity mSeverityLevel = Severity.INHERIT;
6565

6666
/** the last severity level before setting to ignored. */
6767
private Severity mLastEnabledSeverity;
@@ -274,8 +274,8 @@ public void setSeverity(Severity severityLevel) {
274274
if (severityLevel == defaultLevel) {
275275
mSeverityLevel = null;
276276
setLastEnabledSeverity(null);
277-
} else if (Severity.ignore == severityLevel) {
278-
if (mSeverityLevel != null && Severity.ignore != mSeverityLevel) {
277+
} else if (Severity.IGNORE == severityLevel) {
278+
if (mSeverityLevel != null && Severity.IGNORE != mSeverityLevel) {
279279
setLastEnabledSeverity(mSeverityLevel);
280280
}
281281

‎net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/Severity.java‎

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,38 @@
2828
public enum Severity {
2929

3030
/** Unspecified severity level, inherited from parent module. */
31-
inherit,
31+
INHERIT,
3232

3333
/** Severity level 'ignore'. */
34-
ignore,
34+
IGNORE,
3535

3636
/** Severity level 'info'. */
37-
info,
37+
INFO,
3838

3939
/** Severity level 'warning'. */
40-
warning,
40+
WARNING,
4141

4242
/** Severity level 'error'. */
43-
error
43+
ERROR;
44+
45+
public static Severity fromXmlValue(String xmlValue) {
46+
return switch (xmlValue) {
47+
case "inherit" -> INHERIT;
48+
case "ignore" -> IGNORE;
49+
case "info" -> INFO;
50+
case "warning" -> WARNING;
51+
case "error" -> ERROR;
52+
default -> throw new IllegalArgumentException("Unexpected value: " + xmlValue);
53+
};
54+
}
55+
56+
public String toXmlValue() {
57+
return switch (this) {
58+
case INHERIT -> "inherit";
59+
case IGNORE -> "ignore";
60+
case INFO -> "info";
61+
case WARNING -> "warning";
62+
case ERROR -> "error";
63+
};
64+
}
4465
}

‎net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/meta/ConfigPropertyMetadata.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ public List<String> getPropertyEnumeration() {
139139
* @return boolean
140140
*/
141141
public boolean isHidden() {
142-
return ConfigPropertyType.Hidden == mDatatype;
142+
return ConfigPropertyType.HIDDEN == mDatatype;
143143
}
144144

145145
}

‎net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/meta/ConfigPropertyType.java‎

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,29 +26,44 @@
2626
public enum ConfigPropertyType {
2727

2828
/** A String. */
29-
String,
29+
STRING,
3030

3131
/** An array of strings. */
32-
StringArray,
32+
STRING_ARRAY,
3333

3434
/** An integer. */
35-
Integer,
35+
INTEGER,
3636

3737
/** Select a single items from a list. */
38-
SingleSelect,
38+
SINGLE_SELECT,
3939

4040
/** Boolean value. */
41-
Boolean,
41+
BOOLEAN,
4242

4343
/** Select multiple items from a set. */
44-
MultiCheck,
44+
MULTI_CHECK,
4545

4646
/** A value that is not configured. */
47-
Hidden,
47+
HIDDEN,
4848

4949
/** A value that contains a file name. */
50-
File,
50+
FILE,
5151

5252
/** A value that contains a regular expression. */
53-
Regex
53+
REGEX;
54+
55+
static ConfigPropertyType fromXmlValue(String xmlValue) {
56+
return switch (xmlValue) {
57+
case "String" -> STRING;
58+
case "StringArray" -> STRING_ARRAY;
59+
case "Integer" -> INTEGER;
60+
case "SingleSelect" -> SINGLE_SELECT;
61+
case "Boolean" -> BOOLEAN;
62+
case "MultiCheck" -> MULTI_CHECK;
63+
case "Hidden" -> HIDDEN;
64+
case "File" -> FILE;
65+
case "Regex" -> REGEX;
66+
default -> throw new IllegalArgumentException("Unexpected value: " + xmlValue);
67+
};
68+
}
5469
}

‎net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/meta/MetadataFactory.java‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ public static RuleMetadata createGenericMetadata(Module module) {
189189
for (int i = 0; i < size; i++) {
190190

191191
ConfigProperty property = properties.get(i);
192-
ConfigPropertyMetadata meta = new ConfigPropertyMetadata(ConfigPropertyType.String,
192+
ConfigPropertyMetadata meta = new ConfigPropertyMetadata(ConfigPropertyType.STRING,
193193
property.getName(), null, null);
194194
property.setMetaData(meta);
195195
}
@@ -266,32 +266,32 @@ private static ConfigPropertyMetadata createPropertyConfig(ModuleDetails moduleD
266266
String validationType = modulePropertyDetails.getValidationType();
267267
if (validationType != null) {
268268
if (TYPE_ID_PATTERN.equals(validationType)) {
269-
dataType = ConfigPropertyType.Regex;
269+
dataType = ConfigPropertyType.REGEX;
270270
} else if ("tokenSet".equals(validationType) || "tokenTypesSet".equals(validationType)) {
271-
dataType = ConfigPropertyType.MultiCheck;
271+
dataType = ConfigPropertyType.MULTI_CHECK;
272272
}
273273
} else {
274274
dataType = sPropertyTypeMap.get(propertyType);
275275
}
276276
} else {
277277
if (propertyType.endsWith("Option")) {
278-
dataType = ConfigPropertyType.SingleSelect;
278+
dataType = ConfigPropertyType.SINGLE_SELECT;
279279
} else {
280280
if (propertyType.endsWith("[]")) {
281-
dataType = ConfigPropertyType.StringArray;
281+
dataType = ConfigPropertyType.STRING_ARRAY;
282282
} else {
283-
dataType = ConfigPropertyType.String;
283+
dataType = ConfigPropertyType.STRING;
284284
}
285285
}
286286
}
287287
ConfigPropertyMetadata modifiedConfigPropertyMetadata = new ConfigPropertyMetadata(dataType,
288288
modulePropertyDetails.getName(), modulePropertyDetails.getDefaultValue(), null);
289289
modifiedConfigPropertyMetadata.setDescription(modulePropertyDetails.getDescription());
290290

291-
if (dataType == ConfigPropertyType.SingleSelect) {
291+
if (dataType == ConfigPropertyType.SINGLE_SELECT) {
292292
List<String> resultList = getEnumValues(propertyType);
293293
resultList.forEach(modifiedConfigPropertyMetadata.getPropertyEnumeration()::add);
294-
} else if (dataType == ConfigPropertyType.MultiCheck) {
294+
} else if (dataType == ConfigPropertyType.MULTI_CHECK) {
295295
String result = CheckUtil.getModifiableTokens(moduleDetails.getName());
296296
Collections.addAll(modifiedConfigPropertyMetadata.getPropertyEnumeration(), result.split(","));
297297
}
@@ -468,7 +468,7 @@ private static List<String> getEnumValues(String className) {
468468
* @return the default severity.
469469
*/
470470
public static Severity getDefaultSeverity() {
471-
return Severity.inherit;
471+
return Severity.INHERIT;
472472
}
473473

474474
/**
@@ -601,13 +601,13 @@ private static void loadRuleMetadata() {
601601
* Create mapping between {@code ModulePropertyDetails} datatype and {@code ConfigPropertyType}.
602602
*/
603603
private static void createPropertyTypeMapping() {
604-
sPropertyTypeMap.put("java.lang.String", ConfigPropertyType.String);
605-
sPropertyTypeMap.put("java.lang.String[]", ConfigPropertyType.StringArray);
606-
sPropertyTypeMap.put("boolean", ConfigPropertyType.Boolean);
607-
sPropertyTypeMap.put("int", ConfigPropertyType.Integer);
608-
sPropertyTypeMap.put(TYPE_ID_PATTERN, ConfigPropertyType.Regex);
609-
sPropertyTypeMap.put("java.util.regex.Pattern[]", ConfigPropertyType.StringArray);
610-
sPropertyTypeMap.put("File", ConfigPropertyType.File);
604+
sPropertyTypeMap.put("java.lang.String", ConfigPropertyType.STRING);
605+
sPropertyTypeMap.put("java.lang.String[]", ConfigPropertyType.STRING_ARRAY);
606+
sPropertyTypeMap.put("boolean", ConfigPropertyType.BOOLEAN);
607+
sPropertyTypeMap.put("int", ConfigPropertyType.INTEGER);
608+
sPropertyTypeMap.put(TYPE_ID_PATTERN, ConfigPropertyType.REGEX);
609+
sPropertyTypeMap.put("java.util.regex.Pattern[]", ConfigPropertyType.STRING_ARRAY);
610+
sPropertyTypeMap.put("File", ConfigPropertyType.FILE);
611611
}
612612

613613
/**
@@ -737,7 +737,7 @@ private static void processModules(Element groupElement, RuleGroupMetadata group
737737
String defaultSeverity = moduleEl.attributeValue(XMLTags.DEFAULT_SEVERITY_TAG);
738738
Severity severity = defaultSeverity == null || defaultSeverity.trim().length() == 0
739739
? getDefaultSeverity()
740-
: Severity.valueOf(defaultSeverity);
740+
: Severity.fromXmlValue(defaultSeverity);
741741

742742
String name = moduleEl.attributeValue(XMLTags.NAME_TAG).trim();
743743
name = localize(name, metadataBundle);
@@ -792,7 +792,7 @@ private static void processProperties(Element moduleElement, RuleMetadata module
792792
for (Element propertyEl : propertyElements) {
793793

794794
ConfigPropertyType type = ConfigPropertyType
795-
.valueOf(propertyEl.attributeValue(XMLTags.DATATYPE_TAG));
795+
.fromXmlValue(propertyEl.attributeValue(XMLTags.DATATYPE_TAG));
796796

797797
String name = propertyEl.attributeValue(XMLTags.NAME_TAG).trim();
798798
String defaultValue = propertyEl.attributeValue(XMLTags.DEFAULT_VALUE_TAG);

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -597,7 +597,7 @@ public void checkStateChanged(CheckStateChangedEvent event) {
597597
module.setSeverity(module.getMetaData().getDefaultSeverityLevel());
598598
}
599599
} else {
600-
module.setSeverity(Severity.ignore);
600+
module.setSeverity(Severity.IGNORE);
601601
}
602602
mIsDirty = true;
603603
mTableViewer.refresh(module, true);
@@ -781,12 +781,12 @@ private void refreshTableViewerState() {
781781
for (int i = 0; i < size; i++) {
782782
Module module = mModules.get(i);
783783
if (mConfigurable) {
784-
mTableViewer.setChecked(module, !Severity.ignore.equals(module.getSeverity())
784+
mTableViewer.setChecked(module, !Severity.IGNORE.equals(module.getSeverity())
785785
|| !module.getMetaData().hasSeverity());
786786
} else {
787-
mTableViewer.setChecked(module, !Severity.ignore.equals(module.getSeverity())
787+
mTableViewer.setChecked(module, !Severity.IGNORE.equals(module.getSeverity())
788788
|| !module.getMetaData().hasSeverity());
789-
mTableViewer.setGrayed(module, !Severity.ignore.equals(module.getSeverity()));
789+
mTableViewer.setGrayed(module, !Severity.IGNORE.equals(module.getSeverity()));
790790
}
791791
}
792792
}
@@ -962,7 +962,7 @@ public String getColumnText(Object element, int columnIndex) {
962962
text = module.getName() != null ? module.getName() : "";
963963
break;
964964
case 2:
965-
text = module.getSeverity() != null ? module.getSeverity().name() : "";
965+
text = module.getSeverity() != null ? module.getSeverity().toXmlValue() : "";
966966
break;
967967
case 3:
968968
text = module.getComment() != null ? module.getComment() : "";
@@ -978,7 +978,7 @@ public String getColumnText(Object element, int columnIndex) {
978978
@Override
979979
public Comparable<?> getComparableValue(Object element, int col) {
980980
if (col == 0 && element instanceof Module) {
981-
return Severity.ignore.equals(((Module) element).getSeverity()) ? Integer.valueOf(0)
981+
return Severity.IGNORE.equals(((Module) element).getSeverity()) ? Integer.valueOf(0)
982982
: Integer.valueOf(1);
983983
}
984984

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ private Composite createGeneralSection() {
149149
mSeverityCombo.setLabelProvider(new LabelProvider() {
150150
@Override
151151
public String getText(Object element) {
152-
return ((Severity) element).name();
152+
return ((Severity) element).toXmlValue();
153153
}
154154
});
155155
mSeverityCombo.getControl().setLayoutData(new GridData());

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -65,23 +65,23 @@ public static IConfigPropertyWidget createWidget(Composite parent, ConfigPropert
6565
private static IConfigPropertyWidget getWidgetForConfigPropertyType(Composite parent,
6666
ConfigProperty prop, ConfigPropertyType type) {
6767
switch (type) {
68-
case String:
68+
case STRING:
6969
return new ConfigPropertyWidgetString(parent, prop);
70-
case StringArray:
70+
case STRING_ARRAY:
7171
return new ConfigPropertyWidgetStringArray(parent, prop);
72-
case Integer:
72+
case INTEGER:
7373
return new ConfigPropertyWidgetInteger(parent, prop);
74-
case SingleSelect:
74+
case SINGLE_SELECT:
7575
return new ConfigPropertyWidgetSingleSelect(parent, prop);
76-
case Boolean:
76+
case BOOLEAN:
7777
return new ConfigPropertyWidgetBoolean(parent, prop);
78-
case MultiCheck:
78+
case MULTI_CHECK:
7979
return new ConfigPropertyWidgetMultiCheck(parent, prop);
80-
case Hidden:
80+
case HIDDEN:
8181
return new ConfigPropertyWidgetHidden(parent, prop);
82-
case File:
82+
case FILE:
8383
return new ConfigPropertyWidgetFile(parent, prop);
84-
case Regex:
84+
case REGEX:
8585
return new ConfigPropertyWidgetRegex(parent, prop);
8686
default:
8787
return new ConfigPropertyWidgetString(parent, prop);

0 commit comments

Comments
 (0)