[jbosstools-commits] JBoss Tools SVN: r35307 - in trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core: internal and 1 other directory.

[jbosstools-commits at lists.jboss.org]

Author: adietish
Date: 2011-10-03 21:20:36 -0400 (Mon, 03 Oct 2011)
New Revision: 35307

Modified:
   trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IUser.java
   trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/InternalUser.java
Log:
[JBIDE-9793] implemented IUser#hasDomain and changed API so that IUser#getDomain returns null if no domain was created 

Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IUser.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IUser.java	2011-10-04 01:20:20 UTC (rev 35306)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IUser.java	2011-10-04 01:20:36 UTC (rev 35307)
@@ -12,7 +12,6 @@
 
 import java.util.Collection;
 
-
 /**
  * @author André Dietisheim
  */
@@ -23,23 +22,34 @@
 	public String getPassword();
 
 	public boolean isValid() throws OpenshiftException;
-	
+
 	public String getUUID() throws OpenshiftException;
-	
+
 	public IDomain createDomain(String name, ISSHPublicKey key) throws OpenshiftException;
 
+	/**
+	 * Returns the domain that this user created previously. Returns
+	 * <code>null</code> if no domain was created.
+	 * 
+	 * @return the domain that this user created
+	 * @throws OpenshiftException
+	 * 
+	 * @see #createDomain
+	 */
 	public IDomain getDomain() throws OpenshiftException;
 
+	public boolean hasDomain() throws OpenshiftException;
+
 	public ISSHPublicKey getSshKey() throws OpenshiftException;
 
 	public Collection<ICartridge> getCartridges() throws OpenshiftException;
 
 	public IApplication createApplication(String name, ICartridge cartridge) throws OpenshiftException;
-	
+
 	public Collection<IApplication> getApplications() throws OpenshiftException;
 
 	public IApplication getApplicationByName(String name) throws OpenshiftException;
-	
+
 	public void refresh() throws OpenshiftException;
 
 }
\ No newline at end of file

Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/InternalUser.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/InternalUser.java	2011-10-04 01:20:20 UTC (rev 35306)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/InternalUser.java	2011-10-04 01:20:36 UTC (rev 35307)
@@ -23,6 +23,7 @@
 import org.jboss.ide.eclipse.as.openshift.core.ISSHPublicKey;
 import org.jboss.ide.eclipse.as.openshift.core.IUser;
 import org.jboss.ide.eclipse.as.openshift.core.InvalidCredentialsOpenshiftException;
+import org.jboss.ide.eclipse.as.openshift.core.NotFoundOpenshiftException;
 import org.jboss.ide.eclipse.as.openshift.core.OpenshiftException;
 import org.jboss.ide.eclipse.as.openshift.core.OpenshiftService;
 import org.jboss.ide.eclipse.as.openshift.core.UserConfiguration;
@@ -68,12 +69,12 @@
 		this.sshKey = sshKey;
 		this.service = service;
 	}
-	
+
 	@Override
 	public boolean isValid() throws OpenshiftException {
 		try {
 			return service.isValid(this);
-		} catch(InvalidCredentialsOpenshiftException e) {
+		} catch (InvalidCredentialsOpenshiftException e) {
 			return false;
 		}
 	}
@@ -84,23 +85,31 @@
 		this.domain = getService().createDomain(name, key, this);
 		return domain;
 	}
-	
+
 	@Override
 	public IDomain getDomain() throws OpenshiftException {
 		if (domain == null) {
-			this.domain = new Domain(
-					getUserInfo().getNamespace()
-					, getUserInfo().getRhcDomain()
-					, this
-					, service);
+			try {
+				this.domain = new Domain(
+						getUserInfo().getNamespace()
+						, getUserInfo().getRhcDomain()
+						, this
+						, service);
+			} catch (NotFoundOpenshiftException e) {
+				return null;
+			}
 		}
 		return domain;
 	}
 
+	public boolean hasDomain() throws OpenshiftException {
+		return getDomain() != null;
+	}
+	
 	private void setSshKey(ISSHPublicKey key) {
 		this.sshKey = key;
 	}
-	
+
 	@Override
 	public ISSHPublicKey getSshKey() throws OpenshiftException {
 		if (sshKey == null) {
@@ -187,7 +196,7 @@
 		this.sshKey = null;
 		getUserInfo();
 	}
-	
+
 	private void update(List<ApplicationInfo> applicationInfos) {
 		for (ApplicationInfo applicationInfo : applicationInfos) {
 			IApplication application = getApplicationByName(applicationInfo.getName(), applications);