Revision: 5997
http://sourceforge.net/p/jump-pilot/code/5997
Author: ma15569
Date: 2018-11-29 16:25:09 +0000 (Thu, 29 Nov 2018)
Log Message:
-----------
Harmonized Open files: RasterImageLayer open process now points to the same
folder as Layer and Project open process
Modified Paths:
--------------
core/trunk/src/org/openjump/core/rasterimage/SelectRasterImageFilesPanel.java
Modified:
core/trunk/src/org/openjump/core/rasterimage/SelectRasterImageFilesPanel.java
===================================================================
---
core/trunk/src/org/openjump/core/rasterimage/SelectRasterImageFilesPanel.java
2018-11-11 17:41:46 UTC (rev 5996)
+++
core/trunk/src/org/openjump/core/rasterimage/SelectRasterImageFilesPanel.java
2018-11-29 16:25:09 UTC (rev 5997)
@@ -43,6 +43,7 @@
import com.vividsolutions.jump.I18N;
import com.vividsolutions.jump.util.Blackboard;
import com.vividsolutions.jump.workbench.WorkbenchContext;
+import
com.vividsolutions.jump.workbench.datasource.LoadFileDataSourceQueryChooser;
import com.vividsolutions.jump.workbench.ui.GUIUtil;
import com.vividsolutions.jump.workbench.ui.InputChangedListener;
import com.vividsolutions.jump.workbench.ui.plugin.PersistentBlackboardPlugIn;
@@ -50,118 +51,131 @@
import com.vividsolutions.jump.workbench.ui.wizard.WizardPanel;
public class SelectRasterImageFilesPanel extends JFCWithEnterAction implements
- WizardPanel {
+ WizardPanel {
- public static final String KEY = SelectRasterImageFilesPanel.class
- .getName();
+ public static final String KEY = SelectRasterImageFilesPanel.class
+ .getName();
- public static final String FILE_CHOOSER_DIRECTORY_KEY = KEY
- + " - FILE CHOOSER DIRECTORY";
+ public static final String FILE_CHOOSER_DIRECTORY_KEY =
LoadFileDataSourceQueryChooser.class
+ .getName() + " - FILE CHOOSER DIRECTORY";
- public static final String TITLE = I18N
-
.get("org.openjump.core.rasterimage.SelectRasterImageFilesPanel.Select-Raster-Image");
+ // public static final String FILE_CHOOSER_DIRECTORY_KEY = KEY
+ // + " - FILE CHOOSER DIRECTORY";
- public static final String INSTRUCTIONS = I18N
-
.get("org.openjump.core.ui.plugin.file.open.SelectFileOptionsPanel.instructions");
+ public static final String TITLE = I18N
+
.get("org.openjump.core.rasterimage.SelectRasterImageFilesPanel.Select-Raster-Image");
- public static final String ALL_FILES = I18N
-
.get("org.openjump.core.ui.plugin.file.open.SelectFilesPanel.all-files");
+ public static final String INSTRUCTIONS = I18N
+
.get("org.openjump.core.ui.plugin.file.open.SelectFileOptionsPanel.instructions");
- private Set<InputChangedListener> listeners = new
LinkedHashSet<InputChangedListener>();
+ public static final String ALL_FILES = I18N
+
.get("org.openjump.core.ui.plugin.file.open.SelectFilesPanel.all-files");
- private Blackboard blackboard;
- private ActionListener dialogActionListener;
+ private final Set<InputChangedListener> listeners = new
LinkedHashSet<InputChangedListener>();
- public SelectRasterImageFilesPanel(final WorkbenchContext context) {
- setDialogType(JFileChooser.OPEN_DIALOG);
+ private Blackboard blackboard;
+ private ActionListener dialogActionListener;
- if (PersistentBlackboardPlugIn.get(context).get(
- FILE_CHOOSER_DIRECTORY_KEY) != null) {
- setCurrentDirectory(new File((String)
PersistentBlackboardPlugIn
-
.get(context).get(FILE_CHOOSER_DIRECTORY_KEY)));
- }
+ public SelectRasterImageFilesPanel(final WorkbenchContext context) {
+ setDialogType(JFileChooser.OPEN_DIALOG);
- setFileSelectionMode(JFileChooser.FILES_ONLY);
- setMultiSelectionEnabled(true);
- GUIUtil.removeChoosableFileFilters(this);
- /*
- * FileFilter GEOTIFF_FILE_FILTER =
GUIUtil.createFileFilter("GeoTIFF",
- * new String[]{ "tif", "tiff" }); FileFilter GIF_FILE_FILTER =
- * GUIUtil.createFileFilter("GIF", new String[]{ "gif"});
FileFilter
- * JPG_FILE_FILTER = GUIUtil.createFileFilter("JPEG", new
String[]{
- * "jpg"}); FileFilter PNG_FILE_FILTER =
GUIUtil.createFileFilter("PNG",
- * new String[]{ "png"});
addChoosableFileFilter(GEOTIFF_FILE_FILTER);
- * addChoosableFileFilter(GIF_FILE_FILTER);
- * addChoosableFileFilter(JPG_FILE_FILTER);
- * addChoosableFileFilter(PNG_FILE_FILTER);
- */
- FileFilter JAI_IMAGE_FILE_FILTER = GUIUtil
- .createFileFilter(
-
I18N.get("org.openjump.core.rasterimage.SelectRasterImageFilesPanel.supported-raster-image-formats"),
- new String[] { "tif", "tiff",
"gif", "jpg", "jp2",
- "png", "flt",
"bmp", "asc", "txt" });
- addChoosableFileFilter(JAI_IMAGE_FILE_FILTER);
- addChoosableFileFilter(GUIUtil.ALL_FILES_FILTER);
+ if (PersistentBlackboardPlugIn.get(context).get(
+ FILE_CHOOSER_DIRECTORY_KEY) != null) {
+ setCurrentDirectory(new File((String) PersistentBlackboardPlugIn
+ .get(context).get(FILE_CHOOSER_DIRECTORY_KEY)));
+ }
- setFileFilter(JAI_IMAGE_FILE_FILTER);
+ setFileSelectionMode(JFileChooser.FILES_ONLY);
+ setMultiSelectionEnabled(true);
+ GUIUtil.removeChoosableFileFilters(this);
+ /*
+ * FileFilter GEOTIFF_FILE_FILTER = GUIUtil.createFileFilter("GeoTIFF",
+ * new String[]{ "tif", "tiff" }); FileFilter GIF_FILE_FILTER =
+ * GUIUtil.createFileFilter("GIF", new String[]{ "gif"}); FileFilter
+ * JPG_FILE_FILTER = GUIUtil.createFileFilter("JPEG", new String[]{
+ * "jpg"}); FileFilter PNG_FILE_FILTER =
GUIUtil.createFileFilter("PNG",
+ * new String[]{ "png"}); addChoosableFileFilter(GEOTIFF_FILE_FILTER);
+ * addChoosableFileFilter(GIF_FILE_FILTER);
+ * addChoosableFileFilter(JPG_FILE_FILTER);
+ * addChoosableFileFilter(PNG_FILE_FILTER);
+ */
+ final FileFilter JAI_IMAGE_FILE_FILTER = GUIUtil
+ .createFileFilter(
+
I18N.get("org.openjump.core.rasterimage.SelectRasterImageFilesPanel.supported-raster-image-formats"),
+ new String[] { "tif", "tiff", "gif", "jpg", "jp2",
+ "png", "flt", "bmp", "asc", "txt" });
+ addChoosableFileFilter(JAI_IMAGE_FILE_FILTER);
+ addChoosableFileFilter(GUIUtil.ALL_FILES_FILTER);
- setControlButtonsAreShown(false);
+ setFileFilter(JAI_IMAGE_FILE_FILTER);
- addPropertyChangeListener(new PropertyChangeListener() {
- public void propertyChange(PropertyChangeEvent evt) {
- PersistentBlackboardPlugIn.get(context).put(
- FILE_CHOOSER_DIRECTORY_KEY,
-
getCurrentDirectory().toString());
- fireInputChanged();
- }
- });
- }
+ setControlButtonsAreShown(false);
- public void setDialog(WizardDialog dialog) {
- removeActionListener(dialogActionListener);
- dialogActionListener = new InvokeMethodActionListener(dialog,
"next");
- addActionListener(dialogActionListener);
+ addPropertyChangeListener(new PropertyChangeListener() {
+ @Override
+ public void propertyChange(PropertyChangeEvent evt) {
+ PersistentBlackboardPlugIn.get(context).put(
+ FILE_CHOOSER_DIRECTORY_KEY,
+ getCurrentDirectory().toString());
+ fireInputChanged();
+ }
+ });
+ }
- }
+ public void setDialog(WizardDialog dialog) {
+ removeActionListener(dialogActionListener);
+ dialogActionListener = new InvokeMethodActionListener(dialog, "next");
+ addActionListener(dialogActionListener);
- public void enteredFromLeft(final Map dataMap) {
- rescanCurrentDirectory();
- }
+ }
- public void exitingToRight() throws Exception {
- }
+ @Override
+ public void enteredFromLeft(final Map dataMap) {
+ rescanCurrentDirectory();
+ }
- public String getID() {
- return getClass().getName();
- }
+ @Override
+ public void exitingToRight() throws Exception {
+ }
- public String getInstructions() {
- return INSTRUCTIONS;
- }
+ @Override
+ public String getID() {
+ return getClass().getName();
+ }
- public String getNextID() {
- return null;
- }
+ @Override
+ public String getInstructions() {
+ return INSTRUCTIONS;
+ }
- public String getTitle() {
- return TITLE;
- }
+ @Override
+ public String getNextID() {
+ return null;
+ }
- public boolean isInputValid() {
- return getSelectedFile() != null;
- }
+ @Override
+ public String getTitle() {
+ return TITLE;
+ }
- public void add(InputChangedListener listener) {
- listeners.add(listener);
- }
+ @Override
+ public boolean isInputValid() {
+ return getSelectedFile() != null;
+ }
- public void remove(InputChangedListener listener) {
- listeners.remove(listener);
- }
+ @Override
+ public void add(InputChangedListener listener) {
+ listeners.add(listener);
+ }
- private void fireInputChanged() {
- for (InputChangedListener listener : listeners) {
- listener.inputChanged();
- }
- }
+ @Override
+ public void remove(InputChangedListener listener) {
+ listeners.remove(listener);
+ }
+
+ private void fireInputChanged() {
+ for (final InputChangedListener listener : listeners) {
+ listener.inputChanged();
+ }
+ }
}
_______________________________________________
Jump-pilot-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
