summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorunknown2014-04-15 13:57:30 +0200
committerunknown2014-04-15 13:57:30 +0200
commit1124afc04070ec03b7a8c9a4dd2ab66d92f4dc48 (patch)
tree48ad852a819bd5f7d67ff71ba0b51bbdd0050e18
parentHauptmenü ruft jetzt korrekte Suchfenster auf (diff)
parentrtherhert (diff)
downloadtutor-module-1124afc04070ec03b7a8c9a4dd2ab66d92f4dc48.tar.gz
tutor-module-1124afc04070ec03b7a8c9a4dd2ab66d92f4dc48.tar.xz
tutor-module-1124afc04070ec03b7a8c9a4dd2ab66d92f4dc48.zip
Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module
-rw-r--r--Dozentenmodul/bin/gui/image/DeleteImage_GUI.classbin11922 -> 11922 bytes
-rw-r--r--Dozentenmodul/src/gui/image/DeleteImage_GUI.java15
2 files changed, 10 insertions, 5 deletions
diff --git a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class
index 63a49753..914e0f8b 100644
--- a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class
+++ b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class
Binary files differ
diff --git a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java
index 1f2dbfa6..4f2892e8 100644
--- a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java
+++ b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java
@@ -399,18 +399,23 @@ public class DeleteImage_GUI extends JFrame {
System.out.println(imageversion);
try {
if (client.deleteImageData(imageid ,imageversion)) {
- if (client.deleteImageServer(imageid ,imageversion)) {
-
- System.out.println("entrou2");
+ //if (client.deleteImageServer(imageid ,imageversion)) {
JOptionPane.showConfirmDialog(null, "Löschen erfolgreich!",
imageversion, JOptionPane.OK_CANCEL_OPTION);
+
+ /*
+ * DeleteImage_GUI di = new DeleteImage_GUI();
+ * di.setVisible(true);
+ * dispose();
+ */
+
- } else {
+ /*} else {
JOptionPane.showConfirmDialog(null, "Löschen vom Server hat leider nicht geklappt!!",
imageversion, JOptionPane.OK_CANCEL_OPTION);
- }
+ } */
} else {