[client] date woes... *g*

1 files changed, 7 insertions, 9 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java
index 212e92b0..241656f6 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java
@@ -45,6 +45,7 @@ import org.openslx.dozmod.gui.MainWindow;
 import org.openslx.dozmod.gui.changemonitor.AbstractControlWrapper;
 import org.openslx.dozmod.gui.changemonitor.DialogChangeMonitor;
 import org.openslx.dozmod.gui.changemonitor.DialogChangeMonitor.TextNotEmptyConstraint;
+import org.openslx.dozmod.gui.helper.DateTimeHelper;
 import org.openslx.dozmod.gui.helper.ExpiryDateChooser;
 import org.openslx.dozmod.gui.helper.MessageType;
 import org.openslx.dozmod.gui.helper.PopupMenu;
@@ -675,26 +676,23 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe
 		int daysToExtend = -1;
 		if (versions.size() > 1) {
 			// more than one version given, ask the user once and use the value for all versions.
-			daysToExtend = ExpiryDateChooser.askFutureExpiryDate(this, null);
+			daysToExtend = ExpiryDateChooser.askFutureExpiryDuration(this, null);
 			if (daysToExtend == -1)
 				return;
 		}
 		int count = 0;
 		for (ImageVersionDetails img : versions) {
-			long currentExpireDate = img.expireTime;
-			if (currentExpireDate < Util.unixTime()) {
-				// already expired, use today as starting date for the extension
-				currentExpireDate = Util.unixTime();
-			}
+			long currentExpiryTime = img.expireTime < Util.unixTime() ? Util.unixTime() : img.expireTime;
+			Date currentExpiryTimeAsDate = DateTimeHelper.endOfDay(new Date(currentExpiryTime * 1000l));
 			if (daysToExtend == -1) {
-				daysToExtend = ExpiryDateChooser.askFutureExpiryDate(this, new Date(currentExpireDate * 1000));
+				daysToExtend = ExpiryDateChooser.askFutureExpiryDuration(this, currentExpiryTimeAsDate);
 				if (daysToExtend == -1)
 					return;
 			}
-			currentExpireDate += daysToExtend * 86400L;
+			currentExpiryTimeAsDate =  DateTimeHelper.addDaysTo(currentExpiryTimeAsDate, daysToExtend);
 			try {
 				ThriftManager.getSatClient().setImageVersionExpiry(Session.getSatelliteToken(), img.versionId,
-						currentExpireDate);
+						currentExpiryTimeAsDate.getTime() / 1000L);
 				count++;
 			} catch (TException e) {
 				ThriftError.showMessage(this, LOGGER, e,