You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2012/08/23 20:14:43 UTC

svn commit: r1376626 [1/3] - in /lucene/dev/branches/branch_4x: ./ lucene/ lucene/core/ lucene/core/src/java/org/apache/lucene/util/packed/

Author: uschindler
Date: Thu Aug 23 18:14:40 2012
New Revision: 1376626

URL: http://svn.apache.org/viewvc?rev=1376626&view=rev
Log:
Merged revision(s) 1376617-1376625 from lucene/dev/trunk:
Fix strange logic with UOE and abstract methods, as hierarchy is otherwise hard to understand. TODO: indent is sometimes 4
........
Add missing @Override
........

Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/lucene/   (props changed)
    lucene/dev/branches/branch_4x/lucene/core/   (props changed)
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperation.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked1.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked10.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked11.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked12.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked13.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked14.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked15.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked16.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked17.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked18.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked19.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked2.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked20.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked21.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked22.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked23.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked24.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked25.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked26.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked27.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked28.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked29.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked3.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked30.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked31.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked32.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked33.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked34.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked35.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked36.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked37.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked38.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked39.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked4.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked40.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked41.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked42.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked43.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked44.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked45.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked46.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked47.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked48.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked49.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked5.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked50.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked51.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked52.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked53.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked54.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked55.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked56.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked57.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked58.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked59.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked6.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked60.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked61.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked62.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked63.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked64.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked7.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked8.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked9.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock1.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock10.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock12.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock16.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock2.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock21.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock3.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock32.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock4.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock5.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock6.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock7.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock8.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock9.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/gen_BulkOperation.py

Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperation.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperation.java?rev=1376626&r1=1376625&r2=1376626&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperation.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperation.java Thu Aug 23 18:14:40 2012
@@ -152,16 +152,6 @@ abstract class BulkOperation implements 
   }
 
   @Override
-  public void decode(long[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public void decode(byte[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
   public void encode(int[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
     encode(toLongArray(values, valuesOffset, iterations * valueCount()), 0, blocks, blocksOffset, iterations);
   }

Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked1.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked1.java?rev=1376626&r1=1376625&r2=1376626&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked1.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked1.java Thu Aug 23 18:14:40 2012
@@ -23,14 +23,17 @@ package org.apache.lucene.util.packed;
  * Efficient sequential read/write of packed integers.
  */
 final class BulkOperationPacked1 extends BulkOperation {
+    @Override
     public int blockCount() {
       return 1;
     }
 
+    @Override
     public int valueCount() {
       return 64;
     }
 
+    @Override
     public void decode(long[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -103,6 +106,7 @@ final class BulkOperationPacked1 extends
       }
     }
 
+    @Override
     public void decode(byte[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
       assert blocksOffset + 8 * iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -182,6 +186,7 @@ final class BulkOperationPacked1 extends
       }
     }
 
+    @Override
     public void decode(long[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -254,6 +259,7 @@ final class BulkOperationPacked1 extends
       }
     }
 
+    @Override
     public void decode(byte[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
       assert blocksOffset + 8 * iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -333,6 +339,7 @@ final class BulkOperationPacked1 extends
       }
     }
 
+    @Override
     public void encode(int[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -341,6 +348,7 @@ final class BulkOperationPacked1 extends
       }
     }
 
+    @Override
     public void encode(long[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;

Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked10.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked10.java?rev=1376626&r1=1376625&r2=1376626&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked10.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked10.java Thu Aug 23 18:14:40 2012
@@ -23,14 +23,17 @@ package org.apache.lucene.util.packed;
  * Efficient sequential read/write of packed integers.
  */
 final class BulkOperationPacked10 extends BulkOperation {
+    @Override
     public int blockCount() {
       return 5;
     }
 
+    @Override
     public int valueCount() {
       return 32;
     }
 
+    @Override
     public void decode(long[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -75,6 +78,7 @@ final class BulkOperationPacked10 extend
       }
     }
 
+    @Override
     public void decode(byte[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
       assert blocksOffset + 8 * iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -154,6 +158,7 @@ final class BulkOperationPacked10 extend
       }
     }
 
+    @Override
     public void decode(long[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -198,6 +203,7 @@ final class BulkOperationPacked10 extend
       }
     }
 
+    @Override
     public void decode(byte[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
       assert blocksOffset + 8 * iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -277,6 +283,7 @@ final class BulkOperationPacked10 extend
       }
     }
 
+    @Override
     public void encode(int[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -289,6 +296,7 @@ final class BulkOperationPacked10 extend
       }
     }
 
+    @Override
     public void encode(long[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;

Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked11.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked11.java?rev=1376626&r1=1376625&r2=1376626&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked11.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked11.java Thu Aug 23 18:14:40 2012
@@ -23,14 +23,17 @@ package org.apache.lucene.util.packed;
  * Efficient sequential read/write of packed integers.
  */
 final class BulkOperationPacked11 extends BulkOperation {
+    @Override
     public int blockCount() {
       return 11;
     }
 
+    @Override
     public int valueCount() {
       return 64;
     }
 
+    @Override
     public void decode(long[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -113,6 +116,7 @@ final class BulkOperationPacked11 extend
       }
     }
 
+    @Override
     public void decode(byte[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
       assert blocksOffset + 8 * iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -272,6 +276,7 @@ final class BulkOperationPacked11 extend
       }
     }
 
+    @Override
     public void decode(long[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -354,6 +359,7 @@ final class BulkOperationPacked11 extend
       }
     }
 
+    @Override
     public void decode(byte[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
       assert blocksOffset + 8 * iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -513,6 +519,7 @@ final class BulkOperationPacked11 extend
       }
     }
 
+    @Override
     public void encode(int[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -531,6 +538,7 @@ final class BulkOperationPacked11 extend
       }
     }
 
+    @Override
     public void encode(long[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;

Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked12.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked12.java?rev=1376626&r1=1376625&r2=1376626&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked12.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked12.java Thu Aug 23 18:14:40 2012
@@ -23,14 +23,17 @@ package org.apache.lucene.util.packed;
  * Efficient sequential read/write of packed integers.
  */
 final class BulkOperationPacked12 extends BulkOperation {
+    @Override
     public int blockCount() {
       return 3;
     }
 
+    @Override
     public int valueCount() {
       return 16;
     }
 
+    @Override
     public void decode(long[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -57,6 +60,7 @@ final class BulkOperationPacked12 extend
       }
     }
 
+    @Override
     public void decode(byte[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
       assert blocksOffset + 8 * iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -104,6 +108,7 @@ final class BulkOperationPacked12 extend
       }
     }
 
+    @Override
     public void decode(long[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -130,6 +135,7 @@ final class BulkOperationPacked12 extend
       }
     }
 
+    @Override
     public void decode(byte[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
       assert blocksOffset + 8 * iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -177,6 +183,7 @@ final class BulkOperationPacked12 extend
       }
     }
 
+    @Override
     public void encode(int[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -187,6 +194,7 @@ final class BulkOperationPacked12 extend
       }
     }
 
+    @Override
     public void encode(long[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;

Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked13.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked13.java?rev=1376626&r1=1376625&r2=1376626&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked13.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked13.java Thu Aug 23 18:14:40 2012
@@ -23,14 +23,17 @@ package org.apache.lucene.util.packed;
  * Efficient sequential read/write of packed integers.
  */
 final class BulkOperationPacked13 extends BulkOperation {
+    @Override
     public int blockCount() {
       return 13;
     }
 
+    @Override
     public int valueCount() {
       return 64;
     }
 
+    @Override
     public void decode(long[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -115,6 +118,7 @@ final class BulkOperationPacked13 extend
       }
     }
 
+    @Override
     public void decode(byte[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
       assert blocksOffset + 8 * iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -290,6 +294,7 @@ final class BulkOperationPacked13 extend
       }
     }
 
+    @Override
     public void decode(long[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -374,6 +379,7 @@ final class BulkOperationPacked13 extend
       }
     }
 
+    @Override
     public void decode(byte[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
       assert blocksOffset + 8 * iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -549,6 +555,7 @@ final class BulkOperationPacked13 extend
       }
     }
 
+    @Override
     public void encode(int[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -569,6 +576,7 @@ final class BulkOperationPacked13 extend
       }
     }
 
+    @Override
     public void encode(long[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;

Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked14.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked14.java?rev=1376626&r1=1376625&r2=1376626&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked14.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked14.java Thu Aug 23 18:14:40 2012
@@ -23,14 +23,17 @@ package org.apache.lucene.util.packed;
  * Efficient sequential read/write of packed integers.
  */
 final class BulkOperationPacked14 extends BulkOperation {
+    @Override
     public int blockCount() {
       return 7;
     }
 
+    @Override
     public int valueCount() {
       return 32;
     }
 
+    @Override
     public void decode(long[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -77,6 +80,7 @@ final class BulkOperationPacked14 extend
       }
     }
 
+    @Override
     public void decode(byte[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
       assert blocksOffset + 8 * iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -172,6 +176,7 @@ final class BulkOperationPacked14 extend
       }
     }
 
+    @Override
     public void decode(long[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -218,6 +223,7 @@ final class BulkOperationPacked14 extend
       }
     }
 
+    @Override
     public void decode(byte[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
       assert blocksOffset + 8 * iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -313,6 +319,7 @@ final class BulkOperationPacked14 extend
       }
     }
 
+    @Override
     public void encode(int[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -327,6 +334,7 @@ final class BulkOperationPacked14 extend
       }
     }
 
+    @Override
     public void encode(long[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;

Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked15.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked15.java?rev=1376626&r1=1376625&r2=1376626&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked15.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked15.java Thu Aug 23 18:14:40 2012
@@ -23,14 +23,17 @@ package org.apache.lucene.util.packed;
  * Efficient sequential read/write of packed integers.
  */
 final class BulkOperationPacked15 extends BulkOperation {
+    @Override
     public int blockCount() {
       return 15;
     }
 
+    @Override
     public int valueCount() {
       return 64;
     }
 
+    @Override
     public void decode(long[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -117,6 +120,7 @@ final class BulkOperationPacked15 extend
       }
     }
 
+    @Override
     public void decode(byte[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
       assert blocksOffset + 8 * iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -308,6 +312,7 @@ final class BulkOperationPacked15 extend
       }
     }
 
+    @Override
     public void decode(long[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -394,6 +399,7 @@ final class BulkOperationPacked15 extend
       }
     }
 
+    @Override
     public void decode(byte[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
       assert blocksOffset + 8 * iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -585,6 +591,7 @@ final class BulkOperationPacked15 extend
       }
     }
 
+    @Override
     public void encode(int[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -607,6 +614,7 @@ final class BulkOperationPacked15 extend
       }
     }
 
+    @Override
     public void encode(long[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;

Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked16.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked16.java?rev=1376626&r1=1376625&r2=1376626&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked16.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked16.java Thu Aug 23 18:14:40 2012
@@ -23,14 +23,17 @@ package org.apache.lucene.util.packed;
  * Efficient sequential read/write of packed integers.
  */
 final class BulkOperationPacked16 extends BulkOperation {
+    @Override
     public int blockCount() {
       return 1;
     }
 
+    @Override
     public int valueCount() {
       return 4;
     }
 
+    @Override
     public void decode(long[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -43,6 +46,7 @@ final class BulkOperationPacked16 extend
       }
     }
 
+    @Override
     public void decode(byte[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
       assert blocksOffset + 8 * iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -62,6 +66,7 @@ final class BulkOperationPacked16 extend
       }
     }
 
+    @Override
     public void decode(long[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -74,6 +79,7 @@ final class BulkOperationPacked16 extend
       }
     }
 
+    @Override
     public void decode(byte[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
       assert blocksOffset + 8 * iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -93,6 +99,7 @@ final class BulkOperationPacked16 extend
       }
     }
 
+    @Override
     public void encode(int[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -101,6 +108,7 @@ final class BulkOperationPacked16 extend
       }
     }
 
+    @Override
     public void encode(long[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;

Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked17.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked17.java?rev=1376626&r1=1376625&r2=1376626&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked17.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked17.java Thu Aug 23 18:14:40 2012
@@ -23,14 +23,17 @@ package org.apache.lucene.util.packed;
  * Efficient sequential read/write of packed integers.
  */
 final class BulkOperationPacked17 extends BulkOperation {
+    @Override
     public int blockCount() {
       return 17;
     }
 
+    @Override
     public int valueCount() {
       return 64;
     }
 
+    @Override
     public void decode(long[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -119,6 +122,7 @@ final class BulkOperationPacked17 extend
       }
     }
 
+    @Override
     public void decode(byte[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
       assert blocksOffset + 8 * iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -326,6 +330,7 @@ final class BulkOperationPacked17 extend
       }
     }
 
+    @Override
     public void decode(long[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -414,6 +419,7 @@ final class BulkOperationPacked17 extend
       }
     }
 
+    @Override
     public void decode(byte[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
       assert blocksOffset + 8 * iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -621,6 +627,7 @@ final class BulkOperationPacked17 extend
       }
     }
 
+    @Override
     public void encode(int[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -645,6 +652,7 @@ final class BulkOperationPacked17 extend
       }
     }
 
+    @Override
     public void encode(long[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;

Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked18.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked18.java?rev=1376626&r1=1376625&r2=1376626&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked18.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked18.java Thu Aug 23 18:14:40 2012
@@ -23,14 +23,17 @@ package org.apache.lucene.util.packed;
  * Efficient sequential read/write of packed integers.
  */
 final class BulkOperationPacked18 extends BulkOperation {
+    @Override
     public int blockCount() {
       return 9;
     }
 
+    @Override
     public int valueCount() {
       return 32;
     }
 
+    @Override
     public void decode(long[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -79,6 +82,7 @@ final class BulkOperationPacked18 extend
       }
     }
 
+    @Override
     public void decode(byte[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
       assert blocksOffset + 8 * iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -190,6 +194,7 @@ final class BulkOperationPacked18 extend
       }
     }
 
+    @Override
     public void decode(long[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -238,6 +243,7 @@ final class BulkOperationPacked18 extend
       }
     }
 
+    @Override
     public void decode(byte[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
       assert blocksOffset + 8 * iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -349,6 +355,7 @@ final class BulkOperationPacked18 extend
       }
     }
 
+    @Override
     public void encode(int[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -365,6 +372,7 @@ final class BulkOperationPacked18 extend
       }
     }
 
+    @Override
     public void encode(long[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;

Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked19.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked19.java?rev=1376626&r1=1376625&r2=1376626&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked19.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked19.java Thu Aug 23 18:14:40 2012
@@ -23,14 +23,17 @@ package org.apache.lucene.util.packed;
  * Efficient sequential read/write of packed integers.
  */
 final class BulkOperationPacked19 extends BulkOperation {
+    @Override
     public int blockCount() {
       return 19;
     }
 
+    @Override
     public int valueCount() {
       return 64;
     }
 
+    @Override
     public void decode(long[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -121,6 +124,7 @@ final class BulkOperationPacked19 extend
       }
     }
 
+    @Override
     public void decode(byte[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
       assert blocksOffset + 8 * iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -344,6 +348,7 @@ final class BulkOperationPacked19 extend
       }
     }
 
+    @Override
     public void decode(long[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -434,6 +439,7 @@ final class BulkOperationPacked19 extend
       }
     }
 
+    @Override
     public void decode(byte[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
       assert blocksOffset + 8 * iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -657,6 +663,7 @@ final class BulkOperationPacked19 extend
       }
     }
 
+    @Override
     public void encode(int[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -683,6 +690,7 @@ final class BulkOperationPacked19 extend
       }
     }
 
+    @Override
     public void encode(long[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;

Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked2.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked2.java?rev=1376626&r1=1376625&r2=1376626&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked2.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked2.java Thu Aug 23 18:14:40 2012
@@ -23,14 +23,17 @@ package org.apache.lucene.util.packed;
  * Efficient sequential read/write of packed integers.
  */
 final class BulkOperationPacked2 extends BulkOperation {
+    @Override
     public int blockCount() {
       return 1;
     }
 
+    @Override
     public int valueCount() {
       return 32;
     }
 
+    @Override
     public void decode(long[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -71,6 +74,7 @@ final class BulkOperationPacked2 extends
       }
     }
 
+    @Override
     public void decode(byte[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
       assert blocksOffset + 8 * iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -118,6 +122,7 @@ final class BulkOperationPacked2 extends
       }
     }
 
+    @Override
     public void decode(long[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -158,6 +163,7 @@ final class BulkOperationPacked2 extends
       }
     }
 
+    @Override
     public void decode(byte[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
       assert blocksOffset + 8 * iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -205,6 +211,7 @@ final class BulkOperationPacked2 extends
       }
     }
 
+    @Override
     public void encode(int[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -213,6 +220,7 @@ final class BulkOperationPacked2 extends
       }
     }
 
+    @Override
     public void encode(long[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;

Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked20.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked20.java?rev=1376626&r1=1376625&r2=1376626&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked20.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked20.java Thu Aug 23 18:14:40 2012
@@ -23,14 +23,17 @@ package org.apache.lucene.util.packed;
  * Efficient sequential read/write of packed integers.
  */
 final class BulkOperationPacked20 extends BulkOperation {
+    @Override
     public int blockCount() {
       return 5;
     }
 
+    @Override
     public int valueCount() {
       return 16;
     }
 
+    @Override
     public void decode(long[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -59,6 +62,7 @@ final class BulkOperationPacked20 extend
       }
     }
 
+    @Override
     public void decode(byte[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
       assert blocksOffset + 8 * iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -122,6 +126,7 @@ final class BulkOperationPacked20 extend
       }
     }
 
+    @Override
     public void decode(long[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -150,6 +155,7 @@ final class BulkOperationPacked20 extend
       }
     }
 
+    @Override
     public void decode(byte[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
       assert blocksOffset + 8 * iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -213,6 +219,7 @@ final class BulkOperationPacked20 extend
       }
     }
 
+    @Override
     public void encode(int[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -225,6 +232,7 @@ final class BulkOperationPacked20 extend
       }
     }
 
+    @Override
     public void encode(long[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;

Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked21.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked21.java?rev=1376626&r1=1376625&r2=1376626&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked21.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked21.java Thu Aug 23 18:14:40 2012
@@ -23,14 +23,17 @@ package org.apache.lucene.util.packed;
  * Efficient sequential read/write of packed integers.
  */
 final class BulkOperationPacked21 extends BulkOperation {
+    @Override
     public int blockCount() {
       return 21;
     }
 
+    @Override
     public int valueCount() {
       return 64;
     }
 
+    @Override
     public void decode(long[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -123,6 +126,7 @@ final class BulkOperationPacked21 extend
       }
     }
 
+    @Override
     public void decode(byte[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
       assert blocksOffset + 8 * iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -362,6 +366,7 @@ final class BulkOperationPacked21 extend
       }
     }
 
+    @Override
     public void decode(long[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -454,6 +459,7 @@ final class BulkOperationPacked21 extend
       }
     }
 
+    @Override
     public void decode(byte[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
       assert blocksOffset + 8 * iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -693,6 +699,7 @@ final class BulkOperationPacked21 extend
       }
     }
 
+    @Override
     public void encode(int[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -721,6 +728,7 @@ final class BulkOperationPacked21 extend
       }
     }
 
+    @Override
     public void encode(long[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;

Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked22.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked22.java?rev=1376626&r1=1376625&r2=1376626&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked22.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked22.java Thu Aug 23 18:14:40 2012
@@ -23,14 +23,17 @@ package org.apache.lucene.util.packed;
  * Efficient sequential read/write of packed integers.
  */
 final class BulkOperationPacked22 extends BulkOperation {
+    @Override
     public int blockCount() {
       return 11;
     }
 
+    @Override
     public int valueCount() {
       return 32;
     }
 
+    @Override
     public void decode(long[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -81,6 +84,7 @@ final class BulkOperationPacked22 extend
       }
     }
 
+    @Override
     public void decode(byte[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
       assert blocksOffset + 8 * iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -208,6 +212,7 @@ final class BulkOperationPacked22 extend
       }
     }
 
+    @Override
     public void decode(long[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -258,6 +263,7 @@ final class BulkOperationPacked22 extend
       }
     }
 
+    @Override
     public void decode(byte[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
       assert blocksOffset + 8 * iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -385,6 +391,7 @@ final class BulkOperationPacked22 extend
       }
     }
 
+    @Override
     public void encode(int[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -403,6 +410,7 @@ final class BulkOperationPacked22 extend
       }
     }
 
+    @Override
     public void encode(long[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;

Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked23.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked23.java?rev=1376626&r1=1376625&r2=1376626&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked23.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked23.java Thu Aug 23 18:14:40 2012
@@ -23,14 +23,17 @@ package org.apache.lucene.util.packed;
  * Efficient sequential read/write of packed integers.
  */
 final class BulkOperationPacked23 extends BulkOperation {
+    @Override
     public int blockCount() {
       return 23;
     }
 
+    @Override
     public int valueCount() {
       return 64;
     }
 
+    @Override
     public void decode(long[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -125,6 +128,7 @@ final class BulkOperationPacked23 extend
       }
     }
 
+    @Override
     public void decode(byte[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
       assert blocksOffset + 8 * iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -380,6 +384,7 @@ final class BulkOperationPacked23 extend
       }
     }
 
+    @Override
     public void decode(long[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -474,6 +479,7 @@ final class BulkOperationPacked23 extend
       }
     }
 
+    @Override
     public void decode(byte[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
       assert blocksOffset + 8 * iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -729,6 +735,7 @@ final class BulkOperationPacked23 extend
       }
     }
 
+    @Override
     public void encode(int[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -759,6 +766,7 @@ final class BulkOperationPacked23 extend
       }
     }
 
+    @Override
     public void encode(long[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;

Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked24.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked24.java?rev=1376626&r1=1376625&r2=1376626&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked24.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked24.java Thu Aug 23 18:14:40 2012
@@ -23,14 +23,17 @@ package org.apache.lucene.util.packed;
  * Efficient sequential read/write of packed integers.
  */
 final class BulkOperationPacked24 extends BulkOperation {
+    @Override
     public int blockCount() {
       return 3;
     }
 
+    @Override
     public int valueCount() {
       return 8;
     }
 
+    @Override
     public void decode(long[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -49,6 +52,7 @@ final class BulkOperationPacked24 extend
       }
     }
 
+    @Override
     public void decode(byte[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
       assert blocksOffset + 8 * iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -88,6 +92,7 @@ final class BulkOperationPacked24 extend
       }
     }
 
+    @Override
     public void decode(long[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -106,6 +111,7 @@ final class BulkOperationPacked24 extend
       }
     }
 
+    @Override
     public void decode(byte[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
       assert blocksOffset + 8 * iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -145,6 +151,7 @@ final class BulkOperationPacked24 extend
       }
     }
 
+    @Override
     public void encode(int[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -155,6 +162,7 @@ final class BulkOperationPacked24 extend
       }
     }
 
+    @Override
     public void encode(long[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;

Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked25.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked25.java?rev=1376626&r1=1376625&r2=1376626&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked25.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked25.java Thu Aug 23 18:14:40 2012
@@ -23,14 +23,17 @@ package org.apache.lucene.util.packed;
  * Efficient sequential read/write of packed integers.
  */
 final class BulkOperationPacked25 extends BulkOperation {
+    @Override
     public int blockCount() {
       return 25;
     }
 
+    @Override
     public int valueCount() {
       return 64;
     }
 
+    @Override
     public void decode(long[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -127,6 +130,7 @@ final class BulkOperationPacked25 extend
       }
     }
 
+    @Override
     public void decode(byte[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
       assert blocksOffset + 8 * iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -398,6 +402,7 @@ final class BulkOperationPacked25 extend
       }
     }
 
+    @Override
     public void decode(long[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -494,6 +499,7 @@ final class BulkOperationPacked25 extend
       }
     }
 
+    @Override
     public void decode(byte[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
       assert blocksOffset + 8 * iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -765,6 +771,7 @@ final class BulkOperationPacked25 extend
       }
     }
 
+    @Override
     public void encode(int[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -797,6 +804,7 @@ final class BulkOperationPacked25 extend
       }
     }
 
+    @Override
     public void encode(long[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;

Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked26.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked26.java?rev=1376626&r1=1376625&r2=1376626&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked26.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked26.java Thu Aug 23 18:14:40 2012
@@ -23,14 +23,17 @@ package org.apache.lucene.util.packed;
  * Efficient sequential read/write of packed integers.
  */
 final class BulkOperationPacked26 extends BulkOperation {
+    @Override
     public int blockCount() {
       return 13;
     }
 
+    @Override
     public int valueCount() {
       return 32;
     }
 
+    @Override
     public void decode(long[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -83,6 +86,7 @@ final class BulkOperationPacked26 extend
       }
     }
 
+    @Override
     public void decode(byte[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
       assert blocksOffset + 8 * iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -226,6 +230,7 @@ final class BulkOperationPacked26 extend
       }
     }
 
+    @Override
     public void decode(long[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -278,6 +283,7 @@ final class BulkOperationPacked26 extend
       }
     }
 
+    @Override
     public void decode(byte[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
       assert blocksOffset + 8 * iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -421,6 +427,7 @@ final class BulkOperationPacked26 extend
       }
     }
 
+    @Override
     public void encode(int[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -441,6 +448,7 @@ final class BulkOperationPacked26 extend
       }
     }
 
+    @Override
     public void encode(long[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;

Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked27.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked27.java?rev=1376626&r1=1376625&r2=1376626&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked27.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked27.java Thu Aug 23 18:14:40 2012
@@ -23,14 +23,17 @@ package org.apache.lucene.util.packed;
  * Efficient sequential read/write of packed integers.
  */
 final class BulkOperationPacked27 extends BulkOperation {
+    @Override
     public int blockCount() {
       return 27;
     }
 
+    @Override
     public int valueCount() {
       return 64;
     }
 
+    @Override
     public void decode(long[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -129,6 +132,7 @@ final class BulkOperationPacked27 extend
       }
     }
 
+    @Override
     public void decode(byte[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
       assert blocksOffset + 8 * iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -416,6 +420,7 @@ final class BulkOperationPacked27 extend
       }
     }
 
+    @Override
     public void decode(long[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -514,6 +519,7 @@ final class BulkOperationPacked27 extend
       }
     }
 
+    @Override
     public void decode(byte[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
       assert blocksOffset + 8 * iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -801,6 +807,7 @@ final class BulkOperationPacked27 extend
       }
     }
 
+    @Override
     public void encode(int[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -835,6 +842,7 @@ final class BulkOperationPacked27 extend
       }
     }
 
+    @Override
     public void encode(long[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;

Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked28.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked28.java?rev=1376626&r1=1376625&r2=1376626&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked28.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked28.java Thu Aug 23 18:14:40 2012
@@ -23,14 +23,17 @@ package org.apache.lucene.util.packed;
  * Efficient sequential read/write of packed integers.
  */
 final class BulkOperationPacked28 extends BulkOperation {
+    @Override
     public int blockCount() {
       return 7;
     }
 
+    @Override
     public int valueCount() {
       return 16;
     }
 
+    @Override
     public void decode(long[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -61,6 +64,7 @@ final class BulkOperationPacked28 extend
       }
     }
 
+    @Override
     public void decode(byte[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
       assert blocksOffset + 8 * iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -140,6 +144,7 @@ final class BulkOperationPacked28 extend
       }
     }
 
+    @Override
     public void decode(long[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -170,6 +175,7 @@ final class BulkOperationPacked28 extend
       }
     }
 
+    @Override
     public void decode(byte[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
       assert blocksOffset + 8 * iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -249,6 +255,7 @@ final class BulkOperationPacked28 extend
       }
     }
 
+    @Override
     public void encode(int[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -263,6 +270,7 @@ final class BulkOperationPacked28 extend
       }
     }
 
+    @Override
     public void encode(long[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;

Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked29.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked29.java?rev=1376626&r1=1376625&r2=1376626&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked29.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked29.java Thu Aug 23 18:14:40 2012
@@ -23,14 +23,17 @@ package org.apache.lucene.util.packed;
  * Efficient sequential read/write of packed integers.
  */
 final class BulkOperationPacked29 extends BulkOperation {
+    @Override
     public int blockCount() {
       return 29;
     }
 
+    @Override
     public int valueCount() {
       return 64;
     }
 
+    @Override
     public void decode(long[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -131,6 +134,7 @@ final class BulkOperationPacked29 extend
       }
     }
 
+    @Override
     public void decode(byte[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
       assert blocksOffset + 8 * iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -434,6 +438,7 @@ final class BulkOperationPacked29 extend
       }
     }
 
+    @Override
     public void decode(long[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -534,6 +539,7 @@ final class BulkOperationPacked29 extend
       }
     }
 
+    @Override
     public void decode(byte[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
       assert blocksOffset + 8 * iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -837,6 +843,7 @@ final class BulkOperationPacked29 extend
       }
     }
 
+    @Override
     public void encode(int[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -873,6 +880,7 @@ final class BulkOperationPacked29 extend
       }
     }
 
+    @Override
     public void encode(long[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;

Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked3.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked3.java?rev=1376626&r1=1376625&r2=1376626&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked3.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked3.java Thu Aug 23 18:14:40 2012
@@ -23,14 +23,17 @@ package org.apache.lucene.util.packed;
  * Efficient sequential read/write of packed integers.
  */
 final class BulkOperationPacked3 extends BulkOperation {
+    @Override
     public int blockCount() {
       return 3;
     }
 
+    @Override
     public int valueCount() {
       return 64;
     }
 
+    @Override
     public void decode(long[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -105,6 +108,7 @@ final class BulkOperationPacked3 extends
       }
     }
 
+    @Override
     public void decode(byte[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
       assert blocksOffset + 8 * iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -200,6 +204,7 @@ final class BulkOperationPacked3 extends
       }
     }
 
+    @Override
     public void decode(long[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -274,6 +279,7 @@ final class BulkOperationPacked3 extends
       }
     }
 
+    @Override
     public void decode(byte[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
       assert blocksOffset + 8 * iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -369,6 +375,7 @@ final class BulkOperationPacked3 extends
       }
     }
 
+    @Override
     public void encode(int[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -379,6 +386,7 @@ final class BulkOperationPacked3 extends
       }
     }
 
+    @Override
     public void encode(long[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;

Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked30.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked30.java?rev=1376626&r1=1376625&r2=1376626&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked30.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked30.java Thu Aug 23 18:14:40 2012
@@ -23,14 +23,17 @@ package org.apache.lucene.util.packed;
  * Efficient sequential read/write of packed integers.
  */
 final class BulkOperationPacked30 extends BulkOperation {
+    @Override
     public int blockCount() {
       return 15;
     }
 
+    @Override
     public int valueCount() {
       return 32;
     }
 
+    @Override
     public void decode(long[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -85,6 +88,7 @@ final class BulkOperationPacked30 extend
       }
     }
 
+    @Override
     public void decode(byte[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
       assert blocksOffset + 8 * iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -244,6 +248,7 @@ final class BulkOperationPacked30 extend
       }
     }
 
+    @Override
     public void decode(long[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -298,6 +303,7 @@ final class BulkOperationPacked30 extend
       }
     }
 
+    @Override
     public void decode(byte[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
       assert blocksOffset + 8 * iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -457,6 +463,7 @@ final class BulkOperationPacked30 extend
       }
     }
 
+    @Override
     public void encode(int[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -479,6 +486,7 @@ final class BulkOperationPacked30 extend
       }
     }
 
+    @Override
     public void encode(long[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;

Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked31.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked31.java?rev=1376626&r1=1376625&r2=1376626&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked31.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked31.java Thu Aug 23 18:14:40 2012
@@ -23,14 +23,17 @@ package org.apache.lucene.util.packed;
  * Efficient sequential read/write of packed integers.
  */
 final class BulkOperationPacked31 extends BulkOperation {
+    @Override
     public int blockCount() {
       return 31;
     }
 
+    @Override
     public int valueCount() {
       return 64;
     }
 
+    @Override
     public void decode(long[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -133,6 +136,7 @@ final class BulkOperationPacked31 extend
       }
     }
 
+    @Override
     public void decode(byte[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
       assert blocksOffset + 8 * iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -452,6 +456,7 @@ final class BulkOperationPacked31 extend
       }
     }
 
+    @Override
     public void decode(long[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -554,6 +559,7 @@ final class BulkOperationPacked31 extend
       }
     }
 
+    @Override
     public void decode(byte[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
       assert blocksOffset + 8 * iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -873,6 +879,7 @@ final class BulkOperationPacked31 extend
       }
     }
 
+    @Override
     public void encode(int[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -911,6 +918,7 @@ final class BulkOperationPacked31 extend
       }
     }
 
+    @Override
     public void encode(long[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;

Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked32.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked32.java?rev=1376626&r1=1376625&r2=1376626&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked32.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked32.java Thu Aug 23 18:14:40 2012
@@ -23,14 +23,17 @@ package org.apache.lucene.util.packed;
  * Efficient sequential read/write of packed integers.
  */
 final class BulkOperationPacked32 extends BulkOperation {
+    @Override
     public int blockCount() {
       return 1;
     }
 
+    @Override
     public int valueCount() {
       return 2;
     }
 
+    @Override
     public void decode(long[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -41,6 +44,7 @@ final class BulkOperationPacked32 extend
       }
     }
 
+    @Override
     public void decode(byte[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
       assert blocksOffset + 8 * iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -58,6 +62,7 @@ final class BulkOperationPacked32 extend
       }
     }
 
+    @Override
     public void decode(long[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -68,6 +73,7 @@ final class BulkOperationPacked32 extend
       }
     }
 
+    @Override
     public void decode(byte[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
       assert blocksOffset + 8 * iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -85,6 +91,7 @@ final class BulkOperationPacked32 extend
       }
     }
 
+    @Override
     public void encode(int[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;
@@ -93,6 +100,7 @@ final class BulkOperationPacked32 extend
       }
     }
 
+    @Override
     public void encode(long[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
       assert blocksOffset + iterations * blockCount() <= blocks.length;
       assert valuesOffset + iterations * valueCount() <= values.length;