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/lecture/DeleteLecture_GUI.java | 102 +++++---------------- 1 file changed, 24 insertions(+), 78 deletions(-) (limited to 'dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java') diff --git a/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java index b387ab9f..0e2496f3 100644 --- a/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java @@ -82,14 +82,13 @@ public class DeleteLecture_GUI extends JFrame { JTextArea labelimage; JTextArea labeldesc; JLabel labelVerantwortlicher; - JTable tableAllLectures; JTable tablemyLectures; private JTextField textFieldName; - JTabbedPane tabbedPane; boolean activeSearch=false; String[] titles = { "Veranstaltungsname", "Beschreibung", "Gültigkeitsdatum", "Aktiv", "Letzte Benutzung", "Verantwortlicher", "Image", "Schlagwort", "ID" }; + ThriftConnection con = new ThriftConnection(); Client client = models.Client.clientcon.getClient(); final DefaultTableModel modelAll = new DefaultTableModel(titles, 0); @@ -151,6 +150,7 @@ public class DeleteLecture_GUI extends JFrame { tablemyLectures.getColumnModel().getColumn(8).setMinWidth(0); tablemyLectures.getColumnModel().getColumn(8).setMaxWidth(0); + /* tableAllLectures.getColumnModel().getColumn(1).setWidth(0); tableAllLectures.getColumnModel().getColumn(1).setMinWidth(0); tableAllLectures.getColumnModel().getColumn(1).setMaxWidth(0); @@ -169,6 +169,7 @@ public class DeleteLecture_GUI extends JFrame { tableAllLectures.getColumnModel().getColumn(8).setWidth(0); tableAllLectures.getColumnModel().getColumn(8).setMinWidth(0); tableAllLectures.getColumnModel().getColumn(8).setMaxWidth(0); + */ } }); // Verhindert das Vergroessern Des Fensters @@ -301,72 +302,22 @@ public class DeleteLecture_GUI extends JFrame { JLabel lblNewLabel_1 = new JLabel("Veranstaltung löschen"); lblNewLabel_1.setBounds(166, 11, 128, 14); contentPanel.add(lblNewLabel_1); - - tabbedPane = new JTabbedPane(JTabbedPane.TOP); - tabbedPane.addChangeListener(new ChangeListener() { - public void stateChanged(ChangeEvent arg0) { - if (tabbedPane.getSelectedIndex() == 0) { - - String username = person.verantwortlicher.getName() + " " - + person.verantwortlicher.getVorname(); - rowSorterMyLectures.setRowFilter(RowFilter.regexFilter( - username, 5)); - } else if (tabbedPane.getSelectedIndex() == 1) { - rowSorterAll.setRowFilter(null); - } - - } - }); - - 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) - { - String imageid = modelAll - .getValueAt( - tableAllLectures - .convertRowIndexToModel(tableAllLectures - .getSelectedRow()), 8) - .toString(); - - try { - writeLectureData(imageid); - } catch (TException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } catch (ParseException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } - } - }); - tableAllLectures.setModel(modelAll); - tableAllLectures.getColumnModel().getColumn(1).sizeWidthToFit(); - tableAllLectures.getColumnModel().getColumn(2).sizeWidthToFit(); - tableAllLectures.getColumnModel().getColumn(3).sizeWidthToFit(); - tableAllLectures.getColumnModel().getColumn(4).sizeWidthToFit(); - tableAllLectures.getColumnModel().getColumn(5).sizeWidthToFit(); - tableAllLectures.setRowSorter(rowSorterAll); JScrollPane scrollPaneMyImage = new JScrollPane(); + scrollPaneMyImage.setBounds(10, 120, 552, 369); + contentPanel.add(scrollPaneMyImage); tablemyLectures = new JTable(); - tablemyLectures.getSelectionModel().addListSelectionListener( new ListSelectionListener() - { - public void valueChanged(ListSelectionEvent e) - { - String imageid = modelMyLectures + tablemyLectures.getSelectionModel().addListSelectionListener( new ListSelectionListener() + { + public void valueChanged(ListSelectionEvent e) + { + String imageid = modelMyLectures .getValueAt( tablemyLectures .convertRowIndexToModel(tablemyLectures .getSelectedRow()), 8) .toString(); - try { + try { writeLectureData(imageid); } catch (TException e1) { // TODO Auto-generated catch block @@ -375,24 +326,18 @@ public class DeleteLecture_GUI extends JFrame { // TODO Auto-generated catch block e1.printStackTrace(); } - } - }); + } + }); tablemyLectures.setModel(modelMyLectures); - - tablemyLectures.getColumnModel().getColumn(1).sizeWidthToFit(); - tablemyLectures.getColumnModel().getColumn(2).sizeWidthToFit(); - tablemyLectures.getColumnModel().getColumn(3).sizeWidthToFit(); - tablemyLectures.getColumnModel().getColumn(4).sizeWidthToFit(); - tablemyLectures.getColumnModel().getColumn(5).sizeWidthToFit(); - tablemyLectures.setRowSorter(rowSorterMyLectures); - - scrollPaneMyImage.setViewportView(tablemyLectures); - tabbedPane.addTab("Meine Veranstaltungen", null, scrollPaneMyImage, - null); - - scrollPaneAllImages.setViewportView(tableAllLectures); - tabbedPane.addTab("Alle", null, scrollPaneAllImages, null); + tablemyLectures.getColumnModel().getColumn(1).sizeWidthToFit(); + tablemyLectures.getColumnModel().getColumn(2).sizeWidthToFit(); + tablemyLectures.getColumnModel().getColumn(3).sizeWidthToFit(); + tablemyLectures.getColumnModel().getColumn(4).sizeWidthToFit(); + tablemyLectures.getColumnModel().getColumn(5).sizeWidthToFit(); + tablemyLectures.setRowSorter(rowSorterMyLectures); + + scrollPaneMyImage.setViewportView(tablemyLectures); { JPanel buttonPane = new JPanel(); buttonPane.setBounds(0, 640, 826, 33); @@ -521,6 +466,7 @@ public class DeleteLecture_GUI extends JFrame { getContentPane().add(button); button.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { + String lectureID=""; int eingabe; String username = person.verantwortlicher.getName() + " " @@ -562,7 +508,7 @@ public class DeleteLecture_GUI extends JFrame { }//end ask for confirmation }//end check if a row is selected - else if (tableAllLectures.getSelectedRowCount() !=0 && tableAllLectures.getValueAt(tableAllLectures.getSelectedRow(), 5).toString().equals(username)){ + /* else if (tableAllLectures.getSelectedRowCount() !=0 && tableAllLectures.getValueAt(tableAllLectures.getSelectedRow(), 5).toString().equals(username)){ //a row is selected //ask for confirmation eingabe = JOptionPane.showConfirmDialog(null, @@ -604,7 +550,7 @@ public class DeleteLecture_GUI extends JFrame { "Bitte wählen Sie ein eigenes Image aus.", "Message", JOptionPane.INFORMATION_MESSAGE); - } + } */ } }); -- 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/lecture/DeleteLecture_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