Author: adietish Date: 2011-01-04 11:17:51 -0500 (Tue, 04 Jan 2011) New Revision: 27872 Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudImageFactory.java Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudImagesRepository.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java Log: [JBIDE-7294] * added factory for DeltaCloudInstance instances, removed functionality from DeltaCloudInstanceRepository * removed name parameter from request since DeltaCloud does not honor the name you choose * added alias support to NewInstanceWizard Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2011-01-04 16:17:20 UTC (rev 27871) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2011-01-04 16:17:51 UTC (rev 27872) @@ -411,7 +411,8 @@ if (deltaCloudImage == null) { try { Image image = client.listImages(id); - deltaCloudImage = images.add(image, this); + deltaCloudImage = DeltaCloudImageFactory.create(image, this); + images.add(deltaCloudImage); } catch (DeltaCloudClientException e) { throw new DeltaCloudException(MessageFormat.format("Cloud not find image with id \"{0}\"", id), e); } @@ -535,7 +536,8 @@ clearImages(); DeltaCloudImagesRepository repo = getImagesRepository(); DeltaCloudImage[] oldImages = repo.get(); - repo.add(client.listImages(), this); + Collection<DeltaCloudImage> deltaCloudImages = DeltaCloudImageFactory.create(client.listImages(), this); + repo.add(deltaCloudImages); // TODO: remove notification with all instanceRepo, replace by // notifying the changed instance firePropertyChange(PROP_IMAGES, oldImages, repo.get()); Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudImageFactory.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudImageFactory.java (rev 0) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudImageFactory.java 2011-01-04 16:17:51 UTC (rev 27872) @@ -0,0 +1,43 @@ +/******************************************************************************* + * 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.core; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +import org.eclipse.core.runtime.Assert; +import org.jboss.tools.deltacloud.core.client.Image; + +/** + * @author André Dietisheim + */ +public class DeltaCloudImageFactory { + + public static DeltaCloudImage create(Image image, DeltaCloud cloud) { + Assert.isLegal(image != null); + Assert.isLegal(cloud != null); + + return new DeltaCloudImage(image, cloud); + } + + public static Collection<DeltaCloudImage> create(List<Image> images, DeltaCloud cloud) { + Assert.isLegal(images != null); + Assert.isLegal(cloud != null); + + List<DeltaCloudImage> deltaCloudImages = new ArrayList<DeltaCloudImage>(); + for(Image image : images) { + DeltaCloudImage deltaCloudImage = create(image, cloud); + deltaCloudImages.add(deltaCloudImage); + } + return deltaCloudImages; + } +} Property changes on: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudImageFactory.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudImagesRepository.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudImagesRepository.java 2011-01-04 16:17:20 UTC (rev 27871) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudImagesRepository.java 2011-01-04 16:17:51 UTC (rev 27872) @@ -10,12 +10,7 @@ ******************************************************************************/ package org.jboss.tools.deltacloud.core; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import org.jboss.tools.deltacloud.core.client.Image; - /** * @author André Dietisheim */ @@ -25,23 +20,6 @@ super(DeltaCloudImage.class); } - // TODO: move to DeltaCloudImageFactory - public DeltaCloudImage add(Image image, DeltaCloud cloud) { - DeltaCloudImage deltaCloudImage = new DeltaCloudImage(image, cloud); - add(deltaCloudImage); - return deltaCloudImage; - } - - // TODO: move to DeltaCloudImageFactory - public Collection<DeltaCloudImage> add(Collection<Image> imagesToAdd, DeltaCloud cloud) { - List<DeltaCloudImage> deltaCloudImages = new ArrayList<DeltaCloudImage>(); - for (Image image : imagesToAdd) { - DeltaCloudImage deltaCloudImage = add(image, cloud); - deltaCloudImages.add(deltaCloudImage); - } - return deltaCloudImages; - } - @Override protected boolean matches(String id, DeltaCloudImage image) { return image != null Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java 2011-01-04 16:17:20 UTC (rev 27871) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java 2011-01-04 16:17:51 UTC (rev 27872) @@ -408,6 +408,7 @@ new MandatoryStringValidator(WizardMessages.getString(MUST_ENTER_A_KEYNAME))) .setBeforeSetValidator( new KeyValidator()), + // TODO: internationalize strings null); ControlDecorationSupport.create(textBinding, SWT.LEFT | SWT.TOP);