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
---
 .../src/main/java/gui/image/SearchImage_GUI.java   | 44 +++++++++++++++++++---
 1 file changed, 38 insertions(+), 6 deletions(-)

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

diff --git a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
index f63ed9ed..7123275e 100644
--- a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
@@ -204,7 +204,17 @@ public class SearchImage_GUI extends JFrame {
 				tablemyImages.getColumnModel().getColumn(7).setMaxWidth(0);
 				tablemyImages.getColumnModel().getColumn(9).setWidth(0);
 				tablemyImages.getColumnModel().getColumn(9).setMinWidth(0);
-				tablemyImages.getColumnModel().getColumn(9).setMaxWidth(0);				
+				tablemyImages.getColumnModel().getColumn(9).setMaxWidth(0);	
+				
+				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())); 
+					}
+				});
 
 				tablePublicVorlagen.getColumnModel().getColumn(1).setWidth(0);
 				tablePublicVorlagen.getColumnModel().getColumn(1).setMinWidth(0);
@@ -223,7 +233,17 @@ public class SearchImage_GUI extends JFrame {
 				tablePublicVorlagen.getColumnModel().getColumn(7).setMaxWidth(0);
 				tablePublicVorlagen.getColumnModel().getColumn(9).setWidth(0);
 				tablePublicVorlagen.getColumnModel().getColumn(9).setMinWidth(0);
-				tablePublicVorlagen.getColumnModel().getColumn(9).setMaxWidth(0);				
+				tablePublicVorlagen.getColumnModel().getColumn(9).setMaxWidth(0);		
+				
+				tablePublicVorlagen.addMouseListener(new MouseAdapter() {
+
+					@Override
+					public void mouseReleased(MouseEvent e) {
+
+						tablePublicVorlagen.clearSelection(); //just one row is selectable
+						tablePublicVorlagen.setRowSelectionInterval(tablePublicVorlagen.rowAtPoint(e.getPoint()), tablePublicVorlagen.rowAtPoint(e.getPoint())); 
+					}
+				});
 
 				tableAllImages.getColumnModel().getColumn(1).setWidth(0);
 				tableAllImages.getColumnModel().getColumn(1).setMinWidth(0);
@@ -242,7 +262,17 @@ public class SearchImage_GUI extends JFrame {
 				tableAllImages.getColumnModel().getColumn(7).setMaxWidth(0);
 				tableAllImages.getColumnModel().getColumn(9).setWidth(0);
 				tableAllImages.getColumnModel().getColumn(9).setMinWidth(0);
-				tableAllImages.getColumnModel().getColumn(9).setMaxWidth(0);				
+				tableAllImages.getColumnModel().getColumn(9).setMaxWidth(0);
+				
+				tableAllImages.addMouseListener(new MouseAdapter() {
+
+					@Override
+					public void mouseReleased(MouseEvent e) {
+
+						tableAllImages.clearSelection(); //just one row is selectable
+						tableAllImages.setRowSelectionInterval(tableAllImages.rowAtPoint(e.getPoint()), tableAllImages.rowAtPoint(e.getPoint())); 
+					}
+				});
 				
 				textFieldName.requestFocusInWindow();
 			}
@@ -412,10 +442,12 @@ public class SearchImage_GUI extends JFrame {
 				else 
 				{
 					activeSearch = false;
+					/*
 					String username = person.verantwortlicher.getName() + " "
 							+ person.verantwortlicher.getVorname();
-					rowSorterMyImages.setRowFilter(RowFilter.regexFilter(username, 4));
-					rowSorterPublicVorlagen.setRowFilter(RowFilter.regexFilter("true", 8));
+					*/
+					rowSorterMyImages.setRowFilter(null);
+					rowSorterPublicVorlagen.setRowFilter(null);
 					rowSorterAll.setRowFilter(null);
 				}
 			}
@@ -1163,7 +1195,7 @@ public class SearchImage_GUI extends JFrame {
 			}
 			labelWeitereVerantwortliche.setToolTipText(labelWeitereVerantwortliche.getText());
 			
-			if(person.verantwortlicher.getRole() == "Student" && labelLizenzSoftware.getText().trim() == "Ja")
+			if(person.verantwortlicher.getRole().equals("Student") && res.get("license").equals("1"))
 			{
 				btnDownload.setEnabled(false);
 			}
-- 
cgit v1.2.3-55-g7522