import java.net.SocketTimeoutException;
import java.text.SimpleDateFormat;
import java.util.Date;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import eu.etaxonomy.cdm.api.service.IUserService;
import eu.etaxonomy.cdm.common.CdmUtils;
import eu.etaxonomy.cdm.config.CdmSourceException;
-import eu.etaxonomy.cdm.config.ICdmSource;
import eu.etaxonomy.cdm.model.metadata.CdmMetaData;
import eu.etaxonomy.cdm.persistence.permission.Role;
import eu.etaxonomy.taxeditor.l10n.Messages;
- protected Shell shlConnect;
- private Text txtCdmServerStatus;
- private Text txtCdmInstanceStatus;
- private Combo comboCdmServer;
- private Combo comboCdmInstance;
- private Button btnConnect;
-
- private Composite remotingComposite;
- private Button btnCdmServerRefresh;
- private Button btnCdmInstanceRefresh;
- private Button btnStopServer;
- private Composite loginComposite;
- private Label lblLogin;
- private Text txtLogin;
- private Label lblPassword;
- private Text txtPassword;
- private Button btnRememberMe;
- private Label lblDefaultLogin;
- private Composite compAdvanced;
- private Label lblPort;
- private Text txtPort;
- private Label lblServerCdmlibVersion;
- private Text txtServerCdmlibVersion;
- private ExpandableComposite expandableCompositeAdvanced;
- private StyledText styledTxtMessage;
-
- private Label lblEditorCdmlibVersion;
- private Text txtEditorCdmlibVersion;
- private Label lblServerSchemaVersion;
- private Text txtServerSchemaVersion;
- private Label lblEditorCdmVersion;
- private Text txtEditorCdmVersion;
-
- private final int MESSAGE_HEIGHT = 50;
- private final int COMBO_MIN_WIDTH =200;
- private final int CONTROLS_MIN_HEIGHT = 23; //does not seem to work yet
-// private final int MIN_EXP_HEIGHT = 380;
-
- private boolean autoConnect = false;
- private boolean loadLoginPrefs = true;
- private boolean isDevRemoteSource = false;
-
- private Job serverJob;
- protected Object result;
-
- private final Map<String, CdmServerInfo> serverInfoMap = new HashMap<>();
-
- private String serverName;
- private String instanceName;
- private CdmServerInfo selectedServerInfo;
- private CdmInstanceInfo selectedCdmInstance;
- private String login;
- private String password;
+// protected Shell shlConnect;
+// private Text txtCdmServerStatus;
+// private Text txtCdmInstanceStatus;
+//
+// private Button btnConnect;
+//
+// private Composite remotingComposite;
+// private Button btnCdmServerRefresh;
+// private Button btnCdmInstanceRefresh;
+// private Button btnStopServer;
+// private Composite loginComposite;
+// private Label lblLogin;
+// private Text txtLogin;
+// private Label lblPassword;
+// private Text txtPassword;
+// private Button btnRememberMe;
+// private Label lblDefaultLogin;
+// private Composite compAdvanced;
+// private Label lblPort;
+// private Text txtPort;
+// private Label lblServerCdmlibVersion;
+// private Text txtServerCdmlibVersion;
+// private ExpandableComposite expandableCompositeAdvanced;
+// private StyledText styledTxtMessage;
+//
+// private Label lblEditorCdmlibVersion;
+// private Text txtEditorCdmlibVersion;
+// private Label lblServerSchemaVersion;
+// private Text txtServerSchemaVersion;
+// private Label lblEditorCdmVersion;
+// private Text txtEditorCdmVersion;
+//
+// private final int MESSAGE_HEIGHT = 50;
+// private final int COMBO_MIN_WIDTH =200;
+// private final int CONTROLS_MIN_HEIGHT = 23; //does not seem to work yet
+//// private final int MIN_EXP_HEIGHT = 380;
+//
+// private boolean autoConnect = false;
+// private boolean loadLoginPrefs = true;
+// private boolean isDevRemoteSource = false;
+
+// private Job serverJob;
+// protected Object result;
+//
+// private final Map<String, CdmServerInfo> serverInfoMap = new HashMap<>();
+
+// private String serverName;
+// private String instanceName;
+// private CdmServerInfo selectedServerInfo;
+// private CdmInstanceInfo selectedCdmInstance;
+// private String login;
+// private String password;
/**
* Create the dialog.
public RemotingLoginDialogLocal(Shell parent, int style) {
super(parent, style);
setText(Messages.RemotingLoginDialog_LABEL_LOGIN);
+ this.isLocal = true;
}
}
}
- private void populateCdmServerCombo() {
- Job job = new Job(Messages.RemotingLoginDialog_RETRIEVE_SERVER_INSTANCES) {
- @Override
- protected IStatus run(IProgressMonitor monitor) {
- Display.getDefault().syncExec(new Runnable() {
- @Override
- public void run() {
- //TODO performance
- for(CdmServerInfo csii : CdmServerInfoLocal.getCdmServers()) {
- serverInfoMap.put(csii.getName(), csii);
- comboCdmServer.add(csii.getName());
- }
- int serverIndex = -1;
- if(serverName != null) {
- serverIndex = comboCdmServer.indexOf(serverName);
- }
- if(serverIndex == -1) {
- comboCdmServer.select(0);
- autoConnect = false;
- } else {
- comboCdmServer.select(serverIndex);
- }
- ICdmSource devRemoteSource = CdmServerInfo.getDevServerRemoteSource();
- if(devRemoteSource != null) {
- isDevRemoteSource = true;
- String username = System.getProperty("cdm.server.dev.username"); //$NON-NLS-1$
- String password = System.getProperty("cdm.server.dev.password"); //$NON-NLS-1$
- if(username != null && !username.isEmpty() && password != null && !password.isEmpty()) {
- txtLogin.setText(username);
- txtPassword.setText(password);
- CdmStoreLocal.connect(devRemoteSource, RemotingLoginDialogLocal.this);
- }
- } else {
- onRefreshCdmServer();
- }
- }
- });
- return Status.OK_STATUS;
- }
- };
- job.schedule();
- }
+// private void populateCdmServerCombo() {
+// Job job = new Job(Messages.RemotingLoginDialog_RETRIEVE_SERVER_INSTANCES) {
+// @Override
+// protected IStatus run(IProgressMonitor monitor) {
+// Display.getDefault().syncExec(new Runnable() {
+// @Override
+// public void run() {
+// //TODO performance
+// for(CdmServerInfo csii : CdmServerInfo.getCdmServers(true)) {
+// serverInfoMap.put(csii.getName(), csii);
+// comboCdmServer.add(csii.getName());
+// }
+// int serverIndex = -1;
+// if(serverName != null) {
+// serverIndex = comboCdmServer.indexOf(serverName);
+// }
+// if(serverIndex == -1) {
+// comboCdmServer.select(0);
+// autoConnect = false;
+// } else {
+// comboCdmServer.select(serverIndex);
+// }
+// ICdmSource devRemoteSource = CdmServerInfo.getDevServerRemoteSource();
+// if(devRemoteSource != null) {
+// isDevRemoteSource = true;
+// String username = System.getProperty("cdm.server.dev.username"); //$NON-NLS-1$
+// String password = System.getProperty("cdm.server.dev.password"); //$NON-NLS-1$
+// if(username != null && !username.isEmpty() && password != null && !password.isEmpty()) {
+// txtLogin.setText(username);
+// txtPassword.setText(password);
+// CdmStoreLocal.connect(devRemoteSource, RemotingLoginDialogLocal.this);
+// }
+// } else {
+// onRefreshCdmServer();
+// }
+// }
+// });
+// return Status.OK_STATUS;
+// }
+// };
+// job.schedule();
+// }
@Override
public void onRefreshCdmServer() {
private String Nz(String value) {
return CdmUtils.Nz(value);
}
+
}
BGBM BDI Projects / taxeditor.git / commitdiff