Runtime model refactoring

plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF

@@ -47,7 +47,7 @@ Export-Package: org.jkiss.dbeaver,
  org.jkiss.dbeaver.model.virtual,
  org.jkiss.dbeaver.registry,
  org.jkiss.dbeaver.registry.encode,
- org.jkiss.dbeaver.registry.tree,
+ org.jkiss.dbeaver.model.navigator.tree,
  org.jkiss.dbeaver.registry.updater,
  org.jkiss.dbeaver.runtime,
  org.jkiss.dbeaver.runtime.jobs,

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/DBUtils.java

@@ -1257,7 +1257,7 @@ public final class DBUtils {
         if (executionContext != null && executionContext.isConnected()) {
             return getAdapter(DBCTransactionManager.class, executionContext);
         }
-        return null;//VoidTransactionManager.INSTANCE;
+        return null;
     }
 
     public static DBSProcedure findProcedure(DBCSession session, String queryString) throws DBException {

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/AbstractContextDescriptor.java → plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/AbstractContextDescriptor.java

@@ -16,7 +16,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-package org.jkiss.dbeaver.registry;
+package org.jkiss.dbeaver.model.impl;
 
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.jkiss.dbeaver.DBeaverConstants;
@@ -31,17 +31,19 @@ import java.util.List;
  */
 public abstract class AbstractContextDescriptor extends AbstractDescriptor
 {
+    private static final String OBJECT_TYPE = "objectType";
+
     private List<ObjectType> objectTypes = new ArrayList<ObjectType>();
 
     public AbstractContextDescriptor(IConfigurationElement config)
     {
         super(config == null ? DBeaverConstants.PLUGIN_ID : config.getContributor().getName());
         if (config != null) {
-            String objectType = config.getAttribute(RegistryConstants.ATTR_OBJECT_TYPE);
+            String objectType = config.getAttribute(OBJECT_TYPE);
             if (objectType != null) {
                 objectTypes.add(new ObjectType(objectType));
             }
-            for (IConfigurationElement typeCfg : config.getChildren(RegistryConstants.TAG_OBJECT_TYPE)) {
+            for (IConfigurationElement typeCfg : config.getChildren(OBJECT_TYPE)) {
                 objectTypes.add(new ObjectType(typeCfg));
             }
         }

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/AbstractDescriptor.java → plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/AbstractDescriptor.java

@@ -15,10 +15,12 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-package org.jkiss.dbeaver.registry;
+package org.jkiss.dbeaver.model.impl;
 
 import org.apache.commons.jexl2.Expression;
 import org.apache.commons.jexl2.JexlContext;
+import org.apache.commons.jexl2.JexlEngine;
+import org.apache.commons.jexl2.JexlException;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.Platform;
 import org.jkiss.dbeaver.DBException;
@@ -26,7 +28,6 @@ import org.jkiss.dbeaver.core.DBeaverActivator;
 import org.jkiss.dbeaver.core.Log;
 import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.model.DBPImage;
-import org.jkiss.dbeaver.runtime.RuntimeUtils;
 import org.jkiss.utils.CommonUtils;
 import org.osgi.framework.Bundle;
 
@@ -40,7 +41,27 @@ public abstract class AbstractDescriptor {
     public static final String VAR_OBJECT = "object";
     public static final String VAR_CONTEXT = "context";
 
+    private static JexlEngine jexlEngine;
+
+    public static Expression parseExpression(String exprString) throws DBException
+    {
+        synchronized (AbstractDescriptor.class) {
+            if (jexlEngine == null) {
+                jexlEngine = new JexlEngine(null, null, null, null);
+                jexlEngine.setCache(100);
+            }
+        }
+        try {
+            return jexlEngine.createExpression(exprString);
+        } catch (JexlException e) {
+            throw new DBException("Bad expression", e);
+        }
+    }
+
     protected class ObjectType {
+        private static final String ATTR_NAME = "name";
+        private static final String ATTR_IF = "if";
+
         private final String implName;
         private Class<?> implClass;
         private Expression expression;
@@ -52,11 +73,11 @@ public abstract class AbstractDescriptor {
 
         ObjectType(IConfigurationElement cfg)
         {
-            this.implName = cfg.getAttribute(RegistryConstants.ATTR_NAME);
-            String condition = cfg.getAttribute(RegistryConstants.ATTR_IF);
+            this.implName = cfg.getAttribute(ATTR_NAME);
+            String condition = cfg.getAttribute(ATTR_IF);
             if (!CommonUtils.isEmpty(condition)) {
                 try {
-                    this.expression = RuntimeUtils.parseExpression(condition);
+                    this.expression = parseExpression(condition);
                 } catch (DBException ex) {
                     log.warn("Can't parse object type expression: " + condition, ex); //$NON-NLS-1$
                 }

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/VoidTransactionManager.java

-/*
- * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2015 Serge Rieder (serge@jkiss.org)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License (version 2)
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-package org.jkiss.dbeaver.model.impl;
-
-import org.jkiss.code.Nullable;
-import org.jkiss.dbeaver.model.DBPTransactionIsolation;
-import org.jkiss.dbeaver.model.exec.DBCException;
-import org.jkiss.dbeaver.model.exec.DBCSavepoint;
-import org.jkiss.dbeaver.model.exec.DBCSession;
-import org.jkiss.dbeaver.model.exec.DBCTransactionManager;
-import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
-
-/**
- * VoidTransactionManager
- */
-public class VoidTransactionManager implements DBCTransactionManager {
-
-    public static final VoidTransactionManager INSTANCE = new VoidTransactionManager();
-
-    @Override
-    public DBPTransactionIsolation getTransactionIsolation() throws DBCException {
-        return null;
-    }
-
-    @Override
-    public void setTransactionIsolation(DBRProgressMonitor monitor, DBPTransactionIsolation transactionIsolation) throws DBCException {
-
-    }
-
-    @Override
-    public boolean isAutoCommit() throws DBCException {
-        return true;
-    }
-
-    @Override
-    public void setAutoCommit(DBRProgressMonitor monitor, boolean autoCommit) throws DBCException {
-    }
-
-    @Override
-    public boolean supportsSavepoints() {
-        return false;
-    }
-
-    @Override
-    public DBCSavepoint setSavepoint(DBRProgressMonitor monitor, String name) throws DBCException {
-        throw new DBCException("Transactions not supported");
-    }
-
-    @Override
-    public void releaseSavepoint(DBRProgressMonitor monitor, DBCSavepoint savepoint) throws DBCException {
-        throw new DBCException("Transactions not supported");
-    }
-
-    @Override
-    public void commit(DBCSession session) throws DBCException {
-    }
-
-    @Override
-    public void rollback(DBCSession session, @Nullable DBCSavepoint savepoint) throws DBCException {
-    }
-}

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/navigator/DBNDataSource.java

@@ -32,7 +32,7 @@ import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.model.struct.DBSDataSourceContainer;
 import org.jkiss.dbeaver.model.struct.DBSObject;
 import org.jkiss.dbeaver.registry.DataSourceDescriptor;
-import org.jkiss.dbeaver.registry.tree.DBXTreeNode;
+import org.jkiss.dbeaver.model.navigator.meta.DBXTreeNode;
 import org.jkiss.utils.CommonUtils;
 
 import java.util.Collection;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/navigator/DBNDatabaseFolder.java

@@ -26,8 +26,8 @@ import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.model.struct.DBSFolder;
 import org.jkiss.dbeaver.model.struct.DBSObject;
 import org.jkiss.dbeaver.model.struct.DBSWrapper;
-import org.jkiss.dbeaver.registry.tree.DBXTreeFolder;
-import org.jkiss.dbeaver.registry.tree.DBXTreeNode;
+import org.jkiss.dbeaver.model.navigator.meta.DBXTreeFolder;
+import org.jkiss.dbeaver.model.navigator.meta.DBXTreeNode;
 import org.jkiss.utils.CommonUtils;
 
 import java.util.ArrayList;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/navigator/DBNDatabaseItem.java

@@ -19,7 +19,7 @@ package org.jkiss.dbeaver.model.navigator;
 
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.model.struct.DBSObject;
-import org.jkiss.dbeaver.registry.tree.DBXTreeItem;
+import org.jkiss.dbeaver.model.navigator.meta.DBXTreeItem;
 
 /**
  * DBNDatabaseItem

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/navigator/DBNDatabaseNode.java

@@ -27,10 +27,10 @@ import org.jkiss.dbeaver.model.runtime.DBRProgressListener;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.model.struct.*;
 import org.jkiss.dbeaver.registry.DataSourceDescriptor;
-import org.jkiss.dbeaver.registry.tree.DBXTreeFolder;
-import org.jkiss.dbeaver.registry.tree.DBXTreeItem;
-import org.jkiss.dbeaver.registry.tree.DBXTreeNode;
-import org.jkiss.dbeaver.registry.tree.DBXTreeObject;
+import org.jkiss.dbeaver.model.navigator.meta.DBXTreeFolder;
+import org.jkiss.dbeaver.model.navigator.meta.DBXTreeItem;
+import org.jkiss.dbeaver.model.navigator.meta.DBXTreeNode;
+import org.jkiss.dbeaver.model.navigator.meta.DBXTreeObject;
 import org.jkiss.dbeaver.utils.GeneralUtils;
 import org.jkiss.utils.BeanUtils;
 import org.jkiss.utils.CommonUtils;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/navigator/DBNDatabaseObject.java

@@ -23,7 +23,7 @@ import org.jkiss.dbeaver.model.meta.Property;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.model.struct.DBSObject;
 import org.jkiss.dbeaver.model.struct.DBSWrapper;
-import org.jkiss.dbeaver.registry.tree.DBXTreeObject;
+import org.jkiss.dbeaver.model.navigator.meta.DBXTreeObject;
 import org.jkiss.utils.CommonUtils;
 
 /**

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/navigator/DBNModel.java

@@ -31,7 +31,7 @@ import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.model.struct.DBSObject;
 import org.jkiss.dbeaver.model.struct.DBSObjectState;
 import org.jkiss.dbeaver.registry.ProjectRegistry;
-import org.jkiss.dbeaver.registry.tree.DBXTreeFolder;
+import org.jkiss.dbeaver.model.navigator.meta.DBXTreeFolder;
 import org.jkiss.utils.CommonUtils;
 
 import java.util.ArrayList;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/tree/DBXTreeFolder.java → plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/navigator/meta/DBXTreeFolder.java

@@ -15,10 +15,10 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-package org.jkiss.dbeaver.registry.tree;
+package org.jkiss.dbeaver.model.navigator.meta;
 
 import org.jkiss.dbeaver.model.DBPDataSource;
-import org.jkiss.dbeaver.registry.AbstractDescriptor;
+import org.jkiss.dbeaver.model.impl.AbstractDescriptor;
 
 /**
  * DBXTreeFolder

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/tree/DBXTreeIcon.java → plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/navigator/meta/DBXTreeIcon.java

@@ -16,13 +16,13 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-package org.jkiss.dbeaver.registry.tree;
+package org.jkiss.dbeaver.model.navigator.meta;
 
 import org.apache.commons.jexl2.Expression;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.core.Log;
 import org.jkiss.dbeaver.model.DBPImage;
-import org.jkiss.dbeaver.runtime.RuntimeUtils;
+import org.jkiss.dbeaver.model.impl.AbstractDescriptor;
 
 /**
  * DBXTreeIcon
@@ -40,7 +40,7 @@ public class DBXTreeIcon
         this.exprString = exprString;
         this.icon = icon;
         try {
-            this.expression = RuntimeUtils.parseExpression(exprString);
+            this.expression = AbstractDescriptor.parseExpression(exprString);
         } catch (DBException ex) {
             log.warn("Can't parse icon expression: " + exprString, ex);
         }

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/tree/DBXTreeItem.java → plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/navigator/meta/DBXTreeItem.java

@@ -15,11 +15,11 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-package org.jkiss.dbeaver.registry.tree;
+package org.jkiss.dbeaver.model.navigator.meta;
 
 import org.jkiss.dbeaver.model.DBPTermProvider;
 import org.jkiss.dbeaver.model.DBPDataSource;
-import org.jkiss.dbeaver.registry.AbstractDescriptor;
+import org.jkiss.dbeaver.model.impl.AbstractDescriptor;
 
 /**
  * DBXTreeItem

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/tree/DBXTreeNode.java → plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/navigator/meta/DBXTreeNode.java

@@ -15,7 +15,7 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-package org.jkiss.dbeaver.registry.tree;
+package org.jkiss.dbeaver.model.navigator.meta;
 
 import org.apache.commons.jexl2.Expression;
 import org.apache.commons.jexl2.JexlContext;
@@ -26,8 +26,7 @@ import org.jkiss.dbeaver.model.DBPDataSource;
 import org.jkiss.dbeaver.model.DBPImage;
 import org.jkiss.dbeaver.model.navigator.DBNDatabaseNode;
 import org.jkiss.dbeaver.model.navigator.DBNNode;
-import org.jkiss.dbeaver.registry.AbstractDescriptor;
-import org.jkiss.dbeaver.runtime.RuntimeUtils;
+import org.jkiss.dbeaver.model.impl.AbstractDescriptor;
 import org.jkiss.utils.CommonUtils;
 
 import java.util.ArrayList;
@@ -65,7 +64,7 @@ public abstract class DBXTreeNode
         this.virtual = virtual;
         if (!CommonUtils.isEmpty(visibleIf)) {
             try {
-                this.visibleIf = RuntimeUtils.parseExpression(visibleIf);
+                this.visibleIf = AbstractDescriptor.parseExpression(visibleIf);
             } catch (DBException e) {
                 log.warn(e);
             }

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/tree/DBXTreeObject.java → plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/navigator/meta/DBXTreeObject.java

@@ -15,10 +15,10 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-package org.jkiss.dbeaver.registry.tree;
+package org.jkiss.dbeaver.model.navigator.meta;
 
 import org.jkiss.dbeaver.model.DBPDataSource;
-import org.jkiss.dbeaver.registry.AbstractDescriptor;
+import org.jkiss.dbeaver.model.impl.AbstractDescriptor;
 
 /**
  * DBXTreeObject

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataFormatterDescriptor.java

@@ -21,6 +21,7 @@ package org.jkiss.dbeaver.registry;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.jkiss.dbeaver.model.data.DBDDataFormatter;
 import org.jkiss.dbeaver.model.data.DBDDataFormatterSample;
+import org.jkiss.dbeaver.model.impl.AbstractDescriptor;
 import org.jkiss.dbeaver.model.impl.PropertyDescriptor;
 
 import java.util.ArrayList;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceProviderDescriptor.java

@@ -28,8 +28,9 @@ import org.jkiss.dbeaver.core.DBeaverCore;
 import org.jkiss.dbeaver.model.DBPDataSourceProvider;
 import org.jkiss.dbeaver.model.DBPImage;
 import org.jkiss.dbeaver.model.DBPPropertyDescriptor;
+import org.jkiss.dbeaver.model.impl.AbstractDescriptor;
 import org.jkiss.dbeaver.model.struct.DBSObject;
-import org.jkiss.dbeaver.registry.tree.*;
+import org.jkiss.dbeaver.model.navigator.meta.*;
 import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.ui.NavigatorUtils;
 import org.jkiss.dbeaver.model.impl.PropertyDescriptor;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceViewDescriptor.java

@@ -20,6 +20,7 @@ package org.jkiss.dbeaver.registry;
 
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.jkiss.dbeaver.model.DBPImage;
+import org.jkiss.dbeaver.model.impl.AbstractDescriptor;
 
 /**
  * DataSourceViewDescriptor

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataTypeProviderDescriptor.java

@@ -20,6 +20,7 @@ package org.jkiss.dbeaver.registry;
 import org.jkiss.dbeaver.core.Log;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.jkiss.dbeaver.model.data.DBDValueHandlerProvider;
+import org.jkiss.dbeaver.model.impl.AbstractDescriptor;
 import org.jkiss.dbeaver.model.struct.DBSTypedObject;
 
 import java.lang.reflect.Field;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DriverDescriptor.java

@@ -33,6 +33,7 @@ import org.jkiss.dbeaver.core.DBeaverCore;
 import org.jkiss.dbeaver.core.DBeaverUI;
 import org.jkiss.dbeaver.core.Log;
 import org.jkiss.dbeaver.model.*;
+import org.jkiss.dbeaver.model.impl.AbstractDescriptor;
 import org.jkiss.dbeaver.model.meta.Property;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.model.runtime.DBRRunnableContext;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/ExternalResourceDescriptor.java

@@ -19,6 +19,7 @@ package org.jkiss.dbeaver.registry;
 
 import org.jkiss.dbeaver.core.Log;
 import org.eclipse.core.runtime.IConfigurationElement;
+import org.jkiss.dbeaver.model.impl.AbstractDescriptor;
 
 import java.net.URL;
 

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/NetworkHandlerDescriptor.java

@@ -19,6 +19,7 @@ package org.jkiss.dbeaver.registry;
 
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.jkiss.dbeaver.DBException;
+import org.jkiss.dbeaver.model.impl.AbstractContextDescriptor;
 import org.jkiss.dbeaver.ui.IObjectPropertyConfigurator;
 import org.jkiss.dbeaver.model.net.DBWHandlerConfiguration;
 import org.jkiss.dbeaver.model.net.DBWHandlerType;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/PluginServiceRegistry.java

@@ -21,6 +21,7 @@ import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IExtensionRegistry;
 import org.eclipse.core.runtime.Platform;
 import org.jkiss.dbeaver.DBException;
+import org.jkiss.dbeaver.model.impl.AbstractDescriptor;
 import org.jkiss.dbeaver.runtime.IPluginService;
 
 import java.util.ArrayList;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/ResourceHandlerDescriptor.java

@@ -25,6 +25,7 @@ import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.content.IContentDescription;
 import org.eclipse.core.runtime.content.IContentType;
+import org.jkiss.dbeaver.model.impl.AbstractDescriptor;
 import org.jkiss.dbeaver.model.project.DBPResourceHandler;
 import org.jkiss.utils.ArrayUtils;
 import org.jkiss.utils.CommonUtils;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/ToolDescriptor.java

@@ -22,6 +22,7 @@ import org.eclipse.core.runtime.IConfigurationElement;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.model.DBPImage;
 import org.jkiss.dbeaver.model.DBPObject;
+import org.jkiss.dbeaver.model.impl.AbstractContextDescriptor;
 import org.jkiss.dbeaver.model.struct.DBSObject;
 import org.jkiss.dbeaver.tools.IExternalTool;
 import org.jkiss.utils.CommonUtils;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/ToolGroupDescriptor.java

@@ -21,6 +21,7 @@ package org.jkiss.dbeaver.registry;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.jkiss.dbeaver.model.DBPImage;
 import org.jkiss.dbeaver.model.DBPObject;
+import org.jkiss.dbeaver.model.impl.AbstractContextDescriptor;
 import org.jkiss.dbeaver.model.struct.DBSObject;
 import org.jkiss.utils.CommonUtils;
 

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/editor/EntityEditorDescriptor.java

@@ -25,7 +25,7 @@ import org.jkiss.dbeaver.core.CoreMessages;
 import org.jkiss.dbeaver.core.Log;
 import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.model.DBPImage;
-import org.jkiss.dbeaver.registry.AbstractContextDescriptor;
+import org.jkiss.dbeaver.model.impl.AbstractContextDescriptor;
 import org.jkiss.dbeaver.registry.RegistryConstants;
 import org.jkiss.dbeaver.ui.IActionConstants;
 import org.jkiss.dbeaver.ui.editors.IDatabaseEditorInput;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/editor/EntityManagerDescriptor.java

@@ -20,7 +20,7 @@ package org.jkiss.dbeaver.registry.editor;
 
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.jkiss.dbeaver.model.edit.DBEObjectManager;
-import org.jkiss.dbeaver.registry.AbstractDescriptor;
+import org.jkiss.dbeaver.model.impl.AbstractDescriptor;
 import org.jkiss.dbeaver.registry.RegistryConstants;
 
 /**

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/transfer/DataTransferNodeDescriptor.java

@@ -23,7 +23,7 @@ import org.eclipse.jface.wizard.IWizardPage;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.core.Log;
 import org.jkiss.dbeaver.model.DBPImage;
-import org.jkiss.dbeaver.registry.AbstractDescriptor;
+import org.jkiss.dbeaver.model.impl.AbstractDescriptor;
 import org.jkiss.dbeaver.registry.RegistryConstants;
 import org.jkiss.dbeaver.tools.transfer.IDataTransferNode;
 import org.jkiss.dbeaver.tools.transfer.IDataTransferSettings;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/transfer/DataTransferProcessorDescriptor.java

@@ -22,7 +22,7 @@ import org.eclipse.core.runtime.IConfigurationElement;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.model.DBPImage;
 import org.jkiss.dbeaver.model.DBPPropertyDescriptor;
-import org.jkiss.dbeaver.registry.AbstractDescriptor;
+import org.jkiss.dbeaver.model.impl.AbstractDescriptor;
 import org.jkiss.dbeaver.registry.RegistryConstants;
 import org.jkiss.dbeaver.model.impl.PropertyDescriptor;
 import org.jkiss.dbeaver.tools.transfer.IDataTransferProcessor;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/RuntimeUtils.java

@@ -31,9 +31,7 @@ import org.jkiss.dbeaver.core.DBeaverCore;
 import org.jkiss.dbeaver.core.Log;
 import org.jkiss.dbeaver.model.DBPPreferenceStore;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
-import org.jkiss.dbeaver.model.runtime.DBRRunnableContext;
 import org.jkiss.dbeaver.model.runtime.DBRRunnableWithProgress;
-import org.jkiss.dbeaver.model.runtime.MonitorRunnableContext;
 import org.jkiss.dbeaver.runtime.load.ILoadService;
 import org.jkiss.dbeaver.runtime.load.ILoadVisualizer;
 import org.jkiss.dbeaver.runtime.load.jobs.LoadingJob;
@@ -58,8 +56,6 @@ import java.util.Locale;
 public class RuntimeUtils {
     static final Log log = Log.getLog(RuntimeUtils.class);
 
-    private static JexlEngine jexlEngine;
-
     @SuppressWarnings("unchecked")
     public static <T> T getObjectAdapter(Object adapter, Class<T> objectType)
     {
@@ -295,21 +291,6 @@ public class RuntimeUtils {
 */
     }
 
-    public static Expression parseExpression(String exprString) throws DBException
-    {
-        synchronized (RuntimeUtils.class) {
-            if (jexlEngine == null) {
-                jexlEngine = new JexlEngine(null, null, null, null);
-                jexlEngine.setCache(100);
-            }
-        }
-        try {
-            return jexlEngine.createExpression(exprString);
-        } catch (JexlException e) {
-            throw new DBException("Bad expression", e);
-        }
-    }
-
     public static boolean isTypeSupported(Class<?> type, Class[] supportedTypes)
     {
         if (type == null || ArrayUtils.isEmpty(supportedTypes)) {

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/compare/CompareObjectsExecutor.java

@@ -28,7 +28,7 @@ import org.jkiss.dbeaver.model.runtime.DBRProgressListener;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.model.struct.DBSObject;
 import org.jkiss.dbeaver.model.struct.DBSObjectContainer;
-import org.jkiss.dbeaver.registry.tree.DBXTreeNode;
+import org.jkiss.dbeaver.model.navigator.meta.DBXTreeNode;
 import org.jkiss.dbeaver.runtime.properties.PropertiesContributor;
 import org.jkiss.dbeaver.runtime.properties.DataSourcePropertyFilter;
 import org.jkiss.dbeaver.runtime.properties.ILazyPropertyLoadListener;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/compare/CompareObjectsHandler.java

@@ -27,7 +27,7 @@ import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.handlers.HandlerUtil;
 import org.jkiss.dbeaver.model.navigator.DBNDatabaseFolder;
 import org.jkiss.dbeaver.model.navigator.DBNDatabaseNode;
-import org.jkiss.dbeaver.registry.tree.DBXTreeNode;
+import org.jkiss.dbeaver.model.navigator.meta.DBXTreeNode;
 import org.jkiss.dbeaver.ui.UIUtils;
 
 import java.util.ArrayList;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/navigator/NavigatorHandlerConfigureFilter.java

@@ -30,7 +30,7 @@ import org.jkiss.dbeaver.model.navigator.DBNDatabaseFolder;
 import org.jkiss.dbeaver.model.navigator.DBNNode;
 import org.jkiss.dbeaver.model.struct.DBSObject;
 import org.jkiss.dbeaver.model.struct.DBSObjectFilter;
-import org.jkiss.dbeaver.registry.tree.DBXTreeItem;
+import org.jkiss.dbeaver.model.navigator.meta.DBXTreeItem;
 import org.jkiss.dbeaver.ui.NavigatorUtils;
 import org.jkiss.dbeaver.ui.dialogs.connection.EditObjectFilterDialog;
 

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/itemlist/ItemListControl.java

@@ -30,7 +30,7 @@ import org.jkiss.dbeaver.model.navigator.DBNDatabaseFolder;
 import org.jkiss.dbeaver.model.navigator.DBNDatabaseNode;
 import org.jkiss.dbeaver.model.navigator.DBNNode;
 import org.jkiss.dbeaver.model.struct.DBSWrapper;
-import org.jkiss.dbeaver.registry.tree.DBXTreeNode;
+import org.jkiss.dbeaver.model.navigator.meta.DBXTreeNode;
 import org.jkiss.dbeaver.runtime.RuntimeUtils;
 import org.jkiss.dbeaver.runtime.load.DatabaseLoadService;
 import org.jkiss.dbeaver.runtime.load.jobs.LoadingJob;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/itemlist/NodeListControl.java

@@ -39,8 +39,8 @@ import org.jkiss.dbeaver.model.struct.DBSDataSourceContainer;
 import org.jkiss.dbeaver.model.struct.DBSObject;
 import org.jkiss.dbeaver.model.struct.DBSWrapper;
 import org.jkiss.dbeaver.registry.editor.EntityEditorsRegistry;
-import org.jkiss.dbeaver.registry.tree.DBXTreeFolder;
-import org.jkiss.dbeaver.registry.tree.DBXTreeNode;
+import org.jkiss.dbeaver.model.navigator.meta.DBXTreeFolder;
+import org.jkiss.dbeaver.model.navigator.meta.DBXTreeNode;
 import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor;
 import org.jkiss.dbeaver.ui.INavigatorModelView;
 import org.jkiss.dbeaver.ui.NavigatorUtils;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetPresentationDescriptor.java

@@ -22,7 +22,7 @@ import org.eclipse.core.runtime.IConfigurationElement;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.model.DBPImage;
 import org.jkiss.dbeaver.model.exec.DBCResultSet;
-import org.jkiss.dbeaver.registry.AbstractContextDescriptor;
+import org.jkiss.dbeaver.model.impl.AbstractContextDescriptor;
 import org.jkiss.dbeaver.registry.RegistryConstants;
 import org.jkiss.utils.CommonUtils;
 

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/data/registry/DataManagerDescriptor.java

@@ -21,6 +21,7 @@ import org.eclipse.core.runtime.IConfigurationElement;
 import org.jkiss.dbeaver.core.Log;
 import org.jkiss.dbeaver.model.DBPDataKind;
 import org.jkiss.dbeaver.model.DBPDataSource;
+import org.jkiss.dbeaver.model.impl.AbstractDescriptor;
 import org.jkiss.dbeaver.registry.*;
 import org.jkiss.dbeaver.ui.data.IValueManager;
 import org.jkiss.utils.CommonUtils;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/entity/properties/FolderPageNode.java

@@ -27,7 +27,7 @@ import org.eclipse.ui.part.MultiPageEditorSite;
 import org.jkiss.dbeaver.model.navigator.DBNDatabaseNode;
 import org.jkiss.dbeaver.model.navigator.DBNEvent;
 import org.jkiss.dbeaver.model.navigator.DBNNode;
-import org.jkiss.dbeaver.registry.tree.DBXTreeNode;
+import org.jkiss.dbeaver.model.navigator.meta.DBXTreeNode;
 import org.jkiss.dbeaver.ui.*;
 import org.jkiss.dbeaver.ui.controls.ProgressPageControl;
 import org.jkiss.dbeaver.ui.controls.folders.FolderPage;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/entity/properties/ObjectPropertiesEditor.java

@@ -40,8 +40,8 @@ import org.jkiss.dbeaver.model.runtime.DBRRunnableWithProgress;
 import org.jkiss.dbeaver.model.struct.DBSObject;
 import org.jkiss.dbeaver.registry.editor.EntityEditorDescriptor;
 import org.jkiss.dbeaver.registry.editor.EntityEditorsRegistry;
-import org.jkiss.dbeaver.registry.tree.DBXTreeItem;
-import org.jkiss.dbeaver.registry.tree.DBXTreeNode;
+import org.jkiss.dbeaver.model.navigator.meta.DBXTreeItem;
+import org.jkiss.dbeaver.model.navigator.meta.DBXTreeNode;
 import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor;
 import org.jkiss.dbeaver.runtime.properties.PropertiesContributor;
 import org.jkiss.dbeaver.ui.*;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/search/ObjectSearchProvider.java

@@ -21,7 +21,7 @@ import org.eclipse.core.runtime.IConfigurationElement;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.core.Log;
 import org.jkiss.dbeaver.model.DBPImage;
-import org.jkiss.dbeaver.registry.AbstractDescriptor;
+import org.jkiss.dbeaver.model.impl.AbstractDescriptor;
 import org.jkiss.dbeaver.registry.RegistryConstants;
 
 public class ObjectSearchProvider extends AbstractDescriptor

plugins/org.jkiss.dbeaver.generic/src/org/jkiss/dbeaver/ext/generic/GenericDataSourceProvider.java

@@ -30,7 +30,7 @@ import org.jkiss.dbeaver.model.DBPDriver;
 import org.jkiss.dbeaver.model.impl.jdbc.JDBCDataSourceProvider;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.model.struct.DBSDataSourceContainer;
-import org.jkiss.dbeaver.registry.AbstractDescriptor;
+import org.jkiss.dbeaver.model.impl.AbstractDescriptor;
 import org.jkiss.dbeaver.registry.DriverDescriptor;
 import org.jkiss.utils.CommonUtils;