Spring/spring-webflow
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SWF-1250 Replace extensions of deprecated LabeledEnum with Java 5 enum instead of having a StringToLabeledEnumConverter registered with the ConversionService

Browse Source
This commit is contained in:
Rossen Stoyanchev
2010-06-09 15:39:25 +00:00
parent 3d6d1d1566
commit fa0c1f4222
13 changed files with 57 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-binding/.settings/org.eclipse.jdt.core.prefs
View File

@@ -1,4 +1,4 @@
#Fri Feb 13 15:52:19 EST 2009
#Wed Jun 09 09:16:13 BST 2010
eclipse.preferences.version=1
org.eclipse.jdt.core.codeComplete.argumentPrefixes=
org.eclipse.jdt.core.codeComplete.argumentSuffixes=
@@ -9,22 +9,22 @@ org.eclipse.jdt.core.codeComplete.localSuffixes=
org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.4
org.eclipse.jdt.core.compiler.compliance=1.5
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.doc.comment.support=enabled
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
org.eclipse.jdt.core.compiler.problem.deprecation=warning
org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
@@ -79,7 +79,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=di
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.source=1.3
org.eclipse.jdt.core.compiler.source=1.5
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

2
spring-binding/src/main/java/org/springframework/binding/convert/service/DefaultConversionService.java
View File

@@ -21,7 +21,6 @@ import java.util.Date;
import java.util.Locale;
import org.springframework.core.convert.ConversionService;
import org.springframework.core.enums.LabeledEnum;
/**
* Default, local implementation of a conversion service. Will automatically register <i>from string</i> converters for
@@ -75,7 +74,6 @@ public class DefaultConversionService extends GenericConversionService {
addAlias("bigDecimal", BigDecimal.class);
addAlias("locale", Locale.class);
addAlias("date", Date.class);
addAlias("labeledEnum", LabeledEnum.class);
}
}

15
spring-binding/src/main/java/org/springframework/binding/message/Severity.java
View File

@@ -15,8 +15,6 @@
*/
package org.springframework.binding.message;
import org.springframework.core.enums.StaticLabeledEnum;
/**
* Enum exposing supported message severities.
*
@@ -24,30 +22,27 @@ import org.springframework.core.enums.StaticLabeledEnum;
* @author Jeremy Grelle
* @see Message
*/
public class Severity extends StaticLabeledEnum {
public enum Severity {
/**
* The "Informational" severity. Used to indicate a successful operation or result.
*/
public static final Severity INFO = new Severity(0, "Info");
INFO,
/**
* The "Warning" severity. Used to indicate there is a minor problem, or to inform the message receiver of possible
* misuse, or to indicate a problem may arise in the future.
*/
public static final Severity WARNING = new Severity(1, "Warning");
WARNING,
/**
* The "Error" severity. Used to indicate a significant problem like a business rule violation.
*/
public static final Severity ERROR = new Severity(2, "Error");
ERROR,
/**
* The "Fatal" severity. Used to indicate a fatal problem like a system error.
*/
public static final Severity FATAL = new Severity(3, "Fatal");
FATAL
private Severity(int code, String label) {
super(code, label);
}
}