svn commit: r1024131 - /lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/util/StringHelper.java

[si...@apache.org]

Author: simonw
Date: Tue Oct 19 06:38:39 2010
New Revision: 1024131

URL: http://svn.apache.org/viewvc?rev=1024131&view=rev
Log:
LUCENE-2643: StringHelper#stringDifference is wrong about supplementary chars - merged from r1024128

Modified:
    lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/util/StringHelper.java   (contents, props changed)

Modified: lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/util/StringHelper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/util/StringHelper.java?rev=1024131&r1=1024130&r2=1024131&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/util/StringHelper.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/util/StringHelper.java Tue Oct 19 06:38:39 2010
@@ -59,7 +59,10 @@ public abstract class StringHelper {
    * @param s1 The first string to compare
    * @param s2 The second string to compare
    * @return The first position where the two strings differ.
+   * 
+   * @deprecated This method cannot handle supplementary characters.
    */
+  @Deprecated
   public static final int stringDifference(String s1, String s2) {
     int len1 = s1.length();
     int len2 = s2.length();

Propchange: lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/util/StringHelper.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Oct 19 06:38:39 2010
@@ -0,0 +1,8 @@
+/lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/StringHelper.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,932998-932999,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950458,950613,951126,951355,951397,951521,953407,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,957707,960367,960371,960374,960719,962555,963372,963654,963720,963781,9638
 73,963906,963909,963920,964019,964054,964430,964459,964720,964753,964832,964856,965103,965110,965222,965230,965299,965327,965330,965585,966354,966878,967080,979453,979809,980369,980428,980436,980501,980909,980911,980917,981265,981550,981598,981650,981661,981857,981936,982073,982084,982201,982725,982824,983100,983212,983216,983313,983495,983500,983530,983622,983632,983778,984187,984202,984232,984510,984968,985453,985455,985672,985875,986158,986173,986612,987122,988087,988206,988216,988259,988346,988478,988527,988543,988592,988613,988688,988710,988736,988739,989004,989010,989013,989030,989035,989315,989321,989334,989785,990160-990161,990180,990189,990281,990301,990451,990459,990766,990781,990854,991053,991191,991310,991497,992424,992469,992567,992571,992623,993106,993194,993199,993287,993408,994935,994976,994979,995247,995250,995376,995772,996268,996357,996416,996511,996611,996623,996647-996653,996720,996942,996978,997180,997230,998055,998505,998684,999016,999223,999545,999842
 ,1000424,1000581,1000675,1001006,1001420,1001661,1001796,1002032,1003614,1003631,1003645,1003841-1003852,1003873,1003877,1003906,1003938,1003954,1003978,1003990,1004038,1004082,1004179,1004200,1004215,1004241,1004335,1005310,1005356,1005363,1006146,1006290,1006324,1021340,1021357,1021360,1021449,1021969-1021971,1022165,1022191,1022632,1022708-1022710,1022730-1022735,1022748-1022755,1022762-1022793,1022798-1022802,1022826,1022927,1022939,1022956,1022989,1022998,1023006,1023009,1023022,1023040,1023106,1023235-1023246,1023250,1023264-1023265,1023312,1023330,1023346,1023355,1023493,1023509-1023511,1023562,1023579-1023588,1023621,1023635,1023637,1023711,1023845,1023870,1024128
+/lucene/dev/trunk/src/java/org/apache/lucene/util/StringHelper.java:932749
+/lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/StringHelper.java:924791,924850,930201
+/lucene/java/branches/lucene_2_4/src/java/org/apache/lucene/util/StringHelper.java:748824
+/lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/util/StringHelper.java:817269-818600,825998,829134,829881,831036,896850,909334,948516
+/lucene/java/branches/lucene_2_9_back_compat_tests/src/java/org/apache/lucene/util/StringHelper.java:818601-821336
+/lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/util/StringHelper.java:880793,896906
+/lucene/java/trunk/src/java/org/apache/lucene/util/StringHelper.java:924483-925561