Project

General

Profile

« Previous | Next » 

Revision a9c45e1e

Added by Patrick Plitzner over 5 years ago

fix #7844 Add timeout to login dialog

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/RemotingLoginDialog.java
88 88
    /**
89 89
     *
90 90
     */
91
    private static final String DEFAULT_PASS = "00000";
91
    private static final String DEFAULT_PASS = "00000"; //$NON-NLS-1$
92 92
    /**
93 93
     *
94 94
     */
95
    private static final String DEFAULT_USER = "admin";
95
    private static final String DEFAULT_USER = "admin"; //$NON-NLS-1$
96 96
    private static final String UBUNTU = "Ubuntu"; //$NON-NLS-1$
97 97
	protected Object result;
98 98
    protected Shell shlConnect;
......
591 591
                    txtPort.setEditable(true);
592 592
                    txtPort.setEnabled(true);
593 593
                }
594
                if(selectedCsii.pingServer()) {
595
                    txtCdmServerStatus.setText(STATUS_AVAILABLE);
596
                    populateCdmInstanceCombo(true);
597
                    String serverVersionTimestamp = generateLastModifiedTooltip(selectedCsii.getCdmlibLastModified());
598
                    txtServerVersion.setText(selectedCsii.getCdmlibServicesVersion() + ":" + serverVersionTimestamp); //$NON-NLS-1$
599
                } else {
600
                    txtCdmServerStatus.setText(STATUS_NOT_AVAILABLE);
601
                    comboCdmInstance.removeAll();
602
                    disableCdmInstanceControls("", "");
594
                try {
595
                    if(selectedCsii.pingServer()) {
596
                        txtCdmServerStatus.setText(STATUS_AVAILABLE);
597
                        populateCdmInstanceCombo(true);
598
                        String serverVersionTimestamp = generateLastModifiedTooltip(selectedCsii.getCdmlibLastModified());
599
                        txtServerVersion.setText(selectedCsii.getCdmlibServicesVersion() + ":" + serverVersionTimestamp); //$NON-NLS-1$
600
                    } else {
601
                        txtCdmServerStatus.setText(STATUS_NOT_AVAILABLE);
602
                        comboCdmInstance.removeAll();
603
                        disableCdmInstanceControls("", ""); //$NON-NLS-1$ //$NON-NLS-2$
604
                    }
605
                } 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 609
                }
604 610
            }
605 611
            updatePort();

Also available in: Unified diff