fix #8148: fix login dialog problems

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java
index 329fcc56ed7ed4d2b08117b8e1bd942c127fc659..8e150030bd1602216c7bf0fb8162c2dcb29ce575 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java
@@ -236,6 +236,7 @@ public class Messages extends NLS {
        public static String RemotingLoginDialog_JOB_SERVER_LAUNCH;
        public static String RemotingLoginDialog_STARTING_MGD_SERVER;
        public static String RemotingLoginDialog_TASK_LAUNCHING_SERVER;
+       public static String RemotingLoginDialog_MISSING_PERMISSION;
 
 
     public static String SearchManager_LARGE_RESULT_EXPECTED;

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties
index 922d315b8e9dc226309ecd3d2fa139e739bd8e1f..24af041149db7b430f0615694ae78c2f6d97bf92 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties
@@ -140,6 +140,7 @@ RemotingLoginDialog_GENERATING_CONFIG_FILE=Generating datasources config file fo
 RemotingLoginDialog_JOB_SERVER_LAUNCH=Managed CDM Server Launch
 RemotingLoginDialog_STARTING_MGD_SERVER=Starting Managed CDM Server. This may take a while.
 RemotingLoginDialog_TASK_LAUNCHING_SERVER=Launching Managed CDM Server
+RemotingLoginDialog_MISSING_PERMISSION=Your credentials are valid but you are not permitted to use the TaxEditor with the selected data source
 
 EditPasswordElement_PLEASE_CREATE_OR_SAVE_USER=Please create or save user '%s' before changing password
 EditPasswordElement_USERNAME_DOES_NOT_EXIST=Username does not exist

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 0c6cdfc0446e26c2f6656fe333b0e23cb2f7129b..585119cbd01e9d34a97da27d6a5298c482cf1198 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
@@ -141,6 +141,7 @@ RemotingLoginDialog_GENERATING_CONFIG_FILE=Generiere Config-Datei f
 RemotingLoginDialog_JOB_SERVER_LAUNCH=Starte internen CDM-Server
 RemotingLoginDialog_STARTING_MGD_SERVER=Starte internen CDM-Server. Dies kann eine Weile dauern.
 RemotingLoginDialog_TASK_LAUNCHING_SERVER=Starte internen CDM-Server
+RemotingLoginDialog_MISSING_PERMISSION="Die Anmeldedaten sind korrekt, aber Sie haben nicht die Rechte auf der ausgewählten Instanz mit dem Editor zu arbeiten"
 
 EditPasswordElement_PLEASE_CREATE_OR_SAVE_USER=Bitte erstellen oder speichern sie den Nutzer '%s', bevor Sie das Kennwort ändern
 EditPasswordElement_USERNAME_DOES_NOT_EXIST=Nutzername existiert nicht

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/RemotingLoginDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/RemotingLoginDialog.java
index da4d158680a6aea94603d4a4f853d6786511840a..2227a9911bc87effe6280257b31c60fe08a0c545 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/RemotingLoginDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/RemotingLoginDialog.java
@@ -149,7 +149,7 @@ public class RemotingLoginDialog extends Dialog implements ICDMServerError {
     private final int MIN_WIDTH = 530;
     private final int MIN_HEIGHT = 220;
     private final int MIN_EXP_HEIGHT = 380;
-    private final int MESSAGE_HEIGHT = 75;
+    private final int MESSAGE_HEIGHT = 50;
     private Label lblEditorVersion;
     private Text txtEditorVersion;
     private Label lblServerCDMVersion;
@@ -385,6 +385,7 @@ public class RemotingLoginDialog extends Dialog implements ICDMServerError {
         styledTxtMessage.setSelectionForeground(SWTResourceManager.getColor(SWT.COLOR_DARK_RED));
         styledTxtMessage.setDoubleClickEnabled(false);
         styledTxtMessage.setEditable(false);
+        styledTxtMessage.setWordWrap(true);
         GridData gd_styledTxtMessage = new GridData(SWT.FILL, SWT.FILL, true, false, 1, 1);
         gd_styledTxtMessage.exclude = true;
         gd_styledTxtMessage.minimumHeight = MESSAGE_HEIGHT;