Revision 44399
| trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.impl/src/main/java/org/gvsig/fmap/dal/impl/DatabaseWorkspaceStoresRepository.java | ||
|---|---|---|
| 4 | 4 |
import org.gvsig.fmap.dal.DatabaseWorkspaceManager; |
| 5 | 5 |
import java.util.HashMap; |
| 6 | 6 |
import java.util.Map; |
| 7 |
import java.util.logging.Level; |
|
| 7 | 8 |
import org.gvsig.expressionevaluator.ExpressionUtils; |
| 8 | 9 |
import org.gvsig.fmap.dal.AbstractStoresRepository; |
| 9 | 10 |
import org.gvsig.fmap.dal.DALLocator; |
| ... | ... | |
| 22 | 23 |
import org.slf4j.Logger; |
| 23 | 24 |
import org.slf4j.LoggerFactory; |
| 24 | 25 |
import static org.gvsig.fmap.dal.DatabaseWorkspaceManager.FIELD_REPOSITORY_PARAMETERS; |
| 26 |
import org.gvsig.fmap.dal.exception.ValidateDataParametersException; |
|
| 25 | 27 |
import org.gvsig.tools.dynobject.DynClass; |
| 26 | 28 |
import org.gvsig.tools.dynobject.DynField; |
| 29 |
import org.gvsig.tools.util.HasAFile; |
|
| 27 | 30 |
|
| 28 | 31 |
/** |
| 29 | 32 |
* |
| ... | ... | |
| 65 | 68 |
break; |
| 66 | 69 |
} |
| 67 | 70 |
} |
| 71 |
try {
|
|
| 72 |
if (parameters instanceof HasAFile) {
|
|
| 73 |
HasAFile params = (HasAFile) parameters; |
|
| 74 |
params.setFile(ExpressionUtils.evaluateFilename(params.getFile())); |
|
| 75 |
} |
|
| 76 |
parameters.validate(); |
|
| 77 |
} catch (ValidateDataParametersException ex) {
|
|
| 78 |
LOGGER.warn("Not been able to validate parameters", ex);
|
|
| 79 |
} |
|
| 68 | 80 |
} |
| 69 | 81 |
|
| 70 | 82 |
private void load() {
|
| trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.db/org.gvsig.fmap.dal.db.h2/src/main/java/org/gvsig/fmap/dal/store/h2/H2SpatialConnectionParametersHelper.java | ||
|---|---|---|
| 49 | 49 |
dbName.toUpperCase() |
| 50 | 50 |
); |
| 51 | 51 |
} |
| 52 |
} |
|
| 52 |
}
|
|
| 53 | 53 |
if( this.getDynValue(JDBCConnectionParameters.URL_PARAMTER_NAME) == null ) {
|
| 54 | 54 |
String url = H2SpatialHelper.getConnectionURL((H2SpatialConnectionParameters) this.parameters); |
| 55 | 55 |
this.setDynValue(JDBCConnectionParameters.URL_PARAMTER_NAME, url); |
| trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.db/org.gvsig.fmap.dal.db.h2/src/main/java/org/gvsig/fmap/dal/store/h2/H2SpatialStoreParameters.java | ||
|---|---|---|
| 24 | 24 |
import java.io.File; |
| 25 | 25 |
import java.util.Properties; |
| 26 | 26 |
import org.gvsig.fmap.dal.exception.ValidateDataParametersException; |
| 27 |
import org.gvsig.fmap.dal.store.jdbc.JDBCConnectionParameters; |
|
| 27 | 28 |
import org.gvsig.fmap.dal.store.jdbc.JDBCStoreParameters; |
| 28 | 29 |
|
| 29 | 30 |
public class H2SpatialStoreParameters extends JDBCStoreParameters implements H2SpatialConnectionParameters {
|
| 30 | 31 |
|
| 31 | 32 |
private final H2SpatialConnectionParametersHelper helper; |
| 32 |
|
|
| 33 |
|
|
| 33 | 34 |
public H2SpatialStoreParameters() {
|
| 34 | 35 |
super( |
| 35 | 36 |
H2SpatialLibrary.NAME + "StoreParameters", |
| ... | ... | |
| 42 | 43 |
public String getUrl() {
|
| 43 | 44 |
return this.helper.getUrl(); |
| 44 | 45 |
} |
| 45 |
|
|
| 46 |
|
|
| 46 | 47 |
@Override |
| 47 | 48 |
public void validate() throws ValidateDataParametersException {
|
| 48 | 49 |
this.helper.validate(); |
| 49 | 50 |
super.validate(); |
| 50 | 51 |
} |
| 51 |
|
|
| 52 |
|
|
| 52 | 53 |
@Override |
| 53 | 54 |
public Properties getProperties() {
|
| 54 | 55 |
return this.helper.getProperties(); |
| ... | ... | |
| 58 | 59 |
public File getFile() {
|
| 59 | 60 |
return this.helper.getFile(); |
| 60 | 61 |
} |
| 61 |
|
|
| 62 |
|
|
| 62 | 63 |
@Override |
| 63 | 64 |
public void setFile(File database) {
|
| 64 |
this.helper.setFile(database); |
|
| 65 |
try {
|
|
| 66 |
this.helper.setFile(database); |
|
| 67 |
String url = H2SpatialHelper.getConnectionURL((H2SpatialConnectionParameters) this); |
|
| 68 |
this.setDynValue(JDBCConnectionParameters.URL_PARAMTER_NAME, url); |
|
| 69 |
} catch (Exception ex) {
|
|
| 70 |
} |
|
| 65 | 71 |
} |
| 66 | 72 |
|
| 67 | 73 |
} |
Also available in: Unified diff