Project

General

Profile

Revision 41058237

ID4105823747e3cb1326e06f6f65a4e3712c8c9001
Parent 9e4eb709
Child a9316ea5

Added by Patrick Plitzner almost 2 years ago

ref #7844 Enhance error message when connection times out

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties
80 80
CdmStoreConnector_UPDATE_EDITOR_OR_CHOOSE_COMPATIBLE_DATASOURCE=Please update the Taxonomic Editor (Help->Check for Updates) or choose a compatible datasource
81 81
ConfiguratorComposite_CONFIGURE=Configure
82 82

  
83
RemotingLoginDialog_CONNECTION_FAILED_MESSAGE=Could not connect to CDM Server.
84
RemotingLoginDialog_CONNECTION_FAILED_TITLE=Connection failed
83
RemotingLoginDialog_CONNECTION_FAILED_MESSAGE=Could not connect to CDM Server. Please check internet connection and try again.\nIf the problem persists ask your system administrator or contact EditSupport@bgbm.org.
84
RemotingLoginDialog_CONNECTION_FAILED_TITLE=Connection to CDM server failed
85 85
RemotingLoginDialog_DEFAULT_LOGIN=Default: %s (login), %s (password)
86 86
RemotingLoginDialog_CHOOSE_COMPATIBLE_CDM_SERVER=Please choose a compatible cdm-server or update the chosen cdm-server
87 87
RemotingLoginDialog_LABEL_ADVANCED=advanced
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties
80 80
CdmStoreConnector_UPDATE_EDITOR_OR_CHOOSE_COMPATIBLE_DATASOURCE=Bitte aktualisieren Sie den Taxonomic Editor (Hilfe->Suche nach Updates) oder w?hlen sie eine kompatible Datenquelle
81 81
ConfiguratorComposite_CONFIGURE=Einstellungen
82 82

  
83
RemotingLoginDialog_CONNECTION_FAILED_MESSAGE=Eine Verbindung zum CDM-Server konnte nicht hergestellt werden.
83
RemotingLoginDialog_CONNECTION_FAILED_MESSAGE=Eine Verbindung zum CDM-Server konnte nicht hergestellt werden. Bitte ?berpr?fen Sie die Internetverbindung und versuchen es erneut.\nWenn das Problem weiterhin besteht, fragen Sie den Netzwerkadministrator oder kontaktieren Sie EditSupport@bgbm.org.
84 84
RemotingLoginDialog_CONNECTION_FAILED_TITLE=Verbindung fehlgeschlagen
85 85
RemotingLoginDialog_DEFAULT_LOGIN=Standard: %s (Login), %s (Kennwort)
86 86
RemotingLoginDialog_CHOOSE_COMPATIBLE_CDM_SERVER=Bitte w?hlen Sie einen kompatiblen CDM-Server oder aktualisieren sie den CDM-Server
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/RemotingLoginDialog.java
17 17
import java.util.Map;
18 18

  
19 19
import org.apache.commons.lang.StringUtils;
20
import org.apache.log4j.Logger;
20 21
import org.eclipse.core.runtime.IProgressMonitor;
21 22
import org.eclipse.core.runtime.IStatus;
22 23
import org.eclipse.core.runtime.Status;
......
85 86
 */
86 87
public class RemotingLoginDialog extends Dialog implements ICDMServerError {
87 88

  
88
    /**
89
     *
90
     */
89
    private Logger logger = Logger.getLogger(getClass());
90

  
91 91
    private static final String DEFAULT_PASS = "00000"; //$NON-NLS-1$
92
    /**
93
     *
94
     */
95 92
    private static final String DEFAULT_USER = "admin"; //$NON-NLS-1$
96 93
    private static final String UBUNTU = "Ubuntu"; //$NON-NLS-1$
97 94
	protected Object result;
......
603 600
                        disableCdmInstanceControls("", ""); //$NON-NLS-1$ //$NON-NLS-2$
604 601
                    }
605 602
                } catch (CDMServerException | IOException e) {
606
                    MessagingUtils.errorDialog(Messages.RemotingLoginDialog_CONNECTION_FAILED_TITLE, this,
607
                            Messages.RemotingLoginDialog_CONNECTION_FAILED_MESSAGE,
608
                            TaxeditorStorePlugin.PLUGIN_ID, e, true, true);
603
                    MessagingUtils.warningDialog(Messages.RemotingLoginDialog_CONNECTION_FAILED_TITLE, this,
604
                            Messages.RemotingLoginDialog_CONNECTION_FAILED_MESSAGE);
605
                    logger.warn(Messages.RemotingLoginDialog_CONNECTION_FAILED_TITLE, e);
609 606
                }
610 607
            }
611 608
            updatePort();

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)