Revision: 4864
http://sourceforge.net/p/jump-pilot/code/4864
Author: michaudm
Date: 2016-03-25 21:29:42 +0000 (Fri, 25 Mar 2016)
Log Message:
-----------
Making writable datastore more generic
Modified Paths:
--------------
core/trunk/src/org/openjump/core/ui/plugin/datastore/AddDataStoreLayerWizard.java
core/trunk/src/org/openjump/core/ui/plugin/datastore/EditDataStoreQueryPlugIn.java
core/trunk/src/org/openjump/core/ui/plugin/datastore/RefreshDataStoreQueryPlugIn.java
core/trunk/src/org/openjump/core/ui/plugin/datastore/WritableDataStoreDataSource.java
Modified:
core/trunk/src/org/openjump/core/ui/plugin/datastore/AddDataStoreLayerWizard.java
===================================================================
---
core/trunk/src/org/openjump/core/ui/plugin/datastore/AddDataStoreLayerWizard.java
2016-03-25 19:03:29 UTC (rev 4863)
+++
core/trunk/src/org/openjump/core/ui/plugin/datastore/AddDataStoreLayerWizard.java
2016-03-25 21:29:42 UTC (rev 4864)
@@ -145,7 +145,7 @@
private List<Layer> createLayers(final AddDatastoreLayerPanel panel,
TaskMonitor monitor) throws Exception {
- ArrayList<Layer> ret = new ArrayList<Layer>();
+ ArrayList<Layer> ret = new ArrayList<>();
List<DataStoreLayer> dsLayers = panel.getDatasetLayers();
ConnectionDescriptor connectionDescriptor =
panel.getConnectionDescriptor();
Modified:
core/trunk/src/org/openjump/core/ui/plugin/datastore/EditDataStoreQueryPlugIn.java
===================================================================
---
core/trunk/src/org/openjump/core/ui/plugin/datastore/EditDataStoreQueryPlugIn.java
2016-03-25 19:03:29 UTC (rev 4863)
+++
core/trunk/src/org/openjump/core/ui/plugin/datastore/EditDataStoreQueryPlugIn.java
2016-03-25 21:29:42 UTC (rev 4864)
@@ -50,7 +50,7 @@
FeatureInstaller installer = new FeatureInstaller(workbenchContext);
JPopupMenu popupMenu = workbenchContext.getWorkbench().getFrame()
.getLayerNamePopupMenu();
- installer.addPopupMenuItem(popupMenu, this,
+ installer.addPopupMenuPlugin(popupMenu, this,
new String[] { MenuNames.DATASTORE }, getName(), false, ICON,
enableCheck);
}
@@ -98,8 +98,6 @@
}
/**
- * @param workbenchContext
- * @return an enable check
*/
public EnableCheck createEnableCheck(WorkbenchContext workbenchContext) {
final WorkbenchContext wc = workbenchContext;
Modified:
core/trunk/src/org/openjump/core/ui/plugin/datastore/RefreshDataStoreQueryPlugIn.java
===================================================================
---
core/trunk/src/org/openjump/core/ui/plugin/datastore/RefreshDataStoreQueryPlugIn.java
2016-03-25 19:03:29 UTC (rev 4863)
+++
core/trunk/src/org/openjump/core/ui/plugin/datastore/RefreshDataStoreQueryPlugIn.java
2016-03-25 21:29:42 UTC (rev 4864)
@@ -40,8 +40,8 @@
FeatureInstaller installer = new FeatureInstaller(workbenchContext);
JPopupMenu popupMenu = workbenchContext.getWorkbench().getFrame()
.getLayerNamePopupMenu();
- installer.addPopupMenuItem(popupMenu, this, new
String[]{MenuNames.DATASTORE},
- getName(), false, ICON, enableCheck);
+ installer.addPopupMenuPlugin(popupMenu, this, new
String[]{MenuNames.DATASTORE},
+ getName(), false, ICON, enableCheck);
}
@Override
@@ -97,8 +97,6 @@
/**
* Creates an EnableCheck object to enable the plugin if a project is
active
* and if only layers connected to a DataStoreQueryDataSource are selected.
- * @param workbenchContext
- * @return an enable check
*/
public EnableCheck createEnableCheck(WorkbenchContext workbenchContext) {
final WorkbenchContext wc = workbenchContext;
Modified:
core/trunk/src/org/openjump/core/ui/plugin/datastore/WritableDataStoreDataSource.java
===================================================================
---
core/trunk/src/org/openjump/core/ui/plugin/datastore/WritableDataStoreDataSource.java
2016-03-25 19:03:29 UTC (rev 4863)
+++
core/trunk/src/org/openjump/core/ui/plugin/datastore/WritableDataStoreDataSource.java
2016-03-25 21:29:42 UTC (rev 4864)
@@ -7,7 +7,6 @@
import javax.swing.JOptionPane;
import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jump.datastore.DataStoreConnection;
import com.vividsolutions.jump.datastore.DataStoreDriver;
import com.vividsolutions.jump.datastore.SQLUtil;
import
com.vividsolutions.jump.datastore.spatialdatabases.SpatialDatabasesDSConnection;
@@ -20,8 +19,6 @@
import com.vividsolutions.jts.geom.Geometry;
import com.vividsolutions.jts.geom.GeometryFactory;
import com.vividsolutions.jump.I18N;
-import com.vividsolutions.jump.datastore.postgis.PostgisDSConnection;
-import com.vividsolutions.jump.datastore.postgis.PostgisDataStoreDriver;
import com.vividsolutions.jump.feature.AttributeType;
import com.vividsolutions.jump.feature.Feature;
import com.vividsolutions.jump.feature.FeatureCollection;
@@ -166,7 +163,7 @@
@Override
public FeatureCollection executeQuery(String query,
TaskMonitor monitor) throws
Exception {
- Collection exceptions = new ArrayList();
+ Collection<Throwable> exceptions = new ArrayList<>();
FeatureCollection featureCollection = executeQuery(query,
exceptions, monitor);
if (!exceptions.isEmpty()) {
@@ -329,8 +326,7 @@
}
sb.append(");");
Logger.trace(sb.toString());
- PreparedStatement pstmt =
conn.getJdbcConnection().prepareStatement(sb.toString());
- return pstmt;
+ return conn.getJdbcConnection().prepareStatement(sb.toString());
}
@@ -374,7 +370,7 @@
protected PreparedStatement setAttributeValues(PreparedStatement pstmt,
Feature feature, int srid, int dim) throws SQLException {
FeatureSchema schema = feature.getSchema();
- Set<String> excludedAttributes = new HashSet<String>();
+ Set<String> excludedAttributes = new HashSet<>();
for (int i = 0 ; i < schema.getAttributeCount() ; i++) {
if (schema.isAttributeReadOnly(i)) {
excludedAttributes.add(schema.getAttributeName(i));
@@ -464,10 +460,10 @@
/**
* Return a map with modified features indexed by their database id.
* WARNING : New features are excluded from this map.
- * @return
+ * @return a Map containing evolutions indexed by id
*/
public Map<Object,Evolution> getIndexedEvolutions() {
- Map<Object,Evolution> index = new TreeMap<Object,Evolution>();
+ Map<Object,Evolution> index = new TreeMap<>();
for (Evolution evolution : evolutions.values()) {
Evolution.Type type = evolution.getType();
if (type == Evolution.Type.MODIFICATION || type ==
Evolution.Type.SUPPRESSION) {
@@ -503,8 +499,6 @@
/**
* Execute a query against this connection to delete the reference to this
* table in the PostGIS's geometry_columns table.
- * @schemaName unquoted schema name
- * @tableName unquoted table name
*/
abstract protected void deleteTableQuery(SpatialDatabasesDSConnection
conn) throws SQLException;
------------------------------------------------------------------------------
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785351&iu=/4140
_______________________________________________
Jump-pilot-devel mailing list
Jump-pilot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
