} else {
comboCdmServer.select(serverIndex);
}
+ CdmRemoteSource devRemoteSource = CdmServerInfo.getDevServerRemoteSource();
+ if(devRemoteSource != null) {
+ isDevRemoteSource = true;
+ }
refreshCdmServer();
updatePort();
- CdmRemoteSource devRemoteSource = CdmServerInfo.getDevServerRemoteSource();
+
if(devRemoteSource != null) {
String username = System.getProperty("cdm.server.dev.username");
String password = System.getProperty("cdm.server.dev.password");
if(username != null && !username.isEmpty() && password != null && !password.isEmpty()) {
txtLogin.setText(username);
txtPassword.setText(password);
- loadLoginPrefs = false;
CdmStore.connect(devRemoteSource, RemotingLoginDialog.this);
}
}
}
};
- if(txtCdmServerStatus.getText().equals(STATUS_AVAILABLE)) {
+ if(txtCdmServerStatus.getText().equals(STATUS_AVAILABLE) && !isDevRemoteSource) {
// Start the Job
job.schedule();
}
int selIndex = comboCdmInstance.getSelectionIndex();
if(selIndex != -1) {
selectedCdmInstance = selectedCsii.getInstanceFromName(comboCdmInstance.getItem(selIndex));
- if(loadLoginPrefs) {
+ if(loadLoginPrefs && !isDevRemoteSource) {
readPrefCredentials();
}
}
String username, password;
IEclipsePreferences preferences = ConfigurationScope.INSTANCE.getNode(STORE_PREFERENCES_NODE);
Preferences credentialsPrefs = preferences.node(LOGIN_NODE);
- username = credentialsPrefs.get(getUsernamePrefKey(), txtLogin.getText());
+ username = credentialsPrefs.get(getUsernamePrefKey(), "");
txtLogin.setText(username);
- password = credentialsPrefs.get(getPasswordPrefKey(),txtPassword.getText());
+ password = credentialsPrefs.get(getPasswordPrefKey(),"");
txtPassword.setText(password);
if(username.isEmpty() || password.isEmpty()) {
autoConnect = false;
Display.getDefault().asyncExec(new Runnable() {
@Override
public void run() {
- if(isRememberMe() && loadLoginPrefs) {
- persistPrefCredentials();
+ if(!isDevRemoteSource) {
+ if(isRememberMe()) {
+ persistPrefCredentials();
+ }
+ persistPrefLastServerInstance();
}
- persistPrefLastServerInstance();
dispose();
}
});