Project

General

Profile

« Previous | Next » 

Revision 15a62a24

Added by Cherian Mathew over 8 years ago

#4073 Initial implementation of local cdm-server

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/RemotingLoginDialog.java
169 169

  
170 170
        xpndblcmpstAdvanced.setExpanded(false);
171 171

  
172
        CdmRemoteSource devRemoteSource = CdmServerInfo.getDevServerRemoteSource();
173
        if(devRemoteSource != null) {
174
            CdmStore.connect(devRemoteSource, this);
175
            isDevRemoteSource = true;
176
        }
177

  
178 172
        Display display = getParent().getDisplay();
179 173

  
180 174
        while (!shlConnect.isDisposed()) {
......
462 456
                        }
463 457
                        refreshCdmServer();
464 458
                        updatePort();
459
                        CdmRemoteSource devRemoteSource = CdmServerInfo.getDevServerRemoteSource();
460
                        if(devRemoteSource != null) {
461
                            String username = System.getProperty("cdm.server.dev.username");
462
                            String password = System.getProperty("cdm.server.dev.password");
463
                            if(username != null && !username.isEmpty() && password != null && !password.isEmpty()) {
464
                                txtLogin.setText(username);
465
                                txtPassword.setText(password);
466
                                CdmStore.connect(devRemoteSource, RemotingLoginDialog.this);
467
                            }
468
                        }
465 469
                    }
466 470
                });
467 471
                return Status.OK_STATUS;
......
683 687

  
684 688
    private void readPrefCredentials() {
685 689
        String username, password;
686
        if(isDevRemoteSource) {
687
            username = System.getProperty("cdm.server.dev.username");
688
            password = System.getProperty("cdm.server.dev.password");
689
            if(username != null && !username.isEmpty() && password != null && !password.isEmpty()) {
690
                txtLogin.setText(username);
691
                txtPassword.setText(password);
692
                return;
693
            }
694
        }
695 690
        IEclipsePreferences preferences = ConfigurationScope.INSTANCE.getNode(STORE_PREFERENCES_NODE);
696 691
        Preferences credentialsPrefs = preferences.node(LOGIN_NODE);
697 692
        username = credentialsPrefs.get(getUsernamePrefKey(), "");
......
713 708

  
714 709
    private void emptyCredentials() {
715 710
        txtLogin.setText("");
716
        txtLogin.setText("");
711
        txtPassword.setText("");
717 712
    }
718 713

  
719 714
    private String getUsernamePrefKey() {

Also available in: Unified diff