ref #8047: fixing number of status issues - layout

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties
index 60b9278038abeb3e1264828565eb2a53abfde424..641c107bbcc8d3243c39e4a3367a6f84fab2e86a 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties
@@ -406,7 +406,7 @@ ChecklistEditorGeneralPreference_open_distribution_selection=Gebiets Vokabulare
 ChecklistEditorGeneralPreference_open_wizard=Liste der verwendbaren Areal-Vokabulare, zum Editieren verwenden Sie bitte den unten stehenden Button
 ChecklistEditorGeneralPreference_show_rank=Rang Spalte anzeigen
 ChecklistEditorGeneralPreference_sort_areas=Areale gemäß Vokabular sortieren
-ChecklistEditorGeneralPreference_numberFormatExceptionLabel=Der Wert muss eine positive Zahl sein.
+ChecklistEditorGeneralPreference_numberFormatExceptionLabel=Der Wert muss eine positive ganze Zahl sein.
 ChecklistEditorGeneralPreference_numberOfStatus=Anzahl der sichtbaren Status im Drop Down
 ChecklistEditorGeneralPreference_tooltip_numberOfStatus=Anzahl der sichtbaren Status im Drop Down ohne Scrollbar
 ChecklistEditorGeneralPreference_Configure_status_order=Sortierung des Status im Drop Down

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/ChecklistEditorGeneralPreference.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/ChecklistEditorGeneralPreference.java
index 2df83f5da4913253c980b4ed4070273dd8f1204f..e770b62b8da6f645e3b8c30abdae5e75fdc2c3fa 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/ChecklistEditorGeneralPreference.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/ChecklistEditorGeneralPreference.java
@@ -398,7 +398,7 @@ public class ChecklistEditorGeneralPreference extends CdmPreferencePage implemen
 \r
             numberOfStatusText = new Text(child, SWT.BORDER);\r
 //            numberOfStatusText.setSize(30, numberOfStatusText.getSize().y);\r
-            numberOfStatusText.setLayoutData(new GridData(30,15));\r
+            numberOfStatusText.setLayoutData(new GridData(20,15));\r
 \r
             if (numberOfStatus != null){\r
                 numberOfStatusText.setText(this.numberOfStatus.toString());\r
@@ -413,7 +413,11 @@ public class ChecklistEditorGeneralPreference extends CdmPreferencePage implemen
                    setApply(true);\r
                    String text = numberOfStatusText.getText();\r
                    try{\r
-                       numberOfStatus = Integer.valueOf(text);\r
+                       Integer tempNumber = Integer.valueOf(text);\r
+                       if(tempNumber <= 0){\r
+                           throw new NumberFormatException();\r
+                       }\r
+                       numberOfStatus = tempNumber;\r
                        numberFormatExceptionLabel.setVisible(false);\r
                        numberOfStatusText.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));\r
                    }catch(NumberFormatException ex){\r