dbeaver/dbeaver#958 Changed Tree Structure for SQL Server; Added Database...

dbeaver/dbeaver#958 Changed Tree Structure for SQL Server; Added Database folders, Administration folder moved higher

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

@@ -81,16 +81,16 @@
         </configurator>
     </extension>
 
-    <extension point="org.jkiss.dbeaver.dataSourceProvider">
+    <!--<extension point="org.jkiss.dbeaver.dataSourceProvider">
         <datasourcePatch id="sqlserver">
             <treeInjection path="sqlserver/database" after="trigger">
                 <folder label="%tree.databaseInfo.node.name" icon="#folder_info" description="Database system information">
                     <treeContribution category="connectionEditor"/>
-<!--                    <object type="org.jkiss.dbeaver.ext.mssql.ui.editors.SQLServerSessionEditor" label="%tree.sessions.node.name" icon="#sessions" description="Server session manager" editor="org.jkiss.dbeaver.ext.mssql.ui.editors.SQLServerSessionEditor"/>-->
-                </folder>
+                    <object type="org.jkiss.dbeaver.ext.mssql.ui.editors.SQLServerSessionEditor" label="%tree.sessions.node.name" icon="#sessions" description="Server session manager" editor="org.jkiss.dbeaver.ext.mssql.ui.editors.SQLServerSessionEditor"/>-->
+                <!--</folder>
             </treeInjection>
         </datasourcePatch>
-    </extension>
+    </extension>-->
 
     <extension point="org.eclipse.ui.editors">
         <editor

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

@@ -145,6 +145,7 @@ meta.org.jkiss.dbeaver.ext.mssql.model.SQLServerLogin.defaultLanguageName.name =
 meta.org.jkiss.dbeaver.ext.mssql.model.SQLServerLogin.defaultDatabase.name = Default Database
 
 tree.databases.node.name           = Databases
+tree.databases.node.tip            = Server databases
 tree.database.node.name            = Database
 tree.schemas.node.name             = Schemas
 tree.schema.node.name              = Schema
@@ -191,6 +192,8 @@ tree.extendedProperty.node.name    = Extended Property
 tree.security.node.name            = Security
 tree.logins.node.name              = Logins
 tree.login.node.name               = Login
+tree.administer.node.description   = Maintenance/Settings
+tree.administer.node.name          = Administer
 
 driver.sqlserver.description       =Microsoft JDBC Driver for SQL Server (MSSQL)
 driver.jTDS.description            =jTDS SQL Server (MSSQL) driver

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

@@ -37,6 +37,7 @@
             dialect="sqlserver">
 
             <tree path="sqlserver" label="SQL Server data source">
+                <folder type="org.jkiss.dbeaver.ext.mssql.model.SQLServerDatabase" label="%tree.databases.node.name" icon="#folder_database" description="%tree.databases.node.tip">
                 <items label="%tree.database.node.name" path="database" property="databases" icon="#database">
                     <folder type="org.jkiss.dbeaver.ext.mssql.model.SQLServerSchema" label="%tree.schemas.node.name" icon="#folder_schema" description="Schemas">
                         <items label="%tree.schema.node.name" path="schema" property="schemas" icon="#schema">
@@ -141,11 +142,15 @@
                         <items label="%tree.trigger.node.name" path="trigger" property="triggers" icon="#trigger"/>
                     </folder>
                 </items>
+                </folder>
                 <folder label="%tree.security.node.name" icon="#security" description="Security management">
                     <folder type="org.jkiss.dbeaver.ext.mssql.model.SQLServerLogin" label="%tree.logins.node.name" icon="#folder_user" description="Logins">
                         <items label="%tree.login.node.name" path="logins" property="logins" icon="#user"/>
                     </folder>
                 </folder>
+                <folder label="%tree.administer.node.name" icon="#folder_admin" description="tree.administer.node.description">
+                    <treeContribution category="connectionEditor"/>
+                </folder>
             </tree>
 
             <drivers managable="true">