From c5bdd8fd4a633b95e98e179e1286bc78b32dbb88 Mon Sep 17 00:00:00 2001 From: Michael Wilson Date: Thu, 2 Oct 2014 14:14:53 +0200 Subject: -Suchfenster "Image bearbeiten", "Image löschen", Veranstaltung bearbeiten", "Veranstaltung löschen" wurden vereinfacht (nur Anzeige, noch nicht Logik) -Login speichert nun den gesamten Login als User, nicht nur den String vor dem "@uni......." -SQL wurde umgebogen um den Login als primary key für den User festzulegen und damit umzugehen --- .../src/main/java/gui/image/DeleteImage_GUI.java | 611 +++++++-------------- 1 file changed, 209 insertions(+), 402 deletions(-) (limited to 'dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java') diff --git a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java index 2f6ca6f3..964f8ae3 100644 --- a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java @@ -86,11 +86,8 @@ public class DeleteImage_GUI extends JFrame { JRadioButton rdbtnInternetJa; JRadioButton rdbtnInternetNein; JComboBox comboBox; - JTable tableAllImages; JTable tablemyImages; - JTable tablePublicVorlagen; private JTextField textFieldName; - JTabbedPane tabbedPane; boolean activeSearch = false; String[] titles = { "Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "ID", "Version", "Template" }; // Angezeigt @@ -173,47 +170,53 @@ public class DeleteImage_GUI extends JFrame { tablemyImages.getColumnModel().getColumn(7).setMinWidth(0); tablemyImages.getColumnModel().getColumn(7).setMaxWidth(0); - tablePublicVorlagen.getColumnModel().getColumn(1).setWidth(0); - tablePublicVorlagen.getColumnModel().getColumn(1) - .setMinWidth(0); - tablePublicVorlagen.getColumnModel().getColumn(1) - .setMaxWidth(0); - tablePublicVorlagen.getColumnModel().getColumn(3).setWidth(0); - tablePublicVorlagen.getColumnModel().getColumn(3) - .setMinWidth(0); - tablePublicVorlagen.getColumnModel().getColumn(3) - .setMaxWidth(0); - tablePublicVorlagen.getColumnModel().getColumn(8).setWidth(0); - tablePublicVorlagen.getColumnModel().getColumn(8) - .setMinWidth(0); - tablePublicVorlagen.getColumnModel().getColumn(8) - .setMaxWidth(0); - tablePublicVorlagen.getColumnModel().getColumn(6).setWidth(0); - tablePublicVorlagen.getColumnModel().getColumn(6) - .setMinWidth(0); - tablePublicVorlagen.getColumnModel().getColumn(6) - .setMaxWidth(0); - tablePublicVorlagen.getColumnModel().getColumn(7).setWidth(0); - tablePublicVorlagen.getColumnModel().getColumn(7) - .setMinWidth(0); - tablePublicVorlagen.getColumnModel().getColumn(7) - .setMaxWidth(0); - - tableAllImages.getColumnModel().getColumn(1).setWidth(0); - tableAllImages.getColumnModel().getColumn(1).setMinWidth(0); - tableAllImages.getColumnModel().getColumn(1).setMaxWidth(0); - tableAllImages.getColumnModel().getColumn(3).setWidth(0); - tableAllImages.getColumnModel().getColumn(3).setMinWidth(0); - tableAllImages.getColumnModel().getColumn(3).setMaxWidth(0); - tableAllImages.getColumnModel().getColumn(8).setWidth(0); - tableAllImages.getColumnModel().getColumn(8).setMinWidth(0); - tableAllImages.getColumnModel().getColumn(8).setMaxWidth(0); - tableAllImages.getColumnModel().getColumn(6).setWidth(0); - tableAllImages.getColumnModel().getColumn(6).setMinWidth(0); - tableAllImages.getColumnModel().getColumn(6).setMaxWidth(0); - tableAllImages.getColumnModel().getColumn(7).setWidth(0); - tableAllImages.getColumnModel().getColumn(7).setMinWidth(0); - tableAllImages.getColumnModel().getColumn(7).setMaxWidth(0); + /* + * tablePublicVorlagen.getColumnModel().getColumn(1).setWidth(0); + * tablePublicVorlagen.getColumnModel().getColumn(1) + * .setMinWidth(0); + * tablePublicVorlagen.getColumnModel().getColumn(1) + * .setMaxWidth(0); + * tablePublicVorlagen.getColumnModel().getColumn + * (3).setWidth(0); + * tablePublicVorlagen.getColumnModel().getColumn(3) + * .setMinWidth(0); + * tablePublicVorlagen.getColumnModel().getColumn(3) + * .setMaxWidth(0); + * tablePublicVorlagen.getColumnModel().getColumn + * (8).setWidth(0); + * tablePublicVorlagen.getColumnModel().getColumn(8) + * .setMinWidth(0); + * tablePublicVorlagen.getColumnModel().getColumn(8) + * .setMaxWidth(0); + * tablePublicVorlagen.getColumnModel().getColumn + * (6).setWidth(0); + * tablePublicVorlagen.getColumnModel().getColumn(6) + * .setMinWidth(0); + * tablePublicVorlagen.getColumnModel().getColumn(6) + * .setMaxWidth(0); + * tablePublicVorlagen.getColumnModel().getColumn + * (7).setWidth(0); + * tablePublicVorlagen.getColumnModel().getColumn(7) + * .setMinWidth(0); + * tablePublicVorlagen.getColumnModel().getColumn(7) + * .setMaxWidth(0); + * + * tableAllImages.getColumnModel().getColumn(1).setWidth(0); + * tableAllImages.getColumnModel().getColumn(1).setMinWidth(0); + * tableAllImages.getColumnModel().getColumn(1).setMaxWidth(0); + * tableAllImages.getColumnModel().getColumn(3).setWidth(0); + * tableAllImages.getColumnModel().getColumn(3).setMinWidth(0); + * tableAllImages.getColumnModel().getColumn(3).setMaxWidth(0); + * tableAllImages.getColumnModel().getColumn(8).setWidth(0); + * tableAllImages.getColumnModel().getColumn(8).setMinWidth(0); + * tableAllImages.getColumnModel().getColumn(8).setMaxWidth(0); + * tableAllImages.getColumnModel().getColumn(6).setWidth(0); + * tableAllImages.getColumnModel().getColumn(6).setMinWidth(0); + * tableAllImages.getColumnModel().getColumn(6).setMaxWidth(0); + * tableAllImages.getColumnModel().getColumn(7).setWidth(0); + * tableAllImages.getColumnModel().getColumn(7).setMinWidth(0); + * tableAllImages.getColumnModel().getColumn(7).setMaxWidth(0); + */ // bis hier textFieldName.requestFocusInWindow(); } @@ -245,8 +248,7 @@ public class DeleteImage_GUI extends JFrame { getContentPane().add(panel); panel.setLayout(null); { - JLabel lblNewLabel = new JLabel( - "Zu löschendes Image wählen"); + JLabel lblNewLabel = new JLabel("Zu löschendes Image wählen"); lblNewLabel.setBounds(10, 11, 509, 22); panel.add(lblNewLabel); lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18)); @@ -363,11 +365,11 @@ public class DeleteImage_GUI extends JFrame { }); comboBox.setBounds(96, 58, 166, 20); panel_1.add(comboBox); - + lblBeschreibung_1 = new JLabel("Beschreibung:"); lblBeschreibung_1.setBounds(291, 30, 80, 20); panel_1.add(lblBeschreibung_1); - + textField = new JTextField(); textField.setColumns(10); textField.setBounds(381, 30, 166, 20); @@ -409,139 +411,6 @@ public class DeleteImage_GUI extends JFrame { lblNewLabel_1.setBounds(128, 11, 85, 14); contentPanel.add(lblNewLabel_1); - tabbedPane = new JTabbedPane(JTabbedPane.TOP); - 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 scrollPaneMyImage = new JScrollPane(); - tablemyImages = new JTable(); - tablemyImages.getSelectionModel().addListSelectionListener( - new ListSelectionListener() { - public void valueChanged(ListSelectionEvent e) { - String imageid = modelMyImages.getValueAt( - tablemyImages - .convertRowIndexToModel(tablemyImages - .getSelectedRow()), 6) - .toString(); - String version = modelMyImages.getValueAt( - tablemyImages - .convertRowIndexToModel(tablemyImages - .getSelectedRow()), 7) - .toString(); - writeImageData(imageid, version); - } - }); - tablemyImages.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); - tablemyImages.setModel(modelMyImages); - tablemyImages.getColumnModel().getColumn(1).sizeWidthToFit(); - tablemyImages.getColumnModel().getColumn(2).sizeWidthToFit(); - tablemyImages.getColumnModel().getColumn(3).sizeWidthToFit(); - tablemyImages.getColumnModel().getColumn(4).sizeWidthToFit(); - tablemyImages.getColumnModel().getColumn(5).sizeWidthToFit(); - tablemyImages.setRowSorter(rowSorterMyImages); - - scrollPaneMyImage.setViewportView(tablemyImages); - tabbedPane.addTab("Meine Images", null, scrollPaneMyImage, null); - - JScrollPane scrollPaneCoopImages = new JScrollPane(); - JTable tableCoopImages = new JTable(); - tableCoopImages.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); - tableCoopImages.setModel(model); - tableCoopImages.getColumnModel().getColumn(1).sizeWidthToFit(); - tableCoopImages.getColumnModel().getColumn(2).sizeWidthToFit(); - tableCoopImages.getColumnModel().getColumn(3).sizeWidthToFit(); - tableCoopImages.getColumnModel().getColumn(4).sizeWidthToFit(); - tableCoopImages.getColumnModel().getColumn(5).sizeWidthToFit(); - - JScrollPane scrollPanePublicVorlagen = new JScrollPane(); - tablePublicVorlagen = new JTable(); - tablePublicVorlagen.getSelectionModel().addListSelectionListener( - new ListSelectionListener() { - public void valueChanged(ListSelectionEvent e) { - 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 - .setSelectionMode(ListSelectionModel.SINGLE_SELECTION); - - tablePublicVorlagen.getColumnModel().getColumn(1).sizeWidthToFit(); - tablePublicVorlagen.getColumnModel().getColumn(2).sizeWidthToFit(); - tablePublicVorlagen.getColumnModel().getColumn(3).sizeWidthToFit(); - tablePublicVorlagen.getColumnModel().getColumn(4).sizeWidthToFit(); - tablePublicVorlagen.getColumnModel().getColumn(5).sizeWidthToFit(); - tablePublicVorlagen.setRowSorter(rowSorterPublicVorlagen); - scrollPanePublicVorlagen.setViewportView(tablePublicVorlagen); - tabbedPane.addTab("Vorlagen", null, scrollPanePublicVorlagen, null); - - JScrollPane scrollPaneAllImages = new JScrollPane(); - tableAllImages = new JTable(); - tableAllImages.getSelectionModel().addListSelectionListener( - new ListSelectionListener() { - public void valueChanged(ListSelectionEvent e) { - - String imageid = modelAll.getValueAt( - tableAllImages - .convertRowIndexToModel(tableAllImages - .getSelectedRow()), 6) - .toString(); - String version = modelAll.getValueAt( - tableAllImages - .convertRowIndexToModel(tableAllImages - .getSelectedRow()), 7) - .toString(); - writeImageData(imageid, version); - - } - }); - tableAllImages.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); - tableAllImages.setModel(modelAll); - tableAllImages.getColumnModel().getColumn(1).sizeWidthToFit(); - tableAllImages.getColumnModel().getColumn(2).sizeWidthToFit(); - tableAllImages.getColumnModel().getColumn(3).sizeWidthToFit(); - tableAllImages.getColumnModel().getColumn(4).sizeWidthToFit(); - tableAllImages.getColumnModel().getColumn(5).sizeWidthToFit(); - tableAllImages.setRowSorter(rowSorterAll); - - scrollPaneAllImages.setViewportView(tableAllImages); - tabbedPane.addTab("Alle", null, scrollPaneAllImages, null); - - scrollPaneCoopImages.setViewportView(tableCoopImages); - tabbedPane.addTab("bwLehrpool", null, scrollPaneCoopImages, null); - tabbedPane.setEnabledAt(3, false); - JButton btnDelete = new JButton("Löschen"); btnDelete.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { @@ -555,8 +424,8 @@ public class DeleteImage_GUI extends JFrame { // frage, soll das selektierte Daten geloescht werden? eingabe = JOptionPane.showConfirmDialog(null, - "Wollen Sie diese Daten löschen?", - "Löschen?", JOptionPane.YES_NO_OPTION); + "Wollen Sie diese Daten löschen?", "Löschen?", + JOptionPane.YES_NO_OPTION); if (eingabe == JOptionPane.YES_OPTION) { @@ -592,15 +461,6 @@ public class DeleteImage_GUI extends JFrame { di.setVisible(true); dispose(); - /* - * } else { - * - * JOptionPane.showConfirmDialog(null, - * "Loeschen vom Server hat leider nicht geklappt!!" - * , imageversion, - * JOptionPane.OK_CANCEL_OPTION); } - */ - } else { JOptionPane @@ -648,224 +508,171 @@ public class DeleteImage_GUI extends JFrame { } } - } else if (tablePublicVorlagen.getSelectedRowCount() != 0 - && modelPublicVorlagen - .getValueAt( - tablePublicVorlagen - .convertRowIndexToModel(tablePublicVorlagen - .getSelectedRow()), 4) - .equals(username)) { - - // frage, soll das selektierte Daten geloescht werden? - eingabe = JOptionPane.showConfirmDialog(null, - "Wollen Sie diese Daten löschen?", - "Löschen?", JOptionPane.YES_NO_OPTION); - - if (eingabe == JOptionPane.YES_OPTION) { - - imageid = modelPublicVorlagen - .getValueAt( - tablePublicVorlagen - .convertRowIndexToModel(tablePublicVorlagen - .getSelectedRow()), 6) - .toString(); - - imageversion = modelPublicVorlagen - .getValueAt( - tablePublicVorlagen - .convertRowIndexToModel(tablePublicVorlagen - .getSelectedRow()), 7) - .toString(); - - // TODO - // Image darf nur geloescht werden, wenn keine - // Veranstaltung mehr auf das Image verweist. - // Unbdingt abfragen! - - try { - if (!client.connectedToLecture(imageid, - imageversion)) { - try { - client.deleteImageServer(imageid, - imageversion); - if (client.deleteImageData(imageid, - imageversion)) { - // if (client.deleteImageServer(imageid - // ,imageversion)) { - - DeleteImage_GUI di = new DeleteImage_GUI(); - di.setVisible(true); - dispose(); - - /* - * } else { - * - * JOptionPane.showConfirmDialog(null, - * "Loeschen vom Server hat leider nicht geklappt!!" - * , imageversion, - * JOptionPane.OK_CANCEL_OPTION); } - */ - - } else { - - JOptionPane - .showConfirmDialog( - null, - "Löschen von der DB hat leider nicht geklappt!!", - "Fehler", - JOptionPane.INFORMATION_MESSAGE); - } - } catch (HeadlessException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - JOptionPane.showMessageDialog( - null, - e.getCause() + "\n" - + e.getStackTrace(), - "Debug-Message", - JOptionPane.ERROR_MESSAGE); - } catch (TException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - JOptionPane.showMessageDialog( - null, - e.getCause() + "\n" - + e.getStackTrace(), - "Debug-Message", - JOptionPane.ERROR_MESSAGE); - } - - } else { - - JOptionPane - .showMessageDialog( - null, - "Image kann nicht gelöscht werden, da mindestens eine Veranstaltung mit diesem Image verlinkt ist.", - "Verlinkung vorhanden", - JOptionPane.INFORMATION_MESSAGE); - } - } catch (TException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - JOptionPane.showMessageDialog(null, e.getCause() - + "\n" + e.getStackTrace(), - "Debug-Message", JOptionPane.ERROR_MESSAGE); - } - } - - } else if (tableAllImages.getSelectedRowCount() != 0 - && modelAll.getValueAt( - tableAllImages - .convertRowIndexToModel(tableAllImages - .getSelectedRow()), 4).equals( - username)) { - - // frage, soll das selektierte Daten geloescht werden? - eingabe = JOptionPane.showConfirmDialog(null, - "Wollen Sie diese Daten löschen?", - "Löschen?", JOptionPane.YES_NO_OPTION); + /* + * } else if (tablePublicVorlagen.getSelectedRowCount() != 0 + * && modelPublicVorlagen .getValueAt( tablePublicVorlagen + * .convertRowIndexToModel(tablePublicVorlagen + * .getSelectedRow()), 4) .equals(username)) { + * + * // frage, soll das selektierte Daten geloescht werden? + * eingabe = JOptionPane.showConfirmDialog(null, + * "Wollen Sie diese Daten löschen?", "Löschen?", + * JOptionPane.YES_NO_OPTION); + * + * if (eingabe == JOptionPane.YES_OPTION) { + * + * imageid = modelPublicVorlagen .getValueAt( + * tablePublicVorlagen + * .convertRowIndexToModel(tablePublicVorlagen + * .getSelectedRow()), 6) .toString(); + * + * imageversion = modelPublicVorlagen .getValueAt( + * tablePublicVorlagen + * .convertRowIndexToModel(tablePublicVorlagen + * .getSelectedRow()), 7) .toString(); + * + * // TODO // Image darf nur geloescht werden, wenn keine // + * Veranstaltung mehr auf das Image verweist. // Unbdingt + * abfragen! + * + * try { if (!client.connectedToLecture(imageid, + * imageversion)) { try { client.deleteImageServer(imageid, + * imageversion); if (client.deleteImageData(imageid, + * imageversion)) { // if (client.deleteImageServer(imageid + * // ,imageversion)) { + * + * DeleteImage_GUI di = new DeleteImage_GUI(); + * di.setVisible(true); dispose(); + * + * + * + * } else { + * + * JOptionPane .showConfirmDialog( null, + * "Löschen von der DB hat leider nicht geklappt!!", + * "Fehler", JOptionPane.INFORMATION_MESSAGE); } } catch + * (HeadlessException e) { // TODO Auto-generated catch + * block e.printStackTrace(); JOptionPane.showMessageDialog( + * null, e.getCause() + "\n" + e.getStackTrace(), + * "Debug-Message", JOptionPane.ERROR_MESSAGE); } catch + * (TException e) { // TODO Auto-generated catch block + * e.printStackTrace(); JOptionPane.showMessageDialog( null, + * e.getCause() + "\n" + e.getStackTrace(), "Debug-Message", + * JOptionPane.ERROR_MESSAGE); } + * + * } else { + * + * JOptionPane .showMessageDialog( null, + * "Image kann nicht gelöscht werden, da mindestens eine Veranstaltung mit diesem Image verlinkt ist." + * , "Verlinkung vorhanden", + * JOptionPane.INFORMATION_MESSAGE); } } catch (TException + * e) { // TODO Auto-generated catch block + * e.printStackTrace(); JOptionPane.showMessageDialog(null, + * e.getCause() + "\n" + e.getStackTrace(), "Debug-Message", + * JOptionPane.ERROR_MESSAGE); } } + * + * } else if (tableAllImages.getSelectedRowCount() != 0 && + * modelAll.getValueAt( tableAllImages + * .convertRowIndexToModel(tableAllImages + * .getSelectedRow()), 4).equals( username)) { + * + * // frage, soll das selektierte Daten geloescht werden? + * eingabe = JOptionPane.showConfirmDialog(null, + * "Wollen Sie diese Daten löschen?", "Löschen?", + * JOptionPane.YES_NO_OPTION); + * + * if (eingabe == JOptionPane.YES_OPTION) { + * + * imageid = modelAll.getValueAt( tableAllImages + * .convertRowIndexToModel(tableAllImages + * .getSelectedRow()), 6) .toString(); + * + * imageversion = modelAll.getValueAt( tableAllImages + * .convertRowIndexToModel(tableAllImages + * .getSelectedRow()), 7) .toString(); + * + * // TODO // Image darf nur geloescht werden, wenn keine // + * Veranstaltung mehr auf das Image verweist. // Unbdingt + * abfragen! + * + * try { if (!client.connectedToLecture(imageid, + * imageversion)) { try { client.deleteImageServer(imageid, + * imageversion); if (client.deleteImageData(imageid, + * imageversion)) { // if (client.deleteImageServer(imageid + * // ,imageversion)) { + * + * DeleteImage_GUI di = new DeleteImage_GUI(); + * di.setVisible(true); dispose(); + * + * + * } else { + * + * JOptionPane .showConfirmDialog( null, + * "Löschen von der DB hat leider nicht geklappt!!", + * "Fehler", JOptionPane.INFORMATION_MESSAGE); } } catch + * (HeadlessException e) { // TODO Auto-generated catch + * block e.printStackTrace(); JOptionPane.showMessageDialog( + * null, e.getCause() + "\n" + e.getStackTrace(), + * "Debug-Message", JOptionPane.ERROR_MESSAGE); } catch + * (TException e) { // TODO Auto-generated catch block + * e.printStackTrace(); JOptionPane.showMessageDialog( null, + * e.getCause() + "\n" + e.getStackTrace(), "Debug-Message", + * JOptionPane.ERROR_MESSAGE); } + * + * } else { + * + * JOptionPane .showMessageDialog( null, + * "Image kann nicht gelöscht werden, da mindestens eine Veranstaltung mit diesem Image verlinkt ist." + * , "Verlinkung vorhanden", + * JOptionPane.INFORMATION_MESSAGE); } } catch (TException + * e) { // TODO Auto-generated catch block + * e.printStackTrace(); JOptionPane.showMessageDialog(null, + * e.getCause() + "\n" + e.getStackTrace(), "Debug-Message", + * JOptionPane.ERROR_MESSAGE); } } + * + * } else { + * + * JOptionPane.showMessageDialog(null, + * "Bitte wählen Sie ein eigenes Image aus", "Message", + * JOptionPane.INFORMATION_MESSAGE); + */ + } - if (eingabe == JOptionPane.YES_OPTION) { + } + }); + btnDelete.setBounds(449, 508, 118, 23); + contentPanel.add(btnDelete); - imageid = modelAll.getValueAt( - tableAllImages - .convertRowIndexToModel(tableAllImages + JScrollPane scrollPaneMyImage = new JScrollPane(); + scrollPaneMyImage.setBounds(10, 158, 557, 339); + contentPanel.add(scrollPaneMyImage); + tablemyImages = new JTable(); + tablemyImages.getSelectionModel().addListSelectionListener( + new ListSelectionListener() { + public void valueChanged(ListSelectionEvent e) { + String imageid = modelMyImages.getValueAt( + tablemyImages + .convertRowIndexToModel(tablemyImages .getSelectedRow()), 6) .toString(); - - imageversion = modelAll.getValueAt( - tableAllImages - .convertRowIndexToModel(tableAllImages + String version = modelMyImages.getValueAt( + tablemyImages + .convertRowIndexToModel(tablemyImages .getSelectedRow()), 7) .toString(); - - // TODO - // Image darf nur geloescht werden, wenn keine - // Veranstaltung mehr auf das Image verweist. - // Unbdingt abfragen! - - try { - if (!client.connectedToLecture(imageid, - imageversion)) { - try { - client.deleteImageServer(imageid, - imageversion); - if (client.deleteImageData(imageid, - imageversion)) { - // if (client.deleteImageServer(imageid - // ,imageversion)) { - - DeleteImage_GUI di = new DeleteImage_GUI(); - di.setVisible(true); - dispose(); - - /* - * } else { - * - * JOptionPane.showConfirmDialog(null, - * "Loeschen vom Server hat leider nicht geklappt!!" - * , imageversion, - * JOptionPane.OK_CANCEL_OPTION); } - */ - - } else { - - JOptionPane - .showConfirmDialog( - null, - "Löschen von der DB hat leider nicht geklappt!!", - "Fehler", - JOptionPane.INFORMATION_MESSAGE); - } - } catch (HeadlessException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - JOptionPane.showMessageDialog( - null, - e.getCause() + "\n" - + e.getStackTrace(), - "Debug-Message", - JOptionPane.ERROR_MESSAGE); - } catch (TException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - JOptionPane.showMessageDialog( - null, - e.getCause() + "\n" - + e.getStackTrace(), - "Debug-Message", - JOptionPane.ERROR_MESSAGE); - } - - } else { - - JOptionPane - .showMessageDialog( - null, - "Image kann nicht gelöscht werden, da mindestens eine Veranstaltung mit diesem Image verlinkt ist.", - "Verlinkung vorhanden", - JOptionPane.INFORMATION_MESSAGE); - } - } catch (TException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - JOptionPane.showMessageDialog(null, e.getCause() - + "\n" + e.getStackTrace(), - "Debug-Message", JOptionPane.ERROR_MESSAGE); - } + writeImageData(imageid, version); } + }); + tablemyImages.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); + tablemyImages.setModel(modelMyImages); + tablemyImages.getColumnModel().getColumn(1).sizeWidthToFit(); + tablemyImages.getColumnModel().getColumn(2).sizeWidthToFit(); + tablemyImages.getColumnModel().getColumn(3).sizeWidthToFit(); + tablemyImages.getColumnModel().getColumn(4).sizeWidthToFit(); + tablemyImages.getColumnModel().getColumn(5).sizeWidthToFit(); + tablemyImages.setRowSorter(rowSorterMyImages); - } else { - - JOptionPane.showMessageDialog(null, - "Bitte wählen Sie ein eigenes Image aus", - "Message", JOptionPane.INFORMATION_MESSAGE); - } - - } - }); - btnDelete.setBounds(449, 508, 118, 23); - contentPanel.add(btnDelete); + scrollPaneMyImage.setViewportView(tablemyImages); { JPanel buttonPane = new JPanel(); buttonPane.setBounds(0, 640, 902, 33); -- cgit v1.2.3-55-g7522 From 7182b84d172c06d619b5277ed7b8570b50a40e3d Mon Sep 17 00:00:00 2001 From: Michael Wilson Date: Thu, 2 Oct 2014 15:27:10 +0200 Subject: -Volltextsuche vorbereitet, Funktion wird noch angepasst --- .../src/main/java/gui/image/DeleteImage_GUI.java | 27 +++++++--------------- .../main/java/gui/image/SearchEditImage_GUI.java | 26 +++++++-------------- .../src/main/java/gui/image/SearchImage_GUI.java | 26 +++++++-------------- .../java/gui/lecture/CreateLectureLink_GUI.java | 20 ++++------------ .../main/java/gui/lecture/DeleteLecture_GUI.java | 16 +++---------- .../main/java/gui/lecture/EditLectureLink_GUI.java | 20 ++++------------ .../main/java/gui/lecture/SearchLecture_GUI.java | 16 +++---------- 7 files changed, 40 insertions(+), 111 deletions(-) (limited to 'dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java') diff --git a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java index 964f8ae3..b09dc8ba 100644 --- a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java @@ -127,8 +127,6 @@ public class DeleteImage_GUI extends JFrame { modelMyImages); final TableRowSorter rowSorterPublicVorlagen = new TableRowSorter( modelPublicVorlagen); - private JLabel lblBeschreibung_1; - private JTextField textField; /** * Create the dialog. @@ -276,12 +274,12 @@ public class DeleteImage_GUI extends JFrame { contentPanel.add(panel_1); panel_1.setLayout(null); - JLabel lblNewLabel_2 = new JLabel("Name:"); - lblNewLabel_2.setBounds(10, 30, 80, 20); + JLabel lblNewLabel_2 = new JLabel("Volltextsuche:"); + lblNewLabel_2.setBounds(30, 30, 80, 20); panel_1.add(lblNewLabel_2); JLabel lblInternetIstInnerhalb = new JLabel("Betriebssystem:"); - lblInternetIstInnerhalb.setBounds(10, 58, 80, 20); + lblInternetIstInnerhalb.setBounds(30, 58, 80, 20); panel_1.add(lblInternetIstInnerhalb); textFieldName = new JTextField(); @@ -316,7 +314,7 @@ public class DeleteImage_GUI extends JFrame { } }); - textFieldName.setBounds(96, 30, 166, 20); + textFieldName.setBounds(133, 30, 400, 20); panel_1.add(textFieldName); textFieldName.setColumns(10); @@ -363,18 +361,9 @@ public class DeleteImage_GUI extends JFrame { } }); - comboBox.setBounds(96, 58, 166, 20); + comboBox.setBounds(133, 58, 191, 20); panel_1.add(comboBox); - lblBeschreibung_1 = new JLabel("Beschreibung:"); - lblBeschreibung_1.setBounds(291, 30, 80, 20); - panel_1.add(lblBeschreibung_1); - - textField = new JTextField(); - textField.setColumns(10); - textField.setBounds(381, 30, 166, 20); - panel_1.add(textField); - JLabel lblHauptmen = new JLabel("Hauptmenü"); lblHauptmen.addMouseListener(new MouseAdapter() { @Override @@ -758,11 +747,11 @@ public class DeleteImage_GUI extends JFrame { panel.add(lblLetztesUpdate); JLabel lblImageIstVorlage = new JLabel("Image ist Vorlage:"); - lblImageIstVorlage.setBounds(10, 336, 130, 14); + lblImageIstVorlage.setBounds(10, 334, 130, 14); panel.add(lblImageIstVorlage); labelVorlage = new JLabel(""); - labelVorlage.setBounds(10, 350, 296, 14); + labelVorlage.setBounds(10, 348, 296, 14); panel.add(labelVorlage); labelLizenzSoftware = new JLabel(""); @@ -799,7 +788,7 @@ public class DeleteImage_GUI extends JFrame { panel.add(labelCPU); JLabel lblTechnischeDaten = new JLabel("Technische Daten:"); - lblTechnischeDaten.setBounds(10, 322, 296, 14); + lblTechnischeDaten.setBounds(10, 312, 296, 14); panel.add(lblTechnischeDaten); JLabel lblId = new JLabel("ID:"); diff --git a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java index 3535643a..14518069 100644 --- a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java @@ -131,7 +131,6 @@ public class SearchEditImage_GUI extends JFrame { modelMyImages); final TableRowSorter rowSorterPublicVorlagen = new TableRowSorter( modelPublicVorlagen); - private JTextField textField; /** * Create the dialog. @@ -273,12 +272,12 @@ public class SearchEditImage_GUI extends JFrame { contentPanel.add(panel_1); panel_1.setLayout(null); - JLabel lblNewLabel_2 = new JLabel("Name:"); - lblNewLabel_2.setBounds(10, 30, 80, 20); + JLabel lblNewLabel_2 = new JLabel("Volltextsuche:"); + lblNewLabel_2.setBounds(30, 30, 80, 20); panel_1.add(lblNewLabel_2); JLabel lblInternetIstInnerhalb = new JLabel("Betriebssystem:"); - lblInternetIstInnerhalb.setBounds(10, 58, 250, 20); + lblInternetIstInnerhalb.setBounds(30, 58, 80, 20); panel_1.add(lblInternetIstInnerhalb); textFieldName = new JTextField(); @@ -312,7 +311,7 @@ public class SearchEditImage_GUI extends JFrame { } }); - textFieldName.setBounds(96, 30, 166, 20); + textFieldName.setBounds(133, 30, 400, 20); panel_1.add(textFieldName); textFieldName.setColumns(10); @@ -360,17 +359,8 @@ public class SearchEditImage_GUI extends JFrame { } }); - comboBox.setBounds(96, 58, 166, 20); + comboBox.setBounds(133, 58, 191, 20); panel_1.add(comboBox); - - JLabel label_3 = new JLabel("Beschreibung:"); - label_3.setBounds(291, 30, 80, 20); - panel_1.add(label_3); - - textField = new JTextField(); - textField.setColumns(10); - textField.setBounds(381, 30, 166, 20); - panel_1.add(textField); JLabel lblHauptmen = new JLabel("Hauptmenü"); lblHauptmen.addMouseListener(new MouseAdapter() { @@ -744,11 +734,11 @@ public class SearchEditImage_GUI extends JFrame { panel.add(lblLetztesUpdate); JLabel lblImageIstVorlage = new JLabel("Image ist Vorlage:"); - lblImageIstVorlage.setBounds(10, 336, 130, 14); + lblImageIstVorlage.setBounds(10, 334, 130, 14); panel.add(lblImageIstVorlage); labelVorlage = new JLabel(""); - labelVorlage.setBounds(10, 350, 296, 14); + labelVorlage.setBounds(10, 348, 296, 14); panel.add(labelVorlage); labelLizenzSoftware = new JLabel(""); @@ -785,7 +775,7 @@ public class SearchEditImage_GUI extends JFrame { panel.add(labelCPU); JLabel lblTechnischeDaten = new JLabel("Technische Daten:"); - lblTechnischeDaten.setBounds(10, 322, 296, 14); + lblTechnischeDaten.setBounds(10, 312, 296, 14); panel.add(lblTechnischeDaten); JLabel lblId = new JLabel("ID:"); diff --git a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java index fe2b5017..4c253c69 100644 --- a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java @@ -140,7 +140,6 @@ public class SearchImage_GUI extends JFrame { modelMyImages); final TableRowSorter rowSorterPublicVorlagen = new TableRowSorter( modelPublicVorlagen); - private JTextField textField; /** * Create the dialog. @@ -281,12 +280,12 @@ public class SearchImage_GUI extends JFrame { contentPanel.add(panel_1); panel_1.setLayout(null); - JLabel lblNewLabel_2 = new JLabel("Anzeigename:"); - lblNewLabel_2.setBounds(10, 30, 80, 20); + JLabel lblNewLabel_2 = new JLabel("Volltextsuche:"); + lblNewLabel_2.setBounds(30, 30, 80, 20); panel_1.add(lblNewLabel_2); JLabel lblInternetIstInnerhalb = new JLabel("Betriebssystem:"); - lblInternetIstInnerhalb.setBounds(10, 58, 80, 20); + lblInternetIstInnerhalb.setBounds(30, 58, 80, 20); panel_1.add(lblInternetIstInnerhalb); textFieldName = new JTextField(); @@ -321,7 +320,7 @@ public class SearchImage_GUI extends JFrame { } }); - textFieldName.setBounds(96, 30, 166, 20); + textFieldName.setBounds(133, 30, 400, 20); panel_1.add(textFieldName); textFieldName.setColumns(10); @@ -368,17 +367,8 @@ public class SearchImage_GUI extends JFrame { } }); - comboBox.setBounds(96, 58, 166, 20); + comboBox.setBounds(133, 58, 191, 20); panel_1.add(comboBox); - - JLabel label_3 = new JLabel("Beschreibung:"); - label_3.setBounds(291, 30, 80, 20); - panel_1.add(label_3); - - textField = new JTextField(); - textField.setColumns(10); - textField.setBounds(381, 30, 166, 20); - panel_1.add(textField); JLabel lblHauptmen = new JLabel("Hauptmenü"); lblHauptmen.addMouseListener(new MouseAdapter() { @@ -752,11 +742,11 @@ public class SearchImage_GUI extends JFrame { panel.add(lblLetztesUpdate); JLabel lblImageIstVorlage = new JLabel("Image ist Vorlage:"); - lblImageIstVorlage.setBounds(10, 336, 130, 14); + lblImageIstVorlage.setBounds(10, 334, 130, 14); panel.add(lblImageIstVorlage); labelVorlage = new JLabel(""); - labelVorlage.setBounds(10, 350, 296, 14); + labelVorlage.setBounds(10, 348, 296, 14); panel.add(labelVorlage); labelLizenzSoftware = new JLabel(""); @@ -793,7 +783,7 @@ public class SearchImage_GUI extends JFrame { panel.add(labelCPU); JLabel lblTechnischeDaten = new JLabel("Technische Daten:"); - lblTechnischeDaten.setBounds(10, 322, 296, 14); + lblTechnischeDaten.setBounds(10, 312, 296, 14); panel.add(lblTechnischeDaten); JLabel lblId = new JLabel("ID:"); diff --git a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java index cc947084..2ce25309 100644 --- a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java @@ -118,7 +118,6 @@ public class CreateLectureLink_GUI extends JFrame { modelMyImages); final TableRowSorter rowSorterPublicVorlagen = new TableRowSorter( modelPublicVorlagen); - private JTextField textField; /** * Create the dialog. @@ -253,12 +252,12 @@ public class CreateLectureLink_GUI extends JFrame { contentPanel.add(panel_1); panel_1.setLayout(null); - JLabel lblNewLabel_2 = new JLabel("Anzeigename:"); - lblNewLabel_2.setBounds(10, 30, 80, 20); + JLabel lblNewLabel_2 = new JLabel("Volltextsuche:"); + lblNewLabel_2.setBounds(30, 30, 80, 20); panel_1.add(lblNewLabel_2); JLabel lblInternetIstInnerhalb = new JLabel("Betriebssystem:"); - lblInternetIstInnerhalb.setBounds(10, 58, 80, 20); + lblInternetIstInnerhalb.setBounds(30, 58, 80, 20); panel_1.add(lblInternetIstInnerhalb); textFieldName = new JTextField(); @@ -292,7 +291,7 @@ public class CreateLectureLink_GUI extends JFrame { }); - textFieldName.setBounds(96, 30, 166, 20); + textFieldName.setBounds(133, 30, 400, 20); panel_1.add(textFieldName); textFieldName.setColumns(10); @@ -334,17 +333,8 @@ public class CreateLectureLink_GUI extends JFrame { } } }); - comboBox.setBounds(96, 58, 166, 20); + comboBox.setBounds(133, 58, 191, 20); panel_1.add(comboBox); - - JLabel label_3 = new JLabel("Beschreibung:"); - label_3.setBounds(291, 30, 80, 20); - panel_1.add(label_3); - - textField = new JTextField(); - textField.setColumns(10); - textField.setBounds(381, 30, 166, 20); - panel_1.add(textField); JLabel lblHauptmen = new JLabel("Hauptmenü"); lblHauptmen.addMouseListener(new MouseAdapter() { diff --git a/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java index 0e2496f3..937db89a 100644 --- a/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java @@ -98,7 +98,6 @@ public class DeleteLecture_GUI extends JFrame { final TableRowSorter rowSorterMyLectures = new TableRowSorter( modelMyLectures); private JButton button; - private JTextField textField; /** @@ -227,8 +226,8 @@ public class DeleteLecture_GUI extends JFrame { contentPanel.add(panel_1); panel_1.setLayout(null); - JLabel lblNewLabel_2 = new JLabel("Name:"); - lblNewLabel_2.setBounds(10, 30, 80, 20); + JLabel lblNewLabel_2 = new JLabel("Volltextsuche:"); + lblNewLabel_2.setBounds(30, 30, 80, 20); panel_1.add(lblNewLabel_2); textFieldName = new JTextField(); @@ -258,18 +257,9 @@ public class DeleteLecture_GUI extends JFrame { } }); - textFieldName.setBounds(96, 30, 166, 20); + textFieldName.setBounds(133, 30, 400, 20); panel_1.add(textFieldName); textFieldName.setColumns(10); - - JLabel label = new JLabel("Beschreibung:"); - label.setBounds(291, 30, 80, 20); - panel_1.add(label); - - textField = new JTextField(); - textField.setColumns(10); - textField.setBounds(381, 30, 166, 20); - panel_1.add(textField); JLabel lblHauptmen = new JLabel("Hauptmenü"); lblHauptmen.addMouseListener(new MouseAdapter() { diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java index 7c828ea0..dce2ec2a 100644 --- a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java @@ -119,7 +119,6 @@ public class EditLectureLink_GUI extends JFrame { modelMyImages); final TableRowSorter rowSorterPublicVorlagen = new TableRowSorter( modelPublicVorlagen); - private JTextField textField; /** * Create the dialog. */ @@ -253,12 +252,12 @@ public class EditLectureLink_GUI extends JFrame { contentPanel.add(panel_1); panel_1.setLayout(null); - JLabel lblNewLabel_2 = new JLabel("Name:"); - lblNewLabel_2.setBounds(10, 30, 80, 20); + JLabel lblNewLabel_2 = new JLabel("Volltextsuche:"); + lblNewLabel_2.setBounds(30, 30, 80, 20); panel_1.add(lblNewLabel_2); JLabel lblInternetIstInnerhalb = new JLabel("Betriebssystem:"); - lblInternetIstInnerhalb.setBounds(10, 58, 80, 20); + lblInternetIstInnerhalb.setBounds(30, 58, 80, 20); panel_1.add(lblInternetIstInnerhalb); textFieldName = new JTextField(); @@ -292,7 +291,7 @@ public class EditLectureLink_GUI extends JFrame { }); - textFieldName.setBounds(96, 30, 166, 20); + textFieldName.setBounds(133, 30, 400, 20); panel_1.add(textFieldName); textFieldName.setColumns(10); @@ -330,17 +329,8 @@ public class EditLectureLink_GUI extends JFrame { } } }); - comboBox.setBounds(96, 58, 166, 20); + comboBox.setBounds(133, 58, 191, 20); panel_1.add(comboBox); - - JLabel label_3 = new JLabel("Beschreibung:"); - label_3.setBounds(291, 30, 80, 20); - panel_1.add(label_3); - - textField = new JTextField(); - textField.setColumns(10); - textField.setBounds(381, 30, 166, 20); - panel_1.add(textField); JLabel lblHauptmen = new JLabel("Hauptmenü"); lblHauptmen.addMouseListener(new MouseAdapter() { diff --git a/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java index 510e7a7d..4a8b9fd9 100644 --- a/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java @@ -102,7 +102,6 @@ public class SearchLecture_GUI extends JFrame { modelAll); final TableRowSorter rowSorterMyLectures = new TableRowSorter( modelMyLectures); - private JTextField textField; /** @@ -217,8 +216,8 @@ public class SearchLecture_GUI extends JFrame { contentPanel.add(panel_1); panel_1.setLayout(null); - JLabel lblNewLabel_2 = new JLabel("Name:"); - lblNewLabel_2.setBounds(10, 30, 80, 20); + JLabel lblNewLabel_2 = new JLabel("Volltextsuche:"); + lblNewLabel_2.setBounds(30, 30, 80, 20); panel_1.add(lblNewLabel_2); textFieldName = new JTextField(); @@ -248,18 +247,9 @@ public class SearchLecture_GUI extends JFrame { } }); - textFieldName.setBounds(96, 30, 166, 20); + textFieldName.setBounds(133, 30, 400, 20); panel_1.add(textFieldName); textFieldName.setColumns(10); - - JLabel label = new JLabel("Beschreibung:"); - label.setBounds(291, 30, 80, 20); - panel_1.add(label); - - textField = new JTextField(); - textField.setColumns(10); - textField.setBounds(381, 30, 166, 20); - panel_1.add(textField); JLabel lblHauptmen = new JLabel("Hauptmenü"); lblHauptmen.addMouseListener(new MouseAdapter() { -- cgit v1.2.3-55-g7522