Merge pull request #1163 from haileyajohnson/scale-offset

refactor implementation of scale/offset, unsigned conversion, and convert missing

cdm-test/src/test/java/ucar/nc2/TestSequence.java

@@ -36,16 +36,12 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import ucar.ma2.*;
-import ucar.nc2.dataset.NetcdfDataset;
 import ucar.nc2.dataset.NetcdfDatasets;
 import ucar.unidata.util.test.category.NeedsCdmUnitTest;
 import ucar.unidata.util.test.TestDir;
 import java.io.File;
 import java.io.IOException;
-import java.lang.invoke.MethodHandles;
 import java.util.Arrays;
 import java.util.List;
 
@@ -56,7 +52,6 @@
  * @since Nov 10, 2009
  */
 public class TestSequence {
-  private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
   @Test
   @Category(NeedsCdmUnitTest.class)

cdm-test/src/test/java/ucar/nc2/ft/point/TestCfDocDsgExamples.java

@@ -4,8 +4,6 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import ucar.nc2.NetcdfFile;
 import ucar.nc2.constants.FeatureType;
 import ucar.nc2.dataset.NetcdfDatasets;
@@ -16,7 +14,6 @@
 import java.io.File;
 import java.io.FilenameFilter;
 import java.io.IOException;
-import java.lang.invoke.MethodHandles;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -28,7 +25,6 @@
  */
 @RunWith(Parameterized.class)
 public class TestCfDocDsgExamples {
-  private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
   private static final String cfDocDsgExamplesDir = TestDir.cdmLocalFromTestDataDir + "cfDocDsgExamples/";
 
   private static List<Object[]> getPointDatasets() {

cdm/core/src/main/java/ucar/nc2/NetcdfFiles.java

@@ -265,7 +265,7 @@ public static NetcdfFile open(String location, int buffer_size, ucar.nc2.util.Ca
    * @param buffer_size RandomAccessFile buffer size, if <= 0, use default size
    * @param cancelTask allow task to be cancelled; may be null.
    * @param iospMessage special iosp tweaking (sent before open is called), may be null
-   * @return NetcdfFile object, or null if cant find IOServiceProver
+   * @return NetcdfFile object, or null if can't find IOServiceProver
    * @throws IOException if error
    */
   public static NetcdfFile open(String location, int buffer_size, ucar.nc2.util.CancelTask cancelTask,
@@ -290,7 +290,7 @@ public static NetcdfFile open(String location, int buffer_size, ucar.nc2.util.Ca
    * @param iospMessage special iosp tweaking (sent before open is called), may be null
    * @return NetcdfFile object, or null if cant find IOServiceProver
    * @throws IOException if read error
-   * @throws ClassNotFoundException cannat find iospClassName in thye class path
+   * @throws ClassNotFoundException cannot find iospClassName in the class path
    * @throws InstantiationException if class cannot be instantiated
    * @throws IllegalAccessException if class is not accessible
    */

cdm/core/src/main/java/ucar/nc2/dataset/EnhanceScaleMissingUnsigned.java

@@ -31,14 +31,14 @@
  * <li>Values will be {@link DataType#widenNumber widened}, which effectively reinterprets signed data as unsigned
  * data.</li>
  * <li>To accommodate the unsigned conversion, the variable's data type will be changed to the
- * {@link EnhanceScaleMissingUnsignedImpl#nextLarger(DataType) next larger type}.</li>
+ * {@link ucar.nc2.filter.FilterHelpers#nextLarger(DataType) next larger type}.</li>
  * </ol>
  *
  * <h3>Implementation rules for scale/offset</h3>
  *
  * <ol>
  * <li>If scale_factor and/or add_offset variable attributes are present, then this is a "packed" Variable.</li>
- * <li>The data type of the variable will be set to the {@link EnhanceScaleMissingUnsignedImpl#largestOf largest of}:
+ * <li>The data type of the variable will be set to the {@link ucar.nc2.filter.FilterHelpers#largestOf largest of}:
  * <ul>
  * <li>the original data type</li>
  * <li>the unsigned conversion type, if applicable</li>
@@ -117,7 +117,9 @@
  *
  * @author caron
  * @author cwardgar
+ * @deprecated use implementations in Filter package
  */
+@Deprecated
 public interface EnhanceScaleMissingUnsigned extends IsMissingEvaluator {
   /** true if Variable data will be converted using scale and offset */
   boolean hasScaleOffset();