[client] publish image stuff 2.0

1 files changed, 19 insertions, 8 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/cache/ImagePublishedCache.java b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/cache/ImagePublishedCache.java
index e57a4a24..a137d84e 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/cache/ImagePublishedCache.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/cache/ImagePublishedCache.java
@@ -4,11 +4,13 @@ import java.util.List;
 
 import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
-import org.openslx.bwlp.thrift.iface.ImagePublishData;
 import org.openslx.bwlp.thrift.iface.ImageSummaryRead;
 import org.openslx.bwlp.thrift.iface.TAuthorizationException;
 import org.openslx.bwlp.thrift.iface.TInvocationException;
-import org.openslx.dozmod.gui.window.ImageListWindow;
+import org.openslx.dozmod.Config;
+import org.openslx.dozmod.gui.Gui;
+import org.openslx.dozmod.gui.MainWindow;
+import org.openslx.dozmod.gui.helper.MessageType;
 import org.openslx.dozmod.thrift.Session;
 import org.openslx.thrifthelper.ThriftManager;
 import org.openslx.util.GenericDataCache;
@@ -16,7 +18,8 @@ import org.openslx.util.GenericDataCache.CacheMode;
 
 public class ImagePublishedCache {
 
-	private final static Logger LOGGER = Logger.getLogger(ImagePublishedCache.class);
+	private final static Logger LOGGER = Logger
+			.getLogger(ImagePublishedCache.class);
 
 	private static final int CACHE_TIME_LIST_MS = 30 * 1000;
 
@@ -30,11 +33,19 @@ public class ImagePublishedCache {
 			int pageSize = Session.getSatelliteConfig().pageSize;
 			for (int i = 0;; ++i) {
 				List<ImageSummaryRead> page = null;
-				try {
-					page = ThriftManager.getMasterClient().getPublicImages(Session.getMasterToken(), i);
-				} catch (TException e) {
-					LOGGER.error("Could not get the list of public images from the masterserver.", e);
-				}
+//				try {
+					page = ThriftManager.getMasterClient().getPublicImages(
+							Session.getMasterToken(), i);
+//				} catch (TAuthorizationException e) {
+//					if (Gui.showMessageBox(
+//							"Sitzung abgelaufen. Um diese Funktion zu nutzen, melden Sie sich erneut ein. Jetzt abmelden und beenden?",
+//							MessageType.QUESTION_YESNO, LOGGER, e)) {
+//						Config.saveCurrentSession("", "", "");
+//						
+//					}
+//
+//					return null;
+//				}
 				if (result == null) {
 					result = page;
 				} else {