summaryrefslogtreecommitdiffstats
path: root/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard
diff options
context:
space:
mode:
authorralph isenmann2020-11-05 15:07:50 +0100
committerralph isenmann2020-11-05 15:07:50 +0100
commit382b8986302eedf4b4a56918c45f3dd9a2d75864 (patch)
tree3f8bc39488c8a8a03e4415eb47578a5b647b797f /dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard
parent[client] move BindMountConfigurator to ImageMetaDataPage (diff)
downloadtutor-module-382b8986302eedf4b4a56918c45f3dd9a2d75864.tar.gz
tutor-module-382b8986302eedf4b4a56918c45f3dd9a2d75864.tar.xz
tutor-module-382b8986302eedf4b4a56918c45f3dd9a2d75864.zip
[client] refactoring
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard')
-rw-r--r--dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageCreationWizard.java1
-rw-r--r--dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageMetaDataPageLayout.java30
-rw-r--r--dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java10
3 files changed, 18 insertions, 23 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageCreationWizard.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageCreationWizard.java
index 135738d9..ba336652 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageCreationWizard.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageCreationWizard.java
@@ -127,7 +127,6 @@ import java.util.List;
@Override public boolean wantFinish() {
-
if (state.meta instanceof DockerMetaDataDummy)
initUpload();
// since we only started the upload and created a "blank" image entry
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageMetaDataPageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageMetaDataPageLayout.java
index fbec5bf4..0923db0c 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageMetaDataPageLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageMetaDataPageLayout.java
@@ -1,10 +1,5 @@
package org.openslx.dozmod.gui.wizard.layout;
-import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
-import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
-
import org.openslx.bwlp.thrift.iface.OperatingSystem;
import org.openslx.dozmod.gui.Gui;
import org.openslx.dozmod.gui.configurator.ContainerBindMountConfigurator;
@@ -16,8 +11,9 @@ import org.openslx.dozmod.gui.wizard.Wizard;
import org.openslx.dozmod.gui.wizard.WizardPage;
import org.openslx.thrifthelper.Comparators;
-@SuppressWarnings("serial")
-public abstract class ImageMetaDataPageLayout extends WizardPage {
+import javax.swing.*;
+
+@SuppressWarnings("serial") public abstract class ImageMetaDataPageLayout extends WizardPage {
protected final JComboBox<OperatingSystem> cboOperatingSystem;
protected final JTextArea txtDescription;
@@ -31,8 +27,8 @@ public abstract class ImageMetaDataPageLayout extends WizardPage {
/**
* wizard page for entering image data at creating or editing an image
- *
- * @param wizard
+ *
+ * @param wizard The Wizard-object, which this extended {@link WizardPage} belongs to.
*/
public ImageMetaDataPageLayout(Wizard wizard) {
super(wizard, "Metadaten");
@@ -41,14 +37,14 @@ public abstract class ImageMetaDataPageLayout extends WizardPage {
GridManager grid = new GridManager(this, 2, false);
QLabel osCaption = new QLabel("Betriebssystem");
- cboOperatingSystem = new ComboBox<>(Comparators.operatingSystem, new ComboBoxRenderer<OperatingSystem>() {
- @Override
- public String renderItem(OperatingSystem item) {
- if (item == null)
- return null;
- return item.getOsName();
- }
- });
+ cboOperatingSystem = new ComboBox<>(Comparators.operatingSystem,
+ new ComboBoxRenderer<OperatingSystem>() {
+ @Override public String renderItem(OperatingSystem item) {
+ if (item == null)
+ return null;
+ return item.getOsName();
+ }
+ });
cboOperatingSystem.setEditable(false);
grid.add(osCaption);
grid.add(cboOperatingSystem);
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java
index 785e3289..7b9dcd10 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java
@@ -1,10 +1,5 @@
package org.openslx.dozmod.gui.wizard.page;
-import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
-import java.util.Collections;
-import java.util.List;
-
import org.apache.log4j.Logger;
import org.openslx.bwlp.thrift.iface.OperatingSystem;
import org.openslx.bwlp.thrift.iface.ShareMode;
@@ -22,6 +17,11 @@ import org.openslx.util.QuickTimer.Task;
import org.openslx.util.vm.DockerMetaDataDummy;
import org.openslx.util.vm.QemuMetaData;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.util.Collections;
+import java.util.List;
+
/**
* Page for setting the details of an image.
*/