diff --git a/bufr/src/main/java/ucar/nc2/iosp/bufr/BitCounterCompressed.java b/bufr/src/main/java/ucar/nc2/iosp/bufr/BitCounterCompressed.java index 92a83f2c91..41c7a6b1a5 100644 --- a/bufr/src/main/java/ucar/nc2/iosp/bufr/BitCounterCompressed.java +++ b/bufr/src/main/java/ucar/nc2/iosp/bufr/BitCounterCompressed.java @@ -16,7 +16,7 @@ public class BitCounterCompressed implements BitCounter { private final DataDescriptor dkey; // the field to count private final int nrows; // number of (obs) in the compression - private final int bitOffset; // starting position of the compressed data, reletive to start of data section + private final int bitOffset; // starting position of the compressed data, relative to start of data section private int dataWidth; // bitWidth of incremental values private BitCounterCompressed[][] nested; // used if the dkey is a structure = nested[innerRows][dkey.subkeys.size] diff --git a/bufr/src/main/java/ucar/nc2/iosp/bufr/MessageCompressedDataReader.java b/bufr/src/main/java/ucar/nc2/iosp/bufr/MessageCompressedDataReader.java index db8283b0c2..ce2b45d99d 100644 --- a/bufr/src/main/java/ucar/nc2/iosp/bufr/MessageCompressedDataReader.java +++ b/bufr/src/main/java/ucar/nc2/iosp/bufr/MessageCompressedDataReader.java @@ -116,7 +116,7 @@ public ArrayStructure readEntireMessage(Structure s, Message proto, Message m, R * @param ama place data into here in order (may be null). iterators must be already set. * @param m read this message * @param raf from this file - * @param r which datasets, reletive to this message. null == all. + * @param r which datasets, relative to this message. null == all. * @param f output bit count debugging info (may be null) * @throws IOException on read error */ diff --git a/bufr/src/main/java/ucar/nc2/iosp/bufr/MessageUncompressedDataReader.java b/bufr/src/main/java/ucar/nc2/iosp/bufr/MessageUncompressedDataReader.java index b538913fc0..f7c4be383e 100644 --- a/bufr/src/main/java/ucar/nc2/iosp/bufr/MessageUncompressedDataReader.java +++ b/bufr/src/main/java/ucar/nc2/iosp/bufr/MessageUncompressedDataReader.java @@ -95,7 +95,7 @@ ArrayStructure readEntireMessage(Structure s, Message proto, Message m, RandomAc * @param abb place data into here in order (may be null) * @param m read this message * @param raf from this file - * @param r which datasets, reletive to this message. null == all. + * @param r which datasets, relative to this message. null == all. * @param addTime add the time coordinate * @param f output bit count debugging info (may be null) * @return number of datasets read diff --git a/bufr/src/main/sources/eumetsat/readme.txt b/bufr/src/main/sources/eumetsat/readme.txt index 3fc60ce18d..27a6cd376b 100644 --- a/bufr/src/main/sources/eumetsat/readme.txt +++ b/bufr/src/main/sources/eumetsat/readme.txt @@ -8,7 +8,7 @@ http://www.eumetsat.int/Home/Main/Access_to_Data/Meteosat_Meteorological_Product the two table C are identical -table B and D (11) have additions, but no changes reletive to (10) +table B and D (11) have additions, but no changes relative to (10) B: diff --git a/cdm-test/src/test/java/ucar/nc2/iosp/grib/TestGribMisc.java b/cdm-test/src/test/java/ucar/nc2/iosp/grib/TestGribMisc.java index f1500fbe60..2b1d47b764 100644 --- a/cdm-test/src/test/java/ucar/nc2/iosp/grib/TestGribMisc.java +++ b/cdm-test/src/test/java/ucar/nc2/iosp/grib/TestGribMisc.java @@ -81,7 +81,7 @@ public void pdsGenType() throws Exception { assert v != null : ncfile.getLocation(); } - // this one has a forecast and error = must be seperate variables + // this one has a forecast and error = must be separate variables filename = TestDir.cdmUnitTestDir + "formats/grib2/RTMA_CONUS_2p5km_20111225_0000.grib2"; logger.debug("{}", filename); try (NetcdfFile ncfile = NetcdfFiles.open(filename, null)) { diff --git a/cdm-test/src/test/java/ucar/nc2/write/TestGribCompressByBit.java b/cdm-test/src/test/java/ucar/nc2/write/TestGribCompressByBit.java index 84fd74fb15..117a508780 100644 --- a/cdm-test/src/test/java/ucar/nc2/write/TestGribCompressByBit.java +++ b/cdm-test/src/test/java/ucar/nc2/write/TestGribCompressByBit.java @@ -653,7 +653,7 @@ Algorithm getAlgo() { } byte[] compress(GribData.Bean bean) throws IOException { - return GribData.compressScaled(bean); // LOOK could seperate from compression and try different ones + return GribData.compressScaled(bean); // LOOK could separate from compression and try different ones } } diff --git a/cdm/core/src/main/java/thredds/client/catalog/Access.java b/cdm/core/src/main/java/thredds/client/catalog/Access.java index 178cb1345c..fde6076bbc 100644 --- a/cdm/core/src/main/java/thredds/client/catalog/Access.java +++ b/cdm/core/src/main/java/thredds/client/catalog/Access.java @@ -63,7 +63,7 @@ public long getDataSize() { } // optional /** - * Get the standard URL, with resolution if the URL is reletive. + * Get the standard URL, with resolution if the URL is relative. * catalog.resolveURI( getUnresolvedUrlName()) * * @return URL string, or null if error. @@ -95,7 +95,7 @@ public URI getStandardUri() { /** * Construct "unresolved" URL: service.getBase() + getUrlPath() + service.getSuffix(). - * It is not resolved, so it may be a reletive URL. + * It is not resolved, so it may be a relative URL. * * @return unresolved Url as a String */ diff --git a/cdm/core/src/main/java/thredds/client/catalog/Catalog.java b/cdm/core/src/main/java/thredds/client/catalog/Catalog.java index 10a5c9ffbc..99c992888b 100644 --- a/cdm/core/src/main/java/thredds/client/catalog/Catalog.java +++ b/cdm/core/src/main/java/thredds/client/catalog/Catalog.java @@ -168,10 +168,10 @@ private void addAll(DatasetNode node, List all) { } /** - * Resolve reletive URIs, using the catalog's base URI. If the uriString is not reletive, then + * Resolve relative URIs, using the catalog's base URI. If the uriString is not relative, then * no resolution is done. This also allows baseURI to be a file: scheme. * - * @param uriString any url, reletive or absolute + * @param uriString any url, relative or absolute * @return resolved url string, or null on error * @throws java.net.URISyntaxException if uriString violates RFC 2396 */ diff --git a/cdm/core/src/main/java/thredds/client/catalog/CatalogRef.java b/cdm/core/src/main/java/thredds/client/catalog/CatalogRef.java index 96963f6014..fd6ba5b501 100644 --- a/cdm/core/src/main/java/thredds/client/catalog/CatalogRef.java +++ b/cdm/core/src/main/java/thredds/client/catalog/CatalogRef.java @@ -75,7 +75,7 @@ protected String translatePathToReletiveLocation(String dsPath, String configPat if (!dsPath.startsWith(configPath)) return null; - // remove the matching part, the rest is the "reletive location" + // remove the matching part, the rest is the "relative location" String dataDir = dsPath.substring(configPath.length()); if (dataDir.startsWith("/")) dataDir = dataDir.substring(1); diff --git a/cdm/core/src/main/java/thredds/client/catalog/Service.java b/cdm/core/src/main/java/thredds/client/catalog/Service.java index 25cba394dc..23eff008be 100644 --- a/cdm/core/src/main/java/thredds/client/catalog/Service.java +++ b/cdm/core/src/main/java/thredds/client/catalog/Service.java @@ -78,9 +78,9 @@ public List getProperties() { } /** - * See if the service Base is reletive + * See if the service Base is relative * - * @return true if the service Base is reletive + * @return true if the service Base is relative */ public boolean isRelativeBase() { if (getType() == ServiceType.Compound) diff --git a/cdm/core/src/main/java/thredds/client/catalog/builder/DatasetBuilder.java b/cdm/core/src/main/java/thredds/client/catalog/builder/DatasetBuilder.java index 7c0bafd2ae..41b4bd326e 100644 --- a/cdm/core/src/main/java/thredds/client/catalog/builder/DatasetBuilder.java +++ b/cdm/core/src/main/java/thredds/client/catalog/builder/DatasetBuilder.java @@ -88,7 +88,7 @@ public DatasetBuilder(DatasetBuilder parent, Dataset from) { this.parent = parent; this.name = from.getName(); for (Map.Entry entry : from.getFldIterator()) { - if (!entry.getKey().equals(Dataset.Datasets) && !entry.getKey().equals(Dataset.Access)) // set seperately + if (!entry.getKey().equals(Dataset.Datasets) && !entry.getKey().equals(Dataset.Access)) // set separately this.flds.put(entry.getKey(), entry.getValue()); } } diff --git a/cdm/core/src/main/java/thredds/client/catalog/tools/DatasetHtmlWriter.java b/cdm/core/src/main/java/thredds/client/catalog/tools/DatasetHtmlWriter.java index 21df85f7fd..d562bd3da8 100644 --- a/cdm/core/src/main/java/thredds/client/catalog/tools/DatasetHtmlWriter.java +++ b/cdm/core/src/main/java/thredds/client/catalog/tools/DatasetHtmlWriter.java @@ -420,7 +420,7 @@ private String rangeString(ThreddsMetadata.GeospatialRange r) { } /** - * resolve reletive URLS against the catalog URL. + * resolve relative URLS against the catalog URL. * * @param ds use ds parent catalog, if it exists * @param href URL to resolve diff --git a/cdm/core/src/main/java/ucar/ma2/Range.java b/cdm/core/src/main/java/ucar/ma2/Range.java index fb77518240..78d0648d47 100644 --- a/cdm/core/src/main/java/ucar/ma2/Range.java +++ b/cdm/core/src/main/java/ucar/ma2/Range.java @@ -262,12 +262,12 @@ public boolean contains(int want) { } /** - * Create a new Range by composing a Range that is reletive to this Range. + * Create a new Range by composing a Range that is relative to this Range. * Revised 2013/04/19 by Dennis Heimbigner to handle edge cases. * See the commentary associated with the netcdf-c file dceconstraints.h, * function dceslicecompose(). * - * @param r range reletive to base + * @param r range relative to base * @return combined Range, may be EMPTY * @throws InvalidRangeException elements must be nonnegative, 0 <= first <= last */ diff --git a/cdm/core/src/main/java/ucar/ma2/Section.java b/cdm/core/src/main/java/ucar/ma2/Section.java index f16c1d5bca..8783834be3 100644 --- a/cdm/core/src/main/java/ucar/ma2/Section.java +++ b/cdm/core/src/main/java/ucar/ma2/Section.java @@ -273,9 +273,9 @@ public Section compact() throws InvalidRangeException { /** - * Create a new Section by composing with a Section that is reletive to this Section. + * Create a new Section by composing with a Section that is relative to this Section. * - * @param want Section reletive to this one. If null, return this. If individual ranges are null, use corresponding + * @param want Section relative to this one. If null, return this. If individual ranges are null, use corresponding * Range in this. * @return new Section, composed * @throws InvalidRangeException if want.getRank() not equal to this.getRank(), or invalid component Range @@ -371,7 +371,7 @@ public Section union(Section other) throws InvalidRangeException { /** * Create a new Section by shifting each range by newOrigin.first() - * The result is then a reletive offset from the newOrigin. + * The result is then a relative offset from the newOrigin. * * @param newOrigin this becomes the origin of the result * @return new Section, shifted diff --git a/cdm/core/src/main/java/ucar/nc2/Dimension.java b/cdm/core/src/main/java/ucar/nc2/Dimension.java index f3dc79b8bb..a5bfc510b1 100644 --- a/cdm/core/src/main/java/ucar/nc2/Dimension.java +++ b/cdm/core/src/main/java/ucar/nc2/Dimension.java @@ -210,7 +210,7 @@ public String getShortName() { /** * If this is a NetCDF unlimited dimension. The length might increase between invocations, * but it remains fixed for the lifetime of the NetcdfFile. - * If you modify the file in a seperate process, you must close and reopen the file. + * If you modify the file in a separate process, you must close and reopen the file. * * @return if its an "unlimited" Dimension */ diff --git a/cdm/core/src/main/java/ucar/nc2/Group.java b/cdm/core/src/main/java/ucar/nc2/Group.java index 278b2d18b6..e73edd8277 100755 --- a/cdm/core/src/main/java/ucar/nc2/Group.java +++ b/cdm/core/src/main/java/ucar/nc2/Group.java @@ -1071,20 +1071,20 @@ public Optional findGroupLocal(String shortName) { } /** - * Find a subgroup of this Group, with the specified reletive name. + * Find a subgroup of this Group, with the specified relative name. * An embedded "/" separates group names. * Can have a leading "/" only if this is the root group. * - * @param reletiveName eg "group/subgroup/wantGroup". + * @param relativeName eg "group/subgroup/wantGroup". * @return Group or empty if not found. */ - public Optional findGroupNested(String reletiveName) { - if (reletiveName == null || reletiveName.isEmpty()) { + public Optional findGroupNested(String relativeName) { + if (relativeName == null || relativeName.isEmpty()) { return (this.getParentGroup() == null) ? Optional.of(this) : Optional.empty(); } Group.Builder g = this; - StringTokenizer stoke = new StringTokenizer(reletiveName, "/"); + StringTokenizer stoke = new StringTokenizer(relativeName, "/"); while (stoke.hasMoreTokens()) { String groupName = NetcdfFiles.makeNameUnescaped(stoke.nextToken()); Optional sub = g.findGroupLocal(groupName); @@ -1190,22 +1190,22 @@ public Optional> findVariableLocal(String name) { } /** - * Find a Variable, with the specified reletive name. No structure members. + * Find a Variable, with the specified relative name. No structure members. * - * @param reletiveName eg "group/subgroup/varname". + * @param relativeName eg "group/subgroup/varname". */ - public Optional> findVariableNested(String reletiveName) { - if (reletiveName == null || reletiveName.isEmpty()) { + public Optional> findVariableNested(String relativeName) { + if (relativeName == null || relativeName.isEmpty()) { return Optional.empty(); } // break into groupNames and varName Group.Builder group = this; - String varName = reletiveName; - int pos = reletiveName.lastIndexOf('/'); + String varName = relativeName; + int pos = relativeName.lastIndexOf('/'); if (pos >= 0) { - String groupNames = reletiveName.substring(0, pos); - varName = reletiveName.substring(pos + 1); + String groupNames = relativeName.substring(0, pos); + varName = relativeName.substring(pos + 1); group = findGroupNested(groupNames).orElse(null); } diff --git a/cdm/core/src/main/java/ucar/nc2/Variable.java b/cdm/core/src/main/java/ucar/nc2/Variable.java index a4a40b9836..ab3752979d 100644 --- a/cdm/core/src/main/java/ucar/nc2/Variable.java +++ b/cdm/core/src/main/java/ucar/nc2/Variable.java @@ -1801,7 +1801,7 @@ public boolean isCoordinateVariable() { protected int elementSize; // TODO do we need these? breaks immutability - // TODO maybe caching read data shoul be seperate from "this is the source of the data". + // TODO maybe caching read data should be separate from "this is the source of the data". protected Cache cache = new Cache(); // cache cannot be null protected int sizeToCache = -1; // bytes diff --git a/cdm/core/src/main/java/ucar/nc2/dataset/NetcdfDatasets.java b/cdm/core/src/main/java/ucar/nc2/dataset/NetcdfDatasets.java index eceba98888..3709727920 100644 --- a/cdm/core/src/main/java/ucar/nc2/dataset/NetcdfDatasets.java +++ b/cdm/core/src/main/java/ucar/nc2/dataset/NetcdfDatasets.java @@ -158,7 +158,7 @@ public static NetcdfDataset openDataset(DatasetUrl location, Set enhanc * eg: NcmlReader.readNcml(new StringReader(ncml), location, null); * * @param reader the Reader containing the NcML document - * @param ncmlLocation the URL location string of the NcML document, used to resolve reletive path of the referenced + * @param ncmlLocation the URL location string of the NcML document, used to resolve relative path of the referenced * dataset, * or may be just a unique name for caching purposes. * @param cancelTask allow user to cancel the task; may be null diff --git a/cdm/core/src/main/java/ucar/nc2/dataset/conv/IFPSConvention.java b/cdm/core/src/main/java/ucar/nc2/dataset/conv/IFPSConvention.java index adf1b68e32..f12ba0b2ac 100644 --- a/cdm/core/src/main/java/ucar/nc2/dataset/conv/IFPSConvention.java +++ b/cdm/core/src/main/java/ucar/nc2/dataset/conv/IFPSConvention.java @@ -101,7 +101,7 @@ public void augmentDataset(NetcdfDataset ds, CancelTask cancelTask) throws IOExc } // figure out the time coordinate for each data variable - // LOOK : always seperate; could try to discover if they are the same + // LOOK : always separate; could try to discover if they are the same List vars = ds.getVariables(); for (Variable ncvar : vars) { // variables that are used but not displayable or have no data have DIM_0, also don't want history, since those diff --git a/cdm/core/src/main/java/ucar/nc2/dt/GridCoordSystem.java b/cdm/core/src/main/java/ucar/nc2/dt/GridCoordSystem.java index 72ba0b20e8..87495e3617 100644 --- a/cdm/core/src/main/java/ucar/nc2/dt/GridCoordSystem.java +++ b/cdm/core/src/main/java/ucar/nc2/dt/GridCoordSystem.java @@ -40,7 +40,7 @@ public interface GridCoordSystem { */ /** - * The name of the Grid Coordinate System, consisting of the list of coordinate axes, seperated by blanks. + * The name of the Grid Coordinate System, consisting of the list of coordinate axes, separated by blanks. * * @return name of the Grid Coordinate System */ diff --git a/cdm/core/src/main/java/ucar/nc2/ft/fmrc/FmrInv.java b/cdm/core/src/main/java/ucar/nc2/ft/fmrc/FmrInv.java index f586bdacd8..9563776e35 100644 --- a/cdm/core/src/main/java/ucar/nc2/ft/fmrc/FmrInv.java +++ b/cdm/core/src/main/java/ucar/nc2/ft/fmrc/FmrInv.java @@ -130,7 +130,7 @@ public int compareTo(FmrInv fmr) { /** * A grid variable for an fmr (one run) - * A collection of GridDatasetInv.Grid, one for each seperate dataset. All have the same runDate. + * A collection of GridDatasetInv.Grid, one for each separate dataset. All have the same runDate. * The time and vert coord of the GridVariable is the union of the GridDatasetInv.Grid time and vert coords. * * @author caron diff --git a/cdm/core/src/main/java/ucar/nc2/ft/fmrc/FmrcInv.java b/cdm/core/src/main/java/ucar/nc2/ft/fmrc/FmrcInv.java index b80fdacccc..a2677d36d3 100644 --- a/cdm/core/src/main/java/ucar/nc2/ft/fmrc/FmrcInv.java +++ b/cdm/core/src/main/java/ucar/nc2/ft/fmrc/FmrcInv.java @@ -168,8 +168,8 @@ public class FmrcInv { } // not really needed - private final TimeCoord tcOffAll; // all offsets in this collection, reletive to baseDate - private final TimeCoord tcIntAll; // all intervals in this collection, reletive to baseDate + private final TimeCoord tcOffAll; // all offsets in this collection, relative to baseDate + private final TimeCoord tcIntAll; // all intervals in this collection, relative to baseDate // public for debugging public List getFmrList() { diff --git a/cdm/core/src/main/java/ucar/nc2/ft/fmrc/GridDatasetInv.java b/cdm/core/src/main/java/ucar/nc2/ft/fmrc/GridDatasetInv.java index 45e945ae48..feb65f623c 100644 --- a/cdm/core/src/main/java/ucar/nc2/ft/fmrc/GridDatasetInv.java +++ b/cdm/core/src/main/java/ucar/nc2/ft/fmrc/GridDatasetInv.java @@ -289,7 +289,7 @@ private Grid makeGrid(String gridName) { */ public class Grid implements Comparable { final String name; - TimeCoord tc; // time coordinates reletive to getRunDate() + TimeCoord tc; // time coordinates relative to getRunDate() EnsCoord ec; // optional VertCoord vc; // optional diff --git a/cdm/core/src/main/java/ucar/nc2/ft/point/standard/Table.java b/cdm/core/src/main/java/ucar/nc2/ft/point/standard/Table.java index 6a3f552495..40ffedd43c 100644 --- a/cdm/core/src/main/java/ucar/nc2/ft/point/standard/Table.java +++ b/cdm/core/src/main/java/ucar/nc2/ft/point/standard/Table.java @@ -65,7 +65,7 @@ public static Table factory(NetcdfDataset ds, TableConfig config) { case ArrayStructure: // given array of StructureData, stored in config.as return new TableArrayStructure(ds, config); - case Construct: // construct the table from its children - theres no seperate station table, stn info is + case Construct: // construct the table from its children - theres no separate station table, stn info is // duplicated in the obs structure. return new TableConstruct(ds, config); @@ -405,7 +405,7 @@ public String getName() { /////////////////////////////////////////////////////// /** - * When theres no seperate station table, but info is duplicated in the obs structure. + * When theres no separate station table, but info is duplicated in the obs structure. * Must have a ParentId child table * No variables are added to cols. *

diff --git a/cdm/core/src/main/java/ucar/nc2/ft2/coverage/CoordsSet.java b/cdm/core/src/main/java/ucar/nc2/ft2/coverage/CoordsSet.java index 01ee4338d9..04929119db 100644 --- a/cdm/core/src/main/java/ucar/nc2/ft2/coverage/CoordsSet.java +++ b/cdm/core/src/main/java/ucar/nc2/ft2/coverage/CoordsSet.java @@ -20,7 +20,7 @@ * 1) ConstantForecast: runtime (ind), timeOffset (dep), time (scalar) * 1) Best: time (ind), runtime (dep) * - * Grib: If theres a time offset, then there must be a runtime coordinate, and the time offset is reletive to that. + * Grib: If theres a time offset, then there must be a runtime coordinate, and the time offset is relative to that. * LOOK only used by Grib */ @Immutable diff --git a/cdm/core/src/main/java/ucar/nc2/ft2/coverage/CoverageCoordAxis1D.java b/cdm/core/src/main/java/ucar/nc2/ft2/coverage/CoverageCoordAxis1D.java index aca5490bd0..40bcb65131 100644 --- a/cdm/core/src/main/java/ucar/nc2/ft2/coverage/CoverageCoordAxis1D.java +++ b/cdm/core/src/main/java/ucar/nc2/ft2/coverage/CoverageCoordAxis1D.java @@ -367,7 +367,7 @@ protected Optional subsetBuilder(SubsetParams params) // default is all break; - // x,y get seperately subsetted + // x,y get separately subsetted case GeoX: case GeoY: case Lat: diff --git a/cdm/core/src/main/java/ucar/nc2/ft2/coverage/TimeOffsetAxis.java b/cdm/core/src/main/java/ucar/nc2/ft2/coverage/TimeOffsetAxis.java index 3bcf1a726e..cc6a29da34 100644 --- a/cdm/core/src/main/java/ucar/nc2/ft2/coverage/TimeOffsetAxis.java +++ b/cdm/core/src/main/java/ucar/nc2/ft2/coverage/TimeOffsetAxis.java @@ -59,7 +59,7 @@ public Optional subsetFromTime(SubsetParams params, CalendarDate assert (builder != null); - // all the offsets are reletive to rundate + // all the offsets are relative to rundate builder.setReferenceDate(runDate); return Optional.of(new TimeOffsetAxis(builder)); } diff --git a/cdm/core/src/main/java/ucar/nc2/internal/dataset/conv/IFPSConvention.java b/cdm/core/src/main/java/ucar/nc2/internal/dataset/conv/IFPSConvention.java index 5d17326592..e6bdb71ebe 100644 --- a/cdm/core/src/main/java/ucar/nc2/internal/dataset/conv/IFPSConvention.java +++ b/cdm/core/src/main/java/ucar/nc2/internal/dataset/conv/IFPSConvention.java @@ -113,7 +113,7 @@ public void augmentDataset(CancelTask cancelTask) throws IOException { } // figure out the time coordinate for each data variable - // LOOK : always seperate; could try to discover if they are the same + // LOOK : always separate; could try to discover if they are the same // Make copy because we will add new elements to it. for (Variable.Builder ncvar : ImmutableList.copyOf(rootGroup.vbuilders)) { // variables that are used but not displayable or have no data have DIM_0, also don't want history, since those diff --git a/cdm/core/src/main/java/ucar/nc2/internal/dataset/conv/WRFConvention.java b/cdm/core/src/main/java/ucar/nc2/internal/dataset/conv/WRFConvention.java index 5fc4d25fb1..bfb51920c7 100644 --- a/cdm/core/src/main/java/ucar/nc2/internal/dataset/conv/WRFConvention.java +++ b/cdm/core/src/main/java/ucar/nc2/internal/dataset/conv/WRFConvention.java @@ -795,7 +795,7 @@ protected void assignCoordinateTransforms() { coords.findAxisByType(cs, AxisType.GeoZ).ifPresent(axis -> { String units = axis.getUnits(); if ((units == null) || (units.trim().isEmpty())) { - // LOOK each cs might have seperate ct; but they might be identical.... + // LOOK each cs might have separate ct; but they might be identical.... VerticalCTBuilder vctb = new WRFEtaTransformBuilder(coords, cs); coords.addVerticalCTBuilder(vctb); cs.addCoordinateTransformByName(vctb.getTransformName()); diff --git a/cdm/core/src/main/java/ucar/nc2/internal/iosp/hdf4/H4iosp.java b/cdm/core/src/main/java/ucar/nc2/internal/iosp/hdf4/H4iosp.java index 808069ba20..3ddaf9032a 100644 --- a/cdm/core/src/main/java/ucar/nc2/internal/iosp/hdf4/H4iosp.java +++ b/cdm/core/src/main/java/ucar/nc2/internal/iosp/hdf4/H4iosp.java @@ -440,7 +440,7 @@ public LayoutBBTiled.DataChunk next() { } private class DataChunk implements LayoutBBTiled.DataChunk { - private int[] offset; // offset index of this chunk, reletive to entire array + private int[] offset; // offset index of this chunk, relative to entire array private H4header.SpecialComp compress; private ByteBuffer bb; // the data is placed into here diff --git a/cdm/core/src/main/java/ucar/nc2/internal/iosp/hdf5/H5headerNew.java b/cdm/core/src/main/java/ucar/nc2/internal/iosp/hdf5/H5headerNew.java index 4c9111e0d9..aa3aa8491c 100644 --- a/cdm/core/src/main/java/ucar/nc2/internal/iosp/hdf5/H5headerNew.java +++ b/cdm/core/src/main/java/ucar/nc2/internal/iosp/hdf5/H5headerNew.java @@ -1059,7 +1059,7 @@ private Array readAttributeData(MessageAttribute matt, H5headerNew.Vinfo vinfo, } StructureMembers.MemberBuilder mb = builder.addMember(h5sm.name, null, null, dt, dim); - if (h5sm.mdt.endian >= 0) // apparently each member may have seperate byte order (!!!??) + if (h5sm.mdt.endian >= 0) // apparently each member may have separate byte order (!!!??) mb.setDataObject( h5sm.mdt.endian == RandomAccessFile.LITTLE_ENDIAN ? ByteOrder.LITTLE_ENDIAN : ByteOrder.BIG_ENDIAN); mb.setDataParam(h5sm.offset); // offset since start of Structure diff --git a/cdm/core/src/main/java/ucar/nc2/internal/iosp/hdf5/H5iospNew.java b/cdm/core/src/main/java/ucar/nc2/internal/iosp/hdf5/H5iospNew.java index b3e4d95751..5b0039d2ae 100644 --- a/cdm/core/src/main/java/ucar/nc2/internal/iosp/hdf5/H5iospNew.java +++ b/cdm/core/src/main/java/ucar/nc2/internal/iosp/hdf5/H5iospNew.java @@ -443,7 +443,7 @@ private boolean convertStructure(Structure s, StructureMembers sm) { assert v2 != null; H5headerNew.Vinfo vm = (H5headerNew.Vinfo) v2.getSPobject(); - // apparently each member may have seperate byte order (!!!??) + // apparently each member may have separate byte order (!!!??) if (vm.typeInfo.endian >= 0) m.setDataObject( vm.typeInfo.endian == RandomAccessFile.LITTLE_ENDIAN ? ByteOrder.LITTLE_ENDIAN : ByteOrder.BIG_ENDIAN); diff --git a/cdm/core/src/main/java/ucar/nc2/internal/iosp/hdf5/H5objects.java b/cdm/core/src/main/java/ucar/nc2/internal/iosp/hdf5/H5objects.java index dc63b725c7..0d80e275a4 100644 --- a/cdm/core/src/main/java/ucar/nc2/internal/iosp/hdf5/H5objects.java +++ b/cdm/core/src/main/java/ucar/nc2/internal/iosp/hdf5/H5objects.java @@ -2519,7 +2519,7 @@ class HeapIdentifier { // the heap id is has already been read into a byte array at given pos HeapIdentifier(ByteBuffer bb, int pos) { bb.order(ByteOrder.LITTLE_ENDIAN); // header information is in le byte order - bb.position(pos); // reletive reading + bb.position(pos); // relative reading nelems = bb.getInt(); heapAddress = header.isOffsetLong ? bb.getLong() : (long) bb.getInt(); index = bb.getInt(); diff --git a/cdm/core/src/main/java/ucar/nc2/internal/iosp/hdf5/H5tiledLayout.java b/cdm/core/src/main/java/ucar/nc2/internal/iosp/hdf5/H5tiledLayout.java index 7cdd30167c..6db5dd72db 100644 --- a/cdm/core/src/main/java/ucar/nc2/internal/iosp/hdf5/H5tiledLayout.java +++ b/cdm/core/src/main/java/ucar/nc2/internal/iosp/hdf5/H5tiledLayout.java @@ -41,7 +41,7 @@ public H5tiledLayout(H5headerNew.Vinfo vinfo, DataType dtype, Section wantSectio assert vinfo.btree != null; // we have to translate the want section into the same rank as the storageSize, in order to be able to call - // Section.intersect(). It appears that storageSize (actually msl.chunkSize) may have an extra dimension, reletive + // Section.intersect(). It appears that storageSize (actually msl.chunkSize) may have an extra dimension, relative // to the Variable. if ((dtype == DataType.CHAR) && (wantSection.getRank() < vinfo.storageSize.length)) { this.want = Section.builder().appendRanges(wantSection.getRanges()).appendRange(1).build(); diff --git a/cdm/core/src/main/java/ucar/nc2/internal/iosp/hdf5/H5tiledLayoutBB.java b/cdm/core/src/main/java/ucar/nc2/internal/iosp/hdf5/H5tiledLayoutBB.java index 27524be057..4565885dcf 100644 --- a/cdm/core/src/main/java/ucar/nc2/internal/iosp/hdf5/H5tiledLayoutBB.java +++ b/cdm/core/src/main/java/ucar/nc2/internal/iosp/hdf5/H5tiledLayoutBB.java @@ -78,7 +78,7 @@ public H5tiledLayoutBB(Variable v2, Section wantSection, RandomAccessFile raf, F this.byteOrder = byteOrder; // we have to translate the want section into the same rank as the storageSize, in order to be able to call - // Section.intersect(). It appears that storageSize (actually msl.chunkSize) may have an extra dimension, reletive + // Section.intersect(). It appears that storageSize (actually msl.chunkSize) may have an extra dimension, relative // to the Variable. DataType dtype = v2.getDataType(); if ((dtype == DataType.CHAR) && (wantSection.getRank() < vinfo.storageSize.length)) { diff --git a/cdm/core/src/main/java/ucar/nc2/internal/ncml/AggDataset.java b/cdm/core/src/main/java/ucar/nc2/internal/ncml/AggDataset.java index 74cb2e1a49..6ef7bb8bf3 100644 --- a/cdm/core/src/main/java/ucar/nc2/internal/ncml/AggDataset.java +++ b/cdm/core/src/main/java/ucar/nc2/internal/ncml/AggDataset.java @@ -159,7 +159,7 @@ protected Array read(Variable mainv, CancelTask cancelTask) throws IOException { * * @param mainv aggregated Variable * @param cancelTask let user cancel - * @param section reletive to the local Variable + * @param section relative to the local Variable * @return the complete Array for mainv * @throws IOException on I/O error * @throws InvalidRangeException on section error diff --git a/cdm/core/src/main/java/ucar/nc2/internal/ncml/AggDatasetOuter.java b/cdm/core/src/main/java/ucar/nc2/internal/ncml/AggDatasetOuter.java index c77b3fe611..8508dea591 100644 --- a/cdm/core/src/main/java/ucar/nc2/internal/ncml/AggDatasetOuter.java +++ b/cdm/core/src/main/java/ucar/nc2/internal/ncml/AggDatasetOuter.java @@ -30,7 +30,7 @@ class AggDatasetOuter extends AggDataset { private final AggregationOuter aggregationOuter; @Nullable - final String coordValue; // if theres a coordValue on the netcdf element - may be multiple, blank seperated + final String coordValue; // if theres a coordValue on the netcdf element - may be multiple, blank separated final Date coordValueDate; // if its a date final boolean isStringValued; // if coordinat is a String @@ -84,7 +84,7 @@ class AggDatasetOuter extends AggDataset { } } - // allow coordValue attribute on JOIN_EXISTING, may be multiple values seperated by blanks or commas + // allow coordValue attribute on JOIN_EXISTING, may be multiple values separated by blanks or commas if ((aggregationOuter.type == Type.joinExisting) && (coordValueS != null)) { StringTokenizer stoker = new StringTokenizer(coordValueS, " ,"); this.ncoord = stoker.countTokens(); @@ -208,13 +208,13 @@ protected int setStartEnd(int aggStart, CancelTask cancelTask) throws IOExceptio } /** - * Get the desired Range, reletive to this Dataset, if no overlap, return null. + * Get the desired Range, relative to this Dataset, if no overlap, return null. *

* wantStart, wantStop are the indices in the aggregated dataset, wantStart <= i < wantEnd. * if this overlaps, set the Range required for the nested dataset. * note this should handle strides ok. * - * @param totalRange desired range, reletive to aggregated dimension. + * @param totalRange desired range, relative to aggregated dimension. * @return desired Range or null if theres nothing wanted from this datase. * @throws InvalidRangeException if invalid range request */ diff --git a/cdm/core/src/main/java/ucar/nc2/internal/ncml/NcmlReader.java b/cdm/core/src/main/java/ucar/nc2/internal/ncml/NcmlReader.java index b3b40619de..260ac089b3 100644 --- a/cdm/core/src/main/java/ucar/nc2/internal/ncml/NcmlReader.java +++ b/cdm/core/src/main/java/ucar/nc2/internal/ncml/NcmlReader.java @@ -299,7 +299,7 @@ public static NetcdfDataset.Builder mergeNcml(NetcdfFile ref, @Nullable Element * This is an internal method, users should use {@link NetcdfDatasets#openNcmlDataset(Reader, String, CancelTask)} * * @param r the Reader containing the NcML document - * @param ncmlLocation the URL location string of the NcML document, used to resolve reletive path of the referenced + * @param ncmlLocation the URL location string of the NcML document, used to resolve relative path of the referenced * dataset, * or may be just a unique name for caching purposes. * @param cancelTask allow user to cancel the task; may be null @@ -408,7 +408,7 @@ public static NetcdfDataset.Builder readNcml(String ncmlLocation, String referen * This sets up the target dataset and the referenced dataset. only place that iospParam is processed, so everything * must go through here * - * @param ncmlLocation the URL location string of the NcML document, used to resolve reletive path of the referenced + * @param ncmlLocation the URL location string of the NcML document, used to resolve relative path of the referenced * dataset, or * may be just a unique name for caching purposes. * @param referencedDatasetUri refers to this dataset (may be null) @@ -487,7 +487,7 @@ private NetcdfDataset.Builder readNcml(String ncmlLocation, @Nullable String ref *

* This is a bit tricky, because it handles several cases When targetDS == refds, we are just modifying targetDS. When * targetDS != refds, - * we keep them seperate, and copy from refds to newds. + * we keep them separate, and copy from refds to newds. *

* The user may be defining new elements or modifying old ones. The only way to tell is by seeing if the elements * already exist. diff --git a/cdm/core/src/main/java/ucar/nc2/iosp/IndexChunker.java b/cdm/core/src/main/java/ucar/nc2/iosp/IndexChunker.java index 7860107095..73fc3a0b93 100644 --- a/cdm/core/src/main/java/ucar/nc2/iosp/IndexChunker.java +++ b/cdm/core/src/main/java/ucar/nc2/iosp/IndexChunker.java @@ -170,7 +170,7 @@ private static class Dim { long stride; // number of elements long maxSize; // number of elements - must be a long since we may merge Range want; // desired Range - int wantSize; // keep seperate from want so we can modify when merging + int wantSize; // keep separate from want so we can modify when merging Dim(long byteStride, int maxSize, Range want) { this.stride = byteStride; diff --git a/cdm/core/src/main/java/ucar/nc2/iosp/IndexChunkerTiled.java b/cdm/core/src/main/java/ucar/nc2/iosp/IndexChunkerTiled.java index 927dcdf611..d23bd87dce 100644 --- a/cdm/core/src/main/java/ucar/nc2/iosp/IndexChunkerTiled.java +++ b/cdm/core/src/main/java/ucar/nc2/iosp/IndexChunkerTiled.java @@ -66,7 +66,7 @@ public IndexChunkerTiled(Section dataSection, Section wantSection) throws Invali int varRank = intersect.getRank(); // create the List - // Section shifted = intersect.shiftOrigin(dataSection); // want reletive to dataSection + // Section shifted = intersect.shiftOrigin(dataSection); // want relative to dataSection int wantStride = 1; int dataStride = 1; for (int ii = varRank - 1; ii >= 0; ii--) { diff --git a/cdm/core/src/main/java/ucar/nc2/iosp/hdf4/H4iosp.java b/cdm/core/src/main/java/ucar/nc2/iosp/hdf4/H4iosp.java index 9ab4b7c711..16ad6a5667 100644 --- a/cdm/core/src/main/java/ucar/nc2/iosp/hdf4/H4iosp.java +++ b/cdm/core/src/main/java/ucar/nc2/iosp/hdf4/H4iosp.java @@ -388,7 +388,7 @@ public LayoutBBTiled.DataChunk next() { } private class DataChunk implements LayoutBBTiled.DataChunk { - private int[] offset; // offset index of this chunk, reletive to entire array + private int[] offset; // offset index of this chunk, relative to entire array private H4header.SpecialComp compress; private ByteBuffer bb; // the data is placed into here diff --git a/cdm/core/src/main/java/ucar/nc2/iosp/hdf5/H5header.java b/cdm/core/src/main/java/ucar/nc2/iosp/hdf5/H5header.java index 536c971aea..6dea73a27e 100644 --- a/cdm/core/src/main/java/ucar/nc2/iosp/hdf5/H5header.java +++ b/cdm/core/src/main/java/ucar/nc2/iosp/hdf5/H5header.java @@ -30,7 +30,7 @@ /* * Implementation notes - * any field called address is actually reletive to the base address. + * any field called address is actually relative to the base address. * any field called filePos or dataPos is a byte offset within the file. */ /* @@ -1069,7 +1069,7 @@ private Array readAttributeData(H5header.MessageAttribute matt, H5header.Vinfo v } StructureMembers.Member m = sm.addMember(h5sm.name, null, null, dt, dim); - if (h5sm.mdt.endian >= 0) // apparently each member may have seperate byte order (!!!??) + if (h5sm.mdt.endian >= 0) // apparently each member may have separate byte order (!!!??) m.setDataObject( h5sm.mdt.endian == RandomAccessFile.LITTLE_ENDIAN ? ByteOrder.LITTLE_ENDIAN : ByteOrder.BIG_ENDIAN); m.setDataParam((h5sm.offset)); // offset since start of Structure @@ -4802,7 +4802,7 @@ class HeapIdentifier { // the heap id is has already been read into a byte array at given pos HeapIdentifier(ByteBuffer bb, int pos) { bb.order(ByteOrder.LITTLE_ENDIAN); // header information is in le byte order - bb.position(pos); // reletive reading + bb.position(pos); // relative reading nelems = bb.getInt(); heapAddress = isOffsetLong ? bb.getLong() : (long) bb.getInt(); index = bb.getInt(); diff --git a/cdm/core/src/main/java/ucar/nc2/iosp/hdf5/H5iosp.java b/cdm/core/src/main/java/ucar/nc2/iosp/hdf5/H5iosp.java index e96d8ac2a8..726e08863f 100644 --- a/cdm/core/src/main/java/ucar/nc2/iosp/hdf5/H5iosp.java +++ b/cdm/core/src/main/java/ucar/nc2/iosp/hdf5/H5iosp.java @@ -397,7 +397,7 @@ private boolean convertStructure(Structure s, StructureMembers sm) { assert v2 != null; H5header.Vinfo vm = (H5header.Vinfo) v2.getSPobject(); - // apparently each member may have seperate byte order (!!!??) + // apparently each member may have separate byte order (!!!??) if (vm.typeInfo.endian >= 0) m.setDataObject( vm.typeInfo.endian == RandomAccessFile.LITTLE_ENDIAN ? ByteOrder.LITTLE_ENDIAN : ByteOrder.BIG_ENDIAN); diff --git a/cdm/core/src/main/java/ucar/nc2/iosp/hdf5/H5tiledLayout.java b/cdm/core/src/main/java/ucar/nc2/iosp/hdf5/H5tiledLayout.java index 97e526e47f..681c76741e 100644 --- a/cdm/core/src/main/java/ucar/nc2/iosp/hdf5/H5tiledLayout.java +++ b/cdm/core/src/main/java/ucar/nc2/iosp/hdf5/H5tiledLayout.java @@ -41,7 +41,7 @@ public H5tiledLayout(H5header.Vinfo vinfo, DataType dtype, Section wantSection) assert vinfo.btree != null; // we have to translate the want section into the same rank as the storageSize, in order to be able to call - // Section.intersect(). It appears that storageSize (actually msl.chunkSize) may have an extra dimension, reletive + // Section.intersect(). It appears that storageSize (actually msl.chunkSize) may have an extra dimension, relative // to the Variable. if ((dtype == DataType.CHAR) && (wantSection.getRank() < vinfo.storageSize.length)) { this.want = Section.builder().appendRanges(wantSection.getRanges()).appendRange(1).build(); diff --git a/cdm/core/src/main/java/ucar/nc2/iosp/hdf5/H5tiledLayoutBB.java b/cdm/core/src/main/java/ucar/nc2/iosp/hdf5/H5tiledLayoutBB.java index e1c5182f4a..5adefcc4fb 100644 --- a/cdm/core/src/main/java/ucar/nc2/iosp/hdf5/H5tiledLayoutBB.java +++ b/cdm/core/src/main/java/ucar/nc2/iosp/hdf5/H5tiledLayoutBB.java @@ -75,7 +75,7 @@ public H5tiledLayoutBB(Variable v2, Section wantSection, RandomAccessFile raf, H this.byteOrder = byteOrder; // we have to translate the want section into the same rank as the storageSize, in order to be able to call - // Section.intersect(). It appears that storageSize (actually msl.chunkSize) may have an extra dimension, reletive + // Section.intersect(). It appears that storageSize (actually msl.chunkSize) may have an extra dimension, relative // to the Variable. DataType dtype = v2.getDataType(); if ((dtype == DataType.CHAR) && (wantSection.getRank() < vinfo.storageSize.length)) { diff --git a/cdm/core/src/main/java/ucar/nc2/ncml/Aggregation.java b/cdm/core/src/main/java/ucar/nc2/ncml/Aggregation.java index c309699403..27b3ddd815 100644 --- a/cdm/core/src/main/java/ucar/nc2/ncml/Aggregation.java +++ b/cdm/core/src/main/java/ucar/nc2/ncml/Aggregation.java @@ -678,7 +678,7 @@ protected Array read(Variable mainv, CancelTask cancelTask) throws IOException { * * @param mainv aggregated Variable * @param cancelTask let user cancel - * @param section reletive to the local Variable + * @param section relative to the local Variable * @return the complete Array for mainv * @throws IOException on I/O error * @throws InvalidRangeException on section error diff --git a/cdm/core/src/main/java/ucar/nc2/ncml/AggregationOuterDimension.java b/cdm/core/src/main/java/ucar/nc2/ncml/AggregationOuterDimension.java index 1dc7830a8a..d2f2dea267 100644 --- a/cdm/core/src/main/java/ucar/nc2/ncml/AggregationOuterDimension.java +++ b/cdm/core/src/main/java/ucar/nc2/ncml/AggregationOuterDimension.java @@ -552,7 +552,7 @@ protected Dataset makeDataset(MFile dset) { class DatasetOuterDimension extends Dataset { protected int ncoord; // number of coordinates in outer dimension for this dataset - protected String coordValue; // if theres a coordValue on the netcdf element - may be multiple, blank seperated + protected String coordValue; // if theres a coordValue on the netcdf element - may be multiple, blank separated protected Date coordValueDate; // if its a date protected boolean isStringValued; private int aggStart, aggEnd; // index in aggregated dataset; aggStart <= i < aggEnd @@ -599,7 +599,7 @@ protected DatasetOuterDimension(String cacheName, String location, String id, St } } - // allow coordValue attribute on JOIN_EXISTING, may be multiple values seperated by blanks or commas + // allow coordValue attribute on JOIN_EXISTING, may be multiple values separated by blanks or commas if ((type == Type.joinExisting) && (coordValueS != null)) { StringTokenizer stoker = new StringTokenizer(coordValueS, " ,"); this.ncoord = stoker.countTokens(); @@ -712,13 +712,13 @@ protected int setStartEnd(int aggStart, CancelTask cancelTask) throws IOExceptio } /** - * Get the desired Range, reletive to this Dataset, if no overlap, return null. + * Get the desired Range, relative to this Dataset, if no overlap, return null. *

* wantStart, wantStop are the indices in the aggregated dataset, wantStart <= i < wantEnd. * if this overlaps, set the Range required for the nested dataset. * note this should handle strides ok. * - * @param totalRange desired range, reletive to aggregated dimension. + * @param totalRange desired range, relative to aggregated dimension. * @return desired Range or null if theres nothing wanted from this datase. * @throws InvalidRangeException if invalid range request */ diff --git a/cdm/core/src/main/java/ucar/nc2/ncml/NcMLReader.java b/cdm/core/src/main/java/ucar/nc2/ncml/NcMLReader.java index 94065de747..189a8a2abd 100644 --- a/cdm/core/src/main/java/ucar/nc2/ncml/NcMLReader.java +++ b/cdm/core/src/main/java/ucar/nc2/ncml/NcMLReader.java @@ -322,7 +322,7 @@ public static NetcdfDataset readNcML(Reader r, CancelTask cancelTask) throws IOE * eg: NcMLReader.readNcML(new StringReader(ncml), location, null); * * @param r the Reader containing the NcML document - * @param ncmlLocation the URL location string of the NcML document, used to resolve reletive path of the referenced + * @param ncmlLocation the URL location string of the NcML document, used to resolve relative path of the referenced * dataset, * or may be just a unique name for caching purposes. * @param cancelTask allow user to cancel the task; may be null @@ -357,7 +357,7 @@ public static NetcdfDataset readNcML(Reader r, String ncmlLocation, CancelTask c /** * Read NcML from a JDOM Document, and construct a NetcdfDataset. * - * @param ncmlLocation the URL location string of the NcML document, used to resolve reletive path of the referenced + * @param ncmlLocation the URL location string of the NcML document, used to resolve relative path of the referenced * dataset, * or may be just a unique name for caching purposes. * @param netcdfElem the JDOM Document's root (netcdf) element @@ -385,7 +385,7 @@ public static NetcdfDataset readNcML(String ncmlLocation, Element netcdfElem, Ca * @param netcdfElem the JDOM Document's root (netcdf) element * @param referencedDatasetUri the URL location string of the underlying dataset, which overrides anything in * netcdfElem. - * prepend with "file:" to eliminate reletive resolving against ncmlLocation + * prepend with "file:" to eliminate relative resolving against ncmlLocation * @param cancelTask allow user to cancel the task; may be null * @return the resulting NetcdfDataset * @throws IOException on read error, or bad referencedDatasetUri URI @@ -405,7 +405,7 @@ public static NetcdfDataset readNcML(String ncmlLocation, Element netcdfElem, St * This sets up the target dataset and the referenced dataset. * only place that iospParam is processed, so everything must go through here * - * @param ncmlLocation the URL location string of the NcML document, used to resolve reletive path of the referenced + * @param ncmlLocation the URL location string of the NcML document, used to resolve relative path of the referenced * dataset, * or may be just a unique name for caching purposes. * @param referencedDatasetUri refers to this dataset (may be null) @@ -469,7 +469,7 @@ private NetcdfDataset _readNcML(String ncmlLocation, String referencedDatasetUri explicit = (elemE != null); // general idea is that we just modify the referenced dataset - // the exception is when explicit is specified, then we keep them seperate. + // the exception is when explicit is specified, then we keep them separate. // refds != null refds == null // explicit refds!=new new (ref=new) // readMetadata modify (new=ref) new (ref=new) @@ -499,7 +499,7 @@ private NetcdfDataset _readNcML(String ncmlLocation, String referencedDatasetUri *

* This is a bit tricky, because it handles several cases * When targetDS == refds, we are just modifying targetDS. - * When targetDS != refds, we keep them seperate, and copy from refds to newds. + * When targetDS != refds, we keep them separate, and copy from refds to newds. *

* The user may be defining new elements or modifying old ones. The only way to tell is by seeing * if the elements already exist. diff --git a/cdm/core/src/main/java/ucar/nc2/units/DateUnit.java b/cdm/core/src/main/java/ucar/nc2/units/DateUnit.java index 9f3c2b92c4..ef87fcd1f3 100644 --- a/cdm/core/src/main/java/ucar/nc2/units/DateUnit.java +++ b/cdm/core/src/main/java/ucar/nc2/units/DateUnit.java @@ -14,7 +14,7 @@ * "1203 days since 1970-01-01 00:00:00". *

* This is a wrapper around ucar.units package. - * It tracks the value, the base time unit, and the date origin seperately. + * It tracks the value, the base time unit, and the date origin separately. * * @author caron */ diff --git a/cdm/core/src/main/java/ucar/nc2/util/DiskCache2.java b/cdm/core/src/main/java/ucar/nc2/util/DiskCache2.java index 7d3b0f1929..72beee5b4d 100644 --- a/cdm/core/src/main/java/ucar/nc2/util/DiskCache2.java +++ b/cdm/core/src/main/java/ucar/nc2/util/DiskCache2.java @@ -17,7 +17,7 @@ * This starts up a thread to periodically scour itself; be sure to call exit() to terminate the thread. * *

- * Each DiskCache has a "root directory", which may be set as an absolute path, or reletive to the + * Each DiskCache has a "root directory", which may be set as an absolute path, or relative to the * DiskCache "home directory". The root directory must be writeable. * * The DiskCache home directory is set in the following order: @@ -102,15 +102,15 @@ private DiskCache2() {} * Create a cache on disk. Use default policy (CachePathPolicy.NestedDirectory) * * @param root the root directory of the cache. Must be writeable. - * @param reletiveToHome if the root directory is relative to the cache home directory. + * @param relativeToHome if the root directory is relative to the cache home directory. * @param persistMinutes a file is deleted if its last modified time is greater than persistMinutes * @param scourEveryMinutes how often to run the scour process. If <= 0, don't scour. */ - public DiskCache2(String root, boolean reletiveToHome, int persistMinutes, int scourEveryMinutes) { + public DiskCache2(String root, boolean relativeToHome, int persistMinutes, int scourEveryMinutes) { this.persistMinutes = persistMinutes; this.scourEveryMinutes = scourEveryMinutes; - if (reletiveToHome) { + if (relativeToHome) { String home = System.getProperty("nj22.cachePersistRoot"); if (home == null) diff --git a/cdm/core/src/main/java/ucar/nc2/util/URLnaming.java b/cdm/core/src/main/java/ucar/nc2/util/URLnaming.java index 1bcc212cfa..60555acb1b 100644 --- a/cdm/core/src/main/java/ucar/nc2/util/URLnaming.java +++ b/cdm/core/src/main/java/ucar/nc2/util/URLnaming.java @@ -32,7 +32,7 @@ public static String canonicalizeWrite(String location) { * If baseURi is not a file: scheme, then URI.resolve is called. * Otherwise the last "/" is found in the base, and the ref is appended to it. *

- * For file: baseURLS: only reletive URLS not starting with / are supported. This is + * For file: baseURLS: only relative URLS not starting with / are supported. This is * apparently different from the behavior of URI.resolve(), so may be trouble, * but it allows NcML absolute location to be specified without the file: prefix. *

@@ -45,7 +45,7 @@ public static String canonicalizeWrite(String location) { * * * @param baseUri base URI as a Strng - * @param relativeUri reletive URI, as a String + * @param relativeUri relative URI, as a String * @return the resolved URI as a String */ public static String resolve(String baseUri, String relativeUri) { @@ -58,7 +58,7 @@ public static String resolve(String baseUri, String relativeUri) { // deal with a base file URL if (baseUri.startsWith("file:")) { - // the case where the reletiveURL is absolute. + // the case where the relativeURL is absolute. // unfortunately, we may get an Exception try { URI uriRelative = URI.create(relativeUri); diff --git a/cdm/core/src/main/java/ucar/unidata/geoloc/LatLonRect.java b/cdm/core/src/main/java/ucar/unidata/geoloc/LatLonRect.java index 909138c3d9..9844f70840 100644 --- a/cdm/core/src/main/java/ucar/unidata/geoloc/LatLonRect.java +++ b/cdm/core/src/main/java/ucar/unidata/geoloc/LatLonRect.java @@ -480,7 +480,7 @@ public void extend(LatLonRect r) { if (allLongitude) return; - // everything is reletive to current LonMin + // everything is relative to current LonMin double lonMin = getLonMin(); double lonMax = getLonMax(); diff --git a/cdm/core/src/main/java/ucar/unidata/geoloc/projection/UtmProjection.java b/cdm/core/src/main/java/ucar/unidata/geoloc/projection/UtmProjection.java index 9c55616119..94f2510d73 100644 --- a/cdm/core/src/main/java/ucar/unidata/geoloc/projection/UtmProjection.java +++ b/cdm/core/src/main/java/ucar/unidata/geoloc/projection/UtmProjection.java @@ -12,7 +12,7 @@ * Universal Transverse Mercator. * Ellipsoidal earth. *

- * Origin of coordinate system is reletive to the point where the + * Origin of coordinate system is relative to the point where the * central meridian and the equator cross. * This point has x,y value = (500, 0) km for north hemisphere. * and (500, 10,0000) km for south hemisphere. diff --git a/cdm/core/src/main/java/ucar/unidata/util/StringUtil2.java b/cdm/core/src/main/java/ucar/unidata/util/StringUtil2.java index 27aac871ab..174a0d6671 100644 --- a/cdm/core/src/main/java/ucar/unidata/util/StringUtil2.java +++ b/cdm/core/src/main/java/ucar/unidata/util/StringUtil2.java @@ -590,7 +590,7 @@ public static String unescape(String x) { * Cover for String.split, because who can remember regexp? * * @param source split this string - * @return tokens that were seperated by whitespace + * @return tokens that were separated by whitespace * @deprecated use StringUtil2.split() */ @Deprecated diff --git a/cdm/core/src/test/data/thredds/catalog/InvCatalog-1.0.xml b/cdm/core/src/test/data/thredds/catalog/InvCatalog-1.0.xml index 7a8f4cbd12..8d1e87e392 100644 --- a/cdm/core/src/test/data/thredds/catalog/InvCatalog-1.0.xml +++ b/cdm/core/src/test/data/thredds/catalog/InvCatalog-1.0.xml @@ -6,7 +6,7 @@ - + @@ -31,7 +31,7 @@ - + diff --git a/cdm/core/src/test/java/ucar/nc2/util/TestDiskCache.java b/cdm/core/src/test/java/ucar/nc2/util/TestDiskCache.java index f6a8c17a68..215b37a0e1 100644 --- a/cdm/core/src/test/java/ucar/nc2/util/TestDiskCache.java +++ b/cdm/core/src/test/java/ucar/nc2/util/TestDiskCache.java @@ -30,7 +30,7 @@ public void testNotExist() throws Exception { assert !file.canWrite(); } - public void testReletivePath() throws Exception { + public void testRelativePath() throws Exception { String org = System.getProperty("user.dir"); try { System.setProperty("user.dir", TestDir.cdmUnitTestDir); diff --git a/cdm/core/src/test/java/ucar/nc2/util/TestURLnaming.java b/cdm/core/src/test/java/ucar/nc2/util/TestURLnaming.java index f5f1c00c27..a0f3771508 100644 --- a/cdm/core/src/test/java/ucar/nc2/util/TestURLnaming.java +++ b/cdm/core/src/test/java/ucar/nc2/util/TestURLnaming.java @@ -34,7 +34,7 @@ public void testResolve() { private void testResolve(String base, String rel, String result) { System.out.println("baseUri = " + base); - System.out.println("reletiveUri = " + rel); + System.out.println("relativeUri = " + rel); System.out.println("URLnaming.resolve= " + URLnaming.resolve(base, rel)); System.out.println(); if (result != null) diff --git a/cdm/core/src/test/java/ucar/nc2/util/TestUriCreate.java b/cdm/core/src/test/java/ucar/nc2/util/TestUriCreate.java index e3424b2c98..37c275f172 100644 --- a/cdm/core/src/test/java/ucar/nc2/util/TestUriCreate.java +++ b/cdm/core/src/test/java/ucar/nc2/util/TestUriCreate.java @@ -31,7 +31,7 @@ public void testMisc() { } @Test - public void testReletiveFile() throws MalformedURLException, URISyntaxException { + public void testRelativeFile() throws MalformedURLException, URISyntaxException { new URL("file:src/test/data/ncml/nc/"); showUri("src/test/data/ncml/nc/"); diff --git a/cdm/misc/src/main/java/ucar/nc2/iosp/dmsp/DMSPiosp.java b/cdm/misc/src/main/java/ucar/nc2/iosp/dmsp/DMSPiosp.java index aa63d00f5d..ceb49d39ec 100644 --- a/cdm/misc/src/main/java/ucar/nc2/iosp/dmsp/DMSPiosp.java +++ b/cdm/misc/src/main/java/ucar/nc2/iosp/dmsp/DMSPiosp.java @@ -194,7 +194,7 @@ public Array readData(Variable v2, Section section) throws IOException, InvalidR // Make sure the cached data for year, dayOfYear, and secondsOfDay // is available as it is used in the time calculation. // [Note: don't need Arrays returned.] - // @todo Could seperate reading cache from Array production. + // @todo Could separate reading cache from Array production. Variable curVar = this.ncfile.findVariable(VariableInfo.YEAR.getName()); this.readData(curVar, curVar.getShapeAsSection()); diff --git a/docs/src/site/pages/netcdfJava/NcmlCookbook.md b/docs/src/site/pages/netcdfJava/NcmlCookbook.md index 90b36c8318..9c92b99af4 100644 --- a/docs/src/site/pages/netcdfJava/NcmlCookbook.md +++ b/docs/src/site/pages/netcdfJava/NcmlCookbook.md @@ -137,7 +137,7 @@ Create **union** of datasets `cldc.mean.nc` and `lflx.mean.nc` located in the di ~~~ -Create **union** of all datasets ending in `mean.nc` located in the directory `nc` reletive to where the NcML file is found: +Create **union** of all datasets ending in `mean.nc` located in the directory `nc` relative to where the NcML file is found: ~~~xml diff --git a/docs/src/site/pages/netcdfJava/bufrtables.md b/docs/src/site/pages/netcdfJava/bufrtables.md index dfe19980fa..b46312b024 100644 --- a/docs/src/site/pages/netcdfJava/bufrtables.md +++ b/docs/src/site/pages/netcdfJava/bufrtables.md @@ -9,7 +9,7 @@ toc: false ### Standard table mapping -A _standard table_ is a BUFR parameter table that is automatically used by the CDM. A _standard table map_ is an association of a standard table with a center/subcenter/version id. The CDM internally loads one table map located in _bufr.jar_ at /resources/bufrTables/local/tablelookup.csv_. It is a csv (comma seperated value) format: +A _standard table_ is a BUFR parameter table that is automatically used by the CDM. A _standard table map_ is an association of a standard table with a center/subcenter/version id. The CDM internally loads one table map located in _bufr.jar_ at /resources/bufrTables/local/tablelookup.csv_. It is a csv (comma separated value) format: ~~~ # diff --git a/docs/src/site/pages/netcdfJava/developer/DiskCaching.md b/docs/src/site/pages/netcdfJava/developer/DiskCaching.md index 0388679c63..3c985a3820 100644 --- a/docs/src/site/pages/netcdfJava/developer/DiskCaching.md +++ b/docs/src/site/pages/netcdfJava/developer/DiskCaching.md @@ -81,11 +81,11 @@ You can tell the class to scour itself in a background timer by using the constr /** * Create a cache on disk. * @param root the root directory of the cache. Must be writeable. - * @param reletiveToHome if the root directory is reletive to the cache home directory. + * @param relativeToHome if the root directory is relative to the cache home directory. * @param persistMinutes a file is deleted if its last modified time is greater than persistMinutes * @param scourEveryMinutes how often to run the scour process. If <= 0, dont scour. */ - public DiskCache2(String root, boolean reletiveToHome, int persistMinutes, int scourEveryMinutes); + public DiskCache2(String root, boolean relativeToHome, int persistMinutes, int scourEveryMinutes); ~~~ You can change the cache policy from the default CachePathPolicy.OneDirectory by (eg): diff --git a/docs/src/site/pages/netcdfJava/gribfeaturecollections.md b/docs/src/site/pages/netcdfJava/gribfeaturecollections.md index ac0bf40e7d..e6c15dcbee 100644 --- a/docs/src/site/pages/netcdfJava/gribfeaturecollections.md +++ b/docs/src/site/pages/netcdfJava/gribfeaturecollections.md @@ -20,7 +20,7 @@ The GRIB Collections framework has been rewritten in CDM version 4.5, in order t GRIB Collections now keep track of both the reference time and valid time. The collection is partitioned by reference time. A collection with a single reference time will have a single partition with a single time coordinate. A collection with multiple reference times will have partitions for each reference time, plus a PartitionCollection that represents the entire collection. Very large collections should be partitioned by directory and/or file, creating a tree of partitions. -A PartitionCollection has two datasets (kept in seperate groups), the TwoD and the Best dataset. +A PartitionCollection has two datasets (kept in separate groups), the TwoD and the Best dataset. The TwoD dataset has two time coordinates - reference time (aka run time) and forecast time (aka valid time), corresponding to FMRC TwoD datasets. The forecast time is two dimensional, corresponding to all the times available for each reference time. The Best dataset has a single forecast time coordinate, the same as 4.3 GRIB Collections and FMRC Best datasets. If there are multiple GRIB records corresponding to the same forecast time, the record with the smallest offset from its reference time is used. Implementation notes: @@ -30,7 +30,7 @@ For each GRIB file, a grib index is written, named .gbx9. Once wr For each reference time, a cdm index is written, named .ncx2. This occasionally has to be rewritten when new CDM versions are released, or if you modify your GRIB configuration. For each PartitionCollection, a cdm index is written named .ncx2. This must be rewritten if any of the collection files change. The cdm indexing uses extension .ncx2, in order to coexist with the .ncx indexes of previous versions. If you are upgrading to 4.5, and no longer running earlier versions, remove the ncx files (save the gbx9 files). -For large collections, especially if they change, the THREDDS Data Manager (TDM) must be run as a seperate process to update the index files. Generally it is strongly recommended to run the TDM, and configure the TDS to only read and never write the indexes. +For large collections, especially if they change, the THREDDS Data Manager (TDM) must be run as a separate process to update the index files. Generally it is strongly recommended to run the TDM, and configure the TDS to only read and never write the indexes. Collections in the millions of records are now feasible. Java 7 NIO2 package is used to efficiently scan directories. ### Version 4.6 @@ -44,7 +44,7 @@ Global attributes promoted to dataset properties in the catalog Internal changes: Internal memory use has been reduced. Runtime objects are now immutable, which makes caching possible. -RandomAccessFiles are kept in a seperate pool, so they can be cached independent of the Collection objects. +RandomAccessFiles are kept in a separate pool, so they can be cached independent of the Collection objects. (IN PROGRESS FOR VERSION 5) DefaultServices. One can use the service name "DefaultServices" to use the default services for that Feature Type. If you dont specify the service name, DefaultServices is used as the default. DefaultServices use all enabled services appropriate to that Feature Type. @@ -139,7 +139,7 @@ Now suppose that we modify the above example and use timePartition="directory": ~~~ -The collection is divided into partitions. In this case, each file becomes a seperate partition. In order to use this, each file must contain GRIB records from a single runtime. +The collection is divided into partitions. In this case, each file becomes a separate partition. In order to use this, each file must contain GRIB records from a single runtime. The starting time of the partition must be encoded into the filename. One must define a date extractor in the collection specification, or by using a dateFormatMark, as in this example. In this example, the collection is readied when the server starts up. Manual triggers for updating are enabled. @@ -188,7 +188,7 @@ collection path/collection/catalog.xml name path/name/collection partitions path/partitionName/catalog.xml partitionName path/partitionName/collection individual files path/partitionName/files/catalog.xml filename path/files/filename Example 3 (Multiple Groups) : -When a Grib Collection contains multiple horizontal domains (i.e. distinct Grid Definition Sections (GDS)), each domain gets placed into a seperate group. As a rule, one can't tell if there are seperate domains without reading the files. If you open this collection through the CDM (eg using ToolsUI) you would see a dataset that contains groups. The TDS, however, separates groups into different datasets, so that each dataset has only a single (unnamed, aka root) group. +When a Grib Collection contains multiple horizontal domains (i.e. distinct Grid Definition Sections (GDS)), each domain gets placed into a separate group. As a rule, one can't tell if there are separate domains without reading the files. If you open this collection through the CDM (eg using ToolsUI) you would see a dataset that contains groups. The TDS, however, separates groups into different datasets, so that each dataset has only a single (unnamed, aka root) group. ~~~ diff --git a/docs/src/site/pages/netcdfJava/ncmlschema.md b/docs/src/site/pages/netcdfJava/ncmlschema.md index 93025a7990..7aad5977e7 100644 --- a/docs/src/site/pages/netcdfJava/ncmlschema.md +++ b/docs/src/site/pages/netcdfJava/ncmlschema.md @@ -10,7 +10,7 @@ _for version 4.4+ of the Netcdf-Java/CDM library_ An NcML document is an XML document (aka an _instance_ document) whose contents are described and constrained by NcML Schema-2.2. NcML Schema-2.2 combines the earlier _NcML core schema_ which is an XML description of the netCDF-Java / CDM data model, with the earlier _NcML dataset schema_, which allows you to define, redefine, aggregate, and subset existing netCDF files. -An NcML document represents a generic netCDF dataset, i.e. a container for data conforming to the netCDF data model. For instance, it might represent an existing netCDF file, a netCDF file not yet written, a GRIB file read through the netCDF-Java library, a subset of a netCDF file, an aggregation of netCDF files, or a self-contained dataset (i.e. all the data is included in the NcML document and there is no seperate netCDF file holding the data). An NcML document therefore should not necessarily be thought of as a physical netCDF file, but rather the "public interface" to a set of data conforming to the netCDF data model. +An NcML document represents a generic netCDF dataset, i.e. a container for data conforming to the netCDF data model. For instance, it might represent an existing netCDF file, a netCDF file not yet written, a GRIB file read through the netCDF-Java library, a subset of a netCDF file, an aggregation of netCDF files, or a self-contained dataset (i.e. all the data is included in the NcML document and there is no separate netCDF file holding the data). An NcML document therefore should not necessarily be thought of as a physical netCDF file, but rather the "public interface" to a set of data conforming to the netCDF data model. _NcML Schema-2.2_ is written in the W3C XML Schema language, and essentially represents the netCDF-Java / CDM data model, which schematically looks like this in UML @@ -80,7 +80,7 @@ The element _netcdf_ is the root tag of the NcML instance document, and i 2. An optional _iospParam_ element. The NcML inside this element is passed directly to the IOSP. If an iospParam attribute is used, the attribute is used instead. 3. The _netcdf_ element may contain any number (including 0) of elements _group, variable, dimension, or attribute_ that can appear in any order. If you use readMetadata, you can _remove_ specific elements with the remove element. 4. An aggregation element is used to logically join multiple netcdf datasets into a single dataset. -5. The optional _location_ attribute provides a reference to another netCDF dataset, called the _referenced dataset_. The location can be an absolute URL (eg _http://server/myfile_, or _file:/usr/local/data/mine.nc_) or a URL reletive to the NcML location (eg _subdir/mydata.nc_). The referenced dataset contains the variable data that is not explicitly specified in the NcML document itself. If the location is missing and the data is not defined in values elements, then an empty file is written similar to the way CDL files are written by ncgen. +5. The optional _location_ attribute provides a reference to another netCDF dataset, called the _referenced dataset_. The location can be an absolute URL (eg _http://server/myfile_, or _file:/usr/local/data/mine.nc_) or a URL relative to the NcML location (eg _subdir/mydata.nc_). The referenced dataset contains the variable data that is not explicitly specified in the NcML document itself. If the location is missing and the data is not defined in values elements, then an empty file is written similar to the way CDL files are written by ncgen. 6. The optional _id_ attribute is meant to provide a way to uniquely identify (relative to the application context) the NetCDF dataset. It is important to understand that the id attribute refers to the NetCDF dataset defined by the XML instance document, NOT the referenced dataset if there is one. 7. The optional _title_ attribute provides a way to add a human readable title to the netCDF dataset. 8. The optional _enhance_ attribute indicates whether the referenced dataset is opened in enhanced mode, and can be set to _All_, _AllDefer_, _ScaleMissing_, _ScaleMissingDefer_, _CoordSystems_, or _None_ (case insensitive). For backwards compatibility, a value of _true_ means _All_. Default is _None_. See [NetcdfDataset.EnhanceMode](#netcdf_dataset.html#NetcdfDataset.Enhance). diff --git a/docs/src/site/pages/netcdfJava/ncstreamgrammer.md b/docs/src/site/pages/netcdfJava/ncstreamgrammer.md index 1949a4ec28..840cf17d13 100644 --- a/docs/src/site/pages/netcdfJava/ncstreamgrammer.md +++ b/docs/src/site/pages/netcdfJava/ncstreamgrammer.md @@ -131,7 +131,7 @@ in this case, you have to read everything. if buffer has no vlens or strings, co (each struct contains its own heap) -this indicates maybe we should rewrite ArrayStructureBB to have seperate heaps for each struct. +this indicates maybe we should rewrite ArrayStructureBB to have separate heaps for each struct. #### Nested Vlen diff --git a/grib/src/main/java/ucar/nc2/grib/collection/Grib1CollectionBuilder.java b/grib/src/main/java/ucar/nc2/grib/collection/Grib1CollectionBuilder.java index 521b26bec6..b03cd4fac2 100644 --- a/grib/src/main/java/ucar/nc2/grib/collection/Grib1CollectionBuilder.java +++ b/grib/src/main/java/ucar/nc2/grib/collection/Grib1CollectionBuilder.java @@ -119,7 +119,7 @@ public List makeGroups(List allFiles, boolea // GdsHashObject gdsHashObject = new GdsHashObject(gr.getGDS(), hashOverride); CalendarDate runtimeDate = gr.getReferenceDate(); - long runtime = singleRuntime ? runtimeDate.getMillis() : 0; // seperate Groups for each runtime, if + long runtime = singleRuntime ? runtimeDate.getMillis() : 0; // separate Groups for each runtime, if // singleRuntime is true GroupAndRuntime gar = new GroupAndRuntime(hashCode, runtime); Grib1CollectionWriter.Group g = gdsMap.get(gar); diff --git a/grib/src/main/java/ucar/nc2/grib/collection/Grib1CollectionWriter.java b/grib/src/main/java/ucar/nc2/grib/collection/Grib1CollectionWriter.java index 1706b9b2a4..b4fa3f1d7f 100644 --- a/grib/src/main/java/ucar/nc2/grib/collection/Grib1CollectionWriter.java +++ b/grib/src/main/java/ucar/nc2/grib/collection/Grib1CollectionWriter.java @@ -151,7 +151,7 @@ boolean writeIndex(String name, File idxFile, CoordinateRuntime masterRuntime, L /* * message GribCollection { * string name = 1; // must be unique - index filename is name.ncx - * string topDir = 2; // MFile, Partition filenames are reletive to this + * string topDir = 2; // MFile, Partition filenames are relative to this * repeated MFile mfiles = 3; // list of grib MFiles * repeated Dataset dataset = 4; * repeated Gds gds = 5; // unique Gds, shared amongst datasets diff --git a/grib/src/main/java/ucar/nc2/grib/collection/Grib2CollectionBuilder.java b/grib/src/main/java/ucar/nc2/grib/collection/Grib2CollectionBuilder.java index 56f47a8854..1fd48a0ba8 100644 --- a/grib/src/main/java/ucar/nc2/grib/collection/Grib2CollectionBuilder.java +++ b/grib/src/main/java/ucar/nc2/grib/collection/Grib2CollectionBuilder.java @@ -118,7 +118,7 @@ public List makeGroups(List allFiles, boolea // GdsHashObject gdsHashObject = new GdsHashObject(gr.getGDS(), hashCode); CalendarDate runtimeDate = gr.getReferenceDate(); - long runtime = singleRuntime ? runtimeDate.getMillis() : 0; // seperate Groups for each runtime, if + long runtime = singleRuntime ? runtimeDate.getMillis() : 0; // separate Groups for each runtime, if // singleRuntime is true GroupAndRuntime gar = new GroupAndRuntime(hashCode, runtime); Grib2CollectionWriter.Group g = gdsMap.get(gar); diff --git a/grib/src/main/java/ucar/nc2/grib/collection/Grib2CollectionWriter.java b/grib/src/main/java/ucar/nc2/grib/collection/Grib2CollectionWriter.java index 651179dbfb..a294f9cb83 100644 --- a/grib/src/main/java/ucar/nc2/grib/collection/Grib2CollectionWriter.java +++ b/grib/src/main/java/ucar/nc2/grib/collection/Grib2CollectionWriter.java @@ -149,7 +149,7 @@ boolean writeIndex(String name, File idxFile, CoordinateRuntime masterRuntime, L /* * message GribCollection { * string name = 1; // must be unique - index filename is name.ncx - * string topDir = 2; // MFile, Partition filenames are reletive to this + * string topDir = 2; // MFile, Partition filenames are relative to this * repeated MFile mfiles = 3; // list of grib MFiles * repeated Dataset dataset = 4; * repeated Gds gds = 5; // unique Gds, shared amongst datasets diff --git a/grib/src/main/java/ucar/nc2/grib/collection/GribCdmIndex.java b/grib/src/main/java/ucar/nc2/grib/collection/GribCdmIndex.java index bf353e06fd..3d7f1113f5 100644 --- a/grib/src/main/java/ucar/nc2/grib/collection/GribCdmIndex.java +++ b/grib/src/main/java/ucar/nc2/grib/collection/GribCdmIndex.java @@ -355,7 +355,7 @@ public static boolean updateGribCollection(boolean isGrib1, MCollection dcm, Col return false; boolean changed; - if (isGrib1) { // existing case handles correctly - make seperate index for each runtime (OR) partition == runtime + if (isGrib1) { // existing case handles correctly - make separate index for each runtime (OR) partition == runtime Grib1CollectionBuilder builder = new Grib1CollectionBuilder(dcm.getCollectionName(), dcm, logger); changed = builder.updateNeeded(updateType) && builder.createIndex(ptype, errlog); } else { diff --git a/grib/src/main/java/ucar/nc2/grib/collection/GribCollectionBuilder.java b/grib/src/main/java/ucar/nc2/grib/collection/GribCollectionBuilder.java index b29f7f6f4c..f0cd86b0ae 100644 --- a/grib/src/main/java/ucar/nc2/grib/collection/GribCollectionBuilder.java +++ b/grib/src/main/java/ucar/nc2/grib/collection/GribCollectionBuilder.java @@ -186,7 +186,7 @@ else if (allTimesAreUnique) } // PartitionType = all; not currently used but leave it here in case it needs to be revived - // creates seperate collection and index for each runtime. + // creates separate collection and index for each runtime. private boolean createAllRuntimeCollections(Formatter errlog) throws IOException { long start = System.currentTimeMillis(); this.type = GribCollectionImmutable.Type.SRC; diff --git a/grib/src/main/java/ucar/nc2/grib/collection/GribCollectionBuilderFromIndex.java b/grib/src/main/java/ucar/nc2/grib/collection/GribCollectionBuilderFromIndex.java index e565bbfeb2..412a6aac5c 100644 --- a/grib/src/main/java/ucar/nc2/grib/collection/GribCollectionBuilderFromIndex.java +++ b/grib/src/main/java/ucar/nc2/grib/collection/GribCollectionBuilderFromIndex.java @@ -107,7 +107,7 @@ protected boolean readIndex(RandomAccessFile raf) { /* * message GribCollection { * required string name = 1; // must be unique - index filename is name.ncx - * required string topDir = 2; // filenames are reletive to this + * required string topDir = 2; // filenames are relative to this * repeated MFile mfiles = 3; // list of grib MFiles * repeated Dataset dataset = 4; * repeated Gds gds = 5; // unique Gds, shared amongst datasets diff --git a/grib/src/main/java/ucar/nc2/grib/collection/GribCollectionImmutable.java b/grib/src/main/java/ucar/nc2/grib/collection/GribCollectionImmutable.java index e8a7b5b867..f1790e43cd 100644 --- a/grib/src/main/java/ucar/nc2/grib/collection/GribCollectionImmutable.java +++ b/grib/src/main/java/ucar/nc2/grib/collection/GribCollectionImmutable.java @@ -1089,7 +1089,7 @@ RandomAccessFile getDataRaf(int fileno) throws IOException { String filename = mfile.getPath(); File dataFile = new File(filename); - // if data file does not exist, check reletive location - eg may be /upc/share instead of Q: + // if data file does not exist, check relative location - eg may be /upc/share instead of Q: if (!dataFile.exists()) { if (fileMap.size() == 1) { dataFile = new File(directory, name); // single file case diff --git a/grib/src/main/java/ucar/nc2/grib/collection/GribPartitionBuilder.java b/grib/src/main/java/ucar/nc2/grib/collection/GribPartitionBuilder.java index 64b689a320..13aed76691 100644 --- a/grib/src/main/java/ucar/nc2/grib/collection/GribPartitionBuilder.java +++ b/grib/src/main/java/ucar/nc2/grib/collection/GribPartitionBuilder.java @@ -513,7 +513,7 @@ protected boolean writeIndex(PartitionCollectionMutable pc, Formatter f) throws /* * message GribCollection { * required string name = 1; // must be unique - index filename is name.ncx - * required string topDir = 2; // filenames are reletive to this + * required string topDir = 2; // filenames are relative to this * repeated MFile mfiles = 3; // list of grib MFiles * repeated Dataset dataset = 4; * repeated Gds gds = 5; // unique Gds, shared amongst datasets @@ -550,7 +550,7 @@ protected boolean writeIndex(PartitionCollectionMutable pc, Formatter f) throws int count = 0; for (PartitionCollectionMutable.Partition part : pc.partitions) { GribCollectionProto.MFile.Builder b = GribCollectionProto.MFile.newBuilder(); - String pathRS = makeReletiveFilename(pc, part); // reletive to pc.directory + String pathRS = makeRelativeFilename(pc, part); // relative to pc.directory b.setFilename(pathRS); b.setLastModified(part.getLastModified()); b.setLength(part.fileSize); @@ -596,7 +596,7 @@ protected boolean writeIndex(PartitionCollectionMutable pc, Formatter f) throws return true; } - private String makeReletiveFilename(PartitionCollectionMutable pc, PartitionCollectionMutable.Partition part) { + private String makeRelativeFilename(PartitionCollectionMutable pc, PartitionCollectionMutable.Partition part) { Path topDir = pc.directory.toPath(); Path partPath = new File(part.getDirectory(), part.getFilename()).toPath(); Path pathRelative = topDir.relativize(partPath); @@ -764,7 +764,7 @@ private GribCollectionProto.PartitionVariable writePartitionVariableProto(int pa /* * message Partition { * string name = 1; // name is used in TDS - eg the subdirectory when generated by TimePartitionCollections - * string filename = 2; // the gribCollection.ncx file, reletive to gc. + * string filename = 2; // the gribCollection.ncx file, relative to gc. * string directory = 3; // top directory NOT USED * uint64 lastModified = 4; * int64 length = 5; @@ -774,7 +774,7 @@ private GribCollectionProto.PartitionVariable writePartitionVariableProto(int pa private GribCollectionProto.Partition writePartitionProto(PartitionCollectionMutable pc, PartitionCollectionMutable.Partition p) { GribCollectionProto.Partition.Builder b = GribCollectionProto.Partition.newBuilder(); - String pathRS = makeReletiveFilename(pc, p); // reletive to pc.directory + String pathRS = makeRelativeFilename(pc, p); // relative to pc.directory b.setFilename(pathRS); b.setName(p.name); // b.setDirectory(p.directory); diff --git a/grib/src/main/java/ucar/nc2/grib/collection/PartitionCollectionMutable.java b/grib/src/main/java/ucar/nc2/grib/collection/PartitionCollectionMutable.java index 9827955aad..ac9e85af12 100644 --- a/grib/src/main/java/ucar/nc2/grib/collection/PartitionCollectionMutable.java +++ b/grib/src/main/java/ucar/nc2/grib/collection/PartitionCollectionMutable.java @@ -201,7 +201,7 @@ String getIndexFilenameInCache() { File file = new File(directory, filename); File existingFile = GribIndexCache.getExistingFileOrCache(file.getPath()); if (existingFile == null) { - // try reletive to index file + // try relative to index file File parent = getIndexParentFile(); if (parent == null) return null; diff --git a/grib/src/main/java/ucar/nc2/grib/coord/CoordinateSharerBest.java b/grib/src/main/java/ucar/nc2/grib/coord/CoordinateSharerBest.java index dbd05f5170..7a265bc1ce 100644 --- a/grib/src/main/java/ucar/nc2/grib/coord/CoordinateSharerBest.java +++ b/grib/src/main/java/ucar/nc2/grib/coord/CoordinateSharerBest.java @@ -11,7 +11,7 @@ * Use Coordinate.equals(), hashCode() to find unique coordinate variables. * * Used by GribPartitionBuilder.makeBest(), for all coordinates not CoordinateTime2D and not CoordinateRuntime. - * Best coordinates are translated into equivilent 2D coordinate, thus we dont need seperate CoordinateND. + * Best coordinates are translated into equivilent 2D coordinate, thus we dont need separate CoordinateND. * * @author caron * @since 12/10/13 diff --git a/grib/src/main/java/ucar/nc2/grib/coord/CoordinateTime2D.java b/grib/src/main/java/ucar/nc2/grib/coord/CoordinateTime2D.java index e5a8f68270..3fbe47d69c 100644 --- a/grib/src/main/java/ucar/nc2/grib/coord/CoordinateTime2D.java +++ b/grib/src/main/java/ucar/nc2/grib/coord/CoordinateTime2D.java @@ -58,7 +58,7 @@ public class CoordinateTime2D extends CoordinateTimeAbstract implements Coordina * @param timeUnit time duration, based on code * @param vals complete set of Time2D values, may be null (used only during creation) * @param runtime list of runtimes - * @param times list of times, one for each runtime, offsets reletive to its runtime, may not be null + * @param times list of times, one for each runtime, offsets relative to its runtime, may not be null */ public CoordinateTime2D(int code, CalendarPeriod timeUnit, List vals, CoordinateRuntime runtime, List times, int[] time2runtime) { @@ -91,7 +91,7 @@ public CoordinateTime2D(int code, CalendarPeriod timeUnit, List vals, Co * @param vals complete set of Time2D values, may be null (used only during creation) * @param runtime list of runtimes * @param otime list of offsets, all the same for each runtime - * @param times list of times, one for each runtime, offsets reletive to its runtime, may be null (Only available + * @param times list of times, one for each runtime, offsets relative to its runtime, may be null (Only available * during creation, not stored in index) */ public CoordinateTime2D(int code, CalendarPeriod timeUnit, List vals, CoordinateRuntime runtime, @@ -123,7 +123,7 @@ public CoordinateTime2D(int code, CalendarPeriod timeUnit, List vals, Co * @param vals complete set of Time2D values, may be null (used only during creation) * @param runtime list of runtimes * @param regList list of offsets, one each for each possible runtime hour of day. - * @param times list of times, one for each runtime, offsets reletive to its runtime, may be null (Only available + * @param times list of times, one for each runtime, offsets relative to its runtime, may be null (Only available * during creation, not stored in index) */ public CoordinateTime2D(int code, CalendarPeriod timeUnit, List vals, CoordinateRuntime runtime, @@ -766,7 +766,7 @@ public int findTimeIndexFromVal(int runIdx, Object val) { CoordinateTimeAbstract time = getTimeCoordinate(runIdx); if (time.getNCoords() == 1) return 0; - return time.getIndex(val); // not sure if its reletive to runtime ?? + return time.getIndex(val); // not sure if its relative to runtime ?? } /** diff --git a/grib/src/main/java/ucar/nc2/grib/coord/VertCoordValue.java b/grib/src/main/java/ucar/nc2/grib/coord/VertCoordValue.java index ed85feaa8a..c68f21ce3e 100644 --- a/grib/src/main/java/ucar/nc2/grib/coord/VertCoordValue.java +++ b/grib/src/main/java/ucar/nc2/grib/coord/VertCoordValue.java @@ -67,7 +67,7 @@ public int hashCode() { return Objects.hash(value1, value2, mid, isLayer); } - // cannot do approx equals and be consistent with hashCode, so make seperate call + // cannot do approx equals and be consistent with hashCode, so make separate call public boolean nearlyEquals(VertCoordValue other) { return Misc.nearlyEquals(value1, other.value1) && Misc.nearlyEquals(value2, other.value2); } diff --git a/grib/src/main/java/ucar/nc2/grib/grib1/Grib1Gds.java b/grib/src/main/java/ucar/nc2/grib/grib1/Grib1Gds.java index 85757aaac1..f4f05fe751 100644 --- a/grib/src/main/java/ucar/nc2/grib/grib1/Grib1Gds.java +++ b/grib/src/main/java/ucar/nc2/grib/grib1/Grib1Gds.java @@ -50,7 +50,7 @@ @Immutable public abstract class Grib1Gds { private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(Grib1Gds.class); - static final double maxReletiveErrorPos = .01; // reletive error in position - GRIB numbers sometime miscoded + static final double maxRelativeErrorPos = .01; // relative error in position - GRIB numbers sometime miscoded /* * Code table 6 – Data representation type @@ -517,10 +517,10 @@ public boolean equals(Object o) { } LatLon other = (LatLon) o; - if (!Misc.nearlyEqualsAbs(la1, other.la1, maxReletiveErrorPos * deltaLat)) { - return false; // allow some slop, reletive to grid size + if (!Misc.nearlyEqualsAbs(la1, other.la1, maxRelativeErrorPos * deltaLat)) { + return false; // allow some slop, relative to grid size } - if (!Misc.nearlyEqualsAbs(lo1, other.lo1, maxReletiveErrorPos * deltaLon)) { + if (!Misc.nearlyEqualsAbs(lo1, other.lo1, maxRelativeErrorPos * deltaLon)) { return false; } if (!Misc.nearlyEquals(deltaLat, other.deltaLat)) { @@ -532,9 +532,9 @@ public boolean equals(Object o) { @Override public int hashCode() { if (hashCode == 0) { - int useLat = (int) (la1 / (maxReletiveErrorPos * deltaLat)); // Two equal objects must have the same hashCode() + int useLat = (int) (la1 / (maxRelativeErrorPos * deltaLat)); // Two equal objects must have the same hashCode() // value - int useLon = (int) (lo1 / (maxReletiveErrorPos * deltaLon)); + int useLon = (int) (lo1 / (maxRelativeErrorPos * deltaLon)); int useDeltaLon = (int) (deltaLon / Misc.defaultMaxRelativeDiffFloat); int useDeltaLat = (int) (deltaLat / Misc.defaultMaxRelativeDiffFloat); @@ -803,10 +803,10 @@ public boolean equals(Object o) { PolarStereographic that = (PolarStereographic) o; - if (!Misc.nearlyEqualsAbs(la1, that.la1, maxReletiveErrorPos * dY)) { - return false; // allow some slop, reletive to grid size + if (!Misc.nearlyEqualsAbs(la1, that.la1, maxRelativeErrorPos * dY)) { + return false; // allow some slop, relative to grid size } - if (!Misc.nearlyEqualsAbs(lo1, that.lo1, maxReletiveErrorPos * dX)) { + if (!Misc.nearlyEqualsAbs(lo1, that.lo1, maxRelativeErrorPos * dX)) { return false; } if (!Misc.nearlyEquals(lov, that.lov)) { @@ -826,8 +826,8 @@ public boolean equals(Object o) { @Override public int hashCode() { if (hashCode == 0) { - int useLat = (int) (la1 / (maxReletiveErrorPos * dY)); // Two equal objects must have the same hashCode() value - int useLon = (int) (lo1 / (maxReletiveErrorPos * dX)); + int useLat = (int) (la1 / (maxRelativeErrorPos * dY)); // Two equal objects must have the same hashCode() value + int useLon = (int) (lo1 / (maxRelativeErrorPos * dX)); int useLov = (int) (lov / Misc.defaultMaxRelativeDiffFloat); int useDeltaLon = (int) (dX / Misc.defaultMaxRelativeDiffFloat); int useDeltaLat = (int) (dY / Misc.defaultMaxRelativeDiffFloat); @@ -995,10 +995,10 @@ public boolean equals(Object o) { LambertConformal that = (LambertConformal) o; - if (!Misc.nearlyEqualsAbs(la1, that.la1, maxReletiveErrorPos * dY)) { + if (!Misc.nearlyEqualsAbs(la1, that.la1, maxRelativeErrorPos * dY)) { return false; // allow some slop, relative to grid size } - if (!Misc.nearlyEqualsAbs(lo1, that.lo1, maxReletiveErrorPos * dX)) { + if (!Misc.nearlyEqualsAbs(lo1, that.lo1, maxRelativeErrorPos * dX)) { return false; } if (!Misc.nearlyEquals(lad, that.lad)) { @@ -1023,8 +1023,8 @@ public boolean equals(Object o) { @Override public int hashCode() { if (hashCode == 0) { - int useLat = (int) (la1 / (maxReletiveErrorPos * dY)); // Two equal objects must have the same hashCode() value - int useLon = (int) (lo1 / (maxReletiveErrorPos * dX)); + int useLat = (int) (la1 / (maxRelativeErrorPos * dY)); // Two equal objects must have the same hashCode() value + int useLon = (int) (lo1 / (maxRelativeErrorPos * dX)); int useLad = (int) (lad / Misc.defaultMaxRelativeDiffFloat); int useLov = (int) (lov / Misc.defaultMaxRelativeDiffFloat); int useDeltaLon = (int) (dX / Misc.defaultMaxRelativeDiffFloat); @@ -1161,10 +1161,10 @@ public boolean equals(Object o) { Mercator that = (Mercator) o; - if (!Misc.nearlyEqualsAbs(la1, that.la1, maxReletiveErrorPos * dY)) { - return false; // allow some slop, reletive to grid size + if (!Misc.nearlyEqualsAbs(la1, that.la1, maxRelativeErrorPos * dY)) { + return false; // allow some slop, relative to grid size } - if (!Misc.nearlyEqualsAbs(lo1, that.lo1, maxReletiveErrorPos * dX)) { + if (!Misc.nearlyEqualsAbs(lo1, that.lo1, maxRelativeErrorPos * dX)) { return false; } if (!Misc.nearlyEquals(latin, that.latin)) { @@ -1180,8 +1180,8 @@ public boolean equals(Object o) { @Override public int hashCode() { if (hashCode == 0) { - int useLat = (int) (la1 / (maxReletiveErrorPos * dY)); // Two equal objects must have the same hashCode() value - int useLon = (int) (lo1 / (maxReletiveErrorPos * dX)); + int useLat = (int) (la1 / (maxRelativeErrorPos * dY)); // Two equal objects must have the same hashCode() value + int useLon = (int) (lo1 / (maxRelativeErrorPos * dX)); int useLad = (int) (latin / Misc.defaultMaxRelativeDiffFloat); int useDeltaLon = (int) (dX / Misc.defaultMaxRelativeDiffFloat); int useDeltaLat = (int) (dY / Misc.defaultMaxRelativeDiffFloat); diff --git a/grib/src/main/java/ucar/nc2/grib/grib1/tables/Grib1ParamTableReader.java b/grib/src/main/java/ucar/nc2/grib/grib1/tables/Grib1ParamTableReader.java index 4a01e902ae..12772bf50f 100644 --- a/grib/src/main/java/ucar/nc2/grib/grib1/tables/Grib1ParamTableReader.java +++ b/grib/src/main/java/ucar/nc2/grib/grib1/tables/Grib1ParamTableReader.java @@ -50,7 +50,7 @@ public class Grib1ParamTableReader { /** * Read a dataset-specific table from a file * - * @param path read from this path, may be reletive + * @param path read from this path, may be relative */ public Grib1ParamTableReader(String path) { this.path = StringUtil2.replace(path, "\\", "/"); @@ -65,7 +65,7 @@ public Grib1ParamTableReader(String path) { * @param center_id associate with this center * @param subcenter_id associate with this subcenter * @param version associate with this version - * @param path read from this path, may be reletive + * @param path read from this path, may be relative */ Grib1ParamTableReader(int center_id, int subcenter_id, int version, String path) { this.center_id = center_id; diff --git a/grib/src/main/java/ucar/nc2/grib/grib1/tables/Grib1ParamTables.java b/grib/src/main/java/ucar/nc2/grib/grib1/tables/Grib1ParamTables.java index 9a721fd357..0385d46f2d 100644 --- a/grib/src/main/java/ucar/nc2/grib/grib1/tables/Grib1ParamTables.java +++ b/grib/src/main/java/ucar/nc2/grib/grib1/tables/Grib1ParamTables.java @@ -301,7 +301,7 @@ private boolean readLookupTable(InputStream is, String lookupFile) throws IOExce || filename.startsWith("http://")) { path = filename; } else { - File tableFile = new File(parent, filename); // reletive file + File tableFile = new File(parent, filename); // relative file path = tableFile.getPath(); } diff --git a/grib/src/main/java/ucar/nc2/grib/grib2/Grib2Gds.java b/grib/src/main/java/ucar/nc2/grib/grib2/Grib2Gds.java index 674a05932c..58a979f927 100644 --- a/grib/src/main/java/ucar/nc2/grib/grib2/Grib2Gds.java +++ b/grib/src/main/java/ucar/nc2/grib/grib2/Grib2Gds.java @@ -29,7 +29,7 @@ @Immutable public abstract class Grib2Gds { private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(Grib2Gds.class); - static final double maxReletiveErrorPos = .01; // reletive error in position - GRIB numbers sometimes miscoded + static final double maxRelativeErrorPos = .01; // relative error in position - GRIB numbers sometimes miscoded public static Grib2Gds factory(int template, byte[] data) { Grib2Gds result; @@ -453,23 +453,23 @@ public boolean equals(Object o) { return false; LatLon other = (LatLon) o; - if (!Misc.nearlyEqualsAbs(la1, other.la1, maxReletiveErrorPos * deltaLat)) - return false; // allow some slop, reletive to grid size - if (!Misc.nearlyEqualsAbs(lo1, other.lo1, maxReletiveErrorPos * deltaLon)) + if (!Misc.nearlyEqualsAbs(la1, other.la1, maxRelativeErrorPos * deltaLat)) + return false; // allow some slop, relative to grid size + if (!Misc.nearlyEqualsAbs(lo1, other.lo1, maxRelativeErrorPos * deltaLon)) return false; - if (!Misc.nearlyEqualsAbs(la2, other.la2, maxReletiveErrorPos * deltaLat)) + if (!Misc.nearlyEqualsAbs(la2, other.la2, maxRelativeErrorPos * deltaLat)) return false; - return Misc.nearlyEqualsAbs(lo2, other.lo2, maxReletiveErrorPos * deltaLon); + return Misc.nearlyEqualsAbs(lo2, other.lo2, maxRelativeErrorPos * deltaLon); } @Override public int hashCode() { if (hashCode == 0) { - int useLat1 = (int) Math.round(la1 / (maxReletiveErrorPos * deltaLat)); // Two equal objects must have the same + int useLat1 = (int) Math.round(la1 / (maxRelativeErrorPos * deltaLat)); // Two equal objects must have the same // hashCode() value - int useLon1 = (int) Math.round(lo1 / (maxReletiveErrorPos * deltaLon)); - int useLat2 = (int) Math.round(la2 / (maxReletiveErrorPos * deltaLat)); - int useLon2 = (int) Math.round(lo2 / (maxReletiveErrorPos * deltaLon)); + int useLon1 = (int) Math.round(lo1 / (maxRelativeErrorPos * deltaLon)); + int useLat2 = (int) Math.round(la2 / (maxRelativeErrorPos * deltaLat)); + int useLon2 = (int) Math.round(lo2 / (maxRelativeErrorPos * deltaLon)); int result = super.hashCode(); result = 31 * result + useLat1; @@ -793,11 +793,11 @@ public boolean equals(Object o) { Mercator that = (Mercator) o; - if (!Misc.nearlyEqualsAbs(la1, that.la1, maxReletiveErrorPos * dY)) - return false; // allow some slop, reletive to grid size - if (!Misc.nearlyEqualsAbs(lo1, that.lo1, maxReletiveErrorPos * dX)) + if (!Misc.nearlyEqualsAbs(la1, that.la1, maxRelativeErrorPos * dY)) + return false; // allow some slop, relative to grid size + if (!Misc.nearlyEqualsAbs(lo1, that.lo1, maxRelativeErrorPos * dX)) return false; - if (!Misc.nearlyEqualsAbs(lad, that.lad, maxReletiveErrorPos * dY)) + if (!Misc.nearlyEqualsAbs(lad, that.lad, maxRelativeErrorPos * dY)) return false; if (!Misc.nearlyEquals(dY, that.dY)) return false; @@ -808,10 +808,10 @@ public boolean equals(Object o) { @Override public int hashCode() { if (hashCode == 0) { - int useLat = (int) Math.round(la1 / (maxReletiveErrorPos * dY)); // Two equal objects must have the same + int useLat = (int) Math.round(la1 / (maxRelativeErrorPos * dY)); // Two equal objects must have the same // hashCode() value - int useLon = (int) Math.round(lo1 / (maxReletiveErrorPos * dX)); - int useLad = (int) Math.round(lad / (maxReletiveErrorPos * dY)); + int useLon = (int) Math.round(lo1 / (maxRelativeErrorPos * dX)); + int useLad = (int) Math.round(lad / (maxRelativeErrorPos * dY)); int useDeltaLon = Math.round(dX / Misc.defaultMaxRelativeDiffFloat); int useDeltaLat = Math.round(dY / Misc.defaultMaxRelativeDiffFloat); @@ -942,9 +942,9 @@ public boolean equals(Object o) { PolarStereographic that = (PolarStereographic) o; - if (!Misc.nearlyEqualsAbs(la1, that.la1, maxReletiveErrorPos * dY)) - return false; // allow some slop, reletive to grid size - if (!Misc.nearlyEqualsAbs(lo1, that.lo1, maxReletiveErrorPos * dX)) + if (!Misc.nearlyEqualsAbs(la1, that.la1, maxRelativeErrorPos * dY)) + return false; // allow some slop, relative to grid size + if (!Misc.nearlyEqualsAbs(lo1, that.lo1, maxRelativeErrorPos * dX)) return false; if (!Misc.nearlyEquals(lad, that.lad)) return false; @@ -962,9 +962,9 @@ public boolean equals(Object o) { @Override public int hashCode() { if (hashCode == 0) { - int useLat = (int) Math.round(la1 / (maxReletiveErrorPos * dY)); // Two equal objects must have the same + int useLat = (int) Math.round(la1 / (maxRelativeErrorPos * dY)); // Two equal objects must have the same // hashCode() value - int useLon = (int) Math.round(lo1 / (maxReletiveErrorPos * dX)); + int useLon = (int) Math.round(lo1 / (maxRelativeErrorPos * dX)); int useLad = Math.round(lad / Misc.defaultMaxRelativeDiffFloat); int useLov = Math.round(lov / Misc.defaultMaxRelativeDiffFloat); int useDeltaLon = Math.round(dX / Misc.defaultMaxRelativeDiffFloat); @@ -1124,9 +1124,9 @@ public boolean equals(Object o) { LambertConformal that = (LambertConformal) o; - if (!Misc.nearlyEqualsAbs(la1, that.la1, maxReletiveErrorPos * dY)) - return false; // allow some slop, reletive to grid size - if (!Misc.nearlyEqualsAbs(lo1, that.lo1, maxReletiveErrorPos * dX)) + if (!Misc.nearlyEqualsAbs(la1, that.la1, maxRelativeErrorPos * dY)) + return false; // allow some slop, relative to grid size + if (!Misc.nearlyEqualsAbs(lo1, that.lo1, maxRelativeErrorPos * dX)) return false; if (!Misc.nearlyEquals(lad, that.lad)) return false; @@ -1145,9 +1145,9 @@ public boolean equals(Object o) { @Override public int hashCode() { if (hashCode == 0) { - int useLat = (int) Math.round(la1 / (maxReletiveErrorPos * dY)); // Two equal objects must have the same + int useLat = (int) Math.round(la1 / (maxRelativeErrorPos * dY)); // Two equal objects must have the same // hashCode() value - int useLon = (int) Math.round(lo1 / (maxReletiveErrorPos * dX)); + int useLon = (int) Math.round(lo1 / (maxRelativeErrorPos * dX)); int useLad = Math.round(lad / Misc.defaultMaxRelativeDiffFloat); int useLov = Math.round(lov / Misc.defaultMaxRelativeDiffFloat); int useDeltaLon = Math.round(dX / Misc.defaultMaxRelativeDiffFloat); diff --git a/grib/src/main/java/ucar/nc2/grib/grib2/table/EccodesLocalTables.java b/grib/src/main/java/ucar/nc2/grib/grib2/table/EccodesLocalTables.java index e53e538316..dbbe98a5f0 100644 --- a/grib/src/main/java/ucar/nc2/grib/grib2/table/EccodesLocalTables.java +++ b/grib/src/main/java/ucar/nc2/grib/grib2/table/EccodesLocalTables.java @@ -93,7 +93,7 @@ public class EccodesLocalTables extends LocalTables { private final Map tableMap = new HashMap<>(30); - // Each of the centers using eccodes has a seperate EccodesLocalTables with its own Grib2TableConfig, and center + // Each of the centers using eccodes has a separate EccodesLocalTables with its own Grib2TableConfig, and center // value. EccodesLocalTables(Grib2TableConfig config) { super(config); diff --git a/grib/src/main/proto/gribCollection4.proto b/grib/src/main/proto/gribCollection4.proto index 411a288c3a..790c2d6cec 100644 --- a/grib/src/main/proto/gribCollection4.proto +++ b/grib/src/main/proto/gribCollection4.proto @@ -102,7 +102,7 @@ message Dataset { } message MFile { - string filename = 1; // reletive to topDir + string filename = 1; // relative to topDir uint64 lastModified = 2; uint32 index = 3; // the records use this number uint64 length = 4; @@ -110,7 +110,7 @@ message MFile { message GribCollection { string name = 1; // must be unique - index filename is name.ncx - string topDir = 2; // MFile, Partition filenames are reletive to this + string topDir = 2; // MFile, Partition filenames are relative to this repeated MFile mfiles = 3; // list of grib MFiles repeated Dataset dataset = 4; repeated Gds gds = 5; // unique Gds, shared amongst datasets @@ -154,7 +154,7 @@ message PartitionVariable { message Partition { string name = 1; // name is used in TDS - eg the subdirectory when generated by TimePartitionCollections - string filename = 2; // the gribCollection.ncx file, reletive to gc. + string filename = 2; // the gribCollection.ncx file, relative to gc. uint64 lastModified = 4; int64 length = 5; int64 partitionDate = 6; // partition date added 11/25/14 diff --git a/grib/src/main/resources/resources/grib1/noaa_rfc/readme.txt b/grib/src/main/resources/resources/grib1/noaa_rfc/readme.txt index 5c202f8bdc..f25fc348f4 100644 --- a/grib/src/main/resources/resources/grib1/noaa_rfc/readme.txt +++ b/grib/src/main/resources/resources/grib1/noaa_rfc/readme.txt @@ -83,7 +83,7 @@ within the NWS field offices (i.e. Center 9 - US NWS FIELD STATIONS) and differ however, these do not show reference date, but possibly date written. assume that we should take the last record seen. - 2) mixed intervals - should be seperate variables (?) how uniform ?? + 2) mixed intervals - should be separate variables (?) how uniform ?? maybe: http://www.hpc.ncep.noaa.gov/npvu/confpres/hydro15/preprint_adj.pdf http://origin.hpc.ncep.noaa.gov/npvu/help/ diff --git a/grib/src/main/sources/ncep/cfsrMonthlyMeans.txt b/grib/src/main/sources/ncep/cfsrMonthlyMeans.txt index f941623004..b25c4d3133 100644 --- a/grib/src/main/sources/ncep/cfsrMonthlyMeans.txt +++ b/grib/src/main/sources/ncep/cfsrMonthlyMeans.txt @@ -130,7 +130,7 @@ Notes on CFSR dataset "CFSR monthly atmospheric, oceanic and land surface output products are available at 0.5, 1.0, and 2.5 degree horizontal resolutions as 6-hourly diurnal monthly means (00Z, 06Z, 12Z, and 18Z) and regular monthly means." -- trying to seperate the diurnal from regular monthly. +- trying to separate the diurnal from regular monthly. regular: G:/nomads/cfsr/monthly/200808/.*200808.grb2 File=G:/nomads/cfsr/monthly/200808/diabf01.gdas.200808.grb2 (0) diff --git a/legacy/src/main/java/thredds/catalog/InvAccess.java b/legacy/src/main/java/thredds/catalog/InvAccess.java index 4f27e5b23f..c5cd8e5c88 100644 --- a/legacy/src/main/java/thredds/catalog/InvAccess.java +++ b/legacy/src/main/java/thredds/catalog/InvAccess.java @@ -69,7 +69,7 @@ public boolean hasDataSize() { } /** - * Get the standard URL, with resolution if the URL is reletive. + * Get the standard URL, with resolution if the URL is relative. * catalog.resolveURI( getUnresolvedUrlName()) * * @return URL string, or null if error. @@ -110,7 +110,7 @@ public URI getStandardUri() { /** * Construct "unresolved" URL: service.getBase() + getUrlPath() + service.getSuffix(). - * It is not resolved, so it may be a reletive URL. + * It is not resolved, so it may be a relative URL. * * @return Unresolved Url as a String */ diff --git a/legacy/src/main/java/thredds/catalog/InvCatalog.java b/legacy/src/main/java/thredds/catalog/InvCatalog.java index 15a4ff3a49..efb7dd2486 100644 --- a/legacy/src/main/java/thredds/catalog/InvCatalog.java +++ b/legacy/src/main/java/thredds/catalog/InvCatalog.java @@ -150,10 +150,10 @@ public InvService findService(String name) { } /** - * Resolve reletive URIs, using the catalog's base URI. If the uriString is not reletive, then + * Resolve relative URIs, using the catalog's base URI. If the uriString is not relative, then * no resolution is done. This also allows baseURI to be a file: scheme. * - * @param uriString any url, reletive or absolute + * @param uriString any url, relative or absolute * @return resolved url string, or null on error * @throws URISyntaxException if uriString violates RFC 2396 * @see java.net.URI#resolve diff --git a/legacy/src/main/java/thredds/catalog/InvCatalogFactory.java b/legacy/src/main/java/thredds/catalog/InvCatalogFactory.java index 6bcbd29654..ad63fc0dd2 100644 --- a/legacy/src/main/java/thredds/catalog/InvCatalogFactory.java +++ b/legacy/src/main/java/thredds/catalog/InvCatalogFactory.java @@ -78,7 +78,7 @@ public class InvCatalogFactory { /** * Get new Factory for reading and writing catalogs. - * For multithreading, get seperate InvCatalogFactory for each thread. + * For multithreading, get separate InvCatalogFactory for each thread. * * @param validate : do XML validation or not. * @return default factory @@ -280,7 +280,7 @@ public InvCatalogImpl readXML(String uriString) { * by causing validate() to fail. Therefore, be sure to call validate() before trying * to use the InvCatalog object. * - * @param uri : the URI of the document, used for resolving reletive references. + * @param uri : the URI of the document, used for resolving relative references. * @return an InvCatalogImpl object */ public InvCatalogImpl readXML(URI uri) { @@ -331,7 +331,7 @@ public InvCatalogImpl readXML(URI uri) { * the InvCatalog object. * * @param catAsString : the String from which to read the catalog. - * @param baseUri : the base URI of the document, used for resolving reletive references. + * @param baseUri : the base URI of the document, used for resolving relative references. * @return an InvCatalogImpl object */ public InvCatalogImpl readXML(String catAsString, URI baseUri) { @@ -346,7 +346,7 @@ public InvCatalogImpl readXML(String catAsString, URI baseUri) { * the InvCatalog object. * * @param catAsStringReader : the StreamReader from which to read the catalog. - * @param baseUri : the base URI of the document, used for resolving reletive references. + * @param baseUri : the base URI of the document, used for resolving relative references. * @return an InvCatalogImpl object */ public InvCatalogImpl readXML(StringReader catAsStringReader, URI baseUri) { @@ -377,7 +377,7 @@ public InvCatalogImpl readXML(StringReader catAsStringReader, URI baseUri) { * to use the InvCatalog object. * * @param docIs : the InputStream to read from - * @param uri : the URI of the document, used for resolving reletive references. + * @param uri : the URI of the document, used for resolving relative references. * @return an InvCatalogImpl object */ public InvCatalogImpl readXML(InputStream docIs, URI uri) { @@ -415,7 +415,7 @@ public InvCatalogImpl readXML(InputStream docIs, URI uri) { * to use the InvCatalog object. * * @param jdomDoc a parsed JDOM Document - * @param uri : the URI of the document, used for resolving reletive references. + * @param uri : the URI of the document, used for resolving relative references. * @return an InvCatalogImpl object */ public InvCatalogImpl readXML(org.jdom2.Document jdomDoc, URI uri) { diff --git a/legacy/src/main/java/thredds/catalog/InvCatalogImpl.java b/legacy/src/main/java/thredds/catalog/InvCatalogImpl.java index 3a2bd141b0..947f6ef28d 100644 --- a/legacy/src/main/java/thredds/catalog/InvCatalogImpl.java +++ b/legacy/src/main/java/thredds/catalog/InvCatalogImpl.java @@ -403,7 +403,7 @@ public void setCreateFrom(String createFrom) { /** * Set the catalog base URI. - * Its used to resolve reletive URLS. + * Its used to resolve relative URLS. * * @param baseURI set to this */ diff --git a/legacy/src/main/java/thredds/catalog/InvCatalogRef.java b/legacy/src/main/java/thredds/catalog/InvCatalogRef.java index 793795961c..420e34fd72 100644 --- a/legacy/src/main/java/thredds/catalog/InvCatalogRef.java +++ b/legacy/src/main/java/thredds/catalog/InvCatalogRef.java @@ -273,7 +273,7 @@ public synchronized void readAsynch(InvCatalogFactory factory, CatalogSetCallbac return; } - // may be reletive + // may be relative String hrefResolved; try { java.net.URI uri = getParentCatalog().resolveUri(href); diff --git a/legacy/src/main/java/thredds/catalog/InvDatasetImpl.java b/legacy/src/main/java/thredds/catalog/InvDatasetImpl.java index 61e64a138b..7406d495a4 100644 --- a/legacy/src/main/java/thredds/catalog/InvDatasetImpl.java +++ b/legacy/src/main/java/thredds/catalog/InvDatasetImpl.java @@ -1358,7 +1358,7 @@ private static String rangeString(ThreddsMetadata.Range r) { } /** - * resolve reletive URLS against the catalog URL. + * resolve relative URLS against the catalog URL. * * @param ds use ds parent catalog, if it exists * @param href URL to resolve diff --git a/legacy/src/main/java/thredds/catalog/InvService.java b/legacy/src/main/java/thredds/catalog/InvService.java index 5ad98d4145..809fc31a89 100644 --- a/legacy/src/main/java/thredds/catalog/InvService.java +++ b/legacy/src/main/java/thredds/catalog/InvService.java @@ -361,9 +361,9 @@ protected boolean check(StringBuilder out) { } /** - * See if the service Base is reletive + * See if the service Base is relative * - * @return true if the service Base is reletive + * @return true if the service Base is relative */ public boolean isRelativeBase() { if (getServiceType() == ServiceType.COMPOUND) diff --git a/legacy/src/main/java/thredds/catalog/dl/DIFWriter.java b/legacy/src/main/java/thredds/catalog/dl/DIFWriter.java index 0433aeaa2f..8ac0666f5e 100644 --- a/legacy/src/main/java/thredds/catalog/dl/DIFWriter.java +++ b/legacy/src/main/java/thredds/catalog/dl/DIFWriter.java @@ -274,8 +274,8 @@ private void writeDataset(InvDataset ds, Element rootElem, StringBuilder mess) { TimeDuration duration = tm.getDuration(); double ndays = duration.getValue("days"); if (ndays > 0) { - String reletiveTime = "RELATIVE_START_DATE: " + ((int) -ndays); - rootElem.addContent(new Element("Keyword", defNS).addContent(reletiveTime)); + String relativeTime = "RELATIVE_START_DATE: " + ((int) -ndays); + rootElem.addContent(new Element("Keyword", defNS).addContent(relativeTime)); } } } diff --git a/legacy/src/main/java/thredds/catalog/query/DqcFactory.java b/legacy/src/main/java/thredds/catalog/query/DqcFactory.java index 3b492655d7..ca60b821aa 100644 --- a/legacy/src/main/java/thredds/catalog/query/DqcFactory.java +++ b/legacy/src/main/java/thredds/catalog/query/DqcFactory.java @@ -221,7 +221,7 @@ public QueryCapability readXML(String uriString) throws IOException { * check dqc.isValid, dqc.getErrorMessages() to see if ok. * * @param docIs : the InputStream to read from - * @param uri : the URI of the document, used for resolving reletive references. + * @param uri : the URI of the document, used for resolving relative references. * @return an QueryCapability object * @throws IOException on failure */ @@ -247,7 +247,7 @@ public QueryCapability readXML(InputStream docIs, URI uri) throws IOException { * check dqc.isValid, dqc.getErrorMessages() to see if ok. * * @param doc parse this document - * @param uri : the URI of the document, used for resolving reletive references. + * @param uri : the URI of the document, used for resolving relative references. * @return an InvCatalogImpl object * @throws IOException on failure */ diff --git a/legacy/src/main/java/thredds/cataloggen/CollectionLevelScanner.java b/legacy/src/main/java/thredds/cataloggen/CollectionLevelScanner.java index 811cbee9c6..92af047adf 100644 --- a/legacy/src/main/java/thredds/cataloggen/CollectionLevelScanner.java +++ b/legacy/src/main/java/thredds/cataloggen/CollectionLevelScanner.java @@ -92,7 +92,7 @@ * * *

  • The ID of a catalog dataset element is the ID of the parent dataset - * and the name of the corresponding CrawlableDataset seperated by a "/". + * and the name of the corresponding CrawlableDataset separated by a "/". * So, it ends up being the path of the corresponding CrawlableDataset from * the point where the collection CrawlableDataset path ends then prefixed * by the collectionId which is set using the setCollectionId() string. Example: diff --git a/legacy/src/main/java/thredds/cataloggen/DatasetScanCatalogBuilder.java b/legacy/src/main/java/thredds/cataloggen/DatasetScanCatalogBuilder.java index 038224400c..3387514a5a 100644 --- a/legacy/src/main/java/thredds/cataloggen/DatasetScanCatalogBuilder.java +++ b/legacy/src/main/java/thredds/cataloggen/DatasetScanCatalogBuilder.java @@ -49,7 +49,7 @@ * - xlink:title = childCollectionCrDs.getName() * * 2) The ID of a catalog dataset element is the ID of the parent dataset - * and the name of the corresponding CrawlableDataset seperated by a "/". + * and the name of the corresponding CrawlableDataset separated by a "/". * So, it ends up being the path of the CrawlableDataset from the point * where the collection CrawlableDataset path ends then prefixed by the * ID of the datasetScan element for that collection. Example: diff --git a/legacy/src/main/java/thredds/crawlabledataset/CrawlableDataset.java b/legacy/src/main/java/thredds/crawlabledataset/CrawlableDataset.java index 5c5f3b3fcd..b2957308b6 100644 --- a/legacy/src/main/java/thredds/crawlabledataset/CrawlableDataset.java +++ b/legacy/src/main/java/thredds/crawlabledataset/CrawlableDataset.java @@ -27,7 +27,7 @@ *

    * The CrawlableDataset interface is a generalization (and simplification) of * the java.io.File class. A CrawlableDataset path is made up of ONE or more - * path segments each seperated by a slash ("/"). The path may start or end with + * path segments each separated by a slash ("/"). The path may start or end with * a slash ("/"). *

    *

    diff --git a/legacy/src/main/java/ucar/nc2/NetcdfFileWriteable.java b/legacy/src/main/java/ucar/nc2/NetcdfFileWriteable.java index ac586f4d83..4c7b18eefe 100644 --- a/legacy/src/main/java/ucar/nc2/NetcdfFileWriteable.java +++ b/legacy/src/main/java/ucar/nc2/NetcdfFileWriteable.java @@ -395,7 +395,7 @@ public Variable addVariable(String varName, DataType dataType, Dimension[] dims) * * @param varName name of Variable, must be unique with the file. * @param dataType type of underlying element - * @param dims names of Dimensions for the variable, blank seperated. + * @param dims names of Dimensions for the variable, blank separated. * Must already have been added. Use an empty string for a scalar variable. * @return the Variable that has been added */ diff --git a/legacy/src/main/java/ucar/nc2/dt/point/StationDatasetHelper.java b/legacy/src/main/java/ucar/nc2/dt/point/StationDatasetHelper.java index b527611b77..e9ca72f79e 100644 --- a/legacy/src/main/java/ucar/nc2/dt/point/StationDatasetHelper.java +++ b/legacy/src/main/java/ucar/nc2/dt/point/StationDatasetHelper.java @@ -18,7 +18,7 @@ * getStations() * getData( Station s) * - * This assumes that calling getData( Station s) is reletively cheap, ie that theres no cheaper filtering to do. + * This assumes that calling getData( Station s) is relatively cheap, ie that theres no cheaper filtering to do. * * @deprecated use ucar.nc2.ft.point * @author caron diff --git a/legacy/src/main/java/ucar/nc2/dt/point/WriterProfileObsDataset.java b/legacy/src/main/java/ucar/nc2/dt/point/WriterProfileObsDataset.java index eafbf523d4..1891363481 100644 --- a/legacy/src/main/java/ucar/nc2/dt/point/WriterProfileObsDataset.java +++ b/legacy/src/main/java/ucar/nc2/dt/point/WriterProfileObsDataset.java @@ -598,7 +598,7 @@ public static void main(String args[]) throws Exception { manAS.setMemberArray(mname, sdata.getArray(mname)); } - // each level is weritten as a seperate structure + // each level is weritten as a separate structure int numMand = sdata.getScalarInt("numMand"); if (numMand >= manDim.getLength()) continue; diff --git a/opendap/doc/todo.html b/opendap/doc/todo.html index 5b4f4d2cb4..ae01107a8a 100644 --- a/opendap/doc/todo.html +++ b/opendap/doc/todo.html @@ -13,7 +13,7 @@

    Java-OPeNDAP: TO DO

  • XML implementation needs to be refactored to use DOM objects instead of print statements to generate and manage XML documents.

    • -
  • Seperate Client and Server code - NOT FEASIBLE. Although in a perfect world the design should allw for this there is too much code overlap to make this a good idea.
    +
  • Separate Client and Server code - NOT FEASIBLE. Although in a perfect world the design should allw for this there is too much code overlap to make this a good idea.
  • Break out "Display" methods into a service class(es):
      diff --git a/opendap/src/main/java/opendap/dap/DDS.java b/opendap/src/main/java/opendap/dap/DDS.java index cfc532a6de..b51fc345c9 100644 --- a/opendap/src/main/java/opendap/dap/DDS.java +++ b/opendap/src/main/java/opendap/dap/DDS.java @@ -1750,10 +1750,10 @@ public static Vector tokenizeAliasField(String field) throws MalformedAliasExcep throw new MalformedAliasException( "Alias fields that begin with the quote (\") sign " + "must have a closing quote."); - // If there is more stuff, and that stuff is not seperated from the + // If there is more stuff, and that stuff is not separated from the // closing quote by a dot character, then it's bad syntax. if (lastIndex > end && field.charAt(end + 1) != dot) - throw new MalformedAliasException("Alias fields must be seperated by the dot (.) character."); + throw new MalformedAliasException("Alias fields must be separated by the dot (.) character."); // The last caharcter in the field may not be an (unquoted) dot. if (field.charAt(lastIndex) == dot) diff --git a/opendap/src/main/java/ucar/nc2/dods/DODSNetcdfFile.java b/opendap/src/main/java/ucar/nc2/dods/DODSNetcdfFile.java index 5810bbe330..2e7b54ff0c 100644 --- a/opendap/src/main/java/ucar/nc2/dods/DODSNetcdfFile.java +++ b/opendap/src/main/java/ucar/nc2/dods/DODSNetcdfFile.java @@ -242,7 +242,7 @@ public DODSNetcdfFile(String datasetURL, CancelTask cancelTask) throws IOExcepti if (cancelTask != null && cancelTask.isCancel()) return; - // LOOK why do we want to do the primitives seperate from compounds? + // LOOK why do we want to do the primitives separate from compounds? constructTopVariables(rootDodsV, cancelTask); if (cancelTask != null && cancelTask.isCancel()) return; @@ -367,7 +367,7 @@ public synchronized void close() throws java.io.IOException { * * // DDS -> {BaseType} for arrays, BaseType = DArray -> {elemType} * // here we 1) put all Variables into a DodsV, 2) unravel DConstructors (DSequence, DStructure, DGrid) - * // 3) for Darray, we put Variable = elemType, and store the darray seperately, not in the heirarchy. + * // 3) for Darray, we put Variable = elemType, and store the darray separately, not in the heirarchy. * // so you need to get the parent from the dodsV. * private void parseVariables( DodsV parent, Enumeration variables, ArrayList dodsVlist) { * while (variables.hasMoreElements()) { diff --git a/opendap/src/main/java/ucar/nc2/dods/DodsV.java b/opendap/src/main/java/ucar/nc2/dods/DodsV.java index ae5163e674..ec91ab87d8 100644 --- a/opendap/src/main/java/ucar/nc2/dods/DodsV.java +++ b/opendap/src/main/java/ucar/nc2/dods/DodsV.java @@ -69,7 +69,7 @@ static DodsV parseDDS(DDS dds) { * Recursively build the dodsV tree. * 1) put all Variables into a DodsV * 2) unravel DConstructors (DSequence, DStructure, DGrid) - * 3) for Darray, we put Variable = elemType, and store the darray seperately, not in the heirarchy. + * 3) for Darray, we put Variable = elemType, and store the darray separately, not in the heirarchy. * * @param parent of the tree * @param children list of BaseType @@ -146,7 +146,7 @@ static DodsV parseDataDDS(DataDDS dds) throws NoSuchVariableException { * Recursively build the dodsV tree. * 1) put all Variables into a DodsV * 2) unravel DConstructors (DSequence, DStructure, DGrid) - * 3) for Darray, we put Variable = elemType, and store the darray seperately, not in the heirarchy. + * 3) for Darray, we put Variable = elemType, and store the darray separately, not in the heirarchy. * * @param parent of the tree * @param children list of BaseType @@ -397,7 +397,7 @@ void parseDAS(DAS das) throws IOException { addAttributeTable(this, attTable, tableName, true); } else if (tableName.equals("DODS_EXTRA") || tableName.equals("EXTRA_DIMENSION")) { - // handled seperately in DODSNetcdfFile + // handled separately in DODSNetcdfFile continue; } else { diff --git a/uibase/src/main/java/ucar/ui/prefs/LayoutM.java b/uibase/src/main/java/ucar/ui/prefs/LayoutM.java index e275b8806e..2f92892ce8 100644 --- a/uibase/src/main/java/ucar/ui/prefs/LayoutM.java +++ b/uibase/src/main/java/ucar/ui/prefs/LayoutM.java @@ -232,14 +232,14 @@ private boolean layoutPass(Container parent) { x = b2.getX(); else if (cs.xspace < 0) // negative means cs.xspace is the right edge, absolute x = -(size.getWidth() + cs.xspace); - else // otherwise its reletive to right edge of cs.c + else // otherwise its relative to right edge of cs.c x = b2.getX() + b2.getWidth() + cs.xspace; if (cs.yspace == 0) // 0 means align y = b2.getY(); else if (cs.yspace < 0) // negative means cs.yspace is the bottom edge, absolute y = -(size.getHeight() + cs.yspace); - else // otherwise its reletive to bottom edge of cs.c + else // otherwise its relative to bottom edge of cs.c y = b2.getY() + b2.getHeight() + cs.yspace; // set bounds @@ -249,7 +249,7 @@ else if (cs.yspace < 0) // negative means cs.yspace is the bottom edge, absolute globalBounds = globalBounds.union(bounds); if (debugLayout) { - System.out.println(" " + name + " SET (reletive) " + comp.getClass().getName() + " bounds= " + cB + System.out.println(" " + name + " SET (relative) " + comp.getClass().getName() + " bounds= " + cB + " prefrredSize= " + size); System.out.println(" new bounds= " + bounds); } diff --git a/uibase/src/main/java/ucar/ui/util/Resource.java b/uibase/src/main/java/ucar/ui/util/Resource.java index cd16b8b3a1..afb198a3df 100644 --- a/uibase/src/main/java/ucar/ui/util/Resource.java +++ b/uibase/src/main/java/ucar/ui/util/Resource.java @@ -20,7 +20,7 @@ * * 2. Filepath. * Use a resourcePath starting with a forward slash. getResource() then searches relative to the classpath. - * otherwise it will search reletive to ucar.nc2.ui.util, which is probably not what you want. + * otherwise it will search relative to ucar.nc2.ui.util, which is probably not what you want. */ public class Resource { diff --git a/uibase/src/main/java/ucar/ui/widget/BAMutil.java b/uibase/src/main/java/ucar/ui/widget/BAMutil.java index 5649520784..f6b0a0a174 100644 --- a/uibase/src/main/java/ucar/ui/widget/BAMutil.java +++ b/uibase/src/main/java/ucar/ui/widget/BAMutil.java @@ -60,7 +60,7 @@ public class BAMutil { /** * Set the resource path for icons, images, cursors. * - * @param path reletive to the classpath + * @param path relative to the classpath */ public static void setResourcePath(String path) { defaultResourcePath = path; diff --git a/uibase/src/main/java/ucar/ui/widget/ProgressMonitor.java b/uibase/src/main/java/ucar/ui/widget/ProgressMonitor.java index 507fd3de3a..83d9018df7 100644 --- a/uibase/src/main/java/ucar/ui/widget/ProgressMonitor.java +++ b/uibase/src/main/java/ucar/ui/widget/ProgressMonitor.java @@ -111,7 +111,7 @@ public void start(java.awt.Component top, String taskName, int progressMaxCount) pm.setMillisToDecideToPopup(1000); pm.setMillisToPopup(1000); - // do task in a seperate, non-event, thread + // do task in a separate, non-event, thread Thread taskThread = new Thread(task); taskThread.start(); diff --git a/uibase/src/main/java/ucar/ui/widget/StopButton.java b/uibase/src/main/java/ucar/ui/widget/StopButton.java index b1881b0f90..3d962e1036 100644 --- a/uibase/src/main/java/ucar/ui/widget/StopButton.java +++ b/uibase/src/main/java/ucar/ui/widget/StopButton.java @@ -169,7 +169,7 @@ else if (task.isCancel()) myTimer = new Timer(1000, watcher); // every second myTimer.start(); - // do task in a seperate, non-event, thread + // do task in a separate, non-event, thread Thread taskThread = new Thread(task); taskThread.start(); diff --git a/uicdm/src/main/java/thredds/ui/catalog/ThreddsDatasetChooser.java b/uicdm/src/main/java/thredds/ui/catalog/ThreddsDatasetChooser.java index 96f1339d25..0bceca2fd1 100644 --- a/uicdm/src/main/java/thredds/ui/catalog/ThreddsDatasetChooser.java +++ b/uicdm/src/main/java/thredds/ui/catalog/ThreddsDatasetChooser.java @@ -63,7 +63,7 @@ public class ThreddsDatasetChooser extends JPanel { private CatalogChooser catalogChooser; private JTabbedPane tabbedPane; - private boolean doResolve; // shoul we resolve Resolver datasets? + private boolean doResolve; // should we resolve Resolver datasets? private boolean pipeOut; // send results to standard out private boolean messageOut; // send results to popup message private JFrame frame; // need for popup messages diff --git a/uicdm/src/main/java/ucar/nc2/ui/StructureTable.java b/uicdm/src/main/java/ucar/nc2/ui/StructureTable.java index bbc0707764..71f98c4277 100644 --- a/uicdm/src/main/java/ucar/nc2/ui/StructureTable.java +++ b/uicdm/src/main/java/ucar/nc2/ui/StructureTable.java @@ -71,7 +71,7 @@ public StructureTable(PreferencesExt prefs) { dumpWindow.setBounds(new Rectangle(300, 300, 600, 600)); PreferencesExt fcPrefs = (prefs == null) ? null : (PreferencesExt) prefs.node("FileManager"); - fileChooser = new FileManager(null, null, "csv", "comma seperated values", fcPrefs); + fileChooser = new FileManager(null, null, "csv", "comma separated values", fcPrefs); } private EventListenerList listeners = new EventListenerList(); diff --git a/uicdm/src/main/java/ucar/nc2/ui/geoloc/ProjectionManager.java b/uicdm/src/main/java/ucar/nc2/ui/geoloc/ProjectionManager.java index ebdb9e9a96..426a16181d 100644 --- a/uicdm/src/main/java/ucar/nc2/ui/geoloc/ProjectionManager.java +++ b/uicdm/src/main/java/ucar/nc2/ui/geoloc/ProjectionManager.java @@ -203,7 +203,7 @@ private void init() { * * * public void saveProjection(ProjectionImpl proj) { - * //setVisible(true); how to make this work? seperate Thread ? + * //setVisible(true); how to make this work? separate Thread ? * * // force new name * ProjectionImpl newProj = proj.constructCopy(); diff --git a/uicdm/src/main/java/ucar/nc2/ui/gis/GisFeatureRendererMulti.java b/uicdm/src/main/java/ucar/nc2/ui/gis/GisFeatureRendererMulti.java index a26046f76b..e4fb39ac99 100644 --- a/uicdm/src/main/java/ucar/nc2/ui/gis/GisFeatureRendererMulti.java +++ b/uicdm/src/main/java/ucar/nc2/ui/gis/GisFeatureRendererMulti.java @@ -145,7 +145,7 @@ private ArrayList makeShapes(Iterator featList) { /* * if (Debug.isSet("bug.drawShapes")) { * int count =0; - * // make each GisPart a seperate shape for debugging + * // make each GisPart a separate shape for debugging * feats:while (featList.hasNext()) { * AbstractGisFeature feature = (AbstractGisFeature) featList.next(); * java.util.Iterator pi = feature.getGisParts(); diff --git a/uicdm/src/main/java/ucar/nc2/ui/grib/CdmIndexReportPanel.java b/uicdm/src/main/java/ucar/nc2/ui/grib/CdmIndexReportPanel.java index 8e70490bf4..680f7aff95 100644 --- a/uicdm/src/main/java/ucar/nc2/ui/grib/CdmIndexReportPanel.java +++ b/uicdm/src/main/java/ucar/nc2/ui/grib/CdmIndexReportPanel.java @@ -81,7 +81,7 @@ protected void doDupAndMissing(Formatter f, MCollection dcm, boolean eachFile, b f.format("%n Grand Total %s%n", total); } - // seperate report for each file in collection + // separate report for each file in collection private void doDupAndMissingEach(Formatter f, MFile mfile, boolean each, boolean extra, Accum accum) throws IOException { @@ -158,7 +158,7 @@ protected void doMisplacedFields(Formatter f, MCollection dcm, boolean useIndex, } } - // seperate report for each file in collection + // separate report for each file in collection private void doMisplacedFieldsEach(Formatter f2, MFile mfile, Set filenames, boolean extra) throws IOException { Formatter f = new Formatter(System.out); diff --git a/uicdm/src/main/java/ucar/nc2/ui/image/ScalablePicture.java b/uicdm/src/main/java/ucar/nc2/ui/image/ScalablePicture.java index 78994b8f26..a6cfc7c2da 100644 --- a/uicdm/src/main/java/ucar/nc2/ui/image/ScalablePicture.java +++ b/uicdm/src/main/java/ucar/nc2/ui/image/ScalablePicture.java @@ -50,7 +50,7 @@ /** - * a class to load and scale an image either immediately or in a seperate thread. + * a class to load and scale an image either immediately or in a separate thread. */ public class ScalablePicture implements SourcePictureListener { diff --git a/uicdm/src/main/java/ucar/nc2/ui/image/SourcePicture.java b/uicdm/src/main/java/ucar/nc2/ui/image/SourcePicture.java index b93ca10f29..e434a66bc5 100644 --- a/uicdm/src/main/java/ucar/nc2/ui/image/SourcePicture.java +++ b/uicdm/src/main/java/ucar/nc2/ui/image/SourcePicture.java @@ -48,7 +48,7 @@ /** * a class to load and scale a picture either immediately or in a - * seperate thread from a URL + * separate thread from a URL */ public class SourcePicture implements Cloneable { diff --git a/uicdm/src/main/java/ucar/nc2/ui/op/BufrMessageViewer.java b/uicdm/src/main/java/ucar/nc2/ui/op/BufrMessageViewer.java index 39bd2dc88d..8b80d50a22 100644 --- a/uicdm/src/main/java/ucar/nc2/ui/op/BufrMessageViewer.java +++ b/uicdm/src/main/java/ucar/nc2/ui/op/BufrMessageViewer.java @@ -57,7 +57,7 @@ public class BufrMessageViewer extends JPanel { private StructureTable dataTable; private IndependentWindow dataWindow; private FileManager fileChooser; - private boolean seperateWindow; + private boolean separateWindow; public BufrMessageViewer(PreferencesExt prefs, JPanel buttPanel) { this.prefs = prefs; @@ -90,14 +90,14 @@ public BufrMessageViewer(PreferencesExt prefs, JPanel buttPanel) { }); buttPanel.add(showButt); - AbstractAction seperateWindowAction = new AbstractAction() { + AbstractAction separateWindowAction = new AbstractAction() { public void actionPerformed(ActionEvent e) { - seperateWindow = (Boolean) getValue(BAMutil.STATE); + separateWindow = (Boolean) getValue(BAMutil.STATE); } }; - BAMutil.setActionProperties(seperateWindowAction, "nj22/DrawVert", "seperate DDS window", true, 'C', -1); - seperateWindowAction.putValue(BAMutil.STATE, seperateWindow); - BAMutil.addActionToContainer(buttPanel, seperateWindowAction); + BAMutil.setActionProperties(separateWindowAction, "nj22/DrawVert", "separate DDS window", true, 'C', -1); + separateWindowAction.putValue(BAMutil.STATE, separateWindow); + BAMutil.addActionToContainer(buttPanel, separateWindowAction); AbstractButton distinctDdsButt = BAMutil.makeButtcon("nj22/dd", "Dump distinct DDS", false); distinctDdsButt.addActionListener(e -> dumpDDS()); @@ -189,7 +189,7 @@ public void actionPerformed(ActionEvent e) { MessageBean vb = (MessageBean) messageTable.getSelectedBean(); if (vb == null) return; - if (!seperateWindow) + if (!separateWindow) infoTA.clear(); Formatter f = new Formatter(); try { @@ -204,7 +204,7 @@ public void actionPerformed(ActionEvent e) { JOptionPane.showMessageDialog(BufrMessageViewer.this, e1.getMessage()); e1.printStackTrace(); // To change body of catch statement use File | Settings | File Templates. } - if (seperateWindow) { + if (separateWindow) { TextHistoryPane ta = new TextHistoryPane(); IndependentWindow info = new IndependentWindow("Extra Information", BAMutil.getImage("nj22/NetcdfUI"), ta); info.setBounds((Rectangle) prefs.getBean("InfoWindowBounds", new Rectangle(300, 300, 500, 300))); diff --git a/uicdm/src/main/java/ucar/nc2/ui/op/VariableTable.java b/uicdm/src/main/java/ucar/nc2/ui/op/VariableTable.java index 0aede4965c..f6a6c330e0 100644 --- a/uicdm/src/main/java/ucar/nc2/ui/op/VariableTable.java +++ b/uicdm/src/main/java/ucar/nc2/ui/op/VariableTable.java @@ -72,7 +72,7 @@ public VariableTable(PreferencesExt prefs) { this.prefs = prefs; PreferencesExt fcPrefs = (prefs == null) ? null : (PreferencesExt) prefs.node("FileManager"); - fileChooser = new FileManager(null, null, "csv", "comma seperated values", fcPrefs); + fileChooser = new FileManager(null, null, "csv", "comma separated values", fcPrefs); } /**