[client] Support predefined filters in LDAP editor

1 files changed, 66 insertions, 23 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/LdapFilterConfigurator.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/LdapFilterConfigurator.java
index 3727b50e..3ba9e74d 100755
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/LdapFilterConfigurator.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/LdapFilterConfigurator.java
@@ -5,7 +5,9 @@ import java.awt.Insets;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import javax.swing.BorderFactory;
 import javax.swing.JButton;
@@ -23,10 +25,12 @@ import org.openslx.dozmod.gui.Gui;
 import org.openslx.dozmod.gui.changemonitor.DialogChangeMonitor;
 import org.openslx.dozmod.gui.control.QLabel;
 import org.openslx.dozmod.gui.control.WordWrapLabel;
+import org.openslx.dozmod.gui.control.table.CheckListTable.Wrapper;
 import org.openslx.dozmod.gui.control.table.LectureLdapFilterTable;
 import org.openslx.dozmod.gui.control.table.QScrollPane;
 import org.openslx.dozmod.gui.helper.GridManager;
 import org.openslx.dozmod.gui.helper.MessageType;
+import org.openslx.dozmod.thrift.cache.MetaDataCache;
 
 /**
  * Widget for network share configuration of lectures
@@ -35,7 +39,6 @@ public class LdapFilterConfigurator extends LdapFilterConfiguratorLayout {
 
 	private static final long serialVersionUID = -3336605759245603655L;
 	private final static Logger LOGGER = Logger.getLogger(LdapFilterConfigurator.class);
-	private List<LdapFilter> filterList = null;
 
 	public LdapFilterConfigurator() {
 
@@ -51,15 +54,19 @@ public class LdapFilterConfigurator extends LdapFilterConfiguratorLayout {
 		tblFilters.getSelectionModel().addListSelectionListener(new ListSelectionListener() {
 			@Override
 			public void valueChanged(ListSelectionEvent e) {
-				LdapFilter item = tblFilters.getSelectedItem();
+				LdapFilter item = tblFilters.getSelectedItem2();
 				if (item == null) {
 					clearInputFields();
 					return;
 				}
 				// share from the list is selected: fill bottom form and change "Add" to "Apply"
-				btnDel.setEnabled(true);
+				boolean editable = (item.filterId == 0);
 				txtAttribute.setText(item.attribute);
 				txtValue.setText(item.value);
+				txtAttribute.setEditable(editable);
+				txtValue.setEditable(editable);
+				btnAdd.setEnabled(editable);
+				btnDel.setEnabled(editable);
 				btnAdd.setText("Ändern");
 			}
 		});
@@ -81,21 +88,25 @@ public class LdapFilterConfigurator extends LdapFilterConfiguratorLayout {
 					input.value = "";
 				}
 				
+				Wrapper<LdapFilter> newEntry = new Wrapper<LdapFilter>(input, false);
+				List<Wrapper<LdapFilter>> oldList = tblFilters.getData();
+				
 				// either we delete the existing share from the data or we are
 				// creating a new one, either way add it to the list and update
 				// the table, if its not present already
-				if (filterList.contains(input)) {
+				if (oldList.contains(newEntry)) {
 					Gui.showMessageBox("Eintrag bereits vorhanden", MessageType.ERROR, null, null);
 					return;
 				}
 				// now decide whether to create a new entry or update existing one
-				LdapFilter oldEntry = tblFilters.getSelectedItem();
-				if (oldEntry != null) {
+				Wrapper<LdapFilter> oldEntry = tblFilters.getSelectedItem();
+				if (oldEntry != null && oldList.contains(oldEntry)) {
 					// editing existing one, delete it from the internal data
-					filterList.remove(oldEntry);
+					oldList = new ArrayList<>(oldList);
+					oldList.remove(oldEntry);
 				}
-				filterList.add(input);
-				tblFilters.setData(filterList, false);
+				oldList.add(newEntry);
+				tblFilters.setData(oldList, true);
 				clearInputFields();
 			}
 		});
@@ -104,19 +115,20 @@ public class LdapFilterConfigurator extends LdapFilterConfiguratorLayout {
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				// try to delete the selected share
-				LdapFilter selection = tblFilters.getSelectedItem();
+				Wrapper<LdapFilter> selection = tblFilters.getSelectedItem();
 				if (selection == null) {
 					return;
 				}
 				try {
-					if (!filterList.remove(selection)) {
+					List<Wrapper<LdapFilter>> oldList = tblFilters.getData();
+					if (!oldList.remove(selection)) {
 						// false if it was not found
 						LOGGER.error("Could not remove non-existent filter '" + selection.toString()
-								+ "' from the table data: " + filterList.toString());
+								+ "' from the table data: " + oldList.toString());
 						return;
 					}
 					// refresh table data
-					tblFilters.setData(filterList, false);
+					tblFilters.setData(oldList, true);
 				} catch (Exception ex) {
 					LOGGER.debug("Failed to remove " + selection.toString() + " from the table data.", ex);
 					return;
@@ -134,17 +146,49 @@ public class LdapFilterConfigurator extends LdapFilterConfiguratorLayout {
 	}
 
 	public List<LdapFilter> getState() {
-		return filterList;
+		List<Wrapper<LdapFilter>> current = tblFilters.getData();
+		ArrayList<LdapFilter> ret = new ArrayList<>(current.size());
+		for (Wrapper<LdapFilter> item : current) {
+			if (item.isChecked() || item.item.filterId == 0) {
+				ret.add(item.item);
+			}
+		}
+		return ret;
 	}
 
 	public boolean setState(List<LdapFilter> data) {
 		if (data == null)
 			return false;
-		if (filterList == null) {
-			filterList = new ArrayList<>();
+		ArrayList<LdapFilter> filterList = new ArrayList<>(data);
+		List<LdapFilter> predef = MetaDataCache.getPredefinedLdapFilters();
+		Set<LdapFilter> checked = new HashSet<>();
+		for (LdapFilter item : data) {
+			if (item.filterId == 0)
+				continue;
+			// Item has a filterId (is predefined), so validate it's in there
+			// before marking it checked, or just uncheck it by removing the id
+			// so it becomes a custom entry.
+			boolean ok = false;
+			for (LdapFilter pd : predef) {
+				if (pd.filterId == item.filterId) {
+					checked.add(pd);
+					ok = true;
+					break;
+				}
+			}
+			// If it wasn't preselected, add to list now...
+			if (!ok) {
+				item.filterId = 0;
+			}
+		}
+		// Now add remaining filters
+		for (LdapFilter pd : predef) {
+			if (!checked.contains(pd)) {
+				filterList.add(pd);
+				LOGGER.info("Adding " + pd.filterId);
+			}
 		}
-		filterList = data;
-		tblFilters.setData(filterList, false);
+		tblFilters.setData(filterList, checked, false);
 		return true;
 	}
 
@@ -200,18 +244,17 @@ class LdapFilterConfiguratorLayout extends JPanel {
 		grid.nextRow();
 
 		JPanel pnlNewShare = new JPanel();
-		GridManager gridNewFilter = new GridManager(pnlNewShare, 2, true);
-		pnlNewShare.setBorder(BorderFactory.createTitledBorder("Filter definieren"));
+		GridManager gridNewFilter = new GridManager(pnlNewShare, 3, true);
+		pnlNewShare.setBorder(BorderFactory.createTitledBorder("Eignen Filter definieren"));
 		gridNewFilter.add(new QLabel("Attribut"));
 		txtAttribute = new JTextField();
-		gridNewFilter.add(txtAttribute).fill(true, false).expand(true, false);
+		gridNewFilter.add(txtAttribute, 2).fill(true, false).expand(true, false);
 		gridNewFilter.nextRow();
 		gridNewFilter.add(new QLabel("Wert"));
 		txtValue = new JTextField();
 		gridNewFilter.add(txtValue).fill(true, false).expand(true, false);
-		gridNewFilter.nextRow();
 		btnAdd = new JButton("Hinzufügen");
-		gridNewFilter.add(btnAdd, 2).anchor(GridBagConstraints.EAST);
+		gridNewFilter.add(btnAdd).anchor(GridBagConstraints.EAST);
 		gridNewFilter.nextRow();
 		gridNewFilter.finish(false);
 		grid.add(pnlNewShare).fill(true, false).expand(true, false);