diff options
Diffstat (limited to 'dozentenmodul/src/main/java/org')
-rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/thrift/GuiErrorCallback.java | 2 | ||||
-rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/thrift/cache/ImagePublishedCache.java | 21 |
2 files changed, 5 insertions, 18 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/GuiErrorCallback.java b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/GuiErrorCallback.java index b8ceb6b5..4267ea31 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/GuiErrorCallback.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/GuiErrorCallback.java @@ -7,6 +7,7 @@ import org.apache.thrift.TException; import org.apache.thrift.transport.TTransportException; import org.openslx.bwlp.thrift.iface.AuthorizationError; import org.openslx.bwlp.thrift.iface.TAuthorizationException; +import org.openslx.dozmod.Config; import org.openslx.dozmod.gui.Gui; import org.openslx.dozmod.gui.Gui.GuiCallable; import org.openslx.dozmod.gui.helper.MessageType; @@ -47,6 +48,7 @@ public class GuiErrorCallback implements ErrorCallback { //"\n" + errMsg + "\n" + "\nBitte starten Sie das Programm neu. Jetzt beenden?", MessageType.ERROR_RETRY, LOGGER, t)) { // user confirmed exit + Config.saveCurrentSession("", "", ""); Gui.exit(0); } return false; 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 a137d84e..39ca3be7 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 @@ -7,10 +7,6 @@ import org.apache.thrift.TException; 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.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; @@ -33,19 +29,9 @@ 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 (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; -// } + page = ThriftManager.getMasterClient().getPublicImages( + Session.getMasterToken(), i); + if (result == null) { result = page; } else { @@ -62,5 +48,4 @@ public class ImagePublishedCache { return listCache.get(forceRefresh ? CacheMode.NEVER_CACHED : CacheMode.DEFAULT); } - } |