[jbosstools-commits] JBoss Tools SVN: r39400 - in trunk/openshift/plugins/org.jboss.tools.openshift.express.ui: src/org/jboss/tools/openshift/express/internal/core/behaviour and 6 other directories.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Fri Mar 9 03:54:02 EST 2012
Author: adietish
Date: 2012-03-09 03:54:01 -0500 (Fri, 09 Mar 2012)
New Revision: 39400
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/IUserModelListener.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserDelegate.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserModel.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateOrEditDomainAction.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateServerAdapterAction.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteConnectionAction.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/EditCartridgesAction.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/ExpressConsoleView.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftConsoleExpressView.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleContentCategory.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleContentProvider.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleLabelProvider.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationSelectionDialogModel.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardModel.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EditDomainDialog.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EditDomainWizardPageModel.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizard.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizard.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainDialog.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPageModel.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureGitSharedProject.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureUnsharedProject.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ServerAdapterFactory.java
Log:
[JBIDE-11230] replaced all occurrencies of IUser by UserDelegate in the openshift UI
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml 2012-03-09 03:22:05 UTC (rev 39399)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml 2012-03-09 08:54:01 UTC (rev 39400)
@@ -398,7 +398,7 @@
<enablement>
<and>
<instanceof
- value="com.openshift.express.client.IUser">
+ value=" org.jboss.tools.openshift.express.internal.core.console.UserDelegate">
</instanceof>
</and>
</enablement>
@@ -409,7 +409,7 @@
<enablement>
<and>
<instanceof
- value="com.openshift.express.client.IUser">
+ value="org.jboss.tools.openshift.express.internal.core.console.UserDelegate">
</instanceof>
</and>
</enablement>
@@ -420,7 +420,7 @@
<enablement>
<and>
<instanceof
- value="com.openshift.express.client.IUser">
+ value="org.jboss.tools.openshift.express.internal.core.console.UserDelegate">
</instanceof>
</and>
</enablement>
@@ -497,7 +497,7 @@
<enablement>
<or>
<instanceof
- value="com.openshift.express.client.IUser">
+ value="org.jboss.tools.openshift.express.internal.core.console.UserDelegate">
</instanceof>
<instanceof
value="com.openshift.express.client.IApplication">
@@ -539,7 +539,7 @@
<extension
point="org.eclipse.core.runtime.adapters">
<factory
- adaptableType="com.openshift.express.client.IUser"
+ adaptableType="org.jboss.tools.openshift.express.internal.core.console.UserDelegate"
class="org.jboss.tools.openshift.express.internal.ui.viewer.property.PropertySourceAdapterFactory">
<adapter
type="org.eclipse.ui.views.properties.IPropertySource">
@@ -596,7 +596,7 @@
id="org.jboss.tools.openshift.express.ui.userPropertySection"
tab="org.jboss.tools.openshift.express.ui.viewer.expressConsolePropertyTab">
<input
- type="com.openshift.express.client.IUser">
+ type="org.jboss.tools.openshift.express.internal.core.console.UserDelegate">
</input>
</propertySection>
</propertySections>
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java 2012-03-09 03:22:05 UTC (rev 39399)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java 2012-03-09 08:54:01 UTC (rev 39400)
@@ -35,6 +35,7 @@
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
import org.jboss.ide.eclipse.as.core.util.ServerCreationUtils;
import org.jboss.tools.openshift.egit.core.EGitUtils;
+import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
import org.jboss.tools.openshift.express.internal.core.console.UserModel;
import org.jboss.tools.openshift.express.internal.ui.utils.Logger;
import org.jboss.tools.openshift.express.internal.ui.wizard.IOpenShiftExpressWizardModel;
@@ -171,7 +172,7 @@
}
public static void fillServerWithOpenShiftDetails(IServerWorkingCopy wc, IApplication application,
- IUser user, String mode, String deployProject,
+ UserDelegate user, String mode, String deployProject,
String projectRelativeFolder, String remoteName) throws OpenShiftException {
fillServerWithOpenShiftDetails(wc,
application == null ? null : application.getApplicationUrl(),
@@ -340,7 +341,7 @@
public static IApplication findApplicationForServer(IServer server) {
try {
String user = ExpressServerUtils.getExpressUsername(server);
- IUser user2 = UserModel.getDefault().findUser(user);
+ UserDelegate user2 = UserModel.getDefault().findUser(user);
String appName = ExpressServerUtils.getExpressApplicationName(server);
IApplication app = user2.getApplicationByName(appName);
return app;
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/IUserModelListener.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/IUserModelListener.java 2012-03-09 03:22:05 UTC (rev 39399)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/IUserModelListener.java 2012-03-09 08:54:01 UTC (rev 39400)
@@ -10,10 +10,9 @@
******************************************************************************/
package org.jboss.tools.openshift.express.internal.core.console;
-import com.openshift.express.client.IUser;
public interface IUserModelListener {
- public void userAdded(IUser user);
- public void userRemoved(IUser user);
- public void userChanged(IUser user);
+ public void userAdded(UserDelegate user);
+ public void userRemoved(UserDelegate user);
+ public void userChanged(UserDelegate user);
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserDelegate.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserDelegate.java 2012-03-09 03:22:05 UTC (rev 39399)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserDelegate.java 2012-03-09 08:54:01 UTC (rev 39400)
@@ -30,7 +30,7 @@
import com.openshift.express.client.IUser;
import com.openshift.express.client.OpenShiftException;
-public class UserDelegate implements IUser {
+public class UserDelegate {
private IUser delegate;
private boolean rememberPassword;
private boolean connected;
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserModel.java 2012-03-09 03:22:05 UTC (rev 39399)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserModel.java 2012-03-09 08:54:01 UTC (rev 39400)
@@ -82,14 +82,14 @@
fireModelChange(user, ADDED);
}
- public void removeUser(IUser user) {
+ public void removeUser(UserDelegate user) {
allUsers.remove(user.getRhlogin());
if (this.recentUser == user)
this.recentUser = null;
fireModelChange(user, REMOVED);
}
- private void fireModelChange(IUser user, int type) {
+ private void fireModelChange(UserDelegate user, int type) {
Iterator<IUserModelListener> i = listeners.iterator();
while (i.hasNext()) {
IUserModelListener l = i.next();
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateOrEditDomainAction.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateOrEditDomainAction.java 2012-03-09 03:22:05 UTC (rev 39399)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateOrEditDomainAction.java 2012-03-09 08:54:01 UTC (rev 39400)
@@ -14,6 +14,7 @@
import org.eclipse.jface.wizard.IWizard;
import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.swt.widgets.Display;
+import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages;
import org.jboss.tools.openshift.express.internal.ui.utils.Logger;
@@ -37,9 +38,9 @@
public void run() {
final ITreeSelection treeSelection = (ITreeSelection) selection;
if (selection instanceof ITreeSelection
- && treeSelection.getFirstElement() instanceof IUser) {
+ && treeSelection.getFirstElement() instanceof UserDelegate) {
IWizard domainDialog = null;
- final IUser user = (IUser) treeSelection.getFirstElement();
+ final UserDelegate user = (UserDelegate) treeSelection.getFirstElement();
try {
if (user.getDomain() == null || user.getDomain().getNamespace() == null) {
domainDialog = new NewDomainDialog(user);
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateServerAdapterAction.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateServerAdapterAction.java 2012-03-09 03:22:05 UTC (rev 39399)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateServerAdapterAction.java 2012-03-09 08:54:01 UTC (rev 39400)
@@ -12,9 +12,11 @@
import java.util.List;
+import org.eclipse.core.runtime.Assert;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.ITreeSelection;
import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.INewWizard;
import org.eclipse.ui.IWorkbench;
@@ -26,6 +28,7 @@
import org.eclipse.wst.server.ui.internal.wizard.fragment.TasksWizardFragment;
import org.eclipse.wst.server.ui.wizard.WizardFragment;
import org.jboss.tools.openshift.express.internal.core.behaviour.ExpressServerUtils;
+import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
import org.jboss.tools.openshift.express.internal.core.console.UserModel;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages;
@@ -52,8 +55,10 @@
&& treeSelection.getFirstElement() instanceof IApplication) {
final IApplication application = (IApplication) treeSelection.getFirstElement();
IUser user = application.getUser();
+ Assert.isNotNull(user, NLS.bind("application {0} does not reference any user", application.getName()));
+ UserDelegate userDelegate = UserModel.getDefault().findUser(user.getRhlogin());
NewServerWizard w = new NewServerWizard(ExpressServerUtils.OPENSHIFT_SERVER_TYPE);
- w.getTaskModel().putObject(ExpressServerUtils.TASK_WIZARD_ATTR_USER, UserModel.getDefault().findUser(user.getRhlogin()));
+ w.getTaskModel().putObject(ExpressServerUtils.TASK_WIZARD_ATTR_USER, userDelegate);
w.getTaskModel().putObject(ExpressServerUtils.TASK_WIZARD_ATTR_SELECTED_APP, application);
WizardDialog dialog = new WizardDialog(Display.getCurrent().getActiveShell(), w);
dialog.open();
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteConnectionAction.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteConnectionAction.java 2012-03-09 03:22:05 UTC (rev 39399)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteConnectionAction.java 2012-03-09 08:54:01 UTC (rev 39400)
@@ -11,11 +11,10 @@
package org.jboss.tools.openshift.express.internal.ui.action;
import org.eclipse.jface.viewers.ITreeSelection;
+import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
import org.jboss.tools.openshift.express.internal.core.console.UserModel;
import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages;
-import com.openshift.express.client.IUser;
-
/**
* @author Xavier Coulon
*/
@@ -24,15 +23,15 @@
public DeleteConnectionAction() {
super(OpenShiftExpressUIMessages.DELETE_CONNECTION_ACTION);
}
-
+
@Override
public void run() {
- final ITreeSelection treeSelection = (ITreeSelection)selection;
- if (selection != null && selection instanceof ITreeSelection && treeSelection.getFirstElement() instanceof IUser) {
- final IUser user = (IUser) treeSelection.getFirstElement();
+ if (selection instanceof ITreeSelection
+ && ((ITreeSelection) selection).getFirstElement() instanceof UserDelegate) {
+ final ITreeSelection treeSelection = (ITreeSelection) selection;
+ final UserDelegate user = (UserDelegate) treeSelection.getFirstElement();
UserModel.getDefault().removeUser(user);
}
}
-
}
\ No newline at end of file
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/EditCartridgesAction.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/EditCartridgesAction.java 2012-03-09 03:22:05 UTC (rev 39399)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/EditCartridgesAction.java 2012-03-09 08:54:01 UTC (rev 39400)
@@ -14,13 +14,13 @@
import org.eclipse.jface.viewers.ITreeSelection;
import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.swt.widgets.Display;
+import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
import org.jboss.tools.openshift.express.internal.core.console.UserModel;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages;
import org.jboss.tools.openshift.express.internal.ui.wizard.EmbedCartridgeWizard;
import com.openshift.express.client.IApplication;
-import com.openshift.express.client.IUser;
/**
* @author Xavier Coulon
@@ -37,7 +37,7 @@
final ITreeSelection treeSelection = (ITreeSelection)selection;
if (selection != null && selection instanceof ITreeSelection && treeSelection.getFirstElement() instanceof IApplication) {
final IApplication application = (IApplication) treeSelection.getFirstElement();
- final IUser user = UserModel.getDefault().getRecentUser();
+ final UserDelegate user = UserModel.getDefault().getRecentUser();
EmbedCartridgeWizard wizard = new EmbedCartridgeWizard(application, user);
WizardDialog dialog = new WizardDialog(Display.getCurrent().getActiveShell(), wizard);
dialog.create();
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/ExpressConsoleView.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/ExpressConsoleView.java 2012-03-09 03:22:05 UTC (rev 39399)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/ExpressConsoleView.java 2012-03-09 08:54:01 UTC (rev 39400)
@@ -15,11 +15,10 @@
import org.eclipse.ui.navigator.CommonNavigator;
import org.eclipse.ui.navigator.CommonViewer;
import org.jboss.tools.openshift.express.internal.core.console.IUserModelListener;
+import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
import org.jboss.tools.openshift.express.internal.core.console.UserModel;
import org.jboss.tools.openshift.express.internal.ui.utils.DisposeUtils;
-import com.openshift.express.client.IUser;
-
public class ExpressConsoleView extends CommonNavigator implements IUserModelListener {
protected Object getInitialInput() {
return UserModel.getDefault();
@@ -46,15 +45,15 @@
});
}
- public void userAdded(IUser user) {
+ public void userAdded(UserDelegate user) {
refreshViewer();
}
- public void userRemoved(IUser user) {
+ public void userRemoved(UserDelegate user) {
refreshViewer();
}
- public void userChanged(IUser user) {
+ public void userChanged(UserDelegate user) {
refreshViewer();
}
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftConsoleExpressView.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftConsoleExpressView.java 2012-03-09 03:22:05 UTC (rev 39399)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftConsoleExpressView.java 2012-03-09 08:54:01 UTC (rev 39400)
@@ -28,11 +28,10 @@
import org.eclipse.ui.views.properties.tabbed.ITabbedPropertySheetPageContributor;
import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
import org.jboss.tools.common.ui.WizardUtils;
+import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
import org.jboss.tools.openshift.express.internal.core.console.UserModel;
import org.jboss.tools.openshift.express.internal.ui.utils.Logger;
-import com.openshift.express.client.IUser;
-
/**
* @author Xavier Coulon
*
@@ -90,7 +89,7 @@
int returnCode = WizardUtils.openWizardDialog(connectToOpenShiftWizard, shell);
if (returnCode == Window.OK) {
Logger.debug("OpenShift Auth succeeded.");
- final IUser user = UserModel.getDefault().getRecentUser();
+ final UserDelegate user = UserModel.getDefault().getRecentUser();
getCommonViewer().setInput(new OpenShiftExpressConsoleContentCategory(user));
switchToCommonViewer();
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleContentCategory.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleContentCategory.java 2012-03-09 03:22:05 UTC (rev 39399)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleContentCategory.java 2012-03-09 08:54:01 UTC (rev 39400)
@@ -10,23 +10,23 @@
******************************************************************************/
package org.jboss.tools.openshift.express.internal.ui.viewer;
-import com.openshift.express.client.IUser;
+import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
/**
* @author Xavier Coulon
*/
public class OpenShiftExpressConsoleContentCategory {
- private final IUser user;
+ private final UserDelegate user;
- public OpenShiftExpressConsoleContentCategory(final IUser user) {
+ public OpenShiftExpressConsoleContentCategory(final UserDelegate user) {
this.user = user;
}
/**
* @return the user
*/
- public IUser getUser() {
+ public UserDelegate getUser() {
return user;
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleContentProvider.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleContentProvider.java 2012-03-09 03:22:05 UTC (rev 39399)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleContentProvider.java 2012-03-09 08:54:01 UTC (rev 39400)
@@ -60,9 +60,9 @@
}
// Keep track of what's loading and what's finished
- private ArrayList<IUser> loadedUsers = new ArrayList<IUser>();
- private ArrayList<IUser> loadingUsers = new ArrayList<IUser>();
- private HashMap<IUser, OpenShiftException> errors = new HashMap<IUser, OpenShiftException>();
+ private ArrayList<UserDelegate> loadedUsers = new ArrayList<UserDelegate>();
+ private ArrayList<UserDelegate> loadingUsers = new ArrayList<UserDelegate>();
+ private HashMap<UserDelegate, OpenShiftException> errors = new HashMap<UserDelegate, OpenShiftException>();
@Override
public Object[] getElements(final Object parentElement) {
@@ -74,7 +74,7 @@
return UserModel.getDefault().getUsers();
}
if (parentElement instanceof UserModel) {
- IUser[] users = ((UserModel) parentElement).getUsers();
+ UserDelegate[] users = ((UserModel) parentElement).getUsers();
return users;
}
return new Object[0];
@@ -90,12 +90,12 @@
if (!loadedUsers.contains(parentElement)) {
if (!loadingUsers.contains(parentElement)) {
// Load the data
- launchLoadingUserJob((IUser) parentElement);
+ launchLoadingUserJob((UserDelegate) parentElement);
}
// return a stub object that says loading...
return new Object[] { new LoadingStub() };
}
- OpenShiftException ose = errors.get((IUser)parentElement);
+ OpenShiftException ose = errors.get((UserDelegate)parentElement);
if( ose != null ) {
return new Object[]{ose};
}
@@ -125,16 +125,14 @@
Object[] children = new Object[0];
// try {
if (parentElement instanceof OpenShiftExpressConsoleContentCategory) {
- IUser user = ((OpenShiftExpressConsoleContentCategory) parentElement).getUser();
+ UserDelegate user = ((OpenShiftExpressConsoleContentCategory) parentElement).getUser();
children = new Object[] { user };
- }
- if (parentElement instanceof UserDelegate) {
+ } else if (parentElement instanceof UserDelegate) {
final UserDelegate user = (UserDelegate) parentElement;
if (user.hasDomain()) {
children = user.getApplications().toArray();
}
- }
- if (parentElement instanceof IApplication) {
+ } else if (parentElement instanceof IApplication) {
children = ((IApplication) parentElement).getEmbeddedCartridges().toArray();
}
@@ -147,7 +145,7 @@
return children;
}
- private void launchLoadingUserJob(final IUser user) {
+ private void launchLoadingUserJob(final UserDelegate user) {
Job job = new Job("Loading OpenShift Express User information...") {
@Override
@@ -188,7 +186,7 @@
@Override
public boolean hasChildren(Object element) {
- if (element instanceof IUser) {
+ if (element instanceof UserDelegate) {
return true;
}
if (element instanceof IApplication) {
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleLabelProvider.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleLabelProvider.java 2012-03-09 03:22:05 UTC (rev 39399)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleLabelProvider.java 2012-03-09 08:54:01 UTC (rev 39400)
@@ -17,6 +17,7 @@
import org.eclipse.swt.graphics.Image;
import org.eclipse.ui.ISharedImages;
import org.eclipse.ui.PlatformUI;
+import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages;
import org.jboss.tools.openshift.express.internal.ui.viewer.OpenShiftExpressConsoleContentProvider.LoadingStub;
@@ -24,7 +25,6 @@
import com.openshift.express.client.IApplication;
import com.openshift.express.client.IEmbeddableCartridge;
-import com.openshift.express.client.IUser;
import com.openshift.express.client.OpenShiftException;
/**
@@ -58,7 +58,7 @@
@Override
public Image getImage(Object element) {
- if (element instanceof IUser) {
+ if (element instanceof UserDelegate) {
return OpenShiftUIActivator.getDefault().createImage("repository-middle.gif");
}
if (element instanceof IApplication) {
@@ -83,8 +83,8 @@
@Override
public StyledString getStyledText(Object element) {
- if (element instanceof IUser) {
- String message = ((IUser) element).getRhlogin();
+ if (element instanceof UserDelegate) {
+ String message = ((UserDelegate) element).getRhlogin();
StyledString styledString = new StyledString(message);
styledString.setStyle(0, message.length(), StyledString.DECORATIONS_STYLER);
return new StyledString(message);
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-03-09 03:22:05 UTC (rev 39399)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-03-09 08:54:01 UTC (rev 39400)
@@ -80,6 +80,7 @@
import org.jboss.tools.common.ui.WizardUtils;
import org.jboss.tools.common.ui.databinding.ParametrizableWizardPageSupport;
import org.jboss.tools.common.ui.databinding.ValueBindingBuilder;
+import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
import org.jboss.tools.openshift.express.internal.ui.utils.Logger;
import org.jboss.tools.openshift.express.internal.ui.utils.StringUtils;
@@ -90,7 +91,6 @@
import com.openshift.express.client.IApplication;
import com.openshift.express.client.ICartridge;
import com.openshift.express.client.IEmbeddableCartridge;
-import com.openshift.express.client.IUser;
import com.openshift.express.client.NotFoundOpenShiftException;
import com.openshift.express.client.OpenShiftException;
@@ -655,7 +655,7 @@
return;
}
try {
- final IUser user = this.pageModel.getUser();
+ final UserDelegate user = this.pageModel.getUser();
if (user != null && !user.hasDomain()) {
IWizard domainDialog = new NewDomainDialog(user);
WizardDialog dialog = new WizardDialog(Display.getCurrent().getActiveShell(), domainDialog);
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java 2012-03-09 03:22:05 UTC (rev 39399)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java 2012-03-09 08:54:01 UTC (rev 39400)
@@ -18,13 +18,13 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.jboss.tools.common.ui.databinding.ObservableUIPojo;
+import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
import org.jboss.tools.openshift.express.internal.ui.utils.Logger;
import com.openshift.express.client.IApplication;
import com.openshift.express.client.ICartridge;
import com.openshift.express.client.IEmbeddableCartridge;
-import com.openshift.express.client.IUser;
import com.openshift.express.client.OpenShiftException;
/**
@@ -67,12 +67,12 @@
return wizardModel;
}
- public IUser getUser() {
+ public UserDelegate getUser() {
return wizardModel.getUser();
}
public List<IApplication> getApplications() throws OpenShiftException {
- IUser user = getUser();
+ UserDelegate user = getUser();
if (user == null || !user.hasDomain()) {
return Collections.emptyList();
}
@@ -129,7 +129,7 @@
}
public void loadExistingApplications() throws OpenShiftException {
- IUser user = getUser();
+ UserDelegate user = getUser();
if (user != null) {
setExistingApplications(user.getApplications());
setExistingApplicationsLoaded(true);
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationSelectionDialogModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationSelectionDialogModel.java 2012-03-09 03:22:05 UTC (rev 39399)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationSelectionDialogModel.java 2012-03-09 08:54:01 UTC (rev 39400)
@@ -14,10 +14,10 @@
import java.util.List;
import org.jboss.tools.common.ui.databinding.ObservableUIPojo;
+import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
import org.jboss.tools.openshift.express.internal.ui.utils.Logger;
import com.openshift.express.client.IApplication;
-import com.openshift.express.client.IUser;
import com.openshift.express.client.OpenShiftException;
/**
@@ -48,7 +48,7 @@
public List<IApplication> getApplications() {
try {
- IUser user = getUser();
+ UserDelegate user = getUser();
if (user == null) {
return Collections.emptyList();
}
@@ -68,7 +68,7 @@
this.selectedApplication = application);
}
- public IUser getUser() {
+ public UserDelegate getUser() {
// return OpenShiftUIActivator.getDefault().getUser();
return wizardModel.getUser();
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardModel.java 2012-03-09 03:22:05 UTC (rev 39399)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardModel.java 2012-03-09 08:54:01 UTC (rev 39400)
@@ -13,11 +13,11 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.osgi.util.NLS;
import org.jboss.tools.common.ui.databinding.ObservableUIPojo;
+import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages;
import com.openshift.express.client.IApplication;
import com.openshift.express.client.ICartridge;
-import com.openshift.express.client.IUser;
import com.openshift.express.client.OpenShiftApplicationNotAvailableException;
import com.openshift.express.client.OpenShiftException;
@@ -34,21 +34,21 @@
*/
private static final int APP_CREATION_TIMEOUT = 10;
- private IUser user;
+ private UserDelegate user;
private IApplication application;
private String name;
private ICartridge cartridge;
- public ApplicationWizardModel(IUser user) {
+ public ApplicationWizardModel(UserDelegate user) {
this(null, user);
}
- public ApplicationWizardModel(IApplication application, IUser user) {
+ public ApplicationWizardModel(IApplication application, UserDelegate user) {
this.application = application;
this.user = user;
}
- public IUser getUser() {
+ public UserDelegate getUser() {
return user;
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java 2012-03-09 03:22:05 UTC (rev 39399)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java 2012-03-09 08:54:01 UTC (rev 39400)
@@ -24,7 +24,6 @@
import org.jboss.tools.openshift.express.internal.ui.utils.SecurePasswordStoreException;
import org.jboss.tools.openshift.express.internal.ui.utils.StringUtils;
-import com.openshift.express.client.IUser;
import com.openshift.express.client.NotFoundOpenShiftException;
import com.openshift.express.client.configuration.OpenShiftConfiguration;
@@ -81,7 +80,7 @@
protected String initRhLogin() {
String rhLogin = null;
- IUser user = wizardModel.getUser();
+ UserDelegate user = wizardModel.getUser();
if (user == null) {
user = UserModel.getDefault().getRecentUser();
}
@@ -113,7 +112,7 @@
return password;
}
- private void storePassword(IUser user) {
+ private void storePassword(UserDelegate user) {
try {
if (store != null ) {
OpenShiftPasswordStorageKey key = new OpenShiftPasswordStorageKey(libraServer, user.getRhlogin());
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EditDomainDialog.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EditDomainDialog.java 2012-03-09 03:22:05 UTC (rev 39399)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EditDomainDialog.java 2012-03-09 08:54:01 UTC (rev 39400)
@@ -17,9 +17,9 @@
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.osgi.util.NLS;
import org.jboss.tools.common.ui.WizardUtils;
+import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
-import com.openshift.express.client.IUser;
import com.openshift.express.client.OpenShiftEndpointException;
/**
@@ -30,7 +30,7 @@
private EditDomainWizardPageModel model;
- public EditDomainDialog(IUser user) {
+ public EditDomainDialog(UserDelegate user) {
this.model = new EditDomainWizardPageModel(user);
setNeedsProgressMonitor(true);
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EditDomainWizardPageModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EditDomainWizardPageModel.java 2012-03-09 03:22:05 UTC (rev 39399)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EditDomainWizardPageModel.java 2012-03-09 08:54:01 UTC (rev 39400)
@@ -11,9 +11,9 @@
package org.jboss.tools.openshift.express.internal.ui.wizard;
import org.jboss.tools.common.ui.databinding.ObservableUIPojo;
+import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
import org.jboss.tools.openshift.express.internal.ui.utils.Logger;
-import com.openshift.express.client.IUser;
import com.openshift.express.client.OpenShiftException;
/**
@@ -26,9 +26,9 @@
private String namespace;
- private final IUser user;
+ private final UserDelegate user;
- public EditDomainWizardPageModel(IUser user) {
+ public EditDomainWizardPageModel(UserDelegate user) {
this.user = user;
try {
if (user.getDomain() != null) {
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizard.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizard.java 2012-03-09 03:22:05 UTC (rev 39399)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizard.java 2012-03-09 08:54:01 UTC (rev 39400)
@@ -11,9 +11,9 @@
package org.jboss.tools.openshift.express.internal.ui.wizard;
import org.eclipse.jface.wizard.Wizard;
+import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
import com.openshift.express.client.IApplication;
-import com.openshift.express.client.IUser;
/**
* @author André Dietisheim
@@ -23,7 +23,7 @@
private ApplicationWizardModel wizardModel;
private EmbedCartridgeWizardPage embedCartridgeWizardPage;
- public EmbedCartridgeWizard(IApplication application, IUser user) {
+ public EmbedCartridgeWizard(IApplication application, UserDelegate user) {
this.wizardModel = new ApplicationWizardModel(application, user);
setNeedsProgressMonitor(true);
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizard.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizard.java 2012-03-09 03:22:05 UTC (rev 39399)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizard.java 2012-03-09 08:54:01 UTC (rev 39400)
@@ -11,9 +11,9 @@
package org.jboss.tools.openshift.express.internal.ui.wizard;
import org.eclipse.jface.wizard.Wizard;
+import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
import com.openshift.express.client.IApplication;
-import com.openshift.express.client.IUser;
/**
* @author André Dietisheim
@@ -24,7 +24,7 @@
private NewApplicationWizardPage applicationPage;
private EmbedCartridgeWizardPage embedCartridgePage;
- public NewApplicationWizard(IUser user) {
+ public NewApplicationWizard(UserDelegate user) {
this.wizardModel = new ApplicationWizardModel(user);
setNeedsProgressMonitor(true);
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainDialog.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainDialog.java 2012-03-09 03:22:05 UTC (rev 39399)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainDialog.java 2012-03-09 08:54:01 UTC (rev 39400)
@@ -17,9 +17,9 @@
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.osgi.util.NLS;
import org.jboss.tools.common.ui.WizardUtils;
+import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
-import com.openshift.express.client.IUser;
import com.openshift.express.client.OpenShiftEndpointException;
/**
@@ -29,7 +29,7 @@
private NewDomainWizardPageModel model;
- public NewDomainDialog(IUser user) {
+ public NewDomainDialog(UserDelegate user) {
this.model = new NewDomainWizardPageModel(user);
setNeedsProgressMonitor(true);
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPageModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPageModel.java 2012-03-09 03:22:05 UTC (rev 39399)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPageModel.java 2012-03-09 08:54:01 UTC (rev 39400)
@@ -18,11 +18,11 @@
import org.eclipse.jsch.internal.core.IConstants;
import org.eclipse.jsch.internal.core.JSchCorePlugin;
import org.jboss.tools.common.ui.databinding.ObservableUIPojo;
+import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
import org.jboss.tools.openshift.express.internal.ui.utils.FileUtils;
import com.openshift.express.client.IDomain;
import com.openshift.express.client.ISSHPublicKey;
-import com.openshift.express.client.IUser;
import com.openshift.express.client.OpenShiftException;
import com.openshift.express.client.SSHKeyPair;
import com.openshift.express.client.SSHPublicKey;
@@ -41,9 +41,9 @@
private String namespace;
private IDomain domain;
private String sshKey;
- private IUser user;
+ private UserDelegate user;
- public NewDomainWizardPageModel(IUser user) {
+ public NewDomainWizardPageModel(UserDelegate user) {
this.user = user;
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java 2012-03-09 03:22:05 UTC (rev 39399)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java 2012-03-09 08:54:01 UTC (rev 39400)
@@ -32,7 +32,6 @@
import com.openshift.express.client.IApplication;
import com.openshift.express.client.ICartridge;
import com.openshift.express.client.IEmbeddableCartridge;
-import com.openshift.express.client.IUser;
import com.openshift.express.client.OpenShiftApplicationNotAvailableException;
import com.openshift.express.client.OpenShiftException;
@@ -349,7 +348,7 @@
protected IApplication createApplication(String name, ICartridge cartridge, IProgressMonitor monitor)
throws OpenShiftApplicationNotAvailableException, OpenShiftException {
- IUser user = getUser();
+ UserDelegate user = getUser();
if (user == null) {
throw new OpenShiftException("Could not create application, have no valid user credentials");
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureGitSharedProject.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureGitSharedProject.java 2012-03-09 03:22:05 UTC (rev 39399)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureGitSharedProject.java 2012-03-09 08:54:01 UTC (rev 39400)
@@ -31,13 +31,13 @@
import org.jboss.ide.eclipse.as.core.util.FileUtil;
import org.jboss.ide.eclipse.as.core.util.RegExUtils;
import org.jboss.tools.openshift.egit.core.EGitUtils;
+import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIException;
import org.jboss.tools.openshift.express.internal.ui.UnCommittedChangesException;
import org.jboss.tools.openshift.express.internal.ui.utils.FileUtils;
import org.jboss.tools.openshift.express.internal.ui.utils.ResourceUtils;
import com.openshift.express.client.IApplication;
-import com.openshift.express.client.IUser;
import com.openshift.express.client.OpenShiftException;
/**
@@ -49,7 +49,7 @@
public class ConfigureGitSharedProject extends AbstractImportApplicationOperation {
public ConfigureGitSharedProject(String projectName, IApplication application, String remoteName,
- IUser user) {
+ UserDelegate user) {
super(projectName, application, remoteName);
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureUnsharedProject.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureUnsharedProject.java 2012-03-09 03:22:05 UTC (rev 39399)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureUnsharedProject.java 2012-03-09 08:54:01 UTC (rev 39400)
@@ -25,11 +25,11 @@
import org.jboss.ide.eclipse.as.core.util.FileUtil;
import org.jboss.tools.openshift.egit.core.EGitUtils;
import org.jboss.tools.openshift.egit.core.GitIgnore;
+import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
import org.jboss.tools.openshift.express.internal.ui.utils.FileUtils;
import org.jboss.tools.openshift.express.internal.ui.utils.ResourceUtils;
import com.openshift.express.client.IApplication;
-import com.openshift.express.client.IUser;
import com.openshift.express.client.OpenShiftException;
/**
@@ -41,7 +41,7 @@
public class ConfigureUnsharedProject extends AbstractImportApplicationOperation {
public ConfigureUnsharedProject(String projectName, IApplication application, String remoteName,
- IUser user) {
+ UserDelegate user) {
super(projectName, application, remoteName);
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ServerAdapterFactory.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ServerAdapterFactory.java 2012-03-09 03:22:05 UTC (rev 39399)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ServerAdapterFactory.java 2012-03-09 08:54:01 UTC (rev 39400)
@@ -33,11 +33,11 @@
import org.eclipse.wst.server.core.ServerUtil;
import org.eclipse.wst.server.core.internal.Server;
import org.jboss.tools.openshift.express.internal.core.behaviour.ExpressServerUtils;
+import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
import org.jboss.tools.openshift.express.internal.ui.wizard.IOpenShiftExpressWizardModel;
import com.openshift.express.client.IApplication;
-import com.openshift.express.client.IUser;
import com.openshift.express.client.OpenShiftException;
/**
@@ -55,7 +55,7 @@
}
public void create(IProject project, IServerType serverType, IRuntime runtime, String mode,
- IApplication application, IUser user, IProgressMonitor monitor) throws OpenShiftException {
+ IApplication application, UserDelegate user, IProgressMonitor monitor) throws OpenShiftException {
createServerAdapter(project, serverType, runtime, mode, application, user, null, monitor);
}
@@ -67,7 +67,7 @@
* @throws OpenShiftException
*/
protected void createServerAdapter(IProject project, IServerType serverType, IRuntime runtime, String mode,
- IApplication application, IUser user,
+ IApplication application, UserDelegate user,
String remoteName, IProgressMonitor monitor) throws OpenShiftException {
String name = project.getName();
monitor.subTask(NLS.bind("Creating server adapter for project {0}", name));
@@ -76,7 +76,7 @@
}
protected void createServerAdapter(List<IProject> importedProjects, IServerType serverType,
- IRuntime runtime, String mode, IApplication application, IUser user,
+ IRuntime runtime, String mode, IApplication application, UserDelegate user,
String deployProject, String remoteName, IProgressMonitor monitor) {
try {
renameWebContextRoot(importedProjects);
@@ -98,7 +98,7 @@
}
private IServer doCreateServerAdapter(IServerType serverType, IRuntime rt, String mode,
- IApplication application, IUser user, String deployProject, String remoteName) throws CoreException,
+ IApplication application, UserDelegate user, String deployProject, String remoteName) throws CoreException,
OpenShiftException {
Assert.isLegal(serverType != null);
Assert.isLegal(mode != null);
More information about the jbosstools-commits
mailing list