Fix the comments

Unidata · Jul 17, 2024 · 7ee573e · 7ee573e
1 parent 74f6a03
commit 7ee573e
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 98 deletions.
diff --git a/cdm/core/src/main/java/ucar/nc2/dataset/VariableDS.java b/cdm/core/src/main/java/ucar/nc2/dataset/VariableDS.java
@@ -932,12 +932,10 @@ private void createEnhancements() {
       }
       this.dataType = scaleOffset != null ? scaleOffset.getScaledOffsetType() : this.dataType;
     }
-    /** how oh how ??? */
     for (Enhance enhance : this.enhanceMode) {
       for (EnhancementProvider service : ServiceLoader.load(EnhancementProvider.class)) {
-        /** Stand and Norm require floatingpoint, buc classifier can do just numeric? */
         if (service.appliesTo(enhance, this.attributes(), dataType)) {
-          loadedEnhancements.add(service.returnObject(this));
+          loadedEnhancements.add(service.Create(this));
         }
       }
     }

diff --git a/cdm/core/src/main/java/ucar/nc2/filter/Classifier.java b/cdm/core/src/main/java/ucar/nc2/filter/Classifier.java
@@ -1,37 +1,17 @@
 package ucar.nc2.filter;
 
-
-import java.util.Map;
-import java.util.Set;
 import ucar.ma2.Array;
 import ucar.ma2.IndexIterator;
-import ucar.nc2.Variable;
 import ucar.nc2.constants.CDM;
 import ucar.nc2.Attribute;
 import ucar.nc2.dataset.NetcdfDataset.Enhance;
 import ucar.nc2.dataset.VariableDS;
 import ucar.nc2.util.Misc;
 import java.util.ArrayList;
 import java.util.List;
-import ucar.unidata.io.spi.RandomAccessFileProvider;
-
-
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Sets;
 import ucar.ma2.*;
 import ucar.nc2.*;
-import ucar.nc2.constants.CDM;
-import ucar.nc2.dataset.NetcdfDataset.Enhance;
-import ucar.nc2.filter.*;
-import ucar.nc2.internal.dataset.CoordinatesHelper;
-import ucar.nc2.util.CancelTask;
-import ucar.nc2.util.Misc;
 
-import javax.annotation.Nullable;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.*;
 
 public class Classifier implements Enhancement {
 
@@ -148,17 +128,14 @@ public static int[] stringToIntArray(String str) {
   public static class Provider implements EnhancementProvider {
 
 
-    @Override
-    public String getName() {
-      return name;
-    }
 
     @Override
     public boolean appliesTo(Enhance enhance, AttributeContainer attributes, DataType dt) {
       return enhance == Enhance.ApplyClassifier && attributes.findAttribute(CDM.CLASSIFY) != null && dt.isNumeric();
     }
 
-    public Classifier returnObject(VariableDS var) {
+    @Override
+    public Classifier Create(VariableDS var) {
       return createFromVariable(var);
     }
   }

diff --git a/cdm/core/src/main/java/ucar/nc2/filter/EnhancementProvider.java b/cdm/core/src/main/java/ucar/nc2/filter/EnhancementProvider.java
@@ -5,39 +5,21 @@
 
 package ucar.nc2.filter;
 
-import java.util.Map;
-// package ucar.nc2.dataset;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Sets;
 import ucar.ma2.*;
 import ucar.nc2.*;
-import ucar.nc2.constants.CDM;
 import ucar.nc2.dataset.NetcdfDataset.Enhance;
 import ucar.nc2.dataset.VariableDS;
-import ucar.nc2.filter.*;
-import ucar.nc2.internal.dataset.CoordinatesHelper;
-import ucar.nc2.util.CancelTask;
-import ucar.nc2.util.Misc;
 
-import javax.annotation.Nullable;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.*;
 
 /**
- * A Service Provider of {@link Filter}.
+ * A Service Provider of {@link Enhancement}.
  */
 public interface EnhancementProvider {
 
-  String getName();
-
   boolean appliesTo(Enhance enhance, AttributeContainer attributes, DataType dt);
 
-  Enhancement returnObject(VariableDS var);
-
+  Enhancement Create(VariableDS var);
 
-  // void applyEnhancement(Object instance);
 
 }
 

diff --git a/cdm/core/src/main/java/ucar/nc2/filter/Normalizer.java b/cdm/core/src/main/java/ucar/nc2/filter/Normalizer.java
@@ -79,10 +79,6 @@ public double getRange() {
 
   public static class Provider implements EnhancementProvider {
 
-    @Override
-    public String getName() {
-      return name;
-    }
 
     @Override
     public boolean appliesTo(Enhance enhance, AttributeContainer attributes, DataType dt) {
@@ -91,7 +87,7 @@ public boolean appliesTo(Enhance enhance, AttributeContainer attributes, DataTyp
     }
 
     @Override
-    public Normalizer returnObject(VariableDS var) {
+    public Normalizer Create(VariableDS var) {
       return Normalizer.createFromVariable(var);
     }
 

diff --git a/cdm/core/src/main/java/ucar/nc2/filter/ScaleOffset.java b/cdm/core/src/main/java/ucar/nc2/filter/ScaleOffset.java
@@ -291,12 +291,6 @@ public Filter create(Map<String, Object> properties) {
       return new ScaleOffset(properties);
     }
 
-    // @Override
-    // public void doSomething(double val) {
-    // System.out.println("SCALEOFFSET ! "+val);
-    // }
-
-
   }
 
 

diff --git a/cdm/core/src/main/java/ucar/nc2/filter/Standardizer.java b/cdm/core/src/main/java/ucar/nc2/filter/Standardizer.java
@@ -81,11 +81,6 @@ public double getStdDev() {
 
   public static class Provider implements EnhancementProvider {
 
-    @Override
-    public String getName() {
-      return name;
-    }
-
 
     @Override
     public boolean appliesTo(Enhance enhance, AttributeContainer attributes, DataType dt) {
@@ -94,7 +89,7 @@ public boolean appliesTo(Enhance enhance, AttributeContainer attributes, DataTyp
     }
 
     @Override
-    public Standardizer returnObject(VariableDS var) {
+    public Standardizer Create(VariableDS var) {
       return createFromVariable(var);
     }
   }

diff --git a/cdm/core/src/main/java/ucar/unidata/io/spi/EnhancementProvider.java b/cdm/core/src/main/java/ucar/unidata/io/spi/EnhancementProvider.java