Bugfixes und Plausibilitätscheck eingefügt

1 files changed, 41 insertions, 33 deletions

diff --git a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java
index b7f661b5..75318185 100644
--- a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java
+++ b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java
@@ -80,16 +80,12 @@ public class SearchEditImage_GUI extends JFrame {
 
 	/**
 	 * Launch the application.
+	 * 
+	 * public static void main(String[] args) { try { SearchEditImage_GUI dialog
+	 * = new SearchEditImage_GUI();
+	 * dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
+	 * dialog.setVisible(true); } catch (Exception e) { e.printStackTrace(); } }
 	 */
-	public static void main(String[] args) {
-		try {
-			SearchEditImage_GUI dialog = new SearchEditImage_GUI();
-			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
-			dialog.setVisible(true);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
 
 	/**
 	 * Create the dialog.
@@ -102,6 +98,11 @@ public class SearchEditImage_GUI extends JFrame {
 				con.closeThriftConnection();
 				System.exit(0);
 			}
+
+			@Override
+			public void windowOpened(WindowEvent arg0) {
+				textFieldName.requestFocusInWindow();
+			}
 		});
 		// Verhindert das Vergrößern Des Fensters
 		setResizable(false);
@@ -419,33 +420,40 @@ public class SearchEditImage_GUI extends JFrame {
 					public void actionPerformed(ActionEvent e) {
 						con.closeThriftConnection();
 
-						// Image.image.setImageId(imageid);
+						// check if user is in correct tab
 						if (tabbedPane.getSelectedIndex() == 0) {
-							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);
-							con.closeThriftConnection();
-							EditImageAllgemein_GUI ea = new EditImageAllgemein_GUI();
-							ea.setVisible(true);
-							dispose();
+							//check if a row is selected
+							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);
+								con.closeThriftConnection();
+								EditImageAllgemein_GUI ea = new EditImageAllgemein_GUI();
+								ea.setVisible(true);
+								dispose();
+							} else {
+								JOptionPane.showMessageDialog(null,
+										"Bitte wählen Sie ein Image aus.",
+										"Image Auswahl", JOptionPane.INFORMATION_MESSAGE);
+							}// end check if row is selected
 						} else {
 							JOptionPane.showMessageDialog(null,
-									"Bitte wählen Sie ein eigenes Image aus",
-									"Message", JOptionPane.INFORMATION_MESSAGE);
-						}
+									"Bitte wählen Sie ein eigenes Image aus.",
+									"Image Auswahl", JOptionPane.INFORMATION_MESSAGE);
+						}//end check if correct tab is selected
 					}
 				});
 				cancelButton.setActionCommand("Cancel");