diff options
| author | Simon Rettberg | 2015-03-06 18:30:38 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2015-03-06 18:30:38 +0100 |
| commit | 3231fee56ce50facd8483e7af4d7f9ff63c5bc38 (patch) | |
| tree | 9d76b3aeb94ab560e518e3a55b051702761f5118 /dozentenmodul/src/main/java/gui/lecture | |
| parent | MACHETE KILLT CODEZEILEN (diff) | |
| download | tutor-module-3231fee56ce50facd8483e7af4d7f9ff63c5bc38.tar.gz tutor-module-3231fee56ce50facd8483e7af4d7f9ff63c5bc38.tar.xz tutor-module-3231fee56ce50facd8483e7af4d7f9ff63c5bc38.zip | |
Aua, aua...
Diffstat (limited to 'dozentenmodul/src/main/java/gui/lecture')
9 files changed, 845 insertions, 1569 deletions
diff --git a/dozentenmodul/src/main/java/gui/lecture/CreateLectureAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/lecture/CreateLectureAllgemein_GUI.java index 89dff1a9..8afea82e 100644 --- a/dozentenmodul/src/main/java/gui/lecture/CreateLectureAllgemein_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/CreateLectureAllgemein_GUI.java @@ -3,7 +3,6 @@ package gui.lecture; import gui.intro.MainMenue_GUI; import java.awt.Color; -import java.awt.Component; import java.awt.FlowLayout; import java.awt.Font; import java.awt.ScrollPane; @@ -27,8 +26,6 @@ import javax.swing.JSeparator; import javax.swing.JTextArea; import javax.swing.JTextField; import javax.swing.JTextPane; -import javax.swing.UIManager; -import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; import javax.swing.border.TitledBorder; import javax.swing.event.InternalFrameAdapter; @@ -44,34 +41,31 @@ import com.toedter.calendar.JDateChooser; public class CreateLectureAllgemein_GUI extends JInternalFrame { private final JPanel contentPanel = new JPanel(); - String[] result; private JTextField Vorname; private JTextField Nachname; private JTextField Hochschule; private JTextField EMail; private JTextField txtFldVeranstaltungsname; - JTextArea description; - JRadioButton radioButtonyes; - JRadioButton radioButtonno; - JDateChooser dateChooserend; - JDateChooser dateChooserstart; - Date startDate = new Date(); - Date endDate; - Component c = null; + private JTextArea description; + private JRadioButton radioButtonyes; + private JRadioButton radioButtonno; + private JDateChooser dateChooserend; + private JDateChooser dateChooserstart; + private Date startDate = new Date(); + private Date endDate; private boolean descriptionLengthOK = false; // description may not be // longer than // MAX_DESCRIPTION_LENGTH private final int MAX_DESCRIPTION_LENGTH = 254; - public static final String HELP_MESSAGE = "<html><div align=\"center\">Geben Sie hier die Daten zu Ihrer Veranstaltung an.<br />" + - "Der Anzeigename ist nachher der Titel im VMChooser, also dort, wo die Studenten das Labor auswählen.<br />" + - "Eine Angabe des Namens des Dozenten kann daher hilfreich sein, wenn mehrere ähnliche Veranstaltungen vorliegen.<br />" + - "Geben Sie in der Beschreibung kurz an, was in dieser Veranstaltung behandelt wird, evtl. auch mit welcher Software" + - "</div></html>"; - - int maxLifeTime = 180; // Anzahl Tage, die eine Veranstaltung in der Zukunft - // aktiv sein darf - boolean isDateOrderCorrect, isDateMaxLifeTimeCorrect, - isAllInformationReady = false; + public static final String HELP_MESSAGE = "<html><div align=\"center\">Geben Sie hier die Daten zu Ihrer Veranstaltung an.<br />" + + "Der Anzeigename ist nachher der Titel im VMChooser, also dort, wo die Studenten das Labor auswählen.<br />" + + "Eine Angabe des Namens des Dozenten kann daher hilfreich sein, wenn mehrere ähnliche Veranstaltungen vorliegen.<br />" + + "Geben Sie in der Beschreibung kurz an, was in dieser Veranstaltung behandelt wird, evtl. auch mit welcher Software" + + "</div></html>"; + + private int maxLifeTime = 180; // Anzahl Tage, die eine Veranstaltung in der Zukunft + // aktiv sein darf + private boolean isDateOrderCorrect, isDateMaxLifeTimeCorrect, isAllInformationReady = false; /** * Create the dialog. @@ -86,17 +80,9 @@ public class CreateLectureAllgemein_GUI extends JInternalFrame { setResizable(false); - try { - UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); - } catch (ClassNotFoundException | InstantiationException - | IllegalAccessException | UnsupportedLookAndFeelException e) { - - e.printStackTrace(); - } - setTitle("bwLehrpool Suite - Veranstaltung erzeugen - "+person.verantwortlicher.getUserID()); + setTitle("bwLehrpool Suite - Veranstaltung erzeugen - " + person.verantwortlicher.getUserID()); setBounds(0, 0, 603, 722); - getContentPane().setLayout(null); { JPanel panel = new JPanel(); @@ -127,8 +113,8 @@ public class CreateLectureAllgemein_GUI extends JInternalFrame { JPanel panel_1 = new JPanel(); panel_1.setBackground(SystemColor.menu); - panel_1.setBorder(new TitledBorder(null, "Informationen zum Besitzer", - TitledBorder.LEADING, TitledBorder.TOP, null, null)); + panel_1.setBorder(new TitledBorder(null, "Informationen zum Besitzer", TitledBorder.LEADING, + TitledBorder.TOP, null, null)); panel_1.setBounds(10, 331, 557, 162); contentPanel.add(panel_1); panel_1.setLayout(null); @@ -226,8 +212,8 @@ public class CreateLectureAllgemein_GUI extends JInternalFrame { JPanel panel_2 = new JPanel(); panel_2.setLayout(null); - panel_2.setBorder(new TitledBorder(null, "Veranstaltungsdaten", - TitledBorder.LEADING, TitledBorder.TOP, null, null)); + panel_2.setBorder(new TitledBorder(null, "Veranstaltungsdaten", TitledBorder.LEADING, + TitledBorder.TOP, null, null)); panel_2.setBackground(SystemColor.menu); panel_2.setBounds(10, 36, 557, 284); contentPanel.add(panel_2); @@ -245,7 +231,8 @@ public class CreateLectureAllgemein_GUI extends JInternalFrame { JTextArea txtrGebenSieBitte = new JTextArea(); txtrGebenSieBitte.setEditable(false); txtrGebenSieBitte.setWrapStyleWord(true); - txtrGebenSieBitte.setText("Geben Sie bitte einen sprechenden Namen für die Veranstaltung an. Dieser soll jedoch recht spezifisch sein.\r\nBeispiel: \"Grundlagen Programmieren Sommersemester...\", nicht \"Programmieren\""); + txtrGebenSieBitte + .setText("Geben Sie bitte einen sprechenden Namen für die Veranstaltung an. Dieser soll jedoch recht spezifisch sein.\r\nBeispiel: \"Grundlagen Programmieren Sommersemester...\", nicht \"Programmieren\""); txtrGebenSieBitte.setLineWrap(true); txtrGebenSieBitte.setFont(new Font("Tahoma", Font.PLAIN, 12)); txtrGebenSieBitte.setBackground(SystemColor.menu); @@ -267,15 +254,13 @@ public class CreateLectureAllgemein_GUI extends JInternalFrame { description.setBounds(0, 0, 4, 22); scrollPane.add(description); dateChooserstart = new JDateChooser(); - dateChooserstart - .addPropertyChangeListener(new PropertyChangeListener() { - public void propertyChange(PropertyChangeEvent arg0) { - endDate = addDays(dateChooserstart.getDate(), - maxLifeTime); // Datum darf weiter als 6 - // Monate in der Zukunft - // liegen - } - }); + dateChooserstart.addPropertyChangeListener(new PropertyChangeListener() { + public void propertyChange(PropertyChangeEvent arg0) { + endDate = addDays(dateChooserstart.getDate(), maxLifeTime); // Datum darf weiter als 6 + // Monate in der Zukunft + // liegen + } + }); if (Lecture.lecture.getStartdate() == null) { // is not defined yet dateChooserstart.setDate(startDate); @@ -366,8 +351,7 @@ public class CreateLectureAllgemein_GUI extends JInternalFrame { Lecture.lecture.setActive(false); } - Lecture.lecture.setName(txtFldVeranstaltungsname - .getText().trim()); + Lecture.lecture.setName(txtFldVeranstaltungsname.getText().trim()); Lecture.lecture.setDesc(description.getText().trim()); Lecture.lecture.setEnddate(dateChooserend.getDate()); Lecture.lecture.setStartdate(dateChooserstart.getDate()); @@ -383,16 +367,12 @@ public class CreateLectureAllgemein_GUI extends JInternalFrame { continueButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { // liegt das End-Datum vor dem Start-Datum? - if (dateChooserend.getDate().before( - dateChooserstart.getDate())) { + if (dateChooserend.getDate().before(dateChooserstart.getDate())) { // datum ist falsch rum isDateOrderCorrect = false; - JOptionPane - .showMessageDialog( - c, - "Das End-Datum liegt vor dem Start-Datum. Bitte ändern.", - "Datum fehlerhaft", - JOptionPane.INFORMATION_MESSAGE); + JOptionPane.showMessageDialog(null, + "Das End-Datum liegt vor dem Start-Datum. Bitte ändern.", + "Datum fehlerhaft", JOptionPane.INFORMATION_MESSAGE); } else { // bereit isDateOrderCorrect = true; @@ -402,10 +382,9 @@ public class CreateLectureAllgemein_GUI extends JInternalFrame { if (dateChooserend.getDate().after(endDate)) { // Datum zu weit weg isDateMaxLifeTimeCorrect = false; - JOptionPane.showMessageDialog(c, + JOptionPane.showMessageDialog(null, "Das End-Datum liegt zu weit in der Zukunft. Erlaubt ist maximal:\n" - + endDate, "Datum fehlerhaft", - JOptionPane.INFORMATION_MESSAGE); + + endDate, "Datum fehlerhaft", JOptionPane.INFORMATION_MESSAGE); dateChooserend.setDate(endDate); // setze Datum auf // maximum @@ -418,12 +397,9 @@ public class CreateLectureAllgemein_GUI extends JInternalFrame { || description.getText().trim().isEmpty() == true) { // mind 1 Textfeld ist leer isAllInformationReady = false; - JOptionPane - .showMessageDialog( - c, - "Bitte geben Sie einen Veranstaltungsnamen und eine Beschreibung ein.", - "Datum fehlerhaft", - JOptionPane.INFORMATION_MESSAGE); + JOptionPane.showMessageDialog(null, + "Bitte geben Sie einen Veranstaltungsnamen und eine Beschreibung ein.", + "Datum fehlerhaft", JOptionPane.INFORMATION_MESSAGE); } else { // Textfelder bereit isAllInformationReady = true; @@ -437,17 +413,13 @@ public class CreateLectureAllgemein_GUI extends JInternalFrame { } // Pruefe ob alle Eingaben korrekt sind, dann mache // weiter - if (isAllInformationReady == true - && isDateMaxLifeTimeCorrect == true - && isDateOrderCorrect == true - && descriptionLenghtOK() == true) { + if (isAllInformationReady == true && isDateMaxLifeTimeCorrect == true + && isDateOrderCorrect == true && descriptionLenghtOK() == true) { // everything is ok, proceed - Lecture.lecture.setName(txtFldVeranstaltungsname - .getText().trim()); + Lecture.lecture.setName(txtFldVeranstaltungsname.getText().trim()); Lecture.lecture.setDesc(description.getText().trim()); Lecture.lecture.setEnddate(dateChooserend.getDate()); - Lecture.lecture.setStartdate(dateChooserstart - .getDate()); + Lecture.lecture.setStartdate(dateChooserstart.getDate()); GuiManager.show(new PermissionCreateLecture_GUI()); } @@ -486,10 +458,9 @@ public class CreateLectureAllgemein_GUI extends JInternalFrame { // max length is 254 chars if (description.getText().trim().length() >= MAX_DESCRIPTION_LENGTH) { descriptionLengthOK = false; - JOptionPane.showMessageDialog(c, + JOptionPane.showMessageDialog(null, "Die Beschreibung darf max 254 Zeichen enthalten. Aktuell enthält sie " - + description.getText().trim().length() + ".", - "Beschreibung zu umfangreich", + + description.getText().trim().length() + ".", "Beschreibung zu umfangreich", JOptionPane.INFORMATION_MESSAGE); } else { descriptionLengthOK = true; diff --git a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java index 5bd5d84c..c4627a3a 100644 --- a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java @@ -4,7 +4,6 @@ import gui.image.FTPCreateUploader_GUI; import gui.intro.MainMenue_GUI; import java.awt.Color; -import java.awt.Component; import java.awt.FlowLayout; import java.awt.Font; import java.awt.SystemColor; @@ -28,7 +27,6 @@ import javax.swing.JInternalFrame; import javax.swing.JLabel; import javax.swing.JOptionPane; import javax.swing.JPanel; -import javax.swing.JRadioButton; import javax.swing.JScrollPane; import javax.swing.JSeparator; import javax.swing.JTable; @@ -36,8 +34,6 @@ import javax.swing.JTextArea; import javax.swing.JTextField; import javax.swing.JTextPane; import javax.swing.RowFilter; -import javax.swing.UIManager; -import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; import javax.swing.border.TitledBorder; import javax.swing.event.InternalFrameAdapter; @@ -62,36 +58,30 @@ import util.GuiManager; @SuppressWarnings("serial") public class CreateLectureLink_GUI extends JInternalFrame { - + private final static Logger LOGGER = Logger.getLogger(FTPCreateUploader_GUI.class); private final JPanel contentPanel = new JPanel(); - String[] result; - JRadioButton rdbtnInternetJa; - JRadioButton rdbtnInternetNein; - JComboBox<String> comboBox; - JLabel labelName; - JLabel labelUpdate; - JLabel labelVerantwortlicher; - JLabel labelWeitereVerantwortliche; - JLabel labelVorlage; - JLabel labelLizenzSoftware; - JLabel labelInternet; - JLabel labelRam; - JLabel labelCPU; - JLabel labelID; - JLabel labelVersion; - JTextArea textAreadesc; + private JComboBox<String> comboBox; + private JLabel labelName; + private JLabel labelUpdate; + private JLabel labelVerantwortlicher; + private JLabel labelWeitereVerantwortliche; + private JLabel labelVorlage; + private JLabel labelLizenzSoftware; + private JLabel labelInternet; + private JLabel labelRam; + private JLabel labelCPU; + private JLabel labelID; + private JLabel labelVersion; + private JTextArea textAreadesc; private JLabel labelOS; - JTable tableAllImages = new JTable(); - JTable tablemyImages = new JTable(); - boolean activeSearch = false; - Component c = null; + private JTable tablemyImages = new JTable(); private JTextField textFieldName; private JLabel lblTotalResults; private String uuid = null; - String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", - "Verantwortlicher", "Letztes Update", "ID", "Version", "Template", "Beschreibung" }; + private String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", + "Letztes Update", "ID", "Version", "Template", "Beschreibung" }; public static final String HELP_MESSAGE = "<html><div align=\"center\">" + "Damit Ihre Veranstaltung geladen werden kann, muss sie mit einem Image verbunden werden.<br />" @@ -99,36 +89,25 @@ public class CreateLectureLink_GUI extends JInternalFrame { + "Wählen Sie das Image aus, das zu Ihrer Veranstaltung passt und klicken Sie anschließend auf \"Veranstaltung erzeugen\"." + "</div></html>"; - /*final DefaultTableModel modelAll = new DefaultTableModel(titles, 0) { - public boolean isCellEditable(int rowIndex, int mColIndex) { - return false; - } - - };*/ - final DefaultTableModel modelMyImages = new DefaultTableModel(titles, 0) { + private final DefaultTableModel modelMyImages = new DefaultTableModel(titles, 0) { public boolean isCellEditable(int rowIndex, int mColIndex) { return false; } }; - - final TableRowSorter<TableModel> rowSorterMyImages = new TableRowSorter<TableModel>( - modelMyImages); - - - RowFilter<Object, Object> rf = null; - List<RowFilter<Object,Object>> filters = new ArrayList<RowFilter<Object,Object>>(2); + private final TableRowSorter<TableModel> rowSorterMyImages = new TableRowSorter<TableModel>(modelMyImages); + + private RowFilter<Object, Object> rf = null; + private List<RowFilter<Object, Object>> filters = new ArrayList<RowFilter<Object, Object>>(2); /** * Create the dialog. */ public CreateLectureLink_GUI() { - filters.add(RowFilter.regexFilter(".", 0)); rf = RowFilter.orFilter(filters); - - + addInternalFrameListener(new InternalFrameAdapter() { @Override public void internalFrameActivated(InternalFrameEvent arg0) { @@ -166,33 +145,27 @@ public class CreateLectureLink_GUI extends JInternalFrame { tablemyImages.getColumnModel().getColumn(9).setWidth(0); tablemyImages.getColumnModel().getColumn(9).setMinWidth(0); tablemyImages.getColumnModel().getColumn(9).setMaxWidth(0); - + tablemyImages.getTableHeader().setReorderingAllowed(false); - + tablemyImages.addMouseListener(new MouseAdapter() { @Override public void mouseReleased(MouseEvent e) { tablemyImages.clearSelection(); //just one row is selectablemyImages - tablemyImages.setRowSelectionInterval(tablemyImages.rowAtPoint(e.getPoint()), tablemyImages.rowAtPoint(e.getPoint())); + tablemyImages.setRowSelectionInterval(tablemyImages.rowAtPoint(e.getPoint()), + tablemyImages.rowAtPoint(e.getPoint())); } }); - + textFieldName.requestFocusInWindow(); } }); setResizable(false); - try { - UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); - } catch (ClassNotFoundException | InstantiationException - | IllegalAccessException | UnsupportedLookAndFeelException e) { - - e.printStackTrace(); - } - setTitle("bwLehrpool Suite - Veranstaltung erzeugen - "+person.verantwortlicher.getUserID()); + setTitle("bwLehrpool Suite - Veranstaltung erzeugen - " + person.verantwortlicher.getUserID()); setBounds(0, 0, 918, 722); getContentPane().setLayout(null); @@ -203,8 +176,7 @@ public class CreateLectureLink_GUI extends JInternalFrame { getContentPane().add(panel); panel.setLayout(null); { - JLabel lblNewLabel = new JLabel( - "Veranstaltung auf ein Image verlinken"); + JLabel lblNewLabel = new JLabel("Veranstaltung auf ein Image verlinken"); lblNewLabel.setBounds(10, 11, 509, 22); panel.add(lblNewLabel); lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18)); @@ -213,8 +185,7 @@ public class CreateLectureLink_GUI extends JInternalFrame { JTextPane txtpnBitteWhlenSie = new JTextPane(); txtpnBitteWhlenSie.setEditable(false); txtpnBitteWhlenSie.setBackground(SystemColor.menu); - txtpnBitteWhlenSie - .setText("Wählen Sie bitte ein Image aus, auf dem Ihre Veranstaltung basiert."); + txtpnBitteWhlenSie.setText("Wählen Sie bitte ein Image aus, auf dem Ihre Veranstaltung basiert."); txtpnBitteWhlenSie.setBounds(10, 36, 509, 32); panel.add(txtpnBitteWhlenSie); } @@ -226,8 +197,8 @@ public class CreateLectureLink_GUI extends JInternalFrame { JPanel panel_1 = new JPanel(); panel_1.setBackground(SystemColor.menu); - panel_1.setBorder(new TitledBorder(null, "Filterfunktionen", - TitledBorder.LEADING, TitledBorder.TOP, null, null)); + panel_1.setBorder(new TitledBorder(null, "Filterfunktionen", TitledBorder.LEADING, TitledBorder.TOP, + null, null)); panel_1.setBounds(10, 49, 557, 92); contentPanel.add(panel_1); panel_1.setLayout(null); @@ -247,24 +218,21 @@ public class CreateLectureLink_GUI extends JInternalFrame { String stext = textFieldName.getText().trim(); // Wenn Textfield nicht leer if (stext != "") { - activeSearch = true; // Filtere nach der Eingabe - filters.clear(); - filters.add(RowFilter.regexFilter("(?i)"+stext, 0)); //case insensitive - filters.add(RowFilter.regexFilter("(?i)"+stext, 9)); //case insensitive + filters.clear(); + filters.add(RowFilter.regexFilter("(?i)" + stext, 0)); //case insensitive + filters.add(RowFilter.regexFilter("(?i)" + stext, 9)); //case insensitive rf = RowFilter.orFilter(filters); rowSorterMyImages.setRowFilter(rf); - } else { - activeSearch = false; filters.clear(); filters.add(RowFilter.regexFilter(".", 0)); //case insensitive, filter for anything rf = RowFilter.orFilter(filters); rowSorterMyImages.setRowFilter(rf); } tablemyImages.clearSelection(); - + resetLectureInfo(); } @@ -283,29 +251,25 @@ public class CreateLectureLink_GUI extends JInternalFrame { comboBox.addItem(list.get(i)); } } catch (TException e) { - + e.printStackTrace(); - JOptionPane.showMessageDialog(c, - e.getCause() + "\n" + e.getStackTrace(), "Debug-Message", + JOptionPane.showMessageDialog(null, e.getCause() + "\n" + e.getStackTrace(), "Debug-Message", JOptionPane.ERROR_MESSAGE); } comboBox.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { // Prueft das die Auswahl nicht leer ist if (comboBox.getSelectedItem().toString() != "") { - activeSearch = true; // rowSorterAll.setRowFilter(RowFilter.regexFilter(comboBox.getSelectedItem().toString(), // 2)); - rowSorterMyImages.setRowFilter(RowFilter.regexFilter( - comboBox.getSelectedItem().toString(), 2)); + rowSorterMyImages.setRowFilter(RowFilter.regexFilter(comboBox.getSelectedItem() + .toString(), 2)); // rowSorterPublicVorlagen.setRowFilter(RowFilter.regexFilter(comboBox.getSelectedItem().toString(), // 2)); } else { - activeSearch = false; String username = person.verantwortlicher.getName() + " " + person.verantwortlicher.getVorname(); - rowSorterMyImages.setRowFilter(RowFilter.regexFilter( - username, 4)); + rowSorterMyImages.setRowFilter(RowFilter.regexFilter(username, 4)); // rowSorterPublicVorlagen.setRowFilter(RowFilter.regexFilter("true", // 8)); // rowSorterAll.setRowFilter(null); @@ -346,37 +310,30 @@ public class CreateLectureLink_GUI extends JInternalFrame { JScrollPane scrollPaneMyImage = new JScrollPane(); scrollPaneMyImage.setBounds(10, 158, 557, 339); contentPanel.add(scrollPaneMyImage); - tablemyImages.getSelectionModel().addListSelectionListener( - new ListSelectionListener() { - public void valueChanged(ListSelectionEvent e) { - - if(tablemyImages.getSelectedRow() != -1) - { - String imageid = modelMyImages.getValueAt( - tablemyImages - .convertRowIndexToModel(tablemyImages - .getSelectedRow()), 6) - .toString(); - String version = modelMyImages.getValueAt( - tablemyImages - .convertRowIndexToModel(tablemyImages - .getSelectedRow()), 7) - .toString(); - try { - //write the image data to the information fields on the right - writeImageData(imageid, version); - } catch (TException e1) { - - e1.printStackTrace(); - } catch (ParseException e1) { - - e1.printStackTrace(); - } - } + tablemyImages.getSelectionModel().addListSelectionListener(new ListSelectionListener() { + public void valueChanged(ListSelectionEvent e) { + + if (tablemyImages.getSelectedRow() != -1) { + String imageid = modelMyImages.getValueAt( + tablemyImages.convertRowIndexToModel(tablemyImages.getSelectedRow()), 6) + .toString(); + String version = modelMyImages.getValueAt( + tablemyImages.convertRowIndexToModel(tablemyImages.getSelectedRow()), 7) + .toString(); + try { + //write the image data to the information fields on the right + writeImageData(imageid, version); + } catch (TException e1) { + + e1.printStackTrace(); + } catch (ParseException e1) { + + e1.printStackTrace(); } - - - }); + } + } + + }); tablemyImages.setModel(modelMyImages); tablemyImages.getColumnModel().getColumn(1).sizeWidthToFit(); tablemyImages.getColumnModel().getColumn(2).sizeWidthToFit(); @@ -386,7 +343,7 @@ public class CreateLectureLink_GUI extends JInternalFrame { tablemyImages.setRowSorter(rowSorterMyImages); scrollPaneMyImage.setViewportView(tablemyImages); - + lblTotalResults = new JLabel("Anzahl:"); lblTotalResults.setBounds(10, 512, 131, 20); contentPanel.add(lblTotalResults); @@ -409,95 +366,81 @@ public class CreateLectureLink_GUI extends JInternalFrame { getRootPane().setDefaultButton(cancelButton); } { - JButton doLinkButton = new JButton( - "Veranstaltung erzeugen und abschließen"); + JButton doLinkButton = new JButton("Veranstaltung erzeugen und abschließen"); doLinkButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { // check if a row is selected if (tablemyImages.getSelectedRow() != -1) { // a row is selected, do operations - String imageID = tablemyImages.getValueAt( - tablemyImages.getSelectedRow(), 6) + String imageID = tablemyImages.getValueAt(tablemyImages.getSelectedRow(), 6) .toString(); try { - DateFormat formatter = new SimpleDateFormat( - "yyyy-MM-dd HH:mm:ss"); - + DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + //create new lecture - ThriftManager.getSatClient().writeLecturedata( - Lecture.lecture.getName(), - Lecture.lecture.getShortDesc(), - Lecture.lecture.getDesc(), + ThriftManager.getSatClient().writeLecturedata(Lecture.lecture.getName(), + Lecture.lecture.getShortDesc(), Lecture.lecture.getDesc(), formatter.format(Lecture.lecture.getStartdate()).toString(), formatter.format(Lecture.lecture.getEnddate()).toString(), - Lecture.lecture.isActive(), - imageID, - SessionData.authToken, + Lecture.lecture.isActive(), imageID, SessionData.authToken, person.verantwortlicher.getTel(), - person.verantwortlicher.getFakultaet(), - uuid, + person.verantwortlicher.getFakultaet(), uuid, person.verantwortlicher.getHochschule()); System.out.println("imageID" + " " + imageID); System.out.println("lectureID" + " " + uuid); //set rights for this user - - ThriftManager.getSatClient().writeLectureRights( - uuid, - person.verantwortlicher.getRole(), - SessionData.authToken, + + ThriftManager.getSatClient().writeLectureRights(uuid, + person.verantwortlicher.getRole(), SessionData.authToken, person.verantwortlicher.getHochschule(), - person.verantwortlicher.getUserID() - ); - + person.verantwortlicher.getUserID()); + //set rights for additional users - for(int i=0; i< RightsManagement.rightsManagement.getPermittedUserList().size(); i++){ + for (int i = 0; i < RightsManagement.rightsManagement.getPermittedUserList() + .size(); i++) { //System.out.println("Writing additional rights for user "+RightsManagement.rightsManagement.getPermittedUserList().get(i).getUserID()+", User "+(i+1)+"/"+RightsManagement.rightsManagement.getPermittedUserList().size()); ThriftManager.getSatClient().writeAdditionalLectureRights( uuid, - RightsManagement.rightsManagement.getPermittedUserList().get(i).getUserID(), - RightsManagement.rightsManagement.getPermittedUserList().get(i).isLecture_read(), - RightsManagement.rightsManagement.getPermittedUserList().get(i).isLecture_write(), - RightsManagement.rightsManagement.getPermittedUserList().get(i).isLecture_admin(), - SessionData.authToken - ); - + RightsManagement.rightsManagement.getPermittedUserList().get(i) + .getUserID(), + RightsManagement.rightsManagement.getPermittedUserList().get(i) + .isLecture_read(), + RightsManagement.rightsManagement.getPermittedUserList().get(i) + .isLecture_write(), + RightsManagement.rightsManagement.getPermittedUserList().get(i) + .isLecture_admin(), SessionData.authToken); + }//end for - - LOGGER.info("Veranstaltung '"+Lecture.lecture.getName()+"' wurde erfolgreich angelegt."); - + + LOGGER.info("Veranstaltung '" + Lecture.lecture.getName() + + "' wurde erfolgreich angelegt."); + JOptionPane .showMessageDialog( - c, + null, "Ihre Veranstaltung wurde erfolgreich angelegt. Sie kehren nun zum Hauptmenü zurück.", - "Veranstaltung angelegt", - JOptionPane.INFORMATION_MESSAGE); + "Veranstaltung angelegt", JOptionPane.INFORMATION_MESSAGE); // zurueck zum Menue GuiManager.show(new MainMenue_GUI()); } catch (TException e1) { - LOGGER.error("Veranstaltung '"+Lecture.lecture.getName()+"' konnte nicht angelegt werden."); - + LOGGER.error("Veranstaltung '" + Lecture.lecture.getName() + + "' konnte nicht angelegt werden."); + e1.printStackTrace(); - JOptionPane - .showMessageDialog( - c, - "Beim Anlegen Ihrer Veranstaltung ist ein Fehler aufgetreten.", - "Error", - JOptionPane.ERROR_MESSAGE); - JOptionPane.showMessageDialog(c, e1.getCause() - + "\n" + e1.getStackTrace(), - "Debug-Message", - JOptionPane.ERROR_MESSAGE); + JOptionPane.showMessageDialog(null, + "Beim Anlegen Ihrer Veranstaltung ist ein Fehler aufgetreten.", + "Error", JOptionPane.ERROR_MESSAGE); + JOptionPane.showMessageDialog(null, e1.getCause() + "\n" + e1.getStackTrace(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); } dispose(); } else { // nothing selected - JOptionPane.showMessageDialog(c, - "Bitte wählen Sie ein Image aus.", - "Image Auswahl", - JOptionPane.INFORMATION_MESSAGE); + JOptionPane.showMessageDialog(null, "Bitte wählen Sie ein Image aus.", + "Image Auswahl", JOptionPane.INFORMATION_MESSAGE); } } @@ -576,8 +519,7 @@ public class CreateLectureLink_GUI extends JInternalFrame { labelLizenzSoftware.setBounds(10, 383, 296, 14); panel.add(labelLizenzSoftware); - JLabel lblLizenzpflichtigeSoftware = new JLabel( - "Lizenzpflichtige Software:"); + JLabel lblLizenzpflichtigeSoftware = new JLabel("Lizenzpflichtige Software:"); lblLizenzpflichtigeSoftware.setBounds(10, 367, 130, 14); panel.add(lblLizenzpflichtigeSoftware); @@ -638,31 +580,28 @@ public class CreateLectureLink_GUI extends JInternalFrame { textAreadesc.setBackground(SystemColor.menu); textAreadesc.setFont(new Font("Tahoma", Font.PLAIN, 11)); scrollPane.setViewportView(textAreadesc); - - try - { + + try { uuid = ThriftManager.getSatClient().createRandomUUID(SessionData.authToken); - } - catch (TException e1) - { + } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); } - } // Initiale Beffuelung eines Table models - public DefaultTableModel initTableModel(DefaultTableModel model) - throws TException, ParseException { + public DefaultTableModel initTableModel(DefaultTableModel model) throws TException, ParseException { List<Image> images; // Hole eine Liste der Images - if(person.verantwortlicher.getRole()=="Admin"){ + if (person.verantwortlicher.getRole() == "Admin") { //get complete list - images = ThriftManager.getSatClient().getImageList(person.verantwortlicher.getUserID(),SessionData.authToken); - } else { - images = ThriftManager.getSatClient().getImageListPermissionLink(person.verantwortlicher.getUserID(),SessionData.authToken); + images = ThriftManager.getSatClient().getImageList(person.verantwortlicher.getUserID(), + SessionData.authToken); + } else { + images = ThriftManager.getSatClient().getImageListPermissionLink( + person.verantwortlicher.getUserID(), SessionData.authToken); } Iterator<Image> i = images.iterator(); @@ -672,14 +611,10 @@ public class CreateLectureLink_GUI extends JInternalFrame { while (i.hasNext()) { // erzeuge Objekte fuer die Tabelle - Object[] obj = { images.get(x).getImageName(), - images.get(x).getLicenseRestriction(), - images.get(x).getOsName(), images.get(x).getLectureName(), - images.get(x).getUserData(), - out.format(in.parse(images.get(x).updateTime)), - images.get(x).id, images.get(x).getVersion(), - images.get(x).getIsTemplate(), - images.get(x).getDescription()}; + Object[] obj = { images.get(x).getImageName(), images.get(x).getLicenseRestriction(), + images.get(x).getOsName(), images.get(x).getLectureName(), images.get(x).getUserData(), + out.format(in.parse(images.get(x).updateTime)), images.get(x).id, + images.get(x).getVersion(), images.get(x).getIsTemplate(), images.get(x).getDescription() }; // Fuege diese Objekte der Tabelle hinzu model.addRow(obj); @@ -688,12 +623,12 @@ public class CreateLectureLink_GUI extends JInternalFrame { } //show number if rows in GUI - lblTotalResults.setText(lblTotalResults.getText()+" "+model.getRowCount()); - + lblTotalResults.setText(lblTotalResults.getText() + " " + model.getRowCount()); + return model; } - + private void resetLectureInfo() { //reset the detailed information on the right hand side when changing search string labelID.setText(""); @@ -711,12 +646,12 @@ public class CreateLectureLink_GUI extends JInternalFrame { labelCPU.setText(""); } - public void writeImageData(String id, String version) throws TException, - ParseException { + public void writeImageData(String id, String version) throws TException, ParseException { SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss"); - Map<String, String> res = ThriftManager.getSatClient().getImageData(id, version,SessionData.authToken); + Map<String, String> res = ThriftManager.getSatClient().getImageData(id, version, + SessionData.authToken); labelName.setText(res.get("name")); labelOS.setText(res.get("os")); labelUpdate.setText(out.format(in.parse(res.get("lastupdate")))); diff --git a/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java index fa5c84c5..71054020 100644 --- a/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java @@ -1,5 +1,6 @@ package gui.lecture; +import gui.helper.TableFiller; import gui.intro.MainMenue_GUI; import java.awt.Color; @@ -16,7 +17,6 @@ import java.awt.event.MouseEvent; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import java.util.Map; @@ -34,8 +34,6 @@ import javax.swing.JTextField; import javax.swing.JTextPane; import javax.swing.ListSelectionModel; import javax.swing.RowFilter; -import javax.swing.UIManager; -import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; import javax.swing.border.TitledBorder; import javax.swing.event.InternalFrameAdapter; @@ -59,8 +57,7 @@ import util.GuiManager; @SuppressWarnings("serial") public class DeleteLecture_GUI extends JInternalFrame { - private final static Logger LOGGER = Logger - .getLogger(DeleteLecture_GUI.class); + private final static Logger LOGGER = Logger.getLogger(DeleteLecture_GUI.class); private final JPanel contentPanel = new JPanel(); String[] result; @@ -78,21 +75,16 @@ public class DeleteLecture_GUI extends JInternalFrame { private JTextField textFieldName; private JLabel lblTotalResults; boolean activeSearch = false; - String[] titles = { "Veranstaltungsname", "Beschreibung", - "Gültigkeitsdatum", "Aktiv", "Letzte Benutzung", - "Verantwortlicher", "Image", "Schlagwort", "ID" }; + String[] titles = { "Veranstaltungsname", "Beschreibung", "Gültigkeitsdatum", "Aktiv", + "Letzte Benutzung", "Verantwortlicher", "Image", "Schlagwort", "ID" }; - final DefaultTableModel modelMyLectures = new DefaultTableModel(titles, 0){ + final DefaultTableModel modelMyLectures = new DefaultTableModel(titles, 0) { public boolean isCellEditable(int rowIndex, int mColIndex) { return false; } }; - - - - final TableRowSorter<TableModel> rowSorterMyLectures = new TableRowSorter<TableModel>( - modelMyLectures); + final TableRowSorter<TableModel> rowSorterMyLectures = new TableRowSorter<TableModel>(modelMyLectures); private JButton button; Component c = null; @@ -110,7 +102,6 @@ public class DeleteLecture_GUI extends JInternalFrame { * Create the dialog. */ public DeleteLecture_GUI() { - filters.add(RowFilter.regexFilter(".", 0)); rf = RowFilter.orFilter(filters); @@ -119,13 +110,7 @@ public class DeleteLecture_GUI extends JInternalFrame { @Override public void internalFrameActivated(InternalFrameEvent arg0) { textFieldName.requestFocusInWindow(); - try { - initTableModel(modelMyLectures); - - } catch (ParseException e) { - - e.printStackTrace(); - } + initTableModel(modelMyLectures); // auszublendende Angaben // 1=Beschreibung @@ -153,17 +138,17 @@ public class DeleteLecture_GUI extends JInternalFrame { tablemyLectures.getColumnModel().getColumn(8).setWidth(0); tablemyLectures.getColumnModel().getColumn(8).setMinWidth(0); tablemyLectures.getColumnModel().getColumn(8).setMaxWidth(0); - + tablemyLectures.getTableHeader().setReorderingAllowed(false); tablemyLectures.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); tablemyLectures.addMouseListener(new MouseAdapter() { @Override - public void mouseReleased(MouseEvent e) - { + public void mouseReleased(MouseEvent e) { tablemyLectures.clearSelection(); //just one row is selectablemyLectures - tablemyLectures.setRowSelectionInterval(tablemyLectures.rowAtPoint(e.getPoint()), tablemyLectures.rowAtPoint(e.getPoint())); + tablemyLectures.setRowSelectionInterval(tablemyLectures.rowAtPoint(e.getPoint()), + tablemyLectures.rowAtPoint(e.getPoint())); System.out.println(tablemyLectures.getSelectedRow()); } }); @@ -173,19 +158,11 @@ public class DeleteLecture_GUI extends JInternalFrame { // Verhindert das Vergroessern Des Fensters setResizable(false); - try { - // Setzt das Look & Feel auf System - UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); - } catch (ClassNotFoundException | InstantiationException - | IllegalAccessException | UnsupportedLookAndFeelException e) { - - e.printStackTrace(); - } // Setzt den Fenstertitel - setTitle("bwLehrpool Suite - Veranstaltung löschen - "+person.verantwortlicher.getUserID()); + setTitle("bwLehrpool Suite - Veranstaltung löschen - " + person.verantwortlicher.getUserID()); // Zentriert das Fenster in die Bildmitte setBounds(0, 0, 842, 722); - + getContentPane().setLayout(null); { JPanel panel = new JPanel(); @@ -216,12 +193,12 @@ public class DeleteLecture_GUI extends JInternalFrame { JPanel panel_1 = new JPanel(); panel_1.setBackground(SystemColor.menu); - panel_1.setBorder(new TitledBorder(null, "Filterfunktionen", - TitledBorder.LEADING, TitledBorder.TOP, null, null)); + panel_1.setBorder(new TitledBorder(null, "Filterfunktionen", TitledBorder.LEADING, TitledBorder.TOP, + null, null)); panel_1.setBounds(10, 49, 557, 64); contentPanel.add(panel_1); panel_1.setLayout(null); - + JLabel lblNewLabel_2 = new JLabel("Volltextsuche:"); lblNewLabel_2.setBounds(30, 30, 80, 20); panel_1.add(lblNewLabel_2); @@ -291,7 +268,7 @@ public class DeleteLecture_GUI extends JInternalFrame { JLabel label_2 = new JLabel(">"); label_2.setBounds(152, 11, 13, 14); contentPanel.add(label_2); - + lblTotalResults = new JLabel("Anzahl:"); lblTotalResults.setBounds(10, 500, 131, 20); contentPanel.add(lblTotalResults); @@ -303,31 +280,27 @@ public class DeleteLecture_GUI extends JInternalFrame { scrollPaneMyImage.setBounds(10, 120, 552, 369); contentPanel.add(scrollPaneMyImage); tablemyLectures = new JTable(); - tablemyLectures.getSelectionModel().addListSelectionListener( - new ListSelectionListener() { - public void valueChanged(ListSelectionEvent e) { - - if (tablemyLectures.getSelectedRow() != -1) { - String imageid = modelMyLectures - .getValueAt( - tablemyLectures - .convertRowIndexToModel(tablemyLectures - .getSelectedRow()), - 8).toString(); - - try { - writeLectureData(imageid); - } catch (TException e1) { - - e1.printStackTrace(); - } catch (ParseException e1) { - - e1.printStackTrace(); - } - } + tablemyLectures.getSelectionModel().addListSelectionListener(new ListSelectionListener() { + public void valueChanged(ListSelectionEvent e) { + + if (tablemyLectures.getSelectedRow() != -1) { + String imageid = modelMyLectures.getValueAt( + tablemyLectures.convertRowIndexToModel(tablemyLectures.getSelectedRow()), 8) + .toString(); + + try { + writeLectureData(imageid); + } catch (TException e1) { + + e1.printStackTrace(); + } catch (ParseException e1) { + + e1.printStackTrace(); } + } + } - }); + }); tablemyLectures.setModel(modelMyLectures); tablemyLectures.getColumnModel().getColumn(1).sizeWidthToFit(); @@ -351,47 +324,33 @@ public class DeleteLecture_GUI extends JInternalFrame { if (tablemyLectures.getSelectedRowCount() != 0) { // a row is selected // ask for confirmation - eingabe = JOptionPane.showConfirmDialog(c, - "Wollen Sie diese Daten löschen?", "Löschen?", + eingabe = JOptionPane.showConfirmDialog(c, "Wollen Sie diese Daten löschen?", "Löschen?", JOptionPane.YES_NO_OPTION); if (eingabe == JOptionPane.YES_OPTION) { // user has confirmed deletion, now get the ID of the // selected lecture - lectureID = modelMyLectures - .getValueAt( - tablemyLectures - .convertRowIndexToModel(tablemyLectures - .getSelectedRow()), - 8).toString(); - + lectureID = modelMyLectures.getValueAt( + tablemyLectures.convertRowIndexToModel(tablemyLectures.getSelectedRow()), 8) + .toString(); + //int test = tablemyLectures.convertColumnIndexToModel(tablemyLectures.getSelectedRow()); - - + // LOGGER.info("Lösche Veranstaltung: " + lectureID); try { - if (ThriftManager.getSatClient().deleteLecture( - lectureID, - SessionData.authToken, - person.verantwortlicher.getHochschule() - ) - ) - { - + if (ThriftManager.getSatClient().deleteLecture(lectureID, SessionData.authToken, + person.verantwortlicher.getHochschule())) { + // delete successful - LOGGER.info("Veranstaltung erfolgreich '"+lectureID+"' gelöscht."); + LOGGER.info("Veranstaltung erfolgreich '" + lectureID + "' gelöscht."); GuiManager.show(new DeleteLecture_GUI()); } else { // delete not successful - LOGGER.error("Konnte Veranstaltung '" - + lectureID + LOGGER.error("Konnte Veranstaltung '" + lectureID + "' nicht aus der Datenbank löschen!"); - JOptionPane - .showMessageDialog( - c, - "Löschen der Veranstaltung aus der Datenbank fehlgeschlagen.", - "Fehler", - JOptionPane.INFORMATION_MESSAGE); + JOptionPane.showMessageDialog(c, + "Löschen der Veranstaltung aus der Datenbank fehlgeschlagen.", + "Fehler", JOptionPane.INFORMATION_MESSAGE); } } catch (TException e1) { @@ -521,59 +480,33 @@ public class DeleteLecture_GUI extends JInternalFrame { scrollPaneName.setBounds(10, 40, 218, 55); panel.add(scrollPaneName); - } // Initiale Beffuelung eines Table models - public DefaultTableModel initTableModel(DefaultTableModel model) - throws ParseException { + public DefaultTableModel initTableModel(DefaultTableModel model) { List<Lecture> lectures; try { - + // Hole eine Liste der erlaubten Images für die diese Person - if(person.verantwortlicher.getRole()=="Admin") - { + if (person.verantwortlicher.getRole() == "Admin") { //get complete list lectures = ThriftManager.getSatClient().getLectureList(SessionData.authToken); - } - else - { + } else { //get permitted list lectures = ThriftManager.getSatClient().getLectureListPermissionAdmin(SessionData.authToken); } - - Iterator<Lecture> i = lectures.iterator(); - SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss"); - int x = 0; - - while (i.hasNext()) { - // erzeuge Objekte fuer die Tabelle - Object[] obj = { - lectures.get(x).lecturename, - lectures.get(x).desc, - out.format(in.parse(lectures.get(x).starttime)) + " " - + out.format(in.parse(lectures.get(x).endtime)), - lectures.get(x).isActive, - out.format(in.parse(lectures.get(x).lastused)), - lectures.get(x).username, lectures.get(x).imagename, - " ", lectures.get(x).id, }; - // Fuege diese Objekte der Tabelle hinzu - model.addRow(obj); - x++; - i.next(); - } + TableFiller.fillModelWithLectureList(model, lectures); //show number if rows in GUI - lblTotalResults.setText(lblTotalResults.getText()+" "+model.getRowCount()); + lblTotalResults.setText(lblTotalResults.getText() + " " + model.getRowCount()); return model; } catch (TException e1) { e1.printStackTrace(); } - + return model; } @@ -597,15 +530,14 @@ public class DeleteLecture_GUI extends JInternalFrame { SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss"); - Map<String, String> res = ThriftManager.getSatClient().getLectureData(id,SessionData.authToken); + Map<String, String> res = ThriftManager.getSatClient().getLectureData(id, SessionData.authToken); labelName.setText(res.get("name")); labelAktiv.setText(res.get("isActive")); labeldesc.setText(res.get("desc")); labelVerantwortlicher.setText(res.get("owner")); labelstartdate.setText(out.format(in.parse(res.get("startTime")))); labelenddate.setText(out.format(in.parse(res.get("endTime")))); - labelimage.setText(res.get("imagepath").substring( - res.get("imagepath").indexOf("/") + 1)); + labelimage.setText(res.get("imagepath").substring(res.get("imagepath").indexOf("/") + 1)); labelimageversion.setText(res.get("imageversion")); } diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java index b36ff94f..403db9dc 100644 --- a/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java @@ -3,7 +3,6 @@ package gui.lecture; import gui.intro.MainMenue_GUI; import java.awt.Color; -import java.awt.Component; import java.awt.FlowLayout; import java.awt.Font; import java.awt.ScrollPane; @@ -28,8 +27,6 @@ import javax.swing.JSeparator; import javax.swing.JTextArea; import javax.swing.JTextField; import javax.swing.JTextPane; -import javax.swing.UIManager; -import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; import javax.swing.border.TitledBorder; @@ -46,62 +43,48 @@ import util.GuiManager; import com.toedter.calendar.JDateChooser; - @SuppressWarnings("serial") public class EditLectureAllgemein_GUI extends JInternalFrame { private final JPanel contentPanel = new JPanel(); - String[] result; private JTextField Vorname; private JTextField Nachname; private JTextField Hochschule; private JTextField EMail; private JTextField textFieldLaborname; - JTextArea description; - JRadioButton radioButtonyes; - JDateChooser dateChooserend; - JDateChooser dateChooserstart; - JRadioButton radioButtonno; - Date startDate = new Date(); - Date endDate; - Component c = null; + private JTextArea description; + private JRadioButton radioButtonyes; + private JDateChooser dateChooserend; + private JDateChooser dateChooserstart; + private JRadioButton radioButtonno; + private Date startDate = new Date(); + private Date endDate; private final ButtonGroup buttonGroup = new ButtonGroup(); private boolean descriptionLengthOK = false; // description may not be // longer than // MAX_DESCRIPTION_LENGTH private final int MAX_DESCRIPTION_LENGTH = 254; - - int maxLifeTime = 180; // Anzahl Tage, die eine Veranstaltung in der Zukunft + + private int maxLifeTime = 180; // Anzahl Tage, die eine Veranstaltung in der Zukunft // aktiv sein darf - boolean isDateOrderCorrect, isDateMaxLifeTimeCorrect, - isAllInformationReady = false; - - public static final String HELP_MESSAGE = "<html><div align=\"center\">" + - "Bearbeiten Sie hier Ihre allgemeinen Informationen zu einer Veranstaltung.<br />" + - "Sie können auch den Zeitraum neu wählen und die Beschreibung ändern.<br />" + - "Klicken Sie anschließend auf \"Witer\" um die Daten im nächsten Schritt zu übernehmen." + - "</div></html>"; - + private boolean isDateOrderCorrect, isDateMaxLifeTimeCorrect, isAllInformationReady = false; + + public static final String HELP_MESSAGE = "<html><div align=\"center\">" + + "Bearbeiten Sie hier Ihre allgemeinen Informationen zu einer Veranstaltung.<br />" + + "Sie können auch den Zeitraum neu wählen und die Beschreibung ändern.<br />" + + "Klicken Sie anschließend auf \"Witer\" um die Daten im nächsten Schritt zu übernehmen." + + "</div></html>"; + /** * Create the dialog. */ public EditLectureAllgemein_GUI() { - setResizable(false); - try { - UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); - } catch (ClassNotFoundException | InstantiationException - | IllegalAccessException | UnsupportedLookAndFeelException e) { - - e.printStackTrace(); - } - setTitle("bwLehrpool Suite - Veranstaltung bearbeiten - "+person.verantwortlicher.getUserID()); - ; + setTitle("bwLehrpool Suite - Veranstaltung bearbeiten - " + person.verantwortlicher.getUserID()); setBounds(0, 0, 603, 722); - getContentPane().setLayout(null); { JPanel panel = new JPanel(); @@ -132,8 +115,8 @@ public class EditLectureAllgemein_GUI extends JInternalFrame { JPanel panel_1 = new JPanel(); panel_1.setBackground(SystemColor.menu); - panel_1.setBorder(new TitledBorder(null, "Informationen zum Besitzer", - TitledBorder.LEADING, TitledBorder.TOP, null, null)); + panel_1.setBorder(new TitledBorder(null, "Informationen zum Besitzer", TitledBorder.LEADING, + TitledBorder.TOP, null, null)); panel_1.setBounds(10, 331, 557, 162); contentPanel.add(panel_1); panel_1.setLayout(null); @@ -235,8 +218,8 @@ public class EditLectureAllgemein_GUI extends JInternalFrame { JPanel panel_2 = new JPanel(); panel_2.setLayout(null); - panel_2.setBorder(new TitledBorder(null, "Veranstaltungsdaten", - TitledBorder.LEADING, TitledBorder.TOP, null, null)); + panel_2.setBorder(new TitledBorder(null, "Veranstaltungsdaten", TitledBorder.LEADING, + TitledBorder.TOP, null, null)); panel_2.setBackground(SystemColor.menu); panel_2.setBounds(10, 36, 557, 284); contentPanel.add(panel_2); @@ -254,7 +237,8 @@ public class EditLectureAllgemein_GUI extends JInternalFrame { JTextArea txtrGebenSieBitte = new JTextArea(); txtrGebenSieBitte.setEditable(false); txtrGebenSieBitte.setWrapStyleWord(true); - txtrGebenSieBitte.setText("Geben Sie bitte einen sprechenden Namen für die Veranstaltung an. Dieser soll jedoch recht spezifisch sein.\r\nBeispiel: \"Programmieren 1\", nicht \"Programmieren\""); + txtrGebenSieBitte + .setText("Geben Sie bitte einen sprechenden Namen für die Veranstaltung an. Dieser soll jedoch recht spezifisch sein.\r\nBeispiel: \"Programmieren 1\", nicht \"Programmieren\""); txtrGebenSieBitte.setLineWrap(true); txtrGebenSieBitte.setFont(new Font("Tahoma", Font.PLAIN, 12)); txtrGebenSieBitte.setBackground(SystemColor.menu); @@ -287,15 +271,13 @@ public class EditLectureAllgemein_GUI extends JInternalFrame { panel_2.add(label_5); dateChooserstart = new JDateChooser(); - dateChooserstart - .addPropertyChangeListener(new PropertyChangeListener() { - public void propertyChange(PropertyChangeEvent arg0) { - endDate = addDays(dateChooserstart.getDate(), - maxLifeTime); // Datum darf weiter als 6 - // Monate in der Zukunft - // liegen - } - }); + dateChooserstart.addPropertyChangeListener(new PropertyChangeListener() { + public void propertyChange(PropertyChangeEvent arg0) { + endDate = addDays(dateChooserstart.getDate(), maxLifeTime); // Datum darf weiter als 6 + // Monate in der Zukunft + // liegen + } + }); // initialize if (Lecture.lecture.getStartdate() == null) { @@ -335,22 +317,21 @@ public class EditLectureAllgemein_GUI extends JInternalFrame { buttonGroup.add(radioButtonyes); radioButtonyes.setBounds(240, 225, 109, 23); panel_2.add(radioButtonyes); - - + radioButtonno = new JRadioButton("Nein"); buttonGroup.add(radioButtonno); radioButtonno.setBounds(385, 225, 109, 23); panel_2.add(radioButtonno); - + //set button value - if(Lecture.lecture.isActive()==true){ + if (Lecture.lecture.isActive() == true) { radioButtonyes.setSelected(true); radioButtonno.setSelected(false); } else { radioButtonyes.setSelected(false); radioButtonno.setSelected(true); } - + radioButtonyes.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { radioButtonyes.setSelected(true); @@ -393,8 +374,8 @@ public class EditLectureAllgemein_GUI extends JInternalFrame { Lecture.lecture.setDesc(description.getText().trim()); Lecture.lecture.setEnddate(dateChooserend.getDate()); Lecture.lecture.setStartdate(dateChooserstart.getDate()); - Image.image.setImagename(textFieldLaborname.getText().trim()); - + Image.Imagename = textFieldLaborname.getText().trim(); + GuiManager.show(new EditLectureSearch_GUI()); } }); @@ -405,19 +386,15 @@ public class EditLectureAllgemein_GUI extends JInternalFrame { { JButton cancelButton = new JButton("Weiter"); cancelButton.addActionListener(new ActionListener() { - + public void actionPerformed(ActionEvent e) { // liegt das End-Datum vor dem Start-Datum? - if (dateChooserend.getDate().before( - dateChooserstart.getDate())) { + if (dateChooserend.getDate().before(dateChooserstart.getDate())) { // datum ist falsch rum isDateOrderCorrect = false; - JOptionPane - .showMessageDialog( - c, - "Das End-Datum liegt vor dem Start-Datum. Bitte ändern.", - "Datum fehlerhaft", - JOptionPane.INFORMATION_MESSAGE); + JOptionPane.showMessageDialog(null, + "Das End-Datum liegt vor dem Start-Datum. Bitte ändern.", + "Datum fehlerhaft", JOptionPane.INFORMATION_MESSAGE); } else { // bereit isDateOrderCorrect = true; @@ -427,10 +404,9 @@ public class EditLectureAllgemein_GUI extends JInternalFrame { if (dateChooserend.getDate().after(endDate)) { // Datum zu weit weg isDateMaxLifeTimeCorrect = false; - JOptionPane.showMessageDialog(c, + JOptionPane.showMessageDialog(null, "Das End-Datum liegt zu weit in der Zukunft. Erlaubt ist maximal:\n" - + endDate, "Datum fehlerhaft", - JOptionPane.INFORMATION_MESSAGE); + + endDate, "Datum fehlerhaft", JOptionPane.INFORMATION_MESSAGE); dateChooserend.setDate(endDate); // setze Datum auf // maximum @@ -443,12 +419,9 @@ public class EditLectureAllgemein_GUI extends JInternalFrame { || description.getText().trim().isEmpty() == true) { // mind 1 Textfeld ist leer isAllInformationReady = false; - JOptionPane - .showMessageDialog( - c, - "Bitte geben Sie einen Veranstaltungsnamen und eine Beschreibung ein.", - "Datum fehlerhaft", - JOptionPane.INFORMATION_MESSAGE); + JOptionPane.showMessageDialog(null, + "Bitte geben Sie einen Veranstaltungsnamen und eine Beschreibung ein.", + "Datum fehlerhaft", JOptionPane.INFORMATION_MESSAGE); } else { // Textfelder bereit isAllInformationReady = true; @@ -462,25 +435,23 @@ public class EditLectureAllgemein_GUI extends JInternalFrame { } // Pruefe ob alle Eingaben korrekt sind, dann mache // weiter - if (isAllInformationReady == true - && isDateMaxLifeTimeCorrect == true - && isDateOrderCorrect == true - && descriptionLenghtOK() == true) { + if (isAllInformationReady == true && isDateMaxLifeTimeCorrect == true + && isDateOrderCorrect == true && descriptionLenghtOK() == true) { // everything is ok, proceed - Lecture.lecture.setNewName(textFieldLaborname - .getText().trim()); + Lecture.lecture.setNewName(textFieldLaborname.getText().trim()); Lecture.lecture.setDesc(description.getText().trim()); Lecture.lecture.setEnddate(dateChooserend.getDate()); - Lecture.lecture.setStartdate(dateChooserstart - .getDate()); + Lecture.lecture.setStartdate(dateChooserstart.getDate()); - Image.image.setImagename(textFieldLaborname - .getText().trim()); + Image.Imagename = textFieldLaborname.getText().trim(); //check which GUI to open try { - if((ThriftManager.getSatClient().userIsLectureAdmin(person.verantwortlicher.getUserID(), Lecture.lecture.getid(),SessionData.authToken) || (person.verantwortlicher.getRole().equals("Admin")))){ + if ((ThriftManager.getSatClient().userIsLectureAdmin( + person.verantwortlicher.getUserID(), Lecture.lecture.getid(), + SessionData.authToken) || (person.verantwortlicher.getRole() + .equals("Admin")))) { //user is admin of the lecture GuiManager.show(new PermissionEditLecture_GUI()); } else { @@ -491,8 +462,7 @@ public class EditLectureAllgemein_GUI extends JInternalFrame { // TODO Auto-generated catch block e1.printStackTrace(); } - - + } } @@ -530,10 +500,9 @@ public class EditLectureAllgemein_GUI extends JInternalFrame { // max length is 254 chars if (description.getText().trim().length() >= MAX_DESCRIPTION_LENGTH) { descriptionLengthOK = false; - JOptionPane.showMessageDialog(c, + JOptionPane.showMessageDialog(null, "Die Beschreibung darf max 254 Zeichen enthalten. Aktuell enthält sie " - + description.getText().trim().length() + ".", - "Beschreibung zu umfangreich", + + description.getText().trim().length() + ".", "Beschreibung zu umfangreich", JOptionPane.INFORMATION_MESSAGE); } else { descriptionLengthOK = true; diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java index b4bf7bff..0ceb4891 100644 --- a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java @@ -1,9 +1,9 @@ package gui.lecture; +import gui.helper.TableFiller; import gui.intro.MainMenue_GUI; import java.awt.Color; -import java.awt.Component; import java.awt.FlowLayout; import java.awt.Font; import java.awt.SystemColor; @@ -17,7 +17,6 @@ import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import java.util.Map; @@ -27,7 +26,6 @@ import javax.swing.JInternalFrame; import javax.swing.JLabel; import javax.swing.JOptionPane; import javax.swing.JPanel; -import javax.swing.JRadioButton; import javax.swing.JScrollPane; import javax.swing.JSeparator; import javax.swing.JTabbedPane; @@ -36,8 +34,6 @@ import javax.swing.JTextArea; import javax.swing.JTextField; import javax.swing.JTextPane; import javax.swing.RowFilter; -import javax.swing.UIManager; -import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; import javax.swing.border.TitledBorder; import javax.swing.event.InternalFrameAdapter; @@ -63,70 +59,60 @@ import util.GuiManager; public class EditLectureLink_GUI extends JInternalFrame { private final JPanel contentPanel = new JPanel(); - String[] result; - JRadioButton rdbtnInternetJa; - JRadioButton rdbtnInternetNein; - JComboBox<String> comboBox; - JLabel labelName; - JLabel labelUpdate; - JLabel labelVerantwortlicher; - JLabel labelWeitereVerantwortliche; - JLabel labelVorlage; - JLabel labelLizenzSoftware; - JLabel labelInternet; - JLabel labelRam; - JLabel labelID; - JLabel labelVersion; - JTextArea textAreadesc; - JLabel labelCPU; + private JComboBox<String> comboBox; + private JLabel labelName; + private JLabel labelUpdate; + private JLabel labelVerantwortlicher; + private JLabel labelWeitereVerantwortliche; + private JLabel labelVorlage; + private JLabel labelLizenzSoftware; + private JLabel labelInternet; + private JLabel labelRam; + private JLabel labelID; + private JLabel labelVersion; + private JTextArea textAreadesc; + private JLabel labelCPU; private JLabel labelOS; - JTable tableAllImages = new JTable(); - JTable tablemyImages = new JTable(); - JTable tableCoopImages = new JTable(); - JTable tablePublicVorlagen = new JTable(); + private JTable tableAllImages = new JTable(); + private JTable tablemyImages = new JTable(); + private JTable tableCoopImages = new JTable(); + private JTable tablePublicVorlagen = new JTable(); private JTextField textFieldName; - JTabbedPane tabbedPane; - boolean activeSearch = false; - Component c = null; - String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", - "Verantwortlicher", "Letztes Update", "ID", "Version", "Template", "Beschreibung" }; - - final DefaultTableModel modelAll = new DefaultTableModel(titles, 0) { + private JTabbedPane tabbedPane; + private String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", + "Letztes Update", "ID", "Version", "Template", "Beschreibung" }; + + private final DefaultTableModel modelAll = new DefaultTableModel(titles, 0) { public boolean isCellEditable(int rowIndex, int mColIndex) { return false; } }; - final DefaultTableModel modelMyImages = new DefaultTableModel(titles, 0) { + private final DefaultTableModel modelMyImages = new DefaultTableModel(titles, 0) { public boolean isCellEditable(int rowIndex, int mColIndex) { return false; } }; - final DefaultTableModel modelPublicVorlagen = new DefaultTableModel(titles, - 0) { + private final DefaultTableModel modelPublicVorlagen = new DefaultTableModel(titles, 0) { public boolean isCellEditable(int rowIndex, int mColIndex) { return false; } }; - final TableRowSorter<TableModel> rowSorterAll = new TableRowSorter<TableModel>( - modelAll); - final TableRowSorter<TableModel> rowSorterMyImages = new TableRowSorter<TableModel>( - modelMyImages); - final TableRowSorter<TableModel> rowSorterPublicVorlagen = new TableRowSorter<TableModel>( + private final TableRowSorter<TableModel> rowSorterAll = new TableRowSorter<TableModel>(modelAll); + private final TableRowSorter<TableModel> rowSorterMyImages = new TableRowSorter<TableModel>(modelMyImages); + private final TableRowSorter<TableModel> rowSorterPublicVorlagen = new TableRowSorter<TableModel>( modelPublicVorlagen); - - RowFilter<Object, Object> orFilter = null; - List<RowFilter<Object,Object>> orFilters = new ArrayList<RowFilter<Object,Object>>(); - + private RowFilter<Object, Object> orFilter = null; + private List<RowFilter<Object, Object>> orFilters = new ArrayList<RowFilter<Object, Object>>(); + //needed for templates, filter for name OR desc AND temp_flag --> (name || desc) && (temp_flag) - RowFilter<Object, Object> andFilter = null; - List<RowFilter<Object,Object>> andFilters = new ArrayList<RowFilter<Object,Object>>(); + private RowFilter<Object, Object> andFilter = null; + private List<RowFilter<Object, Object>> andFilters = new ArrayList<RowFilter<Object, Object>>(); //the final filter which handles the search in the templates - RowFilter<Object, Object> templateFilter = null; - ArrayList<RowFilter<Object, Object>> finalFilters = new ArrayList<RowFilter<Object, Object>>(); - - + private RowFilter<Object, Object> templateFilter = null; + private ArrayList<RowFilter<Object, Object>> finalFilters = new ArrayList<RowFilter<Object, Object>>(); + public static final String HELP_MESSAGE = "<html><div align=\"center\">" + "Ändern Sie hier das Image, zu dem Ihre Veranstaltung gehört.<br />" + "Wählen Sie das Image aus, das zu Ihrer Veranstaltung passt und klicken Sie anschließend auf \"Veranstaltung ändern und abschließen\"." @@ -136,21 +122,13 @@ public class EditLectureLink_GUI extends JInternalFrame { * Create the dialog. */ public EditLectureLink_GUI() { - + addInternalFrameListener(new InternalFrameAdapter() { @Override public void internalFrameActivated(InternalFrameEvent arg0) { - try { - initTableModelAll(modelAll); - initTableModel(modelMyImages); - initTableModelTemplates(modelPublicVorlagen); - } catch (TException e) { - - e.printStackTrace(); - } catch (ParseException e) { - - e.printStackTrace(); - } + initTableModelAll(modelAll); + initTableModel(modelMyImages); + initTableModelTemplates(modelPublicVorlagen); // auszublendende Angaben // 1=Lizenzpflichtig @@ -176,16 +154,17 @@ public class EditLectureLink_GUI extends JInternalFrame { tablemyImages.getColumnModel().getColumn(9).setWidth(0); tablemyImages.getColumnModel().getColumn(9).setMinWidth(0); tablemyImages.getColumnModel().getColumn(9).setMaxWidth(0); - + tablemyImages.getTableHeader().setReorderingAllowed(false); - + tablemyImages.addMouseListener(new MouseAdapter() { @Override public void mouseReleased(MouseEvent e) { tablemyImages.clearSelection(); //just one row is selectablemyImages - tablemyImages.setRowSelectionInterval(tablemyImages.rowAtPoint(e.getPoint()), tablemyImages.rowAtPoint(e.getPoint())); + tablemyImages.setRowSelectionInterval(tablemyImages.rowAtPoint(e.getPoint()), + tablemyImages.rowAtPoint(e.getPoint())); } }); @@ -207,19 +186,20 @@ public class EditLectureLink_GUI extends JInternalFrame { tablePublicVorlagen.getColumnModel().getColumn(9).setWidth(0); tablePublicVorlagen.getColumnModel().getColumn(9).setMinWidth(0); tablePublicVorlagen.getColumnModel().getColumn(9).setMaxWidth(0); - + tablePublicVorlagen.getTableHeader().setReorderingAllowed(false); - + tablePublicVorlagen.addMouseListener(new MouseAdapter() { @Override public void mouseReleased(MouseEvent e) { tablePublicVorlagen.clearSelection(); //just one row is selectablePublicVorlagen - tablePublicVorlagen.setRowSelectionInterval(tablePublicVorlagen.rowAtPoint(e.getPoint()), tablePublicVorlagen.rowAtPoint(e.getPoint())); + tablePublicVorlagen.setRowSelectionInterval( + tablePublicVorlagen.rowAtPoint(e.getPoint()), + tablePublicVorlagen.rowAtPoint(e.getPoint())); } }); - tableAllImages.getColumnModel().getColumn(1).setWidth(0); tableAllImages.getColumnModel().getColumn(1).setMinWidth(0); @@ -239,16 +219,17 @@ public class EditLectureLink_GUI extends JInternalFrame { tableAllImages.getColumnModel().getColumn(9).setWidth(0); tableAllImages.getColumnModel().getColumn(9).setMinWidth(0); tableAllImages.getColumnModel().getColumn(9).setMaxWidth(0); - + tableAllImages.getTableHeader().setReorderingAllowed(false); - + tableAllImages.addMouseListener(new MouseAdapter() { @Override public void mouseReleased(MouseEvent e) { tableAllImages.clearSelection(); //just one row is selectableAllImages - tableAllImages.setRowSelectionInterval(tableAllImages.rowAtPoint(e.getPoint()), tableAllImages.rowAtPoint(e.getPoint())); + tableAllImages.setRowSelectionInterval(tableAllImages.rowAtPoint(e.getPoint()), + tableAllImages.rowAtPoint(e.getPoint())); } }); @@ -258,14 +239,7 @@ public class EditLectureLink_GUI extends JInternalFrame { setResizable(false); - try { - UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); - } catch (ClassNotFoundException | InstantiationException - | IllegalAccessException | UnsupportedLookAndFeelException e) { - - e.printStackTrace(); - } - setTitle("bwLehrpool Suite - Veranstaltung bearbeiten - "+person.verantwortlicher.getUserID()); + setTitle("bwLehrpool Suite - Veranstaltung bearbeiten - " + person.verantwortlicher.getUserID()); setBounds(0, 0, 918, 722); @@ -279,8 +253,7 @@ public class EditLectureLink_GUI extends JInternalFrame { getContentPane().add(panel); panel.setLayout(null); { - JLabel lblNewLabel = new JLabel( - "Veranstaltung auf ein Image verlinken"); + JLabel lblNewLabel = new JLabel("Veranstaltung auf ein Image verlinken"); lblNewLabel.setBounds(10, 11, 509, 22); panel.add(lblNewLabel); lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18)); @@ -289,8 +262,7 @@ public class EditLectureLink_GUI extends JInternalFrame { JTextPane txtpnBitteWhlenSie = new JTextPane(); txtpnBitteWhlenSie.setEditable(false); txtpnBitteWhlenSie.setBackground(SystemColor.menu); - txtpnBitteWhlenSie - .setText("Wählen Sie bitte ein Image aus, auf dem Ihre Veranstaltung basiert."); + txtpnBitteWhlenSie.setText("Wählen Sie bitte ein Image aus, auf dem Ihre Veranstaltung basiert."); txtpnBitteWhlenSie.setBounds(10, 36, 509, 32); panel.add(txtpnBitteWhlenSie); } @@ -302,8 +274,8 @@ public class EditLectureLink_GUI extends JInternalFrame { JPanel panel_1 = new JPanel(); panel_1.setBackground(SystemColor.menu); - panel_1.setBorder(new TitledBorder(null, "Filterfunktionen", - TitledBorder.LEADING, TitledBorder.TOP, null, null)); + panel_1.setBorder(new TitledBorder(null, "Filterfunktionen", TitledBorder.LEADING, TitledBorder.TOP, + null, null)); panel_1.setBounds(10, 49, 557, 91); contentPanel.add(panel_1); panel_1.setLayout(null); @@ -322,60 +294,56 @@ public class EditLectureLink_GUI extends JInternalFrame { public void keyReleased(KeyEvent e) { String stext = textFieldName.getText().trim(); // Wenn Textfield nicht leer - if (stext != "") - { - activeSearch = true; + if (stext != "") { // Filtere nach der Eingabe - orFilters.clear(); - andFilters.clear(); - finalFilters.clear(); - - orFilters.add(RowFilter.regexFilter("(?i)"+stext, 0)); //case insensitive + orFilters.clear(); + andFilters.clear(); + finalFilters.clear(); + + orFilters.add(RowFilter.regexFilter("(?i)" + stext, 0)); //case insensitive //preparation for search via lecture description. "9" has to be corrected as the index of titles - orFilters.add(RowFilter.regexFilter("(?i)"+stext, 9)); //case insensitive - + orFilters.add(RowFilter.regexFilter("(?i)" + stext, 9)); //case insensitive + orFilter = RowFilter.orFilter(orFilters); - + rowSorterAll.setRowFilter(orFilter); rowSorterMyImages.setRowFilter(orFilter); andFilters.add(RowFilter.regexFilter("1", 8)); andFilter = RowFilter.andFilter(andFilters); - + finalFilters.add(andFilter); finalFilters.add(orFilter); templateFilter = RowFilter.andFilter(finalFilters); rowSorterPublicVorlagen.setRowFilter(templateFilter); - } - else - { - activeSearch = false; - - String username = person.verantwortlicher.getName() + " " + person.verantwortlicher.getVorname(); - + } else { + + String username = person.verantwortlicher.getName() + " " + + person.verantwortlicher.getVorname(); + orFilters.clear(); andFilters.clear(); orFilters.add(RowFilter.regexFilter(username, 4)); //case insensitive, filter for anything orFilter = RowFilter.andFilter(orFilters); - + rowSorterMyImages.setRowFilter(orFilter); rowSorterAll.setRowFilter(orFilter); - + //in addition, templates can only be shown when they really are templates! orFilters.clear(); - orFilters.add(RowFilter.regexFilter("(?i)"+stext, 0)); //case insensitive - orFilters.add(RowFilter.regexFilter("(?i)"+stext, 9)); //case insensitive + orFilters.add(RowFilter.regexFilter("(?i)" + stext, 0)); //case insensitive + orFilters.add(RowFilter.regexFilter("(?i)" + stext, 9)); //case insensitive orFilters.add(RowFilter.regexFilter("1", 8)); orFilter = RowFilter.orFilter(orFilters); rowSorterPublicVorlagen.setRowFilter(orFilter); - + } - + tablemyImages.clearSelection(); tableAllImages.clearSelection(); tablePublicVorlagen.clearSelection(); - + resetLectureInfo(); } @@ -394,19 +362,19 @@ public class EditLectureLink_GUI extends JInternalFrame { comboBox.addItem(list.get(i)); } } catch (TException e2) { - + e2.printStackTrace(); } comboBox.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { // Prueft das die Auswahl nicht leer ist if (comboBox.getSelectedItem().toString() != "") { - activeSearch = true; rowSorterAll.setRowFilter(RowFilter.regexFilter(comboBox.getSelectedItem().toString(), 2)); - rowSorterMyImages.setRowFilter(RowFilter.regexFilter(comboBox.getSelectedItem().toString(), 2)); - rowSorterPublicVorlagen.setRowFilter(RowFilter.regexFilter(comboBox.getSelectedItem().toString(), 2)); + rowSorterMyImages.setRowFilter(RowFilter.regexFilter(comboBox.getSelectedItem() + .toString(), 2)); + rowSorterPublicVorlagen.setRowFilter(RowFilter.regexFilter(comboBox.getSelectedItem() + .toString(), 2)); } else { - activeSearch = false; String username = person.verantwortlicher.getName() + " " + person.verantwortlicher.getVorname(); rowSorterMyImages.setRowFilter(RowFilter.regexFilter(username, 4)); @@ -447,53 +415,26 @@ public class EditLectureLink_GUI extends JInternalFrame { contentPanel.add(lblNewLabel_1); tabbedPane = new JTabbedPane(JTabbedPane.TOP); - //not needed anymore, as the filters are set by the full text search completely - /* - tabbedPane.addChangeListener(new ChangeListener() { - public void stateChanged(ChangeEvent arg0) { - if (tabbedPane.getSelectedIndex() == 0 && activeSearch == false) { - - String username = person.verantwortlicher.getName() + " " - + person.verantwortlicher.getVorname(); - rowSorterMyImages.setRowFilter(RowFilter.regexFilter( - username, 4)); - } else if (tabbedPane.getSelectedIndex() == 1 - && activeSearch == false) { - rowSorterPublicVorlagen.setRowFilter(RowFilter.regexFilter( - "true", 8)); - } else if (tabbedPane.getSelectedIndex() == 2 - && activeSearch == false) { - rowSorterAll.setRowFilter(null); - } - } - }); - */ tabbedPane.setBounds(10, 158, 557, 339); contentPanel.add(tabbedPane); JScrollPane scrollPaneAllImages = new JScrollPane(); - tableAllImages.getSelectionModel().addListSelectionListener( - new ListSelectionListener() { - public void valueChanged(ListSelectionEvent e) { - - if(tableAllImages.getSelectedRow() != -1) - { - - String imageid = modelAll.getValueAt( - tableAllImages - .convertRowIndexToModel(tableAllImages - .getSelectedRow()), 6) - .toString(); - String version = modelAll.getValueAt( - tableAllImages - .convertRowIndexToModel(tableAllImages - .getSelectedRow()), 7) - .toString(); - writeImageData(imageid, version); - } - } - }); + tableAllImages.getSelectionModel().addListSelectionListener(new ListSelectionListener() { + public void valueChanged(ListSelectionEvent e) { + + if (tableAllImages.getSelectedRow() != -1) { + + String imageid = modelAll.getValueAt( + tableAllImages.convertRowIndexToModel(tableAllImages.getSelectedRow()), 6) + .toString(); + String version = modelAll.getValueAt( + tableAllImages.convertRowIndexToModel(tableAllImages.getSelectedRow()), 7) + .toString(); + writeImageData(imageid, version); + } + } + }); tableAllImages.setModel(modelAll); tableAllImages.getColumnModel().getColumn(1).sizeWidthToFit(); tableAllImages.getColumnModel().getColumn(2).sizeWidthToFit(); @@ -502,26 +443,20 @@ public class EditLectureLink_GUI extends JInternalFrame { tableAllImages.getColumnModel().getColumn(5).sizeWidthToFit(); tableAllImages.setRowSorter(rowSorterAll); JScrollPane scrollPaneMyImage = new JScrollPane(); - tablemyImages.getSelectionModel().addListSelectionListener( - new ListSelectionListener() { - public void valueChanged(ListSelectionEvent e) { - - if(tablemyImages.getSelectedRow() != -1) - { - String imageid = modelMyImages.getValueAt( - tablemyImages - .convertRowIndexToModel(tablemyImages //selber fehler wie bei image - .getSelectedRow()), 6) - .toString(); - String version = modelMyImages.getValueAt( - tablemyImages - .convertRowIndexToModel(tablemyImages - .getSelectedRow()), 7) - .toString(); - writeImageData(imageid, version); - } - } - }); + tablemyImages.getSelectionModel().addListSelectionListener(new ListSelectionListener() { + public void valueChanged(ListSelectionEvent e) { + + if (tablemyImages.getSelectedRow() != -1) { + String imageid = modelMyImages.getValueAt( + tablemyImages.convertRowIndexToModel(tablemyImages //selber fehler wie bei image + .getSelectedRow()), 6).toString(); + String version = modelMyImages.getValueAt( + tablemyImages.convertRowIndexToModel(tablemyImages.getSelectedRow()), 7) + .toString(); + writeImageData(imageid, version); + } + } + }); tablemyImages.setModel(modelMyImages); tablemyImages.getColumnModel().getColumn(1).sizeWidthToFit(); tablemyImages.getColumnModel().getColumn(2).sizeWidthToFit(); @@ -534,27 +469,19 @@ public class EditLectureLink_GUI extends JInternalFrame { JScrollPane scrollPanePublicVorlagen = new JScrollPane(); scrollPanePublicVorlagen.setEnabled(false); - tablePublicVorlagen.getSelectionModel().addListSelectionListener( - new ListSelectionListener() { - public void valueChanged(ListSelectionEvent e) { - if(tablePublicVorlagen.getSelectedRow() != -1) - { - String imageid = modelPublicVorlagen - .getValueAt( - tablePublicVorlagen - .convertRowIndexToModel(tablePublicVorlagen - .getSelectedRow()), 6) - .toString(); - String version = modelPublicVorlagen - .getValueAt( - tablePublicVorlagen - .convertRowIndexToModel(tablePublicVorlagen - .getSelectedRow()), 7) - .toString(); - writeImageData(imageid, version); - } - } - }); + tablePublicVorlagen.getSelectionModel().addListSelectionListener(new ListSelectionListener() { + public void valueChanged(ListSelectionEvent e) { + if (tablePublicVorlagen.getSelectedRow() != -1) { + String imageid = modelPublicVorlagen.getValueAt( + tablePublicVorlagen.convertRowIndexToModel(tablePublicVorlagen.getSelectedRow()), + 6).toString(); + String version = modelPublicVorlagen.getValueAt( + tablePublicVorlagen.convertRowIndexToModel(tablePublicVorlagen.getSelectedRow()), + 7).toString(); + writeImageData(imageid, version); + } + } + }); tablePublicVorlagen.setModel(modelPublicVorlagen); tablePublicVorlagen.getColumnModel().getColumn(1).sizeWidthToFit(); tablePublicVorlagen.getColumnModel().getColumn(2).sizeWidthToFit(); @@ -596,11 +523,14 @@ public class EditLectureLink_GUI extends JInternalFrame { JButton btnBack = new JButton("Zurück"); btnBack.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - + //check which GUI to open try { - if(ThriftManager.getSatClient().userIsLectureAdmin(person.verantwortlicher.getUserID(), Lecture.lecture.getid(),SessionData.authToken) || (person.verantwortlicher.getRole().equals("Admin"))){ + if (ThriftManager.getSatClient().userIsLectureAdmin( + person.verantwortlicher.getUserID(), Lecture.lecture.getid(), + SessionData.authToken) + || (person.verantwortlicher.getRole().equals("Admin"))) { //user is admin of the lecture GuiManager.show(new PermissionEditLecture_GUI()); @@ -612,7 +542,7 @@ public class EditLectureLink_GUI extends JInternalFrame { // TODO Auto-generated catch block e1.printStackTrace(); } - + } }); btnBack.setActionCommand("OK"); @@ -620,19 +550,17 @@ public class EditLectureLink_GUI extends JInternalFrame { getRootPane().setDefaultButton(btnBack); } { - JButton btnFinish = new JButton( - "Veranstaltung ändern und abschließen"); + JButton btnFinish = new JButton("Veranstaltung ändern und abschließen"); btnFinish.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - String username = person.verantwortlicher.getName() - + " " + person.verantwortlicher.getVorname(); + String username = person.verantwortlicher.getName() + " " + + person.verantwortlicher.getVorname(); // check if a row is selected if (tablemyImages.getSelectedRow() != -1) { // a row is selected, do operations try { - DateFormat formatter = new SimpleDateFormat( - "yyyy-MM-dd HH:mm:ss"); + DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); // update the lecture ThriftManager.getSatClient().updateLecturedata( @@ -643,302 +571,212 @@ public class EditLectureLink_GUI extends JInternalFrame { formatter.format(Lecture.lecture.getStartdate()).toString(), formatter.format(Lecture.lecture.getEnddate()).toString(), Lecture.lecture.isActive(), - modelMyImages - .getValueAt( - tablemyImages - .convertRowIndexToModel(tablemyImages - .getSelectedRow()), - 6).toString(), - modelMyImages - .getValueAt( - tablemyImages - .convertRowIndexToModel(tablemyImages - .getSelectedRow()), - 7).toString(), - SessionData.authToken, - person.verantwortlicher.getTel(), - person.verantwortlicher.getFakultaet(), - Lecture.lecture.getid(), + modelMyImages.getValueAt( + tablemyImages.convertRowIndexToModel(tablemyImages + .getSelectedRow()), 6).toString(), + modelMyImages.getValueAt( + tablemyImages.convertRowIndexToModel(tablemyImages + .getSelectedRow()), 7).toString(), + SessionData.authToken, person.verantwortlicher.getTel(), + person.verantwortlicher.getFakultaet(), Lecture.lecture.getid(), person.verantwortlicher.getHochschule()); // remove all additional user permissions on // first stage ThriftManager.getSatClient().deleteAllAdditionalLecturePermissions( - Lecture.lecture.getid(), - SessionData.authToken, + Lecture.lecture.getid(), SessionData.authToken, person.verantwortlicher.getUserID()); // then, add user permissions as they have been // set new - for (int i = 0; i < RightsManagement.rightsManagement.getPermittedUserList().size(); i++) - { - /* - System.out.println("Writing additional rights for user " - + RightsManagement.rightsManagement - .getPermittedUserList() - .get(i).getUserID() - + ", User " - + i - + "/" - + RightsManagement.rightsManagement - .getPermittedUserList() - .size() - +", r="+RightsManagement.rightsManagement.getPermittedUserList().get(i).isLecture_read() - +", w="+RightsManagement.rightsManagement.getPermittedUserList().get(i).isLecture_write() - +", a="+RightsManagement.rightsManagement.getPermittedUserList().get(i).isLecture_admin() - ); - */ - + for (int i = 0; i < RightsManagement.rightsManagement.getPermittedUserList() + .size(); i++) { + ThriftManager.getSatClient().writeAdditionalLectureRights( Lecture.lecture.getid(), - RightsManagement.rightsManagement - .getPermittedUserList() - .get(i).getUserID(), // userID - RightsManagement.rightsManagement - .getPermittedUserList() - .get(i).isLecture_read(),// read - RightsManagement.rightsManagement - .getPermittedUserList() - .get(i).isLecture_write(),// write - RightsManagement.rightsManagement - .getPermittedUserList() - .get(i).isLecture_admin(),// admin - SessionData.authToken - ); + RightsManagement.rightsManagement.getPermittedUserList().get(i) + .getUserID(), // userID + RightsManagement.rightsManagement.getPermittedUserList().get(i) + .isLecture_read(),// read + RightsManagement.rightsManagement.getPermittedUserList().get(i) + .isLecture_write(),// write + RightsManagement.rightsManagement.getPermittedUserList().get(i) + .isLecture_admin(),// admin + SessionData.authToken); }// end for JOptionPane .showMessageDialog( - c, + null, "Ihre Veranstaltung wurde erfolgreich geändert. Sie kehren nun zum Hauptmenü zurück.", - "Veranstaltung angelegt", - JOptionPane.INFORMATION_MESSAGE); + "Veranstaltung angelegt", JOptionPane.INFORMATION_MESSAGE); // zurueck zum Menue GuiManager.show(new MainMenue_GUI()); } catch (TException e1) { - + e1.printStackTrace(); - JOptionPane - .showMessageDialog( - c, - "Beim Anlegen Ihrer Veranstaltung ist ein Fehler aufgetreten.", - "Error", - JOptionPane.ERROR_MESSAGE); - JOptionPane.showMessageDialog(c, e1.getCause() - + "\n" + e1.getStackTrace(), - "Debug-Message", + JOptionPane.showMessageDialog(null, + "Beim Anlegen Ihrer Veranstaltung ist ein Fehler aufgetreten.", + "Error", JOptionPane.ERROR_MESSAGE); + JOptionPane.showMessageDialog(null, + e1.getCause() + "\n" + e1.getStackTrace(), "Debug-Message", JOptionPane.ERROR_MESSAGE); } dispose(); } else if (tablePublicVorlagen.getSelectedRow() != -1 - && tablePublicVorlagen - .getValueAt( - tablePublicVorlagen - .getSelectedRow(), 4) + && tablePublicVorlagen.getValueAt(tablePublicVorlagen.getSelectedRow(), 4) .toString().equals(username)) { // a row is selected, do operations try { - DateFormat formatter = new SimpleDateFormat( - "yyyy-MM-dd HH:mm:ss"); + DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); ThriftManager.getSatClient().updateLecturedata( Lecture.lecture.getName(), Lecture.lecture.getNewName(), Lecture.lecture.getShortDesc(), Lecture.lecture.getDesc(), - formatter.format( - Lecture.lecture.getStartdate()) - .toString(), - formatter.format( - Lecture.lecture.getEnddate()) - .toString(), + formatter.format(Lecture.lecture.getStartdate()).toString(), + formatter.format(Lecture.lecture.getEnddate()).toString(), Lecture.lecture.isActive(), - modelPublicVorlagen - .getValueAt( - tablePublicVorlagen - .convertRowIndexToModel(tablePublicVorlagen - .getSelectedRow()), - 6).toString(), - modelPublicVorlagen - .getValueAt( - tablePublicVorlagen - .convertRowIndexToModel(tablePublicVorlagen - .getSelectedRow()), - 7).toString(), - SessionData.authToken, - person.verantwortlicher.getTel(), - person.verantwortlicher.getFakultaet(), - Lecture.lecture.getid(), + modelPublicVorlagen.getValueAt( + tablePublicVorlagen + .convertRowIndexToModel(tablePublicVorlagen + .getSelectedRow()), 6).toString(), + modelPublicVorlagen.getValueAt( + tablePublicVorlagen + .convertRowIndexToModel(tablePublicVorlagen + .getSelectedRow()), 7).toString(), + SessionData.authToken, person.verantwortlicher.getTel(), + person.verantwortlicher.getFakultaet(), Lecture.lecture.getid(), person.verantwortlicher.getHochschule()); // remove all additional user permissions on // first stage ThriftManager.getSatClient().deleteAllAdditionalLecturePermissions( - Lecture.lecture.getid(), - SessionData.authToken, + Lecture.lecture.getid(), SessionData.authToken, person.verantwortlicher.getUserID()); // then, add user permissions as they have been // set new - for (int i = 0; i < RightsManagement.rightsManagement - .getPermittedUserList().size(); i++) { + for (int i = 0; i < RightsManagement.rightsManagement.getPermittedUserList() + .size(); i++) { System.out .println("Writing additional rights for user " + RightsManagement.rightsManagement - .getPermittedUserList() - .get(i).getUserID() + .getPermittedUserList().get(i).getUserID() + ", User " + i + "/" + RightsManagement.rightsManagement - .getPermittedUserList() - .size()); + .getPermittedUserList().size()); ThriftManager.getSatClient().writeAdditionalLectureRights( Lecture.lecture.getName(), - RightsManagement.rightsManagement - .getPermittedUserList() - .get(i).getUserID(), // userID - RightsManagement.rightsManagement - .getPermittedUserList() - .get(i).isImageRead(),// read - RightsManagement.rightsManagement - .getPermittedUserList() - .get(i).isImageWrite(),// write - RightsManagement.rightsManagement - .getPermittedUserList() - .get(i).isImageAdmin(),// admin - SessionData.authToken - ); + RightsManagement.rightsManagement.getPermittedUserList().get(i) + .getUserID(), // userID + RightsManagement.rightsManagement.getPermittedUserList().get(i) + .isImageRead(),// read + RightsManagement.rightsManagement.getPermittedUserList().get(i) + .isImageWrite(),// write + RightsManagement.rightsManagement.getPermittedUserList().get(i) + .isImageAdmin(),// admin + SessionData.authToken); } JOptionPane .showMessageDialog( - c, + null, "Ihre Veranstaltung wurde erfolgreich geändert. Sie kehren nun zum Hauptmenü zurück.", - "Veranstaltung angelegt", - JOptionPane.INFORMATION_MESSAGE); + "Veranstaltung angelegt", JOptionPane.INFORMATION_MESSAGE); // zurueck zum Menue GuiManager.show(new MainMenue_GUI()); } catch (TException e1) { - + e1.printStackTrace(); - JOptionPane - .showMessageDialog( - c, - "Beim Anlegen Ihrer Veranstaltung ist ein Fehler aufgetreten.", - "Error", - JOptionPane.ERROR_MESSAGE); - JOptionPane.showMessageDialog(c, e1.getCause() - + "\n" + e1.getStackTrace(), - "Debug-Message", + JOptionPane.showMessageDialog(null, + "Beim Anlegen Ihrer Veranstaltung ist ein Fehler aufgetreten.", + "Error", JOptionPane.ERROR_MESSAGE); + JOptionPane.showMessageDialog(null, + e1.getCause() + "\n" + e1.getStackTrace(), "Debug-Message", JOptionPane.ERROR_MESSAGE); } dispose(); } else if (tableAllImages.getSelectedRow() != -1 - && tableAllImages - .getValueAt( - tableAllImages.getSelectedRow(), - 4).toString().equals(username)) { + && tableAllImages.getValueAt(tableAllImages.getSelectedRow(), 4).toString() + .equals(username)) { // a row is selected, do operations try { - DateFormat formatter = new SimpleDateFormat( - "yyyy-MM-dd HH:mm:ss"); + DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); ThriftManager.getSatClient().updateLecturedata( Lecture.lecture.getName(), Lecture.lecture.getNewName(), Lecture.lecture.getShortDesc(), Lecture.lecture.getDesc(), - formatter.format( - Lecture.lecture.getStartdate()) - .toString(), - formatter.format( - Lecture.lecture.getEnddate()) - .toString(), + formatter.format(Lecture.lecture.getStartdate()).toString(), + formatter.format(Lecture.lecture.getEnddate()).toString(), Lecture.lecture.isActive(), modelAll.getValueAt( - tableAllImages - .convertRowIndexToModel(tableAllImages - .getSelectedRow()), - 6).toString(), + tableAllImages.convertRowIndexToModel(tableAllImages + .getSelectedRow()), 6).toString(), modelAll.getValueAt( - tableAllImages - .convertRowIndexToModel(tableAllImages - .getSelectedRow()), - 7).toString(), - SessionData.authToken, - person.verantwortlicher.getTel(), - person.verantwortlicher.getFakultaet(), - Lecture.lecture.getid(), + tableAllImages.convertRowIndexToModel(tableAllImages + .getSelectedRow()), 7).toString(), + SessionData.authToken, person.verantwortlicher.getTel(), + person.verantwortlicher.getFakultaet(), Lecture.lecture.getid(), person.verantwortlicher.getHochschule()); // remove all additional user permissions on // first stage ThriftManager.getSatClient().deleteAllAdditionalLecturePermissions( - Lecture.lecture.getid(), - SessionData.authToken, + Lecture.lecture.getid(), SessionData.authToken, person.verantwortlicher.getUserID()); // then, add user permissions as they have been // set new - for (int i = 0; i < RightsManagement.rightsManagement - .getPermittedUserList().size(); i++) { + for (int i = 0; i < RightsManagement.rightsManagement.getPermittedUserList() + .size(); i++) { System.out .println("Writing additional rights for user " + RightsManagement.rightsManagement - .getPermittedUserList() - .get(i).getUserID() + .getPermittedUserList().get(i).getUserID() + ", User " + i + "/" + RightsManagement.rightsManagement - .getPermittedUserList() - .size()); + .getPermittedUserList().size()); ThriftManager.getSatClient().writeAdditionalLectureRights( Lecture.lecture.getName(), - RightsManagement.rightsManagement - .getPermittedUserList() - .get(i).getUserID(), // userID - RightsManagement.rightsManagement - .getPermittedUserList() - .get(i).isImageRead(),// read - RightsManagement.rightsManagement - .getPermittedUserList() - .get(i).isImageWrite(),// write - RightsManagement.rightsManagement - .getPermittedUserList() - .get(i).isImageAdmin(),// admin - SessionData.authToken - ); + RightsManagement.rightsManagement.getPermittedUserList().get(i) + .getUserID(), // userID + RightsManagement.rightsManagement.getPermittedUserList().get(i) + .isImageRead(),// read + RightsManagement.rightsManagement.getPermittedUserList().get(i) + .isImageWrite(),// write + RightsManagement.rightsManagement.getPermittedUserList().get(i) + .isImageAdmin(),// admin + SessionData.authToken); } JOptionPane .showMessageDialog( - c, + null, "Ihre Veranstaltung wurde erfolgreich geändert. Sie kehren nun zum Hauptmenü zurück.", - "Veranstaltung angelegt", - JOptionPane.INFORMATION_MESSAGE); + "Veranstaltung angelegt", JOptionPane.INFORMATION_MESSAGE); // zurueck zum Menue GuiManager.show(new MainMenue_GUI()); } catch (TException e1) { - + e1.printStackTrace(); - JOptionPane - .showMessageDialog( - c, - "Beim Anlegen Ihrer Veranstaltung ist ein Fehler aufgetreten.", - "Error", - JOptionPane.ERROR_MESSAGE); - JOptionPane.showMessageDialog( - null, - e1.getCause() + "\n" - + e1.getStackTrace(), - "Debug-Message", + JOptionPane.showMessageDialog(null, + "Beim Anlegen Ihrer Veranstaltung ist ein Fehler aufgetreten.", + "Error", JOptionPane.ERROR_MESSAGE); + JOptionPane.showMessageDialog(null, + e1.getCause() + "\n" + e1.getStackTrace(), "Debug-Message", JOptionPane.ERROR_MESSAGE); } @@ -946,10 +784,8 @@ public class EditLectureLink_GUI extends JInternalFrame { } else { // nothing selected - JOptionPane.showMessageDialog(c, - "Bitte wählen Sie ein Image aus.", - "Image Auswahl", - JOptionPane.INFORMATION_MESSAGE); + JOptionPane.showMessageDialog(null, "Bitte wählen Sie ein Image aus.", + "Image Auswahl", JOptionPane.INFORMATION_MESSAGE); } } @@ -1028,8 +864,7 @@ public class EditLectureLink_GUI extends JInternalFrame { labelLizenzSoftware.setBounds(10, 383, 296, 14); panel.add(labelLizenzSoftware); - JLabel lblLizenzpflichtigeSoftware = new JLabel( - "Lizenzpflichtige Software:"); + JLabel lblLizenzpflichtigeSoftware = new JLabel("Lizenzpflichtige Software:"); lblLizenzpflichtigeSoftware.setBounds(10, 367, 130, 14); panel.add(lblLizenzpflichtigeSoftware); @@ -1090,159 +925,106 @@ public class EditLectureLink_GUI extends JInternalFrame { textAreadesc.setBackground(SystemColor.menu); textAreadesc.setFont(new Font("Tahoma", Font.PLAIN, 11)); scrollPane.setViewportView(textAreadesc); - } // Initiale Beffuelung eines Table models - public DefaultTableModel initTableModel(DefaultTableModel model) - throws TException, ParseException { + public DefaultTableModel initTableModel(DefaultTableModel model) { List<Image> images; // Hole eine Liste der Images - if(person.verantwortlicher.getRole()=="Admin"){ - //get complete list - images = ThriftManager.getSatClient().getImageList(person.verantwortlicher.getUserID(),SessionData.authToken); - } else { - //get permitted list - images = ThriftManager.getSatClient().getImageListPermissionLink(person.verantwortlicher - .getUserID(),SessionData.authToken); + try { + if (person.verantwortlicher.getRole().equals("Admin")) { + //get complete list + images = ThriftManager.getSatClient().getImageList(person.verantwortlicher.getUserID(), + SessionData.authToken); + } else { + //get permitted list + images = ThriftManager.getSatClient().getImageListPermissionLink( + person.verantwortlicher.getUserID(), SessionData.authToken); + } + } catch (Exception e) { + return model; } - Iterator<Image> i = images.iterator(); - SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss"); - int x = 0; - - while (i.hasNext()) { - // erzeuge Objekte fuer die Tabelle - Object[] obj = { images.get(x).getImageName(), - images.get(x).getLicenseRestriction(), - images.get(x).getOsName(), images.get(x).getLectureName(), - images.get(x).getUserData(), - out.format(in.parse(images.get(x).updateTime)), - images.get(x).id, images.get(x).getVersion(), - images.get(x).getIsTemplate(), - images.get(x).getDescription()}; - // Fuege diese Objekte der Tabelle hinzu - model.addRow(obj); - x++; - i.next(); - } - + TableFiller.fillModelWithImageList(model, images); + //show number of rows in GUI - tabbedPane.setTitleAt(0, tabbedPane.getTitleAt(0)+" ("+model.getRowCount()+") "); + tabbedPane.setTitleAt(0, tabbedPane.getTitleAt(0) + " (" + model.getRowCount() + ") "); return model; } - - - public DefaultTableModel initTableModelAll(DefaultTableModel model) - throws TException, ParseException { + + public DefaultTableModel initTableModelAll(DefaultTableModel model) { List<Image> images; // Hole eine Liste der Images - if(person.verantwortlicher.getRole()=="Admin"){ - //get complete list - images = ThriftManager.getSatClient().getImageList(person.verantwortlicher.getUserID(),SessionData.authToken); - } else { - //get permitted list - images = ThriftManager.getSatClient().getImageListPermissionLink(person.verantwortlicher - .getUserID(),SessionData.authToken); + try { + if (person.verantwortlicher.getRole().equals("Admin")) { + //get complete list + images = ThriftManager.getSatClient().getImageList(person.verantwortlicher.getUserID(), + SessionData.authToken); + } else { + //get permitted list + images = ThriftManager.getSatClient().getImageListPermissionLink( + person.verantwortlicher.getUserID(), SessionData.authToken); + } + } catch (Exception e) { + return model; } - Iterator<Image> i = images.iterator(); - SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss"); - int x = 0; - - while (i.hasNext()) { - // erzeuge Objekte fuer die Tabelle - Object[] obj = { images.get(x).getImageName(), - images.get(x).getLicenseRestriction(), - images.get(x).getOsName(), images.get(x).getLectureName(), - images.get(x).getUserData(), - out.format(in.parse(images.get(x).updateTime)), - images.get(x).id, images.get(x).getVersion(), - images.get(x).getIsTemplate(), - images.get(x).getDescription()}; - // Fuege diese Objekte der Tabelle hinzu - model.addRow(obj); - x++; - i.next(); - } - + TableFiller.fillModelWithImageList(model, images); + //show number of rows in GUI - tabbedPane.setTitleAt(2, tabbedPane.getTitleAt(2)+" ("+model.getRowCount()+") "); + tabbedPane.setTitleAt(2, tabbedPane.getTitleAt(2) + " (" + model.getRowCount() + ") "); return model; } - - + // Initiale Beffuelung eines Table models - public DefaultTableModel initTableModelTemplates(DefaultTableModel model) - throws TException, ParseException { - List<Image> images; + public DefaultTableModel initTableModelTemplates(DefaultTableModel model) { + List<Image> images; - // Hole eine Liste der Images - //images = ThriftManager.getSatClient().getImageListPermissionLink(person.verantwortlicher.getUserID()); + // Hole eine Liste der Images + try { images = ThriftManager.getSatClient().getImageListAllTemplates(SessionData.authToken); + } catch (Exception e) { + return model; + } - Iterator<Image> i = images.iterator(); - SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss"); - int x = 0; - - while (i.hasNext()) { - // erzeuge Objekte fuer die Tabelle - Object[] obj = { images.get(x).getImageName(), - images.get(x).getLicenseRestriction(), - images.get(x).getOsName(), images.get(x).getLectureName(), - images.get(x).getUserData(), - out.format(in.parse(images.get(x).updateTime)), - images.get(x).id, images.get(x).getVersion(), - images.get(x).getIsTemplate(), - images.get(x).getDescription()}; - // Fuege diese Objekte der Tabelle hinzu - model.addRow(obj); - x++; - i.next(); + TableFiller.fillModelWithImageList(model, images); + //show number of rows in GUI + tabbedPane.setTitleAt(1, tabbedPane.getTitleAt(1) + " (" + model.getRowCount() + ") "); - } - //show number of rows in GUI - tabbedPane.setTitleAt(1, tabbedPane.getTitleAt(1)+" ("+model.getRowCount()+") "); + return model; - return model; + } - } - - - private void resetLectureInfo() { - //reset the detailed information on the right hand side when changing search string - labelID.setText(""); - labelVersion.setText(""); - labelName.setText(""); - textAreadesc.setText(""); - labelOS.setText(""); - labelUpdate.setText(""); - labelVerantwortlicher.setText(""); - labelWeitereVerantwortliche.setText(""); - labelVorlage.setText(""); - labelLizenzSoftware.setText(""); - labelInternet.setText(""); - labelRam.setText(""); - labelCPU.setText(""); - } - - + private void resetLectureInfo() { + //reset the detailed information on the right hand side when changing search string + labelID.setText(""); + labelVersion.setText(""); + labelName.setText(""); + textAreadesc.setText(""); + labelOS.setText(""); + labelUpdate.setText(""); + labelVerantwortlicher.setText(""); + labelWeitereVerantwortliche.setText(""); + labelVorlage.setText(""); + labelLizenzSoftware.setText(""); + labelInternet.setText(""); + labelRam.setText(""); + labelCPU.setText(""); + } public void writeImageData(String id, String version) { try { SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss"); - Map<String, String> res = ThriftManager.getSatClient().getImageData(id, version,SessionData.authToken); + Map<String, String> res = ThriftManager.getSatClient().getImageData(id, version, + SessionData.authToken); labelName.setText(res.get("name")); labelOS.setText(res.get("os")); labelUpdate.setText(out.format(in.parse(res.get("lastupdate")))); @@ -1269,7 +1051,7 @@ public class EditLectureLink_GUI extends JInternalFrame { labelVersion.setText(res.get("version")); textAreadesc.setText(res.get("desc")); } catch (TException | ParseException e1) { - + e1.printStackTrace(); } } diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java index e83c4bc3..9e7c40e5 100644 --- a/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java @@ -1,9 +1,9 @@ package gui.lecture; +import gui.helper.TableFiller; import gui.intro.MainMenue_GUI; import java.awt.Color; -import java.awt.Component; import java.awt.FlowLayout; import java.awt.Font; import java.awt.SystemColor; @@ -18,7 +18,6 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; @@ -26,7 +25,6 @@ import javax.swing.JButton; import javax.swing.JInternalFrame; import javax.swing.JLabel; import javax.swing.JPanel; -import javax.swing.JRadioButton; import javax.swing.JScrollPane; import javax.swing.JSeparator; import javax.swing.JTable; @@ -35,8 +33,6 @@ import javax.swing.JTextField; import javax.swing.JTextPane; import javax.swing.ListSelectionModel; import javax.swing.RowFilter; -import javax.swing.UIManager; -import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; import javax.swing.border.TitledBorder; import javax.swing.event.InternalFrameAdapter; @@ -61,48 +57,40 @@ import util.GuiManager; public class EditLectureSearch_GUI extends JInternalFrame { private final JPanel contentPanel = new JPanel(); - String[] result; - JRadioButton rdbtnInternetJa; - JRadioButton rdbtnInternetNein; - JLabel labelAktiv; - JLabel labelstartdate; - JLabel labelenddate; - JLabel labelimageversion; - JTextArea labelName; - JTextArea labelimage; - JTextArea labeldesc; - JLabel labelVerantwortlicher; - JTable tablemyLectures; + private JLabel labelAktiv; + private JLabel labelstartdate; + private JLabel labelenddate; + private JLabel labelimageversion; + private JTextArea labelName; + private JTextArea labelimage; + private JTextArea labeldesc; + private JLabel labelVerantwortlicher; + private JTable tablemyLectures; private JTextField textFieldName; private JLabel lblTotalResults; - boolean activeSearch = false; - Component c = null; - String[] titles = { "Veranstaltungsname", "Beschreibung", - "Gültigkeitsdatum", "Aktiv", "Letzte Benutzung", - "Verantwortlicher", "Image", "Schlagwort", "ID" }; + private String[] titles = { "Veranstaltungsname", "Beschreibung", "Gültigkeitsdatum", "Aktiv", + "Letzte Benutzung", "Verantwortlicher", "Image", "Schlagwort", "ID" }; public static final String HELP_MESSAGE = "<html><div align=\"center\">" + "Suchen Sie hier Ihre Veranstaltungen und wählen Sie sie für weitere Schritte aus.<br />" + "Klicken Sie anschließend auf \"Weiter\", um die Details der Veranstaltung sowie die Berechtigungen zu ändern." + "</div></html>"; - final DefaultTableModel modelMyLectures = new DefaultTableModel(titles, 0) { + private final DefaultTableModel modelMyLectures = new DefaultTableModel(titles, 0) { public boolean isCellEditable(int rowIndex, int mColIndex) { return false; } }; - final TableRowSorter<TableModel> rowSorterMyLectures = new TableRowSorter<TableModel>( + private final TableRowSorter<TableModel> rowSorterMyLectures = new TableRowSorter<TableModel>( modelMyLectures); - RowFilter<Object, Object> rf = null; - List<RowFilter<Object, Object>> filters = new ArrayList<RowFilter<Object, Object>>( - 2); + private RowFilter<Object, Object> rf = null; + private List<RowFilter<Object, Object>> filters = new ArrayList<RowFilter<Object, Object>>(2); /** * Create the dialog. */ public EditLectureSearch_GUI() { - filters.add(RowFilter.regexFilter(".", 0)); rf = RowFilter.orFilter(filters); @@ -111,14 +99,7 @@ public class EditLectureSearch_GUI extends JInternalFrame { @Override public void internalFrameActivated(InternalFrameEvent arg0) { textFieldName.requestFocusInWindow(); - try { - initTableModel(modelMyLectures); - // initTableModel(modelAll); - - } catch (ParseException e) { - - e.printStackTrace(); - } + initTableModel(modelMyLectures); // auszublendende Angaben // 1=Beschreibung @@ -145,7 +126,7 @@ public class EditLectureSearch_GUI extends JInternalFrame { tablemyLectures.getColumnModel().getColumn(8).setWidth(0); tablemyLectures.getColumnModel().getColumn(8).setMinWidth(0); tablemyLectures.getColumnModel().getColumn(8).setMaxWidth(0); - + tablemyLectures.getTableHeader().setReorderingAllowed(false); tablemyLectures.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); tablemyLectures.addMouseListener(new MouseAdapter() { @@ -154,7 +135,8 @@ public class EditLectureSearch_GUI extends JInternalFrame { public void mouseReleased(MouseEvent e) { tablemyLectures.clearSelection(); //just one row is selectablemyLectures - tablemyLectures.setRowSelectionInterval(tablemyLectures.rowAtPoint(e.getPoint()), tablemyLectures.rowAtPoint(e.getPoint())); + tablemyLectures.setRowSelectionInterval(tablemyLectures.rowAtPoint(e.getPoint()), + tablemyLectures.rowAtPoint(e.getPoint())); } }); } @@ -163,16 +145,8 @@ public class EditLectureSearch_GUI extends JInternalFrame { // Verhindert das Vergroessern Des Fensters setResizable(false); - try { - // Setzt das Look & Feel auf System - UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); - } catch (ClassNotFoundException | InstantiationException - | IllegalAccessException | UnsupportedLookAndFeelException e) { - - e.printStackTrace(); - } // Setzt den Fenstertitel - setTitle("bwLehrpool Suite - Veranstaltung bearbeiten - "+person.verantwortlicher.getUserID()); + setTitle("bwLehrpool Suite - Veranstaltung bearbeiten - " + person.verantwortlicher.getUserID()); // Zentriert das Fenster in die Bildmitte setBounds(0, 0, 842, 722); @@ -206,8 +180,8 @@ public class EditLectureSearch_GUI extends JInternalFrame { JPanel panel_1 = new JPanel(); panel_1.setBackground(SystemColor.menu); - panel_1.setBorder(new TitledBorder(null, "Filterfunktionen", - TitledBorder.LEADING, TitledBorder.TOP, null, null)); + panel_1.setBorder(new TitledBorder(null, "Filterfunktionen", TitledBorder.LEADING, TitledBorder.TOP, + null, null)); panel_1.setBounds(10, 49, 557, 66); contentPanel.add(panel_1); panel_1.setLayout(null); @@ -224,26 +198,18 @@ public class EditLectureSearch_GUI extends JInternalFrame { // Textfield eingabe auslesen String stext = textFieldName.getText().trim(); // Wenn Textfield nicht leer - if (stext != "") { - activeSearch = true; + if (!stext.isEmpty()) { // Filtere nach der Eingabe filters.clear(); - filters.add(RowFilter.regexFilter("(?i)" + stext, 0)); // case - // insensitive - filters.add(RowFilter.regexFilter("(?i)" + stext, 1)); // case - // insensitive + filters.add(RowFilter.regexFilter("(?i)" + stext, 0)); + filters.add(RowFilter.regexFilter("(?i)" + stext, 1)); rf = RowFilter.orFilter(filters); rowSorterMyLectures.setRowFilter(rf); } else { - activeSearch = false; - activeSearch = false; filters.clear(); - filters.add(RowFilter.regexFilter(".", 0)); // case - // insensitive, - // filter for - // anything + filters.add(RowFilter.regexFilter(".", 0)); rf = RowFilter.orFilter(filters); rowSorterMyLectures.setRowFilter(rf); @@ -291,39 +257,35 @@ public class EditLectureSearch_GUI extends JInternalFrame { scrollPaneMyImage.setBounds(10, 120, 552, 369); contentPanel.add(scrollPaneMyImage); tablemyLectures = new JTable(); - tablemyLectures.getSelectionModel().addListSelectionListener( - new ListSelectionListener() { - public void valueChanged(ListSelectionEvent e) { + tablemyLectures.getSelectionModel().addListSelectionListener(new ListSelectionListener() { + public void valueChanged(ListSelectionEvent e) { - if (tablemyLectures.getSelectedRow() != -1) { - String lectureid = modelMyLectures - .getValueAt( - tablemyLectures - .convertRowIndexToModel(tablemyLectures - .getSelectedRow()), - 8).toString(); + if (tablemyLectures.getSelectedRow() != -1) { + String lectureid = modelMyLectures.getValueAt( + tablemyLectures.convertRowIndexToModel(tablemyLectures.getSelectedRow()), 8) + .toString(); - try { + try { - // write the values into the information pane on - // the right hand side - writeLectureData(lectureid); + // write the values into the information pane on + // the right hand side + writeLectureData(lectureid); - // fill the itemOwnder model with information - // from selected item - setItemOwnerInformation(lectureid); + // fill the itemOwnder model with information + // from selected item + setItemOwnerInformation(lectureid); - } catch (TException e1) { + } catch (TException e1) { - e1.printStackTrace(); - } catch (ParseException e1) { + e1.printStackTrace(); + } catch (ParseException e1) { - e1.printStackTrace(); - } - } + e1.printStackTrace(); } + } + } - }); + }); tablemyLectures.setModel(modelMyLectures); tablemyLectures.getColumnModel().getColumn(1).sizeWidthToFit(); @@ -334,11 +296,11 @@ public class EditLectureSearch_GUI extends JInternalFrame { tablemyLectures.setRowSorter(rowSorterMyLectures); scrollPaneMyImage.setViewportView(tablemyLectures); - + lblTotalResults = new JLabel("Anzahl:"); lblTotalResults.setBounds(10, 512, 131, 20); contentPanel.add(lblTotalResults); - + { JPanel buttonPane = new JPanel(); buttonPane.setBounds(0, 640, 826, 33); @@ -366,48 +328,29 @@ public class EditLectureSearch_GUI extends JInternalFrame { // a row is selected, do operations - Lecture.lecture.setid(modelMyLectures - .getValueAt( - tablemyLectures - .convertRowIndexToModel(tablemyLectures - .getSelectedRow()), - 8).toString()); - Lecture.lecture.setName(modelMyLectures - .getValueAt( - tablemyLectures - .convertRowIndexToModel(tablemyLectures - .getSelectedRow()), - 0).toString()); - Lecture.lecture.setDesc(modelMyLectures - .getValueAt( - tablemyLectures - .convertRowIndexToModel(tablemyLectures - .getSelectedRow()), - 1).toString()); - String date = modelMyLectures - .getValueAt( - tablemyLectures - .convertRowIndexToModel(tablemyLectures - .getSelectedRow()), - 2).toString(); - - Lecture.lecture.setLinkedImagename(modelMyLectures - .getValueAt( - tablemyLectures - .convertRowIndexToModel(tablemyLectures - .getSelectedRow()), - 6).toString()); - - int zweitesLeerzeichen = date.indexOf(" ", - date.indexOf(" ") + 1); - - String startdate = date.substring(0, - zweitesLeerzeichen); + Lecture.lecture.setid(modelMyLectures.getValueAt( + tablemyLectures.convertRowIndexToModel(tablemyLectures.getSelectedRow()), + 8).toString()); + Lecture.lecture.setName(modelMyLectures.getValueAt( + tablemyLectures.convertRowIndexToModel(tablemyLectures.getSelectedRow()), + 0).toString()); + Lecture.lecture.setDesc(modelMyLectures.getValueAt( + tablemyLectures.convertRowIndexToModel(tablemyLectures.getSelectedRow()), + 1).toString()); + String date = modelMyLectures.getValueAt( + tablemyLectures.convertRowIndexToModel(tablemyLectures.getSelectedRow()), + 2).toString(); + + Lecture.lecture.setLinkedImagename(modelMyLectures.getValueAt( + tablemyLectures.convertRowIndexToModel(tablemyLectures.getSelectedRow()), + 6).toString()); + + int zweitesLeerzeichen = date.indexOf(" ", date.indexOf(" ") + 1); + + String startdate = date.substring(0, zweitesLeerzeichen); String enddate = date.substring(zweitesLeerzeichen); - SimpleDateFormat out = new SimpleDateFormat( - "yyyy-MM-dd HH:mm:ss"); - SimpleDateFormat in = new SimpleDateFormat( - "dd.MM.yyyy HH:mm:ss"); + SimpleDateFormat out = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat in = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss"); try { enddate = out.format(in.parse(enddate)); startdate = out.format(in.parse(startdate)); @@ -416,24 +359,20 @@ public class EditLectureSearch_GUI extends JInternalFrame { e2.printStackTrace(); } - DateFormat df = new SimpleDateFormat( - "yyyy-MM-dd HH:mm:ss"); + DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); try { // Format has to be "yyyy-MM-dd HH:mm:ss" Lecture.lecture.setEnddate(df.parse(enddate)); - Lecture.lecture.setStartdate(df - .parse(startdate)); + Lecture.lecture.setStartdate(df.parse(startdate)); } catch (ParseException e1) { e1.printStackTrace(); } if (modelMyLectures .getValueAt( - tablemyLectures - .convertRowIndexToModel(tablemyLectures - .getSelectedRow()), - 3).toString().equals("1")) { + tablemyLectures.convertRowIndexToModel(tablemyLectures + .getSelectedRow()), 3).toString().equals("1")) { Lecture.lecture.setActive(true); } else { Lecture.lecture.setActive(false); @@ -549,56 +488,30 @@ public class EditLectureSearch_GUI extends JInternalFrame { scrollPaneName.setBounds(10, 40, 218, 55); panel.add(scrollPaneName); - } // Initiale Beffuelung eines Table models - public DefaultTableModel initTableModel(DefaultTableModel model) - throws ParseException { + public DefaultTableModel initTableModel(DefaultTableModel model) { List<org.openslx.sat.thrift.iface.Lecture> lectures; try { - + // Hole eine Liste der erlaubten Images für die diese Person - if(person.verantwortlicher.getRole()=="Admin"){ + if (person.verantwortlicher.getRole().equals("Admin")) { //get complete list lectures = ThriftManager.getSatClient().getLectureList(SessionData.authToken); } else { //get permitted list lectures = ThriftManager.getSatClient().getLectureListPermissionWrite(SessionData.authToken); } - - Iterator<org.openslx.sat.thrift.iface.Lecture> i = lectures.iterator(); - SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss"); - int x = 0; - - while (i.hasNext()) { - // erzeuge Objekte fuer die Tabelle - - Object[] obj = { - lectures.get(x).lecturename, - lectures.get(x).desc, - out.format(in.parse(lectures.get(x).starttime)) + " " - + out.format(in.parse(lectures.get(x).endtime)), - lectures.get(x).isActive, - out.format(in.parse(lectures.get(x).lastused)), - lectures.get(x).username, lectures.get(x).imagename, - " ", lectures.get(x).id }; - // Fuege diese Objekte der Tabelle hinzu - model.addRow(obj); - - x++; - i.next(); - } - + TableFiller.fillModelWithLectureList(model, lectures); + //show number if rows in GUI - lblTotalResults.setText(lblTotalResults.getText()+" "+model.getRowCount()); + lblTotalResults.setText(lblTotalResults.getText() + " " + model.getRowCount()); return model; } catch (TException e1) { - e1.printStackTrace(); } return model; } @@ -623,15 +536,14 @@ public class EditLectureSearch_GUI extends JInternalFrame { SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss"); - Map<String, String> res = ThriftManager.getSatClient().getLectureData(id,SessionData.authToken); + Map<String, String> res = ThriftManager.getSatClient().getLectureData(id, SessionData.authToken); labelName.setText(res.get("name")); labelAktiv.setText(res.get("isActive")); labeldesc.setText(res.get("desc")); labelVerantwortlicher.setText(res.get("owner")); labelstartdate.setText(out.format(in.parse(res.get("startTime")))); labelenddate.setText(out.format(in.parse(res.get("endTime")))); - labelimage.setText(res.get("imagepath").substring( - res.get("imagepath").indexOf("/") + 1)); + labelimage.setText(res.get("imagepath").substring(res.get("imagepath").indexOf("/") + 1)); labelimageversion.setText(res.get("imageversion")); }// end writeLectureData @@ -641,7 +553,7 @@ public class EditLectureSearch_GUI extends JInternalFrame { try { // get values from server and set them in model - map = ThriftManager.getSatClient().getItemOwner(lectureid,SessionData.authToken); + map = ThriftManager.getSatClient().getItemOwner(lectureid, SessionData.authToken); ItemOwner.itemOwner.setUserID(map.get("userID")); ItemOwner.itemOwner.setUsername(map.get("loginName")); diff --git a/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java index c08c5eb1..d612df55 100644 --- a/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java @@ -29,8 +29,6 @@ import javax.swing.JSeparator; import javax.swing.JTable; import javax.swing.JTextPane; import javax.swing.ScrollPaneConstants; -import javax.swing.UIManager; -import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; import javax.swing.border.TitledBorder; import javax.swing.table.DefaultTableModel; @@ -84,13 +82,6 @@ public class PermissionCreateLecture_GUI extends JInternalFrame { public PermissionCreateLecture_GUI() { setResizable(false); - - try { - UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); - } catch (ClassNotFoundException | InstantiationException | IllegalAccessException - | UnsupportedLookAndFeelException e) { - e.printStackTrace(); - } setTitle("bwLehrpool Suite - Berechtigungen - " + person.verantwortlicher.getUserID()); setBounds(0, 0, 603, 722); @@ -419,9 +410,7 @@ public class PermissionCreateLecture_GUI extends JInternalFrame { // get values from table and save the checkbox values - // for (int i = 0; i < map.size(); i++) { for (int i = 0; i < tablePermittedUsers.getRowCount(); i++) { - // System.out.println("in for, rowcount="+table.getRowCount()); person temp = new person(); seperatorIndex = tablePermittedUsers.getModel().getValueAt(i, 0).toString().indexOf(","); @@ -450,10 +439,6 @@ public class PermissionCreateLecture_GUI extends JInternalFrame { } } - //for (int y = 0; y < list.size(); y++) { - // System.out.println("" + list.get(y).getName()); - //} - RightsManagement.rightsManagement.setPermittedUserList(list); }// end saveTableToList() diff --git a/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java index f090eb46..037de54c 100644 --- a/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java @@ -1,23 +1,20 @@ package gui.lecture; +import gui.helper.ColumnSelector; import gui.intro.MainMenue_GUI; import java.awt.Color; -import java.awt.Component; import java.awt.FlowLayout; import java.awt.Font; import java.awt.SystemColor; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.awt.event.ItemEvent; -import java.awt.event.ItemListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import javax.swing.AbstractButton; import javax.swing.JButton; import javax.swing.JInternalFrame; import javax.swing.JLabel; @@ -28,8 +25,6 @@ import javax.swing.JSeparator; import javax.swing.JTable; import javax.swing.JTextPane; import javax.swing.ScrollPaneConstants; -import javax.swing.UIManager; -import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; import javax.swing.border.TitledBorder; import javax.swing.table.DefaultTableModel; @@ -52,16 +47,13 @@ import util.ListAllOtherUsers_GUI; public class PermissionEditLecture_GUI extends JInternalFrame { private final JPanel contentPanel = new JPanel(); - String[] result; private JTable table; - Object[] titles = { "Name", "Lesen", "Schreiben", "Admin", "userID" }; + private String[] titles = { "Name", "Lesen", "Schreiben", "Admin", "userID" }; private List<Person> map = null; // List of people who have rights - Component c = null; public static final String HELP_MESSAGE = "<html><div align=\"center\">" + "Hier können Sie die Berechtigungen für Ihre Veranstaltung festlegen.<br />" + "Es wird unterschieden, ob innerhalb der Suite (dieses Programm) Änderungen vorgenommen werden dürfen, <br />" - + "und/oder ob die Veranstaltung auch im VMChooser angezeigt wird." - + "</div></html>"; + + "und/oder ob die Veranstaltung auch im VMChooser angezeigt wird." + "</div></html>"; final DefaultTableModel model = new DefaultTableModel(titles, 0) { @@ -71,7 +63,7 @@ public class PermissionEditLecture_GUI extends JInternalFrame { } return false; } - + public Class<?> getColumnClass(int c) { switch (c) { case 0: @@ -84,21 +76,11 @@ public class PermissionEditLecture_GUI extends JInternalFrame { }; public PermissionEditLecture_GUI() { - setResizable(false); - - try { - UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); - } catch (ClassNotFoundException | InstantiationException - | IllegalAccessException | UnsupportedLookAndFeelException e) { - - e.printStackTrace(); - } - setTitle("bwLehrpool Suite - Berechtigungen - "+person.verantwortlicher.getUserID()); + setTitle("bwLehrpool Suite - Berechtigungen - " + person.verantwortlicher.getUserID()); setBounds(0, 0, 603, 722); - getContentPane().setLayout(null); { JPanel panel = new JPanel(); @@ -107,8 +89,7 @@ public class PermissionEditLecture_GUI extends JInternalFrame { getContentPane().add(panel); panel.setLayout(null); { - JLabel lblNewLabel = new JLabel( - "Veranstaltung - Berechtigungen"); + JLabel lblNewLabel = new JLabel("Veranstaltung - Berechtigungen"); lblNewLabel.setBounds(10, 11, 509, 22); panel.add(lblNewLabel); lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18)); @@ -130,8 +111,8 @@ public class PermissionEditLecture_GUI extends JInternalFrame { JPanel panel = new JPanel(); panel.setLayout(null); - panel.setBorder(new TitledBorder(null, "Beschreibung", - TitledBorder.LEADING, TitledBorder.TOP, null, null)); + panel.setBorder(new TitledBorder(null, "Beschreibung", TitledBorder.LEADING, TitledBorder.TOP, null, + null)); panel.setBackground(SystemColor.menu); panel.setBounds(10, 35, 557, 130); contentPanel.add(panel); @@ -165,15 +146,14 @@ public class PermissionEditLecture_GUI extends JInternalFrame { JPanel panel_1 = new JPanel(); panel_1.setBackground(SystemColor.menu); - panel_1.setBorder(new TitledBorder(null, "Suite-Berechtigungen", - TitledBorder.LEADING, TitledBorder.TOP, null, null)); + panel_1.setBorder(new TitledBorder(null, "Suite-Berechtigungen", TitledBorder.LEADING, + TitledBorder.TOP, null, null)); panel_1.setBounds(10, 194, 311, 326); contentPanel.add(panel_1); panel_1.setLayout(null); JScrollPane scrollPane = new JScrollPane(); - scrollPane - .setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); + scrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); scrollPane.setBounds(10, 28, 291, 251); panel_1.add(scrollPane); @@ -183,14 +163,15 @@ public class PermissionEditLecture_GUI extends JInternalFrame { public void mouseClicked(MouseEvent e) { checkIntegrity(-1); } + @Override public void mouseReleased(MouseEvent e) { table.clearSelection(); //just one row is selectable - table.setRowSelectionInterval(table.rowAtPoint(e.getPoint()), table.rowAtPoint(e.getPoint())); + table.setRowSelectionInterval(table.rowAtPoint(e.getPoint()), table.rowAtPoint(e.getPoint())); } }); - + table.setModel(model); table.setSelectionForeground(Color.WHITE); table.getTableHeader().setReorderingAllowed(false); @@ -204,24 +185,20 @@ public class PermissionEditLecture_GUI extends JInternalFrame { //System.out.println("Loading data from db"); try { - map = ThriftManager.getSatClient().getPermissionForUserAndLecture( - SessionData.authToken,Lecture.lecture.getid(),person.verantwortlicher.getUserID() - ); + map = ThriftManager.getSatClient().getPermissionForUserAndLecture(SessionData.authToken, + Lecture.lecture.getid(), person.verantwortlicher.getUserID()); Iterator<Person> i = map.iterator(); int x = 0; while (i.hasNext()) { // erzeuge Objekte fuer die Tabelle - Object[] obj = { - map.get(x).getNachname() + ", " - + map.get(x).getVorname(), // Name + Object[] obj = { map.get(x).getNachname() + ", " + map.get(x).getVorname(), // Name (boolean) map.get(x).isLecture_read(), // Read (boolean) map.get(x).isLecture_write(), // Write (boolean) map.get(x).isLecture_admin(), // Admin map.get(x).getUserID() // userID }; - // System.out.println(map.get(x).isImage_read() + ""); // Fuege diese Objekte der Tabelle hinzu model.addRow(obj); @@ -231,16 +208,13 @@ public class PermissionEditLecture_GUI extends JInternalFrame { } } catch (TException e1) { - + e1.printStackTrace(); } } else // read from model { - //System.out.println("reading from model"); - //System.out.println("RightsManagement.rightsManagement.getPermittedUserList().size() = "+ RightsManagement.rightsManagement.getPermittedUserList().size()); - List<person> listt = RightsManagement.rightsManagement - .getPermittedUserList(); + List<person> listt = RightsManagement.rightsManagement.getPermittedUserList(); Iterator<person> i = listt.iterator(); while (i.hasNext()) { @@ -253,37 +227,25 @@ public class PermissionEditLecture_GUI extends JInternalFrame { temp.isLecture_admin(), // Admin temp.getUserID() // userID }; - //System.out.println("Processing: " + temp.getName() + ", " - // + temp.getVorname() + ", " + temp.isLecture_read() - // + ", " + temp.isLecture_write() + ", " - // + temp.isLecture_admin() + ", " + temp.getUserID()); // Fuege diese Objekte der Tabelle hinzu model.addRow(obj); } }// end set list of permitted users - // Object[] rowdata={"Max Mustermann", new Boolean(false),new - // Boolean(false),new Boolean(false),new Boolean(false)}; - // model.addRow(rowdata); - - TableColumn tc1 = table.getColumnModel().getColumn(1); tc1.setCellEditor(table.getDefaultEditor(Boolean.class)); tc1.setCellRenderer(table.getDefaultRenderer(Boolean.class)); - tc1.setHeaderRenderer(new CheckBoxHeader(new MyItemListener1(), - (String) titles[1])); + tc1.setHeaderRenderer(new CheckBoxHeader(new ColumnSelector(table, 1), titles[1])); TableColumn tc2 = table.getColumnModel().getColumn(2); tc2.setCellEditor(table.getDefaultEditor(Boolean.class)); tc2.setCellRenderer(table.getDefaultRenderer(Boolean.class)); - tc2.setHeaderRenderer(new CheckBoxHeader(new MyItemListener2(), - (String) titles[2])); + tc2.setHeaderRenderer(new CheckBoxHeader(new ColumnSelector(table, 1, 2), titles[2])); TableColumn tc3 = table.getColumnModel().getColumn(3); tc3.setCellEditor(table.getDefaultEditor(Boolean.class)); tc3.setCellRenderer(table.getDefaultRenderer(Boolean.class)); - tc3.setHeaderRenderer(new CheckBoxHeader(new MyItemListener3(), - (String) titles[3])); + tc3.setHeaderRenderer(new CheckBoxHeader(new ColumnSelector(table, 1, 2, 3), titles[3])); scrollPane.setViewportView(table); @@ -291,7 +253,7 @@ public class PermissionEditLecture_GUI extends JInternalFrame { btnAddUser.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { // show list of all other relevant users - GuiManager.openPopup(new ListAllOtherUsers_GUI(table, 4)); + GuiManager.openPopup(new ListAllOtherUsers_GUI(table, 4)); // give access to the table model and inform that // the userID is position 5 in the model } @@ -310,13 +272,8 @@ public class PermissionEditLecture_GUI extends JInternalFrame { // This pointer counts the already // deleted rows and correct the // offset of i - //LOGGER.info("deletabelRows.length=" + deletableRows.length); for (int i = 0; i < deletableRows.length; i++) { - - //LOGGER.info("Deleting rowCount[" + i - // + "], tableRow number " - // + deletableRows[i - pointerCorrection]); model.removeRow(deletableRows[i - pointerCorrection]); pointerCorrection++; } @@ -355,15 +312,14 @@ public class PermissionEditLecture_GUI extends JInternalFrame { JPanel panel_2 = new JPanel(); panel_2.setLayout(null); - panel_2.setBorder(new TitledBorder(null, "Sichtbarkeit im VMChooser", - TitledBorder.LEADING, TitledBorder.TOP, null, null)); + panel_2.setBorder(new TitledBorder(null, "Sichtbarkeit im VMChooser", TitledBorder.LEADING, + TitledBorder.TOP, null, null)); panel_2.setBackground(SystemColor.menu); panel_2.setBounds(331, 194, 236, 326); contentPanel.add(panel_2); final JScrollPane scrollPane_1 = new JScrollPane(); - scrollPane_1 - .setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); + scrollPane_1.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); scrollPane_1.setEnabled(false); scrollPane_1.setBounds(16, 88, 210, 191); panel_2.add(scrollPane_1); @@ -403,7 +359,6 @@ public class PermissionEditLecture_GUI extends JInternalFrame { }); cancelButton.setActionCommand("OK"); buttonPane.add(cancelButton); - // getRootPane().setDefaultButton(cancelButton); } { JButton continueButton = new JButton("Weiter"); @@ -413,9 +368,7 @@ public class PermissionEditLecture_GUI extends JInternalFrame { // before save, check integrity to avoid dblClick errors // of rights for (int i = 0; i < table.getRowCount(); i++) { - checkIntegrity(i); // check integrity of each line - // again - //System.out.println("in auto-correct"); + checkIntegrity(i); // check integrity of each line again } saveTableToList(); @@ -452,7 +405,6 @@ public class PermissionEditLecture_GUI extends JInternalFrame { separator_1.setBounds(0, 627, 597, 2); getContentPane().add(separator_1); - }// end constructor private void checkIntegrity(int row) { @@ -472,7 +424,7 @@ public class PermissionEditLecture_GUI extends JInternalFrame { isWrite = (boolean) table.getValueAt(selectedRow, 2); isAdmin = (boolean) table.getValueAt(selectedRow, 3); - boolean[] checkedVals = CheckIntegrity.isIntegreForLecture(isRead, isWrite,isAdmin); + boolean[] checkedVals = CheckIntegrity.isIntegreForLecture(isRead, isWrite, isAdmin); table.setValueAt(checkedVals[0], selectedRow, 1); table.setValueAt(checkedVals[1], selectedRow, 2); @@ -488,33 +440,23 @@ public class PermissionEditLecture_GUI extends JInternalFrame { // get values from table and save the checkbox values - // for (int i = 0; i < map.size(); i++) { for (int i = 0; i < table.getRowCount(); i++) { - // System.out.println("in for, rowcount="+table.getRowCount()); person temp = new person(); - seperatorIndex = table.getModel().getValueAt(i, 0).toString() - .indexOf(","); + seperatorIndex = table.getModel().getValueAt(i, 0).toString().indexOf(","); temp.setUserID(table.getModel().getValueAt(i, 4).toString()); // get // userID - temp.setLecture_admin(Boolean.parseBoolean(table.getModel() - .getValueAt(i, 3).toString())); // get Admin - temp.setLecture_write(Boolean.parseBoolean(table.getModel() - .getValueAt(i, 2).toString()));// get Write - temp.setLecture_read(Boolean.parseBoolean(table.getModel() - .getValueAt(i, 1).toString()));// get Read - seperatorIndex = table.getModel().getValueAt(i, 0).toString() - .indexOf(","); - temp.setName(table.getModel().getValueAt(i, 0).toString() - .substring(0, seperatorIndex)); - temp.setVorname(table.getModel().getValueAt(i, 0).toString() - .substring(seperatorIndex + 2)); + temp.setLecture_admin(Boolean.parseBoolean(table.getModel().getValueAt(i, 3).toString())); // get Admin + temp.setLecture_write(Boolean.parseBoolean(table.getModel().getValueAt(i, 2).toString()));// get Write + temp.setLecture_read(Boolean.parseBoolean(table.getModel().getValueAt(i, 1).toString()));// get Read + seperatorIndex = table.getModel().getValueAt(i, 0).toString().indexOf(","); + temp.setName(table.getModel().getValueAt(i, 0).toString().substring(0, seperatorIndex)); + temp.setVorname(table.getModel().getValueAt(i, 0).toString().substring(seperatorIndex + 2)); // check if at least one checkbox is checked. If yes, save this // entry into list, if not ignore this entry - if (temp.isLecture_admin() || temp.isLecture_write() - || temp.isLecture_read()) { + if (temp.isLecture_admin() || temp.isLecture_write() || temp.isLecture_read()) { // save entry list.add(temp); } else { @@ -525,57 +467,4 @@ public class PermissionEditLecture_GUI extends JInternalFrame { RightsManagement.rightsManagement.setPermittedUserList(list); }// end saveTableToList() - //Read column - class MyItemListener1 implements ItemListener { - public void itemStateChanged(ItemEvent e) { - Object source = e.getSource(); - if (source instanceof AbstractButton == false) - return; - boolean checked = e.getStateChange() == ItemEvent.SELECTED; - for (int x = 0, y = table.getRowCount(); x < y; x++) { - table.setValueAt(new Boolean(checked), x, 1); - } - } - } - - //Write column - class MyItemListener2 implements ItemListener { - public void itemStateChanged(ItemEvent e) { - Object source = e.getSource(); - if (source instanceof AbstractButton == false) - return; - boolean checked = e.getStateChange() == ItemEvent.SELECTED; - for (int x = 0, y = table.getRowCount(); x < y; x++) { - table.setValueAt(new Boolean(checked), x, 1); - table.setValueAt(new Boolean(checked), x, 2); - } - } - } - - //Admin column - class MyItemListener3 implements ItemListener { - public void itemStateChanged(ItemEvent e) { - Object source = e.getSource(); - if (source instanceof AbstractButton == false) - return; - boolean checked = e.getStateChange() == ItemEvent.SELECTED; - for (int x = 0, y = table.getRowCount(); x < y; x++) { - table.setValueAt(new Boolean(checked), x, 1); - table.setValueAt(new Boolean(checked), x, 2); - table.setValueAt(new Boolean(checked), x, 3); - } - } - } - - class MyItemListener4 implements ItemListener { - public void itemStateChanged(ItemEvent e) { - Object source = e.getSource(); - if (source instanceof AbstractButton == false) - return; - boolean checked = e.getStateChange() == ItemEvent.SELECTED; - for (int x = 0, y = table.getRowCount(); x < y; x++) { - table.setValueAt(new Boolean(checked), x, 4); - } - } - } } diff --git a/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java index 07f8a6e7..9f55ee83 100644 --- a/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java @@ -1,9 +1,9 @@ package gui.lecture;
+import gui.helper.TableFiller;
import gui.intro.MainMenue_GUI;
import java.awt.Color;
-import java.awt.Component;
import java.awt.FlowLayout;
import java.awt.Font;
import java.awt.SystemColor;
@@ -16,7 +16,6 @@ import java.awt.event.MouseEvent; import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -24,7 +23,6 @@ import javax.swing.JButton; import javax.swing.JInternalFrame;
import javax.swing.JLabel;
import javax.swing.JPanel;
-import javax.swing.JRadioButton;
import javax.swing.JScrollPane;
import javax.swing.JSeparator;
import javax.swing.JTabbedPane;
@@ -34,12 +32,8 @@ import javax.swing.JTextField; import javax.swing.JTextPane;
import javax.swing.ListSelectionModel;
import javax.swing.RowFilter;
-import javax.swing.UIManager;
-import javax.swing.UnsupportedLookAndFeelException;
import javax.swing.border.EmptyBorder;
import javax.swing.border.TitledBorder;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
import javax.swing.event.InternalFrameAdapter;
import javax.swing.event.InternalFrameEvent;
import javax.swing.event.ListSelectionEvent;
@@ -61,68 +55,54 @@ import util.GuiManager; public class SearchLecture_GUI extends JInternalFrame {
private final JPanel contentPanel = new JPanel();
- String[] result;
- JRadioButton rdbtnInternetJa;
- JRadioButton rdbtnInternetNein;
- JLabel labelAktiv;
- JLabel labelstartdate;
- JLabel labelenddate;
- JLabel labelimageversion;
- JTextArea labelName;
- JTextArea labelimage;
- JTextArea labeldesc;
- JLabel labelVerantwortlicher;
- JTable tableAllLectures;
- JTable tablemyLectures;
+ private JLabel labelAktiv;
+ private JLabel labelstartdate;
+ private JLabel labelenddate;
+ private JLabel labelimageversion;
+ private JTextArea labelName;
+ private JTextArea labelimage;
+ private JTextArea labeldesc;
+ private JLabel labelVerantwortlicher;
+ private JTable tableAllLectures;
+ private JTable tablemyLectures;
private JTextField textFieldName;
- JTabbedPane tabbedPane;
- boolean activeSearch=false;
- Component c = null;
- String[] titles = { "Veranstaltungsname", "Beschreibung",
- "Gültigkeitsdatum", "Aktiv", "Letzte Benutzung",
- "Verantwortlicher", "Image", "Schlagwort", "ID" };
-
- final DefaultTableModel modelAll = new DefaultTableModel(titles, 0){
- public boolean isCellEditable(int rowIndex, int mColIndex) {
- return false;
- }
+ private JTabbedPane tabbedPane;
+ private String[] titles = { "Veranstaltungsname", "Beschreibung", "Gültigkeitsdatum", "Aktiv",
+ "Letzte Benutzung", "Verantwortlicher", "Image", "Schlagwort", "ID" };
+
+ private final DefaultTableModel modelAll = new DefaultTableModel(titles, 0) {
+ public boolean isCellEditable(int rowIndex, int mColIndex) {
+ return false;
+ }
};
-
- final DefaultTableModel modelMyLectures = new DefaultTableModel(titles, 0){
- public boolean isCellEditable(int rowIndex, int mColIndex) {
- return false;
- }
+
+ private final DefaultTableModel modelMyLectures = new DefaultTableModel(titles, 0) {
+ public boolean isCellEditable(int rowIndex, int mColIndex) {
+ return false;
+ }
};
-
- final TableRowSorter<TableModel> rowSorterAll = new TableRowSorter<TableModel>(
- modelAll);
-
- final TableRowSorter<TableModel> rowSorterMyLectures = new TableRowSorter<TableModel>(
+
+ private final TableRowSorter<TableModel> rowSorterAll = new TableRowSorter<TableModel>(modelAll);
+
+ private final TableRowSorter<TableModel> rowSorterMyLectures = new TableRowSorter<TableModel>(
modelMyLectures);
- RowFilter<Object, Object> rf = null;
- List<RowFilter<Object,Object>> filters = new ArrayList<RowFilter<Object,Object>>(2);
+ private RowFilter<Object, Object> rf = null;
+ private List<RowFilter<Object, Object>> filters = new ArrayList<RowFilter<Object, Object>>(2);
/**
* Create the dialog.
*/
public SearchLecture_GUI() {
-
filters.add(RowFilter.regexFilter(".", 0));
rf = RowFilter.orFilter(filters);
addInternalFrameListener(new InternalFrameAdapter() {
@Override
public void internalFrameActivated(InternalFrameEvent arg0) {
- try {
- initTableModel(modelMyLectures);
- initTableModelAll(modelAll);
-
- } catch (ParseException e) {
-
- e.printStackTrace();
- }
+ initTableModel(modelMyLectures);
+ initTableModelAll(modelAll);
tablemyLectures.getColumnModel().getColumn(1).setWidth(0);
tablemyLectures.getColumnModel().getColumn(1).setMinWidth(0);
tablemyLectures.getColumnModel().getColumn(1).setMaxWidth(0);
@@ -141,7 +121,7 @@ public class SearchLecture_GUI extends JInternalFrame { tablemyLectures.getColumnModel().getColumn(8).setWidth(0);
tablemyLectures.getColumnModel().getColumn(8).setMinWidth(0);
tablemyLectures.getColumnModel().getColumn(8).setMaxWidth(0);
-
+
tablemyLectures.getTableHeader().setReorderingAllowed(false);
tablemyLectures.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
tablemyLectures.addMouseListener(new MouseAdapter() {
@@ -150,10 +130,11 @@ public class SearchLecture_GUI extends JInternalFrame { public void mouseReleased(MouseEvent e) {
tablemyLectures.clearSelection(); //just one row is selectablemyLectures
- tablemyLectures.setRowSelectionInterval(tablemyLectures.rowAtPoint(e.getPoint()), tablemyLectures.rowAtPoint(e.getPoint()));
+ tablemyLectures.setRowSelectionInterval(tablemyLectures.rowAtPoint(e.getPoint()),
+ tablemyLectures.rowAtPoint(e.getPoint()));
}
});
-
+
tableAllLectures.getColumnModel().getColumn(1).setWidth(0);
tableAllLectures.getColumnModel().getColumn(1).setMinWidth(0);
tableAllLectures.getColumnModel().getColumn(1).setMaxWidth(0);
@@ -172,7 +153,7 @@ public class SearchLecture_GUI extends JInternalFrame { tableAllLectures.getColumnModel().getColumn(8).setWidth(0);
tableAllLectures.getColumnModel().getColumn(8).setMinWidth(0);
tableAllLectures.getColumnModel().getColumn(8).setMaxWidth(0);
-
+
tableAllLectures.getTableHeader().setReorderingAllowed(false);
tableAllLectures.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
tableAllLectures.addMouseListener(new MouseAdapter() {
@@ -181,7 +162,8 @@ public class SearchLecture_GUI extends JInternalFrame { public void mouseReleased(MouseEvent e) {
tableAllLectures.clearSelection(); //just one row is selectableAllLectures
- tableAllLectures.setRowSelectionInterval(tableAllLectures.rowAtPoint(e.getPoint()), tableAllLectures.rowAtPoint(e.getPoint()));
+ tableAllLectures.setRowSelectionInterval(tableAllLectures.rowAtPoint(e.getPoint()),
+ tableAllLectures.rowAtPoint(e.getPoint()));
}
});
}
@@ -190,20 +172,11 @@ public class SearchLecture_GUI extends JInternalFrame { // Verhindert das Vergroessern Des Fensters
setResizable(false);
- try {
- // Setzt das Look & Feel auf System
- UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
- } catch (ClassNotFoundException | InstantiationException
- | IllegalAccessException | UnsupportedLookAndFeelException e) {
-
- e.printStackTrace();
- }
// Setzt den Fenstertitel
- setTitle("bwLehrpool Suite - Veranstaltung suchen - "+person.verantwortlicher.getUserID());
+ setTitle("bwLehrpool Suite - Veranstaltung suchen - " + person.verantwortlicher.getUserID());
// Zentriert das Fenster in die Bildmitte 2;
setBounds(0, 0, 842, 722);
-
getContentPane().setLayout(null);
{
JPanel panel = new JPanel();
@@ -234,8 +207,8 @@ public class SearchLecture_GUI extends JInternalFrame { JPanel panel_1 = new JPanel();
panel_1.setBackground(SystemColor.menu);
- panel_1.setBorder(new TitledBorder(null, "Filterfunktionen",
- TitledBorder.LEADING, TitledBorder.TOP, null, null));
+ panel_1.setBorder(new TitledBorder(null, "Filterfunktionen", TitledBorder.LEADING, TitledBorder.TOP,
+ null, null));
panel_1.setBounds(10, 49, 557, 63);
contentPanel.add(panel_1);
panel_1.setLayout(null);
@@ -253,18 +226,15 @@ public class SearchLecture_GUI extends JInternalFrame { String stext = textFieldName.getText().trim();
// Wenn Textfield nicht leer
if (stext != "") {
- activeSearch=true;
// Filtere nach der Eingabe
- filters.clear();
- filters.add(RowFilter.regexFilter("(?i)"+stext, 0)); //case insensitive
- filters.add(RowFilter.regexFilter("(?i)"+stext, 1)); //case insensitive
+ filters.clear();
+ filters.add(RowFilter.regexFilter("(?i)" + stext, 0)); //case insensitive
+ filters.add(RowFilter.regexFilter("(?i)" + stext, 1)); //case insensitive
rf = RowFilter.orFilter(filters);
rowSorterMyLectures.setRowFilter(rf);
rowSorterAll.setRowFilter(rf);
- }else{
- activeSearch=false;
- activeSearch = false;
+ } else {
filters.clear();
filters.add(RowFilter.regexFilter(".", 0)); //case insensitive, filter for anything
rf = RowFilter.orFilter(filters);
@@ -273,7 +243,7 @@ public class SearchLecture_GUI extends JInternalFrame { }
tablemyLectures.clearSelection();
tableAllLectures.clearSelection();
-
+
resetLectureInfo();
}
});
@@ -312,48 +282,31 @@ public class SearchLecture_GUI extends JInternalFrame { contentPanel.add(lblNewLabel_1);
tabbedPane = new JTabbedPane(JTabbedPane.TOP);
- tabbedPane.addChangeListener(new ChangeListener() {
- public void stateChanged(ChangeEvent arg0) {
- if (tabbedPane.getSelectedIndex() == 0) {
- //rowSorterMyLectures.setRowFilter(RowFilter.regexFilter(username, 5));
- } else if (tabbedPane.getSelectedIndex() == 1) {
-
- }
-
- }
- });
tabbedPane.setBounds(10, 123, 557, 397);
contentPanel.add(tabbedPane);
-
JScrollPane scrollPaneAllImages = new JScrollPane();
tableAllLectures = new JTable();
- tableAllLectures.getSelectionModel().addListSelectionListener( new ListSelectionListener()
- {
- public void valueChanged(ListSelectionEvent e)
- {
- if(tableAllLectures.getSelectedRow() != -1)
- {
- String imageid = modelAll
- .getValueAt(
- tableAllLectures
- .convertRowIndexToModel(tableAllLectures
- .getSelectedRow()), 8)
- .toString();
-
- try {
- writeLectureData(imageid);
- } catch (TException e1) {
-
- e1.printStackTrace();
- } catch (ParseException e1) {
-
- e1.printStackTrace();
+ tableAllLectures.getSelectionModel().addListSelectionListener(new ListSelectionListener() {
+ public void valueChanged(ListSelectionEvent e) {
+ if (tableAllLectures.getSelectedRow() != -1) {
+ String imageid = modelAll.getValueAt(
+ tableAllLectures.convertRowIndexToModel(tableAllLectures.getSelectedRow()), 8)
+ .toString();
+
+ try {
+ writeLectureData(imageid);
+ } catch (TException e1) {
+
+ e1.printStackTrace();
+ } catch (ParseException e1) {
+
+ e1.printStackTrace();
+ }
}
- }
- }
- });
+ }
+ });
tableAllLectures.setModel(modelAll);
tableAllLectures.getColumnModel().getColumn(1).sizeWidthToFit();
tableAllLectures.getColumnModel().getColumn(2).sizeWidthToFit();
@@ -363,33 +316,26 @@ public class SearchLecture_GUI extends JInternalFrame { JScrollPane scrollPaneMyImage = new JScrollPane();
tablemyLectures = new JTable();
- tablemyLectures.getSelectionModel().addListSelectionListener( new ListSelectionListener()
- {
- public void valueChanged(ListSelectionEvent e)
- {
- if(tablemyLectures.getSelectedRow() != -1)
- {
- String imageid = modelMyLectures
- .getValueAt(
- tablemyLectures
- .convertRowIndexToModel(tablemyLectures
- .getSelectedRow()), 8)
- .toString();
-
- try {
- writeLectureData(imageid);
- } catch (TException e1) {
-
- e1.printStackTrace();
- } catch (ParseException e1) {
-
- e1.printStackTrace();
+ tablemyLectures.getSelectionModel().addListSelectionListener(new ListSelectionListener() {
+ public void valueChanged(ListSelectionEvent e) {
+ if (tablemyLectures.getSelectedRow() != -1) {
+ String imageid = modelMyLectures.getValueAt(
+ tablemyLectures.convertRowIndexToModel(tablemyLectures.getSelectedRow()), 8)
+ .toString();
+
+ try {
+ writeLectureData(imageid);
+ } catch (TException e1) {
+
+ e1.printStackTrace();
+ } catch (ParseException e1) {
+
+ e1.printStackTrace();
+ }
}
- }
- }
-
-
- });
+ }
+
+ });
tablemyLectures.setModel(modelMyLectures);
tablemyLectures.getColumnModel().getColumn(1).sizeWidthToFit();
@@ -400,8 +346,7 @@ public class SearchLecture_GUI extends JInternalFrame { tablemyLectures.setRowSorter(rowSorterMyLectures);
scrollPaneMyImage.setViewportView(tablemyLectures);
- tabbedPane.addTab("Meine Veranstaltungen", null, scrollPaneMyImage,
- null);
+ tabbedPane.addTab("Meine Veranstaltungen", null, scrollPaneMyImage, null);
tableAllLectures.setRowSorter(rowSorterAll);
scrollPaneAllImages.setViewportView(tableAllLectures);
@@ -422,7 +367,6 @@ public class SearchLecture_GUI extends JInternalFrame { });
btnBack.setActionCommand("OK");
buttonPane.add(btnBack);
- //getRootPane().setDefaultButton(btnBack);
}
}
@@ -433,68 +377,68 @@ public class SearchLecture_GUI extends JInternalFrame { JSeparator separator_1 = new JSeparator();
separator_1.setBounds(0, 628, 836, 1);
getContentPane().add(separator_1);
-
+
JPanel panel = new JPanel();
panel.setLayout(null);
- panel.setBorder(new TitledBorder(null, "Detailinformationen",
- TitledBorder.LEADING, TitledBorder.TOP, null, null));
+ panel.setBorder(new TitledBorder(null, "Detailinformationen",
+
+ TitledBorder.LEADING, TitledBorder.TOP, null, null));
panel.setBackground(SystemColor.menu);
panel.setBounds(591, 85, 235, 518);
getContentPane().add(panel);
-
+
JLabel lblNewLabel_3 = new JLabel("Name:");
lblNewLabel_3.setBounds(10, 27, 104, 14);
panel.add(lblNewLabel_3);
-
+
JLabel lblAktiv = new JLabel("Aktiv:");
lblAktiv.setBounds(10, 98, 104, 14);
panel.add(lblAktiv);
-
+
labelAktiv = new JLabel("");
labelAktiv.setBounds(10, 114, 218, 14);
panel.add(labelAktiv);
-
+
labelstartdate = new JLabel("");
labelstartdate.setBounds(10, 147, 218, 14);
panel.add(labelstartdate);
-
+
JLabel lblStartdatum = new JLabel("Startdatum:");
lblStartdatum.setBounds(10, 129, 104, 14);
panel.add(lblStartdatum);
-
+
labelenddate = new JLabel("");
labelenddate.setBounds(10, 175, 218, 14);
panel.add(labelenddate);
-
+
JLabel lblEnddatum = new JLabel("Enddatum:");
lblEnddatum.setBounds(10, 161, 104, 14);
panel.add(lblEnddatum);
-
+
JLabel lblBeschreibung = new JLabel("Beschreibung:");
lblBeschreibung.setBounds(10, 189, 104, 14);
panel.add(lblBeschreibung);
-
+
JLabel lblImage = new JLabel("Image:");
lblImage.setBounds(10, 293, 104, 14);
panel.add(lblImage);
-
+
labelVerantwortlicher = new JLabel("");
labelVerantwortlicher.setBounds(10, 426, 218, 14);
panel.add(labelVerantwortlicher);
-
+
JLabel lblVerantwortlicher = new JLabel("Verantwortlicher:");
lblVerantwortlicher.setBounds(10, 411, 104, 14);
panel.add(lblVerantwortlicher);
-
+
JLabel lblImageversion = new JLabel("Imageversion:");
lblImageversion.setBounds(10, 381, 104, 14);
panel.add(lblImageversion);
-
+
labelimageversion = new JLabel("");
labelimageversion.setBounds(10, 399, 218, 14);
panel.add(labelimageversion);
-
-
+
labeldesc = new JTextArea();
labeldesc.setFont(new Font("Tahoma", Font.PLAIN, 11));
labeldesc.setEditable(false);
@@ -505,7 +449,7 @@ public class SearchLecture_GUI extends JInternalFrame { scrollPane.setBounds(10, 209, 218, 81);
panel.add(scrollPane);
//panel.add(labeldesc);
-
+
labelimage = new JTextArea();
labelimage.setLineWrap(true);
labelimage.setFont(new Font("Tahoma", Font.PLAIN, 11));
@@ -515,7 +459,7 @@ public class SearchLecture_GUI extends JInternalFrame { JScrollPane scrollPaneImage = new JScrollPane(labelimage);
scrollPaneImage.setBounds(10, 309, 215, 69);
panel.add(scrollPaneImage);
-
+
labelName = new JTextArea();
labelName.setEditable(false);
labelName.setFont(new Font("Tahoma", Font.PLAIN, 11));
@@ -525,94 +469,53 @@ public class SearchLecture_GUI extends JInternalFrame { scrollPaneName.setBounds(10, 40, 218, 55);
panel.add(scrollPaneName);
-
}
// Initiale Beffuelung eines Table models
- public DefaultTableModel initTableModel(DefaultTableModel model) throws ParseException {
+ public DefaultTableModel initTableModel(DefaultTableModel model) {
List<Lecture> lectures;
try {
-
+
// Hole eine Liste der erlaubten Images für die diese Person
- if(person.verantwortlicher.getRole()=="Admin"){
+ if (person.verantwortlicher.getRole() == "Admin") {
//get complete list
lectures = ThriftManager.getSatClient().getLectureList(SessionData.authToken);
} else {
//get permitted list
lectures = ThriftManager.getSatClient().getLectureListPermissionRead(SessionData.authToken);
}
-
- Iterator<Lecture> i = lectures.iterator();
- SimpleDateFormat in=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- SimpleDateFormat out=new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
- int x = 0;
-
- while (i.hasNext()) {
- // erzeuge Objekte fuer die Tabelle
- Object[] obj = {
- lectures.get(x).lecturename,
- lectures.get(x).desc,
- out.format(in.parse(lectures.get(x).starttime)) + " "
- + out.format(in.parse(lectures.get(x).endtime)),
- lectures.get(x).isActive, out.format(in.parse(lectures.get(x).lastused)),
- lectures.get(x).username,
- lectures.get(x).imagename," " ,lectures.get(x).id };
- // Fuege diese Objekte der Tabelle hinzu
- model.addRow(obj);
- x++;
- i.next();
- }
+ TableFiller.fillModelWithLectureList(model, lectures);
//show number of rows in GUI
- tabbedPane.setTitleAt(0, tabbedPane.getTitleAt(0)+" ("+model.getRowCount()+") ");
+ tabbedPane.setTitleAt(0, tabbedPane.getTitleAt(0) + " (" + model.getRowCount() + ") ");
return model;
} catch (TException e1) {
-
+
e1.printStackTrace();
}
return model;
}
-
+
// Initiale Beffuelung eines Table models
- public DefaultTableModel initTableModelAll(DefaultTableModel model) throws ParseException {
+ public DefaultTableModel initTableModelAll(DefaultTableModel model) {
List<Lecture> lectures;
try {
// Hole eine Liste der erlaubten Images für die diese Person
- //lectures = ThriftManager.getSatClient().getLectureList();
lectures = ThriftManager.getSatClient().getLectureList(SessionData.authToken);
- Iterator<Lecture> i = lectures.iterator();
- SimpleDateFormat in=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- SimpleDateFormat out=new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
- int x = 0;
-
- while (i.hasNext()) {
- // erzeuge Objekte fuer die Tabelle
- Object[] obj = {
- lectures.get(x).lecturename,
- lectures.get(x).desc,
- out.format(in.parse(lectures.get(x).starttime)) + " "
- + out.format(in.parse(lectures.get(x).endtime)),
- lectures.get(x).isActive, out.format(in.parse(lectures.get(x).lastused)),
- lectures.get(x).username,
- lectures.get(x).imagename," " ,lectures.get(x).id };
- // Fuege diese Objekte der Tabelle hinzu
- model.addRow(obj);
- x++;
- i.next();
- }
+ TableFiller.fillModelWithLectureList(model, lectures);
//show number of rows in GUI
- tabbedPane.setTitleAt(1, tabbedPane.getTitleAt(1)+" ("+model.getRowCount()+") ");
+ tabbedPane.setTitleAt(1, tabbedPane.getTitleAt(1) + " (" + model.getRowCount() + ") ");
return model;
} catch (TException e1) {
-
+
e1.printStackTrace();
}
return model;
}
-
+
private void resetLectureInfo() {
//reset the detailed information on the right hand side when changing search string
@@ -627,22 +530,20 @@ public class SearchLecture_GUI extends JInternalFrame { labelVerantwortlicher.setText("");
}
-
-
- public void writeLectureData(String id) throws TException, ParseException{
-
- SimpleDateFormat in=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- SimpleDateFormat out=new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
- Map<String,String> res=ThriftManager.getSatClient().getLectureData(id,SessionData.authToken);
- labelName.setText(res.get("name"));
- labelAktiv.setText(res.get("isActive"));
- labeldesc.setText(res.get("desc"));
- labelVerantwortlicher.setText(res.get("owner"));
- labelstartdate.setText(out.format(in.parse(res.get("startTime"))));
- labelenddate.setText(out.format(in.parse(res.get("endTime"))));
- labelimage.setText(res.get("imagepath").substring(res.get("imagepath").indexOf("/")+1));
- labelimageversion.setText(res.get("imageversion"));
-
+
+ public void writeLectureData(String id) throws TException, ParseException {
+
+ SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
+ Map<String, String> res = ThriftManager.getSatClient().getLectureData(id, SessionData.authToken);
+ labelName.setText(res.get("name"));
+ labelAktiv.setText(res.get("isActive"));
+ labeldesc.setText(res.get("desc"));
+ labelVerantwortlicher.setText(res.get("owner"));
+ labelstartdate.setText(out.format(in.parse(res.get("startTime"))));
+ labelenddate.setText(out.format(in.parse(res.get("endTime"))));
+ labelimage.setText(res.get("imagepath").substring(res.get("imagepath").indexOf("/") + 1));
+ labelimageversion.setText(res.get("imageversion"));
}
}
|