SQL Abfragen auf ID und Version umgestellt

1 files changed, 12 insertions, 4 deletions

diff --git a/Dozentenmodul/src/gui/SearchEditImage_GUI.java b/Dozentenmodul/src/gui/SearchEditImage_GUI.java
index 840f283c..c2b4b080 100644
--- a/Dozentenmodul/src/gui/SearchEditImage_GUI.java
+++ b/Dozentenmodul/src/gui/SearchEditImage_GUI.java
@@ -66,7 +66,7 @@ public class SearchEditImage_GUI extends JFrame {
 	JTable tablemyImages;
 	private JTextField textFieldName;
 	JTabbedPane tabbedPane;
-	String[] titles= {"Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "Schlagwort"};
+	String[] titles= {"Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "Schlagwort","ID", "Version"};
     ThriftConnection con=new ThriftConnection();
     Client client=con.getThriftConnection();
     final DefaultTableModel modelAll = new DefaultTableModel( titles, 0 );
@@ -392,8 +392,15 @@ public class SearchEditImage_GUI extends JFrame {
 				cancelButton.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
 						con.closeThriftConnection();
-						String imagename=modelMyImages.getValueAt(tablemyImages.convertRowIndexToModel(tablemyImages.getSelectedRow()), 0).toString();
-						Image.image.setImagename(imagename);
+						
+						//Image.image.setImageId(imageid);
+						
+						String imageid=modelMyImages.getValueAt(tablemyImages.convertRowIndexToModel(tablemyImages.getSelectedRow()), 7).toString();
+						
+						Image.image.setImageId(imageid);
+						String imageversion=modelMyImages.getValueAt(tablemyImages.convertRowIndexToModel(tablemyImages.getSelectedRow()), 8).toString();
+						
+						Image.image.setVersion(imageversion);
 						EditImageAllgemein_GUI ea=new EditImageAllgemein_GUI();
 						ea.setVisible(true);
 						dispose();						
@@ -439,7 +446,8 @@ public class SearchEditImage_GUI extends JFrame {
 			while(i.hasNext())
 			{
 				//erzeuge Objekte für die Tabelle
-				Object [] obj={images.get(x).getImageName(),images.get(x).getLicenseRestriction(),images.get(x).getOsName(),images.get(x).getLectureName(),images.get(x).getUserData(),images.get(x).getUpdateTime()};
+				Object [] obj={images.get(x).getImageName(),images.get(x).getLicenseRestriction(),images.get(x).getOsName(),images.get(x).getLectureName(),images.get(x).getUserData(),images.get(x).getUpdateTime(),"",images.get(x).id,images.get(x).getVersion()};
+				//System.out.println("id:"+images.get(x).getId());
 				//Füge diese Objekte der Tabelle hinzu
 				model.addRow(obj);
 				x++;