Merge branch 'v1.1' of git.openslx.org:openslx-ng/tutor-module into v1.1

1 files changed, 4 insertions, 4 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/ImageTable.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/ImageTable.java
index 1af86c41..f67fdb31 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/ImageTable.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/ImageTable.java
@@ -14,11 +14,11 @@ import org.openslx.dozmod.util.FormatHelper;
 @SuppressWarnings("serial")
 public class ImageTable extends ListTable<ImageSummaryRead> {
 
-	private static String[] columnNames = { "Name", "OS", "Besitzer", "Letztes Update", "Größe", "Version",
+	private static String[] columnNames = { "Name", "OS", "Besitzer", "Letztes Update", "Größe", "Valid",
 			"Vorlage" };
 
 	private static Class<?>[] columnClasses = { String.class, String.class, String.class, Long.class,
-			Long.class, String.class, Boolean.class };
+			Long.class, Boolean.class, Boolean.class };
 
 	public ImageTable() {
 		super(columnNames, columnClasses, new Comparator<ImageSummaryRead>() {
@@ -43,7 +43,7 @@ public class ImageTable extends ListTable<ImageSummaryRead> {
 		getRowSorter().setComparator(2, Sorters.userNameById);
 		// fourth and fifth column are both longs (last update and size), use default
 		// sixth column (version id) is string again, doesn't have to be set
-		// seventh column is boolean, use deafult
+		// seventh column is boolean, use default
 		// --------- end of comparators -------------------------------------------------
 	}
 
@@ -62,7 +62,7 @@ public class ImageTable extends ListTable<ImageSummaryRead> {
 		if (columnIndex == 4)
 			return row.getFileSize();
 		if (columnIndex == 5)
-			return row.getLatestVersionId();
+			return row.isValid;
 		if (columnIndex == 6)
 			return row.isTemplate;
 		throw new IndexOutOfBoundsException();