Author: adietish Date: 2010-11-12 06:29:11 -0500 (Fri, 12 Nov 2010) New Revision: 26501 Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/utils/CloudViewElementUtils.java Removed: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CloudViewElementUtils.java Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/adapter/CloudViewElementAdapterFactory.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/adapter/DeltaCloudInstanceAdapterFactory.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/RefreshCloudHandler.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstancePropertySource.java Log: [JBIDE-7499] moved CloudViewElementUtils to utils package Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/adapter/CloudViewElementAdapterFactory.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/adapter/CloudViewElementAdapterFactory.java 2010-11-12 11:27:35 UTC (rev 26500) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/adapter/CloudViewElementAdapterFactory.java 2010-11-12 11:29:11 UTC (rev 26501) @@ -19,7 +19,7 @@ import org.jboss.tools.deltacloud.ui.views.CVImageElement; import org.jboss.tools.deltacloud.ui.views.CVInstanceElement; import org.jboss.tools.deltacloud.ui.views.CloudViewElement; -import org.jboss.tools.deltacloud.ui.views.CloudViewElementUtils; +import org.jboss.tools.internal.deltacloud.ui.utils.CloudViewElementUtils; public class CloudViewElementAdapterFactory implements IAdapterFactory { Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/adapter/DeltaCloudInstanceAdapterFactory.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/adapter/DeltaCloudInstanceAdapterFactory.java 2010-11-12 11:27:35 UTC (rev 26500) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/adapter/DeltaCloudInstanceAdapterFactory.java 2010-11-12 11:29:11 UTC (rev 26501) @@ -26,7 +26,6 @@ @Override public Object getAdapter(Object adaptableObject, Class adapterType) { if (adaptableObject instanceof DeltaCloudInstance) { - System.err.println("DeltaCloudInstanceAdapterFactory#getAdapter for " + adapterType); return ((DeltaCloudInstance) adaptableObject).getDeltaCloud(); } else { return UIUtils.adapt(adaptableObject, DeltaCloud.class); Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/RefreshCloudHandler.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/RefreshCloudHandler.java 2010-11-12 11:27:35 UTC (rev 26500) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/RefreshCloudHandler.java 2010-11-12 11:29:11 UTC (rev 26501) @@ -20,7 +20,7 @@ import org.eclipse.ui.handlers.HandlerUtil; import org.jboss.tools.deltacloud.core.DeltaCloud; import org.jboss.tools.deltacloud.ui.views.CloudViewElement; -import org.jboss.tools.deltacloud.ui.views.CloudViewElementUtils; +import org.jboss.tools.internal.deltacloud.ui.utils.CloudViewElementUtils; import org.jboss.tools.internal.deltacloud.ui.utils.UIUtils; /** Deleted: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CloudViewElementUtils.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CloudViewElementUtils.java 2010-11-12 11:27:35 UTC (rev 26500) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CloudViewElementUtils.java 2010-11-12 11:29:11 UTC (rev 26501) @@ -1,48 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.deltacloud.ui.views; - -import org.jboss.tools.deltacloud.core.DeltaCloud; - -public class CloudViewElementUtils { - - /** - * Returns a DeltaCloud instance for a given cloud view element - * - * @param element the cloud view element to get the DeltaCloud for - * @return the cloud for the given CloudViewElement - * - * @see DeltaCloud - * @see CloudViewElement - */ - public static DeltaCloud getCloud(CloudViewElement element) { - CVCloudElement cvcloud = getCVCloudElement(element); - DeltaCloud cloud = (DeltaCloud) cvcloud.getElement(); - return cloud; - } - - /** - * Returns a CVCloudElement for a given cloud view element - * - * @param element the cloud view element to get the CVCloudElement for - * @return the CVCloudElement for the given CloudViewElement - * - * @see CloudViewElement - * @see CVCloudElement - */ - public static CVCloudElement getCVCloudElement(CloudViewElement element) { - while (!(element instanceof CVCloudElement)) { - element = (CloudViewElement) element.getParent(); - } - return (CVCloudElement) element; - } - -} Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstancePropertySource.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstancePropertySource.java 2010-11-12 11:27:35 UTC (rev 26500) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstancePropertySource.java 2010-11-12 11:29:11 UTC (rev 26501) @@ -17,6 +17,7 @@ import org.eclipse.ui.views.properties.PropertyDescriptor; import org.jboss.tools.deltacloud.core.DeltaCloud; import org.jboss.tools.deltacloud.core.DeltaCloudInstance; +import org.jboss.tools.internal.deltacloud.ui.utils.CloudViewElementUtils; public class InstancePropertySource implements IPropertySource { Copied: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/utils/CloudViewElementUtils.java (from rev 26270, trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CloudViewElementUtils.java) =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/utils/CloudViewElementUtils.java (rev 0) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/utils/CloudViewElementUtils.java 2010-11-12 11:29:11 UTC (rev 26501) @@ -0,0 +1,50 @@ +/******************************************************************************* + * Copyright (c) 2010 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.internal.deltacloud.ui.utils; + +import org.jboss.tools.deltacloud.core.DeltaCloud; +import org.jboss.tools.deltacloud.ui.views.CVCloudElement; +import org.jboss.tools.deltacloud.ui.views.CloudViewElement; + +public class CloudViewElementUtils { + + /** + * Returns a DeltaCloud instance for a given cloud view element + * + * @param element the cloud view element to get the DeltaCloud for + * @return the cloud for the given CloudViewElement + * + * @see DeltaCloud + * @see CloudViewElement + */ + public static DeltaCloud getCloud(CloudViewElement element) { + CVCloudElement cvcloud = getCVCloudElement(element); + DeltaCloud cloud = (DeltaCloud) cvcloud.getElement(); + return cloud; + } + + /** + * Returns a CVCloudElement for a given cloud view element + * + * @param element the cloud view element to get the CVCloudElement for + * @return the CVCloudElement for the given CloudViewElement + * + * @see CloudViewElement + * @see CVCloudElement + */ + public static CVCloudElement getCVCloudElement(CloudViewElement element) { + while (!(element instanceof CVCloudElement)) { + element = (CloudViewElement) element.getParent(); + } + return (CVCloudElement) element; + } + +} Property changes on: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/utils/CloudViewElementUtils.java ___________________________________________________________________ Name: svn:mime-type + text/plain