harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mloe...@apache.org
Subject svn commit: r400020 - in /incubator/harmony/enhanced/classlib/trunk/modules: luni/src/main/java/org/apache/harmony/luni/util/ExternalMessages.properties text/src/main/java/java/text/RuleBasedCollator.java
Date Fri, 05 May 2006 09:17:37 GMT
Author: mloenko
Date: Fri May  5 02:17:35 2006
New Revision: 400020

URL: http://svn.apache.org/viewcvs?rev=400020&view=rev
Log:
resolving conflicts in props file

Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/ExternalMessages.properties
    incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/java/java/text/RuleBasedCollator.java

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/ExternalMessages.properties
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/ExternalMessages.properties?rev=400020&r1=400019&r2=400020&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/ExternalMessages.properties
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/ExternalMessages.properties
Fri May  5 02:17:35 2006
@@ -284,3 +284,5 @@
 K034b=url and proxy can not be null
 K034c=proxy should not be be null
 K034d=method has not been implemented yet
+K034e=Build rules empty
+

Modified: incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/java/java/text/RuleBasedCollator.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/java/java/text/RuleBasedCollator.java?rev=400020&r1=400019&r2=400020&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/java/java/text/RuleBasedCollator.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/java/java/text/RuleBasedCollator.java
Fri May  5 02:17:35 2006
@@ -59,7 +59,7 @@
             throw new NullPointerException();
         }
         if (rules.length() == 0) {
-            throw new ParseException(Msg.getString("K034b"), 0);
+            throw new ParseException(Msg.getString("K034e"), 0);
         }
 
         try {



Mime
View raw message