diff options
| author | Manuel Bentele | 2021-03-05 12:57:22 +0100 |
|---|---|---|
| committer | Manuel Bentele | 2021-03-11 07:46:19 +0100 |
| commit | eee9dd7869e0fbd2cba3b3aecd105d2213884759 (patch) | |
| tree | 21d83e43c015ed44cea678d8b370d57f5d0bf0b4 | |
| parent | [server] Build and run dozmod-server as Docker container (diff) | |
| download | tutor-module-eee9dd7869e0fbd2cba3b3aecd105d2213884759.tar.gz tutor-module-eee9dd7869e0fbd2cba3b3aecd105d2213884759.tar.xz tutor-module-eee9dd7869e0fbd2cba3b3aecd105d2213884759.zip | |
[client] Fix warnings and replace deprecated methods
118 files changed, 681 insertions, 242 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/App.java b/dozentenmodul/src/main/java/org/openslx/dozmod/App.java index eaffd76c..a062c1d6 100755 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/App.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/App.java @@ -17,11 +17,9 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import javax.net.ssl.SSLContext; -import javax.swing.ListCellRenderer; import javax.swing.SwingUtilities; import javax.swing.UIDefaults; import javax.swing.UIManager; -import javax.swing.table.TableCellRenderer; import org.apache.log4j.AppenderSkeleton; import org.apache.log4j.BasicConfigurator; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/Branding.java b/dozentenmodul/src/main/java/org/openslx/dozmod/Branding.java index 1050b0bb..cba84e69 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/Branding.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/Branding.java @@ -128,6 +128,11 @@ public final class Branding { private static void copyBranding(final URI jarUri, final String localDir, final boolean pack) { try (FileSystem fs = FileSystems.newFileSystem(URI.create("jar:" + jarUri), new HashMap<String, String>() { + /** + * Version for serialization. + */ + private static final long serialVersionUID = -5625624201188857134L; + { put("create", "true"); put("encoding", "UTF-8"); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/filetransfer/PassiveTransfer.java b/dozentenmodul/src/main/java/org/openslx/dozmod/filetransfer/PassiveTransfer.java index 910d0056..83943ff8 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/filetransfer/PassiveTransfer.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/filetransfer/PassiveTransfer.java @@ -3,7 +3,6 @@ package org.openslx.dozmod.filetransfer; import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; import org.apache.thrift.TException; import org.openslx.bwlp.thrift.iface.TInvalidTokenException; import org.openslx.bwlp.thrift.iface.TransferState; @@ -18,8 +17,6 @@ import org.openslx.util.QuickTimer.Task; */ public class PassiveTransfer implements TransferEventEmitter { - private static final Logger LOGGER = Logger.getLogger(PassiveTransfer.class); - private static final long THRIFT_INTERVAL_MS = 2000; /** diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java index f65c650d..e481ecd1 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java @@ -110,13 +110,12 @@ public abstract class MainWindow { return page; } - @SuppressWarnings("unchecked") public static <T extends CompositePage> T getPage(Class<T> clazz) { CompositePage page = pages.get(clazz); if (page == null) { return null; } - return (T) page; + return clazz.cast(page); } public static void centerShell(Window shell) { @@ -617,8 +616,13 @@ public abstract class MainWindow { }, 10, 2001); } - @SuppressWarnings("serial") private static class PleaseWait extends CompositePage { + + /** + * Version for serialization. + */ + private static final long serialVersionUID = 52617524175943671L; + public PleaseWait() { GridManager grid = new GridManager(this, 3); grid.add(Box.createHorizontalGlue()).expand(true, true); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/ActivityPanel.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/ActivityPanel.java index 62073b85..2694605e 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/ActivityPanel.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/ActivityPanel.java @@ -6,10 +6,14 @@ import javax.swing.border.CompoundBorder; import org.openslx.dozmod.gui.MainWindow; -@SuppressWarnings("serial") public abstract class ActivityPanel extends JPanel { /** + * Version for serialization. + */ + private static final long serialVersionUID = -3207947029817052277L; + + /** * If this activity wants to prevent the user from closing the application, * it should return true. This makes the application ask the user to confirm * quitting. diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/DownloadPanel.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/DownloadPanel.java index 2a9b2334..bdf128e4 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/DownloadPanel.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/DownloadPanel.java @@ -14,9 +14,13 @@ import org.openslx.dozmod.gui.helper.MessageType; import org.openslx.dozmod.gui.helper.QuitNotification; import org.openslx.dozmod.util.DesktopEnvironment; -@SuppressWarnings("serial") public class DownloadPanel extends TransferPanel implements ActionListener, QuitNotification { + /** + * Version for serialization. + */ + private static final long serialVersionUID = 6268433650243063898L; + private final DownloadPanel panel = this; private final DownloadTask download; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/PassiveUploadPanel.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/PassiveUploadPanel.java index aa461286..bfd9b783 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/PassiveUploadPanel.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/PassiveUploadPanel.java @@ -3,14 +3,15 @@ package org.openslx.dozmod.gui.activity; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import org.apache.log4j.Logger; import org.openslx.dozmod.filetransfer.TransferEventEmitter; import org.openslx.dozmod.gui.helper.I18n; -@SuppressWarnings("serial") public class PassiveUploadPanel extends TransferPanel { - private static final Logger LOGGER = Logger.getLogger(PassiveUploadPanel.class); + /** + * Version for serialization. + */ + private static final long serialVersionUID = 5663220866875102277L; private final TransferEventEmitter state; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/TransferPanel.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/TransferPanel.java index eb752b30..0718946e 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/TransferPanel.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/TransferPanel.java @@ -10,7 +10,6 @@ import javax.swing.BoxLayout; import javax.swing.JButton; import javax.swing.JPanel; -import org.apache.log4j.Logger; import org.openslx.dozmod.filetransfer.TransferEvent; import org.openslx.dozmod.filetransfer.TransferEventEmitter; import org.openslx.dozmod.filetransfer.TransferEventListener; @@ -19,9 +18,13 @@ import org.openslx.dozmod.gui.control.BlockProgressBar; import org.openslx.dozmod.gui.control.QLabel; import org.openslx.dozmod.gui.helper.I18n; -@SuppressWarnings("serial") public abstract class TransferPanel extends ActivityPanel implements TransferEventListener { + /** + * Version for serialization. + */ + private static final long serialVersionUID = -8094141830153862958L; + protected final QLabel lblStatus; protected final QLabel lblError; @@ -46,8 +49,6 @@ public abstract class TransferPanel extends ActivityPanel implements TransferEve private int errorCountdown = 0; - private final static Logger LOGGER = Logger.getLogger(TransferPanel.class); - private JPanel progressWrapper; protected JPanel footer; 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 b9b106f6..b0d9b1c3 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 @@ -24,9 +24,13 @@ import org.openslx.thrifthelper.ThriftManager; import org.openslx.util.QuickTimer; import org.openslx.util.QuickTimer.Task; -@SuppressWarnings("serial") public class UploadPanel extends TransferPanel implements QuitNotification { + /** + * Version for serialization. + */ + private static final long serialVersionUID = -8905745015422520339L; + private static final Logger LOGGER = Logger.getLogger(UploadPanel.class); private final UploadInitiator state; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/ContainerBindMountConfigurator.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/ContainerBindMountConfigurator.java index 630ef571..db536513 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/ContainerBindMountConfigurator.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/ContainerBindMountConfigurator.java @@ -20,6 +20,12 @@ import java.util.List; public class ContainerBindMountConfigurator extends JPanel implements GenericControlWindow<List<ContainerBindMount>> { + + /** + * Version for serialization. + */ + private static final long serialVersionUID = -3439578767452418382L; + private final Logger LOGGER = Logger.getLogger(ContainerBindMountConfigurator.class); private final ContainerBindMountTable bindMountTable; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/ImagePermissionConfigurator.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/ImagePermissionConfigurator.java index cf082e27..dd47b19d 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/ImagePermissionConfigurator.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/ImagePermissionConfigurator.java @@ -43,9 +43,13 @@ import org.openslx.dozmod.util.FormatHelper; * Panel including ImagePermissionTable and add/remove buttons for setting * customImagePermissions. */ -@SuppressWarnings("serial") public class ImagePermissionConfigurator extends JPanel implements GenericControlWindow<Map<String, ImagePermissions>> { + /** + * Version for serialization. + */ + private static final long serialVersionUID = -3168959100399468020L; + protected ImagePermissionTable permissionTable; protected JButton btnAddUser; @@ -127,6 +131,11 @@ public class ImagePermissionConfigurator extends JPanel implements GenericContro permissionTable.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT) .put(KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0), "delete"); permissionTable.getActionMap().put("delete", new AbstractAction() { + /** + * Version for serialization. + */ + private static final long serialVersionUID = 4697626941052452805L; + @Override public void actionPerformed(ActionEvent ae) { btnRemoveUser.doClick(); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/LecturePermissionConfigurator.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/LecturePermissionConfigurator.java index b659c3c9..27a7e9f7 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/LecturePermissionConfigurator.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/LecturePermissionConfigurator.java @@ -43,10 +43,14 @@ import org.openslx.dozmod.gui.window.UserListWindow.UserAddedCallback; * @author joe * */ -@SuppressWarnings("serial") public class LecturePermissionConfigurator extends JPanel implements GenericControlWindow<Map<String, LecturePermissions>> { /** + * Version for serialization. + */ + private static final long serialVersionUID = -1027935137735262385L; + + /** * Self reference */ private LecturePermissionConfigurator me; @@ -133,6 +137,11 @@ public class LecturePermissionConfigurator extends JPanel implements GenericCont permissionTable.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put( KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0), "delete"); permissionTable.getActionMap().put("delete", new AbstractAction() { + /** + * Version for serialization. + */ + private static final long serialVersionUID = 8867019349860510797L; + @Override public void actionPerformed(ActionEvent ae) { btnRemoveUser.doClick(); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/NetrulesConfigurator.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/NetrulesConfigurator.java index 8e11e484..c24a3edb 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/NetrulesConfigurator.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/NetrulesConfigurator.java @@ -208,6 +208,11 @@ public class NetrulesConfigurator extends NetrulesConfiguratorLayout implements pane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW) .put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), "cancel"); pane.getActionMap().put("cancel", new AbstractAction() { + /** + * Version for serialization. + */ + private static final long serialVersionUID = -6322357550690434775L; + @Override public void actionPerformed(ActionEvent e) { dialog.dispose(); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/NetshareConfigurator.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/NetshareConfigurator.java index 95c45282..284f637d 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/NetshareConfigurator.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/NetshareConfigurator.java @@ -340,7 +340,7 @@ class NetshareConfiguratorLayout extends JPanel { protected final JButton btnAdd, btnDel; protected final JCheckBox chkIsPrinter; protected final JCheckBox chkShowPass; - protected final ComboBox<NetShareAuth> cboNetshareAuth = new ComboBox<>( + protected final ComboBox<NetShareAuth> cboNetshareAuth = new ComboBox<NetShareAuth>( new ComboBoxRenderer<NetShareAuth>() { @Override public String renderItem(NetShareAuth item) { @@ -348,8 +348,8 @@ class NetshareConfiguratorLayout extends JPanel { return null; return FormatHelper.netShareAuthName(item); } - }); - protected final ComboBox<Character> cboNetshareMountPoint = new ComboBox<>( + }, NetShareAuth.class); + protected final ComboBox<Character> cboNetshareMountPoint = new ComboBox<Character>( new ComboBoxRenderer<Character>() { @Override public String renderItem(Character letter) { @@ -358,7 +358,7 @@ class NetshareConfiguratorLayout extends JPanel { return letter.equals(NetshareConfigurator.EMPTY_MARKER) ? letter.toString() : letter.toString() + ":"; } - }); + }, Character.class); public NetshareConfiguratorLayout() { GridManager grid = new GridManager(this, 3, true, new Insets(3, 3, 3, 3)); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/StartupConfigurator.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/StartupConfigurator.java index eadc7339..5efaebbd 100755 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/StartupConfigurator.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/StartupConfigurator.java @@ -107,6 +107,11 @@ public class StartupConfigurator extends StartupConfiguratorLayout { pane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW) .put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), "cancel"); pane.getActionMap().put("cancel", new AbstractAction() { + /** + * Version for serialization. + */ + private static final long serialVersionUID = 6028670268490432509L; + @Override public void actionPerformed(ActionEvent e) { dialog.dispose(); @@ -398,12 +403,12 @@ class StartupConfiguratorLayout extends JPanel { public StartupConfiguratorLayout() { GridManager grid = new GridManager(this, 2, true, new Insets(5, 5, 5, 5)); grid.add(new QLabel(I18n.CONFIGURATOR.getString("Startup.Label.audio.text"))); - cboSoundState = new ComboBox<>(new ComboBoxRenderer<SoundState>() { + cboSoundState = new ComboBox<SoundState>(new ComboBoxRenderer<SoundState>() { @Override public String renderItem(SoundState item) { return item.displayName; } - }); + }, SoundState.class); cboSoundState.setModel(new DefaultComboBoxModel<SoundState>(SoundState.values())); grid.add(cboSoundState).fill(true, false).expand(true, false); grid.nextRow(); @@ -423,7 +428,7 @@ class StartupConfiguratorLayout extends JPanel { return null; return item.toString(); } - }); + }, RunscriptType.class); cboRunscriptType.setModel(new DefaultComboBoxModel<RunscriptType>( RunscriptType.values())); cboRunscriptType.setEditable(true); @@ -440,7 +445,7 @@ class StartupConfiguratorLayout extends JPanel { return null; return item.displayName; } - }); + }, RunscriptVisibility.class); cboRunscriptVisibility.setModel(new DefaultComboBoxModel<RunscriptVisibility>(RunscriptVisibility.values())); grid.add(new QLabel(I18n.CONFIGURATOR.getString("Startup.Label.visibility.text"))).fill(false, false) .expand(false, false); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/BlockProgressBar.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/BlockProgressBar.java index 131a5a07..22089f70 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/BlockProgressBar.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/BlockProgressBar.java @@ -13,9 +13,13 @@ import javax.swing.JPanel; import org.openslx.dozmod.gui.Gui; import org.openslx.thrifthelper.TransferStatusWrapper; -@SuppressWarnings("serial") public class BlockProgressBar extends JPanel { + /** + * Version for serialization. + */ + private static final long serialVersionUID = 3530794778387334915L; + private final Color[] blockColors = new Color[6]; private static final Color potentialCompleteColor = new Color(215, 230, 255, 255); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/ComboBox.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/ComboBox.java index 2dddd48e..cd2afbee 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/ComboBox.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/ComboBox.java @@ -10,9 +10,13 @@ import javax.swing.JLabel; import javax.swing.JList; import javax.swing.ListCellRenderer; -@SuppressWarnings("serial") public class ComboBox<T> extends JComboBox<T> { + /** + * Version for serialization. + */ + private static final long serialVersionUID = -114503880726655740L; + public static abstract class ComboBoxRenderer<T> { public abstract String renderItem(T item); @@ -25,13 +29,15 @@ public class ComboBox<T> extends JComboBox<T> { private final ComboBoxRenderer<T> itemRenderer; private final ComboBox<T> me = this; private boolean replacedRenderer = false; + private final Class<T> clazz; - public ComboBox(ComboBoxRenderer<T> renderer) { - this(null, renderer); + public ComboBox(ComboBoxRenderer<T> renderer, Class<T> clazz) { + this(null, renderer, clazz); } - public ComboBox(Comparator<T> equalityComparator, ComboBoxRenderer<T> renderer) { + public ComboBox(Comparator<T> equalityComparator, ComboBoxRenderer<T> renderer, Class<T> clazz) { super(); + this.clazz = clazz; this.itemRenderer = renderer; this.equalityComparator = equalityComparator; } @@ -41,7 +47,6 @@ public class ComboBox<T> extends JComboBox<T> { * comparator given when constructing the ComboBox to determine if an entry * should be selected. */ - @SuppressWarnings("unchecked") @Override public void setSelectedItem(Object anObject) { if (anObject != null && equalityComparator != null) { @@ -50,7 +55,7 @@ public class ComboBox<T> extends JComboBox<T> { try { for (int i = 0; i < model.getSize(); ++i) { T element = model.getElementAt(i); - if (equalityComparator.compare((T) anObject, element) == 0) { + if (equalityComparator.compare(this.clazz.cast(anObject), element) == 0) { localObject = element; break; } @@ -99,12 +104,17 @@ public class ComboBox<T> extends JComboBox<T> { } private class FallbackCellRenderer extends DefaultListCellRenderer { + + /** + * Version for serialization. + */ + private static final long serialVersionUID = 3441233718432775129L; + public FallbackCellRenderer() { putClientProperty("html.disable", Boolean.TRUE); putClientProperty("html", null); } - @SuppressWarnings("unchecked") @Override public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) { @@ -112,7 +122,7 @@ public class ComboBox<T> extends JComboBox<T> { value = itemRenderer.getEmptyText(); } else { try { - value = itemRenderer.renderItem((T) value); + value = itemRenderer.renderItem(ComboBox.this.clazz.cast(value)); } catch (ClassCastException e) { // Should never happen; do nothing, retain original value } diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/ImageListViewer.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/ImageListViewer.java index 3d82e2c9..c7e7fd77 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/ImageListViewer.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/ImageListViewer.java @@ -28,9 +28,13 @@ import org.openslx.dozmod.thrift.cache.UserCache; import org.openslx.util.QuickTimer; import org.openslx.util.QuickTimer.Task; -@SuppressWarnings("serial") public class ImageListViewer extends QLabel { + /** + * Version for serialization. + */ + private static final long serialVersionUID = -1635677030878948625L; + private static final Logger LOGGER = Logger.getLogger(ImageListViewer.class); // search/filter components @@ -273,7 +277,7 @@ public class ImageListViewer extends QLabel { public ImageTable getImageTable() { return imageTable; } - public JComboBox getCboFilter() { + public JComboBox<FilterType> getCboFilter() { return cboFilter; } diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/LocationSelector.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/LocationSelector.java index 706a7d13..e62bbde8 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/LocationSelector.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/LocationSelector.java @@ -42,8 +42,13 @@ import org.openslx.util.QuickTimer.Task; * @author Jonathan Bauer * */ -@SuppressWarnings("serial") public class LocationSelector extends JPanel { + + /** + * Version for serialization. + */ + private static final long serialVersionUID = 3847194308363804953L; + private final static Logger LOGGER = Logger.getLogger(LocationSelector.class); private final JRadioButton btnLimitToLocations; @@ -380,8 +385,13 @@ public class LocationSelector extends JPanel { } } -@SuppressWarnings("serial") class LocationRenderer extends DefaultListCellRenderer { + + /** + * Version for serialization. + */ + private static final long serialVersionUID = -2460263478937939299L; + @Override public Component getListCellRendererComponent(JList<? extends Object> list, Object value, int index, boolean isSelected, boolean cellHasFocus) { diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/PersonLabel.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/PersonLabel.java index 9148ea4b..b72fa2af 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/PersonLabel.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/PersonLabel.java @@ -18,9 +18,13 @@ import org.openslx.dozmod.util.DesktopEnvironment; * A label for displaying a {@link UserInfo} object. Supports a callback event * for when the users clicks the label. */ -@SuppressWarnings("serial") public class PersonLabel extends QLabel { + /** + * Version for serialization. + */ + private static final long serialVersionUID = 1891735421575791028L; + private UserInfo user = null; private PersonLabelClickEvent callback = defaultCallback; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/QDatePickerImpl.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/QDatePickerImpl.java index 9c6adf3a..d698f076 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/QDatePickerImpl.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/QDatePickerImpl.java @@ -18,9 +18,13 @@ import org.jdatepicker.JDatePicker; import org.openslx.dozmod.gui.helper.ColorUtil; import org.openslx.dozmod.gui.helper.TextChangeListener; -@SuppressWarnings("serial") public class QDatePickerImpl extends JDatePicker { + /** + * Version for serialization. + */ + private static final long serialVersionUID = -5858434848990729141L; + private static final Logger LOGGER = Logger.getLogger(QDatePickerImpl.class); private final JButton pickButton; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/CheckListTable.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/CheckListTable.java index 022a985e..67b2f77c 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/CheckListTable.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/CheckListTable.java @@ -8,14 +8,13 @@ import java.util.Set; import javax.swing.Box; -import org.apache.log4j.Logger; - public abstract class CheckListTable<T> extends ListTable<CheckListTable.Wrapper<T>> { + /** + * Version for serialization. + */ private static final long serialVersionUID = 5667297891670398732L; - private static final Logger LOGGER = Logger.getLogger(CheckListTable.class); - public static final ListTableColumn COL_CHECKBOX = new ListTableColumn("", Boolean.class, null, true); private static final Component LBL_EMPTY_CELL = Box.createHorizontalGlue(); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/ContainerBindMountTable.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/ContainerBindMountTable.java index 170feba5..27053661 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/ContainerBindMountTable.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/ContainerBindMountTable.java @@ -6,6 +6,11 @@ import java.util.ArrayList; public class ContainerBindMountTable extends ListTable<ContainerBindMount> { + /** + * Version for serialization. + */ + private static final long serialVersionUID = -2908607335582645909L; + public static final ListTableColumn COL_SOURCE = new ListTableColumn("SOURCE"); public static final ListTableColumn COL_TARGET = new ListTableColumn("TARGET"); public static final ListTableColumn COL_OPTIONS = new ListTableColumn("OPTIONS"); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/ImagePermissionTable.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/ImagePermissionTable.java index c539c751..db9f301f 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/ImagePermissionTable.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/ImagePermissionTable.java @@ -6,9 +6,13 @@ import org.openslx.dozmod.gui.helper.I18n; import org.openslx.dozmod.thrift.cache.UserCache; import org.openslx.dozmod.util.FormatHelper; -@SuppressWarnings("serial") public class ImagePermissionTable extends ListTable<UserImagePermissions> { + /** + * Version for serialization. + */ + private static final long serialVersionUID = -4680532534242749481L; + public static final ListTableColumn COL_USER = new ListTableColumn( I18n.CONTROL.getString("ImagePermissionTable.ListTableColumn.user.colName")); public static final ListTableColumn COL_LINK = new ListTableColumn( diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/ImagePublishedTable.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/ImagePublishedTable.java index 49b125b8..f7f628d5 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/ImagePublishedTable.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/ImagePublishedTable.java @@ -11,10 +11,14 @@ import org.openslx.dozmod.thrift.cache.OrganizationCache; import org.openslx.dozmod.thrift.cache.UserCache; import org.openslx.dozmod.util.FormatHelper; -@SuppressWarnings("serial") public class ImagePublishedTable extends ListTable<ImageSummaryRead> { -// public static final ListTableColumn COL_TEMPLATE = new ListTableColumn("Vorlage", Boolean.class); + /** + * Version for serialization. + */ + private static final long serialVersionUID = -7212496347900388109L; + + // public static final ListTableColumn COL_TEMPLATE = new ListTableColumn("Vorlage", Boolean.class); // public static final ListTableColumn COL_USABLE = new ListTableColumn("Verwendbar", Boolean.class); // public static final ListTableColumn COL_SIZE = new ListTableColumn("Größe", Long.class); // public static final ListTableColumn COL_LASTCHANGE = new ListTableColumn("Geändert", Long.class); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/ImageTable.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/ImageTable.java index 9bf9b59e..361dffb1 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/ImageTable.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/ImageTable.java @@ -12,9 +12,13 @@ import org.openslx.dozmod.thrift.cache.MetaDataCache; import org.openslx.dozmod.thrift.cache.UserCache; import org.openslx.dozmod.util.FormatHelper; -@SuppressWarnings("serial") public class ImageTable extends ListTable<ImageSummaryRead> { + /** + * Version for serialization. + */ + private static final long serialVersionUID = 832005911201385063L; + public static final ListTableColumn COL_TEMPLATE = new ListTableColumn( I18n.CONTROL.getString("ImageTable.ListTableColumn.template.colName"), Boolean.class); public static final ListTableColumn COL_USABLE = new ListTableColumn( diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/ImageVersionTable.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/ImageVersionTable.java index ff783370..45f7756c 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/ImageVersionTable.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/ImageVersionTable.java @@ -5,9 +5,13 @@ import org.openslx.dozmod.gui.helper.I18n; import org.openslx.dozmod.thrift.cache.UserCache; import org.openslx.dozmod.util.FormatHelper; -@SuppressWarnings("serial") public class ImageVersionTable extends ListTable<ImageVersionDetails> { + /** + * Version for serialization. + */ + private static final long serialVersionUID = -2532188492722932492L; + public static final ListTableColumn COL_CREATED = new ListTableColumn( I18n.CONTROL.getString("ImageVersionTable.ListTableColumn.created.colName"), Long.class); public static final ListTableColumn COL_EXPIRING = new ListTableColumn( diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/LectureLdapFilterTable.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/LectureLdapFilterTable.java index f037263e..e839583d 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/LectureLdapFilterTable.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/LectureLdapFilterTable.java @@ -3,9 +3,13 @@ package org.openslx.dozmod.gui.control.table; import org.openslx.bwlp.thrift.iface.LdapFilter; import org.openslx.dozmod.gui.helper.I18n; -@SuppressWarnings("serial") public class LectureLdapFilterTable extends CheckListTable<LdapFilter> { + /** + * Version for serialization. + */ + private static final long serialVersionUID = -3593023625165902800L; + public static final ListTableColumn COL_TITLE = new ListTableColumn( I18n.CONTROL.getString("LectureLdapFilterTable.ListTableColumn.title.colName")); public static final ListTableColumn COL_ATTRIBUTE = new ListTableColumn( diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/LecturePermissionTable.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/LecturePermissionTable.java index 294123f8..8389f4cc 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/LecturePermissionTable.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/LecturePermissionTable.java @@ -6,9 +6,13 @@ import org.openslx.dozmod.gui.helper.I18n; import org.openslx.dozmod.thrift.cache.UserCache; import org.openslx.dozmod.util.FormatHelper; -@SuppressWarnings("serial") public class LecturePermissionTable extends ListTable<UserLecturePermissions> { + /** + * Version for serialization. + */ + private static final long serialVersionUID = -4128118524074272768L; + public static final ListTableColumn COL_USER = new ListTableColumn( I18n.CONTROL.getString("LecturePermissionTable.ListTableColumn.user.colName")); public static final ListTableColumn COL_EDIT = new ListTableColumn( diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/LectureTable.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/LectureTable.java index 46cf9552..1cb759fe 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/LectureTable.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/LectureTable.java @@ -14,9 +14,13 @@ import org.openslx.dozmod.thrift.Sorters; import org.openslx.dozmod.thrift.cache.UserCache; import org.openslx.dozmod.util.FormatHelper; -@SuppressWarnings("serial") public class LectureTable extends ListTable<LectureSummary> { + /** + * Version for serialization. + */ + private static final long serialVersionUID = -6370801260782670273L; + public static final ListTableColumn COL_NAME = new ListTableColumn( I18n.CONTROL.getString("LectureTable.ListTableColumn.name.colName")); public static final ListTableColumn COL_OWNER = new ListTableColumn( diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/ListTable.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/ListTable.java index 8ac6441d..81049906 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/ListTable.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/ListTable.java @@ -23,9 +23,13 @@ import javax.swing.table.TableRowSorter; import org.openslx.dozmod.Config; import org.openslx.dozmod.gui.helper.TableColumnAdjuster; -@SuppressWarnings("serial") public abstract class ListTable<T> extends JTable { + /** + * Version for serialization. + */ + private static final long serialVersionUID = 1639243260163123851L; + private final ListModel<T> model; private final TableRowSorter<ListModel<T>> sorter; @@ -237,6 +241,11 @@ public abstract class ListTable<T> extends JTable { */ public static class ListModel<T> extends AbstractTableModel { + /** + * Version for serialization. + */ + private static final long serialVersionUID = -5509013855607495446L; + private final ColumnState[] columns; private ArrayList<T> data = null; @@ -347,6 +356,12 @@ public abstract class ListTable<T> extends JTable { * a cell is selected */ private class ListTableRenderer extends DefaultTableCellRenderer { + + /** + * Version for serialization. + */ + private static final long serialVersionUID = -2018119994616551022L; + public ListTableRenderer() { putClientProperty("html.disable", Boolean.TRUE); putClientProperty("html", null); @@ -368,6 +383,11 @@ public abstract class ListTable<T> extends JTable { private class IconRenderer extends DefaultTableCellRenderer { + /** + * Version for serialization. + */ + private static final long serialVersionUID = 8234375098523405939L; + @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/NetshareTable.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/NetshareTable.java index 3eb56748..41f95bf9 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/NetshareTable.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/NetshareTable.java @@ -7,9 +7,13 @@ import org.openslx.dozmod.gui.helper.I18n; import org.openslx.dozmod.thrift.Sorters; import org.openslx.dozmod.util.FormatHelper; -@SuppressWarnings("serial") public class NetshareTable extends CheckListTable<NetShare> { + /** + * Version for serialization. + */ + private static final long serialVersionUID = -3162083709644989385L; + public static final ListTableColumn COL_NAME = new ListTableColumn( I18n.CONTROL.getString("NetShareTable.ListTableColumn.name.colName")); public static final ListTableColumn COL_MOUNT = new ListTableColumn( diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/QScrollPane.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/QScrollPane.java index c4ee12b0..0535091f 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/QScrollPane.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/QScrollPane.java @@ -14,9 +14,13 @@ import javax.swing.JTable; * - transfer focus to table when clicking on empty space * - make the scroll pane's background color match that of the JTable. */ -@SuppressWarnings("serial") public class QScrollPane extends JScrollPane { + /** + * Version for serialization. + */ + private static final long serialVersionUID = -4143309488768348491L; + public QScrollPane(final JTable view) { super(view); this.addMouseListener(new MouseAdapter() { diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/UserTable.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/UserTable.java index 000384fa..2fd8e115 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/UserTable.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/UserTable.java @@ -4,9 +4,13 @@ import org.openslx.bwlp.thrift.iface.UserInfo; import org.openslx.dozmod.gui.helper.I18n; import org.openslx.dozmod.util.FormatHelper; -@SuppressWarnings("serial") public class UserTable extends ListTable<UserInfo> { + /** + * Version for serialization. + */ + private static final long serialVersionUID = -6029268514356995316L; + public static final ListTableColumn COL_NAME = new ListTableColumn( I18n.CONTROL.getString("UserTable.ListTableColumn.name.colName")); public static final ListTableColumn COL_MAIL = new ListTableColumn( diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/CompositePage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/CompositePage.java index 3a80d2cd..3cc09cdc 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/CompositePage.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/CompositePage.java @@ -4,9 +4,13 @@ import java.awt.LayoutManager; import javax.swing.JPanel; -@SuppressWarnings("serial") public abstract class CompositePage extends JPanel { + /** + * Version for serialization. + */ + private static final long serialVersionUID = 7811320331427149627L; + public CompositePage() { super(); } diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/DateTimeHelper.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/DateTimeHelper.java index e03aa939..4af23fec 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/DateTimeHelper.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/DateTimeHelper.java @@ -5,13 +5,10 @@ import java.util.Date; import javax.swing.JSpinner; -import org.apache.log4j.Logger; import org.jdatepicker.JDatePicker; public class DateTimeHelper { - private final static Logger LOGGER = Logger.getLogger(DateTimeHelper.class); - /** * Returns the Date composed of the given datePicker's date and the given * timeSpinner's time. Returns null if the model of either one doesn't diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/DebugWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/DebugWindow.java index 3450cb7c..f740b83d 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/DebugWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/DebugWindow.java @@ -19,15 +19,18 @@ import org.apache.log4j.Appender; import org.apache.log4j.AppenderSkeleton; import org.apache.log4j.BasicConfigurator; import org.apache.log4j.Level; -import org.apache.log4j.Priority; import org.apache.log4j.spi.LoggingEvent; import org.joda.time.format.DateTimeFormat; import org.joda.time.format.DateTimeFormatter; import org.openslx.dozmod.gui.Gui; -@SuppressWarnings("serial") public class DebugWindow extends JPanel { + /** + * Version for serialization. + */ + private static final long serialVersionUID = 2602474207529142616L; + private static final DateTimeFormatter formatter = DateTimeFormat.forPattern("HH:mm:ss"); private final JTextPane txtLog; @@ -64,11 +67,11 @@ public class DebugWindow extends JPanel { protected void append(final LoggingEvent event) { final Level l = event.getLevel(); final Color c; - if (l.isGreaterOrEqual(Priority.ERROR)) { + if (l.isGreaterOrEqual(Level.ERROR)) { c = Color.RED; - } else if (l.isGreaterOrEqual(Priority.WARN)) { + } else if (l.isGreaterOrEqual(Level.WARN)) { c = Color.ORANGE; - } else if (l.isGreaterOrEqual(Priority.INFO)) { + } else if (l.isGreaterOrEqual(Level.INFO)) { c = Color.BLACK; } else { c = Color.GRAY; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/ExpiryDateChooser.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/ExpiryDateChooser.java index 855757f9..f97298f3 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/ExpiryDateChooser.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/ExpiryDateChooser.java @@ -50,7 +50,10 @@ public class ExpiryDateChooser { */ class ExpiryDateChooserWindow extends JPanel { - private static final Logger LOGGER = Logger.getLogger(ExpiryDateChooser.class); + /** + * Version for serialization. + */ + private static final long serialVersionUID = 7300013126671050102L; public static final int DEFAULT_EXTENSION_DURATION = 14; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/GridManager.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/GridManager.java index b3b5f70e..df016d8f 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/GridManager.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/GridManager.java @@ -304,8 +304,13 @@ public class GridManager { // - @SuppressWarnings("serial") public class GBC extends GridBagConstraints { + + /** + * Version for serialization. + */ + private static final long serialVersionUID = -7462590049264126413L; + private boolean valid = true; private final Component component; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/GridPos.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/GridPos.java index 2a1b0200..7c0bbb94 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/GridPos.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/GridPos.java @@ -5,7 +5,8 @@ import java.awt.Insets; /** * Helper for creating Constraints when using GridBagLayout. - * Deprecated, use GridManager instead. + * + * @deprecated Deprecated, use {@link GridManager} instead. */ @Deprecated public class GridPos { diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/PopupMenu.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/PopupMenu.java index 07029841..ffad689b 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/PopupMenu.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/PopupMenu.java @@ -8,6 +8,11 @@ import javax.swing.border.BevelBorder; public class PopupMenu extends JPopupMenu { + /** + * Version for serialization. + */ + private static final long serialVersionUID = 4283100540609442650L; + private ActionListener menuListener = null; public PopupMenu(final ActionListener menuListener) { diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/QFileChooser.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/QFileChooser.java index 2ef175d6..ddac98f0 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/QFileChooser.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/QFileChooser.java @@ -9,9 +9,13 @@ import javax.swing.UIManager; import org.apache.log4j.Logger; -@SuppressWarnings("serial") public class QFileChooser extends JFileChooser { + /** + * Version for serialization. + */ + private static final long serialVersionUID = 3856532034624815076L; + private static final Logger LOGGER = Logger.getLogger(QFileChooser.class); public QFileChooser(String path, boolean dirMode) { diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/StatusHeader.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/StatusHeader.java index ae2e8adb..8b07626c 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/StatusHeader.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/StatusHeader.java @@ -14,6 +14,11 @@ import java.awt.*; */ public class StatusHeader extends JPanel { + /** + * Version for serialization. + */ + private static final long serialVersionUID = 4614079201768816885L; + private final QLabel titleLabel; private final QLabel messageLabel; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/TableColumnAdjuster.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/TableColumnAdjuster.java index e8e04237..09bb7789 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/TableColumnAdjuster.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/TableColumnAdjuster.java @@ -176,7 +176,7 @@ public class TableColumnAdjuster implements PropertyChangeListener, TableModelLi width = Math.max(width, tableColumn.getPreferredWidth()); } - columnSizes.put(tableColumn, new Integer(tableColumn.getWidth())); + columnSizes.put(tableColumn, Integer.valueOf(tableColumn.getWidth())); table.getTableHeader().setResizingColumn(tableColumn); tableColumn.setWidth(width); @@ -347,8 +347,13 @@ public class TableColumnAdjuster implements PropertyChangeListener, TableModelLi /* * Action to adjust or restore the width of a single column or all columns */ - @SuppressWarnings("serial") class ColumnAction extends AbstractAction { + + /** + * Version for serialization. + */ + private static final long serialVersionUID = 6906791174899022370L; + private boolean isSelectedColumn; private boolean isAdjust; @@ -383,8 +388,13 @@ public class TableColumnAdjuster implements PropertyChangeListener, TableModelLi * Toggle properties of the TableColumnAdjuster so the user can customize * the functionality to their preferences */ - @SuppressWarnings("serial") class ToggleAction extends AbstractAction { + + /** + * Version for serialization. + */ + private static final long serialVersionUID = -1426129321657325037L; + private boolean isToggleDynamic; private boolean isToggleLarger; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/panel/ContainerPanel.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/panel/ContainerPanel.java index 7c116867..37008e78 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/panel/ContainerPanel.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/panel/ContainerPanel.java @@ -20,8 +20,12 @@ import java.nio.ByteBuffer; public class ContainerPanel extends JPanel { + /** + * Version for serialization. + */ + private static final long serialVersionUID = -3335320345960410582L; + // TODO Set the height of txtContainerRecipe dependent of the Context. Full height for IMAGE_CONTEXT. - public static final String IMAGE_CONTEXT = "IMAGE"; public static final String CONTAINER_CONTEXT = "CONTAINER"; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/BwIdmLinkWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/BwIdmLinkWindow.java index 189491c1..fef7e616 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/BwIdmLinkWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/BwIdmLinkWindow.java @@ -14,7 +14,6 @@ import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JTextArea; -import org.apache.log4j.Logger; import org.openslx.dozmod.Branding; import org.openslx.dozmod.gui.Gui; import org.openslx.dozmod.gui.helper.GridManager; @@ -26,14 +25,16 @@ import org.openslx.dozmod.util.DesktopEnvironment.Link; /** * Class for showing window with button to open registration page in browser. */ -@SuppressWarnings("serial") public class BwIdmLinkWindow extends JDialog implements UiFeedback { + /** + * Version for serialization. + */ + private static final long serialVersionUID = 2120246234601011414L; + protected JButton btnLink; protected JButton OkButton; - private static final Logger LOGGER = Logger.getLogger(BwIdmLinkWindow.class); - /** * Don't use this, use static function open instead! */ diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/CheckUpdateWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/CheckUpdateWindow.java index b3c8ae05..b2a4edd1 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/CheckUpdateWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/CheckUpdateWindow.java @@ -4,7 +4,6 @@ import java.awt.Window; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import org.apache.log4j.Logger; import org.openslx.dozmod.gui.helper.UiFeedback; import org.openslx.dozmod.gui.window.layout.CheckUpdateWindowLayout; import org.openslx.dozmod.util.ClientVersion; @@ -12,10 +11,12 @@ import org.openslx.dozmod.util.FormatHelper; import org.openslx.dozmod.util.DesktopEnvironment; import org.openslx.dozmod.util.DesktopEnvironment.Link; -@SuppressWarnings("serial") public class CheckUpdateWindow extends CheckUpdateWindowLayout implements UiFeedback, ActionListener { - private final static Logger LOGGER = Logger.getLogger(CheckUpdateWindow.class); + /** + * Version for serialization. + */ + private static final long serialVersionUID = 3992160915138023046L; public CheckUpdateWindow(Window modalParent) { super(modalParent); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ConfigWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ConfigWindow.java index 15d26b92..6e94735d 100755 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ConfigWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ConfigWindow.java @@ -27,9 +27,13 @@ import org.openslx.dozmod.thrift.Session; import org.openslx.dozmod.thrift.ThriftError; import org.openslx.thrifthelper.ThriftManager; -@SuppressWarnings("serial") public class ConfigWindow extends ConfigWindowLayout implements UiFeedback, ActionListener { + /** + * Version for serialization. + */ + private static final long serialVersionUID = 1528773221604107054L; + private final static Logger LOGGER = Logger.getLogger(ConfigWindow.class); private SatelliteUserConfig userConfig = null; private JRadioButton selectedLookAndFeel = null; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ContainerBindMountWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ContainerBindMountWindow.java index e261d99a..77361f57 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ContainerBindMountWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ContainerBindMountWindow.java @@ -15,6 +15,11 @@ import java.util.List; public class ContainerBindMountWindow extends ContainerBindMountWindowLayout { + /** + * Version for serialization. + */ + private static final long serialVersionUID = -399726779412965808L; + private final ContainerBindMountTable bindMountTable; public ContainerBindMountWindow(Window modalParent, ContainerBindMountTable bindMountTable) { diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/DisclaimerWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/DisclaimerWindow.java index 2974773b..5307a871 100755 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/DisclaimerWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/DisclaimerWindow.java @@ -19,9 +19,13 @@ import org.openslx.dozmod.util.ResourceLoader; /** * Window for showing the disclaimer. */ -@SuppressWarnings("serial") public class DisclaimerWindow extends GenericNoticeWindow implements UiFeedback { + /** + * Version for serialization. + */ + private static final long serialVersionUID = 8479978304760663L; + private final static Logger LOGGER = Logger.getLogger(PrivacyNoticeWindow.class); final DisclaimerWindow me = this; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/GenericNoticeWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/GenericNoticeWindow.java index 09b22948..42f9758d 100755 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/GenericNoticeWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/GenericNoticeWindow.java @@ -21,9 +21,13 @@ import org.openslx.dozmod.gui.window.layout.GenericNoticeWindowLayout; /** * Window for showing the notice. */ -@SuppressWarnings("serial") public abstract class GenericNoticeWindow extends GenericNoticeWindowLayout implements UiFeedback { + /** + * Version for serialization. + */ + private static final long serialVersionUID = -3047119377363041283L; + final GenericNoticeWindow me = this; private final static Logger LOGGER = Logger.getLogger(GenericNoticeWindow.class); 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 d4cacc0c..fe342b36 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 @@ -1,7 +1,5 @@ package org.openslx.dozmod.gui.window; -import java.awt.*; -import java.awt.event.*; import java.awt.Color; import java.awt.Frame; import java.awt.event.ActionEvent; @@ -42,9 +40,6 @@ import org.openslx.dozmod.gui.window.UserListWindow.UserAddedCallback; import org.openslx.dozmod.gui.window.layout.ImageDetailsWindowLayout; import org.openslx.dozmod.gui.wizard.ImageUpdateWizard; import org.openslx.dozmod.gui.wizard.LectureWizard; -import org.openslx.dozmod.model.ContainerBuildContextMethod; -import org.openslx.dozmod.model.ContainerDefinition; -import org.openslx.dozmod.model.ContainerMeta; import org.openslx.dozmod.permissions.ImagePerms; import org.openslx.dozmod.thrift.ImageDetailsActions; import org.openslx.dozmod.thrift.Session; @@ -66,19 +61,17 @@ import org.openslx.util.QuickTimer.Task; import org.openslx.util.ThriftUtil; import org.openslx.util.Util; -import javax.swing.*; -import java.awt.*; -import java.awt.event.*; -import java.nio.ByteBuffer; -import java.util.List; -import java.util.*; - /** * Window for displaying and editing the details of an image. */ -@SuppressWarnings("serial") public class ImageDetailsWindow extends ImageDetailsWindowLayout +public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFeedback { + /** + * Version for serialization. + */ + private static final long serialVersionUID = -1901954219828374015L; + private static final Logger LOGGER = Logger.getLogger(ImageDetailsWindow.class); /** @@ -264,6 +257,11 @@ import java.util.*; tblVersions.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT) .put(KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0), "delete"); tblVersions.getActionMap().put("delete", new AbstractAction() { + /** + * Version for serialization. + */ + private static final long serialVersionUID = -8997886497303940355L; + @Override public void actionPerformed(ActionEvent ae) { if (ImagePerms.canEdit(image)) { deleteVersions(tblVersions.getSelectedItems()); @@ -852,12 +850,14 @@ import java.util.*; * * ******************************************************************************* */ - @SuppressWarnings("deprecation") @Override public void show() { + @Override + public void setVisible(boolean visible) { if (!isVisible()) { pack(); MainWindow.centerShell(this); } - super.show(); + + super.setVisible(visible); } /* ******************************************************************************* diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageListWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageListWindow.java index 9167565a..b77e41e7 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageListWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageListWindow.java @@ -45,9 +45,13 @@ import org.openslx.util.QuickTimer.Task; * Window with the list of available images. * Has filters for the images and buttons to create, edit and delete buttons. */ -@SuppressWarnings("serial") public class ImageListWindow extends ImageListWindowLayout implements DownloadCallback, DeleteCallback { + /** + * Version for serialization. + */ + private static final long serialVersionUID = 84238230133246131L; + private final static Logger LOGGER = Logger.getLogger(ImageListWindow.class); /** @@ -219,6 +223,11 @@ public class ImageListWindow extends ImageListWindowLayout implements DownloadCa imageTable.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put( KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), "details"); imageTable.getActionMap().put("details", new AbstractAction() { + /** + * Version for serialization. + */ + private static final long serialVersionUID = -256047309950408854L; + @Override public void actionPerformed(ActionEvent ae) { btnEditDetails.doClick(); @@ -227,6 +236,11 @@ public class ImageListWindow extends ImageListWindowLayout implements DownloadCa imageTable.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put( KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0), "delete"); imageTable.getActionMap().put("delete", new AbstractAction() { + /** + * Version for serialization. + */ + private static final long serialVersionUID = -4869941709769159250L; + @Override public void actionPerformed(ActionEvent ae) { btnDelete.doClick(); 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 079329c7..a04d09c9 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 @@ -50,9 +50,13 @@ import org.openslx.thrifthelper.ThriftManager; import org.openslx.util.QuickTimer; import org.openslx.util.QuickTimer.Task; -@SuppressWarnings("serial") public class ImagePublishedWindow extends ImagePublishedWindowLayout implements UiFeedback, DownloadCallback { + /** + * Version for serialization. + */ + private static final long serialVersionUID = 7455819819182519090L; + private final static Logger LOGGER = Logger.getLogger(ImagePublishedWindow.class); private final ImagePublishedWindow me = this; @@ -298,14 +302,14 @@ public class ImagePublishedWindow extends ImagePublishedWindowLayout implements * ************************************************************************** * ***** */ - @SuppressWarnings("deprecation") @Override - public void show() { + public void setVisible(boolean visible) { if (!isVisible()) { pack(); MainWindow.centerShell(this); } - super.show(); + + super.setVisible(visible); } @Override diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureChangeImage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureChangeImage.java index 41532b6f..2980b03c 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureChangeImage.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureChangeImage.java @@ -28,9 +28,13 @@ import org.openslx.dozmod.permissions.ImagePerms; /** * Window for changing the linked image of a lecture */ -@SuppressWarnings("serial") public class LectureChangeImage extends LectureChangeImageLayout implements UiFeedback, GenericControlWindow<ImageSummaryRead> { + /** + * Version for serialization. + */ + private static final long serialVersionUID = 3558697767037191501L; + private static final Logger LOGGER = Logger.getLogger(LectureChangeImage.class); private boolean okUsed = false; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java index cb242092..6825d644 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java @@ -65,9 +65,13 @@ import org.openslx.thrifthelper.ThriftManager; /** * Window to display and edit the details of a lecture */ -@SuppressWarnings("serial") public class LectureDetailsWindow extends LectureDetailsWindowLayout implements UiFeedback { + /** + * Version for serialization. + */ + private static final long serialVersionUID = -2190481933307215137L; + private static final Logger LOGGER = Logger.getLogger(LectureDetailsWindow.class); /** @@ -674,14 +678,14 @@ public class LectureDetailsWindow extends LectureDetailsWindowLayout implements win.setVisible(true); } - @SuppressWarnings("deprecation") @Override - public void show() { + public void setVisible(boolean visible) { if (!isVisible()) { pack(); MainWindow.centerShell(this); } - super.show(); + + super.setVisible(visible); } /* diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureListWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureListWindow.java index ff1a3635..e45fcac8 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureListWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureListWindow.java @@ -57,9 +57,13 @@ import org.openslx.util.Util; * Window for displaying a table with the available lectures. * Lectures can be created and deleted here. */ -@SuppressWarnings("serial") public class LectureListWindow extends LectureListWindowLayout { + /** + * Version for serialization. + */ + private static final long serialVersionUID = 3135935034893934652L; + private final static Logger LOGGER = Logger.getLogger(LectureListWindow.class); public final LectureListWindow me = this; @@ -352,6 +356,11 @@ public class LectureListWindow extends LectureListWindowLayout { tblLectures.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put( KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), "details"); tblLectures.getActionMap().put("details", new AbstractAction() { + /** + * Version for serialization. + */ + private static final long serialVersionUID = -5308046358988793018L; + @Override public void actionPerformed(ActionEvent ae) { btnEditLecture.doClick(); @@ -360,6 +369,11 @@ public class LectureListWindow extends LectureListWindowLayout { tblLectures.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put( KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0), "delete"); tblLectures.getActionMap().put("delete", new AbstractAction() { + /** + * Version for serialization. + */ + private static final long serialVersionUID = 7494603320083796245L; + @Override public void actionPerformed(ActionEvent ae) { btnDeleteLecture.doClick(); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java index 94ee10e4..ba91b0f0 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java @@ -56,9 +56,13 @@ import edu.kit.scc.dei.ecplean.ECPAuthenticationException; * @author Jonathan Bauer * */ -@SuppressWarnings("serial") public class LoginWindow extends LoginWindowLayout { + /** + * Version for serialization. + */ + private static final long serialVersionUID = 3826201134186162076L; + private final static Logger LOGGER = Logger.getLogger(LoginWindow.class); public static enum LoginType { @@ -179,6 +183,11 @@ public class LoginWindow extends LoginWindowLayout { pnlLoginForm.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put( KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), "login"); pnlLoginForm.getActionMap().put("login", new AbstractAction() { + /** + * + */ + private static final long serialVersionUID = 5794599288256601257L; + @Override public void actionPerformed(ActionEvent ae) { btnLogin.doClick(); @@ -474,14 +483,14 @@ public class LoginWindow extends LoginWindowLayout { } } - @SuppressWarnings("deprecation") @Override - public void show() { + public void setVisible(boolean visible) { if (!isVisible()) { pack(); MainWindow.centerShell(this); } - super.show(); + + super.setVisible(visible); } /** diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/MainMenuWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/MainMenuWindow.java index 32a9cd9e..2362f092 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/MainMenuWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/MainMenuWindow.java @@ -7,9 +7,13 @@ import org.openslx.dozmod.gui.MainWindow; import org.openslx.dozmod.gui.window.layout.MainMenuWindowLayout; import org.openslx.dozmod.thrift.Session; -@SuppressWarnings("serial") public class MainMenuWindow extends MainMenuWindowLayout { + /** + * Version for serialization. + */ + private static final long serialVersionUID = 1386462978086690536L; + public MainMenuWindow() { super(); // function for vmButton diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/PrivacyNoticeWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/PrivacyNoticeWindow.java index 3743664a..03a4c790 100755 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/PrivacyNoticeWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/PrivacyNoticeWindow.java @@ -19,9 +19,13 @@ import org.openslx.dozmod.util.ResourceLoader; /** * Window for showing the privacy notice. */ -@SuppressWarnings("serial") public class PrivacyNoticeWindow extends GenericNoticeWindow implements UiFeedback { + /** + * Version for serialization. + */ + private static final long serialVersionUID = -7356663101779860276L; + private final static Logger LOGGER = Logger.getLogger(PrivacyNoticeWindow.class); final PrivacyNoticeWindow me = this; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/SatelliteListWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/SatelliteListWindow.java index 2674dc9a..147d8ef3 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/SatelliteListWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/SatelliteListWindow.java @@ -25,9 +25,13 @@ import org.openslx.dozmod.gui.window.layout.SatelliteListWindowLayout; /** * Window for selecting an available satellite or setting custom ip. */ -@SuppressWarnings("serial") public class SatelliteListWindow extends SatelliteListWindowLayout implements UiFeedback { + /** + * Version for serialization. + */ + private static final long serialVersionUID = 6027458429250953184L; + private Satellite satellite = null; public interface UserAddedCallback { diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/UserListWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/UserListWindow.java index fb1c5c1a..0747b3bf 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/UserListWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/UserListWindow.java @@ -15,7 +15,6 @@ import javax.swing.JTable; import javax.swing.RowFilter; import javax.swing.UIManager; -import org.apache.log4j.Logger; import org.openslx.bwlp.thrift.iface.UserInfo; import org.openslx.dozmod.gui.Gui; import org.openslx.dozmod.gui.helper.TextChangeListener; @@ -25,10 +24,12 @@ import org.openslx.dozmod.thrift.cache.UserCache; import org.openslx.util.QuickTimer; import org.openslx.util.QuickTimer.Task; -@SuppressWarnings("serial") public class UserListWindow extends UserListWindowLayout implements UiFeedback { - private final static Logger LOGGER = Logger.getLogger(UserListWindow.class); + /** + * Version for serialization. + */ + private static final long serialVersionUID = -5435541037590985436L; private final UserListWindow me = this; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtConfigEditorWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtConfigEditorWindow.java index 8ea5372b..3a29e3b3 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtConfigEditorWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtConfigEditorWindow.java @@ -28,9 +28,13 @@ import org.openslx.vm.VboxMetaData; import org.openslx.vm.VmMetaData; import org.openslx.vm.VmwareConfig; -@SuppressWarnings("serial") public class VirtConfigEditorWindow extends VirtConfigEditorWindowLayout implements UiFeedback { + /** + * Version for serialization. + */ + private static final long serialVersionUID = 8416526255408870346L; + private final static Logger LOGGER = Logger.getLogger(VirtConfigEditorWindow.class); public interface VirtConfigChanged { diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtDropDownConfigEditorWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtDropDownConfigEditorWindow.java index 200a9f0e..b44cc764 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtDropDownConfigEditorWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtDropDownConfigEditorWindow.java @@ -28,10 +28,14 @@ import org.openslx.vm.VmMetaData.HWVersion; import org.openslx.vm.VmMetaData.SoundCardType; import org.openslx.vm.VmMetaData.UsbSpeed; -@SuppressWarnings("serial") public class VirtDropDownConfigEditorWindow extends VirtDropDownConfigEditorWindowLayout implements UiFeedback { + /** + * Version for serialization. + */ + private static final long serialVersionUID = 230794205942072411L; + private final static Logger LOGGER = Logger.getLogger(VirtDropDownConfigEditorWindow.class); public interface VirtConfigChanged { diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/CheckUpdateWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/CheckUpdateWindowLayout.java index 017194b5..40b6fc62 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/CheckUpdateWindowLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/CheckUpdateWindowLayout.java @@ -17,9 +17,13 @@ import org.openslx.dozmod.gui.control.QLabel; import org.openslx.dozmod.gui.helper.GridManager; import org.openslx.dozmod.gui.helper.I18n; -@SuppressWarnings("serial") public abstract class CheckUpdateWindowLayout extends JDialog { + /** + * Version for serialization. + */ + private static final long serialVersionUID = 324711636079341890L; + protected static JButton btnLink; protected static JButton btnClose; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ConfigWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ConfigWindowLayout.java index 69ad002c..8254cda2 100755 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ConfigWindowLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ConfigWindowLayout.java @@ -9,7 +9,6 @@ import javax.swing.UIManager.LookAndFeelInfo; import org.openslx.dozmod.Branding; import org.openslx.dozmod.Config; -import org.openslx.dozmod.gui.Gui; import org.openslx.dozmod.gui.control.ComboBox; import org.openslx.dozmod.gui.control.QLabel; import org.openslx.dozmod.gui.control.WordWrapLabel; @@ -17,9 +16,13 @@ import org.openslx.dozmod.gui.helper.GridManager; import org.openslx.dozmod.gui.helper.I18n; import org.openslx.dozmod.gui.helper.Language; -@SuppressWarnings("serial") public class ConfigWindowLayout extends JDialog { + /** + * Version for serialization. + */ + private static final long serialVersionUID = -9134937794208526938L; + protected final JRadioButton btnProxyNone; protected final JRadioButton btnProxyAuto; protected final JRadioButton btnProxySocks = null; @@ -150,12 +153,12 @@ public class ConfigWindowLayout extends JDialog { false, true)) .fill(true, false) .expand(true, false); - cboLanguage = new ComboBox<>(new ComboBox.ComboBoxRenderer<Language>() { + cboLanguage = new ComboBox<Language>(new ComboBox.ComboBoxRenderer<Language>() { @Override public String renderItem(Language item) { return item.displayName; } - }); + }, Language.class); cboLanguage.setModel(new DefaultComboBoxModel<>(Language.values())); grid.add(cboLanguage).fill(true, false).expand(true, false); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ContainerBindMountWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ContainerBindMountWindowLayout.java index 54befd60..6f6a3cfe 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ContainerBindMountWindowLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ContainerBindMountWindowLayout.java @@ -11,6 +11,11 @@ import java.awt.*; public class ContainerBindMountWindowLayout extends JDialog { + /** + * Version for serialization. + */ + private static final long serialVersionUID = -4410299500877608736L; + private static final String title = "Add Bind Mount"; protected final StatusHeader header; @@ -28,14 +33,14 @@ public class ContainerBindMountWindowLayout extends JDialog { protected static String[] SOURCE_MOUNT_POINTS = { EMPTY_MARKER, TAGS[0], TAGS[1], "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z" }; - protected final ComboBox<String> cboSourceMountPoint = new ComboBox<>( + protected final ComboBox<String> cboSourceMountPoint = new ComboBox<String>( new ComboBox.ComboBoxRenderer<String>() { @Override public String renderItem(String letter) { if (letter == null) return null; return letter; } - }); + }, String.class); public ContainerBindMountWindowLayout(Window modalParent) { super(modalParent, title, ModalityType.APPLICATION_MODAL); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/GenericNoticeWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/GenericNoticeWindowLayout.java index 9bbce4f1..2297256e 100755 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/GenericNoticeWindowLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/GenericNoticeWindowLayout.java @@ -19,9 +19,13 @@ import org.openslx.dozmod.gui.control.QLabel; import org.openslx.dozmod.gui.helper.GridManager; import org.openslx.dozmod.gui.helper.I18n; -@SuppressWarnings("serial") public abstract class GenericNoticeWindowLayout extends JDialog { + /** + * Version for serialization. + */ + private static final long serialVersionUID = 265942744790417984L; + protected String info = I18n.WINDOW_LAYOUT.getString("GenericNotice.Label.noticePanel.text"); protected JTextArea notice; protected JScrollPane disclaimerPanel; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageDetailsWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageDetailsWindowLayout.java index 64e2ddf5..f1a4d4c6 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageDetailsWindowLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageDetailsWindowLayout.java @@ -14,13 +14,11 @@ import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.JTabbedPane; -import javax.swing.JTextArea; import javax.swing.JTextField; import org.openslx.bwlp.thrift.iface.OperatingSystem; import org.openslx.bwlp.thrift.iface.ShareMode; import org.openslx.dozmod.gui.Gui; -import org.openslx.dozmod.gui.configurator.ContainerBindMountConfigurator; import org.openslx.dozmod.gui.configurator.ImagePermissionConfigurator; import org.openslx.dozmod.gui.control.ComboBox; import org.openslx.dozmod.gui.control.ComboBox.ComboBoxRenderer; @@ -33,16 +31,18 @@ import org.openslx.dozmod.gui.helper.I18n; import org.openslx.dozmod.gui.panel.ContainerPanel; import org.openslx.thrifthelper.Comparators; -import javax.swing.*; -import java.awt.*; +public abstract class ImageDetailsWindowLayout extends JDialog { -@SuppressWarnings("serial") public abstract class ImageDetailsWindowLayout extends JDialog { + /** + * Version for serialization. + */ + private static final long serialVersionUID = -4081946551542794079L; private static final int ICON_SIZE_Y = 24; - private final String TAB_OVERVIEW_TITEL = I18n.WINDOW_LAYOUT.getString("ImageDetails.Tab.overview.title"); - private final String TAB_VERSIONS_TITEL = I18n.WINDOW_LAYOUT.getString("ImageDetails.Tab.versions.title"); - private final String TAB_PERMISSIONS_TITEL = I18n.WINDOW_LAYOUT.getString("ImageDetails.Tab.permissions.title"); + // private final String TAB_OVERVIEW_TITEL = I18n.WINDOW_LAYOUT.getString("ImageDetails.Tab.overview.title"); + // private final String TAB_VERSIONS_TITEL = I18n.WINDOW_LAYOUT.getString("ImageDetails.Tab.versions.title"); + // private final String TAB_PERMISSIONS_TITEL = I18n.WINDOW_LAYOUT.getString("ImageDetails.Tab.permissions.title"); protected final JTextField txtTitle; protected final JEditorPane txtDescription; @@ -151,7 +151,7 @@ import java.awt.*; return null; return item.getOsName(); } - }); + }, OperatingSystem.class); cboOperatingSystem.setEditable(false); grid.add(new QLabel(I18n.WINDOW_LAYOUT.getString("ImageDetails.Label.OS.text"))); @@ -168,7 +168,7 @@ import java.awt.*; return "null"; return item.name(); } - }); + }, ShareMode.class); grid.add(new QLabel(I18n.WINDOW_LAYOUT.getString("ImageDetails.Label.shareMode.text"))); grid.add(cboShareMode, 2).expand(true, false).fill(true, false); grid.nextRow(); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageListWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageListWindowLayout.java index 67ed8ec9..b8ccc9a9 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageListWindowLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageListWindowLayout.java @@ -9,7 +9,6 @@ import javax.swing.BoxLayout; import javax.swing.JButton; import javax.swing.JPanel; -import org.apache.log4j.Logger; import org.openslx.dozmod.gui.Gui; import org.openslx.dozmod.gui.control.ImageListViewer; import org.openslx.dozmod.gui.control.ImageListViewer.FilterType; @@ -18,13 +17,15 @@ import org.openslx.dozmod.gui.helper.CompositePage; import org.openslx.dozmod.gui.helper.GridManager; import org.openslx.dozmod.gui.helper.I18n; -@SuppressWarnings("serial") public abstract class ImageListWindowLayout extends CompositePage { - private final static Logger LOGGER = Logger.getLogger(ImageListWindowLayout.class); + /** + * Version for serialization. + */ + private static final long serialVersionUID = 2558709606798079473L; private static final int ICON_SIZE_Y = 24; - private final ImageListWindowLayout me = this; + protected final static String infoTextString = I18n.WINDOW_LAYOUT.getString("ImageList.Label.title.text"); protected final static String infoTitleString = I18n.WINDOW_LAYOUT.getString("ImageList.Label.info.text"); protected final static String newButtonLabel = I18n.WINDOW_LAYOUT.getString("ImageList.Button.newVM.text"); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImagePublishedWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImagePublishedWindowLayout.java index 61dbf613..6f3a844e 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImagePublishedWindowLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImagePublishedWindowLayout.java @@ -18,9 +18,13 @@ import org.openslx.dozmod.gui.control.table.QScrollPane; import org.openslx.dozmod.gui.helper.GridManager; import org.openslx.dozmod.gui.helper.I18n; -@SuppressWarnings("serial") public class ImagePublishedWindowLayout extends JDialog { + /** + * Version for serialization. + */ + private static final long serialVersionUID = -4597001188534939501L; + protected final ImagePublishedTable imagePublishedTable; private static final int ICON_SIZE_Y = 24; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureChangeImageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureChangeImageLayout.java index a9948308..3b844c7b 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureChangeImageLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureChangeImageLayout.java @@ -9,7 +9,6 @@ import javax.swing.JButton; import javax.swing.JDialog; import javax.swing.JPanel; -import org.apache.log4j.Logger; import org.openslx.dozmod.gui.Gui; import org.openslx.dozmod.gui.control.ImageListViewer; import org.openslx.dozmod.gui.control.ImageListViewer.FilterType; @@ -19,10 +18,12 @@ import org.openslx.dozmod.gui.helper.I18n; /** * Layout for the ChangeLinkedImage of a lecture */ -@SuppressWarnings("serial") public class LectureChangeImageLayout extends JDialog { - private static final Logger LOGGER = Logger.getLogger(LectureChangeImageLayout.class); + /** + * Version for serialization. + */ + private static final long serialVersionUID = 6936071150564605388L; /** * Buttons 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 ff8b4d54..cfc1b581 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 @@ -2,22 +2,17 @@ package org.openslx.dozmod.gui.window.layout; import java.awt.BorderLayout; import java.awt.Color; -import java.awt.Dimension; import java.awt.Font; import java.awt.Frame; import java.awt.GridBagConstraints; import java.awt.Insets; import java.util.Calendar; -import java.awt.GridLayout; -import java.awt.FlowLayout; import javax.swing.BorderFactory; import javax.swing.Box; import javax.swing.BoxLayout; -import javax.swing.GroupLayout; import javax.swing.JButton; import javax.swing.JCheckBox; -import javax.swing.JComboBox; import javax.swing.JDialog; import javax.swing.JEditorPane; import javax.swing.JFrame; @@ -25,12 +20,9 @@ import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.JSpinner; import javax.swing.JTabbedPane; -import javax.swing.JTextArea; import javax.swing.JTextField; import javax.swing.SpinnerDateModel; import javax.swing.text.DateFormatter; -import javax.swing.text.StyledEditorKit; -import javax.swing.text.html.HTMLEditorKit; import org.jdatepicker.JDatePicker; import org.openslx.bwlp.thrift.iface.ImageVersionDetails; @@ -53,9 +45,13 @@ import org.openslx.dozmod.util.FormatHelper; import org.openslx.sat.thrift.version.Feature; import org.openslx.thrifthelper.Comparators; -@SuppressWarnings("serial") public abstract class LectureDetailsWindowLayout extends JDialog { + /** + * Version for serialization. + */ + private static final long serialVersionUID = -8773468375105202314L; + // stuff ending in '...Info' are supposed to be the read-only labels for the information tab protected final QLabel lblTitleInfo; protected final JTextField txtTitle; @@ -225,7 +221,7 @@ public abstract class LectureDetailsWindowLayout extends JDialog { // auto update chkAutoUpdate = new JCheckBox(I18n.WINDOW_LAYOUT.getString("LectureDetails.CheckBox.autoUpdate.text")); // versions combo - cboVersions = new ComboBox<>(Comparators.imageVersionDetails, + cboVersions = new ComboBox<ImageVersionDetails>(Comparators.imageVersionDetails, new ComboBoxRenderer<ImageVersionDetails>() { @Override public String renderItem(ImageVersionDetails item) { @@ -238,7 +234,7 @@ public abstract class LectureDetailsWindowLayout extends JDialog { + I18n.WINDOW_LAYOUT.getString("LectureDetails.ComboBox.versionInvalid.text"); } } - }); + }, ImageVersionDetails.class); btnDownloadImage = new JButton(I18n.WINDOW_LAYOUT.getString("LectureDetails.Button.downloadImage.text")); btnDownloadImage.setToolTipText( I18n.WINDOW_LAYOUT.getString("LectureDetails.Button.downloadImage.toolTipText")); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureListWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureListWindowLayout.java index 42fb8a2a..088dd288 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureListWindowLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureListWindowLayout.java @@ -16,9 +16,13 @@ import org.openslx.dozmod.gui.helper.GridManager; import org.openslx.dozmod.gui.helper.I18n; import org.openslx.dozmod.gui.window.LectureListWindow.FilterType; -@SuppressWarnings("serial") public abstract class LectureListWindowLayout extends CompositePage { + /** + * Version for serialization. + */ + private static final long serialVersionUID = 5844801627900076060L; + private static final int ICON_SIZE_Y = 24; // buttons diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java index 0486c616..d68ebba4 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java @@ -29,9 +29,13 @@ import org.openslx.dozmod.gui.helper.GridManager; import org.openslx.dozmod.gui.helper.I18n; import org.openslx.dozmod.util.ResourceLoader; -@SuppressWarnings("serial") public abstract class LoginWindowLayout extends JDialog { + /** + * Version for serialization. + */ + private static final long serialVersionUID = 4666636501698824636L; + private static final Logger LOGGER = Logger.getLogger(LoginWindowLayout.class); // TODO This has nothing to to with the layout @@ -92,7 +96,7 @@ public abstract class LoginWindowLayout extends JDialog { btnSettings = new JButton(I18n.WINDOW_LAYOUT.getString("Login.Button.settings.text")); btnLogDir = new JButton(I18n.WINDOW_LAYOUT.getString("Login.Button.logDir.text")); - cboOrganization = new ComboBox<>(new ComboBoxRenderer<Organization>() { + cboOrganization = new ComboBox<Organization>(new ComboBoxRenderer<Organization>() { @Override public String renderItem(Organization item) { if (item == null) @@ -104,7 +108,7 @@ public abstract class LoginWindowLayout extends JDialog { public String getEmptyText() { return I18n.WINDOW_LAYOUT.getString("Login.ComboBox.organization.emptyText"); } - }); + }, Organization.class); txtUsername = new JTextField(); txtPassword = new JPasswordField(); btnLogin = new JButton(I18n.WINDOW_LAYOUT.getString("Login.Button.login.text")); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/MainMenuWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/MainMenuWindowLayout.java index 8448659e..77593f07 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/MainMenuWindowLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/MainMenuWindowLayout.java @@ -10,8 +10,12 @@ import org.openslx.dozmod.gui.helper.GridManager; import org.openslx.dozmod.gui.helper.I18n; import org.openslx.dozmod.util.ResourceLoader; -@SuppressWarnings("serial") public abstract class MainMenuWindowLayout extends CompositePage { + /** + * Version for serialization. + */ + private static final long serialVersionUID = 2556140124575460640L; + // text for info for the vms selection protected String vmInfo = I18n.WINDOW_LAYOUT.getString("MainMenu.Label.vmInfo.text"); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/SatelliteListWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/SatelliteListWindowLayout.java index 457c39d3..719be3b1 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/SatelliteListWindowLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/SatelliteListWindowLayout.java @@ -21,9 +21,13 @@ import org.openslx.bwlp.thrift.iface.Satellite; import org.openslx.dozmod.gui.helper.GridManager; import org.openslx.dozmod.gui.helper.I18n; -@SuppressWarnings("serial") public class SatelliteListWindowLayout extends JDialog { + /** + * Version for serialization. + */ + private static final long serialVersionUID = -1845521445853597611L; + protected final JButton btnCancel; protected final JButton btnContinue; protected final JTextField txtCustomAddress; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/UserListWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/UserListWindowLayout.java index c82791d7..bc4144c2 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/UserListWindowLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/UserListWindowLayout.java @@ -19,9 +19,13 @@ import org.openslx.dozmod.gui.control.table.UserTable; import org.openslx.dozmod.gui.helper.GridManager; import org.openslx.dozmod.gui.helper.I18n; -@SuppressWarnings("serial") public class UserListWindowLayout extends JDialog { + /** + * Version for serialization. + */ + private static final long serialVersionUID = -6131494019684066983L; + protected final UserTable userTable; protected final JButton btnConfirm; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtConfigEditorWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtConfigEditorWindowLayout.java index cfa25564..3fae7491 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtConfigEditorWindowLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtConfigEditorWindowLayout.java @@ -18,9 +18,13 @@ import org.openslx.dozmod.gui.Gui; import org.openslx.dozmod.gui.helper.GridManager; import org.openslx.dozmod.gui.helper.I18n; -@SuppressWarnings("serial") public class VirtConfigEditorWindowLayout extends JDialog { + /** + * Version for serialization. + */ + private static final long serialVersionUID = -3112360263218578977L; + protected final JScrollPane pnlScrollPane; protected final JEditorPane pnlEditor; protected final JButton btnSave; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtDropDownConfigEditorWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtDropDownConfigEditorWindowLayout.java index bddf759e..a566f158 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtDropDownConfigEditorWindowLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtDropDownConfigEditorWindowLayout.java @@ -31,9 +31,13 @@ import org.openslx.vm.VmMetaData.HWVersion; import org.openslx.vm.VmMetaData.SoundCardType; import org.openslx.vm.VmMetaData.UsbSpeed; -@SuppressWarnings("serial") public class VirtDropDownConfigEditorWindowLayout extends JDialog { + /** + * Version for serialization. + */ + private static final long serialVersionUID = -8808628177189132030L; + protected final JScrollPane pnlScrollPane; protected final JEditorPane pnlEditor; protected final JButton btnSave; @@ -66,43 +70,43 @@ public class VirtDropDownConfigEditorWindowLayout extends JDialog { * ComboBoxes - one for each device */ - cboSound = new ComboBox<>(new ComboBoxRenderer<SoundCardType>() { + cboSound = new ComboBox<SoundCardType>(new ComboBoxRenderer<SoundCardType>() { @Override public String renderItem(SoundCardType item) { return item.displayName; } - }); + }, SoundCardType.class); // 3D accelerationBox - cbo3DAcceleration = new ComboBox<>(new ComboBoxRenderer<DDAcceleration>() { + cbo3DAcceleration = new ComboBox<DDAcceleration>(new ComboBoxRenderer<DDAcceleration>() { @Override public String renderItem(DDAcceleration item) { return item.displayName; } - }); + }, DDAcceleration.class); // HardwareVersioBox - cboHWVersion = new ComboBox<>(new ComboBoxRenderer<HWVersion>() { + cboHWVersion = new ComboBox<HWVersion>(new ComboBoxRenderer<HWVersion>() { @Override public String renderItem(HWVersion item) { return item.displayName; } - }); + }, HWVersion.class); // HardwareVersioBox - cboE0VirtDev = new ComboBox<>(new ComboBoxRenderer<EthernetDevType>() { + cboE0VirtDev = new ComboBox<EthernetDevType>(new ComboBoxRenderer<EthernetDevType>() { @Override public String renderItem(EthernetDevType item) { return item.displayName; } - }); + }, EthernetDevType.class); - cboMaxUsbSpeed = new ComboBox<>(new ComboBoxRenderer<UsbSpeed>() { + cboMaxUsbSpeed = new ComboBox<UsbSpeed>(new ComboBoxRenderer<UsbSpeed>() { @Override public String renderItem(UsbSpeed item) { return item.displayName; } - }); + }, UsbSpeed.class); pnlEditor = new JEditorPane("text/plain", null); pnlScrollPane = new JScrollPane(pnlEditor, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, 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 1a972b46..55ef788b 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 @@ -24,9 +24,14 @@ import java.awt.*; import java.util.ArrayList; import java.util.List; -@SuppressWarnings("serial") public class ImageCreationWizard extends Wizard +public class ImageCreationWizard extends Wizard implements UiFeedback, QuitNotification { + /** + * Version for serialization. + */ + private static final long serialVersionUID = -353405234601306343L; + private final static Logger LOGGER = Logger.getLogger(ImageCreationWizard.class); private final UploadWizardState state = new UploadWizardState(); 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 56624820..d05b02b5 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 @@ -22,9 +22,13 @@ import org.openslx.thrifthelper.TConst; import org.openslx.util.QuickTimer; import org.openslx.util.QuickTimer.Task; -@SuppressWarnings("serial") public class ImageUpdateWizard extends Wizard implements UiFeedback, QuitNotification { + /** + * Version for serialization. + */ + private static final long serialVersionUID = -584900619809829672L; + private final static Logger LOGGER = Logger.getLogger(ImageCreationWizard.class); private final UploadWizardState state = new UploadWizardState(); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/LectureWizard.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/LectureWizard.java index a5b235a9..86ae6dad 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/LectureWizard.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/LectureWizard.java @@ -24,9 +24,13 @@ import org.openslx.dozmod.thrift.ThriftActions; import org.openslx.dozmod.thrift.cache.LectureCache; import org.openslx.dozmod.thrift.cache.MetaDataCache; -@SuppressWarnings("serial") public class LectureWizard extends Wizard implements UiFeedback { + /** + * Version for serialization. + */ + private static final long serialVersionUID = -7447355922540362345L; + private final static Logger LOGGER = Logger.getLogger(LectureWizard.class); public final LectureWizardState state = new LectureWizardState(); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/Wizard.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/Wizard.java index 35a4ddad..3c5e27ba 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/Wizard.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/Wizard.java @@ -13,7 +13,12 @@ import java.awt.event.WindowEvent; import java.util.ArrayList; import java.util.List; -@SuppressWarnings("serial") public abstract class Wizard extends JDialog { +public abstract class Wizard extends JDialog { + + /** + * Version for serialization. + */ + private static final long serialVersionUID = 1436816291272809418L; private final StatusHeader header; private final List<WizardPage> pages = new ArrayList<>(); @@ -94,15 +99,19 @@ import java.util.List; }); } - @SuppressWarnings("deprecation") @Override public void show() { - if (needsLayout) { - needsLayout = false; - pack(); - if (!pages.isEmpty()) { - showPage(0); + @Override + public void setVisible(boolean visible) { + if (visible) { + if (needsLayout) { + needsLayout = false; + pack(); + if (!pages.isEmpty()) { + showPage(0); + } } } - super.show(); + + super.setVisible(visible); } protected void showPage(int index) { diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/WizardPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/WizardPage.java index b8be827a..48f171d0 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/WizardPage.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/WizardPage.java @@ -7,9 +7,13 @@ import javax.swing.Icon; import javax.swing.JPanel; import javax.swing.UIManager; -@SuppressWarnings("serial") public abstract class WizardPage extends JPanel { + /** + * Version for serialization. + */ + private static final long serialVersionUID = 5899883467618546096L; + private static final Color WARNING_COLOR = new Color(200, 100, 0); private final String title; 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 d4d253ab..ada3324a 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 @@ -13,6 +13,11 @@ import java.awt.event.KeyEvent; public class ContainerUploadPageLayout extends WizardPage { + /** + * Version for serialization. + */ + private static final long serialVersionUID = -6361748362199780290L; + protected final JTextField txtImageName; protected final JButton btnBrowseForImage; protected final JTextField txtImageFile; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageCustomPermissionPageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageCustomPermissionPageLayout.java index c4e94f88..15adf000 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageCustomPermissionPageLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageCustomPermissionPageLayout.java @@ -14,9 +14,13 @@ import org.openslx.dozmod.gui.helper.I18n; import org.openslx.dozmod.gui.wizard.Wizard; import org.openslx.dozmod.gui.wizard.WizardPage; -@SuppressWarnings("serial") public class ImageCustomPermissionPageLayout extends WizardPage { + /** + * Version for serialization. + */ + private static final long serialVersionUID = -1928592541187476973L; + protected ImagePermissionConfigurator imageCustomPermissionManager; // permissions checks 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 862712ea..f607e3da 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 @@ -13,7 +13,12 @@ import org.openslx.thrifthelper.Comparators; import javax.swing.*; -@SuppressWarnings("serial") public abstract class ImageMetaDataPageLayout extends WizardPage { +public abstract class ImageMetaDataPageLayout extends WizardPage { + + /** + * Version for serialization. + */ + private static final long serialVersionUID = -6627630305879774283L; protected final QLabel lblOperatingSystem; protected final JComboBox<OperatingSystem> cboOperatingSystem; @@ -36,14 +41,14 @@ import javax.swing.*; GridManager grid = new GridManager(this, 2, false); lblOperatingSystem = new QLabel(I18n.PAGE_LAYOUT.getString("ImageMetaData.Label.OS.text")); - cboOperatingSystem = new ComboBox<>(Comparators.operatingSystem, + cboOperatingSystem = new ComboBox<OperatingSystem>(Comparators.operatingSystem, new ComboBoxRenderer<OperatingSystem>() { @Override public String renderItem(OperatingSystem item) { if (item == null) return null; return item.getOsName(); } - }); + }, OperatingSystem.class); cboOperatingSystem.setEditable(false); grid.add(lblOperatingSystem); grid.add(cboOperatingSystem); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageOvfConversionPageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageOvfConversionPageLayout.java index 7f42fd9d..bc5f820e 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageOvfConversionPageLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageOvfConversionPageLayout.java @@ -15,10 +15,14 @@ import org.openslx.dozmod.gui.helper.I18n; import org.openslx.dozmod.gui.wizard.Wizard; import org.openslx.dozmod.gui.wizard.WizardPage; -@SuppressWarnings("serial") public abstract class ImageOvfConversionPageLayout extends WizardPage { - public final JButton btnStartConversion; + /** + * Version for serialization. + */ + private static final long serialVersionUID = -7840405923937109563L; + + public final JButton btnStartConversion; protected final JTextArea txtInfoText; protected final JProgressBar conversionProgressBar; protected final JButton btnBrowseForOvftool; 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 c9f3bf34..8999e880 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 @@ -9,6 +9,11 @@ import javax.swing.*; public abstract class ImageTypePageLayout extends WizardPage { + /** + * Version for serialization. + */ + private static final long serialVersionUID = 2548125409461846482L; + protected final JTextArea txtInfoText; protected final JButton btnNewVmImage; protected final JButton btnNewDockerImage; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageUploadPageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageUploadPageLayout.java index ceb1ed58..33f12519 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageUploadPageLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageUploadPageLayout.java @@ -15,9 +15,13 @@ import org.openslx.dozmod.gui.helper.I18n; import org.openslx.dozmod.gui.wizard.Wizard; import org.openslx.dozmod.gui.wizard.WizardPage; -@SuppressWarnings("serial") public abstract class ImageUploadPageLayout extends WizardPage { + /** + * Version for serialization. + */ + private static final long serialVersionUID = 4242983732316327827L; + protected final JTextField txtImageName; protected final JButton btnBrowseForImage; protected final JTextField txtImageFile; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageUploadSummaryPageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageUploadSummaryPageLayout.java index 1781a1d9..46c6eb41 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageUploadSummaryPageLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageUploadSummaryPageLayout.java @@ -10,9 +10,13 @@ import org.openslx.dozmod.gui.helper.I18n; import org.openslx.dozmod.gui.wizard.Wizard; import org.openslx.dozmod.gui.wizard.WizardPage; -@SuppressWarnings("serial") public class ImageUploadSummaryPageLayout extends WizardPage { + /** + * Version for serialization. + */ + private static final long serialVersionUID = -8323690047540145725L; + protected final BlockProgressBar ctlUploadProgressBar; protected final JCheckBox chkCreateLecture; protected final JLabel lblHelpText; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureCreationPageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureCreationPageLayout.java index 1149a6c9..eee4f533 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureCreationPageLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureCreationPageLayout.java @@ -19,9 +19,13 @@ import org.openslx.dozmod.gui.wizard.WizardPage; import java.awt.Dimension; -@SuppressWarnings("serial") public abstract class LectureCreationPageLayout extends WizardPage { + /** + * Version for serialization. + */ + private static final long serialVersionUID = 422592252404059239L; + protected final JTextField txtName; protected final JEditorPane txtDescription; protected final QDatePickerImpl dtpStartDate; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureCustomPermissionPageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureCustomPermissionPageLayout.java index 0615fb0b..17f3d38c 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureCustomPermissionPageLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureCustomPermissionPageLayout.java @@ -14,9 +14,13 @@ import org.openslx.dozmod.gui.helper.I18n; import org.openslx.dozmod.gui.wizard.Wizard; import org.openslx.dozmod.gui.wizard.WizardPage; -@SuppressWarnings("serial") public abstract class LectureCustomPermissionPageLayout extends WizardPage { + /** + * Version for serialization. + */ + private static final long serialVersionUID = 7355993124602939971L; + protected LecturePermissionConfigurator lectureCustomPermissionManager; // permissions checks diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureImageListPageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureImageListPageLayout.java index ef7baf36..830b8770 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureImageListPageLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureImageListPageLayout.java @@ -7,9 +7,13 @@ import org.openslx.dozmod.gui.helper.I18n; import org.openslx.dozmod.gui.wizard.Wizard; import org.openslx.dozmod.gui.wizard.WizardPage; -@SuppressWarnings("serial") public abstract class LectureImageListPageLayout extends WizardPage { + /** + * Version for serialization. + */ + private static final long serialVersionUID = -4839648148827234593L; + protected final ImageListViewer ctlImageList; /** diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureLocationSelectionPageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureLocationSelectionPageLayout.java index bd86e86c..703d88e8 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureLocationSelectionPageLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureLocationSelectionPageLayout.java @@ -1,16 +1,17 @@ package org.openslx.dozmod.gui.wizard.layout; -import org.apache.log4j.Logger; import org.openslx.dozmod.gui.control.LocationSelector; import org.openslx.dozmod.gui.helper.GridManager; import org.openslx.dozmod.gui.helper.I18n; import org.openslx.dozmod.gui.wizard.Wizard; import org.openslx.dozmod.gui.wizard.WizardPage; -@SuppressWarnings("serial") public class LectureLocationSelectionPageLayout extends WizardPage { - private final static Logger LOGGER = Logger.getLogger(LectureLocationSelectionPageLayout.class); + /** + * Version for serialization. + */ + private static final long serialVersionUID = -5292483123910412285L; protected final LocationSelector ctlLocationSelector; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureOptionsPageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureOptionsPageLayout.java index 28c04d81..a758dae6 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureOptionsPageLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureOptionsPageLayout.java @@ -9,9 +9,13 @@ import org.openslx.dozmod.gui.helper.I18n; import org.openslx.dozmod.gui.wizard.Wizard; import org.openslx.dozmod.gui.wizard.WizardPage; -@SuppressWarnings("serial") public abstract class LectureOptionsPageLayout extends WizardPage { + /** + * Version for serialization. + */ + private static final long serialVersionUID = 6681810149647022738L; + protected static String title = I18n.PAGE_LAYOUT.getString("LectureOptions.WizardPage.title"); protected final JCheckBox chkUsbEnabled; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureRestrictionPageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureRestrictionPageLayout.java index 02e9d7b4..31ccaabf 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureRestrictionPageLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureRestrictionPageLayout.java @@ -4,9 +4,13 @@ import org.openslx.dozmod.gui.helper.I18n; import org.openslx.dozmod.gui.wizard.Wizard; import org.openslx.dozmod.gui.wizard.WizardPage; -@SuppressWarnings("serial") public class LectureRestrictionPageLayout extends WizardPage { + /** + * Version for serialization. + */ + private static final long serialVersionUID = 5529458984966765682L; + public LectureRestrictionPageLayout(Wizard wizard) { super(wizard, I18n.PAGE_LAYOUT.getString("LectureRestriction.WizardPage.title")); } diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ContainerUploadPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ContainerUploadPage.java index 1954db28..b16a9785 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ContainerUploadPage.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ContainerUploadPage.java @@ -40,6 +40,11 @@ public class ContainerUploadPage extends ContainerUploadPageLayout { // TODO: Add a Instruction for the new Container-Feature in bwLehrpool. // TODO: Add link to instructions for Docker-Intetragtion at https://www.bwlehrpool.de/doku.php + /** + * Version for serialization. + */ + private static final long serialVersionUID = 2564301984375080698L; + private final Logger LOGGER = Logger.getLogger(ContainerUploadPage.class); private final UploadWizardState state; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageCustomPermissionPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageCustomPermissionPage.java index c5d91f39..3a40cb35 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageCustomPermissionPage.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageCustomPermissionPage.java @@ -9,9 +9,13 @@ import org.openslx.dozmod.gui.wizard.layout.ImageCustomPermissionPageLayout; import org.openslx.dozmod.state.UploadWizardState; import org.openslx.dozmod.thrift.Session; -@SuppressWarnings("serial") public class ImageCustomPermissionPage extends ImageCustomPermissionPageLayout { + /** + * Version for serialization. + */ + private static final long serialVersionUID = -8809873730069813731L; + private final static Logger LOGGER = Logger.getLogger(ImageCustomPermissionPage.class); private boolean initDone = false; 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 19df525a..b767cbd4 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,6 +1,5 @@ package org.openslx.dozmod.gui.wizard.page; -import org.apache.log4j.Logger; import org.openslx.bwlp.thrift.iface.OperatingSystem; import org.openslx.bwlp.thrift.iface.ShareMode; import org.openslx.dozmod.gui.Gui; @@ -25,9 +24,12 @@ import java.util.List; /** * Page for setting the details of an image. */ -@SuppressWarnings("serial") public class ImageMetaDataPage extends ImageMetaDataPageLayout { +public class ImageMetaDataPage extends ImageMetaDataPageLayout { - private final static Logger LOGGER = Logger.getLogger(ImageMetaDataPage.class); + /** + * Version for serialization. + */ + private static final long serialVersionUID = -256817058595905373L; private UploadWizardState state; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageOvfConversionPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageOvfConversionPage.java index 774d6a6e..8caa4c51 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageOvfConversionPage.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageOvfConversionPage.java @@ -30,9 +30,13 @@ import org.openslx.dozmod.util.ConversionTaskWorker; * the new vmx image, starts the conversion SwingWorker and shows the progress. * Replaces the image description file in state after conversion. */ -@SuppressWarnings("serial") public class ImageOvfConversionPage extends ImageOvfConversionPageLayout { - private final static Logger LOGGER = Logger.getLogger(ImageOvfConversionPage.class); + /** + * Version for serialization. + */ + private static final long serialVersionUID = 464428060782110490L; + + private final static Logger LOGGER = Logger.getLogger(ImageOvfConversionPage.class); private UploadWizardState state; private ImageOvfConversionPage page; 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 219f3391..cd80a41e 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 @@ -8,6 +8,11 @@ import java.awt.event.ActionListener; public class ImageTypePage extends ImageTypePageLayout { + /** + * Version for serialization. + */ + private static final long serialVersionUID = 2211290890039619075L; + public ImageTypePage(final ImageCreationWizard wizard) { super(wizard); 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 68bcbd50..4f64f1e9 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 @@ -45,9 +45,13 @@ import org.openslx.vm.disk.DiskImageException; /** * Page for uploading a new image. */ -@SuppressWarnings("serial") public class ImageUploadPage extends ImageUploadPageLayout { + /** + * Version for serialization. + */ + private static final long serialVersionUID = -2974001512014608455L; + private final static Logger LOGGER = Logger.getLogger(ImageUploadPage.class); private UploadWizardState state; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadSummaryPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadSummaryPage.java index 73b158c0..fdd52efb 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadSummaryPage.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadSummaryPage.java @@ -20,9 +20,13 @@ import org.openslx.dozmod.thrift.UploadInitiator.UploadInitState; import org.openslx.dozmod.thrift.cache.ImageCache; import org.openslx.util.QuickTimer; -@SuppressWarnings("serial") public class ImageUploadSummaryPage extends ImageUploadSummaryPageLayout { + /** + * Version for serialization. + */ + private static final long serialVersionUID = -319910198640112507L; + private static final Logger LOGGER = Logger.getLogger(ImageUploadSummaryPage.class); private boolean pageIsVisible = false; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureCreationPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureCreationPage.java index ffa37134..261bb20f 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureCreationPage.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureCreationPage.java @@ -8,7 +8,6 @@ import java.util.Date; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; -import org.apache.log4j.Logger; import org.openslx.dozmod.gui.helper.DateTimeHelper; import org.openslx.dozmod.gui.helper.I18n; import org.openslx.dozmod.gui.helper.TextChangeListener; @@ -22,10 +21,12 @@ import org.openslx.dozmod.util.FormatHelper; * First page for creating a new lecture. * Used to set name, description and start- and endtime */ -@SuppressWarnings("serial") public class LectureCreationPage extends LectureCreationPageLayout { - private final static Logger LOGGER = Logger.getLogger(LectureCreationPage.class); + /** + * Version for serialization. + */ + private static final long serialVersionUID = 1632884502302543558L; private LectureWizardState state = null; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureCustomPermissionPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureCustomPermissionPage.java index 2d37238a..bcaa773e 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureCustomPermissionPage.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureCustomPermissionPage.java @@ -12,9 +12,13 @@ import org.openslx.dozmod.thrift.Session; /** * Wizard page for setting custom permissions for the lecture to be created */ -@SuppressWarnings("serial") public class LectureCustomPermissionPage extends LectureCustomPermissionPageLayout { + /** + * Version for serialization. + */ + private static final long serialVersionUID = 8593836578573838805L; + private final static Logger LOGGER = Logger.getLogger(LectureCustomPermissionPage.class); private boolean initDone = false; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureImageListPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureImageListPage.java index 01f179c2..3b4935cb 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureImageListPage.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureImageListPage.java @@ -7,7 +7,6 @@ import javax.swing.SwingUtilities; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; -import org.apache.log4j.Logger; import org.openslx.bwlp.thrift.iface.ImageSummaryRead; import org.openslx.dozmod.gui.control.table.ImageTable; import org.openslx.dozmod.gui.helper.I18n; @@ -22,10 +21,12 @@ import org.openslx.util.QuickTimer.Task; /** * Page for choosing the linked image for the lecture to be created */ -@SuppressWarnings("serial") public class LectureImageListPage extends LectureImageListPageLayout { - private final static Logger LOGGER = Logger.getLogger(LectureImageListPage.class); + /** + * Version for serialization. + */ + private static final long serialVersionUID = 4934345495859750609L; private LectureWizardState state = null; /** diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureLocationSelectionPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureLocationSelectionPage.java index bcad47f8..9bb84a49 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureLocationSelectionPage.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureLocationSelectionPage.java @@ -2,17 +2,18 @@ package org.openslx.dozmod.gui.wizard.page; import java.util.List; -import org.apache.log4j.Logger; import org.openslx.dozmod.gui.helper.I18n; import org.openslx.dozmod.gui.wizard.Wizard; import org.openslx.dozmod.gui.wizard.layout.LectureLocationSelectionPageLayout; import org.openslx.dozmod.state.LectureWizardState; import org.openslx.dozmod.thrift.Session; -@SuppressWarnings("serial") public class LectureLocationSelectionPage extends LectureLocationSelectionPageLayout { - private final static Logger LOGGER = Logger.getLogger(LectureLocationSelectionPage.class); + /** + * Version for serialization. + */ + private static final long serialVersionUID = 4438572389120087933L; private LectureWizardState state = null; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureOptionsPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureOptionsPage.java index 45ca1d88..5b5e066f 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureOptionsPage.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureOptionsPage.java @@ -9,9 +9,13 @@ import org.openslx.dozmod.gui.wizard.layout.LectureOptionsPageLayout; import org.openslx.dozmod.state.LectureWizardState; import org.openslx.dozmod.thrift.Session; -@SuppressWarnings("serial") public class LectureOptionsPage extends LectureOptionsPageLayout { + /** + * Version for serialization. + */ + private static final long serialVersionUID = -3108044488988318613L; + private LectureWizardState state = null; private List<NetRule> currentNetrules; private String currentRunscript = new String(""); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/model/ContainerDefinition.java b/dozentenmodul/src/main/java/org/openslx/dozmod/model/ContainerDefinition.java index 35ef765d..80019440 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/model/ContainerDefinition.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/model/ContainerDefinition.java @@ -171,6 +171,8 @@ public class ContainerDefinition { // replace windows by unix EOL recipe = rawRecipe.replaceAll("\\r\\n", "\n"); + + bis.close(); } catch (IOException e) { LOGGER.error("Could not read Container Recipe", e); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/permissions/ImagePerms.java b/dozentenmodul/src/main/java/org/openslx/dozmod/permissions/ImagePerms.java index f22f51c0..f7a6df3b 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/permissions/ImagePerms.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/permissions/ImagePerms.java @@ -1,6 +1,5 @@ package org.openslx.dozmod.permissions; -import org.apache.log4j.Logger; import org.openslx.bwlp.thrift.iface.ImageDetailsRead; import org.openslx.bwlp.thrift.iface.ImageSummaryRead; @@ -9,8 +8,6 @@ import org.openslx.bwlp.thrift.iface.ImageSummaryRead; */ public class ImagePerms { - private final static Logger LOGGER = Logger.getLogger(ImagePerms.class); - public static boolean canAdmin(ImageDetailsRead image) { return image != null && image.userPermissions != null && image.userPermissions.admin; } diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/state/UploadWizardState.java b/dozentenmodul/src/main/java/org/openslx/dozmod/state/UploadWizardState.java index 1485943a..4e1dbcdf 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/state/UploadWizardState.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/state/UploadWizardState.java @@ -52,7 +52,7 @@ public class UploadWizardState { /** * Meta data (description file content) of this VM */ - public VmMetaData meta = null; + public VmMetaData<?,?,?,?,?> meta = null; // To be able to call the conversion Page from within the ImageUploadPage // TODO find cleaner approach, this probably shouldn't be in here.. diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/Session.java b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/Session.java index 46771d46..cf2468b3 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/Session.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/Session.java @@ -7,7 +7,6 @@ import org.apache.log4j.Logger; import org.apache.thrift.TException; import org.openslx.bwlp.thrift.iface.ImagePermissions; import org.openslx.bwlp.thrift.iface.LecturePermissions; -import org.openslx.bwlp.thrift.iface.Role; import org.openslx.bwlp.thrift.iface.SatelliteConfig; import org.openslx.bwlp.thrift.iface.WhoamiInfo; import org.openslx.sat.thrift.version.Feature; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/cache/ImagePublishedCache.java b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/cache/ImagePublishedCache.java index 39ca3be7..a3556224 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/cache/ImagePublishedCache.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/cache/ImagePublishedCache.java @@ -2,7 +2,6 @@ package org.openslx.dozmod.thrift.cache; import java.util.List; -import org.apache.log4j.Logger; import org.apache.thrift.TException; import org.openslx.bwlp.thrift.iface.ImageSummaryRead; import org.openslx.bwlp.thrift.iface.TAuthorizationException; @@ -14,9 +13,6 @@ import org.openslx.util.GenericDataCache.CacheMode; public class ImagePublishedCache { - private final static Logger LOGGER = Logger - .getLogger(ImagePublishedCache.class); - private static final int CACHE_TIME_LIST_MS = 30 * 1000; private static final GenericDataCache<List<ImageSummaryRead>> listCache = new GenericDataCache<List<ImageSummaryRead>>( diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/util/DateLabelFormatter.java b/dozentenmodul/src/main/java/org/openslx/dozmod/util/DateLabelFormatter.java index 3e6b7043..17efb0fa 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/util/DateLabelFormatter.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/util/DateLabelFormatter.java @@ -8,9 +8,13 @@ import javax.swing.JFormattedTextField.AbstractFormatter; import org.joda.time.format.DateTimeFormat; import org.joda.time.format.DateTimeFormatter; -@SuppressWarnings("serial") public class DateLabelFormatter extends AbstractFormatter { + /** + * Version for serialization. + */ + private static final long serialVersionUID = -5278627382904881108L; + private static final DateTimeFormatter formatter = DateTimeFormat.forPattern("dd.MM.yyyy"); @Override diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/util/MapHelper.java b/dozentenmodul/src/main/java/org/openslx/dozmod/util/MapHelper.java index 61133cd9..6c0763d0 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/util/MapHelper.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/util/MapHelper.java @@ -3,12 +3,8 @@ package org.openslx.dozmod.util; import java.util.Map; import java.util.Map.Entry; -import org.apache.log4j.Logger; - public class MapHelper { - private static final Logger LOGGER = Logger.getLogger(MapHelper.class); - private MapHelper() { } diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/util/ProxyConfigurator.java b/dozentenmodul/src/main/java/org/openslx/dozmod/util/ProxyConfigurator.java index d3bd27ad..e2be7a92 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/util/ProxyConfigurator.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/util/ProxyConfigurator.java @@ -152,7 +152,7 @@ public class ProxyConfigurator { // TODO: Geht nich for (String proto : new String[] { "TLSv1.2", "TLSv1.1", "TLS" }) { try { - return new SSLConnectionSocketFactory(SSLContexts.custom().useProtocol(proto).build()); + return new SSLConnectionSocketFactory(SSLContexts.custom().setProtocol(proto).build()); } catch (Exception e) { LOGGER.warn(proto + " not available", e); } |