diff options
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout')
13 files changed, 159 insertions, 163 deletions
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 bdb7e806..bd9a3b71 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 @@ -8,12 +8,12 @@ import javax.swing.Box; import javax.swing.BoxLayout; import javax.swing.JButton; import javax.swing.JDialog; -import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.JTextArea; import org.openslx.dozmod.gui.Gui; +import org.openslx.dozmod.gui.control.QLabel; import org.openslx.dozmod.gui.helper.GridManager; @SuppressWarnings("serial") @@ -26,13 +26,12 @@ public abstract class CheckUpdateWindowLayout extends JDialog { protected static JButton btnLink; protected static JButton btnClose; - protected JLabel lblLocalVersion = new JLabel("-"); - protected JLabel lblRemoteVersion = new JLabel("-"); - protected JLabel lblLocalVersionTime = new JLabel("-"); - protected JLabel lblRemoteVersionTime = new JLabel("-"); + protected final QLabel lblLocalVersion = new QLabel("-"); + protected final QLabel lblRemoteVersion = new QLabel("-"); + protected final QLabel lblLocalVersionTime = new QLabel("-"); + protected final QLabel lblRemoteVersionTime = new QLabel("-"); - protected JScrollPane changelogPanel; - protected JTextArea txtChangelog; + protected final JTextArea txtChangelog; public CheckUpdateWindowLayout(Frame modalParent) { super(modalParent, title, modalParent != null ? ModalityType.APPLICATION_MODAL @@ -49,12 +48,12 @@ public abstract class CheckUpdateWindowLayout extends JDialog { JPanel infoPanel = new JPanel(); GridManager infoGrid = new GridManager(infoPanel, 4); infoPanel.setBorder(BorderFactory.createTitledBorder(noticeLabel)); - infoGrid.add(new JLabel("Ihre Version")); + infoGrid.add(new QLabel("Ihre Version")); infoGrid.add(Box.createHorizontalStrut(10)); infoGrid.add(lblLocalVersion); infoGrid.add(Box.createHorizontalGlue()).fill(true, false).expand(true, false); infoGrid.nextRow(); - infoGrid.add(new JLabel("Aktuelle Version")); + infoGrid.add(new QLabel("Aktuelle Version")); infoGrid.add(Box.createHorizontalStrut(10)); infoGrid.add(lblRemoteVersion); infoGrid.add(Box.createHorizontalGlue()).fill(true, false).expand(true, false); @@ -63,8 +62,8 @@ public abstract class CheckUpdateWindowLayout extends JDialog { txtChangelog = new JTextArea("-", 30, 20); txtChangelog.setLineWrap(true); txtChangelog.setWrapStyleWord(true); - changelogPanel = new JScrollPane(txtChangelog, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, - JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED); + JScrollPane changelogPanel = new JScrollPane(txtChangelog, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, + JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); changelogPanel.setBorder(BorderFactory.createTitledBorder("Changelog")); // checkbox for acknowledging the disclaimer diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/DisclaimerWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/DisclaimerWindowLayout.java index c2061287..36ba1a86 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/DisclaimerWindowLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/DisclaimerWindowLayout.java @@ -35,8 +35,8 @@ public abstract class DisclaimerWindowLayout extends JDialog { private static String continueButtonLabel = "Weiter"; // Buttons - protected JCheckBox chkAgreeBox; - protected JButton btnContinue; + protected final JCheckBox chkAgreeBox; + protected final JButton btnContinue; public DisclaimerWindowLayout(Frame modalParent) { super(modalParent, title, modalParent != null ? ModalityType.APPLICATION_MODAL 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 2689d5f3..c572f5ec 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 @@ -62,10 +62,10 @@ public abstract class ImageDetailsWindowLayout extends JDialog { protected final JButton btnClose; protected final JButton btnShowLinkingLectures; - protected final QLabel linkedLectureCount; + protected final QLabel lblLinkedLectureCount; - protected final ImageVersionTable versionTable; - protected QScrollPane versionTableScrollPane; + protected final ImageVersionTable tblVersions; + protected final QScrollPane scpVersions; public ImageDetailsWindowLayout(Frame modalParent) { super(modalParent, "<init>", ModalityType.APPLICATION_MODAL); @@ -185,8 +185,8 @@ public abstract class ImageDetailsWindowLayout extends JDialog { grid.nextRow(); grid.add(new QLabel("Veranstaltungen")); - linkedLectureCount = new QLabel(); - grid.add(linkedLectureCount).expand(true, false); + lblLinkedLectureCount = new QLabel(); + grid.add(lblLinkedLectureCount).expand(true, false); btnShowLinkingLectures = new JButton("Anzeigen"); grid.add(btnShowLinkingLectures).fill(true, false); grid.nextRow(); @@ -222,10 +222,10 @@ public abstract class ImageDetailsWindowLayout extends JDialog { QLabel lblVersion = new QLabel("Image-Versionen"); lblVersion.setFont(lblVersion.getFont().deriveFont(Font.BOLD)); versionTablePanel.add(lblVersion, BorderLayout.PAGE_START); - versionTable = new ImageVersionTable(); - versionTableScrollPane = new QScrollPane(versionTable); - versionTableScrollPane.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10)); - versionTablePanel.add(versionTableScrollPane, BorderLayout.CENTER); + tblVersions = new ImageVersionTable(); + scpVersions = new QScrollPane(tblVersions); + scpVersions.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10)); + versionTablePanel.add(scpVersions, BorderLayout.CENTER); // add the tabel panel to the right panel JPanel rightPanel = new JPanel(); 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 e14267e3..1fa98797 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 @@ -33,13 +33,13 @@ public abstract class ImageListWindowLayout extends CompositePage { // -------------------------------------- // search field, table and buttons - protected final ImageListViewer imageListViewer; - protected final JButton newButton; - protected final JButton newLectureButton; - protected final JButton editButton; - protected final JButton downloadButton; - protected final JButton deleteButton; - protected final JButton switchViewButton; + protected final ImageListViewer ctlImageListViewer; + protected final JButton btnNewVm; + protected final JButton btnNewLecture; + protected final JButton btnEditDetails; + protected final JButton btnDownload; + protected final JButton btnDelete; + protected final JButton btnSwitchView; public ImageListWindowLayout() { super(new BorderLayout()); @@ -54,34 +54,34 @@ public abstract class ImageListWindowLayout extends CompositePage { infoPanel.add(infoTitle, BorderLayout.NORTH); infoPanel.add(infoText, BorderLayout.CENTER); - imageListViewer = new ImageListViewer(FilterType.USABLE); + ctlImageListViewer = new ImageListViewer(FilterType.USABLE); // -------------------------------------- // the buttons at the bottom JPanel buttonPanel = new JPanel(); buttonPanel.setBorder(BorderFactory.createEmptyBorder(5, 0, 0, 0)); buttonPanel.setLayout(new BoxLayout(buttonPanel, BoxLayout.LINE_AXIS)); - newButton = new JButton(newButtonLabel); - newLectureButton = new JButton(newLectureButtonLabel); - deleteButton = new JButton(deleteButtonLabel); - editButton = new JButton(editButtonLabel); - downloadButton = new JButton(downloadButtonLabel); - switchViewButton = new JButton(switchViewButtonLabel); - buttonPanel.add(newButton); + btnNewVm = new JButton(newButtonLabel); + btnNewLecture = new JButton(newLectureButtonLabel); + btnDelete = new JButton(deleteButtonLabel); + btnEditDetails = new JButton(editButtonLabel); + btnDownload = new JButton(downloadButtonLabel); + btnSwitchView = new JButton(switchViewButtonLabel); + buttonPanel.add(btnNewVm); buttonPanel.add(Box.createRigidArea(new Dimension(5, 0))); - buttonPanel.add(newLectureButton); - buttonPanel.add(editButton); - buttonPanel.add(downloadButton); + buttonPanel.add(btnNewLecture); + buttonPanel.add(btnEditDetails); + buttonPanel.add(btnDownload); buttonPanel.add(Box.createRigidArea(new Dimension(5, 0))); - buttonPanel.add(deleteButton); + buttonPanel.add(btnDelete); buttonPanel.add(Box.createHorizontalGlue()); - buttonPanel.add(switchViewButton); + buttonPanel.add(btnSwitchView); // put everything together GridManager grid = new GridManager(this, 1); grid.add(infoPanel).fill(true, false).expand(true, false); grid.nextRow(); - grid.add(imageListViewer).fill(true, true).expand(true, true); + grid.add(ctlImageListViewer).fill(true, true).expand(true, true); grid.nextRow(); grid.add(buttonPanel).fill(true, false).expand(true, false); grid.nextRow(); 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 e87400f8..8d751a31 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 @@ -65,15 +65,15 @@ public abstract class LectureDetailsWindowLayout extends JDialog { protected final JButton btnPermissions; protected final JButton btnLocations; - protected QLabel lblError; + protected final QLabel lblError; protected final JButton btnSaveChanges; protected final JButton btnClose; protected final JButton btnDownloadImage; - protected JDatePickerImpl startDate; - protected JDatePickerImpl endDate; - protected JSpinner startTime; - protected JSpinner endTime; + protected final JDatePickerImpl dtpStartDate; + protected final JDatePickerImpl dtpEndDate; + protected final JSpinner spnStartTime; + protected final JSpinner spnEndTime; protected Color dateTimeTextColor; @@ -180,11 +180,11 @@ public abstract class LectureDetailsWindowLayout extends JDialog { // start time of the lecture JPanel startTimePanel = new JPanel(); startTimePanel.setLayout(new BoxLayout(startTimePanel, BoxLayout.LINE_AXIS)); - startDate = new QDatePickerImpl(new JDatePanelImpl(new UtilDateModel(new Date()), pickerStrings), + dtpStartDate = new QDatePickerImpl(new JDatePanelImpl(new UtilDateModel(new Date()), pickerStrings), new DateLabelFormatter()); - startTime = makeTimeSpinner(23, 59); - startTimePanel.add(startDate); - startTimePanel.add(startTime); + spnStartTime = makeTimeSpinner(23, 59); + startTimePanel.add(dtpStartDate); + startTimePanel.add(spnStartTime); startTimePanel.setMinimumSize(startTimePanel.getPreferredSize()); startTimePanel.setMaximumSize(startTimePanel.getPreferredSize()); lblStartTime = new QLabel(); @@ -195,11 +195,11 @@ public abstract class LectureDetailsWindowLayout extends JDialog { // end time of the lecture JPanel endTimePanel = new JPanel(); endTimePanel.setLayout(new BoxLayout(endTimePanel, BoxLayout.LINE_AXIS)); - endDate = new QDatePickerImpl(new JDatePanelImpl(new UtilDateModel(new Date()), pickerStrings), + dtpEndDate = new QDatePickerImpl(new JDatePanelImpl(new UtilDateModel(new Date()), pickerStrings), new DateLabelFormatter()); - endTime = makeTimeSpinner(00, 59); - endTimePanel.add(endDate); - endTimePanel.add(endTime); + spnEndTime = makeTimeSpinner(00, 59); + endTimePanel.add(dtpEndDate); + endTimePanel.add(spnEndTime); endTimePanel.setMinimumSize(endTimePanel.getPreferredSize()); endTimePanel.setMaximumSize(endTimePanel.getPreferredSize()); 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 476a9a2e..7aee0f30 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 @@ -4,8 +4,6 @@ import java.awt.BorderLayout; import java.awt.Dimension; import java.awt.Font; import java.awt.GridBagLayout; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; import javax.swing.BorderFactory; import javax.swing.Box; @@ -14,7 +12,6 @@ import javax.swing.JButton; import javax.swing.JComboBox; import javax.swing.JLabel; import javax.swing.JPanel; -import javax.swing.JScrollPane; import javax.swing.JTextField; import javax.swing.UIManager; import javax.swing.border.TitledBorder; @@ -38,16 +35,16 @@ public abstract class LectureListWindowLayout extends CompositePage { private static final String infoTextString = "Hier können Sie Veranstaltungen anlegen, bearbeiten und löschen."; // buttons - protected final JButton newButton; - protected final JButton deleteButton; - protected final JButton editButton; - protected final JButton switchViewButton; - protected final JComboBox<FilterType> filterCbo; - protected JLabel lectureCountLabel; + protected final JButton btnNewLecture; + protected final JButton btnDeleteLecture; + protected final JButton btnEditLecture; + protected final JButton btnSwitchView; + protected final JComboBox<FilterType> cboFilter; + protected final QLabel lblVisibleLectureCount; - protected final JTextField searchTextField; + protected final JTextField txtSearch; - protected final LectureTable lectureTable; + protected final LectureTable tblLectures; public LectureListWindowLayout() { super(new GridBagLayout()); @@ -72,29 +69,28 @@ public abstract class LectureListWindowLayout extends CompositePage { JPanel filterPanel = new JPanel(); filterPanel.setBorder(new TitledBorder(filterPanelLabel)); filterPanel.setLayout(new BoxLayout(filterPanel, BoxLayout.LINE_AXIS)); - searchTextField = new JTextField(); - filterCbo = new JComboBox<FilterType>(); + txtSearch = new JTextField(); + cboFilter = new JComboBox<FilterType>(); for (FilterType s : FilterType.values()) { - filterCbo.addItem(s); + cboFilter.addItem(s); } - filterPanel.add(searchTextField); - filterPanel.add(filterCbo); + filterPanel.add(txtSearch); + filterPanel.add(cboFilter); // Panel for itemCount JPanel lectureCountPanel = new JPanel(); - lectureCountLabel = new JLabel(); + lblVisibleLectureCount = new QLabel(); lectureCountPanel.add(new JLabel("Sichtbar:")); - lectureCountPanel.add(lectureCountLabel); + lectureCountPanel.add(lblVisibleLectureCount); filterPanel.add(lectureCountPanel); // the actual table - lectureTable = new LectureTable(); + tblLectures = new LectureTable(); tableGrid.add(filterPanel).fill(true, false).expand(true, false); tableGrid.nextRow(); - QScrollPane jsp = new QScrollPane(lectureTable); + QScrollPane jsp = new QScrollPane(tblLectures); - jsp.setBackground(UIManager.getColor("Table.background")); tableGrid.add(jsp).fill(true, true).expand(true, true); tableGrid.nextRow(); @@ -106,17 +102,17 @@ public abstract class LectureListWindowLayout extends CompositePage { buttonPanel.setLayout(new BoxLayout(buttonPanel, BoxLayout.LINE_AXIS)); buttonPanel.setBorder(BorderFactory.createEmptyBorder(5, 0, 0, 0)); - newButton = new JButton(newButtonLabel); - buttonPanel.add(newButton); + btnNewLecture = new JButton(newButtonLabel); + buttonPanel.add(btnNewLecture); buttonPanel.add(Box.createRigidArea(new Dimension(5, 0))); - editButton = new JButton(editButtonLabel); - buttonPanel.add(editButton); + btnEditLecture = new JButton(editButtonLabel); + buttonPanel.add(btnEditLecture); buttonPanel.add(Box.createRigidArea(new Dimension(5, 0))); - deleteButton = new JButton(deleteButtonLabel); - buttonPanel.add(deleteButton); + btnDeleteLecture = new JButton(deleteButtonLabel); + buttonPanel.add(btnDeleteLecture); buttonPanel.add(Box.createHorizontalGlue()); - switchViewButton = new JButton(switchViewButtonLabel); - buttonPanel.add(switchViewButton); + btnSwitchView = new JButton(switchViewButtonLabel); + buttonPanel.add(btnSwitchView); // ----------------- end group for table ------------------------- grid.add(infoPanel).fill(true, false).expand(true, false); @@ -130,7 +126,7 @@ public abstract class LectureListWindowLayout extends CompositePage { } protected void setLectureCountLabel(int i) { - lectureCountLabel.setText(Integer.toString(i)); + lblVisibleLectureCount.setText(Integer.toString(i)); } } 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 index 5e67de86..1408242d 100644 --- 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 @@ -34,7 +34,7 @@ public class LecturePermissionWindowLayout extends JDialog { /** * The lecturePermissionManager to use. */ - protected final LectureCustomPermissionManager lecturePermissionManager; + protected final LectureCustomPermissionManager ctlPermissionManager; /** * The title of the window. @@ -53,7 +53,7 @@ public class LecturePermissionWindowLayout extends JDialog { GridManager grid = new GridManager(contentPanel, 1); // create the lecturePermissionManager and add it to the pane. - lecturePermissionManager = new LectureCustomPermissionManager(); + ctlPermissionManager = new LectureCustomPermissionManager(); // Panel with the default permissions JPanel defaultPermissionPane = new JPanel(); @@ -73,7 +73,7 @@ public class LecturePermissionWindowLayout extends JDialog { buttonPane.add(btnOk); // Put everything into the grid - grid.add(lecturePermissionManager).fill(true, true).expand(true, true); + grid.add(ctlPermissionManager).fill(true, true).expand(true, true); grid.nextRow(); grid.add(defaultPermissionPane).fill(true, false).expand(true, false); grid.nextRow(); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LocationSelectionWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LocationSelectionWindowLayout.java index 57b859a4..74801fc6 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LocationSelectionWindowLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LocationSelectionWindowLayout.java @@ -24,7 +24,7 @@ public class LocationSelectionWindowLayout extends JDialog { * */ private static final long serialVersionUID = -7722131149214063979L; - protected final LocationSelector locationSelector; + protected final LocationSelector ctlLocationSelector; protected final JButton btnSaveChanges; protected final JButton btnClose; protected final QLabel lblError; @@ -37,18 +37,18 @@ public class LocationSelectionWindowLayout extends JDialog { GridManager grid = new GridManager(this, 1); WordWrapLabel header = new WordWrapLabel( "Hier können Sie die Räume auswählen, in denen diese Veranstaltung sichtbar sein soll."); - locationSelector = new LocationSelector(); + ctlLocationSelector = new LocationSelector(); grid.add(header).fill(true, false).expand(true, false); grid.nextRow(); grid.add(new JSeparator()); grid.nextRow(); - grid.add(locationSelector).fill(true, true).expand(true, true); + grid.add(ctlLocationSelector).fill(true, true).expand(true, true); grid.nextRow(); // button panel on the bottom JPanel buttonPanel = new JPanel(); buttonPanel.setLayout(new BoxLayout(buttonPanel, BoxLayout.X_AXIS)); lblError = new QLabel(); - lblError.setForeground(Color.red); + lblError.setForeground(Color.RED); btnClose = new JButton("Abbrechen"); btnSaveChanges = new JButton("Übernehmen"); buttonPanel.add(lblError); 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 4b1db451..aadced38 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 @@ -52,17 +52,17 @@ public abstract class LoginWindowLayout extends JDialog { private static final String LOGIN_FORM_LABEL = "Zugangsdaten"; // login type panel - protected final JRadioButton[] loginTypes = new JRadioButton[3]; + protected final JRadioButton[] rdoLoginType = new JRadioButton[3]; protected final JButton btnSettings; // login form panel - protected final JComboBox<Organization> idpCombo; - protected final JTextField usernameField; - protected final JPasswordField passwordField; - protected final JCheckBox saveUsernameCheck; - protected final JButton loginButton; - protected final JPanel loginTypePanel; - protected final JPanel loginFormPanel; + protected final JComboBox<Organization> cboOrganization; + protected final JTextField txtUsername; + protected final JPasswordField txtPassword; + protected final JCheckBox chkSaveUsername; + protected final JButton btnLogin; + protected final JPanel pnlLoginType; + protected final JPanel pnlLoginForm; /** * Create a new login composite @@ -79,12 +79,12 @@ public abstract class LoginWindowLayout extends JDialog { grid.add(new QLabel(getScaledLogo()), 2); grid.nextRow(); - loginTypes[0] = new JRadioButton("Authentifizierung über bwIDM"); - loginTypes[1] = new JRadioButton("Test-Zugang mit festem Benutzer"); - loginTypes[2] = new JRadioButton("Direkter Zugang zum Satelliten"); + rdoLoginType[0] = new JRadioButton("Authentifizierung über bwIDM"); + rdoLoginType[1] = new JRadioButton("Test-Zugang mit festem Benutzer"); + rdoLoginType[2] = new JRadioButton("Direkter Zugang zum Satelliten"); btnSettings = new JButton("Einstellungen"); - idpCombo = new ComboBox<>(new ComboBoxRenderer<Organization>() { + cboOrganization = new ComboBox<>(new ComboBoxRenderer<Organization>() { @Override public String renderItem(Organization item) { if (item == null) @@ -97,15 +97,15 @@ public abstract class LoginWindowLayout extends JDialog { return "Wird geladen..."; } }); - usernameField = new JTextField(); - passwordField = new JPasswordField(); - loginButton = new JButton("Login"); - saveUsernameCheck = new JCheckBox("Benutzername speichern"); - - loginTypePanel = makeLoginTypePanel(); - grid.add(loginTypePanel).expand(0.25, 1).fill(true, true); - loginFormPanel = makeLoginFormPanel(); - grid.add(loginFormPanel).expand(0.75, 1).fill(true, true); + txtUsername = new JTextField(); + txtPassword = new JPasswordField(); + btnLogin = new JButton("Login"); + chkSaveUsername = new JCheckBox("Benutzername speichern"); + + pnlLoginType = makeLoginTypePanel(); + grid.add(pnlLoginType).expand(0.25, 1).fill(true, true); + pnlLoginForm = makeLoginFormPanel(); + grid.add(pnlLoginForm).expand(0.75, 1).fill(true, true); grid.nextRow(); grid.finish(false); @@ -120,21 +120,21 @@ public abstract class LoginWindowLayout extends JDialog { GridManager grid = new GridManager(loginFormPanel, 2); grid.add(new QLabel("Identity Provider")); - grid.add(idpCombo).expand(true, false).fill(true, false); + grid.add(cboOrganization).expand(true, false).fill(true, false); grid.nextRow(); // label + field for username grid.add(new QLabel("Benutzername")); - grid.add(usernameField).expand(true, false).fill(true, false); + grid.add(txtUsername).expand(true, false).fill(true, false); grid.nextRow(); // label + field for password grid.add(new QLabel("Passwort")); - grid.add(passwordField).expand(true, false).fill(true, false); + grid.add(txtPassword).expand(true, false).fill(true, false); grid.nextRow(); - grid.add(loginButton); - grid.add(saveUsernameCheck); + grid.add(btnLogin); + grid.add(chkSaveUsername); grid.nextRow(); grid.finish(true); return loginFormPanel; @@ -145,9 +145,9 @@ public abstract class LoginWindowLayout extends JDialog { loginTypePanel.setLayout(new BoxLayout(loginTypePanel, BoxLayout.PAGE_AXIS)); loginTypePanel.setBorder(new TitledBorder(AUTH_TYPE_LABEL)); ButtonGroup loginTypeButtonGroup = new ButtonGroup(); - for (int i = 0; i < loginTypes.length; i++) { - loginTypeButtonGroup.add(loginTypes[i]); - loginTypePanel.add(loginTypes[i]); + for (int i = 0; i < rdoLoginType.length; i++) { + loginTypeButtonGroup.add(rdoLoginType[i]); + loginTypePanel.add(rdoLoginType[i]); } loginTypePanel.add(Box.createVerticalGlue()); loginTypePanel.add(btnSettings); 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 e319550e..002a3fc1 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 @@ -25,28 +25,28 @@ public abstract class MainMenuWindowLayout extends CompositePage { + "2) Zu Veranstaltungen gehörende Virtuelle Maschinen herunterladen<br> </html>"; // buttons - protected JLabel vmImage; - protected JLabel lectureImage; - protected JButton vmButton; - protected JButton lectureButton; + protected final JLabel lblVirtualMachinesLogo; + protected final JLabel lblLectureLogo; + protected final JButton btnShowVirtualMachines; + protected final JButton btnShowLectures; public MainMenuWindowLayout() { this.setBorder(BorderFactory.createTitledBorder("bwSuite-Hauptmenü")); GridManager grid = new GridManager(this, 2); - vmImage = new JLabel(ResourceLoader.getIcon("/img/virtualization.png", "VM-Übersicht")); + lblVirtualMachinesLogo = new JLabel(ResourceLoader.getIcon("/img/virtualization.png", "VM-Übersicht")); JLabel vmInfoLabel = new JLabel(vmInfo); vmInfoLabel.setVerticalAlignment(JLabel.TOP); - lectureImage = new JLabel(ResourceLoader.getIcon("/img/lecture.png", "Veranstaltungen")); + lblLectureLogo = new JLabel(ResourceLoader.getIcon("/img/lecture.png", "Veranstaltungen")); JLabel lecturesInfoLabel = new JLabel(lecturesInfo); lecturesInfoLabel.setVerticalAlignment(JLabel.TOP); - vmButton = new JButton("Zu den Images"); - lectureButton = new JButton("Zu den Veranstaltungen"); - grid.add(vmImage).fill(true, false).expand(true, false); - grid.add(lectureImage).fill(true, false).expand(true, false); + btnShowVirtualMachines = new JButton("Zu den Images"); + btnShowLectures = new JButton("Zu den Veranstaltungen"); + grid.add(lblVirtualMachinesLogo).fill(true, false).expand(true, false); + grid.add(lblLectureLogo).fill(true, false).expand(true, false); grid.nextRow(); - grid.add(vmButton).fill(true, false).expand(true, false); - grid.add(lectureButton).fill(true, false).expand(true, false); + grid.add(btnShowVirtualMachines).fill(true, false).expand(true, false); + grid.add(btnShowLectures).fill(true, false).expand(true, false); grid.nextRow(); grid.add(vmInfoLabel).fill(true, true).expand(true, true); grid.add(lecturesInfoLabel).fill(true, true).expand(true, true); 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 dd71352f..bf6d1bc5 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 @@ -4,6 +4,7 @@ import java.awt.BorderLayout; import java.awt.Window; import java.util.HashMap; import java.util.List; +import java.util.Map; import javax.swing.BorderFactory; import javax.swing.Box; @@ -22,11 +23,11 @@ import org.openslx.dozmod.gui.helper.GridManager; @SuppressWarnings("serial") public class SatelliteListWindowLayout extends JDialog { - protected final JButton cancelButton; - protected final JButton nextButton; - protected final JTextField customIpField; - protected final JRadioButton radioCustomIp; - protected final HashMap<JRadioButton, Satellite> radioToSat = new HashMap<JRadioButton, Satellite>(); + protected final JButton btnCancel; + protected final JButton btnContinue; + protected final JTextField txtCustomAddress; + protected final JRadioButton rdoCusomAddress; + protected final Map<JRadioButton, Satellite> radioToSat = new HashMap<>(); private static String title = "Satelliten-Server wählen"; @@ -57,11 +58,11 @@ public class SatelliteListWindowLayout extends JDialog { // --------------- custom ip button and field -------------------------------------- selectionPanelGrid.add(new JLabel("Server-Adresse selbst eingeben"), 2); selectionPanelGrid.nextRow(); - radioCustomIp = new JRadioButton(""); - btnGroup.add(radioCustomIp); - customIpField = new JTextField(""); - selectionPanelGrid.add(radioCustomIp).fill(true, false).expand(false, false); - selectionPanelGrid.add(customIpField).fill(true, false).expand(true, false); + rdoCusomAddress = new JRadioButton(""); + btnGroup.add(rdoCusomAddress); + txtCustomAddress = new JTextField(""); + selectionPanelGrid.add(rdoCusomAddress).fill(true, false).expand(false, false); + selectionPanelGrid.add(txtCustomAddress).fill(true, false).expand(true, false); selectionPanelGrid.nextRow(); // --------------- end custom ip field -------------------------------- selectionPanelGrid.finish(false); @@ -70,11 +71,11 @@ public class SatelliteListWindowLayout extends JDialog { JPanel buttonPane = new JPanel(); buttonPane.setLayout(new BoxLayout(buttonPane, BoxLayout.LINE_AXIS)); buttonPane.setBorder(BorderFactory.createEmptyBorder(1, 3, 3, 3)); - cancelButton = new JButton("Abbrechen"); - buttonPane.add(cancelButton); + btnCancel = new JButton("Abbrechen"); + buttonPane.add(btnCancel); buttonPane.add(Box.createHorizontalGlue()); - nextButton = new JButton("Weiter"); - buttonPane.add(nextButton); + btnContinue = new JButton("Weiter"); + buttonPane.add(btnContinue); // --------------- end button panel ---------------------------------- // pack it all 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 4f4fd38f..2cb55271 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 @@ -23,9 +23,9 @@ public class UserListWindowLayout extends JDialog { protected final UserTable userTable; - protected final JButton setButton; - protected final JButton cancelButton; - protected final JTextField searchUserField; + protected final JButton btnConfirm; + protected final JButton btnCancel; + protected final JTextField txtSearch; private static String title = "Benutzerliste"; @@ -40,8 +40,8 @@ public class UserListWindowLayout extends JDialog { filterPanel.setLayout(new BoxLayout(filterPanel, BoxLayout.LINE_AXIS)); filterPanel.setBorder(BorderFactory.createEmptyBorder(10, 10, 0, 10)); filterPanel.add(new QLabel("Suchen: ")); - searchUserField = new JTextField(); - filterPanel.add(searchUserField); + txtSearch = new JTextField(); + filterPanel.add(txtSearch); // --------------- end filter field -------------------------------- // --------------- user table -------------------------------------- @@ -59,11 +59,11 @@ public class UserListWindowLayout extends JDialog { buttonPane.setLayout(new BoxLayout(buttonPane, BoxLayout.LINE_AXIS)); buttonPane.setBorder(BorderFactory.createEmptyBorder(0, 10, 10, 10)); buttonPane.add(Box.createHorizontalGlue()); - cancelButton = new JButton("Schließen"); - buttonPane.add(cancelButton); + btnCancel = new JButton("Schließen"); + buttonPane.add(btnCancel); buttonPane.add(Box.createRigidArea(new Dimension(10, 0))); - setButton = new JButton(buttonCaption); - buttonPane.add(setButton); + btnConfirm = new JButton(buttonCaption); + buttonPane.add(btnConfirm); // --------------- end button panel ---------------------------------- // pack it all diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtualizerNoticeWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtualizerNoticeWindowLayout.java index 620f363a..c999586c 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtualizerNoticeWindowLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtualizerNoticeWindowLayout.java @@ -24,8 +24,8 @@ public abstract class VirtualizerNoticeWindowLayout extends JDialog { + "</body></html>"; // protected JButton windowsDLButton; - protected final JButton btnDL; - protected final JButton continueButton; + protected final JButton btnDownload; + protected final JButton btnClose; public VirtualizerNoticeWindowLayout(Frame modalParent) { super(modalParent, title, modalParent != null ? ModalityType.APPLICATION_MODAL @@ -49,8 +49,8 @@ public abstract class VirtualizerNoticeWindowLayout extends JDialog { infoPane.add(Box.createRigidArea(new Dimension(0, 10))); // Download buttons - btnDL = new JButton("VMWare Player herunterladen"); - infoPane.add(btnDL); + btnDownload = new JButton("VMWare Player herunterladen"); + infoPane.add(btnDownload); // Bottom controls JPanel bottomPane = new JPanel(); @@ -58,8 +58,8 @@ public abstract class VirtualizerNoticeWindowLayout extends JDialog { bottomPane.add(Box.createHorizontalGlue()); - continueButton = new JButton("Schließen"); - bottomPane.add(continueButton); + btnClose = new JButton("Schließen"); + bottomPane.add(btnClose); grid.add(infoPane).fill(true, true).expand(true, true); grid.nextRow(); |