SQL Server: split model/UI bundles

plugins/org.jkiss.dbeaver.ext.mssql.ui/META-INF/MANIFEST.MF

@@ -4,15 +4,17 @@ Bundle-Name: SQL Server UI
 Bundle-SymbolicName: org.jkiss.dbeaver.ext.mssql.ui;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Release-Date: 20190121
-Bundle-Activator: org.jkiss.dbeaver.ext.mssql.SQLServerUIActivator
+Bundle-Activator: org.jkiss.dbeaver.ext.mssql.ui.SQLServerUIActivator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.jface.text,
+ org.eclipse.ui.editors,
  org.eclipse.ui.views,
  org.eclipse.ui.workbench,
  org.eclipse.ui.workbench.texteditor,
  org.jkiss.dbeaver.core,
- org.jkiss.dbeaver.ext.mssql.core
+ org.jkiss.dbeaver.ext.generic,
+ org.jkiss.dbeaver.ext.mssql
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: JKISS

plugins/org.jkiss.dbeaver.ext.mssql.ui/OSGI-INF/l10n/bundle.properties

+Bundle-Vendor = JKISS
+Bundle-Name = DBeaver SQL Server UI
+
+sqlserver.dialog.connection.header=SQL Server Connection Settings
+
+editor.source.name                 = Source

plugins/org.jkiss.dbeaver.ext.mssql.ui/OSGI-INF/l10n/bundle_de.properties

+Bundle-Name = DBeaver SQL Server UI Support
+
+sqlserver.dialog.connection.header = SQL Server Verbindungseinstellungen

plugins/org.jkiss.dbeaver.ext.mssql.ui/OSGI-INF/l10n/bundle_ja.properties

+sqlserver.dialog.connection.header=SQL Server \u306E\u63A5\u7D9A\u8A2D\u5B9A

plugins/org.jkiss.dbeaver.ext.mssql.ui/build.properties

@@ -3,5 +3,4 @@ output.. = target/classes/
 bin.includes = plugin.xml,\
                META-INF/,\
                .,\
-               LICENSE.txt,\
-               plugin.properties
+               LICENSE.txt

plugins/org.jkiss.dbeaver.ext.mssql.ui/plugin.xml

@@ -3,4 +3,70 @@
 
 <plugin>
 
+    <extension point="org.jkiss.dbeaver.dataSourceView">
+        <view
+                id="org.jkiss.dbeaver.ext.mssql.dataSourceWizardView"
+                dataSource="sqlserver,mssql"
+                targetID="org.jkiss.dbeaver.ext.ui.newConnectionWizard"
+                label="%sqlserver.dialog.connection.header"
+                class="org.jkiss.dbeaver.ext.mssql.ui.SQLServerConnectionPage"
+                icon="icons/database.png">
+        </view>
+        <view
+                class="org.jkiss.dbeaver.ext.mssql.ui.SQLServerConnectionPage"
+                icon="icons/database.png"
+                id="org.jkiss.dbeaver.ext.mssql.dataSourceEditorView"
+                dataSource="sqlserver,mssql"
+                label="%sqlserver.dialog.connection.header"
+                targetID="org.jkiss.dbeaver.ext.ui.editConnectionDialog">
+        </view>
+    </extension>
+
+    <extension point="org.jkiss.dbeaver.objectManager">
+        <manager class="org.jkiss.dbeaver.ext.mssql.edit.SQLServerTableManager" objectType="org.jkiss.dbeaver.ext.mssql.model.SQLServerTable"/>
+        <manager class="org.jkiss.dbeaver.ext.mssql.edit.SQLServerTableColumnManager" objectType="org.jkiss.dbeaver.ext.mssql.model.SQLServerTableColumn"/>
+        <manager class="org.jkiss.dbeaver.ext.mssql.edit.SQLServerUniqueKeyManager" objectType="org.jkiss.dbeaver.ext.mssql.model.SQLServerTableUniqueKey"/>
+        <manager class="org.jkiss.dbeaver.ext.mssql.edit.SQLServerForeignKeyManager" objectType="org.jkiss.dbeaver.ext.mssql.model.SQLServerTableForeignKey"/>
+        <manager class="org.jkiss.dbeaver.ext.mssql.edit.SQLServerIndexManager" objectType="org.jkiss.dbeaver.ext.mssql.model.SQLServerTableIndex"/>
+        <manager class="org.jkiss.dbeaver.ext.mssql.edit.SQLServerCheckConstraintManager" objectType="org.jkiss.dbeaver.ext.mssql.model.SQLServerTableCheckConstraint"/>
+        <manager class="org.jkiss.dbeaver.ext.mssql.edit.SQLServerTableTriggerManager" objectType="org.jkiss.dbeaver.ext.mssql.model.SQLServerTableTrigger"/>
+
+        <manager class="org.jkiss.dbeaver.ext.mssql.edit.generic.SQLServerGenericProcedureManager" objectType="org.jkiss.dbeaver.ext.mssql.model.generic.SQLServerGenericProcedure"/>
+        <manager class="org.jkiss.dbeaver.ext.mssql.edit.generic.SQLServerGenericTriggerManager" objectType="org.jkiss.dbeaver.ext.mssql.model.generic.SQLServerGenericTrigger"/>
+    </extension>
+
+    <extension point="org.jkiss.dbeaver.databaseEditor">
+        <editor
+                id="generic.table.ddl.view"
+                class="org.jkiss.dbeaver.ui.editors.sql.SQLSourceViewer"
+                main="false"
+                label="DDL"
+                description="DDL"
+                position="additions_end"
+                icon="#sql_text"
+                type="folder">
+            <objectType name="org.jkiss.dbeaver.ext.mssql.model.SQLServerTable"/>
+        </editor>
+        <editor
+                id="generic.view.source.view"
+                class="org.jkiss.dbeaver.ui.editors.sql.SQLSourceViewer"
+                main="false"
+                label="Definition"
+                description="View definition"
+                position="additions_end"
+                icon="#sql_text"
+                type="folder"
+                embeddable="false">
+            <objectType name="org.jkiss.dbeaver.ext.mssql.model.SQLServerView"/>
+        </editor>
+        <editor id="generic.source.view" class="org.jkiss.dbeaver.ext.mssql.ui.editors.SQLServerSourceViewEditor"
+                label="%editor.source.name" description="%editor.source.name" icon="#sql_text" position="additions_middle"
+                contributor="org.jkiss.dbeaver.ui.editors.sql.SQLEditorContributorNested" type="folder" embeddable="false">
+            <objectType name="org.jkiss.dbeaver.ext.mssql.model.SQLServerProcedure"/>
+            <objectType name="org.jkiss.dbeaver.ext.mssql.model.SQLServerTableTrigger"/>
+            <objectType name="org.jkiss.dbeaver.ext.mssql.model.SQLServerDatabaseTrigger"/>
+            <objectType name="org.jkiss.dbeaver.ext.mssql.model.SQLServerDatabaseTrigger"/>
+        </editor>
+    </extension>
+
 </plugin>

plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/edit/SQLServerUniqueKeyManager.java → plugins/org.jkiss.dbeaver.ext.mssql.ui/src/org/jkiss/dbeaver/ext/mssql/edit/SQLServerUniqueKeyManager.java

@@ -17,8 +17,10 @@
 package org.jkiss.dbeaver.ext.mssql.edit;
 
 import org.jkiss.code.Nullable;
-import org.jkiss.dbeaver.ext.generic.model.*;
-import org.jkiss.dbeaver.ext.mssql.model.*;
+import org.jkiss.dbeaver.ext.mssql.model.SQLServerTable;
+import org.jkiss.dbeaver.ext.mssql.model.SQLServerTableColumn;
+import org.jkiss.dbeaver.ext.mssql.model.SQLServerTableUniqueKey;
+import org.jkiss.dbeaver.ext.mssql.model.SQLServerTableUniqueKeyColumn;
 import org.jkiss.dbeaver.model.edit.DBECommandContext;
 import org.jkiss.dbeaver.model.impl.DBSObjectCache;
 import org.jkiss.dbeaver.model.impl.sql.edit.struct.SQLConstraintManager;
@@ -29,8 +31,6 @@ import org.jkiss.dbeaver.model.struct.DBSObject;
 import org.jkiss.dbeaver.ui.UITask;
 import org.jkiss.dbeaver.ui.editors.object.struct.EditConstraintPage;
 
-import java.util.Locale;
-
 /**
  * SQL server unique constraint manager
  */

plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/ui/SQLServerConnectionPage.java → plugins/org.jkiss.dbeaver.ext.mssql.ui/src/org/jkiss/dbeaver/ext/mssql/ui/SQLServerConnectionPage.java

@@ -18,16 +18,13 @@
 package org.jkiss.dbeaver.ext.mssql.ui;
 
 import org.eclipse.jface.dialogs.IDialogPage;
-import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.*;
-import org.jkiss.dbeaver.ext.mssql.SQLServerActivator;
 import org.jkiss.dbeaver.ext.mssql.SQLServerConstants;
-import org.jkiss.dbeaver.ext.mssql.SQLServerMessages;
 import org.jkiss.dbeaver.ext.mssql.SQLServerUtils;
 import org.jkiss.dbeaver.model.DBPDataSourceContainer;
 import org.jkiss.dbeaver.model.connection.DBPConnectionConfiguration;
@@ -74,7 +71,7 @@ public class SQLServerConnectionPage extends ConnectionPageAbstract implements I
 
         {
             Label hostLabel = new Label(settingsGroup, SWT.NONE);
-            hostLabel.setText(SQLServerMessages.dialog_connection_host_label);
+            hostLabel.setText(SQLServerUIMessages.dialog_connection_host_label);
             hostLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
             hostText = new Text(settingsGroup, SWT.BORDER);
@@ -87,7 +84,7 @@ public class SQLServerConnectionPage extends ConnectionPageAbstract implements I
                 gd.horizontalSpan = 3;
             } else {
                 Label portLabel = new Label(settingsGroup, SWT.NONE);
-                portLabel.setText(SQLServerMessages.dialog_connection_port_label);
+                portLabel.setText(SQLServerUIMessages.dialog_connection_port_label);
                 portLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
                 portText = new Text(settingsGroup, SWT.BORDER);
@@ -99,7 +96,7 @@ public class SQLServerConnectionPage extends ConnectionPageAbstract implements I
 
         {
             Label dbLabel = new Label(settingsGroup, SWT.NONE);
-            dbLabel.setText(SQLServerMessages.dialog_connection_database_schema_label);
+            dbLabel.setText(SQLServerUIMessages.dialog_connection_database_schema_label);
             dbLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
             dbText = new Text(settingsGroup, SWT.BORDER);
@@ -113,7 +110,7 @@ public class SQLServerConnectionPage extends ConnectionPageAbstract implements I
         {
             if (SQLServerUtils.isDriverSqlServer(getSite().getDriver())) {
                 if (!isDriverAzure) {
-                    windowsAuthenticationButton = UIUtils.createLabelCheckbox(settingsGroup, SQLServerMessages.dialog_connection_windows_authentication_button, false);
+                    windowsAuthenticationButton = UIUtils.createLabelCheckbox(settingsGroup, SQLServerUIMessages.dialog_connection_windows_authentication_button, false);
                     windowsAuthenticationButton.addSelectionListener(new SelectionAdapter() {
                         @Override
                         public void widgetSelected(SelectionEvent e) {
@@ -122,13 +119,13 @@ public class SQLServerConnectionPage extends ConnectionPageAbstract implements I
                     });
                     UIUtils.createEmptyLabel(settingsGroup, 2, 1);
                 } else {
-                    adpAuthenticationButton = UIUtils.createLabelCheckbox(settingsGroup, SQLServerMessages.dialog_connection_adp_authentication_button, false);
+                    adpAuthenticationButton = UIUtils.createLabelCheckbox(settingsGroup, SQLServerUIMessages.dialog_connection_adp_authentication_button, false);
                     UIUtils.createEmptyLabel(settingsGroup, 2, 1);
                 }
             }
 
             userNameLabel = new Label(settingsGroup, SWT.NONE);
-            userNameLabel.setText(SQLServerMessages.dialog_connection_user_name_label);
+            userNameLabel.setText(SQLServerUIMessages.dialog_connection_user_name_label);
             userNameLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
             userNameText = new Text(settingsGroup, SWT.BORDER);
@@ -139,7 +136,7 @@ public class SQLServerConnectionPage extends ConnectionPageAbstract implements I
             UIUtils.createEmptyLabel(settingsGroup, 2, 1);
 
             passwordLabel = new Label(settingsGroup, SWT.NONE);
-            passwordLabel.setText(SQLServerMessages.dialog_connection_password_label);
+            passwordLabel.setText(SQLServerUIMessages.dialog_connection_password_label);
             passwordLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
             passwordText = new Text(settingsGroup, SWT.BORDER | SWT.PASSWORD);
@@ -152,14 +149,14 @@ public class SQLServerConnectionPage extends ConnectionPageAbstract implements I
 
         {
             Group secureGroup = new Group(settingsGroup, SWT.NONE);
-            secureGroup.setText(SQLServerMessages.dialog_setting_connection_settings);
+            secureGroup.setText(SQLServerUIMessages.dialog_setting_connection_settings);
             gd = new GridData(GridData.FILL_HORIZONTAL);
             gd.horizontalSpan = 4;
             secureGroup.setLayoutData(gd);
             secureGroup.setLayout(new GridLayout(1, false));
 
             createSavePasswordButton(secureGroup);
-            showAllSchemas = UIUtils.createCheckbox(secureGroup, SQLServerMessages.dialog_setting_show_all_schemas, SQLServerMessages.dialog_setting_show_all_schemas_tip, true, 2);
+            showAllSchemas = UIUtils.createCheckbox(secureGroup, SQLServerUIMessages.dialog_setting_show_all_schemas, SQLServerUIMessages.dialog_setting_show_all_schemas_tip, true, 2);
         }
 
         createDriverPanel(settingsGroup);
@@ -192,9 +189,9 @@ public class SQLServerConnectionPage extends ConnectionPageAbstract implements I
         {
             setImageDescriptor(isSqlServer ?
                 (isDriverAzure ?
-                    SQLServerActivator.getImageDescriptor("icons/azure_logo.png") :
-                    SQLServerActivator.getImageDescriptor("icons/mssql_logo.png")) :
-                SQLServerActivator.getImageDescriptor("icons/sybase_logo.png"));
+                    SQLServerUIActivator.getImageDescriptor("icons/azure_logo.png") :
+                    SQLServerUIActivator.getImageDescriptor("icons/mssql_logo.png")) :
+                SQLServerUIActivator.getImageDescriptor("icons/sybase_logo.png"));
         }
 
         // Load values from new connection info

plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/SQLServerActivator.java → plugins/org.jkiss.dbeaver.ext.mssql.ui/src/org/jkiss/dbeaver/ext/mssql/ui/SQLServerUIActivator.java

@@ -15,24 +15,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jkiss.dbeaver.ext.mssql;
+package org.jkiss.dbeaver.ext.mssql.ui;
 
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.resource.ImageRegistry;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
 
-public class SQLServerActivator extends AbstractUIPlugin {
+public class SQLServerUIActivator extends AbstractUIPlugin {
 
     public static final String IMG_SQL_SERVER = "IMG_SQL_SERVER"; //$NON-NLS-1$
 
     // The plug-in ID
-    public static final String PLUGIN_ID = "org.jkiss.dbeaver.ext.mssql"; //$NON-NLS-1$
+    public static final String PLUGIN_ID = "org.jkiss.dbeaver.ext.mssql.ui"; //$NON-NLS-1$
 
     // The shared instance
-    private static SQLServerActivator plugin;
+    private static SQLServerUIActivator plugin;
 
-    public SQLServerActivator() {
+    public SQLServerUIActivator() {
     }
 
     @Override
@@ -47,7 +47,7 @@ public class SQLServerActivator extends AbstractUIPlugin {
         super.stop(context);
     }
 
-    public static SQLServerActivator getDefault() {
+    public static SQLServerUIActivator getDefault() {
         return plugin;
     }
 

plugins/org.jkiss.dbeaver.ext.mssql.ui/src/org/jkiss/dbeaver/ext/mssql/ui/SQLServerUIMessages.java

+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2019 Serge Rider (serge@jkiss.org)
+ * Copyright (C) 2010-2017 Eugene Fradkin (eugene.fradkin@gmail.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jkiss.dbeaver.ext.mssql.ui;
+
+import org.eclipse.osgi.util.NLS;
+
+public class SQLServerUIMessages extends NLS {
+    static final String BUNDLE_NAME = "org.jkiss.dbeaver.ext.mssql.SQLServerUIMessages"; //$NON-NLS-1$
+
+    /* PostgreConnectionPage */
+    public static String dialog_setting_connection_settings;
+
+    public static String dialog_connection_windows_authentication_button;
+    public static String dialog_connection_adp_authentication_button;
+    public static String dialog_connection_database_schema_label;
+    public static String dialog_connection_host_label;
+    public static String dialog_connection_password_label;
+    public static String dialog_connection_port_label;
+    public static String dialog_connection_user_name_label;
+    public static String dialog_setting_show_all_schemas;
+    public static String dialog_setting_show_all_schemas_tip;
+
+    static {
+        // initialize resource bundle
+        NLS.initializeMessages(BUNDLE_NAME, SQLServerUIMessages.class);
+    }
+
+    private SQLServerUIMessages() {
+    }
+
+
+}

plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/SQLServerResources.properties → plugins/org.jkiss.dbeaver.ext.mssql.ui/src/org/jkiss/dbeaver/ext/mssql/ui/SQLServerUIMessages.properties

@@ -9,8 +9,3 @@ dialog_connection_port_label=Port:
 dialog_connection_user_name_label=User name:
 dialog_setting_show_all_schemas=Show All Schemas
 dialog_setting_show_all_schemas_tip=Shows all database schemas. If disabled shows only non-empty schemas.
-
-index_type_Heap = Heap
-index_type_NonClustered = Non clustered
-index_type_XML = XML
-index_type_Spatial = Spatial

plugins/org.jkiss.dbeaver.ext.mssql/META-INF/MANIFEST.MF

@@ -7,13 +7,13 @@ Bundle-Release-Date: 20190121
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.ui.views,
- org.eclipse.jface,
- org.eclipse.jface.text,
- org.jkiss.dbeaver.core,
- org.eclipse.ui.workbench.texteditor,
  org.eclipse.ui.editors,
+ org.jkiss.dbeaver.model,
  org.jkiss.dbeaver.ext.generic,
  com.github.jsqlparser
+Export-Package: org.jkiss.dbeaver.ext.mssql,
+ org.jkiss.dbeaver.ext.mssql.model,
+ org.jkiss.dbeaver.ext.mssql.model.generic
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %Bundle-Vendor

plugins/org.jkiss.dbeaver.ext.mssql/plugin.xml

@@ -397,70 +397,4 @@
         </datasource>
     </extension>
 
-    <extension point="org.jkiss.dbeaver.dataSourceView">
-        <view
-                id="org.jkiss.dbeaver.ext.mssql.dataSourceWizardView"
-                dataSource="sqlserver,mssql"
-                targetID="org.jkiss.dbeaver.ext.ui.newConnectionWizard"
-                label="%sqlserver.dialog.connection.header"
-                class="org.jkiss.dbeaver.ext.mssql.ui.SQLServerConnectionPage"
-                icon="icons/database.png">
-        </view>
-        <view
-                class="org.jkiss.dbeaver.ext.mssql.ui.SQLServerConnectionPage"
-                icon="icons/database.png"
-                id="org.jkiss.dbeaver.ext.mssql.dataSourceEditorView"
-                dataSource="sqlserver,mssql"
-                label="%sqlserver.dialog.connection.header"
-                targetID="org.jkiss.dbeaver.ext.ui.editConnectionDialog">
-        </view>
-    </extension>
-
-    <extension point="org.jkiss.dbeaver.objectManager">
-        <manager class="org.jkiss.dbeaver.ext.mssql.edit.SQLServerTableManager" objectType="org.jkiss.dbeaver.ext.mssql.model.SQLServerTable"/>
-        <manager class="org.jkiss.dbeaver.ext.mssql.edit.SQLServerTableColumnManager" objectType="org.jkiss.dbeaver.ext.mssql.model.SQLServerTableColumn"/>
-        <manager class="org.jkiss.dbeaver.ext.mssql.edit.SQLServerUniqueKeyManager" objectType="org.jkiss.dbeaver.ext.mssql.model.SQLServerTableUniqueKey"/>
-        <manager class="org.jkiss.dbeaver.ext.mssql.edit.SQLServerForeignKeyManager" objectType="org.jkiss.dbeaver.ext.mssql.model.SQLServerTableForeignKey"/>
-        <manager class="org.jkiss.dbeaver.ext.mssql.edit.SQLServerIndexManager" objectType="org.jkiss.dbeaver.ext.mssql.model.SQLServerTableIndex"/>
-        <manager class="org.jkiss.dbeaver.ext.mssql.edit.SQLServerCheckConstraintManager" objectType="org.jkiss.dbeaver.ext.mssql.model.SQLServerTableCheckConstraint"/>
-        <manager class="org.jkiss.dbeaver.ext.mssql.edit.SQLServerTableTriggerManager" objectType="org.jkiss.dbeaver.ext.mssql.model.SQLServerTableTrigger"/>
-
-        <manager class="org.jkiss.dbeaver.ext.mssql.edit.generic.SQLServerGenericProcedureManager" objectType="org.jkiss.dbeaver.ext.mssql.model.generic.SQLServerGenericProcedure"/>
-        <manager class="org.jkiss.dbeaver.ext.mssql.edit.generic.SQLServerGenericTriggerManager" objectType="org.jkiss.dbeaver.ext.mssql.model.generic.SQLServerGenericTrigger"/>
-    </extension>
-
-    <extension point="org.jkiss.dbeaver.databaseEditor">
-        <editor
-                id="generic.table.ddl.view"
-                class="org.jkiss.dbeaver.ui.editors.sql.SQLSourceViewer"
-                main="false"
-                label="DDL"
-                description="DDL"
-                position="additions_end"
-                icon="#sql_text"
-                type="folder">
-            <objectType name="org.jkiss.dbeaver.ext.mssql.model.SQLServerTable"/>
-        </editor>
-        <editor
-                id="generic.view.source.view"
-                class="org.jkiss.dbeaver.ui.editors.sql.SQLSourceViewer"
-                main="false"
-                label="Definition"
-                description="View definition"
-                position="additions_end"
-                icon="#sql_text"
-                type="folder"
-                embeddable="false">
-            <objectType name="org.jkiss.dbeaver.ext.mssql.model.SQLServerView"/>
-        </editor>
-        <editor id="generic.source.view" class="org.jkiss.dbeaver.ext.mssql.ui.editors.SQLServerSourceViewEditor"
-                label="%editor.source.name" description="%editor.source.name" icon="#sql_text" position="additions_middle"
-                contributor="org.jkiss.dbeaver.ui.editors.sql.SQLEditorContributorNested" type="folder" embeddable="false">
-            <objectType name="org.jkiss.dbeaver.ext.mssql.model.SQLServerProcedure"/>
-            <objectType name="org.jkiss.dbeaver.ext.mssql.model.SQLServerTableTrigger"/>
-            <objectType name="org.jkiss.dbeaver.ext.mssql.model.SQLServerDatabaseTrigger"/>
-            <objectType name="org.jkiss.dbeaver.ext.mssql.model.SQLServerDatabaseTrigger"/>
-        </editor>
-    </extension>
-
 </plugin>

plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/SQLServerMessages.java

@@ -21,20 +21,7 @@ import org.eclipse.osgi.util.NLS;
 import org.jkiss.dbeaver.model.struct.rdb.DBSIndexType;
 
 public class SQLServerMessages extends NLS {
-    static final String BUNDLE_NAME = "org.jkiss.dbeaver.ext.mssql.SQLServerResources"; //$NON-NLS-1$
-
-    /* PostgreConnectionPage */
-    public static String dialog_setting_connection_settings;
-
-    public static String dialog_connection_windows_authentication_button;
-    public static String dialog_connection_adp_authentication_button;
-    public static String dialog_connection_database_schema_label;
-    public static String dialog_connection_host_label;
-    public static String dialog_connection_password_label;
-    public static String dialog_connection_port_label;
-    public static String dialog_connection_user_name_label;
-    public static String dialog_setting_show_all_schemas;
-    public static String dialog_setting_show_all_schemas_tip;
+    static final String BUNDLE_NAME = "org.jkiss.dbeaver.ext.mssql.SQLServerMessages"; //$NON-NLS-1$
 
     public static String index_type_Heap;
     public static String index_type_NonClustered;

plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/SQLServerMessages.properties

+index_type_Heap = Heap
+index_type_NonClustered = Non clustered
+index_type_XML = XML
+index_type_Spatial = Spatial

plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/model/SQLServerDialect.java

@@ -16,8 +16,6 @@
  */
 package org.jkiss.dbeaver.ext.mssql.model;
 
-import org.eclipse.jface.text.rules.IRule;
-import org.jkiss.code.NotNull;
 import org.jkiss.dbeaver.ext.mssql.SQLServerConstants;
 import org.jkiss.dbeaver.ext.mssql.SQLServerUtils;
 import org.jkiss.dbeaver.model.DBPDataKind;
@@ -28,14 +26,13 @@ import org.jkiss.dbeaver.model.impl.jdbc.JDBCSQLDialect;
 import org.jkiss.dbeaver.model.struct.DBSTypedObject;
 import org.jkiss.dbeaver.model.struct.rdb.DBSProcedure;
 import org.jkiss.dbeaver.model.struct.rdb.DBSProcedureParameter;
-import org.jkiss.dbeaver.runtime.sql.SQLRuleProvider;
 import org.jkiss.utils.CommonUtils;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-public class SQLServerDialect extends JDBCSQLDialect implements SQLRuleProvider {
+public class SQLServerDialect extends JDBCSQLDialect {
 
     private static final String[][] TSQL_BEGIN_END_BLOCK = new String[][]{
         /*{
@@ -120,10 +117,6 @@ public class SQLServerDialect extends JDBCSQLDialect implements SQLRuleProvider
         return super.getColumnTypeModifiers(dataSource, column, typeName, dataKind);
     }
 
-    @Override
-    public void extendRules(@NotNull List<IRule> rules, @NotNull RulePosition position) {
-    }
-
     @Override
     public void generateStoredProcedureCall(StringBuilder sql, DBSProcedure proc, Collection<? extends DBSProcedureParameter> parameters) {
         List<DBSProcedureParameter> inParameters = new ArrayList<>();

plugins/pom.xml

@@ -51,6 +51,7 @@
         <module>org.jkiss.dbeaver.ext.hsqldb</module>
         <module>org.jkiss.dbeaver.ext.informix</module>
         <module>org.jkiss.dbeaver.ext.mssql</module>
+        <module>org.jkiss.dbeaver.ext.mssql.ui</module>
         <module>org.jkiss.dbeaver.ext.mysql</module>
         <module>org.jkiss.dbeaver.ext.netezza</module>
         <module>org.jkiss.dbeaver.ext.oracle</module>