#12676 change filtered transfer column list parameter to avoid comparison...

#12676 change filtered transfer column list parameter to avoid comparison attributes with equal names

plugins/org.jkiss.dbeaver.data.office.ui/src/org/jkiss/dbeaver/data/office/ui/handlers/OpenSpreadsheetHandler.java

@@ -18,12 +18,10 @@ package org.jkiss.dbeaver.data.office.ui.handlers;
 
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.ui.handlers.HandlerUtil;
 import org.jkiss.dbeaver.data.office.export.DataExporterXLSX;
-import org.jkiss.dbeaver.model.data.DBDAttributeBinding;
 import org.jkiss.dbeaver.model.data.DBDDataFilter;
 import org.jkiss.dbeaver.model.messages.ModelMessages;
 import org.jkiss.dbeaver.model.runtime.AbstractJob;
@@ -50,7 +48,7 @@ import java.util.Map;
 public class OpenSpreadsheetHandler extends AbstractHandler
 {
     @Override
-    public Object execute(ExecutionEvent event) throws ExecutionException
+    public Object execute(ExecutionEvent event)
     {
     	IResultSetController resultSet = ResultSetHandlerMain.getActiveResultSet(HandlerUtil.getActivePart(event));
         if (resultSet == null) {
@@ -68,13 +66,9 @@ public class OpenSpreadsheetHandler extends AbstractHandler
             for (ResultSetRow selectedRow : rsSelectedRows) {
                 selectedRows.add((long) selectedRow.getRowNumber());
             }
-            List<String> selectedAttributes = new ArrayList<>();
-            for (DBDAttributeBinding attributeBinding : rsSelection.getSelectedAttributes()) {
-                selectedAttributes.add(attributeBinding.getName());
-            }
 
             options.setSelectedRows(selectedRows);
-            options.setSelectedColumns(selectedAttributes);
+            options.setSelectedColumns(rsSelection.getSelectedAttributes());
         }
         ResultSetDataContainer dataContainer = new ResultSetDataContainer(resultSet, options);
         if (dataContainer.getDataSource() == null) {

plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetDataContainer.java

@@ -167,7 +167,7 @@ public class ResultSetDataContainer implements DBSDataContainer, DBPContextProvi
             if (ac != null && !ac.isVisible()) {
                 continue;
             }
-            if (!filterAttributes || options.getSelectedColumns().contains(attr.getName())) {
+            if (!filterAttributes || options.getSelectedColumns().contains(attr)) {
                 filtered.add(attr);
             }
         }

plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetDataContainerOptions.java

@@ -16,12 +16,14 @@
  */
 package org.jkiss.dbeaver.ui.controls.resultset;
 
+import org.jkiss.dbeaver.model.data.DBDAttributeBinding;
+
 import java.util.List;
 
 public class ResultSetDataContainerOptions {
 
     private List<Long> selectedRows;
-    private List<String> selectedColumns;
+    private List<DBDAttributeBinding> selectedColumns;
 
     public List<Long> getSelectedRows() {
         return selectedRows;
@@ -31,11 +33,11 @@ public class ResultSetDataContainerOptions {
         this.selectedRows = selectedRows;
     }
 
-    public List<String> getSelectedColumns() {
+    public List<DBDAttributeBinding> getSelectedColumns() {
         return selectedColumns;
     }
 
-    public void setSelectedColumns(List<String> selectedColumns) {
+    public void setSelectedColumns(List<DBDAttributeBinding> selectedColumns) {
         this.selectedColumns = selectedColumns;
     }
 }

plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/handler/ResultSetHandlerCopyAs.java

@@ -109,13 +109,9 @@ public class ResultSetHandlerCopyAs extends AbstractHandler implements IElementU
             for (ResultSetRow selectedRow : rsSelectedRows) {
                 selectedRows.add((long) selectedRow.getRowNumber());
             }
-            List<String> selectedAttributes = new ArrayList<>();
-            for (DBDAttributeBinding attributeBinding : rsSelectedAttributes) {
-                selectedAttributes.add(attributeBinding.getName());
-            }
 
             options.setSelectedRows(selectedRows);
-            options.setSelectedColumns(selectedAttributes);
+            options.setSelectedColumns(rsSelectedAttributes);
         }
         ResultSetDataContainer dataContainer = new ResultSetDataContainer(resultSet, options);
         if (dataContainer.getDataSource() == null) {

plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/handler/ResultSetHandlerMain.java

@@ -485,14 +485,10 @@ public class ResultSetHandlerMain extends AbstractHandler {
                 for (ResultSetRow selectedRow : rsv.getSelection().getSelectedRows()) {
                     selectedRows.add(Long.valueOf(selectedRow.getRowNumber()));
                 }
-                List<String> selectedAttributes = new ArrayList<>();
-                for (DBDAttributeBinding attributeBinding : rsv.getSelection().getSelectedAttributes()) {
-                    selectedAttributes.add(attributeBinding.getName());
-                }
 
                 ResultSetDataContainerOptions options = new ResultSetDataContainerOptions();
                 options.setSelectedRows(selectedRows);
-                options.setSelectedColumns(selectedAttributes);
+                options.setSelectedColumns(rsv.getSelection().getSelectedAttributes());
 
                 ResultSetDataContainer dataContainer = new ResultSetDataContainer(rsv, options);
                 DataTransferWizard.openWizard(

plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/handler/ResultSetHandlerOpenWith.java

@@ -129,13 +129,9 @@ public class ResultSetHandlerOpenWith extends AbstractHandler implements IElemen
             for (ResultSetRow selectedRow : rsSelectedRows) {
                 selectedRows.add((long) selectedRow.getRowNumber());
             }
-            List<String> selectedAttributes = new ArrayList<>();
-            for (DBDAttributeBinding attributeBinding : rsSelectedAttributes) {
-                selectedAttributes.add(attributeBinding.getName());
-            }
 
             options.setSelectedRows(selectedRows);
-            options.setSelectedColumns(selectedAttributes);
+            options.setSelectedColumns(rsSelectedAttributes);
         }
         ResultSetDataContainer dataContainer = new ResultSetDataContainer(resultSet, options);
         if (dataContainer.getDataSource() == null) {