From b9f993161d7a8472e82f2c747c2361a3ba411b6a Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Fri, 7 Dec 2018 16:13:59 +0100 Subject: [client] Get rid of Feature checks; RPC version was bumped --- .../openslx/dozmod/gui/activity/UploadPanel.java | 13 ++++-------- .../gui/configurator/LdapFilterConfigurator.java | 2 +- .../dozmod/gui/window/ImageDetailsWindow.java | 8 +++----- .../dozmod/gui/window/ImagePublishedWindow.java | 15 ++++++-------- .../window/layout/LectureDetailsWindowLayout.java | 9 ++------- .../dozmod/gui/wizard/page/ImageUploadPage.java | 23 ++-------------------- 6 files changed, 18 insertions(+), 52 deletions(-) diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/UploadPanel.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/UploadPanel.java index ea339651..57c167e9 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/UploadPanel.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/UploadPanel.java @@ -16,7 +16,6 @@ import org.openslx.dozmod.gui.helper.MessageType; import org.openslx.dozmod.state.UploadWizardState; import org.openslx.dozmod.thrift.Session; import org.openslx.dozmod.thrift.UploadInitiator; -import org.openslx.sat.thrift.version.Feature; import org.openslx.thrifthelper.ThriftManager; import org.openslx.util.QuickTimer; import org.openslx.util.QuickTimer.Task; @@ -34,14 +33,10 @@ public class UploadPanel extends TransferPanel { public UploadPanel(UploadWizardState state) { super(state.upload.getUploadTask(), state.name, state.diskFile.getName()); - if (!Session.hasFeature(Feature.SERVER_SIDE_COPY)) { - chkServerSideCopy = null; - } else { - chkServerSideCopy = new JCheckBox("ServerSide Copy"); - footer.add(Box.createHorizontalStrut(15)); - footer.add(chkServerSideCopy); - chkServerSideCopy.addActionListener(new SscToggle()); - } + chkServerSideCopy = new JCheckBox("ServerSide Copy"); + footer.add(Box.createHorizontalStrut(15)); + footer.add(chkServerSideCopy); + chkServerSideCopy.addActionListener(new SscToggle()); btnClose.addActionListener(new ButtonAction()); this.state = state.upload; state.upload.getUploadTask().addListener(this); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/LdapFilterConfigurator.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/LdapFilterConfigurator.java index 14ed1157..1f359305 100755 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/LdapFilterConfigurator.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/LdapFilterConfigurator.java @@ -147,7 +147,7 @@ public class LdapFilterConfigurator extends LdapFilterConfiguratorLayout { public List getState() { List> current = tblFilters.getData(); if (current == null) - return new ArrayList<>(0);; + return new ArrayList<>(0); ArrayList ret = new ArrayList<>(current.size()); for (Wrapper item : current) { if (item.isChecked() || item.item.filterId == 0) { diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java index b254b379..212e92b0 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java @@ -65,7 +65,6 @@ import org.openslx.dozmod.thrift.cache.MetaDataCache; import org.openslx.dozmod.thrift.cache.UserCache; import org.openslx.dozmod.util.DesktopEnvironment; import org.openslx.dozmod.util.FormatHelper; -import org.openslx.sat.thrift.version.Feature; import org.openslx.thrifthelper.Comparators; import org.openslx.thrifthelper.TConst; import org.openslx.thrifthelper.ThriftManager; @@ -324,8 +323,7 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe && ImagePerms.canEdit(image) && (image.shareMode == ShareMode.LOCAL || image.shareMode == ShareMode.PUBLISH)); mnuDelete.setEnabled(ImagePerms.canEdit(image)); - mnuExtendExpiryDate.setEnabled(!multiSelection && (selectedVersion.isValid - || Session.hasFeature(Feature.EXTEND_EXPIRED_VM))); + mnuExtendExpiryDate.setEnabled(!multiSelection && selectedVersion.isValid); pop.show(e.getComponent(), e.getX(), e.getY()); } } @@ -492,8 +490,8 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe * masterserver. */ private void uploadToMaster() { - // 04.2018: bail if we the user tries to publish a non-vmware image. - if (Session.hasFeature(Feature.MULTIPLE_HYPERVISORS) && !TConst.VIRT_VMWARE.equals(image.virtId)) { + // TODO 04.2018: bail if we the user tries to publish a non-vmware image. + if (!TConst.VIRT_VMWARE.equals(image.virtId)) { Gui.showMessageBox( MetaDataCache.getVirtualizerById(image.virtId).virtName + " ist derzeit nicht für den öffentlichen Austausch freigegeben.", diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImagePublishedWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImagePublishedWindow.java index c81af1a6..117ca324 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImagePublishedWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImagePublishedWindow.java @@ -42,7 +42,6 @@ import org.openslx.dozmod.thrift.ThriftError; import org.openslx.dozmod.thrift.cache.ImagePublishedCache; import org.openslx.dozmod.thrift.cache.OrganizationCache; import org.openslx.dozmod.thrift.cache.UserCache; -import org.openslx.sat.thrift.version.Feature; import org.openslx.thrifthelper.TConst; import org.openslx.thrifthelper.ThriftManager; import org.openslx.util.QuickTimer; @@ -254,16 +253,14 @@ public class ImagePublishedWindow extends ImagePublishedWindowLayout implements final List imagePublishedList = ImagePublishedCache.get(forceRefresh); if (imagePublishedList == null) return; - // 04.2018: Safety check to hide the non-vmware images from the list + // TODO 04.2018: Safety check to hide the non-vmware images from the list // in case they somehow manage to get published. Remove this when we // support publishing images from other hypervisors. - if (Session.hasFeature(Feature.MULTIPLE_HYPERVISORS)) { - for (Iterator iter = imagePublishedList.listIterator(); iter - .hasNext();) { - ImageSummaryRead current = iter.next(); - if (current != null && !current.virtId.equals(TConst.VIRT_VMWARE)) { - iter.remove(); - } + for (Iterator iter = imagePublishedList.listIterator(); iter + .hasNext();) { + ImageSummaryRead current = iter.next(); + if (current != null && !current.virtId.equals(TConst.VIRT_VMWARE)) { + iter.remove(); } } Gui.asyncExec(new Runnable() { diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureDetailsWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureDetailsWindowLayout.java index 4eae542c..dd049c79 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureDetailsWindowLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureDetailsWindowLayout.java @@ -43,7 +43,6 @@ import org.openslx.dozmod.gui.helper.GridManager; import org.openslx.dozmod.thrift.Session; import org.openslx.dozmod.thrift.cache.MetaDataCache; import org.openslx.dozmod.util.FormatHelper; -import org.openslx.sat.thrift.version.Feature; import org.openslx.thrifthelper.Comparators; @SuppressWarnings("serial") @@ -408,12 +407,8 @@ public abstract class LectureDetailsWindowLayout extends JDialog { pnlTabs.addTab("VM-Start", pnlTabRunscript); } pnlTabs.addTab("Berechtigungen", pnlTabPermissions); - if (Session.hasFeature(Feature.NETWORK_SHARES)) { - pnlTabs.addTab("Netzlaufwerke", pnlTabNetshare); - } - if (Session.hasFeature(Feature.LECTURE_FILTER_LDAP)) { - pnlTabs.addTab("LDAP-Filter", pnlTabLdapFilter); - } + pnlTabs.addTab("Netzlaufwerke", pnlTabNetshare); + pnlTabs.addTab("LDAP-Filter", pnlTabLdapFilter); add(pnlTabs, BorderLayout.CENTER); // usage counter + button panel on the bottom JPanel buttonPanel = new JPanel(); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadPage.java index 16ca257e..87555a4a 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadPage.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadPage.java @@ -23,20 +23,16 @@ import org.openslx.dozmod.gui.helper.QFileChooser; import org.openslx.dozmod.gui.wizard.Wizard; import org.openslx.dozmod.gui.wizard.layout.ImageUploadPageLayout; import org.openslx.dozmod.state.UploadWizardState; -import org.openslx.dozmod.thrift.Session; 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.sat.thrift.version.Feature; import org.openslx.thrifthelper.TConst; import org.openslx.util.vm.DiskImage; import org.openslx.util.vm.DiskImage.UnknownImageFormatException; -import org.openslx.util.vm.UnsupportedVirtualizerFormatException; import org.openslx.util.vm.VmMetaData; import org.openslx.util.vm.VmMetaData.HardDisk; -import org.openslx.util.vm.VmwareMetaData; /** * Page for uploading a new image. @@ -86,13 +82,7 @@ public class ImageUploadPage extends ImageUploadPageLayout { browseForVm(); } }); - // initialize allSupportedFilter depending on whether multiple hypervisors - // are supported or not - if (Session.hasFeature(Feature.MULTIPLE_HYPERVISORS)) { - allSupportedFilter = new FileNameExtensionFilter("All Supported", "vmx", "vbox"); - } else { - allSupportedFilter = new FileNameExtensionFilter("All Supported", "vmx"); - } + allSupportedFilter = new FileNameExtensionFilter("All Supported", "vmx", "vbox"); btnBrowseForImage.requestFocus(); } @@ -100,9 +90,7 @@ public class ImageUploadPage extends ImageUploadPageLayout { QFileChooser fc = new QFileChooser(Config.getUploadPath(), false); fc.setAcceptAllFileFilterUsed(false); fc.addChoosableFileFilter(vmxFilter); - if (Session.hasFeature(Feature.MULTIPLE_HYPERVISORS)) { - fc.addChoosableFileFilter(vboxFilter); - } + fc.addChoosableFileFilter(vboxFilter); fc.addChoosableFileFilter(allSupportedFilter); fc.setFileFilter(allSupportedFilter); // differentiate between existing and new VMs @@ -143,13 +131,6 @@ public class ImageUploadPage extends ImageUploadPageLayout { } final String fileformat = state.meta.getVirtualizer().virtName; - // bail if multiple hypervisors are not supported - if (!(state.meta instanceof VmwareMetaData) && !Session.hasFeature(Feature.MULTIPLE_HYPERVISORS)) { - setErrorMessage("Der Hypervisor der gewählten VM (" + fileformat - + ") wird vom aktuellen Satellitenserver nicht unterstützt."); - setPageComplete(false); - return; - } // check if the user somehow changed the type of the VM if (existingImage != null && !existingImage.virtId.equals(state.meta.getVirtualizer().virtId)) { Virtualizer existingImageVirtualizer = MetaDataCache.getVirtualizerById(existingImage.virtId); -- cgit v1.2.3-55-g7522