Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module

Conflicts:
	dozentenmodulserver/src/main/java/sql/SQL.java

• Note: manual merge

1 files changed, 62 insertions, 24 deletions

diff --git a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
index 2f4d958a..25c59fa7 100644
--- a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
@@ -21,6 +21,7 @@ import java.net.URISyntaxException;
 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;
@@ -95,7 +96,7 @@ public class CreateLectureLink_GUI extends JFrame {
 	Component c = null;
 	private JTextField textFieldName;
 	String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung",
-			"Verantwortlicher", "Letztes Update", "ID", "Version", "Template" };
+			"Verantwortlicher", "Letztes Update", "ID", "Version", "Template", "Beschreibung" };
 	ThriftConnection con = new ThriftConnection();
 	Client client = models.Client.clientcon.getClient();
 
@@ -105,22 +106,25 @@ public class CreateLectureLink_GUI extends JFrame {
 			+ "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) {
+	/*final DefaultTableModel modelAll = new DefaultTableModel(titles, 0) {
 		public boolean isCellEditable(int rowIndex, int mColIndex) {
 			return false;
 		}
-	};
+		
+	};*/
 	final DefaultTableModel modelMyImages = new DefaultTableModel(titles, 0) {
 		public boolean isCellEditable(int rowIndex, int mColIndex) {
 			return false;
 		}
 	};
+	/*
 	final DefaultTableModel modelPublicVorlagen = new DefaultTableModel(titles,
 			0) {
 		public boolean isCellEditable(int rowIndex, int mColIndex) {
 			return false;
 		}
 	};
+	*/
 	// final TableRowSorter<TableModel> rowSorterAll = new
 	// TableRowSorter<TableModel>(
 	// modelAll);
@@ -130,11 +134,18 @@ public class CreateLectureLink_GUI extends JFrame {
 	// final TableRowSorter<TableModel> rowSorterPublicVorlagen = new
 	// TableRowSorter<TableModel>(
 	// modelPublicVorlagen);
+	
+	RowFilter rf = null;
+	List<RowFilter<Object,Object>> filters = new ArrayList<RowFilter<Object,Object>>(2);
 
 	/**
 	 * Create the dialog.
 	 */
 	public CreateLectureLink_GUI(Component formerGUI) {
+		
+		filters.add(RowFilter.regexFilter(".", 0));
+		rf = RowFilter.orFilter(filters);
+		
 		addWindowListener(new WindowAdapter() {
 			@Override
 			public void windowClosing(WindowEvent arg0) {
@@ -146,8 +157,8 @@ public class CreateLectureLink_GUI extends JFrame {
 			public void windowOpened(WindowEvent arg0) {
 				try {
 					initTableModel(modelMyImages);
-					initTableModel(modelAll);
-					initTableModel(modelPublicVorlagen);
+					//initTableModel(modelAll);
+					//initTableModel(modelPublicVorlagen);
 				} catch (TException e) {
 					// TODO Auto-generated catch block
 					e.printStackTrace();
@@ -177,6 +188,9 @@ public class CreateLectureLink_GUI extends JFrame {
 				tablemyImages.getColumnModel().getColumn(7).setWidth(0);
 				tablemyImages.getColumnModel().getColumn(7).setMinWidth(0);
 				tablemyImages.getColumnModel().getColumn(7).setMaxWidth(0);
+				tablemyImages.getColumnModel().getColumn(9).setWidth(0);
+				tablemyImages.getColumnModel().getColumn(9).setMinWidth(0);
+				tablemyImages.getColumnModel().getColumn(9).setMaxWidth(0);
 				
 				textFieldName.requestFocusInWindow();
 			}
@@ -250,23 +264,23 @@ public class CreateLectureLink_GUI extends JFrame {
 				if (stext != "") {
 					activeSearch = true;
 					// Filtere nach der Eingabe
-					// rowSorterAll.setRowFilter(RowFilter.regexFilter(textFieldName.getText(),
-					// 0));
-					rowSorterMyImages.setRowFilter(RowFilter.regexFilter(
-							textFieldName.getText(), 0));
-					// rowSorterPublicVorlagen.setRowFilter(RowFilter.regexFilter(textFieldName.getText(),
-					// 0));
+				 	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;
-					String username = person.verantwortlicher.getName() + " "
-							+ person.verantwortlicher.getVorname();
-					rowSorterMyImages.setRowFilter(RowFilter.regexFilter(
-							username, 4));
-					// rowSorterPublicVorlagen.setRowFilter(RowFilter.regexFilter("true",
-					// 8));
-					// rowSorterAll.setRowFilter(null);
+					filters.clear();
+					filters.add(RowFilter.regexFilter(".", 0)); //case insensitive, filter for anything
+					rf = RowFilter.orFilter(filters);
+					rowSorterMyImages.setRowFilter(rf);
 				}
+				tablemyImages.clearSelection();
+				
+				resetLectureInfo();
 
 			}
 
@@ -353,6 +367,9 @@ public class CreateLectureLink_GUI extends JFrame {
 		tablemyImages.getSelectionModel().addListSelectionListener(
 				new ListSelectionListener() {
 					public void valueChanged(ListSelectionEvent e) {
+						
+						if(tablemyImages.getSelectedRow() != -1)
+						{
 						String imageid = modelMyImages.getValueAt(
 								tablemyImages
 										.convertRowIndexToModel(tablemyImages
@@ -372,7 +389,10 @@ public class CreateLectureLink_GUI extends JFrame {
 							// TODO Auto-generated catch block
 							e1.printStackTrace();
 						}
+						}
 					}
+					
+					
 				});
 		tablemyImages.setModel(modelMyImages);
 		tablemyImages.getColumnModel().getColumn(1).sizeWidthToFit();
@@ -724,8 +744,8 @@ public class CreateLectureLink_GUI extends JFrame {
 				.getUserID());
 
 		Iterator<server.generated.Image> i = images.iterator();
-		SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
-		SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy hh:mm:ss");
+		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()) {
@@ -736,7 +756,8 @@ public class CreateLectureLink_GUI extends JFrame {
 					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).getIsTemplate(),
+					images.get(x).getDescription()};
 			// Fuege diese Objekte der Tabelle hinzu
 
 			model.addRow(obj);
@@ -744,16 +765,33 @@ public class CreateLectureLink_GUI extends JFrame {
 			i.next();
 
 		}
-
+		
 		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("");
+	}
 
 	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");
+		SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
 		Map<String, String> res = client.getImageData(id, version);
 		labelName.setText(res.get("name"));
 		labelOS.setText(res.get("os"));