From: Alexander Oppermann <a.oppermann@bgbm.org>
Date: Tue, 25 Nov 2014 14:23:48 +0000 (+0000)
Subject: made bug fixes for:
X-Git-Tag: 3.6.0~308^2~5
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/d38253881101c684d18aedee46f81e3f76f427cf

made bug fixes for:

* disabled rank editing support
* empty values are no longer displayed with a "-"
* Checklist Editor is now activated by default
---

diff --git a/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/perspective/ChecklistPerspective.java b/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/perspective/ChecklistPerspective.java
index cba4c8604..8c7a86ac2 100644
--- a/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/perspective/ChecklistPerspective.java
+++ b/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/perspective/ChecklistPerspective.java
@@ -50,6 +50,6 @@ public class ChecklistPerspective extends Default {
 		folder.addView(ConceptViewPart.ID);
 //		folder.addView(MediaViewPart.ID);
 
-		createAdditionalFolder(layout, layout.getEditorArea());
+//		createAdditionalFolder(layout, layout.getEditorArea());
 	}
 }
diff --git a/eu.etaxonomy.taxeditor.cdmlib/.classpath b/eu.etaxonomy.taxeditor.cdmlib/.classpath
index 14558d073..47f830d89 100644
--- a/eu.etaxonomy.taxeditor.cdmlib/.classpath
+++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath
@@ -204,7 +204,7 @@
 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.5.0-SNAPSHOT-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.5.0-SNAPSHOT.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.5.0-SNAPSHOT-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.5.0-SNAPSHOT.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.5.0-SNAPSHOT.jar" sourcepath="lib/cdmlib-persistence-3.5.0-SNAPSHOT-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.5.0-SNAPSHOT-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.5.0-SNAPSHOT.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.5.0-SNAPSHOT-sources.jar"/>
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/ChecklistEditor.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/ChecklistEditor.java
index 3fe844fa7..b99aee8d2 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/ChecklistEditor.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/ChecklistEditor.java
@@ -337,7 +337,8 @@ public class ChecklistEditor extends EditorPart implements ISelectionListener, I
                 table.setSortColumn(column.getColumn());
             }
             if (i == 3) {
-                column.setEditingSupport(new RankEditingSupport(viewer, this));
+            	/** uncommented it for now because no rank editing is wanted **/
+//                column.setEditingSupport(new RankEditingSupport(viewer, this));
             }
             if (i >= 4) {
                 //read PrefrenceStore to setWidth according to last saved state
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/ChecklistLabelProvider.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/ChecklistLabelProvider.java
index 16a5e2689..a1160c1de 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/ChecklistLabelProvider.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/ChecklistLabelProvider.java
@@ -46,7 +46,7 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  */
 public class ChecklistLabelProvider extends LabelProvider implements ITableLabelProvider {
 
-    public static final String DEFAULT_ENTRY = "-";
+    public static final String DEFAULT_ENTRY = "";
     private IDescriptionService descriptionService;
     private final List<DefinedTermBase<?>> namedAreas;
 
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
index 484a13357..2dbfde950 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
@@ -392,6 +392,7 @@ public class PreferencesUtil implements IPreferenceKeys {
 				"http://www.biodiversitylibrary.org/openurl");
 		getPreferenceStore().setDefault(OPENURL_IMAGE_MAX_WIDTH, "1000");
 		getPreferenceStore().setDefault(OPENURL_IMAGE_MAX_HEIGHT, "1000");
+		getPreferenceStore().setDefault(IPreferenceKeys.DISTRIBUTION_AREA_PREFRENCES_ACTIVE, true);
 	}
 
 	/**
@@ -425,7 +426,7 @@ public class PreferencesUtil implements IPreferenceKeys {
 							"The following has been set as your preferred nomenclatural code:\n\n\t"
 									+ NomenclaturalCodeHelper
 											.getDescription(code)
-									+ "\n\nYou can change the nomenclatural code at any time in the \"Preferences\" menu.");*/
+									+ "\n\nYou iour is not consistent throughout the application. For DescriptionElemts and also PolytomousKeyNode.Question and PolytomousKeyNode.Statement it shows only the languages where text is available whereas for PolytomousKeyNode.modyfingText it shows a strange list of about 10-20 (different for different nodes) most of them starting with can change the nomenclatural code at any time in the \"Preferences\" menu.");*/
 		}
 	}