Skip to content

Commit

Permalink
Fix deprecation warnings, comments
Browse files Browse the repository at this point in the history
Replaces usage of deprecated method.
  • Loading branch information
openfirmware committed Oct 27, 2020
1 parent 1ff51e2 commit e090486
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 20 deletions.
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
package org.opengis.cite.cdb10;

import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.net.URI;
import java.util.Map;
import java.util.logging.Level;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;

import org.opengis.cite.cdb10.util.TestSuiteLogger;
import org.opengis.cite.cdb10.util.URIUtils;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ public void verifyLOD() throws IOException {
DirectoryStream<Path> lods = Files.newDirectoryStream(featureType);

for (Path lod : lods) {
validateLOD(lod, errors);
validateLod(lod.getFileName().toString(), errors);
}

}
Expand Down Expand Up @@ -464,10 +464,10 @@ public void verifyTNAMSecond() throws IOException {
* Validates that GTModel directories have valid codes/names.
* D501, D511, D504, D505, 507, 509, 513 only.
*
* Level 1: Dataset
* Level 2: TNAM First Character
* Level 3: TNAM Second Character
* Level 4: Texture Name (TNAM)
* - Level 1: Dataset
* - Level 2: TNAM First Character
* - Level 3: TNAM Second Character
* - Level 4: Texture Name (TNAM)
*
* @throws IOException Error reading from CDB
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ public void verifyLOD() throws IOException {
DirectoryStream<Path> lods = Files.newDirectoryStream(entityDir, DirectoryStreamFilters.lodFilter());

for (Path lod : lods) {
validateLOD(lod, errors);
validateLod(lod.getFileName().toString(), errors);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,10 @@ public class TilesStructureTests extends Capability1Tests {

/**
* Return the number of degrees of Longitude a Geocell encompasses, given a
* latitude. (Geocells have variable sizes.)
* @param latitude The latitude in integer degrees
* @return An integer amount of degrees of longitude
* latitude. (Geocells have variable sizes.)
*
* @param latitude The latitude in integer degrees
* @return An integer amount of degrees of longitude
*/
public Integer sliceWidthForLatitude(Integer latitude) {
Integer dLonZone = 1;
Expand Down Expand Up @@ -74,8 +75,8 @@ public void verifyGeocellLatitudeDirNamePrefix() throws IOException {
}

/**
* Validates that latitude geocell directories end with a valid slice latitude.
* latitudes should be zero-padded to 2 width.
* Validates that latitude geocell directories end with a valid slice
* latitude. latitudes should be zero-padded to 2 width.
*
* @throws IOException Error reading from CDB
*/
Expand Down Expand Up @@ -153,8 +154,8 @@ public void verifyGeocellLongitudeDirNamePrefix() throws IOException {
}

/**
* Validates that longitude geocell directories end with a valid slice longitude.
* longitudes should be zero-padded to 3 width.
* Validates that longitude geocell directories end with a valid slice
* longitude. longitudes should be zero-padded to 3 width.
*
* @throws IOException Error reading from CDB
*/
Expand Down Expand Up @@ -280,7 +281,8 @@ public void verifyDatasetPrefix() throws IOException {
}

/**
* Validates that dataset directories prefix code and name match and are valid values.
* Validates that dataset directories prefix code and name match and are
* valid values.
*
* @throws IOException Error reading from CDB
*/
Expand Down Expand Up @@ -367,7 +369,7 @@ public void verifyLODName() throws IOException {
DirectoryStream<Path> lods = Files.newDirectoryStream(dataset, DirectoryStreamFilters.lodFilter());

for (Path lod : lods) {
validateLOD(lod, errors);
validateLod(lod.getFileName().toString(), errors);
}

}
Expand All @@ -379,7 +381,8 @@ public void verifyLODName() throws IOException {
}

/**
* Validates that UREF directories have valid names and are in a valid range for the LOD.
* Validates that UREF directories have valid names and are in a valid range
* for the LOD.
*
* @throws IOException Error reading from CDB
*/
Expand Down

0 comments on commit e090486

Please sign in to comment.