1 files changed, 49 insertions, 24 deletions

diff --git a/Dozentenmodul/src/gui/SearchEditImage_GUI.java b/Dozentenmodul/src/gui/SearchEditImage_GUI.java
index dbe23115..dbc2562c 100644
--- a/Dozentenmodul/src/gui/SearchEditImage_GUI.java
+++ b/Dozentenmodul/src/gui/SearchEditImage_GUI.java
@@ -25,6 +25,7 @@ import javax.swing.JLabel;
 import javax.swing.JMenu;
 import javax.swing.JMenuBar;
 import javax.swing.JMenuItem;
+import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JRadioButton;
 import javax.swing.JScrollPane;
@@ -44,6 +45,7 @@ import javax.swing.table.DefaultTableModel;
 import javax.swing.table.TableModel;
 import javax.swing.table.TableRowSorter;
 import models.Image;
+import models.person;
 //import models.person;
 
 import org.apache.thrift.TException;
@@ -51,6 +53,7 @@ import org.apache.thrift.TException;
 import server.Server.Client;
 import thrift.ThriftConnection;
 
+
 @SuppressWarnings("serial")
 public class SearchEditImage_GUI extends JFrame {
 
@@ -269,14 +272,14 @@ public class SearchEditImage_GUI extends JFrame {
 				System.out.println(tabbedPane.getSelectedIndex());
 				if(tabbedPane.getSelectedIndex()==0){
 					
-					
-					
+					String username= person.verantwortlicher.getName()+" "+person.verantwortlicher.getVorname();
+					//String username="Spitzer Tobias";
+					rowSorterMyImages.setRowFilter(RowFilter.regexFilter(username, 4));
 				}
 				else if(tabbedPane.getSelectedIndex()==1){
-					String username="Spitzer Tobias";
-					rowSorterMyImages.setRowFilter(RowFilter.regexFilter(username, 4));
+
+					
 					
-					//rowSorterMyImages.toggleSortOrder(0);	
 				}
 				
 			}
@@ -284,17 +287,7 @@ public class SearchEditImage_GUI extends JFrame {
 
 		tabbedPane.setBounds(10, 197, 557, 300);
 		contentPanel.add(tabbedPane);
-		
-		JScrollPane scrollPaneMyImage = new JScrollPane();
-		tablemyImages=new JTable();
-		tablemyImages.setModel(modelMyImages);
-		tablemyImages.getColumnModel().getColumn(1).sizeWidthToFit();
-		tablemyImages.getColumnModel().getColumn(2).sizeWidthToFit();
-		tablemyImages.getColumnModel().getColumn(3).sizeWidthToFit();
-		tablemyImages.getColumnModel().getColumn(4).sizeWidthToFit();
-		tablemyImages.getColumnModel().getColumn(5).sizeWidthToFit();
 		initTableModel(modelMyImages);
-		tablemyImages.setRowSorter(rowSorterMyImages);
 		
 		JScrollPane scrollPaneAllImages = new JScrollPane();
 		tableAllImages=new JTable();
@@ -305,13 +298,23 @@ public class SearchEditImage_GUI extends JFrame {
 		tableAllImages.getColumnModel().getColumn(4).sizeWidthToFit();
 		tableAllImages.getColumnModel().getColumn(5).sizeWidthToFit();
 		initTableModel(modelAll);
+		
+		JScrollPane scrollPaneMyImage = new JScrollPane();
+		tablemyImages=new JTable();
+		tablemyImages.setModel(modelMyImages);
+		tablemyImages.getColumnModel().getColumn(1).sizeWidthToFit();
+		tablemyImages.getColumnModel().getColumn(2).sizeWidthToFit();
+		tablemyImages.getColumnModel().getColumn(3).sizeWidthToFit();
+		tablemyImages.getColumnModel().getColumn(4).sizeWidthToFit();
+		tablemyImages.getColumnModel().getColumn(5).sizeWidthToFit();
+		tablemyImages.setRowSorter(rowSorterMyImages);
+		
+				scrollPaneMyImage.setViewportView(tablemyImages);
+				tabbedPane.addTab("Meine Images", null, scrollPaneMyImage, null);
 		tableAllImages.setRowSorter(rowSorterAll);
 		
 				scrollPaneAllImages.setViewportView(tableAllImages);
 				tabbedPane.addTab("Alle", null, scrollPaneAllImages, null);
-
-		scrollPaneMyImage.setViewportView(tablemyImages);
-		tabbedPane.addTab("Meine Images", null, scrollPaneMyImage, null);
 		
 		JScrollPane scrollPaneCoopImages = new JScrollPane();
 		JTable tableCoopImages=new JTable();
@@ -359,10 +362,27 @@ public class SearchEditImage_GUI extends JFrame {
 		btnDownload.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent arg0) {
 				//Öffnet den Downloader
-				con.closeThriftConnection();
-				FTPDownloader_GUI down=new FTPDownloader_GUI();
-				down.setVisible(true);
-				SearchEditImage_GUI.this.setVisible(false);
+				
+				if(tablemyImages.getSelectedRow()!=-1)
+				{
+					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);
+					SearchEditImage_GUI.this.setVisible(false);
+					FTPDownloader_GUI down=new FTPDownloader_GUI();
+					down.setVisible(true);
+					con.closeThriftConnection();
+					
+					
+					
+				}
+				else{
+					JOptionPane.showMessageDialog(null, "Bitte wählen Sie ein Image für den Download aus", "Message",
+							JOptionPane.INFORMATION_MESSAGE);
+				}
 			}
 		});
 		btnDownload.setBounds(449, 508, 118, 23);
@@ -395,7 +415,7 @@ public class SearchEditImage_GUI extends JFrame {
 						con.closeThriftConnection();
 						
 						//Image.image.setImageId(imageid);
-						
+						if(tabbedPane.getSelectedIndex()==0){
 						String imageid=modelMyImages.getValueAt(tablemyImages.convertRowIndexToModel(tablemyImages.getSelectedRow()), 7).toString();
 						
 						Image.image.setImageId(imageid);
@@ -405,7 +425,12 @@ public class SearchEditImage_GUI extends JFrame {
 						con.closeThriftConnection();
 						EditImageAllgemein_GUI ea=new EditImageAllgemein_GUI();
 						ea.setVisible(true);
-						dispose();						
+						dispose();		
+						}
+						else{
+							JOptionPane.showMessageDialog(null, "Bitte wählen Sie ein eigenes Image aus", "Message",
+									JOptionPane.INFORMATION_MESSAGE);
+						}
 					}
 				});
 				cancelButton.setActionCommand("Cancel");