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 --- .../main/java/gui/image/SearchEditImage_GUI.java | 185 +++++---------------- 1 file changed, 43 insertions(+), 142 deletions(-) (limited to 'dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java') diff --git a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java index 2d65fda3..3535643a 100644 --- a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java @@ -1,7 +1,6 @@ package gui.image; import gui.intro.About_GUI; -import gui.intro.Login_GUI; import gui.intro.MainMenue_GUI; import java.awt.Color; @@ -87,18 +86,16 @@ public class SearchEditImage_GUI extends JFrame { JLabel labelCPU; JLabel labelID; JLabel labelVersion; + JLabel lblNewLabel = new JLabel("Imageauswahl"); JTextArea textAreadesc; private JLabel labelOS; String[] result; JRadioButton rdbtnInternetJa; JRadioButton rdbtnInternetNein; JComboBox comboBox; - JTable tableAllImages; JTable tablemyImages; - JTable tablePublicVorlagen; boolean activeSearch = false; private JTextField textFieldName; - JTabbedPane tabbedPane; String[] titles = { "Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "ID", "Version", "Template" };// Angezeigt // werden @@ -175,7 +172,7 @@ public class SearchEditImage_GUI extends JFrame { tablemyImages.getColumnModel().getColumn(7).setWidth(0); tablemyImages.getColumnModel().getColumn(7).setMinWidth(0); tablemyImages.getColumnModel().getColumn(7).setMaxWidth(0); - + /* tablePublicVorlagen.getColumnModel().getColumn(1).setWidth(0); tablePublicVorlagen.getColumnModel().getColumn(1) .setMinWidth(0); @@ -217,6 +214,7 @@ public class SearchEditImage_GUI extends JFrame { tableAllImages.getColumnModel().getColumn(7).setWidth(0); tableAllImages.getColumnModel().getColumn(7).setMinWidth(0); tableAllImages.getColumnModel().getColumn(7).setMaxWidth(0); + */ textFieldName.requestFocusInWindow(); } }); @@ -247,7 +245,7 @@ public class SearchEditImage_GUI extends JFrame { getContentPane().add(panel); panel.setLayout(null); { - JLabel lblNewLabel = new JLabel("Imageauswahl"); + lblNewLabel.setBounds(10, 11, 509, 22); panel.add(lblNewLabel); lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18)); @@ -406,133 +404,6 @@ public class SearchEditImage_GUI extends JFrame { lblNewLabel_1.setBounds(129, 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.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.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.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.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 btnDownload = new JButton("Download"); btnDownload.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { @@ -541,7 +412,7 @@ public class SearchEditImage_GUI extends JFrame { String username = person.verantwortlicher.getName() + " " + person.verantwortlicher.getVorname(); // check if user is in correct tab - if (tabbedPane.getSelectedIndex() == 0) { + /*if (tabbedPane.getSelectedIndex() == 0) { */ // check if a row is selected if (tablemyImages.getSelectedRow() != -1) { String imageid = modelMyImages.getValueAt( @@ -562,7 +433,7 @@ public class SearchEditImage_GUI extends JFrame { FTPEditDownloader_GUI ea = new FTPEditDownloader_GUI(); ea.setVisible(true); dispose(); - } + /* } } else if (tabbedPane.getSelectedIndex() == 1) { if (tablePublicVorlagen.getSelectedRow() != -1) { if (modelPublicVorlagen @@ -638,16 +509,16 @@ public class SearchEditImage_GUI extends JFrame { FTPEditDownloader_GUI ea = new FTPEditDownloader_GUI(); ea.setVisible(true); - dispose(); - } else { + dispose(); + } else { JOptionPane .showMessageDialog( null, "Sie haben keine Berechtigung fremde Images herunterzuladen.", "Message", JOptionPane.INFORMATION_MESSAGE); - } - } + }//end actionPerformed + } */ } else { JOptionPane .showMessageDialog( @@ -659,6 +530,36 @@ public class SearchEditImage_GUI extends JFrame { }); btnDownload.setBounds(449, 508, 118, 23); contentPanel.add(btnDownload); + + 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(); + 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(); + tablemyImages.getColumnModel().getColumn(3).sizeWidthToFit(); + tablemyImages.getColumnModel().getColumn(4).sizeWidthToFit(); + tablemyImages.getColumnModel().getColumn(5).sizeWidthToFit(); + tablemyImages.setRowSorter(rowSorterMyImages); + + scrollPaneMyImage.setViewportView(tablemyImages); { JPanel buttonPane = new JPanel(); buttonPane.setBounds(0, 640, 902, 33); @@ -688,7 +589,7 @@ public class SearchEditImage_GUI extends JFrame { String username = person.verantwortlicher.getName() + " " + person.verantwortlicher.getVorname(); // check if user is in correct tab - if (tabbedPane.getSelectedIndex() == 0) { + //if (tabbedPane.getSelectedIndex() == 0) { // check if a row is selected if (tablemyImages.getSelectedRow() != -1) { String imageid = modelMyImages @@ -712,7 +613,7 @@ public class SearchEditImage_GUI extends JFrame { ea.setVisible(true); dispose(); } - } else if (tabbedPane.getSelectedIndex() == 1) { + /* } else if (tabbedPane.getSelectedIndex() == 1) { if (tablePublicVorlagen.getSelectedRow() != -1 && modelPublicVorlagen //deprecated(?) .getValueAt( @@ -778,7 +679,7 @@ public class SearchEditImage_GUI extends JFrame { JOptionPane.INFORMATION_MESSAGE); } }// end check if correct tab is selected - } + */}//end actionPerformed }); cancelButton.setActionCommand("Cancel"); buttonPane.add(cancelButton); -- cgit v1.2.3-55-g7522