From 8ad8f1f3fd36c1e3f8e14c84e3187f9777799c6e Mon Sep 17 00:00:00 2001
From: Nino Breuer
Date: Wed, 19 Nov 2014 10:07:04 +0100
Subject: • fixed bug: wrong content of lists after de-selecting dropdown menu
 while filtering for images/lectures

• added single line selection restriction to lists

• removed some unused imports
---
 .../main/java/gui/image/SearchEditImage_GUI.java   | 46 +++++++++++++---------
 1 file changed, 27 insertions(+), 19 deletions(-)

(limited to 'dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java')

diff --git a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
index 0c9099c0..a758e88c 100644
--- a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
@@ -42,6 +42,7 @@ import javax.swing.JTable;
 import javax.swing.JTextArea;
 import javax.swing.JTextField;
 import javax.swing.JTextPane;
+import javax.swing.ListSelectionModel;
 import javax.swing.RowFilter;
 import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
@@ -334,16 +335,16 @@ public class SearchEditImage_GUI extends JFrame {
 					activeSearch = true;
 					
 					rowSorterMyImages.setRowFilter(RowFilter.regexFilter(comboBox.getSelectedItem().toString(), 2));
-
-					
 					
 				} else {
 					
 					
 					activeSearch = false;
+					/*
 					String username = person.verantwortlicher.getName() + " "
 							+ person.verantwortlicher.getVorname();
-					rowSorterMyImages.setRowFilter(RowFilter.regexFilter(username, 4));
+					*/
+					rowSorterMyImages.setRowFilter(null);
 					
 				}
 			}
@@ -426,24 +427,19 @@ public class SearchEditImage_GUI extends JFrame {
 		tablemyImages = new JTable();
 
 		tablemyImages.getSelectionModel().addListSelectionListener(
-				new ListSelectionListener() {
-					public void valueChanged(ListSelectionEvent e) {
+				new ListSelectionListener() 
+				{
+					public void valueChanged(ListSelectionEvent e) 
+					{	
 						
-						if (tablemyImages.getSelectedRow() != -1) {
-							
+						//tablemyImages.clearSelection();
+						//tablemyImages.setRowSelectionInterval(e.getLastIndex(), e.getLastIndex());
+						
+						if (tablemyImages.getSelectedRow() != -1) 
+						{	
 							//zeige die ganzen Details an
-							String imageid = modelMyImages
-									.getValueAt(
-											tablemyImages
-													.convertRowIndexToModel(tablemyImages
-															.getSelectedRow()),
-											6).toString();
-							String version = modelMyImages
-									.getValueAt(
-											tablemyImages
-													.convertRowIndexToModel(tablemyImages
-															.getSelectedRow()),
-											7).toString();
+							String imageid = modelMyImages.getValueAt(tablemyImages.convertRowIndexToModel(tablemyImages.getSelectedRow()),6).toString();
+							String version = modelMyImages.getValueAt(tablemyImages.convertRowIndexToModel(tablemyImages.getSelectedRow()),7).toString();
 							
 							//write the values into the information pane on the right hand side
 							writeImageData(imageid, version);
@@ -453,7 +449,19 @@ public class SearchEditImage_GUI extends JFrame {
 						}
 					}
 				});
+	
+		tablemyImages.addMouseListener(new MouseAdapter() {
+
+			@Override
+			public void mouseReleased(MouseEvent e) {
+
+				tablemyImages.clearSelection(); //just one row is selectable
+				tablemyImages.setRowSelectionInterval(tablemyImages.rowAtPoint(e.getPoint()), tablemyImages.rowAtPoint(e.getPoint())); 
+			}
+		});
+		
 		tablemyImages.setModel(modelMyImages);
+		tablemyImages.setSelectionMode(ListSelectionModel.SINGLE_INTERVAL_SELECTION);
 		tablemyImages.getColumnModel().getColumn(1).sizeWidthToFit();
 		tablemyImages.getColumnModel().getColumn(2).sizeWidthToFit();
 		tablemyImages.getColumnModel().getColumn(3).sizeWidthToFit();
-- 
cgit v1.2.3-55-g7522