Revision: 5030
http://sourceforge.net/p/jump-pilot/code/5030
Author: michaudm
Date: 2016-09-25 11:03:56 +0000 (Sun, 25 Sep 2016)
Log Message:
-----------
Small improvements in ProjUtils/NewLayerProperties
Modified Paths:
--------------
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/DataStoreDataSource.java
core/trunk/src/org/openjump/core/ccordsys/utils/ProjUtils.java
core/trunk/src/org/openjump/core/ui/plugin/layer/NewLayerPropertiesPlugIn.java
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/DataStoreDataSource.java
===================================================================
---
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/DataStoreDataSource.java
2016-09-22 06:41:00 UTC (rev 5029)
+++
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/DataStoreDataSource.java
2016-09-25 11:03:56 UTC (rev 5030)
@@ -36,7 +36,7 @@
public static final String CACHING_KEY = "Caching";
- public static final String CONNECTION_DESCRIPTOR_KEY = "Connection
Descriptor";
+ //public static final String CONNECTION_DESCRIPTOR_KEY = "Connection
Descriptor";
protected WorkbenchContext context;
Modified: core/trunk/src/org/openjump/core/ccordsys/utils/ProjUtils.java
===================================================================
--- core/trunk/src/org/openjump/core/ccordsys/utils/ProjUtils.java
2016-09-22 06:41:00 UTC (rev 5029)
+++ core/trunk/src/org/openjump/core/ccordsys/utils/ProjUtils.java
2016-09-25 11:03:56 UTC (rev 5030)
@@ -3,12 +3,13 @@
import com.vividsolutions.jump.I18N;
import com.vividsolutions.jump.feature.Feature;
import com.vividsolutions.jump.feature.FeatureCollection;
+import com.vividsolutions.jump.io.datasource.DataSource;
import com.vividsolutions.jump.io.datasource.DataSourceQuery;
import com.vividsolutions.jump.util.FileUtil;
import com.vividsolutions.jump.workbench.imagery.ImageryLayerDataset;
import com.vividsolutions.jump.workbench.imagery.ReferencedImageStyle;
import com.vividsolutions.jump.workbench.model.Layer;
-import
com.vividsolutions.jump.workbench.ui.plugin.datastore.DataStoreDataSource;
+import
com.vividsolutions.jump.workbench.ui.plugin.datastore.DataStoreQueryDataSource;
import org.apache.commons.imaging.ImageReadException;
import org.apache.commons.io.FilenameUtils;
import org.openjump.core.ccordsys.srid.SRIDStyle;
@@ -300,7 +301,7 @@
else {
if (!isDataBaseLayer(layer)) {
DataSourceQuery dsq = layer.getDataSourceQuery();
- Object fnameObj =
dsq.getDataSource().getProperties().get("File");
+ Object fnameObj =
dsq.getDataSource().getProperties().get(DataSource.FILE_KEY);
fileSourcePath = fnameObj.toString();
srsInfo = getSRSInfoFromAuxiliaryFile(fileSourcePath);
}
@@ -321,7 +322,7 @@
// Boolean. Selected layer is related to a database
private static boolean isDataBaseLayer(Layer layer) {
DataSourceQuery dsq = layer.getDataSourceQuery();
- if (dsq == null || dsq.getDataSource() instanceof DataStoreDataSource)
{
+ if (dsq == null || dsq.getDataSource() instanceof
DataStoreQueryDataSource) {
return true;
} else {
return false;
Modified:
core/trunk/src/org/openjump/core/ui/plugin/layer/NewLayerPropertiesPlugIn.java
===================================================================
---
core/trunk/src/org/openjump/core/ui/plugin/layer/NewLayerPropertiesPlugIn.java
2016-09-22 06:41:00 UTC (rev 5029)
+++
core/trunk/src/org/openjump/core/ui/plugin/layer/NewLayerPropertiesPlugIn.java
2016-09-25 11:03:56 UTC (rev 5030)
@@ -61,6 +61,8 @@
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
+import com.vividsolutions.jump.io.datasource.DataSource;
+import
com.vividsolutions.jump.workbench.ui.plugin.datastore.DataStoreQueryDataSource;
import org.apache.commons.io.FilenameUtils;
import org.openjump.core.ccordsys.utils.ProjUtils;
import org.openjump.core.ccordsys.utils.SRSInfo;
@@ -505,7 +507,7 @@
private boolean isDataBaseLayer(Layer layer) {
DataSourceQuery dsq = layer.getDataSourceQuery();
if (dsq == null
- || dsq.getDataSource() instanceof DataStoreDataSource) {
+ || dsq.getDataSource() instanceof
DataStoreQueryDataSource) {
return true;
} else {
return false;
@@ -582,10 +584,10 @@
multipleSourceTypes = true;
}
Object fnameObj = dsq.getDataSource().getProperties()
- .get("File");
+ .get(DataSource.FILE_KEY);
if (fnameObj == null) {
fnameObj = dsq.getDataSource().getProperties()
- .get("Connection Descriptor");
+
.get(DataStoreQueryDataSource.CONNECTION_DESCRIPTOR_KEY);
}
if (fnameObj != null) {
sourcePath = fnameObj.toString();
@@ -725,8 +727,11 @@
private void setInfoProjection(Layer[] layers) throws Exception {
SRSInfo srsInfo =
ProjUtils.getSRSInfoFromLayerStyleOrSource(layers[0]);
label_Coordinate_file = srsInfo.getSource();
- label_Coordinate = String.format("%s:%s - %s",
- srsInfo.getRegistry(), srsInfo.getCode(),
srsInfo.getDescription());
+ label_Coordinate = String.format("%s:%s",
+ srsInfo.getRegistry(), srsInfo.getCode());
+ if (srsInfo.getDescription() != null &&
srsInfo.getDescription().length() > 0) {
+ label_Coordinate = label_Coordinate + " - " +
srsInfo.getDescription();
+ }
}
------------------------------------------------------------------------------
_______________________________________________
Jump-pilot-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
