Filter button on resultset columns.

bundles/org.jkiss.utils/.classpath

-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

bundles/org.jkiss.wmi/.classpath

-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-	<classpathentry kind="src" path="src/java"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src/java"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

nls/bundles/org.jkiss.dbeaver.ext.postgresql.nls/.classpath

-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

plugins/org.jkiss.dbeaver.core.application/.classpath

-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

plugins/org.jkiss.dbeaver.core.eclipse/.classpath

-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="target/classes/"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="target/classes/"/>
+</classpath>

plugins/org.jkiss.dbeaver.core/.classpath

-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="target/classes/"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="output" path="target/classes/"/>
+</classpath>

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/lightgrid/GridColumn.java

@@ -41,8 +41,8 @@ class GridColumn {
 	 */
 	private static final int DEFAULT_WIDTH = 10;
 
-    private static final int topMargin = 3;
-    private static final int bottomMargin = 3;
+    private static final int topMargin = 6;
+    private static final int bottomMargin = 6;
     private static final int leftMargin = 6;
     private static final int rightMargin = 6;
     private static final int imageSpacing = 3;
@@ -114,6 +114,23 @@ class GridColumn {
 		}
 	}
 
+	
+	
+	public boolean isOverFilterButton (int x, int y) {
+		 Rectangle bounds = getBounds();
+	        if (y < bounds.y || y > bounds.y + bounds.height) {
+	            return false;
+	        }
+        Rectangle sortBounds = GridColumnRenderer.getSortControlBounds();
+        Rectangle filterBounds = GridColumnRenderer.getFilterControlBounds();
+        
+		int filterEnd = bounds.width - rightMargin - sortBounds.width;
+		int filterBegin = filterEnd - filterBounds.width;
+		
+		return  x >= filterBegin && x <= filterEnd && y < bounds.y + sortBounds.height;
+	}
+	
+	
     public boolean isOverSortArrow(int x, int y)
     {
         if (!isSortable()) {
@@ -203,6 +220,8 @@ class GridColumn {
             x += rightMargin + GridColumnRenderer.getSortControlBounds().width;
         }
 
+        x+= GridColumnRenderer.getFilterControlBounds().width;
+        
         if (!CommonUtils.isEmpty(children)) {
             int childWidth = 0;
             for (GridColumn child : children) {

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/lightgrid/GridColumnRenderer.java

@@ -35,15 +35,19 @@ class GridColumnRenderer extends AbstractRenderer
 {
     public static final int LEFT_MARGIN = 6;
     public static final int RIGHT_MARGIN = 6;
-    public static final int BOTTOM_MARGIN = 3;
-    public static final int TOP_MARGIN = 3;
+    public static final int BOTTOM_MARGIN = 6;
+    public static final int TOP_MARGIN = 6;
     public static final int ARROW_MARGIN = 6;
     public static final int IMAGE_SPACING = 3;
 
     public static final Image IMAGE_ASTERISK = DBeaverIcons.getImage(UIIcon.SORT_UNKNOWN);
     public static final Image IMAGE_DESC = DBeaverIcons.getImage(UIIcon.SORT_DECREASE);
     public static final Image IMAGE_ASC = DBeaverIcons.getImage(UIIcon.SORT_INCREASE);
+    public static final Image IMAGE_FILTER = DBeaverIcons.getImage(UIIcon.FILTER);
     public static final int SORT_WIDTH = 16;
+    public static final int FILTER_WIDTH = 16;
+    
+    
 
     public  GridColumnRenderer(LightGrid grid) {
         super(grid);
@@ -52,6 +56,10 @@ class GridColumnRenderer extends AbstractRenderer
     public static Rectangle getSortControlBounds() {
         return IMAGE_DESC.getBounds();
     }
+    
+    public static Rectangle getFilterControlBounds() {
+    	return IMAGE_FILTER.getBounds();
+    }
 
     @Nullable
     protected Image getColumnImage(Object element) {
@@ -78,6 +86,7 @@ class GridColumnRenderer extends AbstractRenderer
         //AbstractRenderer arrowRenderer = col.getSortRenderer();
         int sortOrder = grid.getContentProvider().getSortOrder(element);
         Rectangle sortBounds = getSortControlBounds();
+        Rectangle filterBounds = getFilterControlBounds();
 
         // set the font to be used to display the text.
         gc.setFont(getColumnFont(element));
@@ -117,7 +126,7 @@ class GridColumnRenderer extends AbstractRenderer
         } else {
             width -= ARROW_MARGIN + sortBounds.width + ARROW_MARGIN;
         }
-
+        width -= filterBounds.width;
         //gc.setForeground(getDisplay().getSystemColor(SWT.COLOR_WIDGET_FOREGROUND));
 
         int y = bounds.y + TOP_MARGIN;
@@ -139,6 +148,11 @@ class GridColumnRenderer extends AbstractRenderer
                 sortBounds.y = y;
             }
             paintSort(gc, sortBounds, sortOrder);
+            
+            filterBounds.x = bounds.x + bounds.width - ARROW_MARGIN - filterBounds.width - sortBounds.width +1 ;
+            filterBounds.y = y;
+            
+            gc.drawImage(IMAGE_FILTER, filterBounds.x, filterBounds.y);
         }
 
         {
@@ -237,5 +251,4 @@ class GridColumnRenderer extends AbstractRenderer
         }
 */
     }
-
 }

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/lightgrid/LightGrid.java

@@ -54,6 +54,7 @@ public abstract class LightGrid extends Canvas {
 
     protected static final int Event_ChangeSort = 1000;
     protected static final int Event_NavigateLink = 1001;
+    protected static final int Event_FilterColumn = 1002;
 
     /**
      * Horizontal scrolling increment, in pixels.
@@ -219,9 +220,11 @@ public abstract class LightGrid extends Canvas {
 
     private boolean hoveringOnHeader = false;
     private boolean hoveringOnColumnSorter = false;
+    private boolean hoveringOnColumnFilter = false;
     private boolean hoveringOnLink = false;
 
     private GridColumn columnBeingSorted;
+    private GridColumn columnBeingFiltered;
     private boolean hoveringOnColumnResizer = false;
     private GridColumn columnBeingResized;
     private boolean resizingColumn = false;
@@ -1920,7 +1923,7 @@ public abstract class LightGrid extends Canvas {
      */
     private void handleHoverOnColumnHeader(int x, int y)
     {
-        boolean overSorter = false, overResizer = false;
+        boolean overSorter = false, overResizer = false, overFilter = false;
         hoveringOnHeader = false;
         if (y <= headerHeight) {
             int x2 = 0;
@@ -1933,12 +1936,16 @@ public abstract class LightGrid extends Canvas {
 
             if (x < x2) {
                 int ltSort = getContentProvider().getSortOrder(null);
-                if (ltSort != SWT.NONE && x > x2 - GridColumnRenderer.SORT_WIDTH - GridColumnRenderer.ARROW_MARGIN && x < x2 - GridColumnRenderer.ARROW_MARGIN &&
-                    y > GridColumnRenderer.TOP_MARGIN)
+                if (ltSort != SWT.NONE 
+                		&& x > x2 - GridColumnRenderer.SORT_WIDTH - GridColumnRenderer.ARROW_MARGIN 
+                		&& x < x2 - GridColumnRenderer.ARROW_MARGIN 
+                		&& y > GridColumnRenderer.TOP_MARGIN)
                 {
                     columnBeingSorted = null;
                     overSorter = true;
                 }
+
+                
             } else {
                 if (x > getRowHeaderWidth()) {
                     for (GridColumn column : columns) {
@@ -1949,6 +1956,13 @@ public abstract class LightGrid extends Canvas {
                                 columnBeingSorted = column;
                                 break;
                             }
+                            
+                            if(column.isOverFilterButton(x - x2, y)) {
+                            	columnBeingFiltered = column;
+                            	overFilter = true;
+                            	break;
+                            }
+                            
                             x2 += column.getWidth();
                             if (x2 >= (x - COLUMN_RESIZER_THRESHOLD) && x2 <= (x + COLUMN_RESIZER_THRESHOLD)) {
                                 overResizer = true;
@@ -1982,6 +1996,18 @@ public abstract class LightGrid extends Canvas {
             }
             hoveringOnColumnSorter = overSorter;
         }
+        
+        if(overFilter != hoveringOnColumnFilter) {
+        	if(overFilter) 
+        		setCursor(sortCursor);        	
+        	else if(!overSorter) {
+        		columnBeingFiltered = null;
+        		setCursor(null);
+        	}
+        		
+        	hoveringOnColumnFilter = overFilter;
+        }
+        
         if (overResizer != hoveringOnColumnResizer) {
             if (overResizer) {
                 setCursor(getDisplay().getSystemCursor(SWT.CURSOR_SIZEWE));
@@ -1994,7 +2020,7 @@ public abstract class LightGrid extends Canvas {
             hoveringOnColumnResizer = overResizer;
         }
 
-        if (hoveringOnHeader && !overSorter && !overResizer) {
+        if (hoveringOnHeader && !overSorter && !overResizer && !overFilter) {
             hoveringOnHeaderDragArea = true;
         } else {
             hoveringOnHeaderDragArea = false;
@@ -2764,6 +2790,14 @@ public abstract class LightGrid extends Canvas {
                 return;
             }
         }
+        
+        if(hoveringOnColumnFilter) {
+        	handleHoverOnColumnHeader(e.x, e.y);
+        	 if (hoveringOnColumnFilter) {
+                 return;
+             }
+        }
+        
         if (hoveringOnColumnResizer) {
             if (e.button == 1) {
                 resizingColumn = true;
@@ -3034,6 +3068,25 @@ public abstract class LightGrid extends Canvas {
                 }
             }
         }
+        
+        
+        if(hoveringOnColumnFilter) {
+        	handleHoverOnColumnHeader(e.x, e.y);
+        	 if(hoveringOnColumnFilter) {
+        		 if (e.button == 1) {
+                     Event event = new Event();
+                     event.x = e.x;
+                     event.y = e.y;
+                     event.data = columnBeingFiltered == null ? null : columnBeingFiltered.getElement();
+                     event.stateMask = e.stateMask;
+                     notifyListeners(Event_FilterColumn, event);
+                     return;
+                 }
+        		 
+        	 }
+        }
+        
+        
         if (resizingColumn) {
             resizingColumn = false;
             handleHoverOnColumnHeader(e.x, e.y); // resets cursor if

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/CustomCheckboxCombo.java

+package org.jkiss.dbeaver.ui.controls.resultset;
+
+
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.regex.Pattern;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.viewers.CheckboxTableViewer;
+import org.eclipse.jface.viewers.ColumnLabelProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.SWTException;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.TableItem;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.swt.widgets.Widget;
+import org.jkiss.code.NotNull;
+import org.jkiss.code.Nullable;
+import org.jkiss.dbeaver.DBException;
+import org.jkiss.dbeaver.core.DBeaverUI;
+import org.jkiss.dbeaver.model.DBPDataKind;
+import org.jkiss.dbeaver.model.DBUtils;
+import org.jkiss.dbeaver.model.DBValueFormatting;
+import org.jkiss.dbeaver.model.data.DBDAttributeBinding;
+import org.jkiss.dbeaver.model.data.DBDDisplayFormat;
+import org.jkiss.dbeaver.model.data.DBDLabelValuePair;
+import org.jkiss.dbeaver.model.exec.DBCExecutionContext;
+import org.jkiss.dbeaver.model.exec.DBCLogicalOperator;
+import org.jkiss.dbeaver.model.exec.DBCSession;
+import org.jkiss.dbeaver.model.runtime.AbstractJob;
+import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
+import org.jkiss.dbeaver.model.sql.SQLUtils;
+import org.jkiss.dbeaver.model.struct.DBSAttributeEnumerable;
+import org.jkiss.dbeaver.model.struct.DBSEntityReferrer;
+import org.jkiss.dbeaver.ui.UIUtils;
+import org.jkiss.dbeaver.ui.controls.ListContentProvider;
+import org.jkiss.dbeaver.ui.controls.ViewerColumnController;
+import org.jkiss.dbeaver.ui.data.editors.ReferenceValueEditor;
+import org.jkiss.dbeaver.utils.GeneralUtils;
+import org.jkiss.utils.CommonUtils;
+
+public class CustomCheckboxCombo extends Composite {
+	
+
+
+
+	 public static final int MAX_MULTI_VALUES = 1000;
+	 public static final String MULTI_KEY_LABEL = "...";
+	@NotNull
+    private final ResultSetViewer viewer;
+    @NotNull
+    private final DBDAttributeBinding attr;
+    @NotNull
+    private final ResultSetRow[] rows;
+    @NotNull
+    private final DBCLogicalOperator operator = DBCLogicalOperator.IN;
+    private CheckboxTableViewer table;
+    private String filterPattern;
+    private KeyLoadJob loadJob;
+    private Shell shell;
+
+
+	
+    /**
+    *
+    * Constructs a new instance of this class given its parent, a style value describing its behavior and appearance, and default text
+    *
+    * The style value is either one of the style constants defined in class SWT which is applicable to instances of this class, or must be built by bitwise OR'ing together (that is, using the int "|" operator) two or more of those SWT style constants. The class description lists the style constants that are applicable to the class. Style bits are also inherited from superclasses.
+    * 
+    * The default text is displayed when no options are selected.
+    * 
+    * @param parent a composite control which will be the parent of the new instance (cannot be null)
+    * @param style the style of control to construct
+    * @param trigger the Control listening for a mousedown to show the combo
+    * @throws IllegalArgumentException if the parent is null
+    * @throws IllegalArgumentException if the defaultText is null
+    * @throws SWTException if not called from the thread that created the parent
+    * @since version 1.0.0.0
+    */
+	public CustomCheckboxCombo(Composite parent, int style, @Nullable Control trigger,@NotNull ResultSetViewer viewer, @NotNull DBDAttributeBinding attr, @NotNull ResultSetRow[] rows) {
+		super(parent, style);		
+		this.attr = attr;
+		this.rows = rows;
+		this.viewer = viewer;
+		init(trigger);
+	}
+	
+	private void init(Control trigger) {
+
+		initFloatShell();
+		if(trigger != null) {
+			trigger.addListener(SWT.MouseDown, e -> {
+				setVisible(true);
+		    });
+		}
+	    
+	}
+
+
+	public void setLocation(Point location) {
+		shell.setLocation(location);
+	}
+	
+	public void setVisible(boolean v) {		
+		shell.setVisible(v);
+	}
+	
+
+	
+	private void initFloatShell() {		
+		shell = new Shell(CustomCheckboxCombo.this.getShell(), SWT.BORDER);
+		shell.setLayout(new GridLayout());
+	   
+		
+		
+	   	shell.addListener(SWT.Deactivate, e-> {
+       	 if (shell != null && !shell.isDisposed()) {
+    		 shell.setVisible(false);
+    		 //shell.close(); 	
+    		 shell.dispose();
+    	 }
+	   	});
+		
+	   	createMultiValueSelector(shell);
+	   	shell.pack();
+	   	
+	   	setVisible(false);
+	}
+	
+
+	private void createMultiValueSelector(Composite composite) {
+        table = CheckboxTableViewer.newCheckList(composite, SWT.BORDER | SWT.MULTI | SWT.CHECK | SWT.FULL_SELECTION);
+        table.getTable().setLinesVisible(true);
+        table.getTable().setHeaderVisible(false);
+        GridData gd = new GridData(GridData.FILL_BOTH);
+        gd.widthHint = 400;
+        gd.heightHint = 300;
+        table.getTable().setLayoutData(gd);
+        table.setContentProvider(new ListContentProvider());
+
+        
+        
+        ViewerColumnController columnController = new ViewerColumnController(getClass().getName(), table);
+        columnController.addColumn("Value", "Value", SWT.LEFT, true, true, new ColumnLabelProvider() {
+            @Override
+            public String getText(Object element) {
+                return attr.getValueHandler().getValueDisplayString(attr, ((DBDLabelValuePair)element).getValue(), DBDDisplayFormat.UI);
+            }
+        });
+     
+        columnController.createColumns();
+
+        table.getTable().getColumn(0).setWidth(300);
+        
+        MenuManager menuMgr = new MenuManager();
+        menuMgr.addMenuListener(new IMenuListener() {
+            @Override
+            public void menuAboutToShow(IMenuManager manager)
+            {
+                UIUtils.fillDefaultTableContextMenu(manager, table.getTable());
+                manager.add(new Separator());
+                manager.add(new Action("Select &All") {
+                    @Override
+                    public void run() {
+                        for (DBDLabelValuePair row : getMultiValues()) {
+                            table.setChecked(row, true);
+                        }
+                    }
+                });
+                manager.add(new Action("Select &None") {
+                    @Override
+                    public void run() {
+                        for (DBDLabelValuePair row : getMultiValues()) {
+                            table.setChecked(row, false);
+                        }
+                    }
+                });
+            }
+        });
+        menuMgr.setRemoveAllWhenShown(true);
+        table.getTable().setMenu(menuMgr.createContextMenu(table.getTable()));
+
+        if (attr.getDataKind() == DBPDataKind.STRING) {
+            // Create filter text
+            final Text valueFilterText = new Text(composite, SWT.BORDER);
+            valueFilterText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+            valueFilterText.addModifyListener(new ModifyListener() {
+                @Override
+                public void modifyText(ModifyEvent e) {
+                    filterPattern = valueFilterText.getText();
+                    if (filterPattern.isEmpty()) {
+                        filterPattern = null;
+                    }
+                    loadValues();
+                }
+            });
+        }
+
+        filterPattern = null;
+        loadValues();
+    }
+
+  
+	private Collection<DBDLabelValuePair> getMultiValues() {
+        return (Collection<DBDLabelValuePair>)table.getInput();
+    }
+	
+	
+	private void loadValues() {
+        if (loadJob != null) {
+            if (loadJob.getState() == Job.RUNNING) {
+                loadJob.cancel();
+            }
+            loadJob.schedule(100);
+            return;
+        }
+        // Load values
+        final DBSEntityReferrer enumerableConstraint = ReferenceValueEditor.getEnumerableConstraint(attr);
+       
+        loadAttributeEnum((DBSAttributeEnumerable) attr.getEntityAttribute());
+       
+    }
+
+	private void loadAttributeEnum(final DBSAttributeEnumerable attributeEnumerable) {
+        //table.getTable().getColumn(1).setText("Count");
+        loadJob = new KeyLoadJob("Load '" + attr.getName() + "' values") {
+            @Override
+            protected Collection<DBDLabelValuePair> readEnumeration(DBCSession session) throws DBException {
+                return attributeEnumerable.getValueEnumeration(session, filterPattern, MAX_MULTI_VALUES);
+            }
+        };
+        loadJob.schedule();
+    }
+
+	 private void loadMultiValueList(@NotNull Collection<DBDLabelValuePair> values) {
+	        Pattern pattern = null;
+	        if (!CommonUtils.isEmpty(filterPattern)) {
+	            pattern = Pattern.compile(SQLUtils.makeLikePattern("%" + filterPattern + "%"), Pattern.CASE_INSENSITIVE);
+	        }
+
+	        // Get all values from actual RSV data
+	        boolean hasNulls = false;
+	        java.util.Map<Object, DBDLabelValuePair> rowData = new HashMap<>();
+	        for (DBDLabelValuePair pair : values) {
+	            final DBDLabelValuePair oldLabel = rowData.get(pair.getValue());
+	            if (oldLabel != null) {
+	                // Duplicate label for single key - may happen in case of composite foreign keys
+	                String multiLabel = oldLabel.getLabel() + "," + pair.getLabel();
+	                if (multiLabel.length() > 200) {
+	                    multiLabel = multiLabel.substring(0, 200) + MULTI_KEY_LABEL;
+	                }
+	                rowData.put(pair.getValue(), new DBDLabelValuePair(multiLabel, pair.getValue()));
+	            } else{
+	                rowData.put(pair.getValue(), pair);
+	            }
+	        }
+	        // Add values from fetched rows
+	        for (ResultSetRow row : viewer.getModel().getAllRows()) {
+	            Object cellValue = viewer.getModel().getCellValue(attr, row);
+	            if (DBUtils.isNullValue(cellValue)) {
+	                hasNulls = true;
+	                continue;
+	            }
+	            if (!rowData.containsKey(cellValue)) {
+	                String itemString = attr.getValueHandler().getValueDisplayString(attr, cellValue, DBDDisplayFormat.UI);
+	                rowData.put(cellValue, new DBDLabelValuePair(itemString, cellValue));
+	            }
+	        }
+
+	        java.util.List<DBDLabelValuePair> sortedList = new ArrayList<>(rowData.values());
+	        Collections.sort(sortedList);
+	        if (pattern != null) {
+	            for (Iterator<DBDLabelValuePair> iter = sortedList.iterator(); iter.hasNext(); ) {
+	                final DBDLabelValuePair valuePair = iter.next();
+	                String itemString = attr.getValueHandler().getValueDisplayString(attr, valuePair.getValue(), DBDDisplayFormat.UI);
+	                if (!pattern.matcher(itemString).matches() && (valuePair.getLabel() == null || !pattern.matcher(valuePair.getLabel()).matches())) {
+	                    iter.remove();
+	                }
+	            }
+	        }
+	        Collections.sort(sortedList);
+	        if (hasNulls) {
+	            sortedList.add(0, new DBDLabelValuePair(DBValueFormatting.getDefaultValueDisplayString(null, DBDDisplayFormat.UI), null));
+	        }
+
+	        Set<Object> checkedValues = new HashSet<>();
+	        for (ResultSetRow row : rows) {
+	            Object value = viewer.getModel().getCellValue(attr, row);
+	            checkedValues.add(value);
+	        }
+
+	        table.setInput(sortedList);
+	        DBDLabelValuePair firstVisibleItem = null;
+	        for (DBDLabelValuePair row : sortedList) {
+	            Object cellValue = row.getValue();
+
+	            if (checkedValues.contains(cellValue)) {
+	                table.setChecked(row, true);
+	                if (firstVisibleItem == null) {
+	                    firstVisibleItem = row;
+	                }
+	            }
+	        }
+	        ViewerColumnController.getFromControl(table.getTable()).repackColumns();
+	        if (firstVisibleItem != null) {
+	            final Widget item = table.testFindItem(firstVisibleItem);
+	            if (item != null) {
+	                table.getTable().setSelection((TableItem) item);
+	                table.getTable().showItem((TableItem) item);
+	            }
+	        }
+	    }
+
+   
+
+
+	private abstract class KeyLoadJob extends AbstractJob {
+        protected KeyLoadJob(String name) {
+            super(name);
+        }
+
+        @Override
+        protected IStatus run(DBRProgressMonitor monitor) {
+            final DBCExecutionContext executionContext = viewer.getExecutionContext();
+            if (executionContext == null) {
+                return Status.OK_STATUS;
+            }
+            try (DBCSession session = DBUtils.openUtilSession(monitor, executionContext.getDataSource(), "Read value enumeration")) {
+                final Collection<DBDLabelValuePair> valueEnumeration = readEnumeration(session);
+                if (valueEnumeration == null) {
+                    return Status.OK_STATUS;
+                } else {
+                    populateValues(valueEnumeration);
+                }
+            } catch (DBException e) {
+                populateValues(Collections.<DBDLabelValuePair>emptyList());
+                return GeneralUtils.makeExceptionStatus(e);
+            }
+            return Status.OK_STATUS;
+        }
+
+        @Nullable
+        protected abstract Collection<DBDLabelValuePair> readEnumeration(DBCSession session) throws DBException;
+
+        protected void populateValues(@NotNull final Collection<DBDLabelValuePair> values) {
+            DBeaverUI.asyncExec(new Runnable() {
+                @Override
+                public void run() {
+                    loadMultiValueList(values);
+                }
+            });
+        }
+    }
+
+	
+}

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetCommandHandler.java

@@ -100,6 +100,7 @@ public class ResultSetCommandHandler extends AbstractHandler {
     public static final String CMD_GENERATE_SCRIPT = "org.jkiss.dbeaver.core.resultset.generateScript";
     public static final String CMD_NAVIGATE_LINK = "org.jkiss.dbeaver.core.resultset.navigateLink";
     public static final String CMD_FILTER_MENU = "org.jkiss.dbeaver.core.resultset.filterMenu";
+    public static final String CMD_FILTERDISTINCT = "org.jkiss.dbeaver.core.resultset.filterDistinct";
     public static final String CMD_REFERENCES_MENU = "org.jkiss.dbeaver.core.resultset.referencesMenu";
     public static final String CMD_COPY_COLUMN_NAMES = "org.jkiss.dbeaver.core.resultset.grid.copyColumnNames";
     public static final String CMD_COPY_ROW_NAMES = "org.jkiss.dbeaver.core.resultset.grid.copyRowNames";
@@ -409,6 +410,12 @@ public class ResultSetCommandHandler extends AbstractHandler {
                 rsv.showFiltersMenu();
                 break;
             }
+            case CMD_FILTERDISTINCT: {
+            	event.getParameters();
+            	Event sourceEvent = (Event)event.getTrigger();
+            	rsv.showDistinctFilter((DBDAttributeBinding)sourceEvent.data);
+            	break;
+            }
             case CMD_REFERENCES_MENU: {
                 rsv.showReferencesMenu();
                 break;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java

@@ -1587,6 +1587,24 @@ public class ResultSetViewer extends Viewer
         showContextMenuAtCursor(menuManager);
     }
 
+    void showDistinctFilter(DBDAttributeBinding curAttribute) { 	
+    	
+		 ResultSetRow[] rows = null;
+	     Collection<ResultSetRow> selectedRows = getSelection().getSelectedRows();
+	     rows = selectedRows.toArray(new ResultSetRow[selectedRows.size()]);
+	   
+	     
+	     CustomCheckboxCombo combo = new CustomCheckboxCombo(getSite().getShell(), SWT.NONE, null, ResultSetViewer.this, curAttribute, rows);
+	     
+	     Point cursorLocation = getActivePresentation().getCursorLocation();
+	     Control control = getActivePresentation().getControl();
+	     Point location = control.getDisplay().map(control, null, cursorLocation);
+	     combo.setLocation(location);
+	     combo.setVisible(true);
+        
+    }
+    
+    
     void showReferencesMenu() {
         ResultSetRow currentRow = getCurrentRow();
         if (currentRow == null || currentRow.getRowNumber() < 0) {

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/spreadsheet/Spreadsheet.java

@@ -19,6 +19,7 @@ package org.jkiss.dbeaver.ui.controls.resultset.spreadsheet;
 import org.eclipse.jface.action.IMenuListener;
 import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.accessibility.Accessible;
 import org.eclipse.swt.accessibility.AccessibleEvent;
@@ -39,6 +40,7 @@ import org.jkiss.dbeaver.core.DBeaverUI;
 import org.jkiss.dbeaver.model.data.DBDAttributeBinding;
 import org.jkiss.dbeaver.ui.controls.lightgrid.*;
 import org.jkiss.dbeaver.ui.controls.resultset.AbstractPresentation;
+import org.jkiss.dbeaver.ui.controls.resultset.ResultSetViewer;
 
 /**
  * ResultSetControl
@@ -107,6 +109,7 @@ public class Spreadsheet extends LightGrid implements Listener {
         super.addListener(SWT.KeyUp, this);
         super.addListener(LightGrid.Event_ChangeSort, this);
         super.addListener(LightGrid.Event_NavigateLink, this);
+        super.addListener(LightGrid.Event_FilterColumn, this);
 
         tableEditor = new SpreadsheetCellEditor(this);
         tableEditor.horizontalAlignment = SWT.LEFT;
@@ -308,6 +311,12 @@ public class Spreadsheet extends LightGrid implements Listener {
             case LightGrid.Event_ChangeSort:
                 presentation.changeSorting(event.data, event.stateMask);
                 break;
+            case LightGrid.Event_FilterColumn:
+            	//showFiltersMenu
+            	presentation.showFiltering(event.data);
+            	
+            	
+            	break;                
             case LightGrid.Event_NavigateLink:
                 // Perform navigation async because it may change grid content and
                 // we don't want to mess current grid state

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/spreadsheet/SpreadsheetPresentation.java

@@ -33,6 +33,11 @@
 
 package org.jkiss.dbeaver.ui.controls.resultset.spreadsheet;
 
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.commands.NotEnabledException;
+import org.eclipse.core.commands.NotHandledException;
+import org.eclipse.core.commands.common.NotDefinedException;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
@@ -59,6 +64,10 @@ import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.handlers.HandlerUtil;
+import org.eclipse.ui.handlers.IHandlerService;
 import org.eclipse.ui.menus.CommandContributionItem;
 import org.eclipse.ui.progress.UIJob;
 import org.eclipse.ui.themes.ITheme;
@@ -87,6 +96,7 @@ import org.jkiss.dbeaver.ui.UIUtils;
 import org.jkiss.dbeaver.ui.controls.PropertyPageStandard;
 import org.jkiss.dbeaver.ui.controls.lightgrid.*;
 import org.jkiss.dbeaver.ui.controls.resultset.*;
+import org.jkiss.dbeaver.ui.controls.resultset.IResultSetPresentation.RowPosition;
 import org.jkiss.dbeaver.ui.controls.resultset.panel.ViewValuePanel;
 import org.jkiss.dbeaver.ui.data.IMultiController;
 import org.jkiss.dbeaver.ui.data.IValueController;
@@ -1030,6 +1040,40 @@ public class SpreadsheetPresentation extends AbstractPresentation implements IRe
         boolean altPressed = (state & SWT.ALT) == SWT.ALT;
         controller.toggleSortOrder((DBDAttributeBinding) columnElement, ctrlPressed, altPressed);
     }
+    
+
+	///////////////////////////////////////////////
+	// Filtering
+    
+    public void showFiltering(Object columnElement) {
+//    	final ResultSetViewer rsv = (ResultSetViewer) controller.getContainer().getResultSetController();
+//    	rsv.showFiltersMenu();
+//    	
+    	
+    	if(getSelection().getSelectedRows().size() == 0 || !getSelection().getSelectedAttributes().contains(columnElement)) {
+    		setCurrentAttribute((DBDAttributeBinding)columnElement);
+    		scrollToRow(RowPosition.FIRST);
+    	}    	
+    	
+    	IHandlerService handlerService = PlatformUI.getWorkbench().getService(IHandlerService.class);
+    	Event event = new Event();
+    	event.data = columnElement;
+    	try {
+			handlerService.executeCommand(ResultSetCommandHandler.CMD_FILTERDISTINCT, event);
+		} catch (ExecutionException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (NotDefinedException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (NotEnabledException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (NotHandledException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+    }
 
     ///////////////////////////////////////////////
     // Misc

plugins/org.jkiss.dbeaver.data.office/.classpath

-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="target/classes/"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="output" path="target/classes/"/>
+</classpath>

plugins/org.jkiss.dbeaver.ext.db2/.classpath

-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="target/classes/"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="output" path="target/classes/"/>
+</classpath>

plugins/org.jkiss.dbeaver.ext.derby/.classpath

-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="target/classes/"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="output" path="target/classes/"/>
+</classpath>

plugins/org.jkiss.dbeaver.ext.erd/.classpath

-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

plugins/org.jkiss.dbeaver.ext.firebird/.classpath

 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>

plugins/org.jkiss.dbeaver.ext.generic/.classpath

 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="src/"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

plugins/org.jkiss.dbeaver.ext.h2/.classpath

-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

plugins/org.jkiss.dbeaver.ext.hsqldb/.classpath

-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

plugins/org.jkiss.dbeaver.ext.import-config/.classpath

 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>

plugins/org.jkiss.dbeaver.ext.informix/.classpath

 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>

plugins/org.jkiss.dbeaver.ext.mssql/.classpath

 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>

plugins/org.jkiss.dbeaver.ext.mysql/.classpath

 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>

plugins/org.jkiss.dbeaver.ext.oracle/.classpath

 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>

plugins/org.jkiss.dbeaver.ext.phoenix/.classpath

 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>

plugins/org.jkiss.dbeaver.ext.postgresql/.classpath

 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>

plugins/org.jkiss.dbeaver.ext.sample.database/.classpath

-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

plugins/org.jkiss.dbeaver.ext.sqlite/.classpath

-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

plugins/org.jkiss.dbeaver.ext.teradata/.classpath

-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

plugins/org.jkiss.dbeaver.ext.ui.locks/.classpath

-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

plugins/org.jkiss.dbeaver.ext.ui.svg/.classpath

-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

plugins/org.jkiss.dbeaver.ext.vertica/.classpath

 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>

plugins/org.jkiss.dbeaver.ext.wmi/.classpath

 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>

plugins/org.jkiss.dbeaver.test/.classpath

 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>