-Volltextsuche vorbereitet, Funktion wird noch angepasst

7 files changed, 40 insertions, 111 deletions

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<TableModel> rowSorterPublicVorlagen = new TableRowSorter<TableModel>(
 			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<TableModel> rowSorterPublicVorlagen = new TableRowSorter<TableModel>(
 			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<TableModel> rowSorterPublicVorlagen = new TableRowSorter<TableModel>(

 			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<TableModel> rowSorterPublicVorlagen = new TableRowSorter<TableModel>(
 			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<TableModel> rowSorterMyLectures = new TableRowSorter<TableModel>(
 			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<TableModel> rowSorterPublicVorlagen = new TableRowSorter<TableModel>(
 			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<TableModel> rowSorterMyLectures = new TableRowSorter<TableModel>(

 			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() {