diff --git a/ccm-core/src/com/arsdigita/globalization/AcceptField.java b/ccm-core/src/com/arsdigita/globalization/AcceptField.java index 64ebcc0e7..306d4ca84 100755 --- a/ccm-core/src/com/arsdigita/globalization/AcceptField.java +++ b/ccm-core/src/com/arsdigita/globalization/AcceptField.java @@ -24,9 +24,9 @@ package com.arsdigita.globalization; *
* * @version $Revision: #8 $ $Date: 2004/08/16 $ + * @version $Id: AcceptField.java 287 2005-02-22 00:29:02Z sskracic $ */ public class AcceptField implements Comparable { - public final static String versionId = "$Id: AcceptField.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; // default quality value protected final static int DEFAULT_Q_VALUE = 1; diff --git a/ccm-core/src/com/arsdigita/globalization/AcceptHeader.java b/ccm-core/src/com/arsdigita/globalization/AcceptHeader.java index 1c1368c1b..e6960f64f 100755 --- a/ccm-core/src/com/arsdigita/globalization/AcceptHeader.java +++ b/ccm-core/src/com/arsdigita/globalization/AcceptHeader.java @@ -27,9 +27,9 @@ import java.util.StringTokenizer; * * * @version $Revision: #8 $ $Date: 2004/08/16 $ + * @version $Id: AcceptHeader.java 287 2005-02-22 00:29:02Z sskracic $ */ public abstract class AcceptHeader { - public final static String versionId = "$Id: AcceptHeader.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; // as passed in by the client browser. protected String m_acceptHeader = ""; diff --git a/ccm-core/src/com/arsdigita/globalization/AcceptLanguage.java b/ccm-core/src/com/arsdigita/globalization/AcceptLanguage.java index 48881d68c..30e964928 100755 --- a/ccm-core/src/com/arsdigita/globalization/AcceptLanguage.java +++ b/ccm-core/src/com/arsdigita/globalization/AcceptLanguage.java @@ -27,9 +27,9 @@ import java.util.Locale; * * * @version $Revision: #8 $ $Date: 2004/08/16 $ + * @version $Id: AcceptLanguage.java 287 2005-02-22 00:29:02Z sskracic $ */ public class AcceptLanguage extends AcceptField { - public final static String versionId = "$Id: AcceptLanguage.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private String m_language = ""; private Locale m_locale = null; diff --git a/ccm-core/src/com/arsdigita/globalization/AcceptLanguageHeader.java b/ccm-core/src/com/arsdigita/globalization/AcceptLanguageHeader.java index c7d0dfad9..37c52d8d2 100755 --- a/ccm-core/src/com/arsdigita/globalization/AcceptLanguageHeader.java +++ b/ccm-core/src/com/arsdigita/globalization/AcceptLanguageHeader.java @@ -24,9 +24,9 @@ package com.arsdigita.globalization; * * * @version $Revision: #8 $ $Date: 2004/08/16 $ + * @version $Id: AcceptLanguageHeader.java 287 2005-02-22 00:29:02Z sskracic $ */ public class AcceptLanguageHeader extends AcceptHeader { - public final static String versionId = "$Id: AcceptLanguageHeader.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; /** *diff --git a/ccm-core/src/com/arsdigita/globalization/ApplicationLocaleProvider.java b/ccm-core/src/com/arsdigita/globalization/ApplicationLocaleProvider.java index 9e7ec690d..b9fbfecca 100755 --- a/ccm-core/src/com/arsdigita/globalization/ApplicationLocaleProvider.java +++ b/ccm-core/src/com/arsdigita/globalization/ApplicationLocaleProvider.java @@ -28,9 +28,9 @@ import java.util.Locale; *
* * @version $Revision: #8 $ $Date: 2004/08/16 $ + * @version $Id: ApplicationLocaleProvider.java 287 2005-02-22 00:29:02Z sskracic $ */ public class ApplicationLocaleProvider implements LocaleProvider { - public final static String versionId = "$Id: ApplicationLocaleProvider.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private RequestValue m_locale = new RequestValue(); diff --git a/ccm-core/src/com/arsdigita/globalization/Charset.java b/ccm-core/src/com/arsdigita/globalization/Charset.java index bf75a1157..cba06a850 100755 --- a/ccm-core/src/com/arsdigita/globalization/Charset.java +++ b/ccm-core/src/com/arsdigita/globalization/Charset.java @@ -34,9 +34,9 @@ import java.math.BigDecimal; * * @author Yon Feldman * @version $Revision: #11 $ $Date: 2004/08/16 $ + * @version $Id: Charset.java 287 2005-02-22 00:29:02Z sskracic $ */ public class Charset extends DomainObject { - public final static String versionId = "$Id: Charset.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public final static String BASE_DATA_OBJECT_TYPE = "com.arsdigita.globalization.Charset"; diff --git a/ccm-core/src/com/arsdigita/globalization/ClientLocaleProvider.java b/ccm-core/src/com/arsdigita/globalization/ClientLocaleProvider.java index 2fe244f32..12e855271 100755 --- a/ccm-core/src/com/arsdigita/globalization/ClientLocaleProvider.java +++ b/ccm-core/src/com/arsdigita/globalization/ClientLocaleProvider.java @@ -27,9 +27,9 @@ import java.util.ResourceBundle; * * * @version $Revision: #8 $ $Date: 2004/08/16 $ + * @version $Id: ClientLocaleProvider.java 287 2005-02-22 00:29:02Z sskracic $ */ public class ClientLocaleProvider implements LocaleProvider { - public final static String versionId = "$Id: ClientLocaleProvider.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private String m_targetBundle = ""; private String m_acceptLanguages = ""; diff --git a/ccm-core/src/com/arsdigita/globalization/GlobalizationException.java b/ccm-core/src/com/arsdigita/globalization/GlobalizationException.java index 75ad180ad..1758dc2d1 100755 --- a/ccm-core/src/com/arsdigita/globalization/GlobalizationException.java +++ b/ccm-core/src/com/arsdigita/globalization/GlobalizationException.java @@ -24,9 +24,9 @@ package com.arsdigita.globalization; * * * @version $Revision: #8 $ $Date: 2004/08/16 $ + * @version $Id: GlobalizationException.java 287 2005-02-22 00:29:02Z sskracic $ */ public class GlobalizationException extends java.lang.Exception { - public final static String versionId = "$Id: GlobalizationException.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; GlobalizationException() { super(); diff --git a/ccm-core/src/com/arsdigita/globalization/Globalized.java b/ccm-core/src/com/arsdigita/globalization/Globalized.java index 4cc8bc250..36cf879d4 100755 --- a/ccm-core/src/com/arsdigita/globalization/Globalized.java +++ b/ccm-core/src/com/arsdigita/globalization/Globalized.java @@ -38,9 +38,9 @@ import java.text.DateFormat; * * * @version $Revision: #9 $ $Date: 2004/08/16 $ + * @version $Id: Globalized.java 287 2005-02-22 00:29:02Z sskracic $ */ public interface Globalized { - public final static String versionId = "$Id: Globalized.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; /** * The default format for displaying dates. diff --git a/ccm-core/src/com/arsdigita/globalization/GlobalizedMessage.java b/ccm-core/src/com/arsdigita/globalization/GlobalizedMessage.java index de10ed0e2..25896ba29 100755 --- a/ccm-core/src/com/arsdigita/globalization/GlobalizedMessage.java +++ b/ccm-core/src/com/arsdigita/globalization/GlobalizedMessage.java @@ -127,6 +127,10 @@ public class GlobalizedMessage { return m_key; } + /** + * + * @param key + */ private void setKey(String key) { if (key == null || key.length() == 0) { throw new IllegalArgumentException("key cannot be empty."); diff --git a/ccm-core/src/com/arsdigita/globalization/Initializer.java b/ccm-core/src/com/arsdigita/globalization/Initializer.java index 053986dc8..10ddc4aaf 100755 --- a/ccm-core/src/com/arsdigita/globalization/Initializer.java +++ b/ccm-core/src/com/arsdigita/globalization/Initializer.java @@ -37,6 +37,8 @@ import org.apache.log4j.Logger; /** * Initialize the Globalization package * + * Old initializer system. Needs LegacyInitializer as glue to invoke. + * * @version $Revision: #15 $ $Date: 2004/08/16 $ */ public class Initializer implements com.arsdigita.initializer.Initializer { diff --git a/ccm-core/src/com/arsdigita/globalization/Locale.java b/ccm-core/src/com/arsdigita/globalization/Locale.java index 34966456c..b18893eb3 100755 --- a/ccm-core/src/com/arsdigita/globalization/Locale.java +++ b/ccm-core/src/com/arsdigita/globalization/Locale.java @@ -37,9 +37,9 @@ import org.apache.log4j.Logger; * * @author Yon Feldman * @version $Revision: #12 $ $Date: 2004/08/16 $ + * @version $Id: Locale.java 287 2005-02-22 00:29:02Z sskracic $ */ public class Locale extends DomainObject { - public final static String versionId = "$Id: Locale.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_cat = Logger.getLogger(Locale.class.getName()); diff --git a/ccm-core/src/com/arsdigita/globalization/LocaleProvider.java b/ccm-core/src/com/arsdigita/globalization/LocaleProvider.java index 771db1ceb..663bb79e3 100755 --- a/ccm-core/src/com/arsdigita/globalization/LocaleProvider.java +++ b/ccm-core/src/com/arsdigita/globalization/LocaleProvider.java @@ -30,9 +30,9 @@ import java.util.Locale; * * * @version $Revision: #8 $ $Date: 2004/08/16 $ + * @version $Id: LocaleProvider.java 287 2005-02-22 00:29:02Z sskracic $ */ public interface LocaleProvider { - public final static String versionId = "$Id: LocaleProvider.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; /** *diff --git a/ccm-core/src/com/arsdigita/globalization/MessageCatalog.java b/ccm-core/src/com/arsdigita/globalization/MessageCatalog.java index a3c85c4b5..df942a14e 100755 --- a/ccm-core/src/com/arsdigita/globalization/MessageCatalog.java +++ b/ccm-core/src/com/arsdigita/globalization/MessageCatalog.java @@ -50,10 +50,10 @@ import org.apache.log4j.Logger; *
* * @version $Revision: #14 $ $Date: 2004/08/16 $ + * @version $Id: MessageCatalog.java 287 2005-02-22 00:29:02Z sskracic $ */ public class MessageCatalog extends DomainObject implements java.io.Serializable { - public final static String versionId = "$Id: MessageCatalog.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_cat = Logger.getLogger(MessageCatalog.class.getName()); diff --git a/ccm-core/src/com/arsdigita/globalization/MixedResourceBundle.java b/ccm-core/src/com/arsdigita/globalization/MixedResourceBundle.java index b092ebb3f..0c843d027 100755 --- a/ccm-core/src/com/arsdigita/globalization/MixedResourceBundle.java +++ b/ccm-core/src/com/arsdigita/globalization/MixedResourceBundle.java @@ -49,9 +49,9 @@ import org.apache.log4j.Logger; * * * @version $Revision: #10 $ $Date: 2004/08/16 $ + * @version $Id: MixedResourceBundle.java 287 2005-02-22 00:29:02Z sskracic $ */ public abstract class MixedResourceBundle extends java.util.ResourceBundle { - public final static String versionId = "$Id: MixedResourceBundle.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_cat = Logger.getLogger(MixedResourceBundle.class.getName()); diff --git a/ccm-core/src/com/arsdigita/globalization/SystemLocaleProvider.java b/ccm-core/src/com/arsdigita/globalization/SystemLocaleProvider.java index ef6f16ced..be6a93020 100755 --- a/ccm-core/src/com/arsdigita/globalization/SystemLocaleProvider.java +++ b/ccm-core/src/com/arsdigita/globalization/SystemLocaleProvider.java @@ -26,9 +26,9 @@ import java.util.Locale; * * * @version $Revision: #8 $ $Date: 2004/08/16 $ + * @version $Id: SystemLocaleProvider.java 287 2005-02-22 00:29:02Z sskracic $ */ public class SystemLocaleProvider implements LocaleProvider { - public final static String versionId = "$Id: SystemLocaleProvider.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public Locale getLocale() { return Locale.getDefault(); diff --git a/ccm-core/src/com/arsdigita/globalization/package.html b/ccm-core/src/com/arsdigita/globalization/package.html index d8b458256..c7d1abf47 100755 --- a/ccm-core/src/com/arsdigita/globalization/package.html +++ b/ccm-core/src/com/arsdigita/globalization/package.html @@ -3,7 +3,7 @@