Merge remote-tracking branch 'origin/devel' into devel

README.md

@@ -64,13 +64,12 @@ Binaries are in `product/standalone/target/products`
 
 ## Contribution: help the Beaver!
 
-Hooray, we have reached 7k of stars on GitHub and continue to grow!
+Hooray, we have reached 10k of stars on GitHub and continue to grow!
 That's really cool, we are glad that you like DBeaver.
 
 - We are actively looking for new source code contributors. We have added labels “Good first issue” and “Help wanted” to some tickets. If you want to be a part of our development team just be brave and take a ticket.
 - You can buy <a href="https://dbeaver.com/download">DBeaver EE</a> version. It includes all features of CE + NoSQL databases support + EE extensions + official online support. Also, licensed users have priorities in bug fixes and new features development.
 
-Save wild animals :) Thank you!  
+Thank you!  
 
 - <a href="https://github.com/dbeaver/dbeaver/graphs/contributors">DBeaver Team</a> (contributors)
-- <a href="https://github.com/serge-rider/">Serge Rider</a>  (author and maintainer)

plugins/org.jkiss.dbeaver.data.transfer.ui/src/org/jkiss/dbeaver/tools/transfer/ui/wizard/DataTransferTaskConfigurator.java

@@ -259,9 +259,18 @@ public class DataTransferTaskConfigurator implements DBTTaskConfigurator {
                 return;
             }
 
+            DataTransferSettings settings = dtWizard.getSettings();
             boolean isExport = isExport();
             List<IDataTransferProducer> producers = isExport ? new ArrayList<>() : null;
             List<IDataTransferConsumer> consumers = isExport ? null : new ArrayList<>();
+/*
+            if (producers == null && settings.getInitProducers() != null) {
+                producers = Arrays.asList(settings.getInitProducers());
+            }
+            if (consumers == null && settings.getInitConsumers() != null) {
+                consumers = Arrays.asList(settings.getInitConsumers());
+            }
+*/
 
             TableItem[] items = objectsTable.getItems();
 
@@ -277,7 +286,7 @@ public class DataTransferTaskConfigurator implements DBTTaskConfigurator {
                     }
                 }
             }
-            dtWizard.getSettings().setDataPipes(producers, consumers);
+            settings.setDataPipes(producers, consumers);
             dtWizard.loadSettings(dtWizard.getRunnableContext());
         }
 

plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/task/TaskConfigurationWizardDialog.java

@@ -140,7 +140,10 @@ public class TaskConfigurationWizardDialog extends ActiveWizardDialog {
         super.updateButtons();
         Button saveAsButton = getButton(SAVE_TASK_BTN_ID);
         if (saveAsButton != null) {
-            saveAsButton.setEnabled((getTaskWizard() != null && getTaskWizard().isCurrentTaskSaved()) || getWizard().canFinish());
+            // TODO: we should be able to save/run task immediately if it was saved before.
+            // TODO: There is a bug in DT wizard which doesn't let to do it (producers/consumers are initialized only on the last page).
+            // TODO: init transfer for all deserialized producers/consumers
+            saveAsButton.setEnabled(/*(getTaskWizard() != null && getTaskWizard().isCurrentTaskSaved()) || */getWizard().canFinish());
         }
     }
 

pom.xml

@@ -15,8 +15,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>
 
-        <!-- Eclipse 2019-09 -->
-        <eclipse-p2-repo.url>http://download.eclipse.org/releases/2019-09/</eclipse-p2-repo.url>
+        <!-- Eclipse 2019-06 -->
+        <eclipse-p2-repo.url>http://download.eclipse.org/releases/2019-06/</eclipse-p2-repo.url>
         <!-- Orbit. From Photon because we need com.ibm.icu.base -->
         <orbit-p2-repo.url>http://download.eclipse.org/tools/orbit/downloads/drops/R20180330011457/repository</orbit-p2-repo.url>
         <!-- DBeaver Maven dependencies (see product/localRepository for details) -->

product/standalone/DBeaver.p2.inf

@@ -9,8 +9,8 @@ instructions.configure=\
   addRepository(type:1,location:https${#58}//dbeaver.io/update/sshj/latest/,name:DBeaver SSHJ extension,enabled:true);\
   addRepository(type:0,location:https${#58}//dbeaver.io/update/debug/latest/,name:DBeaver Debug extension,enabled:true);\
   addRepository(type:1,location:https${#58}//dbeaver.io/update/debug/latest/,name:DBeaver Debug extension,enabled:true);\
-  addRepository(type:0,location:http${#58}//download.eclipse.org/releases/2019-09/,name:Eclipse 2019-09,enabled:true);\
-  addRepository(type:1,location:http${#58}//download.eclipse.org/releases/2019-09/,name:Eclipse 2019-09,enabled:true);\
+  addRepository(type:0,location:http${#58}//download.eclipse.org/releases/2019-06/,name:Eclipse 2019-06,enabled:true);\
+  addRepository(type:1,location:http${#58}//download.eclipse.org/releases/2019-06/,name:Eclipse 2019-06,enabled:true);\
   addRepository(type:0,location:https${#58}//dbeaver.io/update/ce/latest/,name:DBeaver CE update site,enabled:true);\
   addRepository(type:1,location:https${#58}//dbeaver.io/update/ce/latest/,name:DBeaver CE update site,enabled:true);\
   addRepository(type:0,location:http${#58}//www.genuitec.com/updates/devstyle/ci/,name:Darkest Dark Theme,enabled:true);\