From 22b4970de928d90feeeba4379df7e3160fb754db Mon Sep 17 00:00:00 2001 From: jurgen Date: Fri, 5 Jun 2015 09:47:37 +0000 Subject: [PATCH] Properties model refactoring Former-commit-id: 757faef3042ffc1c0834c246a4412c9dee9aa6ad --- .../dbeaver/model/edit/DBEObjectEditor.java | 4 +- .../model/impl/sql/edit/SQLObjectEditor.java | 8 ++-- .../properties/ObjectPropertyDescriptor.java | 3 +- .../properties/ProxyPropertyDescriptor.java | 38 ++++++++----------- .../ext/wmi/edit/WMINamespaceManager.java | 4 +- 5 files changed, 25 insertions(+), 32 deletions(-) diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/edit/DBEObjectEditor.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/edit/DBEObjectEditor.java index db6242c5a6..5b16dfe788 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/edit/DBEObjectEditor.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/edit/DBEObjectEditor.java @@ -18,8 +18,8 @@ package org.jkiss.dbeaver.model.edit; -import org.eclipse.ui.views.properties.IPropertyDescriptor; import org.jkiss.dbeaver.model.DBPObject; +import org.jkiss.dbeaver.model.DBPPropertyDescriptor; import org.jkiss.dbeaver.model.edit.prop.DBEPropertyHandler; /** @@ -29,6 +29,6 @@ public interface DBEObjectEditor extends DBEObje boolean canEditObject(OBJECT_TYPE object); - DBEPropertyHandler makePropertyHandler(OBJECT_TYPE object, IPropertyDescriptor property); + DBEPropertyHandler makePropertyHandler(OBJECT_TYPE object, DBPPropertyDescriptor property); } diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/sql/edit/SQLObjectEditor.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/sql/edit/SQLObjectEditor.java index 4c8eb8abbb..4c22b37563 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/sql/edit/SQLObjectEditor.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/sql/edit/SQLObjectEditor.java @@ -18,10 +18,10 @@ package org.jkiss.dbeaver.model.impl.sql.edit; import org.eclipse.ui.IWorkbenchWindow; -import org.eclipse.ui.views.properties.IPropertyDescriptor; import org.jkiss.dbeaver.DBException; import org.jkiss.dbeaver.core.CoreMessages; import org.jkiss.dbeaver.model.DBPNamedObject2; +import org.jkiss.dbeaver.model.DBPPropertyDescriptor; import org.jkiss.dbeaver.model.DBPSaveableObject; import org.jkiss.dbeaver.model.DBUtils; import org.jkiss.dbeaver.model.edit.*; @@ -56,7 +56,7 @@ public abstract class SQLObjectEditor makePropertyHandler(OBJECT_TYPE object, IPropertyDescriptor property) + public final DBEPropertyHandler makePropertyHandler(OBJECT_TYPE object, DBPPropertyDescriptor property) { return new PropertyHandler(property); } @@ -129,7 +129,7 @@ public abstract class SQLObjectEditor, DBEPropertyReflector, DBEPropertyValidator { - private PropertyHandler(IPropertyDescriptor property) + private PropertyHandler(DBPPropertyDescriptor property) { super(property); } diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/properties/ObjectPropertyDescriptor.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/properties/ObjectPropertyDescriptor.java index ba7680ea69..8b915c1098 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/properties/ObjectPropertyDescriptor.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/properties/ObjectPropertyDescriptor.java @@ -30,6 +30,7 @@ import org.eclipse.ui.views.properties.IPropertyDescriptor; import org.eclipse.ui.views.properties.IPropertySource; import org.jkiss.dbeaver.model.DBPNamedObject; import org.jkiss.dbeaver.model.DBPPersistedObject; +import org.jkiss.dbeaver.model.DBPPropertyDescriptor; import org.jkiss.dbeaver.model.meta.IPropertyValueEditorProvider; import org.jkiss.dbeaver.model.meta.IPropertyValueTransformer; import org.jkiss.dbeaver.model.meta.Property; @@ -53,7 +54,7 @@ import java.util.ResourceBundle; /** * ObjectPropertyDescriptor */ -public class ObjectPropertyDescriptor extends ObjectAttributeDescriptor implements IPropertyDescriptorEx, IPropertyValueListProvider +public class ObjectPropertyDescriptor extends ObjectAttributeDescriptor implements DBPPropertyDescriptor, IPropertyDescriptorEx, IPropertyValueListProvider { private final Property propInfo; private final String propName; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/properties/ProxyPropertyDescriptor.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/properties/ProxyPropertyDescriptor.java index 76833d70be..21942fb2b3 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/properties/ProxyPropertyDescriptor.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/properties/ProxyPropertyDescriptor.java @@ -21,16 +21,17 @@ import org.eclipse.jface.viewers.CellEditor; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.views.properties.IPropertyDescriptor; +import org.jkiss.dbeaver.model.DBPPropertyDescriptor; /** * ProxyPropertyDescriptor */ -public class ProxyPropertyDescriptor implements IPropertyDescriptor +public class ProxyPropertyDescriptor implements DBPPropertyDescriptor { - protected final IPropertyDescriptor original; + protected final DBPPropertyDescriptor original; - public ProxyPropertyDescriptor(IPropertyDescriptor original) + public ProxyPropertyDescriptor(DBPPropertyDescriptor original) { this.original = original; } @@ -41,12 +42,6 @@ public class ProxyPropertyDescriptor implements IPropertyDescriptor return this.original.getId(); } - @Override - public CellEditor createPropertyEditor(Composite parent) - { - return this.original.createPropertyEditor(parent); - } - @Override public String getCategory() { @@ -60,33 +55,30 @@ public class ProxyPropertyDescriptor implements IPropertyDescriptor } @Override - public String getDisplayName() - { - return this.original.getDisplayName(); + public Class getDataType() { + return original.getDataType(); } @Override - public String[] getFilterFlags() - { - return this.original.getFilterFlags(); + public boolean isRequired() { + return original.isRequired(); } @Override - public Object getHelpContextIds() - { - return this.original.getHelpContextIds(); + public Object getDefaultValue() { + return original.getDefaultValue(); } @Override - public ILabelProvider getLabelProvider() - { - return this.original.getLabelProvider(); + public boolean isEditable(Object object) { + return original.isEditable(object); } @Override - public boolean isCompatibleWith(IPropertyDescriptor anotherProperty) + public String getDisplayName() { - return this.original.isCompatibleWith(anotherProperty); + return this.original.getDisplayName(); } + } diff --git a/plugins/org.jkiss.dbeaver.wmi/src/org/jkiss/dbeaver/ext/wmi/edit/WMINamespaceManager.java b/plugins/org.jkiss.dbeaver.wmi/src/org/jkiss/dbeaver/ext/wmi/edit/WMINamespaceManager.java index 9ff8a19f21..2ebd6f83c2 100644 --- a/plugins/org.jkiss.dbeaver.wmi/src/org/jkiss/dbeaver/ext/wmi/edit/WMINamespaceManager.java +++ b/plugins/org.jkiss.dbeaver.wmi/src/org/jkiss/dbeaver/ext/wmi/edit/WMINamespaceManager.java @@ -17,8 +17,8 @@ */ package org.jkiss.dbeaver.ext.wmi.edit; -import org.eclipse.ui.views.properties.IPropertyDescriptor; import org.jkiss.dbeaver.DBException; +import org.jkiss.dbeaver.model.DBPPropertyDescriptor; import org.jkiss.dbeaver.model.edit.DBEPersistAction; import org.jkiss.dbeaver.ext.wmi.model.WMINamespace; import org.jkiss.dbeaver.model.edit.DBECommand; @@ -39,7 +39,7 @@ public class WMINamespaceManager extends AbstractObjectManager imp } @Override - public DBEPropertyHandler makePropertyHandler(WMINamespace object, IPropertyDescriptor property) + public DBEPropertyHandler makePropertyHandler(WMINamespace object, DBPPropertyDescriptor property) { return null; } -- GitLab