X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.district.selection.ui%2Fsrc%2Forg%2Fsimantics%2Fdistrict%2Fselection%2Fui%2FElementSelectorTableUI.java;fp=org.simantics.district.selection.ui%2Fsrc%2Forg%2Fsimantics%2Fdistrict%2Fselection%2Fui%2FElementSelectorTableUI.java;h=79602077b0bf96698a413f4a2d64091991e36f79;hb=aa1022a8c3aa858e3a9cddf00f6da13640e6fb66;hp=4603eb8eb58ee6dbc2ee45e4627bfe20e95c4687;hpb=52cc05171577e526bcdaa170ee5708b76b5be13a;p=simantics%2Fdistrict.git

diff --git a/org.simantics.district.selection.ui/src/org/simantics/district/selection/ui/ElementSelectorTableUI.java b/org.simantics.district.selection.ui/src/org/simantics/district/selection/ui/ElementSelectorTableUI.java
index 4603eb8e..79602077 100644
--- a/org.simantics.district.selection.ui/src/org/simantics/district/selection/ui/ElementSelectorTableUI.java
+++ b/org.simantics.district.selection.ui/src/org/simantics/district/selection/ui/ElementSelectorTableUI.java
@@ -6,13 +6,15 @@ import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.resource.JFaceResources;
 import org.eclipse.jface.resource.LocalResourceManager;
 import org.eclipse.jface.resource.ResourceManager;
+import org.eclipse.jface.viewers.CheckStateChangedEvent;
+import org.eclipse.jface.viewers.CheckboxTableViewer;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.jface.viewers.ColumnViewerToolTipSupport;
 import org.eclipse.jface.viewers.DoubleClickEvent;
+import org.eclipse.jface.viewers.ICheckStateListener;
 import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TableViewerColumn;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
@@ -36,7 +38,7 @@ public class ElementSelectorTableUI extends Composite {
 
 	private static final Logger LOGGER = LoggerFactory.getLogger(ElementSelectorTableUI.class);
 
-	private TableViewer viewer;
+	private CheckboxTableViewer viewer;
 
 	private ElementSelectionView view;
 
@@ -44,24 +46,40 @@ public class ElementSelectorTableUI extends Composite {
 
 	public ElementSelectorTableUI(Composite parent, int style, ElementSelectionView view) {
 		super(parent, style);
-		
+
 		resourceManager = new LocalResourceManager(JFaceResources.getResources(), this);
-		
+
 		this.view = view;
-		
+
 		parent.setLayout(new FillLayout());
-		//        GridDataFactory.fillDefaults().grab(true, true).applyTo(this);
-		//        GridLayoutFactory.fillDefaults().numColumns(1).applyTo(this);
+		// GridDataFactory.fillDefaults().grab(true, true).applyTo(this);
+		// GridLayoutFactory.fillDefaults().numColumns(1).applyTo(this);
 		this.setLayout(new FillLayout());
 
 		viewer = createViewer();
 		addSelectionListener();
+		addCheckStateListener();
 		setContentProvider();
 		createSelectorListener(parent);
 		enableToolTips();
 		configureTable();
 	}
 
+	private void addCheckStateListener() {
+		viewer.addCheckStateListener(new ICheckStateListener() {
+			
+			@Override
+			public void checkStateChanged(CheckStateChangedEvent event) {
+				boolean checked = event.getChecked();
+				if (checked) {
+					view.performSelection(getDisplay(), (ElementSelector) event.getElement());
+				} else {
+					view.clearResultVisualisation((ElementSelector) event.getElement());
+				}
+			}
+		});
+	}
+
 	public Table getTable() {
 		return viewer.getTable();
 	}
@@ -71,17 +89,18 @@ public class ElementSelectorTableUI extends Composite {
 		return selection != null ? (ElementSelector) selection.getFirstElement() : null;
 	}
 
-	private TableViewer createViewer() {
-		return new TableViewer(this, SWT.FULL_SELECTION | SWT.SINGLE);
+	private CheckboxTableViewer createViewer() {
+		return CheckboxTableViewer.newCheckList(this, SWT.FULL_SELECTION | SWT.SINGLE);
 	}
 
 	private void configureTable() {
-		Table table = viewer.getTable();
+		Table table = getTable();
 		table.setHeaderVisible(true);
 		table.setLinesVisible(true);
 
 		createNameColumn();
 		createQueryColumn();
+		//createQueryActiveColumn();
 	}
 
 	private void enableToolTips() {
@@ -94,8 +113,8 @@ public class ElementSelectorTableUI extends Composite {
 			public Object[] getElements(Object inputElement) {
 				if (inputElement == null || !(inputElement instanceof Collection))
 					return new Object[0];
-				
-				return ((Collection<?>)inputElement).toArray();
+
+				return ((Collection<?>) inputElement).toArray();
 			}
 		});
 	}
@@ -111,18 +130,18 @@ public class ElementSelectorTableUI extends Composite {
 				ElementSelector selector = (ElementSelector) element;
 				return " " + selector.getName();
 			}
-			
+
 			@Override
 			public Image getImage(Object element) {
 				ElementSelector selector = (ElementSelector) element;
 				float[] color = selector.getColor();
 				if (color == null)
 					return null;
-				
+
 				RGB rgb = ElementSelectionTools.literalToColor(color).getRgb();
-				
+
 				PaletteData paletteData = new PaletteData(new RGB[] { new RGB(255, 255, 255), rgb });
-				
+
 				// Create image with a colored horizontal bar
 				// TODO: Indicate line width
 				Image image = resourceManager.createImage(ImageDescriptor.createFromImageDataProvider(zoom -> {
@@ -134,10 +153,10 @@ public class ElementSelectorTableUI extends Composite {
 							imageData.setPixel(x, y, 1);
 						}
 					}
-					
+
 					return imageData;
 				}));
-				
+
 				return image;
 			}
 		});
@@ -160,23 +179,24 @@ public class ElementSelectorTableUI extends Composite {
 	}
 
 	private void createSelectorListener(Composite parent) {
-		Simantics.getSession().asyncRequest(new ElementSelectionTools.SelectionsRequest(), new SyncListenerAdapter<Collection<ElementSelector>>() {
-			public void execute(ReadGraph graph, Collection<ElementSelector> result) {
-				parent.getDisplay().asyncExec(() -> {
-					viewer.setInput(result);
-				});
-			}
+		Simantics.getSession().asyncRequest(new ElementSelectionTools.SelectionsRequest(),
+				new SyncListenerAdapter<Collection<ElementSelector>>() {
+					public void execute(ReadGraph graph, Collection<ElementSelector> result) {
+						parent.getDisplay().asyncExec(() -> {
+							viewer.setInput(result);
+						});
+					}
 
-			@Override
-			public void exception(ReadGraph graph, Throwable t) throws DatabaseException {
-				LOGGER.error("Error getting element selector list", t);
-			}
+					@Override
+					public void exception(ReadGraph graph, Throwable t) throws DatabaseException {
+						LOGGER.error("Error getting element selector list", t);
+					}
 
-			@Override
-			public boolean isDisposed() {
-				return ElementSelectorTableUI.this.isDisposed();
-			}
-		});
+					@Override
+					public boolean isDisposed() {
+						return ElementSelectorTableUI.this.isDisposed();
+					}
+				});
 	}
 
 	private void addSelectionListener() {
@@ -189,8 +209,16 @@ public class ElementSelectorTableUI extends Composite {
 			IStructuredSelection selection = (IStructuredSelection) event.getViewer().getSelection();
 			Display display = event.getViewer().getControl().getDisplay();
 			ElementSelector query = (ElementSelector) selection.getFirstElement();
-			
+
 			view.performSelection(display, query);
+			
+			viewer.setChecked(selection.getFirstElement(), true);
 		}
 	}
+	
+	@Override
+	public void dispose() {
+		view.dispose();
+		super.dispose();
+	}
 }