From: Andreas Müller <a.mueller@bgbm.org>
Date: Thu, 13 Oct 2016 13:31:44 +0000 (+0200)
Subject: ref #3658 remove nomenclatural code from datasources
X-Git-Tag: 4.4.0^2~57
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/9e4b94cbcb65ade703b48a900a369fe776c1c79b

ref #3658 remove nomenclatural code from datasources
---

diff --git a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/messages.properties b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/messages.properties
index a56ca8310..852c474b7 100644
--- a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/messages.properties
+++ b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/messages.properties
@@ -6,7 +6,6 @@ CdmDataSourceViewPart_2=Notes
 CdmDataSourceViewPart_3=Compatible
 CdmDataSourceViewPart_4=CDM Version
 CdmDataSourceViewPart_5=Created
-CdmDataSourceViewPart_6=Nomenclatural Code
 CdmDataSourceViewPart_7=Database
 CdmDataSourceViewPart_8=Type
 CdmDataSourceViewPart_9=Up
diff --git a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/messages_de.properties b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/messages_de.properties
index bb3d74683..f906aa13b 100644
--- a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/messages_de.properties
+++ b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/messages_de.properties
@@ -6,7 +6,6 @@ CdmDataSourceViewPart_2=Notizen
 CdmDataSourceViewPart_3=Kompatibel
 CdmDataSourceViewPart_4=CDM Version
 CdmDataSourceViewPart_5=Erstellt
-CdmDataSourceViewPart_6=Nomenklaturcode
 CdmDataSourceViewPart_7=Datenquelle
 CdmDataSourceViewPart_8=Typ
 CdmDataSourceViewPart_9=Verf\u00FCgbar
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/Messages.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/Messages.java
index 48c0e4e95..ed80b87bc 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/Messages.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/Messages.java
@@ -40,7 +40,6 @@ public class Messages extends NLS {
     public static String CdmDataSourceViewPart_3;
     public static String CdmDataSourceViewPart_4;
     public static String CdmDataSourceViewPart_5;
-    public static String CdmDataSourceViewPart_6;
     public static String CdmDataSourceViewPart_7;
     public static String CdmDataSourceViewPart_8;
     public static String CdmDataSourceViewPart_9;
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/CdmDataSourceLabelProvider.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/CdmDataSourceLabelProvider.java
index 0a586c2cc..162610f07 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/CdmDataSourceLabelProvider.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/CdmDataSourceLabelProvider.java
@@ -71,17 +71,16 @@ public class CdmDataSourceLabelProvider extends LabelProvider implements ITableL
 				} else {
 					return DatabaseTypeEnum.MySQL.getName();
 				}
-			//TODO 6 was nomenclatural code, do we need to change following numbers?
-			case 7:
+			case 6:
 				return container.getMetaData(MetaDataPropertyName.DB_CREATE_DATE);
-			case 8:
+			case 7:
 				return container.getMetaData(MetaDataPropertyName.DB_SCHEMA_VERSION);
-			case 9:
+			case 8:
 				if(container.getMetaDataMap().get(MetaDataPropertyName.DB_SCHEMA_VERSION) != null){
 					return container.isDataSourceCompatible() ? "Yes" : "No";
 				}
 				break;
-			case 10:
+			case 9:
 				return container.getMetaData(MetaDataPropertyName.DB_CREATE_NOTE);
 		}
 		return CdmMetaDataAwareDataSourceContainer.DEFAULT_ENTRY;
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/CdmDataSourceViewPart.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/CdmDataSourceViewPart.java
index d82b2eccc..e806667df 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/CdmDataSourceViewPart.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/CdmDataSourceViewPart.java
@@ -50,7 +50,6 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  *
  * @author n.hoffmann
  * @created 14.04.2009
- * @version 1.0
  */
 public class CdmDataSourceViewPart extends ViewPart{
 
@@ -208,8 +207,8 @@ public class CdmDataSourceViewPart extends ViewPart{
 	// This will create the columns for the table
 	private void createColumns(TableViewer viewer) {
 		Table table = viewer.getTable();
-		String[] titles = {Messages.CdmDataSourceViewPart_12, Messages.CdmDataSourceViewPart_11, Messages.CdmDataSourceViewPart_10, Messages.CdmDataSourceViewPart_9, Messages.CdmDataSourceViewPart_8, Messages.CdmDataSourceViewPart_7, Messages.CdmDataSourceViewPart_6, Messages.CdmDataSourceViewPart_5, Messages.CdmDataSourceViewPart_4, Messages.CdmDataSourceViewPart_3, Messages.CdmDataSourceViewPart_2};
-		int[] bounds = { 24, 200, 100, 50 , 80, 120, 50, 100, 100, 50, 300};
+		String[] titles = {Messages.CdmDataSourceViewPart_12, Messages.CdmDataSourceViewPart_11, Messages.CdmDataSourceViewPart_10, Messages.CdmDataSourceViewPart_9, Messages.CdmDataSourceViewPart_8, Messages.CdmDataSourceViewPart_7, Messages.CdmDataSourceViewPart_5, Messages.CdmDataSourceViewPart_4, Messages.CdmDataSourceViewPart_3, Messages.CdmDataSourceViewPart_2};
+		int[] bounds = { 24, 200, 100, 50 , 80, 120, 100, 100, 50, 300};
 
 		for (int i = 0; i < titles.length; i++) {
 			TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);