From 78d551fa5d2ac824e11bec236cdddc8ce3445efc Mon Sep 17 00:00:00 2001 From: Yoshito Umaoka Date: Wed, 29 Feb 2012 17:22:09 +0000 Subject: [PATCH] ICU-9138 Fix svn properties X-SVN-Rev: 31542 --- .gitattributes | 9 -- .../src/com/ibm/icu/text/MessagePattern.java | 82 +++++++++---------- 2 files changed, 41 insertions(+), 50 deletions(-) diff --git a/.gitattributes b/.gitattributes index f7c24042e7..40162f2b18 100644 --- a/.gitattributes +++ b/.gitattributes @@ -225,7 +225,6 @@ icu4j/eclipse-build/plugins.template/com.ibm.icu.base/.settings/org.eclipse.jdt. icu4j/eclipse-build/plugins.template/com.ibm.icu.base/META-INF/MANIFEST.MF -text icu4j/eclipse-build/plugins.template/com.ibm.icu.base/build.properties -text icu4j/eclipse-build/plugins.template/com.ibm.icu.base/plugin.properties -text -icu4j/eclipse-build/plugins.template/com.ibm.icu.base/src/com/ibm/icu/text/MessagePattern.java -text icu4j/eclipse-build/plugins.template/com.ibm.icu.tests/META-INF/MANIFEST.MF -text icu4j/eclipse-build/plugins.template/com.ibm.icu.tests/plugin.properties -text icu4j/eclipse-build/plugins.template/com.ibm.icu/META-INF/MANIFEST.MF -text @@ -245,11 +244,6 @@ icu4j/main/classes/core/.project -text icu4j/main/classes/core/.settings/org.eclipse.core.resources.prefs -text icu4j/main/classes/core/.settings/org.eclipse.jdt.core.prefs -text icu4j/main/classes/core/manifest.stub -text -icu4j/main/classes/core/src/com/ibm/icu/text/CompactDecimalFormat.java -text -icu4j/main/classes/core/src/com/ibm/icu/text/CompactDecimalFormatData.java -text -icu4j/main/classes/core/src/com/ibm/icu/util/GenderInfo.java -text -icu4j/main/classes/core/src/com/ibm/icu/util/ListFormat.java -text -icu4j/main/classes/core/src/com/ibm/icu/util/ListFormatData.java -text icu4j/main/classes/currdata/.externalToolBuilders/copy-data-currdata.launch -text icu4j/main/classes/currdata/.settings/org.eclipse.core.resources.prefs -text icu4j/main/classes/currdata/.settings/org.eclipse.jdt.core.prefs -text @@ -309,7 +303,6 @@ icu4j/main/tests/core/manifest.stub -text icu4j/main/tests/core/src/com/ibm/icu/dev/data/rbbi/english.dict -text icu4j/main/tests/core/src/com/ibm/icu/dev/data/resources/testmessages.properties -text icu4j/main/tests/core/src/com/ibm/icu/dev/data/thai6.ucs -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/CompactDecimalFormatTest.java -text icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_3.6/com.ibm.icu.impl.OlsonTimeZone.dat -text icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_3.6/com.ibm.icu.impl.TimeZoneAdapter.dat -text icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_3.6/com.ibm.icu.math.BigDecimal.dat -text @@ -680,8 +673,6 @@ icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_4.8/com.ibm icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_4.8/com.ibm.icu.util.ULocale.dat -text icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_4.8/com.ibm.icu.util.UResourceTypeMismatchException.dat -text icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_4.8/com.ibm.icu.util.VTimeZone.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/GenderInfoTest.java -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/ListFormatTest.java -text icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/Trie2Test.setRanges1.16.tri2 -text icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/Trie2Test.setRanges1.32.tri2 -text icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/Trie2Test.setRanges2.16.tri2 -text diff --git a/icu4j/eclipse-build/plugins.template/com.ibm.icu.base/src/com/ibm/icu/text/MessagePattern.java b/icu4j/eclipse-build/plugins.template/com.ibm.icu.base/src/com/ibm/icu/text/MessagePattern.java index 88c8c8b4d8..095f383692 100644 --- a/icu4j/eclipse-build/plugins.template/com.ibm.icu.base/src/com/ibm/icu/text/MessagePattern.java +++ b/icu4j/eclipse-build/plugins.template/com.ibm.icu.base/src/com/ibm/icu/text/MessagePattern.java @@ -1,41 +1,41 @@ -/* - ******************************************************************************* - * Copyright (C) 1996-2012, International Business Machines Corporation and * - * others. All Rights Reserved. * - ******************************************************************************* - */ - -package com.ibm.icu.text; - -/* - * Empty stub - */ -public class MessagePattern { - private MessagePattern() {} - - public enum ApostropheMode { - /** - * A literal apostrophe is represented by - * either a single or a double apostrophe pattern character. - * Within a MessageFormat pattern, a single apostrophe only starts quoted literal text - * if it immediately precedes a curly brace {}, - * or a pipe symbol | if inside a choice format, - * or a pound symbol # if inside a plural format. - *

- * This is the default behavior starting with ICU 4.8. - * @draft ICU 4.8 - * @provisional This API might change or be removed in a future release. - */ - DOUBLE_OPTIONAL, - /** - * A literal apostrophe must be represented by - * a double apostrophe pattern character. - * A single apostrophe always starts quoted literal text. - *

- * This is the behavior of ICU 4.6 and earlier, and of the JDK. - * @draft ICU 4.8 - * @provisional This API might change or be removed in a future release. - */ - DOUBLE_REQUIRED - } -} +/* + ******************************************************************************* + * Copyright (C) 1996-2012, International Business Machines Corporation and * + * others. All Rights Reserved. * + ******************************************************************************* + */ + +package com.ibm.icu.text; + +/* + * Empty stub + */ +public class MessagePattern { + private MessagePattern() {} + + public enum ApostropheMode { + /** + * A literal apostrophe is represented by + * either a single or a double apostrophe pattern character. + * Within a MessageFormat pattern, a single apostrophe only starts quoted literal text + * if it immediately precedes a curly brace {}, + * or a pipe symbol | if inside a choice format, + * or a pound symbol # if inside a plural format. + *

+ * This is the default behavior starting with ICU 4.8. + * @draft ICU 4.8 + * @provisional This API might change or be removed in a future release. + */ + DOUBLE_OPTIONAL, + /** + * A literal apostrophe must be represented by + * a double apostrophe pattern character. + * A single apostrophe always starts quoted literal text. + *

+ * This is the behavior of ICU 4.6 and earlier, and of the JDK. + * @draft ICU 4.8 + * @provisional This API might change or be removed in a future release. + */ + DOUBLE_REQUIRED + } +}