From e4c4df9f0d7a6806d77386ff497e6b82461ec4cd Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Tue, 30 Aug 2016 15:32:15 +0200
Subject: [client] added "expires" column in ImageTable + increased MainWindow
 width a bit

---
 dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java | 2 +-
 .../main/java/org/openslx/dozmod/gui/control/table/ImageTable.java | 7 +++++--
 .../org/openslx/dozmod/gui/window/layout/MainMenuWindowLayout.java | 4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'dozentenmodul/src/main/java')

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java
index 3ed14ad9..77795a23 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java
@@ -209,7 +209,7 @@ public abstract class MainWindow {
 		mainContainer.setLayout(new BoxLayout(mainContainer, BoxLayout.PAGE_AXIS));
 
 		// Scale the ui with the font.
-		mainWindow.setMinimumSize(Gui.getScaledDimension(950, 670));
+		mainWindow.setMinimumSize(Gui.getScaledDimension(1050, 670));
 
 		// register all pages of the main window
 		registerPage(new MainMenuWindow());
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 4741e291..92f27a55 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
@@ -15,6 +15,7 @@ public class ImageTable extends ListTable<ImageSummaryRead> {
 	public static final ListTableColumn COL_USABLE = new ListTableColumn("Verwendbar", Boolean.class);
 	public static final ListTableColumn COL_SIZE = new ListTableColumn("Größe", Long.class);
 	public static final ListTableColumn COL_LASTCHANGE = new ListTableColumn("Geändert", Long.class);
+	public static final ListTableColumn COL_EXPIRING = new ListTableColumn("Ablaufdatum", Long.class);
 	public static final ListTableColumn COL_OWNER = new ListTableColumn("Besitzer", Sorters.userNameById);
 	public static final ListTableColumn COL_OS = new ListTableColumn("OS", Integer.class, Sorters.osNameById);
 	public static final ListTableColumn COL_NAME = new ListTableColumn("Name");
@@ -31,7 +32,7 @@ public class ImageTable extends ListTable<ImageSummaryRead> {
 					return -1;
 				return o1.imageBaseId.compareTo(o2.imageBaseId);
 			}
-		}, COL_NAME, COL_OS, COL_OWNER, COL_LASTCHANGE, COL_SIZE, COL_USABLE, COL_TEMPLATE);
+		}, COL_NAME, COL_OS, COL_OWNER, COL_LASTCHANGE, COL_EXPIRING, COL_SIZE, COL_USABLE, COL_TEMPLATE);
 	}
 
 	// return the right value of our image (row) depending on given column
@@ -45,6 +46,8 @@ public class ImageTable extends ListTable<ImageSummaryRead> {
 			return row.getOwnerId();
 		if (column == COL_LASTCHANGE)
 			return row.getUpdateTime();
+		if (column == COL_EXPIRING)
+			return row.getExpireTime();
 		if (column == COL_SIZE)
 			return row.getFileSize();
 		if (column == COL_USABLE)
@@ -62,7 +65,7 @@ public class ImageTable extends ListTable<ImageSummaryRead> {
 			return FormatHelper.osName(MetaDataCache.getOsById((int) value, true));
 		if (column == COL_OWNER)
 			return FormatHelper.userName(UserCache.find((String) value));
-		if (column == COL_LASTCHANGE)
+		if (column == COL_LASTCHANGE || column == COL_EXPIRING)
 			return FormatHelper.shortDate((long) value);
 		if (column == COL_SIZE)
 			return FormatHelper.bytes((long) value, false);
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/MainMenuWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/MainMenuWindowLayout.java
index 325e4b14..7233e257 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/MainMenuWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/MainMenuWindowLayout.java
@@ -12,7 +12,7 @@ import org.openslx.dozmod.util.ResourceLoader;
 public abstract class MainMenuWindowLayout extends CompositePage {
 	// text for info for the vms selection
 	protected String vmInfo = "<html><b>Übersicht Virtueller Maschinen</b><br>"
-			+ "Zur Übersicht über die verfügbaren Virtuellen Maschinen wechseln. Hier können Sie:<br><br>"
+			+ "Zur Übersicht über die verfügbaren Virtuellen Maschinen wechseln.<br>Hier können Sie:<br><br>"
 			+ "1) Veranstaltungen auf Basis einer Virtuellen Maschine erstellen<br>"
 			+ "2) Neue Virtuelle Maschinen hochladen<br>" 
 			+ "3) Virtuelle Maschinen herunterladen<br>"
@@ -20,7 +20,7 @@ public abstract class MainMenuWindowLayout extends CompositePage {
 
 	// text for the info for the lecture selection
 	protected String lecturesInfo = "<html><b>Übersicht Veranstaltungen</b><br>"
-			+ "Zur Übersicht über verfügbare Veranstaltungen wechseln. Hier können Sie:<br><br>"
+			+ "Zur Übersicht über verfügbare Veranstaltungen wechseln.<br>Hier können Sie:<br><br>"
 			+ "1) Veranstaltungen bearbeiten oder löschen<br>"
 			+ "2) Zu Veranstaltungen gehörende Virtuelle Maschinen herunterladen<br>&nbsp;</html>";
 
-- 
cgit v1.2.3-55-g7522