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, 27 insertions, 8 deletions

diff --git a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
index 22344d2f..e3f482e2 100644
--- a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
@@ -115,22 +115,26 @@ public class DeleteImage_GUI extends JFrame {
 	
 	ThriftConnection con = new ThriftConnection();
 	Client client = models.Client.clientcon.getClient();
+	
+	/*
 	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);
@@ -153,6 +157,7 @@ public class DeleteImage_GUI extends JFrame {
 		
 		filters.add(RowFilter.regexFilter(".", 0));
 		rf = RowFilter.orFilter(filters);
+
 		
 		
 		addWindowListener(new WindowAdapter() {
@@ -165,9 +170,9 @@ public class DeleteImage_GUI extends JFrame {
 
 			@Override
 			public void windowOpened(WindowEvent arg0) {
-				initTableModel(modelAll);
+				//initTableModel(modelAll);
 				initTableModel(modelMyImages);
-				initTableModel(modelPublicVorlagen);
+				//initTableModel(modelPublicVorlagen);
 
 				// auszublendende Angaben
 				// 1=Lizenzpflichtig
@@ -497,6 +502,9 @@ public class DeleteImage_GUI extends JFrame {
 		tablemyImages.getSelectionModel().addListSelectionListener(
 				new ListSelectionListener() {
 					public void valueChanged(ListSelectionEvent e) {
+						
+						if(tablemyImages.getSelectedRow() != -1)
+						{
 						String imageid = modelMyImages.getValueAt(
 								tablemyImages
 										.convertRowIndexToModel(tablemyImages
@@ -508,7 +516,9 @@ public class DeleteImage_GUI extends JFrame {
 												.getSelectedRow()), 7)
 								.toString();
 						writeImageData(imageid, version);
+						}
 					}
+					
 				});
 		tablemyImages.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
 		tablemyImages.setModel(modelMyImages);
@@ -752,6 +762,8 @@ public class DeleteImage_GUI extends JFrame {
 
 	// Initiale Beffuelung eines Table models
 	public DefaultTableModel initTableModel(DefaultTableModel model) {
+		
+		
 		List<server.generated.Image> images;
 		try {
 			// Hole eine Liste der Images
@@ -759,10 +771,12 @@ public class DeleteImage_GUI extends JFrame {
 
 			Iterator<server.generated.Image> i = images.iterator();
 
+			System.out.println("Size of image list="+images.size());
+			
 			int x = 0;
-			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");
+			
 			while (i.hasNext()) {
 				// erzeuge Objekte fuer die Tabelle
 				Object[] obj = { images.get(x).getImageName(),
@@ -778,8 +792,13 @@ public class DeleteImage_GUI extends JFrame {
 				model.addRow(obj);
 				x++;
 				i.next();
+				
+				
 
 			}
+			if(x==0){
+				System.out.println("Damn... nothing to do here..");
+			}
 
 			return model;
 		} catch (TException | ParseException e1) {
@@ -812,8 +831,8 @@ public class DeleteImage_GUI extends JFrame {
 
 	public void writeImageData(String id, String version) {
 		try {
-			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"));