diff options
author | ralph isenmann | 2020-10-27 15:05:07 +0100 |
---|---|---|
committer | ralph isenmann | 2020-10-27 15:05:07 +0100 |
commit | 7f4c8667f9855a6ad0a7c8e0bb08f567c22f20d6 (patch) | |
tree | 14151c01e981a5036f7a8d82393e4c774f85477b /dozentenmodul/src | |
parent | [client] update ImageDetailsWindow for Container (diff) | |
download | tutor-module-7f4c8667f9855a6ad0a7c8e0bb08f567c22f20d6.tar.gz tutor-module-7f4c8667f9855a6ad0a7c8e0bb08f567c22f20d6.tar.xz tutor-module-7f4c8667f9855a6ad0a7c8e0bb08f567c22f20d6.zip |
[client] refactoring
- rename DockerfileUploadPage to ContainerUploadPage
- use now ContainerBindMountConfigurator in ContainerUploadPage and -Layout
Diffstat (limited to 'dozentenmodul/src')
-rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageCreationWizard.java | 2 | ||||
-rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageUpdateWizard.java | 4 | ||||
-rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ContainerUploadPageLayout.java | 29 | ||||
-rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ContainerUploadPage.java (renamed from dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/DockerfileUploadPage.java) | 53 |
4 files changed, 24 insertions, 64 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 349f555a..ea5a3c7a 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 @@ -66,7 +66,7 @@ public class ImageCreationWizard extends Wizard implements UiFeedback, QuitNotif public void doDockerCreation() { cleanCurrent(); - currentPages.add(new DockerfileUploadPage(this,state)); + currentPages.add(new ContainerUploadPage(this,state)); currentPages.add(new ImageMetaDataPage(this,state)); currentPages.add(new ImageCustomPermissionPage(this, state)); addPages(); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageUpdateWizard.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageUpdateWizard.java index 8152b019..96305128 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageUpdateWizard.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageUpdateWizard.java @@ -10,7 +10,7 @@ import org.openslx.dozmod.gui.Gui; import org.openslx.dozmod.gui.helper.MessageType; import org.openslx.dozmod.gui.helper.QuitNotification; import org.openslx.dozmod.gui.helper.UiFeedback; -import org.openslx.dozmod.gui.wizard.page.DockerfileUploadPage; +import org.openslx.dozmod.gui.wizard.page.ContainerUploadPage; import org.openslx.dozmod.gui.wizard.page.ImageUploadPage; import org.openslx.dozmod.gui.wizard.page.ImageUploadSummaryPage; import org.openslx.dozmod.state.UploadWizardState; @@ -34,7 +34,7 @@ public class ImageUpdateWizard extends Wizard implements UiFeedback, QuitNotific // TODO allow user to update the plain dockerfile switch (image.virtId){ case TConst.VIRT_DOCKER: - addPage(new DockerfileUploadPage(this,state, image)); + addPage(new ContainerUploadPage(this,state, image)); break; case TConst.VIRT_QEMU: case TConst.VIRT_VIRTUALBOX: diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ContainerUploadPageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ContainerUploadPageLayout.java index df9e99fc..e0efde7f 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ContainerUploadPageLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ContainerUploadPageLayout.java @@ -1,8 +1,7 @@ package org.openslx.dozmod.gui.wizard.layout; +import org.openslx.dozmod.gui.configurator.ContainerBindMountConfigurator; import org.openslx.dozmod.gui.control.QLabel; -import org.openslx.dozmod.gui.control.table.ContainerBindMountTable; -import org.openslx.dozmod.gui.control.table.QScrollPane; import org.openslx.dozmod.gui.helper.GridManager; import org.openslx.dozmod.gui.wizard.Wizard; import org.openslx.dozmod.gui.wizard.WizardPage; @@ -10,7 +9,7 @@ import org.openslx.dozmod.model.ContainerBuildContextMethod; import javax.swing.*; import java.awt.*; -import java.awt.event.*; +import java.awt.event.KeyEvent; public class ContainerUploadPageLayout extends WizardPage { @@ -27,11 +26,7 @@ public class ContainerUploadPageLayout extends WizardPage { protected final JTabbedPane tpInput; protected final JTextField txtGitRepo; - protected final ContainerBindMountTable bindMountTable; - protected final JButton btnAddBindMount; - protected final JButton btnDelBindMount; - - + protected ContainerBindMountConfigurator bindMountConfigurator; // TODO set proper Text labels @@ -72,17 +67,9 @@ public class ContainerUploadPageLayout extends WizardPage { g2.add(txtGitRepo).fill(true, false).expand(true, false); g2.finish(false); - JPanel p3 = new JPanel(); - p3.setVisible(false); - GridManager g3 = new GridManager(p3, 3, true, new Insets(5, 0, 5, 0)); - QLabel tmp = new QLabel("DUMMY"); - g3.add(tmp).fill(true, false).expand(true, false); - g3.finish(false); - tpInput = new JTabbedPane(); tpInput.addTab("Dockerfile", p1); tpInput.addTab("Git Repository", p2); - // tpInput.addTab("Simple Input", p3); tpInput.setSelectedIndex(ContainerBuildContextMethod.FILE.ordinal()); grid.add(tpInput, 3).fill(true, false); @@ -110,15 +97,9 @@ public class ContainerUploadPageLayout extends WizardPage { grid.add(txtContainerRun, 2, 1).fill(true, false).expand(true, false); grid.nextRow(); - bindMountTable = new ContainerBindMountTable(); - QScrollPane jsp = new QScrollPane(bindMountTable); - grid.add(jsp, 3).fill(true, true).expand(true, true); + bindMountConfigurator = new ContainerBindMountConfigurator(); + grid.add(bindMountConfigurator, 3).fill(true, true).expand(true, true); grid.nextRow(); - btnAddBindMount = new JButton("Add Bind Mount"); - btnDelBindMount = new JButton("Remove Bind Mount"); - grid.add(Box.createHorizontalBox(), 1).fill(true, false).expand(true, false); - grid.add(btnAddBindMount); - grid.add(btnDelBindMount); //grid.add(Box.createVerticalGlue(), 3).expand(true, true); txtInfoText = new JTextArea(); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/DockerfileUploadPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ContainerUploadPage.java index 9eaf5cf6..9004a957 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/DockerfileUploadPage.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ContainerUploadPage.java @@ -5,16 +5,19 @@ import org.apache.log4j.Logger; import org.openslx.bwlp.thrift.iface.ImageDetailsRead; import org.openslx.dozmod.Config; import org.openslx.dozmod.gui.Gui; -import org.openslx.dozmod.gui.helper.*; -import org.openslx.dozmod.gui.window.ContainerBindMountWindow; +import org.openslx.dozmod.gui.helper.MessageType; +import org.openslx.dozmod.gui.helper.QFileChooser; +import org.openslx.dozmod.gui.helper.TextChangeListener; import org.openslx.dozmod.gui.wizard.Wizard; import org.openslx.dozmod.gui.wizard.layout.ContainerUploadPageLayout; -import org.openslx.dozmod.model.ContainerBindMount; import org.openslx.dozmod.model.ContainerBuildContextMethod; import org.openslx.dozmod.model.ContainerDefinition; import org.openslx.dozmod.model.ContainerMeta; import org.openslx.dozmod.state.UploadWizardState; -import org.openslx.dozmod.thrift.*; +import org.openslx.dozmod.thrift.ThriftActions; +import org.openslx.dozmod.thrift.ThriftError; +import org.openslx.dozmod.thrift.UploadInitiator; +import org.openslx.dozmod.thrift.WrappedException; import org.openslx.dozmod.thrift.cache.MetaDataCache; import org.openslx.util.vm.DockerMetaDataDummy; @@ -22,14 +25,14 @@ import javax.swing.*; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import javax.swing.filechooser.FileFilter; -import java.awt.event.*; -import java.io.*; -import java.util.ArrayList; -import java.util.List; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.io.File; +import java.io.IOException; -public class DockerfileUploadPage extends ContainerUploadPageLayout { +public class ContainerUploadPage extends ContainerUploadPageLayout { - private final Logger LOGGER = Logger.getLogger(DockerfileUploadPage.class); + private final Logger LOGGER = Logger.getLogger(ContainerUploadPage.class); /** * Page for uploading an imagefile @@ -39,7 +42,7 @@ public class DockerfileUploadPage extends ContainerUploadPageLayout { private final UploadWizardState state; private final ImageDetailsRead existingImage; - public DockerfileUploadPage(Wizard wizard, final UploadWizardState state_) { + public ContainerUploadPage(Wizard wizard, final UploadWizardState state_) { super(wizard); canComeBack = false; @@ -52,7 +55,7 @@ public class DockerfileUploadPage extends ContainerUploadPageLayout { init(); } - public DockerfileUploadPage(Wizard wizard, UploadWizardState uploadWizardState, + public ContainerUploadPage(Wizard wizard, UploadWizardState uploadWizardState, ImageDetailsRead imageDetailsRead) { super(wizard); @@ -110,34 +113,10 @@ public class DockerfileUploadPage extends ContainerUploadPageLayout { } }); - btnAddBindMount.addActionListener(new ActionListener() { - @Override public void actionPerformed(ActionEvent e) { - addBindMount(); - } - }); - btnDelBindMount.addActionListener(new ActionListener() { - @Override public void actionPerformed(ActionEvent e) { - btnDelBindMount(); - } - }); - btnBrowseForImage.requestFocus(); txtInfoText.setText("Many Text"); } - private void addBindMount() { - ContainerBindMountWindow.open(wizard, bindMountTable); - } - - private void btnDelBindMount() { - if (null == bindMountTable.getSelectedItem()) - return; - List<ContainerBindMount> data = new ArrayList<>(bindMountTable.getData()); - if (data.remove(bindMountTable.getSelectedItem())) - LOGGER.info("Bind Mount Entry Deleted"); - bindMountTable.setData(data, true); - } - private void browseFile() { QFileChooser fc = new QFileChooser(Config.getUploadPath(), false); @@ -237,7 +216,7 @@ public class DockerfileUploadPage extends ContainerUploadPageLayout { containerMeta.setBuildContextMethod(getBuildContextMethod().ordinal()); containerMeta.setImageName(txtImageName.getText()); containerMeta.setRunOptions(txtContainerRun.getText()); - containerMeta.setBindMountConfig(bindMountTable.getData()); + containerMeta.setBindMountConfig(bindMountConfigurator.getData()); switch (getBuildContextMethod()) { case FILE: cd = new ContainerDefinition(state.descriptionFile, containerMeta); |