added autocomplete and autocheck for setting new image rights

1 files changed, 53 insertions, 12 deletions

diff --git a/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java b/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
index a877cc59..cbbcbdd9 100644
--- a/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
@@ -3,6 +3,7 @@ package gui.image;
 import gui.intro.About_GUI;
 import gui.intro.Login_GUI;
 import gui.intro.MainMenue_GUI;
+
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.FlowLayout;
@@ -22,6 +23,7 @@ import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+
 import javax.swing.AbstractButton;
 import javax.swing.DefaultComboBoxModel;
 import javax.swing.JButton;
@@ -49,21 +51,19 @@ import javax.swing.table.JTableHeader;
 import javax.swing.table.TableCellRenderer;
 import javax.swing.table.TableColumn;
 import javax.swing.table.TableColumnModel;
+
 import models.Image;
 import models.Links;
 import models.RightsManagement;
 import models.person;
+
 import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
-import server.generated.Person;
-
 
+import server.generated.Person;
 import server.generated.Server.Client;
-import util.GuiOrganizer;
-
+import util.CheckIntegrity;
 import util.OpenLinks;
-import java.beans.PropertyChangeListener;
-import java.beans.PropertyChangeEvent;
 
 @SuppressWarnings("serial")
 public class PermissionCreateImage_GUI extends JFrame {
@@ -144,10 +144,10 @@ public class PermissionCreateImage_GUI extends JFrame {
 		//System.out.println("formergui X oben:"+formerGUI.getLocation().getX());
 		//System.out.println("formergui Y oben:"+formerGUI.getLocation().getY());
 		
-		System.out.println("this oben: "+this.getLocation().getX());
-		System.out.println("this oben: "+this.getLocation().getY());
+		//System.out.println("this oben: "+this.getLocation().getX());
+		//System.out.println("this oben: "+this.getLocation().getY());
 		
-		System.out.println("------------------------------------------");
+		//System.out.println("------------------------------------------");
 
 		getContentPane().setLayout(null);
 		{
@@ -193,16 +193,20 @@ public class PermissionCreateImage_GUI extends JFrame {
 		panel_1.add(scrollPane);
 
 		table = new JTable();
-		table.addMouseListener(new MouseAdapter() {
+		table.addMouseListener(new MouseAdapter() 
+		{
 			@Override
-			public void mouseClicked(MouseEvent e) {
-				System.out.println("Mouse clicked");
+			public void mouseClicked(MouseEvent e) 
+			{
+				checkIntegrity(-1);
 			}
+
 		});
 		
 		table.setModel(model);
 		table.setSelectionForeground(Color.WHITE);
 
+		
 		// invisible attribute userID for identifying selected user
 		table.getColumnModel().getColumn(5).setWidth(0);
 		table.getColumnModel().getColumn(5).setMinWidth(0);
@@ -458,6 +462,13 @@ public class PermissionCreateImage_GUI extends JFrame {
 				JButton continueButton = new JButton("Weiter");
 				continueButton.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
+						
+						//before save, check integrity to avoid dblClick errors of rights
+						for(int i = 0; i < table.getRowCount(); i++)
+						{
+							checkIntegrity(i); //check integrity of each line again
+							System.out.println("in auto-correct");
+						}
 
 						saveTableToList();
 
@@ -565,6 +576,36 @@ public class PermissionCreateImage_GUI extends JFrame {
 		//System.out.println("this on screen unten X: "+this.getLocationOnScreen().getX());
 		//System.out.println("this on screen unten Y: "+this.getLocationOnScreen().getY());
 	}
+	
+	private void checkIntegrity(int row) 
+	{
+		
+		int selectedRow;
+		
+		if(row == -1)
+		{
+			selectedRow = table.getSelectedRow();
+		}
+		else
+		{
+			selectedRow = row;
+		}
+		
+		boolean isRead, isWrite, isLink, isAdmin;
+		
+		//collect all row data
+		isRead  = (boolean) table.getValueAt(selectedRow, 1);
+		isWrite = (boolean) table.getValueAt(selectedRow, 2);
+		isLink  = (boolean) table.getValueAt(selectedRow, 3);
+		isAdmin = (boolean) table.getValueAt(selectedRow, 4);
+		
+		boolean[] checkedVals = CheckIntegrity.isIntegre(isRead, isWrite, isLink, isAdmin);
+		
+		table.setValueAt(checkedVals[0], selectedRow, 1);
+		table.setValueAt(checkedVals[1], selectedRow, 2);
+		table.setValueAt(checkedVals[2], selectedRow, 3);
+		table.setValueAt(checkedVals[3], selectedRow, 4);
+	}
 
 	// Read column
 	class MyItemListener1 implements ItemListener {