svn commit: r714230 - in /lucene/solr/trunk/src/java/org/apache/solr/analysis: BaseCharFilter.java MappingCharFilter.java

[ko...@apache.org]

Author: koji
Date: Sat Nov 15 02:44:38 2008
New Revision: 714230

URL: http://svn.apache.org/viewvc?rev=714230&view=rev
Log:
hide implementation detail of pcmList

Modified:
    lucene/solr/trunk/src/java/org/apache/solr/analysis/BaseCharFilter.java
    lucene/solr/trunk/src/java/org/apache/solr/analysis/MappingCharFilter.java

Modified: lucene/solr/trunk/src/java/org/apache/solr/analysis/BaseCharFilter.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/analysis/BaseCharFilter.java?rev=714230&r1=714229&r2=714230&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/analysis/BaseCharFilter.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/analysis/BaseCharFilter.java Sat Nov 15 02:44:38 2008
@@ -28,28 +28,36 @@
  */
 public abstract class BaseCharFilter extends CharFilter {
 
-  protected List<PosCorrectMap> pcmList;
+  private List<PosCorrectMap> pcmList;
   
   public BaseCharFilter( CharStream in ){
     super(in);
-    pcmList = new ArrayList<PosCorrectMap>();
   }
 
   protected int correctPosition( int currentPos ){
-    if( pcmList.isEmpty() ) return currentPos;
+    if( pcmList == null || pcmList.isEmpty() ) return currentPos;
     for( int i = pcmList.size() - 1; i >= 0; i-- ){
       if( currentPos >= pcmList.get( i ).pos )
         return currentPos + pcmList.get( i ).cumulativeDiff;
     }
     return currentPos;
   }
+  
+  protected int getLastCumulativeDiff(){
+    return pcmList == null || pcmList.isEmpty() ? 0 : pcmList.get( pcmList.size() - 1 ).cumulativeDiff;
+  }
+  
+  protected void addPosCorrectMap( int pos, int cumulativeDiff ){
+    if( pcmList == null ) pcmList = new ArrayList<PosCorrectMap>();
+    pcmList.add( new PosCorrectMap( pos, cumulativeDiff ) );
+  }
 
-  protected static class PosCorrectMap {
+  static class PosCorrectMap {
 
-    protected int pos;
-    protected int cumulativeDiff;
+    int pos;
+    int cumulativeDiff;
 
-    public PosCorrectMap( int pos, int cumulativeDiff ){
+    PosCorrectMap( int pos, int cumulativeDiff ){
       this.pos = pos;
       this.cumulativeDiff = cumulativeDiff;
     }

Modified: lucene/solr/trunk/src/java/org/apache/solr/analysis/MappingCharFilter.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/analysis/MappingCharFilter.java?rev=714230&r1=714229&r2=714230&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/analysis/MappingCharFilter.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/analysis/MappingCharFilter.java Sat Nov 15 02:44:38 2008
@@ -54,14 +54,13 @@
       replacement = result.normStr;
       charPointer = 0;
       if( result.diff != 0 ){
-        int prevCumulativeDiff = pcmList.isEmpty() ? 0 :
-          pcmList.get( pcmList.size() - 1 ).cumulativeDiff;
+        int prevCumulativeDiff = getLastCumulativeDiff();
         if( result.diff < 0 ){
           for( int i = 0; i < -result.diff ; i++ )
-            pcmList.add( new PosCorrectMap( nextCharCounter + i - prevCumulativeDiff, prevCumulativeDiff - 1 - i ) );
+            addPosCorrectMap( nextCharCounter + i - prevCumulativeDiff, prevCumulativeDiff - 1 - i );
         }
         else{
-          pcmList.add( new PosCorrectMap( nextCharCounter - result.diff - prevCumulativeDiff, prevCumulativeDiff + result.diff ) );
+          addPosCorrectMap( nextCharCounter - result.diff - prevCumulativeDiff, prevCumulativeDiff + result.diff ) ;
         }
       }
     }