Revision 6740eed5
Added by Andreas Müller almost 7 years ago
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/CdmDataSourceLabelProvider.java | ||
|---|---|---|
| 17 | 17 |
import eu.etaxonomy.cdm.database.DatabaseTypeEnum; |
| 18 | 18 |
import eu.etaxonomy.cdm.database.ICdmDataSource; |
| 19 | 19 |
import eu.etaxonomy.cdm.model.metadata.CdmMetaData.MetaDataPropertyName; |
| 20 |
import eu.etaxonomy.cdm.model.metadata.CdmMetaDataPropertyName; |
|
| 20 | 21 |
import eu.etaxonomy.taxeditor.model.ImageResources; |
| 21 | 22 |
import eu.etaxonomy.taxeditor.store.CdmStore; |
| 22 | 23 |
|
| ... | ... | |
| 71 | 72 |
return DatabaseTypeEnum.MySQL.getName(); |
| 72 | 73 |
} |
| 73 | 74 |
case 6: |
| 74 |
return container.getMetaData(MetaDataPropertyName.DB_CREATE_DATE); |
|
| 75 |
return container.getMetaData(CdmMetaDataPropertyName.DB_CREATE_DATE);
|
|
| 75 | 76 |
case 7: |
| 76 |
return container.getMetaData(MetaDataPropertyName.DB_SCHEMA_VERSION); |
|
| 77 |
return container.getMetaData(CdmMetaDataPropertyName.DB_SCHEMA_VERSION);
|
|
| 77 | 78 |
case 8: |
| 78 |
if(container.getMetaDataMap().get(MetaDataPropertyName.DB_SCHEMA_VERSION) != null){
|
|
| 79 |
if(container.getMetaDataMap().get(CdmMetaDataPropertyName.DB_SCHEMA_VERSION) != null){
|
|
| 79 | 80 |
return container.isDataSourceCompatible() ? "Yes" : "No"; |
| 80 | 81 |
} |
| 81 | 82 |
break; |
| 82 | 83 |
case 9: |
| 83 |
return container.getMetaData(MetaDataPropertyName.DB_CREATE_NOTE); |
|
| 84 |
return container.getMetaData(CdmMetaDataPropertyName.DB_CREATE_NOTE);
|
|
| 84 | 85 |
} |
| 85 | 86 |
return CdmMetaDataAwareDataSourceContainer.DEFAULT_ENTRY; |
| 86 | 87 |
} |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/CdmDataSourceViewerComparator.java | ||
|---|---|---|
| 14 | 14 |
|
| 15 | 15 |
import eu.etaxonomy.cdm.config.ICdmSource; |
| 16 | 16 |
import eu.etaxonomy.cdm.database.ICdmDataSource; |
| 17 |
import eu.etaxonomy.cdm.model.metadata.CdmMetaData.MetaDataPropertyName;
|
|
| 17 |
import eu.etaxonomy.cdm.model.metadata.CdmMetaDataPropertyName; |
|
| 18 | 18 |
|
| 19 | 19 |
/** |
| 20 | 20 |
* @author n.hoffmann |
| ... | ... | |
| 54 | 54 |
|
| 55 | 55 |
switch (propertyIndex) {
|
| 56 | 56 |
case 9: |
| 57 |
result = d1.getMetaData(MetaDataPropertyName.DB_CREATE_NOTE).compareTo(d2.getMetaData(MetaDataPropertyName.DB_CREATE_NOTE));
|
|
| 57 |
result = d1.getMetaData(CdmMetaDataPropertyName.DB_CREATE_NOTE).compareTo(d2.getMetaData(CdmMetaDataPropertyName.DB_CREATE_NOTE));
|
|
| 58 | 58 |
break; |
| 59 | 59 |
case 8: |
| 60 | 60 |
// is compatible |
| ... | ... | |
| 69 | 69 |
} |
| 70 | 70 |
break; |
| 71 | 71 |
case 7: |
| 72 |
result = d1.getMetaData(MetaDataPropertyName.DB_SCHEMA_VERSION).compareTo(d2.getMetaData(MetaDataPropertyName.DB_SCHEMA_VERSION));
|
|
| 72 |
result = d1.getMetaData(CdmMetaDataPropertyName.DB_SCHEMA_VERSION).compareTo(d2.getMetaData(CdmMetaDataPropertyName.DB_SCHEMA_VERSION));
|
|
| 73 | 73 |
break; |
| 74 | 74 |
case 6: |
| 75 |
result = d1.getMetaData(MetaDataPropertyName.DB_CREATE_DATE).compareTo(d2.getMetaData(MetaDataPropertyName.DB_CREATE_DATE));
|
|
| 75 |
result = d1.getMetaData(CdmMetaDataPropertyName.DB_CREATE_DATE).compareTo(d2.getMetaData(CdmMetaDataPropertyName.DB_CREATE_DATE));
|
|
| 76 | 76 |
break; |
| 77 | 77 |
case 5: |
| 78 | 78 |
if(cs1 instanceof ICdmDataSource && cs2 instanceof ICdmDataSource) {
|
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/CdmMetaDataAwareDataSourceContainer.java | ||
|---|---|---|
| 15 | 15 |
import eu.etaxonomy.cdm.config.CdmSourceException; |
| 16 | 16 |
import eu.etaxonomy.cdm.config.ICdmSource; |
| 17 | 17 |
import eu.etaxonomy.cdm.model.metadata.CdmMetaData; |
| 18 |
import eu.etaxonomy.cdm.model.metadata.CdmMetaData.MetaDataPropertyName;
|
|
| 18 |
import eu.etaxonomy.cdm.model.metadata.CdmMetaDataPropertyName; |
|
| 19 | 19 |
import eu.etaxonomy.taxeditor.model.MessagingUtils; |
| 20 | 20 |
|
| 21 | 21 |
/** |
| ... | ... | |
| 36 | 36 |
|
| 37 | 37 |
private boolean running; |
| 38 | 38 |
|
| 39 |
private Map<MetaDataPropertyName, String> metaDataMap; |
|
| 39 |
private Map<CdmMetaDataPropertyName, String> metaDataMap;
|
|
| 40 | 40 |
|
| 41 | 41 |
/** |
| 42 | 42 |
* <p>Constructor for CdmMetaDataAwareDataSourceContainer.</p> |
| ... | ... | |
| 69 | 69 |
running = cdmSource.checkConnection(); |
| 70 | 70 |
} catch (Exception e) {
|
| 71 | 71 |
running = false; |
| 72 |
for(MetaDataPropertyName metaDataPropertyName : MetaDataPropertyName.values()){
|
|
| 72 |
for(CdmMetaDataPropertyName metaDataPropertyName : CdmMetaDataPropertyName.values()){
|
|
| 73 | 73 |
metaDataMap.put(metaDataPropertyName, DEFAULT_ENTRY); |
| 74 | 74 |
} |
| 75 | 75 |
} |
| ... | ... | |
| 94 | 94 |
} |
| 95 | 95 |
} |
| 96 | 96 |
|
| 97 |
private Map<MetaDataPropertyName, String> getDefaultMetaDataMap(){
|
|
| 98 |
Map<MetaDataPropertyName, String> resultMap = new HashMap<MetaDataPropertyName, String>(MetaDataPropertyName.values().length);
|
|
| 97 |
private Map<CdmMetaDataPropertyName, String> getDefaultMetaDataMap(){
|
|
| 98 |
Map<CdmMetaDataPropertyName, String> resultMap = new HashMap<>(CdmMetaDataPropertyName.values().length);
|
|
| 99 | 99 |
|
| 100 |
for(MetaDataPropertyName metaDataPropertyName : MetaDataPropertyName.values()){
|
|
| 100 |
for(CdmMetaDataPropertyName metaDataPropertyName : CdmMetaDataPropertyName.values()){
|
|
| 101 | 101 |
resultMap.put(metaDataPropertyName, null); |
| 102 | 102 |
} |
| 103 | 103 |
|
| ... | ... | |
| 109 | 109 |
* |
| 110 | 110 |
* @return the metaDataMap |
| 111 | 111 |
*/ |
| 112 |
public Map<MetaDataPropertyName, String> getMetaDataMap() {
|
|
| 112 |
public Map<CdmMetaDataPropertyName, String> getMetaDataMap() {
|
|
| 113 | 113 |
return metaDataMap; |
| 114 | 114 |
} |
| 115 | 115 |
|
| ... | ... | |
| 119 | 119 |
* @return a boolean. |
| 120 | 120 |
*/ |
| 121 | 121 |
public boolean isDataSourceCompatible(){
|
| 122 |
String version = metaDataMap.get(MetaDataPropertyName.DB_SCHEMA_VERSION); |
|
| 122 |
String version = metaDataMap.get(CdmMetaDataPropertyName.DB_SCHEMA_VERSION);
|
|
| 123 | 123 |
return version == null || version.equals(DEFAULT_ENTRY) ? false : CdmMetaData.isDbSchemaVersionCompatible(version); |
| 124 | 124 |
} |
| 125 | 125 |
|
| ... | ... | |
| 129 | 129 |
* @param metaDataPropertyName a {@link eu.etaxonomy.cdm.model.common.CdmMetaData.MetaDataPropertyName} object.
|
| 130 | 130 |
* @return a {@link java.lang.String} object.
|
| 131 | 131 |
*/ |
| 132 |
public String getMetaData(MetaDataPropertyName metaDataPropertyName){
|
|
| 132 |
public String getMetaData(CdmMetaDataPropertyName metaDataPropertyName){
|
|
| 133 | 133 |
String property = metaDataMap.get(metaDataPropertyName); |
| 134 | 134 |
return property != null ? property : DEFAULT_ENTRY; |
| 135 | 135 |
} |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/DataSourceMenuPropertyTester.java | ||
|---|---|---|
| 12 | 12 |
import org.eclipse.core.expressions.PropertyTester; |
| 13 | 13 |
import org.eclipse.jface.viewers.IStructuredSelection; |
| 14 | 14 |
|
| 15 |
import eu.etaxonomy.cdm.model.metadata.CdmMetaData.MetaDataPropertyName;
|
|
| 15 |
import eu.etaxonomy.cdm.model.metadata.CdmMetaDataPropertyName; |
|
| 16 | 16 |
import eu.etaxonomy.taxeditor.view.datasource.CdmMetaDataAwareDataSourceContainer; |
| 17 | 17 |
|
| 18 | 18 |
/** |
| ... | ... | |
| 60 | 60 |
|
| 61 | 61 |
if (object instanceof CdmMetaDataAwareDataSourceContainer) {
|
| 62 | 62 |
CdmMetaDataAwareDataSourceContainer container = (CdmMetaDataAwareDataSourceContainer) object; |
| 63 |
String schemaVersion = container.getMetaData(MetaDataPropertyName.DB_SCHEMA_VERSION); |
|
| 63 |
String schemaVersion = container.getMetaData(CdmMetaDataPropertyName.DB_SCHEMA_VERSION);
|
|
| 64 | 64 |
return !schemaVersion.equals(CdmMetaDataAwareDataSourceContainer.DEFAULT_ENTRY); |
| 65 | 65 |
} |
| 66 | 66 |
} |
Also available in: Unified diff
ref #6535 adapt TaxEdtior to new CdmMetaDataPropertyName