[client] improve workflow of container creation

2 files changed, 17 insertions, 14 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageTypePageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageTypePageLayout.java
index 8999e880..d858882a 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageTypePageLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageTypePageLayout.java
@@ -15,8 +15,9 @@ public abstract class ImageTypePageLayout extends WizardPage {
 	private static final long serialVersionUID = 2548125409461846482L;
 
 	protected final JTextArea txtInfoText;
-	protected final JButton btnNewVmImage;
-	protected final JButton btnNewDockerImage;
+	protected final JRadioButton rbtnNewVmImage;
+	protected final JRadioButton rbtnNewDockerImage;
+	protected final ButtonGroup btgrpImageTyp;
 
 	/**
 	 * Page to choose between new VM-Image or Docker Image
@@ -40,12 +41,14 @@ public abstract class ImageTypePageLayout extends WizardPage {
 		grid.nextRow();
 		grid.nextRow();
 
-		// -- New VM Pick--
-		btnNewVmImage = new JButton(I18n.PAGE_LAYOUT.getString("ImageTypePageLayout.button.newVM"));
-		grid.add(btnNewVmImage, 2, 2).fill(true, true).expand(true, true);
-		// -- New Docker-Image Pick--
-		btnNewDockerImage = new JButton(I18n.PAGE_LAYOUT.getString("ImageTypePageLayout.button.newDocker"));
-		grid.add(btnNewDockerImage, 2, 2).fill(true, true).expand(true, true);
+		rbtnNewVmImage = new JRadioButton(I18n.PAGE_LAYOUT.getString("ImageTypePageLayout.button.newVM"));
+		grid.add(rbtnNewVmImage, 2, 2).fill(true, true).expand(true, true);
+		rbtnNewDockerImage = new JRadioButton(I18n.PAGE_LAYOUT.getString("ImageTypePageLayout.button.newDocker"));
+		grid.add(rbtnNewDockerImage, 2, 2).fill(true, true).expand(true, true);
+
+		btgrpImageTyp = new ButtonGroup();
+		btgrpImageTyp.add(rbtnNewVmImage);
+		btgrpImageTyp.add(rbtnNewDockerImage);
 
 		grid.finish(false);
 
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageTypePage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageTypePage.java
index cd80a41e..d839559e 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageTypePage.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageTypePage.java
@@ -16,25 +16,25 @@ public class ImageTypePage extends ImageTypePageLayout {
 	public ImageTypePage(final ImageCreationWizard wizard) {
 		super(wizard);
 
-		btnNewVmImage.addActionListener(new ActionListener() {
+		rbtnNewVmImage.addActionListener(new ActionListener() {
 			@Override public void actionPerformed(ActionEvent e) {
+				setPageComplete(false);
 				wizard.doVmCreation();
 				setPageComplete(true);
-				wizard.doNext();
 			}
 		});
 
-		btnNewDockerImage.addActionListener(new ActionListener() {
+		rbtnNewDockerImage.addActionListener(new ActionListener() {
 			@Override public void actionPerformed(ActionEvent e) {
+				setPageComplete(false);
 				wizard.doDockerCreation();
 				setPageComplete(true);
-				wizard.doNext();
 			}
 		});
 	}
 
 	@Override protected void onPageEnter() {
-		// set onPageEnter to disable Next and Finish button
-		setPageComplete(false);
+		if(btgrpImageTyp.getSelection() == null)
+			rbtnNewVmImage.doClick();
 	}
 }