From f194e6b1af06f6188a943fcdcd449fb4e5bb5c7b Mon Sep 17 00:00:00 2001
From: ShadelessFox <yanuari.channel@gmail.com>
Date: Wed, 23 Sep 2020 14:02:05 +0300
Subject: [PATCH] #8033 Rename variable 'type' to 'connectionType'

Former-commit-id: 02ddce0416f515ff9a8b4a1f7e87e30748752399
---
 .../jkiss/dbeaver/ui/preferences/PrefPageConnections.java | 2 +-
 .../ui/pages/stream/StreamConsumerPageOutput.java         | 8 ++++----
 .../tools/transfer/stream/StreamTransferConsumer.java     | 4 ++--
 .../model/connection/DBPConnectionConfiguration.java      | 2 +-
 .../model/connection/DataSourceVariableResolver.java      | 2 +-
 .../org/jkiss/dbeaver/registry/DataSourceDescriptor.java  | 4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/preferences/PrefPageConnections.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/preferences/PrefPageConnections.java
index ce23084f04..664ba730fe 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/preferences/PrefPageConnections.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/preferences/PrefPageConnections.java
@@ -49,7 +49,7 @@ public class PrefPageConnections extends TargetPrefPage
         DBPConnectionConfiguration.VARIABLE_USER,
         DBPConnectionConfiguration.VARIABLE_PASSWORD,
         DBPConnectionConfiguration.VARIABLE_URL,
-        DBPConnectionConfiguration.VARIABLE_TYPE,
+        DBPConnectionConfiguration.VARIABLE_CONN_TYPE,
 
         DBConstants.VAR_CONTEXT_NAME,
         DBConstants.VAR_CONTEXT_ID,
diff --git a/plugins/org.jkiss.dbeaver.data.transfer.ui/src/org/jkiss/dbeaver/tools/transfer/ui/pages/stream/StreamConsumerPageOutput.java b/plugins/org.jkiss.dbeaver.data.transfer.ui/src/org/jkiss/dbeaver/tools/transfer/ui/pages/stream/StreamConsumerPageOutput.java
index 79446da201..970973ca1f 100644
--- a/plugins/org.jkiss.dbeaver.data.transfer.ui/src/org/jkiss/dbeaver/tools/transfer/ui/pages/stream/StreamConsumerPageOutput.java
+++ b/plugins/org.jkiss.dbeaver.data.transfer.ui/src/org/jkiss/dbeaver/tools/transfer/ui/pages/stream/StreamConsumerPageOutput.java
@@ -103,7 +103,7 @@ public class StreamConsumerPageOutput extends ActiveWizardPage<DataTransferWizar
                 StreamTransferConsumer.VARIABLE_DATE,
                 StreamTransferConsumer.VARIABLE_INDEX,
                 StreamTransferConsumer.VARIABLE_PROJECT,
-                StreamTransferConsumer.VARIABLE_TYPE);
+                StreamTransferConsumer.VARIABLE_CONN_TYPE);
             fileNameText.setLayoutData(gd);
             fileNameText.addModifyListener(e -> {
                 settings.setOutputFilePattern(fileNameText.getText());
@@ -120,7 +120,7 @@ public class StreamConsumerPageOutput extends ActiveWizardPage<DataTransferWizar
                     GeneralUtils.variablePattern(StreamTransferConsumer.VARIABLE_TIMESTAMP),
                     GeneralUtils.variablePattern(StreamTransferConsumer.VARIABLE_DATE),
                     GeneralUtils.variablePattern(StreamTransferConsumer.VARIABLE_INDEX),
-                    GeneralUtils.variablePattern(StreamTransferConsumer.VARIABLE_TYPE),
+                    GeneralUtils.variablePattern(StreamTransferConsumer.VARIABLE_CONN_TYPE),
                     GeneralUtils.variablePattern(StreamTransferConsumer.VARIABLE_PROJECT)));
 
             {
@@ -221,7 +221,7 @@ public class StreamConsumerPageOutput extends ActiveWizardPage<DataTransferWizar
                 StreamTransferConsumer.VARIABLE_TIMESTAMP,
                 StreamTransferConsumer.VARIABLE_DATE,
                 StreamTransferConsumer.VARIABLE_PROJECT,
-                StreamTransferConsumer.VARIABLE_TYPE);
+                StreamTransferConsumer.VARIABLE_CONN_TYPE);
             ContentAssistUtils.installContentProposal(
                 execProcessText,
                 new SmartTextContentAdapter(),
@@ -230,7 +230,7 @@ public class StreamConsumerPageOutput extends ActiveWizardPage<DataTransferWizar
                     GeneralUtils.variablePattern(StreamTransferConsumer.VARIABLE_TIMESTAMP),
                     GeneralUtils.variablePattern(StreamTransferConsumer.VARIABLE_DATE),
                     GeneralUtils.variablePattern(StreamTransferConsumer.VARIABLE_PROJECT),
-                    GeneralUtils.variablePattern(StreamTransferConsumer.VARIABLE_TYPE),
+                    GeneralUtils.variablePattern(StreamTransferConsumer.VARIABLE_CONN_TYPE),
                     GeneralUtils.variablePattern(StreamTransferConsumer.VARIABLE_FILE)));
 
             showFinalMessageCheckbox = UIUtils.createCheckbox(resultsSettings, DTUIMessages.stream_consumer_page_output_label_show_finish_message, null, getWizard().getSettings().isShowFinalMessage(), 4);
diff --git a/plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/StreamTransferConsumer.java b/plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/StreamTransferConsumer.java
index dcd4bb9b64..152646e1db 100644
--- a/plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/StreamTransferConsumer.java
+++ b/plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/StreamTransferConsumer.java
@@ -79,7 +79,7 @@ public class StreamTransferConsumer implements IDataTransferConsumer<StreamConsu
     public static final String VARIABLE_INDEX = "index";
     public static final String VARIABLE_DATE = "date";
     public static final String VARIABLE_PROJECT = "project";
-    public static final String VARIABLE_TYPE = "type";
+    public static final String VARIABLE_CONN_TYPE = "connectionType";
     public static final String VARIABLE_FILE = "file";
 
     public static final int OUT_FILE_BUFFER_SIZE = 100000;
@@ -539,7 +539,7 @@ public class StreamTransferConsumer implements IDataTransferConsumer<StreamConsu
                 }
                 case VARIABLE_FILE:
                     return targetFile == null ? "" : targetFile.getAbsolutePath();
-                case VARIABLE_TYPE:
+                case VARIABLE_CONN_TYPE:
                     if (dataContainer == null) {
                         return null;
                     }
diff --git a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/connection/DBPConnectionConfiguration.java b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/connection/DBPConnectionConfiguration.java
index c365a54f81..483ae817a6 100644
--- a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/connection/DBPConnectionConfiguration.java
+++ b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/connection/DBPConnectionConfiguration.java
@@ -45,7 +45,7 @@ public class DBPConnectionConfiguration implements DBPObject {
     public static final String VARIABLE_USER = "user";
     public static final String VARIABLE_PASSWORD = "password";
     public static final String VARIABLE_URL = "url";
-    public static final String VARIABLE_TYPE = "type";
+    public static final String VARIABLE_CONN_TYPE = "connectionType";
 
     public static final String VAR_PROJECT_PATH = "project.path";
     public static final String VAR_PROJECT_NAME = "project.name";
diff --git a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/connection/DataSourceVariableResolver.java b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/connection/DataSourceVariableResolver.java
index 46f48bba18..7225420c59 100644
--- a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/connection/DataSourceVariableResolver.java
+++ b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/connection/DataSourceVariableResolver.java
@@ -45,7 +45,7 @@ public class DataSourceVariableResolver extends SystemVariablesResolver {
                 return configuration.getUserPassword();
             case DBPConnectionConfiguration.VARIABLE_URL:
                 return configuration.getUrl();
-            case DBPConnectionConfiguration.VARIABLE_TYPE:
+            case DBPConnectionConfiguration.VARIABLE_CONN_TYPE:
                 return configuration.getConnectionType().getName();
             case DBPConnectionConfiguration.VAR_PROJECT_PATH:
                 return dataSourceContainer == null ? null : dataSourceContainer.getProject().getEclipseProject().getLocation().toOSString();
diff --git a/plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/DataSourceDescriptor.java b/plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/DataSourceDescriptor.java
index 60e648ccda..665b137376 100644
--- a/plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/DataSourceDescriptor.java
+++ b/plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/DataSourceDescriptor.java
@@ -89,7 +89,7 @@ public class DataSourceDescriptor
         {DBPConnectionConfiguration.VARIABLE_USER, "database user name"},
         {DBPConnectionConfiguration.VARIABLE_PASSWORD, "database password (plain)"},
         {DBPConnectionConfiguration.VARIABLE_URL, "connection URL"},
-        {DBPConnectionConfiguration.VARIABLE_TYPE, "connection type"},
+        {DBPConnectionConfiguration.VARIABLE_CONN_TYPE, "connection type"},
 
         {DBPConnectionConfiguration.VAR_PROJECT_PATH, "project path"},
         {DBPConnectionConfiguration.VAR_PROJECT_NAME, "project name"},
@@ -1397,7 +1397,7 @@ public class DataSourceDescriptor
                 case DBPConnectionConfiguration.VARIABLE_USER: return configuration.getUserName();
                 case DBPConnectionConfiguration.VARIABLE_PASSWORD: return configuration.getUserPassword();
                 case DBPConnectionConfiguration.VARIABLE_URL: return configuration.getUrl();
-                case DBPConnectionConfiguration.VARIABLE_TYPE: return configuration.getConnectionType().getName();
+                case DBPConnectionConfiguration.VARIABLE_CONN_TYPE: return configuration.getConnectionType().getName();
                 default: return SystemVariablesResolver.INSTANCE.get(name);
             }
         };
-- 
GitLab