#7557 Native tools: verbose parameter handle refactoring/fix

Former-commit-id: 86daad9e

plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/tasks/MySQLDatabaseExportHandler.java

@@ -116,11 +116,6 @@ public class MySQLDatabaseExportHandler extends MySQLNativeToolHandler<MySQLExpo
         return false;
     }
 
-    @Override
-    public boolean isVerbose() {
-        return true;
-    }
-
     @Override
     protected boolean isLogInputStream() {
         return false;

plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/tasks/MySQLNativeToolHandler.java

@@ -32,9 +32,6 @@ public abstract class MySQLNativeToolHandler<SETTINGS extends AbstractNativeTool
         java.util.List<String> cmd = new ArrayList<>();
         handler.fillProcessParameters(settings, arg, cmd);
 
-        if (handler.isVerbose()) {
-            cmd.add("-v");
-        }
         DBPConnectionConfiguration connectionInfo = settings.getDataSourceContainer().getActualConnectionConfiguration();
         cmd.add("--host=" + connectionInfo.getHostName());
         if (!CommonUtils.isEmpty(connectionInfo.getHostPort())) {

plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/tasks/MySQLScriptExecuteHandler.java

@@ -40,6 +40,10 @@ public class MySQLScriptExecuteHandler extends MySQLNativeToolHandler<MySQLScrip
     @Override
     protected List<String> getCommandLine(MySQLScriptExecuteSettings settings, MySQLCatalog arg) throws IOException {
         List<String> cmd = getMySQLToolCommandLine(this, settings, arg);
+        if (settings.isVerbose()) {
+            cmd.add("-v");
+        }
+
         cmd.add(arg.getName());
         return cmd;
     }
@@ -57,11 +61,6 @@ public class MySQLScriptExecuteHandler extends MySQLNativeToolHandler<MySQLScrip
         settings.addExtraCommandArgs(cmd);
     }
 
-    @Override
-    public boolean isVerbose() {
-        return true;
-    }
-
     @Override
     protected boolean isMergeProcessStreams() {
         return true;

plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/tasks/OracleScriptExecuteHandler.java

@@ -41,11 +41,6 @@ public class OracleScriptExecuteHandler extends AbstractNativeToolHandler<Oracle
         return false;
     }
 
-    @Override
-    public boolean isVerbose() {
-        return false;
-    }
-
     @Override
     public void fillProcessParameters(OracleScriptExecuteSettings settings, OracleDataSource arg, List<String> cmd) throws IOException {
         String sqlPlusExec = RuntimeUtils.getNativeBinaryName("sqlplus"); //$NON-NLS-1$

plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/tasks/PostgreNativeToolHandler.java

@@ -51,6 +51,9 @@ public abstract class PostgreNativeToolHandler<SETTINGS extends AbstractNativeTo
         settings.addExtraCommandArgs(cmd);
     }
 
+    public boolean isVerbose() {
+        return false;
+    }
 
     protected abstract boolean isExportWizard();
 

plugins/org.jkiss.dbeaver.tasks.native/src/org/jkiss/dbeaver/tasks/nativetool/AbstractNativeToolHandler.java

@@ -79,10 +79,6 @@ public abstract class AbstractNativeToolHandler<SETTINGS extends AbstractNativeT
         return true;
     }
 
-    public boolean isVerbose() {
-        return false;
-    }
-
     private void validateClientHome(DBRProgressMonitor monitor, SETTINGS settings) throws DBCException {
         DBPDataSourceContainer dataSourceContainer = settings.getDataSourceContainer();
         if (isNativeClientHomeRequired()) {