A while ago I moved the gnu.regexp stuff to gnu.java.util.regex.
However, I forgot to do this for the properties files too. Here they
come now.
2006-07-19 Roman Kennke <[EMAIL PROTECTED]>
* resource/gnu/regexp/MessagesBundle.properties,
* resource/gnu/regexp/MessagesBundle_fr.properties,
* resource/gnu/regexp/MessagesBundle_it.properties:
Moved to resource/gnu/java/util/regex.
* resource/gnu/java/util/regex/MessagesBundle.properties,
* resource/gnu/java/util/regex/MessagesBundle_fr.properties,
* resource/gnu/java/util/regex/MessagesBundle_it.properties:
New files.
* gnu/java/util/regex/RE.java
Use new resource bundle location.
/Roman
Index: gnu/java/util/regex/RE.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/util/regex/RE.java,v
retrieving revision 1.1
diff -u -1 -2 -r1.1 RE.java
--- gnu/java/util/regex/RE.java 7 Jun 2006 19:30:06 -0000 1.1
+++ gnu/java/util/regex/RE.java 19 Jul 2006 19:44:25 -0000
@@ -121,25 +121,25 @@
public int first, second;
}
private static final class CharUnit implements Serializable {
public char ch;
public boolean bk;
}
// This String will be returned by getVersion()
private static final String VERSION = "1.1.5-dev";
// The localized strings are kept in a separate file
- private static ResourceBundle messages = PropertyResourceBundle.getBundle("gnu/regexp/MessagesBundle", Locale.getDefault());
+ private static ResourceBundle messages = PropertyResourceBundle.getBundle("gnu/java/util/regex/MessagesBundle", Locale.getDefault());
// These are, respectively, the first and last tokens in our linked list
// If there is only one token, firstToken == lastToken
private REToken firstToken, lastToken;
// This is the number of subexpressions in this regular expression,
// with a minimum value of zero. Returned by getNumSubs()
private int numSubs;
/** Minimum length, in characters, of any possible match. */
private int minimumLength;
private int maximumLength;
Index: resource/gnu/java/util/regex/MessagesBundle.properties
===================================================================
RCS file: resource/gnu/java/util/regex/MessagesBundle.properties
diff -N resource/gnu/java/util/regex/MessagesBundle.properties
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ resource/gnu/java/util/regex/MessagesBundle.properties 19 Jul 2006 19:44:25 -0000
@@ -0,0 +1,22 @@
+# Localized error messages for gnu.regexp
+
+# Prefix for REException messages
+error.prefix=At position {0} in regular expression pattern:
+
+# REException (parse error) messages
+repeat.assertion=repeated token is zero-width assertion
+repeat.chained=attempted to repeat a token that is already repeated
+repeat.no.token=quantifier (?*+{}) without preceding token
+repeat.empty.token=repeated token may be empty
+unmatched.brace=unmatched brace
+unmatched.bracket=unmatched bracket
+unmatched.paren=unmatched parenthesis
+interval.no.end=unexpected end of interval
+class.no.end=unexpected end of character class
+subexpr.no.end=unexpected end of subexpression
+interval.order=an interval''s minimum is greater than its maximum
+interval.error=an interval is empty * or contains illegal characters
+ends.with.backslash=backslash at end of pattern
+
+# RESyntax message
+syntax.final=Syntax has been declared final and cannot be modified
Index: resource/gnu/java/util/regex/MessagesBundle_fr.properties
===================================================================
RCS file: resource/gnu/java/util/regex/MessagesBundle_fr.properties
diff -N resource/gnu/java/util/regex/MessagesBundle_fr.properties
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ resource/gnu/java/util/regex/MessagesBundle_fr.properties 19 Jul 2006 19:44:25 -0000
@@ -0,0 +1,22 @@
+# Localized error messages for gnu.regexp
+
+# Prefix for REException messages
+error.prefix=A l''index {0} dans le modèle d''expression régulière:
+
+# REException (parse error) messages
+repeat.assertion=l''élément répété est de largeur zéro
+repeat.chained=tentative de répétition d''un élément déjà répété
+repeat.no.token=quantifieur (?*+{}) sans élément précédent
+repeat.empty.token=l''élément répété peut être vide
+unmatched.brace=accolade inégalée
+unmatched.bracket=crochet inégalé
+unmatched.paren=parenthèse inégalée
+interval.no.end=fin d''interval non attendue
+class.no.end=fin de classe de caractères non attendue
+subexpr.no.end=fin de sous-expression non attendue
+interval.order=l''interval minimum est supérieur à l''interval maximum
+interval.error=l''interval est vide ou contient des caractères illégaux
+ends.with.backslash=antislash à la fin du modèle
+
+# RESyntax message
+syntax.final=La syntaxe a été déclarée finale et ne peut pas être modifiée
Index: resource/gnu/java/util/regex/MessagesBundle_it.properties
===================================================================
RCS file: resource/gnu/java/util/regex/MessagesBundle_it.properties
diff -N resource/gnu/java/util/regex/MessagesBundle_it.properties
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ resource/gnu/java/util/regex/MessagesBundle_it.properties 19 Jul 2006 19:44:25 -0000
@@ -0,0 +1,31 @@
+# Localized error messages for gnu.regexp, in Italian.
+# $Id: MessagesBundle_it.properties,v 1.1 2004/06/04 21:13:58 saugart Exp $
+# Messaggi italiani per gnu.regexp.
+#
+# Attenzione: Questa traduzione fu scritto da un italo-americano.
+# Per favore correggete l'italiano bestemmiato e mandate i patch
+# al listo <classpath at gnu dot org>.
+#
+# @author Steven Augart <steve at watson dot ibm dot com>, <steve at augart dot com>
+
+# Prefix for REException messages
+error.prefix=Al indice {0} nel modello dell''espressione regulare:
+
+# REException (parse error) messages
+repeat.assertion=l''elemento ripetuto ha larghezza zero
+repeat.chained=prova di ripetere un elemento già ripetuto
+repeat.no.token=quantificatore (?*+{}) senza elemento precedente
+repeat.empty.token=l''elemento ripetuto può essere vuoto
+unmatched.brace=parentesi quadra senza corrispondente
+unmatched.bracket=graffa senza corrispondente
+unmatched.paren=parentesi senza corrispondente
+interval.no.end=la fine d''intervallo è imprevista
+class.no.end=la fine della classe di caratteri è imprevista
+subexpr.no.end=la fine del sub-espressione è imprevista
+interval.order=il valore minimo d''intervallo è piú grande del suo valore massimo
+interval.error=l''intervallo è vuoto o contiene caratteri impermessibili
+# Non so come si dice "backslash" in italiano.
+ends.with.backslash=il modello finisce con un backslash (il carattere "\")
+
+# RESyntax message
+syntax.final=La sintassi è dichiarata "final" (finale) e non si può modificarla
Index: resource/gnu/regexp/MessagesBundle.properties
===================================================================
RCS file: resource/gnu/regexp/MessagesBundle.properties
diff -N resource/gnu/regexp/MessagesBundle.properties
--- resource/gnu/regexp/MessagesBundle.properties 4 Jun 2004 21:13:58 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-# Localized error messages for gnu.regexp
-
-# Prefix for REException messages
-error.prefix=At position {0} in regular expression pattern:
-
-# REException (parse error) messages
-repeat.assertion=repeated token is zero-width assertion
-repeat.chained=attempted to repeat a token that is already repeated
-repeat.no.token=quantifier (?*+{}) without preceding token
-repeat.empty.token=repeated token may be empty
-unmatched.brace=unmatched brace
-unmatched.bracket=unmatched bracket
-unmatched.paren=unmatched parenthesis
-interval.no.end=unexpected end of interval
-class.no.end=unexpected end of character class
-subexpr.no.end=unexpected end of subexpression
-interval.order=an interval''s minimum is greater than its maximum
-interval.error=an interval is empty * or contains illegal characters
-ends.with.backslash=backslash at end of pattern
-
-# RESyntax message
-syntax.final=Syntax has been declared final and cannot be modified
Index: resource/gnu/regexp/MessagesBundle_fr.properties
===================================================================
RCS file: resource/gnu/regexp/MessagesBundle_fr.properties
diff -N resource/gnu/regexp/MessagesBundle_fr.properties
--- resource/gnu/regexp/MessagesBundle_fr.properties 4 Jun 2004 21:13:58 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-# Localized error messages for gnu.regexp
-
-# Prefix for REException messages
-error.prefix=A l''index {0} dans le modèle d''expression régulière:
-
-# REException (parse error) messages
-repeat.assertion=l''élément répété est de largeur zéro
-repeat.chained=tentative de répétition d''un élément déjà répété
-repeat.no.token=quantifieur (?*+{}) sans élément précédent
-repeat.empty.token=l''élément répété peut être vide
-unmatched.brace=accolade inégalée
-unmatched.bracket=crochet inégalé
-unmatched.paren=parenthèse inégalée
-interval.no.end=fin d''interval non attendue
-class.no.end=fin de classe de caractères non attendue
-subexpr.no.end=fin de sous-expression non attendue
-interval.order=l''interval minimum est supérieur à l''interval maximum
-interval.error=l''interval est vide ou contient des caractères illégaux
-ends.with.backslash=antislash à la fin du modèle
-
-# RESyntax message
-syntax.final=La syntaxe a été déclarée finale et ne peut pas être modifiée
Index: resource/gnu/regexp/MessagesBundle_it.properties
===================================================================
RCS file: resource/gnu/regexp/MessagesBundle_it.properties
diff -N resource/gnu/regexp/MessagesBundle_it.properties
--- resource/gnu/regexp/MessagesBundle_it.properties 4 Jun 2004 21:13:58 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,31 +0,0 @@
-# Localized error messages for gnu.regexp, in Italian.
-# $Id: MessagesBundle_it.properties,v 1.1 2004/06/04 21:13:58 saugart Exp $
-# Messaggi italiani per gnu.regexp.
-#
-# Attenzione: Questa traduzione fu scritto da un italo-americano.
-# Per favore correggete l'italiano bestemmiato e mandate i patch
-# al listo <classpath at gnu dot org>.
-#
-# @author Steven Augart <steve at watson dot ibm dot com>, <steve at augart dot com>
-
-# Prefix for REException messages
-error.prefix=Al indice {0} nel modello dell''espressione regulare:
-
-# REException (parse error) messages
-repeat.assertion=l''elemento ripetuto ha larghezza zero
-repeat.chained=prova di ripetere un elemento già ripetuto
-repeat.no.token=quantificatore (?*+{}) senza elemento precedente
-repeat.empty.token=l''elemento ripetuto può essere vuoto
-unmatched.brace=parentesi quadra senza corrispondente
-unmatched.bracket=graffa senza corrispondente
-unmatched.paren=parentesi senza corrispondente
-interval.no.end=la fine d''intervallo è imprevista
-class.no.end=la fine della classe di caratteri è imprevista
-subexpr.no.end=la fine del sub-espressione è imprevista
-interval.order=il valore minimo d''intervallo è piú grande del suo valore massimo
-interval.error=l''intervallo è vuoto o contiene caratteri impermessibili
-# Non so come si dice "backslash" in italiano.
-ends.with.backslash=il modello finisce con un backslash (il carattere "\")
-
-# RESyntax message
-syntax.final=La sintassi è dichiarata "final" (finale) e non si può modificarla
