Revision: 6417
http://sourceforge.net/p/jump-pilot/code/6417
Author: ma15569
Date: 2020-09-04 04:45:49 +0000 (Fri, 04 Sep 2020)
Log Message:
-----------
Removed dependency to
org.openjump.core.ui.plugin.layer.pirolraster.LoadSextanteRasterImagePlugIn
Modified Paths:
--------------
core/trunk/src/org/openjump/core/rasterimage/AddRasterImageLayerWizard.java
core/trunk/src/org/openjump/core/rasterimage/RasterImageIOUtils.java
Modified:
core/trunk/src/org/openjump/core/rasterimage/AddRasterImageLayerWizard.java
===================================================================
--- core/trunk/src/org/openjump/core/rasterimage/AddRasterImageLayerWizard.java
2020-09-02 20:55:26 UTC (rev 6416)
+++ core/trunk/src/org/openjump/core/rasterimage/AddRasterImageLayerWizard.java
2020-09-04 04:45:49 UTC (rev 6417)
@@ -13,7 +13,7 @@
import org.openjump.core.ccordsys.utils.SRSInfo;
import org.openjump.core.ui.plugin.file.OpenRecentPlugIn;
import org.openjump.core.ui.plugin.file.open.ChooseProjectPanel;
-import
org.openjump.core.ui.plugin.layer.pirolraster.LoadSextanteRasterImagePlugIn;
+//import
org.openjump.core.ui.plugin.layer.pirolraster.LoadSextanteRasterImagePlugIn;
import org.openjump.core.ui.plugin.layer.pirolraster.RasterImageWizardPanel;
import org.openjump.core.ui.swing.wizard.AbstractWizardGroup;
import org.openjump.io.PropertiesHandler;
@@ -121,7 +121,7 @@
public void open(File file, TaskMonitor monitor) {
try {
try {
- properties.setProperty(LoadSextanteRasterImagePlugIn.KEY_PATH,
+ properties.setProperty("path",
file.getPath());
properties.store(" " + KEY_ZOOM_TO_INSERTED_IMAGE
@@ -128,7 +128,7 @@
+ I18N.get("RasterImagePlugIn.28")
+ KEY_ALLWAYSACCEPT_TWF_EXT
+ I18N.get("RasterImagePlugIn.29")
- + LoadSextanteRasterImagePlugIn.KEY_PATH
+ + "path"
+ I18N.get("RasterImagePlugIn.30"));
final String selectedFilename = file.getPath();
Modified: core/trunk/src/org/openjump/core/rasterimage/RasterImageIOUtils.java
===================================================================
--- core/trunk/src/org/openjump/core/rasterimage/RasterImageIOUtils.java
2020-09-02 20:55:26 UTC (rev 6416)
+++ core/trunk/src/org/openjump/core/rasterimage/RasterImageIOUtils.java
2020-09-04 04:45:49 UTC (rev 6417)
@@ -24,7 +24,7 @@
import org.openjump.core.rasterimage.TiffTags.TiffReadingException;
import org.openjump.core.rasterimage.sextante.OpenJUMPSextanteRasterLayer;
import
org.openjump.core.rasterimage.sextante.rasterWrappers.GridWrapperNotInterpolated;
-import
org.openjump.core.ui.plugin.layer.pirolraster.LoadSextanteRasterImagePlugIn;
+//import
org.openjump.core.ui.plugin.layer.pirolraster.LoadSextanteRasterImagePlugIn;
import com.vividsolutions.jts.geom.Envelope;
import com.vividsolutions.jump.I18N;
@@ -42,8 +42,7 @@
public class RasterImageIOUtils {
static Properties properties = null;
private static String byteOrder = "LSBFIRST";
- private static String propertiesFile = LoadSextanteRasterImagePlugIn
- .getPropertiesFile();
+ private static String propertiesFile = "path";
static NumberFormat cellFormat = null;
// public static final Double DEFAULT_NODATA = Double.valueOf(-9999.0D);
public static double defaultNoData = -99999.0D;
@@ -216,7 +215,7 @@
try {
FileInputStream fis = new FileInputStream(propertiesFile);
properties.load(fis);
- properties.getProperty(LoadSextanteRasterImagePlugIn.KEY_PATH);
+ properties.getProperty(propertiesFile);
fis.close();
} catch (FileNotFoundException localFileNotFoundException) {
} catch (IOException e) {
@@ -304,7 +303,7 @@
try {
FileInputStream fis = new FileInputStream(propertiesFile);
properties.load(fis);
- properties.getProperty(LoadSextanteRasterImagePlugIn.KEY_PATH);
+ properties.getProperty(propertiesFile);
fis.close();
} catch (FileNotFoundException localFileNotFoundException) {
} catch (IOException e) {
@@ -397,7 +396,7 @@
try {
FileInputStream fis = new FileInputStream(propertiesFile);
properties.load(fis);
- properties.getProperty(LoadSextanteRasterImagePlugIn.KEY_PATH);
+ properties.getProperty(propertiesFile);
fis.close();
} catch (FileNotFoundException localFileNotFoundException) {
} catch (IOException e) {
@@ -491,7 +490,7 @@
try {
FileInputStream fis = new FileInputStream(propertiesFile);
properties.load(fis);
- properties.getProperty(LoadSextanteRasterImagePlugIn.KEY_PATH);
+ properties.getProperty(propertiesFile);
fis.close();
} catch (FileNotFoundException localFileNotFoundException) {
} catch (IOException e) {
@@ -584,7 +583,7 @@
try {
FileInputStream fis = new FileInputStream(propertiesFile);
properties.load(fis);
- properties.getProperty(LoadSextanteRasterImagePlugIn.KEY_PATH);
+ properties.getProperty(propertiesFile);
fis.close();
} catch (FileNotFoundException localFileNotFoundException) {
} catch (IOException e) {
@@ -677,7 +676,7 @@
try {
FileInputStream fis = new FileInputStream(propertiesFile);
properties.load(fis);
- properties.getProperty(LoadSextanteRasterImagePlugIn.KEY_PATH);
+ properties.getProperty(propertiesFile);
fis.close();
} catch (FileNotFoundException localFileNotFoundException) {
} catch (IOException e) {
@@ -924,7 +923,7 @@
try {
FileInputStream fis = new FileInputStream(propertiesFile);
properties.load(fis);
- properties.getProperty(LoadSextanteRasterImagePlugIn.KEY_PATH);
+ properties.getProperty(propertiesFile);
fis.close();
} catch (FileNotFoundException localFileNotFoundException) {
} catch (IOException e) {
@@ -1009,7 +1008,7 @@
try {
FileInputStream fis = new FileInputStream(propertiesFile);
properties.load(fis);
- properties.getProperty(LoadSextanteRasterImagePlugIn.KEY_PATH);
+ properties.getProperty(propertiesFile);
fis.close();
} catch (FileNotFoundException localFileNotFoundException) {
} catch (IOException e) {
_______________________________________________
Jump-pilot-devel mailing list
Jump-pilot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
