From b658c5fae040ed156290dec5d86f4603fc125cbb Mon Sep 17 00:00:00 2001 From: jurgen Date: Wed, 24 Jun 2015 09:59:11 +0000 Subject: [PATCH] Properties moved to runtime --- .../dbeaver/runtime/properties/ILazyPropertyLoadListener.java | 1 - .../entity => runtime}/properties/PropertiesContributor.java | 3 +-- .../dbeaver/runtime/properties/PropertySourceAbstract.java | 1 - .../jkiss/dbeaver/tools/compare/CompareObjectsExecutor.java | 2 +- .../org/jkiss/dbeaver/ui/controls/PropertyPageStandard.java | 2 +- .../ui/editors/entity/properties/FolderPageProperties.java | 1 + .../ui/editors/entity/properties/ObjectPropertiesEditor.java | 1 + 7 files changed, 5 insertions(+), 6 deletions(-) rename plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/{ui/editors/entity => runtime}/properties/PropertiesContributor.java (92%) diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/properties/ILazyPropertyLoadListener.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/properties/ILazyPropertyLoadListener.java index 0e3b18ebb5..93db90c99e 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/properties/ILazyPropertyLoadListener.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/properties/ILazyPropertyLoadListener.java @@ -18,7 +18,6 @@ package org.jkiss.dbeaver.runtime.properties; -import org.eclipse.ui.views.properties.IPropertyDescriptor; import org.jkiss.dbeaver.model.DBPPropertyDescriptor; /** diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/entity/properties/PropertiesContributor.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/properties/PropertiesContributor.java similarity index 92% rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/entity/properties/PropertiesContributor.java rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/properties/PropertiesContributor.java index 2e149457b3..165137f7ce 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/entity/properties/PropertiesContributor.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/properties/PropertiesContributor.java @@ -16,11 +16,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -package org.jkiss.dbeaver.ui.editors.entity.properties; +package org.jkiss.dbeaver.runtime.properties; import org.jkiss.dbeaver.core.CoreMessages; import org.jkiss.dbeaver.model.DBPPropertyDescriptor; -import org.jkiss.dbeaver.runtime.properties.ILazyPropertyLoadListener; import java.util.ArrayList; import java.util.List; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/properties/PropertySourceAbstract.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/properties/PropertySourceAbstract.java index afc85c2ba1..4f426ab2c0 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/properties/PropertySourceAbstract.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/properties/PropertySourceAbstract.java @@ -31,7 +31,6 @@ import org.jkiss.dbeaver.runtime.load.AbstractLoadService; import org.jkiss.dbeaver.runtime.load.ILoadVisualizer; import org.jkiss.dbeaver.runtime.load.LoadingUtils; import org.jkiss.dbeaver.runtime.load.jobs.LoadingJob; -import org.jkiss.dbeaver.ui.editors.entity.properties.PropertiesContributor; import org.jkiss.utils.ArrayUtils; import java.lang.reflect.InvocationTargetException; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/compare/CompareObjectsExecutor.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/compare/CompareObjectsExecutor.java index 2250e23b5b..9993b30eae 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/compare/CompareObjectsExecutor.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/compare/CompareObjectsExecutor.java @@ -29,7 +29,7 @@ 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.ui.editors.entity.properties.PropertiesContributor; +import org.jkiss.dbeaver.runtime.properties.PropertiesContributor; import org.jkiss.dbeaver.runtime.properties.DataSourcePropertyFilter; import org.jkiss.dbeaver.runtime.properties.ILazyPropertyLoadListener; import org.jkiss.dbeaver.runtime.properties.ObjectPropertyDescriptor; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/PropertyPageStandard.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/PropertyPageStandard.java index de01e75935..36a86e75cc 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/PropertyPageStandard.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/PropertyPageStandard.java @@ -23,7 +23,7 @@ import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.views.properties.*; import org.jkiss.dbeaver.model.DBPPropertyDescriptor; import org.jkiss.dbeaver.runtime.RuntimeUtils; -import org.jkiss.dbeaver.ui.editors.entity.properties.PropertiesContributor; +import org.jkiss.dbeaver.runtime.properties.PropertiesContributor; import org.jkiss.dbeaver.runtime.properties.ILazyPropertyLoadListener; import org.jkiss.utils.ArrayUtils; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/entity/properties/FolderPageProperties.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/entity/properties/FolderPageProperties.java index d781e30e3a..e5df3984a6 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/entity/properties/FolderPageProperties.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/entity/properties/FolderPageProperties.java @@ -28,6 +28,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.progress.UIJob; import org.jkiss.dbeaver.model.*; import org.jkiss.dbeaver.model.struct.DBSObject; +import org.jkiss.dbeaver.runtime.properties.PropertiesContributor; import org.jkiss.dbeaver.ui.UIUtils; import org.jkiss.dbeaver.ui.controls.folders.FolderPage; import org.jkiss.dbeaver.ui.editors.IDatabaseEditorInput; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/entity/properties/ObjectPropertiesEditor.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/entity/properties/ObjectPropertiesEditor.java index 9597bae6e2..3a285450df 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/entity/properties/ObjectPropertiesEditor.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/entity/properties/ObjectPropertiesEditor.java @@ -43,6 +43,7 @@ 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.runtime.VoidProgressMonitor; +import org.jkiss.dbeaver.runtime.properties.PropertiesContributor; import org.jkiss.dbeaver.ui.*; import org.jkiss.dbeaver.ui.controls.ObjectEditorPageControl; import org.jkiss.dbeaver.ui.controls.ProgressPageControl; -- GitLab