From c6561884c70f6c1eaaf4b11032e20b9c10a607ea Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Thu, 20 Aug 2015 17:34:46 +0200 Subject: [client] use ThriftActions to delete image in image details window --- .../dozmod/gui/window/ImageDetailsWindow.java | 24 +++++----------------- 1 file changed, 5 insertions(+), 19 deletions(-) (limited to 'dozentenmodul/src/main/java') 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 0f9e89cd..abbee863 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 @@ -41,6 +41,7 @@ import org.openslx.dozmod.gui.wizard.UpdateWizard; import org.openslx.dozmod.permissions.ImagePerms; import org.openslx.dozmod.thrift.Session; import org.openslx.dozmod.thrift.ThriftActions; +import org.openslx.dozmod.thrift.ThriftActions.DeleteCallback; import org.openslx.dozmod.thrift.ThriftError; import org.openslx.dozmod.thrift.cache.MetaDataCache; import org.openslx.dozmod.thrift.cache.UserCache; @@ -331,28 +332,13 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe * @param version image version to delete */ private void deleteVersion(final ImageVersionDetails version) { - // requires confirmation of the user - if (!Gui.showMessageBox(me, "Wollen Sie diese Version des Images wirklich löschen?", - MessageType.QUESTION_YESNO, LOGGER, null)) - return; - QuickTimer.scheduleOnce(new Task() { - @Override - public void fire() { - try { - ThriftManager.getSatClient().deleteImageVersion(Session.getSatelliteToken(), version.versionId); - } catch (TException e) { - ThriftError.showMessage(me, LOGGER, e, "Fehler beim Löschen der Version"); - return; - } - // no feedback, only force refresh - Gui.asyncExec(new Runnable() { + ThriftActions.deleteImageVersion(JOptionPane.getFrameForComponent(this), + image.getImageBaseId(), version.versionId, new DeleteCallback() { @Override - public void run() { - refresh(true); + public void isDeleted(boolean success) { + refresh(success); } }); - } - }); } /******************************************************************************** -- cgit v1.2.3-55-g7522