Skip to content

Commit 95f1ee9

Browse files
tschietschie
authored
Data parent directory (#413)
* Specify samples-data directory in File constructors * remove sout * add missing parent directory * add missing parent dir * Revert "add missing parent dir" This reverts commit 29c5abe. * add missing parent dir * change canonicalPath to absolutePath
1 parent 009b2f3 commit 95f1ee9

File tree

44 files changed

+63
-52
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+63
-52
lines changed

‎analysis/line-of-sight-geoelement/src/main/java/com/esri/samples/line_of_sight_geoelement/LineOfSightGeoElementSample.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ public void start(Stage stage) {
162162
);
163163

164164
// create a graphic of a taxi to be the target
165-
String modelURI = new File("./samples-data/dolmus_3ds/dolmus.3ds").getAbsolutePath();
165+
String modelURI = new File(System.getProperty("data.dir"), "./samples-data/dolmus_3ds/dolmus.3ds").getAbsolutePath();
166166
ModelSceneSymbol taxiSymbol = new ModelSceneSymbol(modelURI, 1.0);
167167
taxiSymbol.setAnchorPosition(SceneSymbol.AnchorPosition.BOTTOM);
168168
taxiSymbol.loadAsync();

‎analysis/viewshed-geoelement/src/main/java/com/esri/samples/viewshed_geoelement/ViewshedGeoElementSample.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ public void start(Stage stage) {
113113
graphicsOverlay.setRenderer(renderer3D);
114114

115115
// create a graphic of a tank
116-
String modelURI = new File("./samples-data/bradley_low_3ds/bradle.3ds").getAbsolutePath();
117-
ModelSceneSymbol tankSymbol = new ModelSceneSymbol(modelURI, 10.0);
116+
String modelURI = new File(System.getProperty("data.dir"), "./samples-data/bradley_low_3ds/bradle.3ds").getAbsolutePath();
117+
ModelSceneSymbol tankSymbol = new ModelSceneSymbol(modelURI.replace("\\", "/"), 10.0);
118118
tankSymbol.setHeading(90);
119119
tankSymbol.setAnchorPosition(SceneSymbol.AnchorPosition.BOTTOM);
120120
tankSymbol.loadAsync();

‎display_information/dictionary-renderer-graphics-overlay/src/main/java/com/esri/samples/dictionary_renderer_graphics_overlay/DictionaryRendererGraphicsOverlaySample.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,8 @@ public void start(Stage stage) throws Exception {
7676
mapView.getGraphicsOverlays().add(graphicsOverlay);
7777

7878
// create symbol dictionary from style file
79-
DictionarySymbolStyle symbolDictionary = DictionarySymbolStyle.createFromFile("./samples-data/stylx/mil2525d.stylx");
79+
File stylxFile = new File(System.getProperty("data.dir"), "./samples-data/stylx/mil2525d.stylx");
80+
DictionarySymbolStyle symbolDictionary = DictionarySymbolStyle.createFromFile(stylxFile.getAbsolutePath());
8081

8182
// tells graphics overlay how to render graphics with symbol dictionary attributes set
8283
DictionaryRenderer renderer = new DictionaryRenderer(symbolDictionary);
@@ -102,7 +103,7 @@ public void start(Stage stage) throws Exception {
102103
*/
103104
private List<Map<String, Object>> parseMessages() throws Exception {
104105

105-
File mil2525dFile = new File("./samples-data/xml/Mil2525DMessages.xml");
106+
File mil2525dFile = new File(System.getProperty("data.dir"), "./samples-data/xml/Mil2525DMessages.xml");
106107
DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
107108
DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder();
108109
Document document = documentBuilder.parse(mil2525dFile);

‎editing/edit-and-sync-features/src/main/java/com/esri/samples/edit_and_sync_features/EditAndSyncFeaturesController.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@ private void initialize() {
8383

8484
try {
8585
// create a basemap from a local tile cache
86-
TileCache sanFranciscoTileCache = new TileCache("samples-data/sanfrancisco/SanFrancisco.tpk");
86+
File tpkFile = new File(System.getProperty("data.dir"), "./samples-data/sanfrancisco/SanFrancisco.tpk");
87+
TileCache sanFranciscoTileCache = new TileCache(tpkFile.getAbsolutePath());
8788
ArcGISTiledLayer tiledLayer = new ArcGISTiledLayer(sanFranciscoTileCache);
8889
Basemap basemap = new Basemap(tiledLayer);
8990

‎feature_layers/feature-layer-dictionary-renderer/src/main/java/com/esri/samples/feature_layer_dictionary_renderer/FeatureLayerDictionaryRendererSample.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
import com.esri.arcgisruntime.symbology.DictionaryRenderer;
3232
import com.esri.arcgisruntime.symbology.DictionarySymbolStyle;
3333

34+
import java.io.File;
35+
3436
public class FeatureLayerDictionaryRendererSample extends Application {
3537

3638
private MapView mapView;
@@ -57,7 +59,8 @@ public void start(Stage stage) {
5759
geodatabase.loadAsync();
5860

5961
// render tells layer what symbols to apply to what features
60-
DictionarySymbolStyle symbolDictionary = DictionarySymbolStyle.createFromFile("./samples-data/stylx/mil2525d.stylx");
62+
File stylxFile = new File(System.getProperty("data.dir"), "./samples-data/stylx/mil2525d.stylx");
63+
DictionarySymbolStyle symbolDictionary = DictionarySymbolStyle.createFromFile(stylxFile.getAbsolutePath());
6164
symbolDictionary.loadAsync();
6265

6366
geodatabase.addDoneLoadingListener(() -> {

‎feature_layers/feature-layer-geodatabase/src/main/java/com/esri/samples/feature_layer_geodatabase/FeatureLayerGeodatabaseSample.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,9 @@ public void start(Stage stage) {
5858
mapView.setMap(map);
5959

6060
// create geodatabase from local resource
61-
String geodatabaseUrl = new File("samples-data/los_angeles/LA_Trails.geodatabase").getAbsolutePath();
62-
Geodatabase geodatabase = new Geodatabase(geodatabaseUrl);
61+
File geodatabaseFile = new File(System.getProperty("data.dir"), "./samples-data/los_angeles/LA_Trails" +
62+
".geodatabase");
63+
Geodatabase geodatabase = new Geodatabase(geodatabaseFile.getAbsolutePath());
6364
geodatabase.addDoneLoadingListener(() -> {
6465
if (geodatabase.getLoadStatus() == LoadStatus.LOADED) {
6566
// access the geodatabase's feature table Trailheads

‎feature_layers/feature-layer-geopackage/src/main/java/com/esri/samples/feature_layer_geopackage/FeatureLayerGeoPackageSample.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public void start(Stage stage) {
5757
ArcGISMap map = new ArcGISMap(Basemap.createStreetsVector());
5858

5959
// create a GeoPackage from a local gpkg file
60-
File geoPackageFile = new File("./samples-data/auroraCO/AuroraCO.gpkg");
60+
File geoPackageFile = new File(System.getProperty("data.dir"), "./samples-data/auroraCO/AuroraCO.gpkg");
6161
GeoPackage geoPackage = new GeoPackage(geoPackageFile.getAbsolutePath());
6262
geoPackage.loadAsync();
6363

‎feature_layers/feature-layer-shapefile/src/main/java/com/esri/samples/feature_layer_shapefile/FeatureLayerShapefileSample.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public void start(Stage stage) {
5858
mapView.setMap(map);
5959

6060
// create a shapefile feature table from the local file
61-
File shapefile = new File("./samples-data/auroraCO/Public_Art.shp");
61+
File shapefile = new File(System.getProperty("data.dir"), "./samples-data/auroraCO/Public_Art.shp");
6262
ShapefileFeatureTable shapefileFeatureTable = new ShapefileFeatureTable(shapefile.getAbsolutePath());
6363

6464
// use the shapefile feature table to create a feature layer

‎feature_layers/generate-geodatabase/src/main/java/com/esri/samples/generate_geodatabase/GenerateGeodatabaseSample.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@ public void start(Stage stage) {
7171
stage.show();
7272

7373
// use a local tile package for the basemap
74-
TileCache tileCache = new TileCache("samples-data/sanfrancisco/SanFrancisco.tpk");
74+
File tpkFile = new File(System.getProperty("data.dir"), "./samples-data/sanfrancisco/SanFrancisco.tpk");
75+
TileCache tileCache = new TileCache(tpkFile.getAbsolutePath());
7576
ArcGISTiledLayer tiledLayer = new ArcGISTiledLayer(tileCache);
7677

7778
// create a map view and add a map

‎hydrography/add-enc-exchange-set/src/main/java/com/esri/samples/add_enc_exchange_set/AddEncExchangeSetSample.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public void start(Stage stage) {
8585
mapView.setMap(map);
8686

8787
// load the ENC exchange set from local data
88-
File encPath = new File("./samples-data/enc/ExchangeSetwithoutUpdates/ENC_ROOT/CATALOG.031");
88+
File encPath = new File(System.getProperty("data.dir"), "./samples-data/enc/ExchangeSetwithoutUpdates/ENC_ROOT/CATALOG.031");
8989
EncExchangeSet encExchangeSet = new EncExchangeSet(Collections.singletonList(encPath.getAbsolutePath()));
9090
encExchangeSet.loadAsync();
9191
encExchangeSet.addDoneLoadingListener(() -> {

‎kml/display-kml/src/main/java/com/esri/samples/display_kml/DisplayKMLSample.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public void start(Stage stage) {
8888
kmlLayer = new KmlLayer(portalItem);
8989
break;
9090
case LOCAL_FILE:
91-
File kmlFile = new File("./samples-data/kml/US_State_Capitals.kml");
91+
File kmlFile = new File(System.getProperty("data.dir"), "./samples-data/kml/US_State_Capitals.kml");
9292
KmlDataset fileKmlDataset = new KmlDataset(kmlFile.getAbsolutePath());
9393
kmlLayer = new KmlLayer(fileKmlDataset);
9494
break;

‎kml/list-kml-contents/src/main/java/com/esri/samples/list_kml_contents/ListKMLContentsSample.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public void start(Stage stage) {
7272
sceneView.setArcGISScene(scene);
7373

7474
// load a KML dataset from a local KMZ file and show it as an operational layer
75-
File kmzFile = new File("./samples-data/kml/esri_test_data.kmz");
75+
File kmzFile = new File(System.getProperty("data.dir"), "./samples-data/kml/esri_test_data.kmz");
7676
KmlDataset kmlDataset = new KmlDataset(kmzFile.getAbsolutePath());
7777
KmlLayer kmlLayer = new KmlLayer(kmlDataset);
7878
scene.getOperationalLayers().add(kmlLayer);

‎kml/play-a-kml-tour/src/main/java/com/esri/samples/play_a_kml_tour/PlayAKMLTourSample.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ public void start(Stage stage) throws IOException {
112112
controlsVBox.getChildren().addAll(playPauseButton, replayButton);
113113

114114
// add a KML layer from a KML dataset with a KML tour
115-
KmlDataset kmlDataset = new KmlDataset(new File("./samples-data/kml/Esri_tour.kmz").getAbsolutePath());
115+
KmlDataset kmlDataset = new KmlDataset(new File(System.getProperty("data.dir"), "./samples-data/kml/Esri_tour.kmz").getAbsolutePath());
116116
KmlLayer kmlLayer = new KmlLayer(kmlDataset);
117117
scene.getOperationalLayers().add(kmlLayer);
118118

‎local_server/local-server-dynamic-workspace-raster/src/main/java/com/esri/samples/local_server_dynamic_workspace_raster/LocalServerDynamicWorkspaceRasterSample.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public void start(Stage stage) {
9999
FileChooser fileChooser = new FileChooser();
100100
fileChooser.setTitle("Open Resource File");
101101
fileChooser.getExtensionFilters().addAll(new ExtensionFilter("Image Files", "*.tif"));
102-
fileChooser.setInitialDirectory(new File("./samples-data/raster/"));
102+
fileChooser.setInitialDirectory(new File(System.getProperty("data.dir"), "./samples-data/raster/"));
103103
File selectedFile = fileChooser.showOpenDialog(stage);
104104

105105
if (selectedFile != null) {

‎local_server/local-server-dynamic-workspace-shapefile/src/main/java/com/esri/samples/local_server_dynamic_workspace_shapefile/LocalServerDynamicWorkspaceShapefileSample.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public void start(Stage stage) {
9999
FileChooser fileChooser = new FileChooser();
100100
fileChooser.setTitle("Open Resource File");
101101
fileChooser.getExtensionFilters().addAll(new ExtensionFilter("Shapefiles", "*.shp"));
102-
fileChooser.setInitialDirectory(new File("./samples-data/shapefiles/"));
102+
fileChooser.setInitialDirectory(new File(System.getProperty("data.dir"), "./samples-data/shapefiles/"));
103103
// choose the file, then start the local map service
104104
addButton.setOnAction(e -> {
105105
// browse to the shapefile file

‎local_server/local-server-feature-layer/src/main/java/com/esri/samples/local_server_feature_layer/LocalServerFeatureLayerSample.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ public void start(Stage stage) {
8080
server.addStatusChangedListener(status -> {
8181
if (server.getStatus() == LocalServerStatus.STARTED) {
8282
// start feature service
83-
String featureServiceURL = new File("samples-data/local_server/PointsofInterest.mpk").getAbsolutePath();
84-
featureService = new LocalFeatureService(featureServiceURL);
83+
File mpkFile = new File(System.getProperty("data.dir"), "./samples-data/local_server/PointsofInterest.mpk");
84+
featureService = new LocalFeatureService(mpkFile.getAbsolutePath());
8585
featureService.addStatusChangedListener(this::addLocalFeatureLayer);
8686
featureService.startAsync();
8787
}

‎local_server/local-server-geoprocessing/src/main/java/com/esri/samples/local_server_geoprocessing/LocalServerGeoprocessingController.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public void initialize() {
6969
mapView.setMap(map);
7070

7171
//load tiled layer and zoom to location
72-
String rasterURL = new File("./samples-data/local_server/RasterHillshade.tpk").getAbsolutePath();
72+
String rasterURL = new File(System.getProperty("data.dir"), "./samples-data/local_server/RasterHillshade.tpk").getAbsolutePath();
7373
TileCache tileCache = new TileCache(rasterURL);
7474
ArcGISTiledLayer tiledLayer = new ArcGISTiledLayer(tileCache);
7575
tiledLayer.loadAsync();
@@ -91,7 +91,7 @@ public void initialize() {
9191
server.addStatusChangedListener(status -> {
9292
if (server.getStatus() == LocalServerStatus.STARTED) {
9393
try {
94-
String gpServiceURL = new File("./samples-data/local_server/Contour.gpk").getAbsolutePath();
94+
String gpServiceURL = new File(System.getProperty("data.dir"), "./samples-data/local_server/Contour.gpk").getAbsolutePath();
9595
// need map server result to add contour lines to map
9696
localGPService =
9797
new LocalGeoprocessingService(gpServiceURL, ServiceType.ASYNCHRONOUS_SUBMIT_WITH_MAP_SERVER_RESULT);

‎local_server/local-server-map-image-layer/src/main/java/com/esri/samples/local_server_map_image_layer/LocalServerMapImageLayerSample.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public void start(Stage stage) {
7979
server.addStatusChangedListener(status -> {
8080
if (status.getNewStatus() == LocalServerStatus.STARTED) {
8181
// start map image service
82-
String mapServiceURL = new File("./samples-data/local_server/RelationshipID.mpk").getAbsolutePath();
82+
String mapServiceURL = new File(System.getProperty("data.dir"), "./samples-data/local_server/RelationshipID.mpk").getAbsolutePath();
8383
mapImageService = new LocalMapService(mapServiceURL);
8484
mapImageService.addStatusChangedListener(this::addLocalMapImageLayer);
8585
mapImageService.startAsync();

‎local_server/local-server-services/src/main/java/com/esri/samples/local_server_services/LocalServerServicesController.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ private void initialize() {
9292
// create a file chooser to select package files
9393
packageChooser = new FileChooser();
9494
packagePath.textProperty().bind(packageChooser.initialFileNameProperty());
95-
packageChooser.setInitialDirectory(new File("./samples-data/local_server"));
95+
packageChooser.setInitialDirectory(new File(System.getProperty("data.dir"), "./samples-data/local_server"));
9696
packageChooser.setInitialFileName(packageChooser.getInitialDirectory().getAbsolutePath() + "/PointsOfInterest.mpk");
9797

9898
// create filters to choose files for specific services

‎map/apply-scheduled-updates-to-preplanned-map-area/src/main/java/com/esri/samples/apply_scheduled_updates_to_preplanned_map_area/ApplyScheduledUpdatesToPreplannedMapAreaSample.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public void start(Stage stage) {
7373
// create a temporary copy of the local offline map files, so that updating does not overwrite them permanently
7474
tempMobileMapPackageDirectory = Files.createTempDirectory("canyonlands_offline_map").toFile();
7575
tempMobileMapPackageDirectory.deleteOnExit();
76-
File sourceDirectory = new File("./samples-data/canyonlands/");
76+
File sourceDirectory = new File(System.getProperty("data.dir"), "./samples-data/canyonlands/");
7777
FileUtils.copyDirectory(sourceDirectory, tempMobileMapPackageDirectory);
7878

7979
// load the offline map as a mobile map package

‎map/generate-offline-map-with-local-basemap/src/main/java/com/esri/samples/generate_offline_map_with_local_basemap/GenerateOfflineMapWithLocalBasemapSample.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ public void drawStatusChanged(DrawStatusChangedEvent drawStatusChangedEvent) {
137137
// open a directory chooser to select the directory containing the referenced basemap
138138
DirectoryChooser directoryChooser = new DirectoryChooser();
139139
// for this sample, the directory chosen should be "naperville"
140-
directoryChooser.setInitialDirectory(new File("./samples-data"));
140+
directoryChooser.setInitialDirectory(new File(System.getProperty("data.dir"), "./samples-data"));
141141
directoryChooser.setTitle("Choose directory containing local basemap");
142142
File localBasemapDirectory = directoryChooser.showDialog(stage.getOwner());
143143

‎map/mobile-map-search-and-route/src/main/java/com/esri/samples/mobile_map_search_and_route/MobileMapSearchAndRouteSample.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public void start(Stage stage) {
9393
FileChooser fileChooser = new FileChooser();
9494
FileChooser.ExtensionFilter mpkFilter = new FileChooser.ExtensionFilter("Map Packages (*.mmpk)", "*.mmpk");
9595
fileChooser.getExtensionFilters().add(mpkFilter);
96-
fileChooser.setInitialDirectory(new File("./samples-data/mmpk"));
96+
fileChooser.setInitialDirectory(new File(System.getProperty("data.dir"), "./samples-data/mmpk"));
9797

9898
// click a button to open the file chooser
9999
Button findMmpkButton = new Button("Open mobile map package");

‎map/open-mobile-map-package/src/main/java/com/esri/samples/open_mobile_map_package/OpenMobileMapPackageSample.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public void start(Stage stage) {
5252
mapView = new MapView();
5353

5454
//load a mobile map package
55-
final String mmpkPath = new File("./samples-data/mmpk/Yellowstone.mmpk").getAbsolutePath();
55+
final String mmpkPath = new File(System.getProperty("data.dir"), "./samples-data/mmpk/Yellowstone.mmpk").getAbsolutePath();
5656
mobileMapPackage = new MobileMapPackage(mmpkPath);
5757

5858
mobileMapPackage.loadAsync();

‎map/read-geopackage/src/main/java/com/esri/samples/read_geopackage/ReadGeoPackageSample.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public void start(Stage stage) {
5757
mapView.setMap(map);
5858

5959
// load the local GeoPackage
60-
File geoPackageFile = new File("./samples-data/auroraCO/AuroraCO.gpkg");
60+
File geoPackageFile = new File(System.getProperty("data.dir"), "./samples-data/auroraCO/AuroraCO.gpkg");
6161
GeoPackage geoPackage = new GeoPackage(geoPackageFile.getAbsolutePath());
6262
geoPackage.loadAsync();
6363
geoPackage.addDoneLoadingListener(() -> {

‎raster/blend-renderer/src/main/java/com/esri/samples/blend_renderer/BlendRendererController.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ public class BlendRendererController {
4646
public void initialize() {
4747

4848
// create rasters
49-
imageryRasterPath = new File("./samples-data/raster/Shasta.tif").getAbsolutePath();
50-
elevationRasterPath = new File("./samples-data/raster/Shasta_Elevation.tif").getAbsolutePath();
49+
imageryRasterPath = new File(System.getProperty("data.dir"), "./samples-data/raster/Shasta.tif").getAbsolutePath();
50+
elevationRasterPath = new File(System.getProperty("data.dir"), "./samples-data/raster/Shasta_Elevation.tif").getAbsolutePath();
5151

5252
// create a raster layer
5353
RasterLayer rasterLayer = new RasterLayer(new Raster(imageryRasterPath));

‎raster/colormap-renderer/src/main/java/com/esri/samples/colormap_renderer/ColormapRendererSample.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public void start(Stage stage) {
5555
stage.show();
5656

5757
// create a raster from a local raster file
58-
Raster raster = new Raster(new File("./samples-data/raster/ShastaBW.tif").getAbsolutePath());
58+
Raster raster = new Raster(new File(System.getProperty("data.dir"), "./samples-data/raster/ShastaBW.tif").getAbsolutePath());
5959

6060
// create a raster layer
6161
RasterLayer rasterLayer = new RasterLayer(raster);

‎raster/hillshade-renderer/src/main/java/com/esri/samples/hillshade_renderer/HillshadeRendererController.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public class HillshadeRendererController {
4242
public void initialize() {
4343

4444
// create raster
45-
Raster raster = new Raster(new File("./samples-data/raster/srtm.tiff").getAbsolutePath());
45+
Raster raster = new Raster(new File(System.getProperty("data.dir"), "./samples-data/raster/srtm.tiff").getAbsolutePath());
4646

4747
// create a raster layer
4848
rasterLayer = new RasterLayer(raster);

‎raster/raster-function/src/main/java/com/esri/samples/raster_function/RasterFunctionSample.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public void start(Stage stage) {
7070

7171
if (imageServiceRaster.getLoadStatus() == LoadStatus.LOADED) {
7272
// create raster function from local json file
73-
File jsonFile = new File("./samples-data/raster/hillshade_simplified.json");
73+
File jsonFile = new File(System.getProperty("data.dir"), "./samples-data/raster/hillshade_simplified.json");
7474
try (Scanner scanner = new Scanner(jsonFile)) {
7575
// read in the complete file as a string
7676
String json = scanner.useDelimiter("\\A").next();

‎raster/raster-layer-file/src/main/java/com/esri/samples/raster_layer_file/RasterLayerFileSample.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public void start(Stage stage) {
5151
stage.show();
5252

5353
// create a raster from a local raster file
54-
Raster raster = new Raster(new File("./samples-data/raster/Shasta.tif").getAbsolutePath());
54+
Raster raster = new Raster(new File(System.getProperty("data.dir"), "./samples-data/raster/Shasta.tif").getAbsolutePath());
5555

5656
// create a raster layer
5757
RasterLayer rasterLayer = new RasterLayer(raster);

‎raster/raster-layer-geopackage/src/main/java/com/esri/samples/raster_layer_geopackage/RasterLayerGeopackageSample.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public void start(Stage stage) {
5757
mapView.setMap(map);
5858

5959
// create a geopackage from a local gpkg file
60-
GeoPackage geoPackage = new GeoPackage(new File("./samples-data/auroraCO/AuroraCO.gpkg").getAbsolutePath());
60+
GeoPackage geoPackage = new GeoPackage(new File(System.getProperty("data.dir"), "./samples-data/auroraCO/AuroraCO.gpkg").getAbsolutePath());
6161

6262
// load the geopackage
6363
geoPackage.loadAsync();

‎raster/rgb-renderer/src/main/java/com/esri/samples/rgb_renderer/RgbRendererController.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public class RgbRendererController {
6060
public void initialize() {
6161

6262
// create raster
63-
Raster raster = new Raster(new File("./samples-data/raster/Shasta.tif").getAbsolutePath());
63+
Raster raster = new Raster(new File(System.getProperty("data.dir"), "./samples-data/raster/Shasta.tif").getAbsolutePath());
6464

6565
// create a raster layer
6666
rasterLayer = new RasterLayer(raster);

‎raster/stretch-renderer/src/main/java/com/esri/samples/stretch_renderer/StretchRendererController.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public class StretchRendererController {
5555
public void initialize() {
5656

5757
// create raster
58-
Raster raster = new Raster(new File("./samples-data/raster/ShastaBW.tif").getAbsolutePath());
58+
Raster raster = new Raster(new File(System.getProperty("data.dir"), "./samples-data/raster/ShastaBW.tif").getAbsolutePath());
5959

6060
// create a raster layer
6161
rasterLayer = new RasterLayer(raster);

‎scene/animate-3d-graphic/src/main/java/com/esri/samples/animate_3d_graphic/Animate3dGraphicController.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ public void initialize() {
141141
mapOverlay.getGraphics().add(plane2D);
142142

143143
// create a graphic with a ModelSceneSymbol of a plane to add to the scene
144-
String modelURI = new File("./samples-data/bristol/Collada/Bristol.dae").getAbsolutePath();
144+
String modelURI = new File(System.getProperty("data.dir"), "./samples-data/bristol/Collada/Bristol.dae").getAbsolutePath();
145145
ModelSceneSymbol plane3DSymbol = new ModelSceneSymbol(modelURI, 1.0);
146146
plane3DSymbol.loadAsync();
147147
plane3D = new Graphic(new Point(0, 0, 0, WGS84), plane3DSymbol);

‎scene/choose-camera-controller/src/main/java/com/esri/samples/choose_camera_controller/ChooseCameraControllerSample.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public void start(Stage stage){
8888
sceneView.getGraphicsOverlays().add(sceneGraphicsOverlay);
8989

9090
// create a graphic with a ModelSceneSymbol of a plane to add to the scene
91-
String modelURI = new File("./samples-data/bristol/Collada/Bristol.dae").getAbsolutePath();
91+
String modelURI = new File(System.getProperty("data.dir"), "./samples-data/bristol/Collada/Bristol.dae").getAbsolutePath();
9292
ModelSceneSymbol plane3DSymbol = new ModelSceneSymbol(modelURI, 1.0);
9393
plane3DSymbol.loadAsync();
9494
plane3DSymbol.setHeading(45);

0 commit comments

Comments
 (0)