Revision: 5103
http://sourceforge.net/p/jump-pilot/code/5103
Author: michaudm
Date: 2016-10-25 21:05:00 +0000 (Tue, 25 Oct 2016)
Log Message:
-----------
Generify getDataSourceQuery
Modified Paths:
--------------
core/trunk/src/com/vividsolutions/jump/workbench/datasource/AbstractLoadSaveDatasetPlugIn.java
core/trunk/src/com/vividsolutions/jump/workbench/datasource/DataSourceQueryChooser.java
core/trunk/src/com/vividsolutions/jump/workbench/datasource/DataSourceQueryChooserDialog.java
core/trunk/src/com/vividsolutions/jump/workbench/datasource/DataSourceQueryChooserManager.java
core/trunk/src/com/vividsolutions/jump/workbench/datasource/LoadDatasetPlugIn.java
core/trunk/src/com/vividsolutions/jump/workbench/datasource/LoadFileDataSourceQueryChooser.java
core/trunk/src/com/vividsolutions/jump/workbench/datasource/SaveDatasetAsPlugIn.java
core/trunk/src/com/vividsolutions/jump/workbench/datasource/SaveFileDataSourceQueryChooser.java
core/trunk/src/org/openjump/core/ui/plugin/file/DataSourceQueryChooserOpenWizard.java
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/datasource/AbstractLoadSaveDatasetPlugIn.java
===================================================================
---
core/trunk/src/com/vividsolutions/jump/workbench/datasource/AbstractLoadSaveDatasetPlugIn.java
2016-10-25 13:49:15 UTC (rev 5102)
+++
core/trunk/src/com/vividsolutions/jump/workbench/datasource/AbstractLoadSaveDatasetPlugIn.java
2016-10-25 21:05:00 UTC (rev 5103)
@@ -4,6 +4,7 @@
import java.awt.event.WindowEvent;
import java.util.Collection;
+import com.vividsolutions.jump.io.datasource.DataSourceQuery;
import com.vividsolutions.jump.workbench.WorkbenchContext;
import com.vividsolutions.jump.workbench.plugin.PlugInContext;
import com.vividsolutions.jump.workbench.plugin.ThreadedBasePlugIn;
@@ -35,7 +36,7 @@
protected WorkbenchContext getContext() {
return context;
}
- private Collection dataSourceQueries;
+ private Collection<DataSourceQuery> dataSourceQueries;
public boolean execute(PlugInContext context) throws Exception {
dataSourceQueries = showDialog(context.getWorkbenchContext());
@@ -48,7 +49,7 @@
protected abstract Collection showDialog(WorkbenchContext context);
- protected Collection getDataSourceQueries() {
+ protected Collection<DataSourceQuery> getDataSourceQueries() {
return dataSourceQueries;
}
}
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/datasource/DataSourceQueryChooser.java
===================================================================
---
core/trunk/src/com/vividsolutions/jump/workbench/datasource/DataSourceQueryChooser.java
2016-10-25 13:49:15 UTC (rev 5102)
+++
core/trunk/src/com/vividsolutions/jump/workbench/datasource/DataSourceQueryChooser.java
2016-10-25 21:05:00 UTC (rev 5103)
@@ -31,6 +31,8 @@
*/
package com.vividsolutions.jump.workbench.datasource;
+import com.vividsolutions.jump.io.datasource.DataSourceQuery;
+
import java.awt.Component;
import java.util.Collection;
@@ -44,14 +46,17 @@
*
*/
public interface DataSourceQueryChooser {
- public Component getComponent();
- public Collection getDataSourceQueries();
+
+ Component getComponent();
+ Collection<DataSourceQuery> getDataSourceQueries();
+
/**
* @return a brief description of the dataset type, suitable for display
in a combo box.
*/
- public String toString();
+ String toString();
+
/**
* The user has pressed the OK button.
*/
- public boolean isInputValid();
+ boolean isInputValid();
}
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/datasource/DataSourceQueryChooserDialog.java
===================================================================
---
core/trunk/src/com/vividsolutions/jump/workbench/datasource/DataSourceQueryChooserDialog.java
2016-10-25 13:49:15 UTC (rev 5102)
+++
core/trunk/src/com/vividsolutions/jump/workbench/datasource/DataSourceQueryChooserDialog.java
2016-10-25 21:05:00 UTC (rev 5103)
@@ -32,7 +32,6 @@
package com.vividsolutions.jump.workbench.datasource;
import com.vividsolutions.jump.I18N;
-import
com.vividsolutions.jump.workbench.datasource.FileDataSourceQueryChooser.FileChooserPanel;
import com.vividsolutions.jump.workbench.ui.OKCancelPanel;
import java.awt.*;
@@ -57,6 +56,7 @@
* first combobox.
*/
public class DataSourceQueryChooserDialog extends JDialog {
+
private CardLayout cardLayout = new CardLayout();
private BorderLayout borderLayout2 = new BorderLayout();
private JPanel mainPanel = new JPanel(cardLayout);
@@ -195,12 +195,7 @@
}
void okCancelPanel_actionPerformed(ActionEvent e) {
- /*
- if (!okCancelPanel.wasOKPressed() ||
- getCurrentChooser().isInputValid()) {
- setVisible(false);
- }
- */
+
if (!okCancelPanel.wasOKPressed()) { //cancel case
setVisible(false);
}
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/datasource/DataSourceQueryChooserManager.java
===================================================================
---
core/trunk/src/com/vividsolutions/jump/workbench/datasource/DataSourceQueryChooserManager.java
2016-10-25 13:49:15 UTC (rev 5102)
+++
core/trunk/src/com/vividsolutions/jump/workbench/datasource/DataSourceQueryChooserManager.java
2016-10-25 21:05:00 UTC (rev 5103)
@@ -42,26 +42,35 @@
* JUMP Workbench starts up.
*/
public class DataSourceQueryChooserManager {
- private ArrayList loadDataSourceQueryChoosers = new ArrayList();
- public List getLoadDataSourceQueryChoosers() {
+
+ private ArrayList<DataSourceQueryChooser> loadDataSourceQueryChoosers =
new ArrayList<>();
+
+ public List<DataSourceQueryChooser> getLoadDataSourceQueryChoosers() {
return Collections.unmodifiableList(loadDataSourceQueryChoosers);
}
+
public DataSourceQueryChooserManager
addLoadDataSourceQueryChooser(DataSourceQueryChooser chooser) {
loadDataSourceQueryChoosers.add(chooser);
return this;
- }
- private ArrayList saveDataSourceQueryChoosers = new ArrayList();
- public List getSaveDataSourceQueryChoosers() {
- return Collections.unmodifiableList(saveDataSourceQueryChoosers);
- }
+ }
+
+ private ArrayList<DataSourceQueryChooser> saveDataSourceQueryChoosers =
new ArrayList<>();
+
+ public List<DataSourceQueryChooser> getSaveDataSourceQueryChoosers() {
+ return Collections.unmodifiableList(saveDataSourceQueryChoosers);
+ }
+
public DataSourceQueryChooserManager
addSaveDataSourceQueryChooser(DataSourceQueryChooser chooser) {
saveDataSourceQueryChoosers.add(chooser);
return this;
- }
+ }
+
/**
* @param blackboard typically the Workbench blackboard
*/
public static DataSourceQueryChooserManager get(Blackboard blackboard) {
- return (DataSourceQueryChooserManager)
blackboard.get(DataSourceQueryChooserManager.class.getName() + " - INSTANCE",
new DataSourceQueryChooserManager());
+ return (DataSourceQueryChooserManager) blackboard.get(
+ DataSourceQueryChooserManager.class.getName() + " - INSTANCE",
+ new DataSourceQueryChooserManager());
}
}
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/datasource/LoadDatasetPlugIn.java
===================================================================
---
core/trunk/src/com/vividsolutions/jump/workbench/datasource/LoadDatasetPlugIn.java
2016-10-25 13:49:15 UTC (rev 5102)
+++
core/trunk/src/com/vividsolutions/jump/workbench/datasource/LoadDatasetPlugIn.java
2016-10-25 21:05:00 UTC (rev 5103)
@@ -39,7 +39,6 @@
import com.vividsolutions.jump.io.datasource.*;
import com.vividsolutions.jump.io.datasource.Connection;
import com.vividsolutions.jump.task.TaskMonitor;
-import com.vividsolutions.jump.util.CollectionUtil;
import com.vividsolutions.jump.util.StringUtil;
import
com.vividsolutions.jump.workbench.datasource.FileDataSourceQueryChooser.FileChooserPanel;
import com.vividsolutions.jump.workbench.WorkbenchContext;
@@ -49,13 +48,11 @@
import com.vividsolutions.jump.workbench.plugin.PlugInContext;
import com.vividsolutions.jump.workbench.plugin.ThreadedBasePlugIn;
import com.vividsolutions.jump.workbench.ui.GUIUtil;
-import com.vividsolutions.jump.workbench.ui.WorkbenchFrame;
import com.vividsolutions.jump.workbench.ui.images.IconLoader;
import com.vividsolutions.jump.workbench.ui.plugin.PersistentBlackboardPlugIn;
import com.vividsolutions.jump.util.Blackboard;
import org.openjump.core.ui.util.ExceptionUtil;
-import java.awt.event.ComponentAdapter;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.util.*;
@@ -172,14 +169,13 @@
//Seamus Thomas Carroll [mailto:carro...@cpsc.ucalgary.ca]
//was concerned when he noticed that #getDataSourceQueries
//was being called twice. So call it once only. [Jon Aquino 2004-02-05]
- Collection dataSourceQueries = getDialog(context).getCurrentChooser()
+ Collection<DataSourceQuery> dataSourceQueries =
getDialog(context).getCurrentChooser()
.getDataSourceQueries();
Assert.isTrue(!dataSourceQueries.isEmpty());
boolean exceptionsEncountered = false;
- for (Iterator i = dataSourceQueries.iterator(); i.hasNext();) {
- DataSourceQuery dataSourceQuery = (DataSourceQuery) i.next();
- ArrayList exceptions = new ArrayList();
+ for (DataSourceQuery dataSourceQuery : dataSourceQueries) {
+ ArrayList<Throwable> exceptions = new ArrayList<>();
Assert.isTrue(dataSourceQuery.getDataSource().isReadable());
monitor.report("Loading " + dataSourceQuery.toString() + "...");
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/datasource/LoadFileDataSourceQueryChooser.java
===================================================================
---
core/trunk/src/com/vividsolutions/jump/workbench/datasource/LoadFileDataSourceQueryChooser.java
2016-10-25 13:49:15 UTC (rev 5102)
+++
core/trunk/src/com/vividsolutions/jump/workbench/datasource/LoadFileDataSourceQueryChooser.java
2016-10-25 21:05:00 UTC (rev 5103)
@@ -37,6 +37,7 @@
import javax.swing.JFileChooser;
import com.vividsolutions.jump.coordsys.CoordinateSystemSupport;
+import com.vividsolutions.jump.io.datasource.DataSourceQuery;
import com.vividsolutions.jump.util.Blackboard;
import com.vividsolutions.jump.workbench.WorkbenchContext;
import com.vividsolutions.jump.workbench.ui.GUIUtil;
@@ -100,7 +101,7 @@
}
- public Collection getDataSourceQueries() {
+ public Collection<DataSourceQuery> getDataSourceQueries() {
//User has pressed OK, so persist the directory. [Jon Aquino]
PersistentBlackboardPlugIn.get(context).put(FILE_CHOOSER_DIRECTORY_KEY,
getFileChooserPanel().getChooser().getCurrentDirectory().toString());
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/datasource/SaveDatasetAsPlugIn.java
===================================================================
---
core/trunk/src/com/vividsolutions/jump/workbench/datasource/SaveDatasetAsPlugIn.java
2016-10-25 13:49:15 UTC (rev 5102)
+++
core/trunk/src/com/vividsolutions/jump/workbench/datasource/SaveDatasetAsPlugIn.java
2016-10-25 21:05:00 UTC (rev 5103)
@@ -38,6 +38,7 @@
import javax.swing.ImageIcon;
import javax.swing.JFileChooser;
+import com.vividsolutions.jump.io.datasource.DataSourceQuery;
import
com.vividsolutions.jump.workbench.datasource.FileDataSourceQueryChooser.FileChooserPanel;
import com.vividsolutions.jump.workbench.WorkbenchContext;
import com.vividsolutions.jump.workbench.ui.GUIUtil;
@@ -56,7 +57,7 @@
this.setShortcutModifiers(KeyEvent.ALT_MASK+KeyEvent.SHIFT_MASK);
}
- protected Collection showDialog(WorkbenchContext context) {
+ protected Collection<DataSourceQuery> showDialog(WorkbenchContext context)
{
GUIUtil.centreOnWindow(getDialog());
// initialize the FileChooser with the layer name [mmichaud 2007-08-25]
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/datasource/SaveFileDataSourceQueryChooser.java
===================================================================
---
core/trunk/src/com/vividsolutions/jump/workbench/datasource/SaveFileDataSourceQueryChooser.java
2016-10-25 13:49:15 UTC (rev 5102)
+++
core/trunk/src/com/vividsolutions/jump/workbench/datasource/SaveFileDataSourceQueryChooser.java
2016-10-25 21:05:00 UTC (rev 5103)
@@ -42,6 +42,7 @@
import javax.swing.event.AncestorEvent;
import javax.swing.event.AncestorListener;
+import com.vividsolutions.jump.io.datasource.DataSourceQuery;
import org.openjump.core.ui.plugin.file.open.JFCWithEnterAction;
import com.vividsolutions.jump.I18N;
@@ -142,7 +143,7 @@
return context.getBlackboard();
}
- public Collection getDataSourceQueries() {
+ public Collection<DataSourceQuery> getDataSourceQueries() {
//User has pressed OK, so persist the directory. [Jon Aquino]
PersistentBlackboardPlugIn.get(context).put(FILE_CHOOSER_DIRECTORY_KEY,
getFileChooserPanel().getChooser().getCurrentDirectory().toString());
Modified:
core/trunk/src/org/openjump/core/ui/plugin/file/DataSourceQueryChooserOpenWizard.java
===================================================================
---
core/trunk/src/org/openjump/core/ui/plugin/file/DataSourceQueryChooserOpenWizard.java
2016-10-25 13:49:15 UTC (rev 5102)
+++
core/trunk/src/org/openjump/core/ui/plugin/file/DataSourceQueryChooserOpenWizard.java
2016-10-25 21:05:00 UTC (rev 5103)
@@ -11,14 +11,11 @@
import com.vividsolutions.jump.io.datasource.Connection;
import com.vividsolutions.jump.io.datasource.DataSourceQuery;
import com.vividsolutions.jump.task.TaskMonitor;
-import com.vividsolutions.jump.util.CollectionUtil;
import com.vividsolutions.jump.util.StringUtil;
import com.vividsolutions.jump.workbench.WorkbenchContext;
import com.vividsolutions.jump.workbench.datasource.DataSourceQueryChooser;
import com.vividsolutions.jump.workbench.model.StandardCategoryNames;
import com.vividsolutions.jump.workbench.plugin.PlugInContext;
-import com.vividsolutions.jump.workbench.ui.GUIUtil;
-import com.vividsolutions.jump.workbench.ui.WorkbenchFrame;
import com.vividsolutions.jump.workbench.ui.images.IconLoader;
import com.vividsolutions.jump.workbench.ui.wizard.WizardDialog;
import org.openjump.core.ui.util.ExceptionUtil;
@@ -66,12 +63,11 @@
if (chooser.isInputValid()) {
chooseProjectPanel.activateSelectedProject();
PlugInContext context = workbenchContext.createPlugInContext();
- Collection dataSourceQueries = chooser.getDataSourceQueries();
+ Collection<DataSourceQuery> dataSourceQueries =
chooser.getDataSourceQueries();
if (!dataSourceQueries.isEmpty()) {
boolean exceptionsEncountered = false;
- for (Iterator i = dataSourceQueries.iterator(); i.hasNext();) {
- DataSourceQuery dataSourceQuery = (DataSourceQuery)i.next();
+ for (DataSourceQuery dataSourceQuery : dataSourceQueries) {
List<Throwable> exceptions = new ArrayList<>();
if (dataSourceQuery.getDataSource().isReadable()) {
monitor.report("Loading " + dataSourceQuery.toString() + "...");
------------------------------------------------------------------------------
The Command Line: Reinvented for Modern Developers
Did the resurgence of CLI tooling catch you by surprise?
Reconnect with the command line and become more productive.
Learn the new .NET and ASP.NET CLI. Get your free copy!
http://sdm.link/telerik
_______________________________________________
Jump-pilot-devel mailing list
Jump-pilot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
