diff options
author | Simon Rettberg | 2018-06-21 15:41:44 +0200 |
---|---|---|
committer | Simon Rettberg | 2018-06-21 15:41:44 +0200 |
commit | c0003a559a36dfca1bdc4add0034e67bd22824ed (patch) | |
tree | d0f03daa4eb8b94cbfb9472213a109eade52a0dc /dozentenmodul/src/main/java/org/openslx/dozmod/gui/window | |
parent | [client] Refactor change monitor classes, better error message handling (diff) | |
download | tutor-module-c0003a559a36dfca1bdc4add0034e67bd22824ed.tar.gz tutor-module-c0003a559a36dfca1bdc4add0034e67bd22824ed.tar.xz tutor-module-c0003a559a36dfca1bdc4add0034e67bd22824ed.zip |
[client] Sanitize class/var names, split up control package
All configurators have moved from *.control to *.configurator
*.control should be used for simple controls that feel like
they're really just one thing. The configurators are more like
a group of controls.
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/gui/window')
10 files changed, 30 insertions, 229 deletions
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 951b9f0c..f97f0330 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 @@ -21,13 +21,13 @@ import org.openslx.dozmod.authentication.ShibbolethEcp; import org.openslx.dozmod.gui.Gui; import org.openslx.dozmod.gui.helper.GridManager; import org.openslx.dozmod.gui.helper.UiFeedback; -import org.openslx.dozmod.util.OpenLinks; +import org.openslx.dozmod.util.DesktopEnvironment; /** * Class for showing window with button to open registration page in browser. */ @SuppressWarnings("serial") -public class BwIDMLinkWindow extends JDialog implements UiFeedback { +public class BwIdmLinkWindow extends JDialog implements UiFeedback { private static final String title = "Registrierung erforderlich"; private static final String infoText = "<html><body style='width:100%'>" + "Sie sind nicht bei bwLehrpool registriert. " @@ -37,16 +37,16 @@ public class BwIDMLinkWindow extends JDialog implements UiFeedback { protected JButton btnLink; protected JButton OkButton; - private static final Logger LOGGER = Logger.getLogger(BwIDMLinkWindow.class); + private static final Logger LOGGER = Logger.getLogger(BwIdmLinkWindow.class); /** * Don't use this, use static function open instead! */ - public BwIDMLinkWindow(Frame modalParent) { + public BwIdmLinkWindow(Frame modalParent) { super(modalParent, title, modalParent != null ? ModalityType.APPLICATION_MODAL : ModalityType.MODELESS); - final BwIDMLinkWindow me = this; + final BwIdmLinkWindow me = this; setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); // panel for the border. @@ -67,7 +67,7 @@ public class BwIDMLinkWindow extends JDialog implements UiFeedback { @Override public void actionPerformed(ActionEvent e) { try { - OpenLinks.openWebpageUri(ShibbolethEcp.getRegistrationUrl().toURI()); + DesktopEnvironment.openWebpageUri(ShibbolethEcp.getRegistrationUrl().toURI()); } catch (URISyntaxException e1) { LOGGER.error("Could not convert from url to uri: ", e1); } @@ -116,7 +116,7 @@ public class BwIDMLinkWindow extends JDialog implements UiFeedback { * @param modalParent the parent of the window. */ public static void open(Frame modalParent) { - new BwIDMLinkWindow(modalParent).setVisible(true); + new BwIdmLinkWindow(modalParent).setVisible(true); } @Override 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 0a0f5883..b3c8ae05 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 @@ -9,8 +9,8 @@ import org.openslx.dozmod.gui.helper.UiFeedback; import org.openslx.dozmod.gui.window.layout.CheckUpdateWindowLayout; import org.openslx.dozmod.util.ClientVersion; import org.openslx.dozmod.util.FormatHelper; -import org.openslx.dozmod.util.OpenLinks; -import org.openslx.dozmod.util.OpenLinks.Link; +import org.openslx.dozmod.util.DesktopEnvironment; +import org.openslx.dozmod.util.DesktopEnvironment.Link; @SuppressWarnings("serial") public class CheckUpdateWindow extends CheckUpdateWindowLayout implements UiFeedback, ActionListener { @@ -35,7 +35,7 @@ public class CheckUpdateWindow extends CheckUpdateWindowLayout implements UiFeed @Override public void actionPerformed(ActionEvent e) { if (e.getSource() == btnLink) { - OpenLinks.openWebpage(Link.DOZMOD); + DesktopEnvironment.openWebpage(Link.DOZMOD); } if (e.getSource() == btnClose) { dispose(); 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 d198e897..15964e65 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 @@ -62,7 +62,7 @@ import org.openslx.dozmod.thrift.cache.MetaDataCache; import org.openslx.dozmod.thrift.cache.UserCache; import org.openslx.dozmod.util.FormatHelper; import org.openslx.dozmod.util.MapHelper; -import org.openslx.dozmod.util.OpenLinks; +import org.openslx.dozmod.util.DesktopEnvironment; import org.openslx.sat.thrift.version.Feature; import org.openslx.thrifthelper.TConst; import org.openslx.thrifthelper.ThriftManager; @@ -524,7 +524,7 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe "Upload der VM auf den Masterserver fehlgeschlagen." + " Prüfen Sie, ob Sie bei der Registrierung dem landesweiten VM-Austausch zugestimmt haben.\n" + " Sie können dies hier überprüfen:\n" - + OpenLinks.Link.REGISTER_BWIDM.uri.toString() + "\n\n"); + + DesktopEnvironment.Link.REGISTER_BWIDM.uri.toString() + "\n\n"); return; } Gui.asyncExec(new Runnable() { diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LecturePermissionWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LecturePermissionWindow.java deleted file mode 100644 index 332835f9..00000000 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LecturePermissionWindow.java +++ /dev/null @@ -1,110 +0,0 @@ -package org.openslx.dozmod.gui.window; - -import java.awt.Window; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.util.Map; - -import org.apache.log4j.Logger; -import org.openslx.bwlp.thrift.iface.LecturePermissions; -import org.openslx.dozmod.gui.helper.UiFeedback; -import org.openslx.dozmod.gui.window.layout.LecturePermissionWindowLayout; - -/** - * Window for modifying the custom permissions of an lecture. - */ -@SuppressWarnings("serial") -public class LecturePermissionWindow extends LecturePermissionWindowLayout implements UiFeedback { - - private static final Logger LOGGER = Logger.getLogger(LecturePermissionWindow.class); - - private boolean okUsed = false; - - /** - * Don't use this constructor, use static function - * LectureCustomPermissionWindow.open instead. - */ - protected LecturePermissionWindow(final Window modalParent, - final Map<String, LecturePermissions> permissionMap, final LecturePermissions defaultPermissions, - String ownerId) { - super(modalParent); - - /** - * initialise the lecturePermissionManager - */ - ctlPermissionManager.initPanel(permissionMap, defaultPermissions, ownerId); - - chkCustomPermAdmin.setSelected(defaultPermissions.admin); - chkCustomPermEdit.setSelected(defaultPermissions.edit); - - ActionListener updateDefaultPermissionListener = new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - ctlPermissionManager.updateDefaultPermissions(chkCustomPermAdmin.isSelected(), - chkCustomPermEdit.isSelected()); - } - }; - - chkCustomPermAdmin.addActionListener(updateDefaultPermissionListener); - chkCustomPermEdit.addActionListener(updateDefaultPermissionListener); - - /** - * ActionListeners for the buttons. - */ - btnOk.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - okUsed = true; - dispose(); - } - }); - btnClose.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent arg0) { - dispose(); - } - }); - } - - /** - * Set a created ImageCustomPermissionWindow visible and return resulting - * permissions - * - * @return PermissionDefaultToCustomLink with default- and customPermissions - * when using OK button, null otherwise - */ - private void run() { - setVisible(true); - if (okUsed) - ctlPermissionManager.getPermissions(); - } - - /** - * Create new LecturePermissionWindow dialog - * - * @param modalParent parentwindow of the popup window - * @param permissionMap the permissions of the lecture - * @param defaultPermissions default permissions of the lecture - * @param ownerId Id not to be shown in the list to add new users. Can be - * null. - * @return PermissionDefaultToCustomLink with new permissions of null, if - * abort button has been used - */ - - public static void open(Window modalParent, Map<String, LecturePermissions> permissionMap, - LecturePermissions defaultPermissions, String ownerId) { - new LecturePermissionWindow(modalParent, permissionMap, defaultPermissions, ownerId).run(); - - } - - @Override - public boolean wantConfirmQuit() { - // TODO only return true if user added something new in the list - return false; - } - - @Override - public void escapePressed() { - dispose(); - } -} 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 07b36328..87524764 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 @@ -42,8 +42,8 @@ import org.openslx.dozmod.thrift.Session; import org.openslx.dozmod.thrift.ThriftActions; import org.openslx.dozmod.thrift.ThriftError; import org.openslx.dozmod.thrift.cache.OrganizationCache; -import org.openslx.dozmod.util.OpenLinks; -import org.openslx.dozmod.util.OpenLinks.Link; +import org.openslx.dozmod.util.DesktopEnvironment; +import org.openslx.dozmod.util.DesktopEnvironment.Link; import org.openslx.util.QuickTimer; import org.openslx.util.QuickTimer.Task; @@ -169,7 +169,7 @@ public class LoginWindow extends LoginWindowLayout { btnOpenRegistration.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - OpenLinks.openWebpage(Link.REGISTER_BWIDM); + DesktopEnvironment.openWebpage(Link.REGISTER_BWIDM); } }); @@ -193,7 +193,7 @@ public class LoginWindow extends LoginWindowLayout { btnLogDir.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - OpenLinks.openLocal(new File(Config.getPath())); + DesktopEnvironment.openLocal(new File(Config.getPath())); } }); @@ -359,7 +359,7 @@ public class LoginWindow extends LoginWindowLayout { break; case UNREGISTERED_ERROR: LOGGER.error("User not registered!"); - BwIDMLinkWindow.open((JFrame) SwingUtilities.getWindowAncestor(me)); + BwIdmLinkWindow.open((JFrame) SwingUtilities.getWindowAncestor(me)); break; case INVALID_URL_ERROR: Gui.showMessageBox(me, "ECP Authenticator says: Invalid URL.", MessageType.ERROR, LOGGER, diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtualizerNoticeWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtualizerNoticeWindow.java index 9f7258b0..8da88314 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtualizerNoticeWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtualizerNoticeWindow.java @@ -12,8 +12,8 @@ import org.apache.log4j.Logger; import org.openslx.dozmod.Config; import org.openslx.dozmod.gui.helper.UiFeedback; import org.openslx.dozmod.gui.window.layout.VirtualizerNoticeWindowLayout; -import org.openslx.dozmod.util.OpenLinks; -import org.openslx.dozmod.util.OpenLinks.Link; +import org.openslx.dozmod.util.DesktopEnvironment; +import org.openslx.dozmod.util.DesktopEnvironment.Link; @SuppressWarnings("serial") public class VirtualizerNoticeWindow extends VirtualizerNoticeWindowLayout implements UiFeedback { @@ -45,7 +45,7 @@ public class VirtualizerNoticeWindow extends VirtualizerNoticeWindowLayout imple btnDownload.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - OpenLinks.openWebpage(Link.VMWARE); + DesktopEnvironment.openWebpage(Link.VMWARE); } }); } diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImagePermissionWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImagePermissionWindowLayout.java index 231dc4f7..6b9ea566 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImagePermissionWindowLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImagePermissionWindowLayout.java @@ -13,7 +13,7 @@ import javax.swing.JPanel; import org.apache.log4j.Logger; import org.openslx.dozmod.gui.Gui; -import org.openslx.dozmod.gui.control.ImageCustomPermissionManager; +import org.openslx.dozmod.gui.configurator.ImagePermissionConfigurator; import org.openslx.dozmod.gui.helper.GridManager; /** @@ -32,7 +32,7 @@ public class ImagePermissionWindowLayout extends JDialog { protected final JButton btnOk; protected final JButton btnClose; - protected final ImageCustomPermissionManager imagePermissionManager; + protected final ImagePermissionConfigurator imagePermissionManager; private static String title = "Berechtigungen"; private static String infoTextDefPerms = "<html><body style='width:100%'>" @@ -48,7 +48,7 @@ public class ImagePermissionWindowLayout extends JDialog { contentPanel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5)); add(contentPanel); - imagePermissionManager = new ImageCustomPermissionManager(); + imagePermissionManager = new ImagePermissionConfigurator(); // Panel for the buttons at the bottom JPanel buttonPane = new JPanel(); 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 f0e03375..1508d95e 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 @@ -28,16 +28,16 @@ import javax.swing.text.DateFormatter; import org.jdatepicker.JDatePicker; import org.openslx.bwlp.thrift.iface.ImageVersionDetails; import org.openslx.dozmod.gui.Gui; +import org.openslx.dozmod.gui.configurator.LdapFilterConfigurator; +import org.openslx.dozmod.gui.configurator.LecturePermissionConfigurator; +import org.openslx.dozmod.gui.configurator.NetshareConfigurator; +import org.openslx.dozmod.gui.configurator.RunscriptConfigurator; import org.openslx.dozmod.gui.control.ComboBox; import org.openslx.dozmod.gui.control.ComboBox.ComboBoxRenderer; -import org.openslx.dozmod.gui.control.LdapFilterConfigurator; -import org.openslx.dozmod.gui.control.LectureCustomPermissionManager; import org.openslx.dozmod.gui.control.LocationSelector; -import org.openslx.dozmod.gui.control.NetshareConfigurator; import org.openslx.dozmod.gui.control.PersonLabel; import org.openslx.dozmod.gui.control.QDatePickerImpl; import org.openslx.dozmod.gui.control.QLabel; -import org.openslx.dozmod.gui.control.RunscriptConfigurator; import org.openslx.dozmod.gui.control.WordWrapLabel; import org.openslx.dozmod.gui.helper.GridManager; import org.openslx.dozmod.thrift.Session; @@ -88,7 +88,7 @@ public abstract class LectureDetailsWindowLayout extends JDialog { protected final JSpinner spnEndTime; protected JTabbedPane pnlTabs; - protected final LectureCustomPermissionManager ctlPermissionManager; + protected final LecturePermissionConfigurator ctlPermissionManager; protected final LocationSelector ctlLocationSelector; protected final RunscriptConfigurator ctlRunscriptConfigurator; protected final NetshareConfigurator ctlNetshareConfigurator; @@ -330,7 +330,7 @@ public abstract class LectureDetailsWindowLayout extends JDialog { * Tab "Permissions" * ********************************************************************************/ - ctlPermissionManager = new LectureCustomPermissionManager(); + ctlPermissionManager = new LecturePermissionConfigurator(); pnlTabPermissions = new JPanel(); GridManager grdPermissions = new GridManager(pnlTabPermissions, 1, false); JPanel defaultPermissionPane = new JPanel(); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureNetrulesWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureNetrulesWindowLayout.java index ce4067ce..d6f13d8f 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureNetrulesWindowLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureNetrulesWindowLayout.java @@ -17,7 +17,7 @@ import javax.swing.event.ChangeListener; import org.openslx.bwlp.thrift.iface.NetRule; import org.openslx.dozmod.gui.Gui; import org.openslx.dozmod.gui.changemonitor.ListEditorWindow; -import org.openslx.dozmod.gui.control.NetrulesConfigurator; +import org.openslx.dozmod.gui.configurator.NetrulesConfigurator; public abstract class LectureNetrulesWindowLayout extends JDialog implements ListEditorWindow<NetRule> { diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LecturePermissionWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LecturePermissionWindowLayout.java deleted file mode 100644 index 1408242d..00000000 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LecturePermissionWindowLayout.java +++ /dev/null @@ -1,89 +0,0 @@ -package org.openslx.dozmod.gui.window.layout; - -import java.awt.Window; - -import javax.swing.BorderFactory; -import javax.swing.Box; -import javax.swing.BoxLayout; -import javax.swing.JButton; -import javax.swing.JCheckBox; -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.LectureCustomPermissionManager; -import org.openslx.dozmod.gui.helper.GridManager; - -/** - * Layout for the LectureCustomPermissionWindow - */ -@SuppressWarnings("serial") -public class LecturePermissionWindowLayout extends JDialog { - - private static final Logger LOGGER = Logger.getLogger(LecturePermissionWindowLayout.class); - - /** - * Buttons - */ - protected final JButton btnOk; - protected final JButton btnClose; - protected final JCheckBox chkCustomPermAdmin; - protected final JCheckBox chkCustomPermEdit; - - /** - * The lecturePermissionManager to use. - */ - protected final LectureCustomPermissionManager ctlPermissionManager; - - /** - * The title of the window. - */ - private static String title = "Benutzerdefinierte Berechtigungen"; - - protected LecturePermissionWindowLayout(Window modalParent) { - super(modalParent, title, modalParent != null ? ModalityType.APPLICATION_MODAL - : ModalityType.MODELESS); - - // Panel to add everything into, needed for the border. - JPanel contentPanel = new JPanel(); - contentPanel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5)); - add(contentPanel); - - GridManager grid = new GridManager(contentPanel, 1); - - // create the lecturePermissionManager and add it to the pane. - ctlPermissionManager = new LectureCustomPermissionManager(); - - // Panel with the default permissions - JPanel defaultPermissionPane = new JPanel(); - defaultPermissionPane.setBorder(BorderFactory.createTitledBorder("Andere Nutzer")); - chkCustomPermEdit = new JCheckBox("Bearbeiten"); - chkCustomPermAdmin = new JCheckBox("Admin"); - defaultPermissionPane.add(chkCustomPermEdit); - defaultPermissionPane.add(chkCustomPermAdmin); - - // Panel for the buttons at the bottom - JPanel buttonPane = new JPanel(); - buttonPane.setLayout(new BoxLayout(buttonPane, BoxLayout.LINE_AXIS)); - buttonPane.add(Box.createGlue()); - btnClose = new JButton("Abbrechen"); - buttonPane.add(btnClose); - btnOk = new JButton("Übernehmen"); - buttonPane.add(btnOk); - - // Put everything into the grid - grid.add(ctlPermissionManager).fill(true, true).expand(true, true); - grid.nextRow(); - grid.add(defaultPermissionPane).fill(true, false).expand(true, false); - grid.nextRow(); - grid.add(buttonPane).fill(true, false).expand(false, false); - grid.nextRow(); - grid.finish(false); - - contentPanel.setPreferredSize(Gui.getScaledDimension(480, 350)); - - pack(); - setLocationRelativeTo(modalParent); - } -} |