From 8db13bb44541a87ad424b444a44561338e01ec3b Mon Sep 17 00:00:00 2001 From: Arjen Poutsma Date: Wed, 5 Aug 2009 11:51:13 +0000 Subject: [PATCH] Deprecated org.springframework.enums --- .../core/enums/AbstractCachingLabeledEnumResolver.java | 2 ++ .../core/enums/AbstractGenericLabeledEnum.java | 3 ++- .../org/springframework/core/enums/AbstractLabeledEnum.java | 4 +++- .../main/java/org/springframework/core/enums/LabeledEnum.java | 4 +++- .../org/springframework/core/enums/LabeledEnumResolver.java | 4 +++- .../springframework/core/enums/LetterCodedLabeledEnum.java | 4 +++- .../org/springframework/core/enums/ShortCodedLabeledEnum.java | 4 +++- .../org/springframework/core/enums/StaticLabeledEnum.java | 4 +++- .../springframework/core/enums/StaticLabeledEnumResolver.java | 4 +++- .../springframework/core/enums/StringCodedLabeledEnum.java | 4 +++- 10 files changed, 28 insertions(+), 9 deletions(-) diff --git a/org.springframework.core/src/main/java/org/springframework/core/enums/AbstractCachingLabeledEnumResolver.java b/org.springframework.core/src/main/java/org/springframework/core/enums/AbstractCachingLabeledEnumResolver.java index c3e73945558..798dacc8004 100644 --- a/org.springframework.core/src/main/java/org/springframework/core/enums/AbstractCachingLabeledEnumResolver.java +++ b/org.springframework.core/src/main/java/org/springframework/core/enums/AbstractCachingLabeledEnumResolver.java @@ -40,7 +40,9 @@ import org.springframework.util.ClassUtils; * @author Juergen Hoeller * @since 1.2.2 * @see #findLabeledEnums(Class) + * @deprecated as of Spring 3.0, in favor of Java 5 enums. */ +@Deprecated public abstract class AbstractCachingLabeledEnumResolver implements LabeledEnumResolver { protected transient final Log logger = LogFactory.getLog(getClass()); diff --git a/org.springframework.core/src/main/java/org/springframework/core/enums/AbstractGenericLabeledEnum.java b/org.springframework.core/src/main/java/org/springframework/core/enums/AbstractGenericLabeledEnum.java index 9cf452b02da..41611b285a2 100644 --- a/org.springframework.core/src/main/java/org/springframework/core/enums/AbstractGenericLabeledEnum.java +++ b/org.springframework.core/src/main/java/org/springframework/core/enums/AbstractGenericLabeledEnum.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2009 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,6 +21,7 @@ package org.springframework.core.enums; * * @author Keith Donald * @since 1.2.6 + * @deprecated as of Spring 3.0, in favor of Java 5 enums. */ public abstract class AbstractGenericLabeledEnum extends AbstractLabeledEnum { diff --git a/org.springframework.core/src/main/java/org/springframework/core/enums/AbstractLabeledEnum.java b/org.springframework.core/src/main/java/org/springframework/core/enums/AbstractLabeledEnum.java index d55a483a7b5..8f04acd89fb 100644 --- a/org.springframework.core/src/main/java/org/springframework/core/enums/AbstractLabeledEnum.java +++ b/org.springframework.core/src/main/java/org/springframework/core/enums/AbstractLabeledEnum.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2009 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,7 +23,9 @@ package org.springframework.core.enums; * @author Juergen Hoeller * @author Sam Brannen * @since 1.2.2 + * @deprecated as of Spring 3.0, in favor of Java 5 enums. */ +@Deprecated public abstract class AbstractLabeledEnum implements LabeledEnum { /** diff --git a/org.springframework.core/src/main/java/org/springframework/core/enums/LabeledEnum.java b/org.springframework.core/src/main/java/org/springframework/core/enums/LabeledEnum.java index a84cf9c75bc..d2aa701b91b 100644 --- a/org.springframework.core/src/main/java/org/springframework/core/enums/LabeledEnum.java +++ b/org.springframework.core/src/main/java/org/springframework/core/enums/LabeledEnum.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2009 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -39,7 +39,9 @@ import org.springframework.util.comparator.NullSafeComparator; * * @author Keith Donald * @since 1.2.2 + * @deprecated as of Spring 3.0, in favor of Java 5 enums. */ +@Deprecated public interface LabeledEnum extends Comparable, Serializable { /** diff --git a/org.springframework.core/src/main/java/org/springframework/core/enums/LabeledEnumResolver.java b/org.springframework.core/src/main/java/org/springframework/core/enums/LabeledEnumResolver.java index 7a6ad90f556..9fb83e5d128 100644 --- a/org.springframework.core/src/main/java/org/springframework/core/enums/LabeledEnumResolver.java +++ b/org.springframework.core/src/main/java/org/springframework/core/enums/LabeledEnumResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2009 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,7 +25,9 @@ import java.util.Set; * @author Keith Donald * @author Juergen Hoeller * @since 1.2.2 + * @deprecated as of Spring 3.0, in favor of Java 5 enums. */ +@Deprecated public interface LabeledEnumResolver { /** diff --git a/org.springframework.core/src/main/java/org/springframework/core/enums/LetterCodedLabeledEnum.java b/org.springframework.core/src/main/java/org/springframework/core/enums/LetterCodedLabeledEnum.java index 88a0bf327b3..b8bd13a49af 100644 --- a/org.springframework.core/src/main/java/org/springframework/core/enums/LetterCodedLabeledEnum.java +++ b/org.springframework.core/src/main/java/org/springframework/core/enums/LetterCodedLabeledEnum.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2009 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,7 +27,9 @@ import org.springframework.util.Assert; * * @author Keith Donald * @since 1.2.2 + * @deprecated as of Spring 3.0, in favor of Java 5 enums. */ +@Deprecated public class LetterCodedLabeledEnum extends AbstractGenericLabeledEnum { /** diff --git a/org.springframework.core/src/main/java/org/springframework/core/enums/ShortCodedLabeledEnum.java b/org.springframework.core/src/main/java/org/springframework/core/enums/ShortCodedLabeledEnum.java index 7db41f4f3d9..b3a129d99f2 100644 --- a/org.springframework.core/src/main/java/org/springframework/core/enums/ShortCodedLabeledEnum.java +++ b/org.springframework.core/src/main/java/org/springframework/core/enums/ShortCodedLabeledEnum.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2009 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,7 +25,9 @@ package org.springframework.core.enums; * * @author Keith Donald * @since 1.2.2 + * @deprecated as of Spring 3.0, in favor of Java 5 enums. */ +@Deprecated public class ShortCodedLabeledEnum extends AbstractGenericLabeledEnum { /** diff --git a/org.springframework.core/src/main/java/org/springframework/core/enums/StaticLabeledEnum.java b/org.springframework.core/src/main/java/org/springframework/core/enums/StaticLabeledEnum.java index 95ef43b8680..0c167cf49b6 100644 --- a/org.springframework.core/src/main/java/org/springframework/core/enums/StaticLabeledEnum.java +++ b/org.springframework.core/src/main/java/org/springframework/core/enums/StaticLabeledEnum.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2009 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -41,7 +41,9 @@ package org.springframework.core.enums; * * @author Keith Donald * @since 1.2.6 + * @deprecated as of Spring 3.0, in favor of Java 5 enums. */ +@Deprecated public abstract class StaticLabeledEnum extends AbstractLabeledEnum { /** diff --git a/org.springframework.core/src/main/java/org/springframework/core/enums/StaticLabeledEnumResolver.java b/org.springframework.core/src/main/java/org/springframework/core/enums/StaticLabeledEnumResolver.java index eb8d2840aef..c71db32bc37 100644 --- a/org.springframework.core/src/main/java/org/springframework/core/enums/StaticLabeledEnumResolver.java +++ b/org.springframework.core/src/main/java/org/springframework/core/enums/StaticLabeledEnumResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2009 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,7 +31,9 @@ import org.springframework.util.Assert; * @author Keith Donald * @author Juergen Hoeller * @since 1.2.2 + * @deprecated as of Spring 3.0, in favor of Java 5 enums. */ +@Deprecated public class StaticLabeledEnumResolver extends AbstractCachingLabeledEnumResolver { /** diff --git a/org.springframework.core/src/main/java/org/springframework/core/enums/StringCodedLabeledEnum.java b/org.springframework.core/src/main/java/org/springframework/core/enums/StringCodedLabeledEnum.java index ffa9956f50e..9fa24e0cbd4 100644 --- a/org.springframework.core/src/main/java/org/springframework/core/enums/StringCodedLabeledEnum.java +++ b/org.springframework.core/src/main/java/org/springframework/core/enums/StringCodedLabeledEnum.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2009 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,7 +29,9 @@ import org.springframework.util.Assert; * @author Juergen Hoeller * @since 1.2.2 * @see org.springframework.core.enums.LabeledEnumResolver#getLabeledEnumSet(Class) + * @deprecated as of Spring 3.0, in favor of Java 5 enums. */ +@Deprecated public class StringCodedLabeledEnum extends AbstractGenericLabeledEnum { /**