summaryrefslogtreecommitdiffstats
path: root/Dozentenmodul/src/gui/image/DeleteImage_GUI.java
diff options
context:
space:
mode:
authorunknown2014-04-14 17:52:49 +0200
committerunknown2014-04-14 17:52:49 +0200
commitcd84e775c083d2013115a69ef24c6de506617c04 (patch)
tree281fa281773ea74c0128cebd769d005678af7cda /Dozentenmodul/src/gui/image/DeleteImage_GUI.java
parentMerge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module (diff)
parentkonsolenausgaben funktionierender teile entfernt (diff)
downloadtutor-module-cd84e775c083d2013115a69ef24c6de506617c04.tar.gz
tutor-module-cd84e775c083d2013115a69ef24c6de506617c04.tar.xz
tutor-module-cd84e775c083d2013115a69ef24c6de506617c04.zip
Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module
Conflicts: Dozentenmodulserver/bin/server/ServerHandler.class Dozentenmodulserver/src/server/ServerHandler.java
Diffstat (limited to 'Dozentenmodul/src/gui/image/DeleteImage_GUI.java')
-rw-r--r--Dozentenmodul/src/gui/image/DeleteImage_GUI.java15
1 files changed, 10 insertions, 5 deletions
diff --git a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java
index 376d7c5f..2c4ba5e6 100644
--- a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java
+++ b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java
@@ -370,11 +370,15 @@ public class DeleteImage_GUI extends JFrame {
"Wollen Sie diese Daten löschen?", "Löschen?",JOptionPane.YES_NO_OPTION);
if (eingabe == JOptionPane.YES_OPTION) {
- String imageid = modelAll.getValueAt(tableAllImages.convertRowIndexToModel
- (tableAllImages.getSelectedRow()), 7).toString();
+ String imageid = modelMyImages.getValueAt(tablemyImages.convertRowIndexToModel
+ (tablemyImages.getSelectedRow()), 7).toString();
+ /* modelMyImages.getValueAt(
+ tablemyImages.convertRowIndexToModel(tablemyImages
+ .getSelectedRow()), 7).toString();
+ */
- String imageversion = modelAll.getValueAt(tableAllImages.convertRowIndexToModel
- (tableAllImages.getSelectedRow()), 8).toString();
+ String imageversion = modelMyImages.getValueAt(tablemyImages.convertRowIndexToModel
+ (tablemyImages.getSelectedRow()), 8).toString();
//TODO
//Image darf nur gelöscht werden, wenn keine Veranstaltung mehr auf das Image verweist.
@@ -382,7 +386,8 @@ public class DeleteImage_GUI extends JFrame {
//try {
//if(client.connectedToEvents(imageid ,imageversion)) {
- System.out.println("entrou1");
+ System.out.println(imageid);
+ System.out.println(imageversion);
try {
if (client.deleteImageData(imageid ,imageversion) &&
client.deleteImageServer(imageid ,imageversion)) {