From c0555cd64bdf539555dc86787989d3c4d2b31342 Mon Sep 17 00:00:00 2001 From: "l.morris" Date: Thu, 19 Jan 2012 12:58:27 +0000 Subject: [PATCH] Fixes #2550 --- .../view/datasource/CdmMetaDataAwareDataSourceContainer.java | 5 ++++- .../view/datasource/handler/EditDataSourceHandler.java | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/CdmMetaDataAwareDataSourceContainer.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/CdmMetaDataAwareDataSourceContainer.java index 9c3097df4..f64a6b59b 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/CdmMetaDataAwareDataSourceContainer.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/CdmMetaDataAwareDataSourceContainer.java @@ -66,6 +66,9 @@ public class CdmMetaDataAwareDataSourceContainer { running = dataSource.testConnection(); } catch (Exception e) { running = false; + for(MetaDataPropertyName metaDataPropertyName : MetaDataPropertyName.values()){ + metaDataMap.put(metaDataPropertyName, DEFAULT_ENTRY); + } } try { @@ -114,7 +117,7 @@ public class CdmMetaDataAwareDataSourceContainer { */ public boolean isDataSourceCompatible(){ String version = metaDataMap.get(MetaDataPropertyName.DB_SCHEMA_VERSION); - return version == null ? false : CdmMetaData.isDbSchemaVersionCompatible(version); + return version == null || version.equals(DEFAULT_ENTRY) ? false : CdmMetaData.isDbSchemaVersionCompatible(version); } /** diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/EditDataSourceHandler.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/EditDataSourceHandler.java index 7bfc465b2..36c969640 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/EditDataSourceHandler.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/EditDataSourceHandler.java @@ -45,7 +45,9 @@ public class EditDataSourceHandler extends AbstractDataSourceHandler { if(result == IStatus.OK){ CdmDataSourceViewPart view = (CdmDataSourceViewPart) StoreUtil.getView(CdmDataSourceViewPart.ID, false); if(view != null){ + container.getMetaDataFromDataSource(); view.getViewer().update(new CdmMetaDataAwareDataSourceContainer[]{container}, null); + } } -- 2.34.1