bf

woorea · woorea · commit dfc3fa3510a4 · 2012-04-01T07:29:02.000+02:00
diff --git a/openstack-ui/src/main/java/org/openstack/ui/client/view/compute/wizards/CreateServerActivity.java b/openstack-ui/src/main/java/org/openstack/ui/client/view/compute/wizards/CreateServerActivity.java
@@ -1,8 +1,10 @@
 package org.openstack.ui.client.view.compute.wizards;
 
+import java.util.Collection;
 import java.util.List;
 
 import org.openstack.model.compute.FlavorList;
+import org.openstack.model.compute.Image;
 import org.openstack.model.compute.ImageList;
 import org.openstack.model.compute.KeyPairList;
 import org.openstack.model.compute.KeyPairListItem;
@@ -11,10 +13,13 @@
 import org.openstack.model.compute.SecurityGroupList;
 import org.openstack.model.compute.Server;
 import org.openstack.model.compute.nova.NovaServerForCreate;
+import org.openstack.ui.client.UI;
 import org.openstack.ui.client.api.DefaultAsyncCallback;
 import org.openstack.ui.client.api.OpenStackClient;
 
 import com.google.common.base.Function;
+import com.google.common.base.Predicate;
+import com.google.common.collect.Collections2;
 import com.google.common.collect.Lists;
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.editor.client.SimpleBeanEditorDriver;
@@ -100,7 +105,7 @@ public NovaServerForCreate.SecurityGroup apply(SecurityGroup input) {
 		createServerRequestDriver.initialize(wizard);
 		createServerRequestDriver.edit(new NovaServerForCreate());
 		show(serverForCreate.getImageRef() == null ? 0 : 1);
-		wizard.popup.center();
+		UI.MODAL.center();
 	}
 
 	@Override
@@ -110,7 +115,7 @@ public void onFinish() {
 
 			@Override
 			public void onSuccess(Server result) {
-				wizard.popup.hide(true);
+				UI.MODAL.hide();
 			}
 		});
 		
@@ -166,7 +171,14 @@ public void updateImages() {
 
 			@Override
 			public void onSuccess(ImageList result) {
-				wizard.image.imageRef.refresh(result.getList());
+				Collection<Image> images = Collections2.filter(result.getList(), new Predicate<Image>() {
+
+					@Override
+					public boolean apply(Image input) {
+						return input.getName().endsWith("uec");
+					}
+				});
+				wizard.image.imageRef.refresh(images);
 
 			}
 
diff --git a/openstack-ui/src/main/java/org/openstack/ui/client/view/compute/wizards/CreateServerWizard.java b/openstack-ui/src/main/java/org/openstack/ui/client/view/compute/wizards/CreateServerWizard.java
@@ -1,6 +1,7 @@
 package org.openstack.ui.client.view.compute.wizards;
 
 import org.openstack.model.compute.nova.NovaServerForCreate;
+import org.openstack.ui.client.UI;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.editor.client.Editor;
@@ -43,8 +44,6 @@ public interface Presenter extends SelectImageStep.Presenter, ServerConfiguratio
 
 	private Presenter presenter;
 
-	PopupPanel popup;
-
 	@UiField
 	HorizontalPanel steps;
 	@UiField
@@ -76,7 +75,6 @@ public interface Presenter extends SelectImageStep.Presenter, ServerConfiguratio
 
 	public CreateServerWizard() {
 		initWidget(uiBinder.createAndBindUi(this));
-		popup = new PopupPanel(false, true);
 		for (int i = 0; i < body.getWidgetCount(); i++) {
 			WizardStep ws = (WizardStep) body.getWidget(i);
 			HTML step = new HTML("<h3>Step" + (i + 1) + "</h3><p>" + ws.getDescription() + "</p>");
@@ -91,7 +89,7 @@ public void onClick(ClickEvent event) {
 			});
 			steps.add(step);
 		}
-		popup.setWidget(this);
+		UI.MODAL.setWidget(this);
 	}
 
 	private void buttonsStuff(int index) {
@@ -111,7 +109,7 @@ void show(int index) {
 	@UiHandler({ "cancel", "close" })
 	void onCancelOrClose(ClickEvent evt) {
 		presenter.onCancel();
-		popup.hide(true);
+		UI.MODAL.hide();
 	}
 
 	@UiHandler("previous")
diff --git a/openstack-ui/src/main/java/org/openstack/ui/client/view/compute/wizards/FirewallStep.java b/openstack-ui/src/main/java/org/openstack/ui/client/view/compute/wizards/FirewallStep.java
@@ -35,8 +35,10 @@ interface Presenter {
 	
 	@UiField ScrollPanel securityGroupEditor;
 	
+	@Ignore
 	@UiField SecurityGroupEditor securityGroup;
 	
+	@Ignore
 	@UiField SecurityGroupRulesEditor rules;
 
 	public FirewallStep() {
diff --git a/openstack-ui/src/main/java/org/openstack/ui/client/view/compute/wizards/ImageTablePicker.java b/openstack-ui/src/main/java/org/openstack/ui/client/view/compute/wizards/ImageTablePicker.java
@@ -1,11 +1,9 @@
 package org.openstack.ui.client.view.compute.wizards;
 
-import java.util.List;
+import java.util.Collection;
 
 import org.openstack.model.compute.Image;
-import org.openstack.model.compute.nova.NovaImage;
 
-import com.google.gwt.core.client.GWT;
 import com.google.gwt.editor.client.LeafValueEditor;
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.event.dom.client.ClickHandler;
@@ -38,7 +36,7 @@ public void setPresenter(Presenter presenter) {
 		this.presenter = presenter;
 	}
 
-	public void refresh(List<Image> images) {
+	public void refresh(Collection<Image> images) {
 		int row = 0;
 		for (final Image image : images) {
 			int col = 0;
