[458349] Consolidate UI
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=458349
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/repositories/wizards/MasterRepositoryController.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/repositories/wizards/MasterRepositoryController.java
index 8042db9..d94fc93 100644
--- a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/repositories/wizards/MasterRepositoryController.java
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/repositories/wizards/MasterRepositoryController.java
@@ -218,11 +218,21 @@
return connectorDescription;
}
- public final String getName()
+ public final String getRepositoryName()
{
return repositoryName;
}
+ public final String getUserName()
+ {
+ return userName;
+ }
+
+ public final String getPassword()
+ {
+ return password;
+ }
+
public final boolean isValid()
{
return portText.isValid() && repositoryNameText.isValid();
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/repositories/wizards/RepositoryClonePage.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/repositories/wizards/RepositoryClonePage.java
index 1807b0d..1d207cf 100644
--- a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/repositories/wizards/RepositoryClonePage.java
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/repositories/wizards/RepositoryClonePage.java
@@ -81,10 +81,10 @@
throw new Exception("Host is empty.");
}
- String name = controller.getName();
- if (StringUtil.isEmpty(name))
+ String repositoryName = controller.getRepositoryName();
+ if (StringUtil.isEmpty(repositoryName))
{
- throw new Exception("Name is empty.");
+ throw new Exception("Repository name is empty.");
}
String reconnectSeconds = reconnectSecondsText.getText();
@@ -134,7 +134,7 @@
properties.setProperty(CloneCDORepository.PROP_CONNECTOR_TYPE, "tcp");
properties.setProperty(CloneCDORepository.PROP_CONNECTOR_DESCRIPTION, connectorDescription);
- properties.setProperty(CloneCDORepository.PROP_NAME, name);
+ properties.setProperty(CloneCDORepository.PROP_NAME, repositoryName);
properties.setProperty(CloneCDORepository.PROP_RECONNECT_SECONDS, reconnectSeconds);
properties.setProperty(CloneCDORepository.PROP_RECOMMIT_SECONDS, recommitSeconds);
properties.setProperty(CloneCDORepository.PROP_RECOMMIT_ATTEMPTS, recommitAttempts);
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/repositories/wizards/RepositoryRemotePage.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/repositories/wizards/RepositoryRemotePage.java
index 2360cd1..5f0dd84 100644
--- a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/repositories/wizards/RepositoryRemotePage.java
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/repositories/wizards/RepositoryRemotePage.java
@@ -58,14 +58,14 @@
throw new Exception("Host is empty.");
}
- String name = controller.getName();
- if (StringUtil.isEmpty(name))
+ String repositoryName = controller.getRepositoryName();
+ if (StringUtil.isEmpty(repositoryName))
{
- throw new Exception("Name is empty.");
+ throw new Exception("Repository name is empty.");
}
properties.setProperty(RemoteCDORepository.PROP_CONNECTOR_TYPE, "tcp");
properties.setProperty(RemoteCDORepository.PROP_CONNECTOR_DESCRIPTION, connectorDescription);
- properties.setProperty(RemoteCDORepository.PROP_NAME, name);
+ properties.setProperty(RemoteCDORepository.PROP_NAME, repositoryName);
}
}
