From d9499d2d53dbb9dd70574fef141a16664c0908e6 Mon Sep 17 00:00:00 2001 From: jurgen Date: Wed, 6 Feb 2013 10:34:51 +0000 Subject: [PATCH] RSV properties RS metadata properties --- .../org.jkiss.dbeaver.core/plugin.properties | 10 ++++- .../org/jkiss/dbeaver/core/CoreMessages.java | 6 --- .../dbeaver/core/CoreResources.properties | 3 -- .../dbeaver/core/CoreResources_ru.properties | 3 -- .../dbeaver/core/CoreResources_zh.properties | 3 -- .../jdbc/data/JDBCAbstractValueHandler.java | 18 ++------- .../jdbc/data/JDBCComplexValueHandler.java | 4 +- .../jdbc/data/JDBCContentValueHandler.java | 9 ++--- .../jdbc/data/JDBCDateTimeValueHandler.java | 2 +- .../jdbc/data/JDBCNumberValueHandler.java | 16 -------- .../jdbc/data/JDBCObjectValueHandler.java | 13 ------ .../impl/jdbc/exec/JDBCColumnMetaData.java | 40 ++++++++++++------- .../dbeaver/ui/controls/ColumnInfoPanel.java | 4 +- .../controls/resultset/ResultSetViewer.java | 6 ++- 14 files changed, 51 insertions(+), 86 deletions(-) diff --git a/plugins/org.jkiss.dbeaver.core/plugin.properties b/plugins/org.jkiss.dbeaver.core/plugin.properties index 9fe7db785f..73e2e438a6 100644 --- a/plugins/org.jkiss.dbeaver.core/plugin.properties +++ b/plugins/org.jkiss.dbeaver.core/plugin.properties @@ -240,6 +240,14 @@ meta.org.jkiss.dbeaver.model.impl.jdbc.struct.JDBCTableIndex.name.name=Index Nam meta.org.jkiss.dbeaver.model.impl.jdbc.struct.JDBCTableIndex.table.name=Table meta.org.jkiss.dbeaver.model.impl.jdbc.struct.JDBCTableIndex.indexType.name=Index Type meta.org.jkiss.dbeaver.model.impl.jdbc.struct.JDBCTableObject.table.name=Table +meta.org.jkiss.dbeaver.model.impl.jdbc.exec.JDBCColumnMetaData.name.name=Name +meta.org.jkiss.dbeaver.model.impl.jdbc.exec.JDBCColumnMetaData.typeName.name=Type +meta.org.jkiss.dbeaver.model.impl.jdbc.exec.JDBCColumnMetaData.index.name=Position +meta.org.jkiss.dbeaver.model.impl.jdbc.exec.JDBCColumnMetaData.required.name=Not Null +meta.org.jkiss.dbeaver.model.impl.jdbc.exec.JDBCColumnMetaData.entityName.name=Table Name +meta.org.jkiss.dbeaver.model.impl.jdbc.exec.JDBCColumnMetaData.scale.name=Scale +meta.org.jkiss.dbeaver.model.impl.jdbc.exec.JDBCColumnMetaData.precision.name=Precision +meta.org.jkiss.dbeaver.model.impl.jdbc.exec.JDBCColumnMetaData.maxLength.name=Max Length meta.org.jkiss.dbeaver.model.impl.struct.AbstractAttribute.name.name=Column Name meta.org.jkiss.dbeaver.model.impl.struct.AbstractAttribute.typeName.name=Data Type meta.org.jkiss.dbeaver.model.impl.struct.AbstractAttribute.ordinalPosition.name=Ordinal Position @@ -276,4 +284,4 @@ meta.org.jkiss.dbeaver.registry.DriverDescriptor.driverClassName.name=Driver Cla meta.org.jkiss.dbeaver.registry.DriverDescriptor.sampleURL.name=URL meta.org.jkiss.dbeaver.ui.controls.ColumnInfoPanel$CellKeyInfo.type.name=Type meta.org.jkiss.dbeaver.ui.controls.ColumnInfoPanel$CellKeyInfo.name.name=Name -meta.org.jkiss.dbeaver.ui.controls.ColumnInfoPanel$CellKeyInfo.columns.name=Columns \ No newline at end of file +meta.org.jkiss.dbeaver.ui.controls.ColumnInfoPanel$CellKeyInfo.columns.name=Columns diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreMessages.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreMessages.java index 9bc662d9b1..4de89b4148 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreMessages.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreMessages.java @@ -171,14 +171,8 @@ public class CoreMessages extends NLS { public static String controls_client_homes_panel_label_product_version; - public static String controls_column_info_panel_property_column_name; - - public static String controls_column_info_panel_property_column_type; - public static String controls_column_info_panel_property_key; - public static String controls_column_info_panel_property_table_name; - public static String controls_driver_tree_column_connections; public static String controls_driver_tree_column_name; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources.properties b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources.properties index c1d6981bf9..96b5001ec6 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources.properties +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources.properties @@ -216,10 +216,7 @@ model_navigator_Connection=Connection model_navigator_Connections=Connections controls_client_home_selector_browse=Browse ... -controls_column_info_panel_property_column_name=Column Name -controls_column_info_panel_property_column_type=Column Type controls_column_info_panel_property_key=Key -controls_column_info_panel_property_table_name=Table Name controls_driver_tree_column_connections=Connections controls_driver_tree_column_name=Name controls_object_list_job_props_read=Lazy properties read diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources_ru.properties b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources_ru.properties index 65200a70c3..9cbea4d8f8 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources_ru.properties +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources_ru.properties @@ -723,10 +723,7 @@ controls_client_homes_panel_button_remove_home=\u0423\u0434\u0430\u043B\u0438\u0 controls_client_homes_panel_confirm_remove_home_text=\u0412\u044B \u0443\u0432\u0435\u0440\u0435\u043D\u044B, \u0447\u0442\u043E \u0445\u043E\u0442\u0438\u0442\u0435 \u0443\u0434\u0430\u043B\u0438\u0442\u044C \u043A\u043B\u0438\u0435\u043D\u0442\u0430 "{0}"? controls_client_homes_panel_confirm_remove_home_title=\u0423\u0434\u0430\u043B\u0435\u043D\u0438\u0435 \u043A\u043B\u0438\u0435\u043D\u0442\u0430 controls_client_homes_panel_dialog_title=\u041A\u043B\u0438\u0435\u043D\u0442\u044B \u0411\u0414 -controls_column_info_panel_property_column_name=\u0418\u043C\u044F \u043A\u043E\u043B\u043E\u043D\u043A\u0438 -controls_column_info_panel_property_column_type=\u0422\u0438\u043F \u043A\u043E\u043B\u043E\u043D\u043A\u0438 controls_column_info_panel_property_key=\u041A\u043B\u044E\u0447 -controls_column_info_panel_property_table_name=\u0418\u043C\u044F \u0442\u0430\u0431\u043B\u0438\u0446\u044B controls_driver_tree_column_connections=\u0421\u043E\u0435\u0434\u0438\u043D\u0435\u043D\u0438\u044F controls_driver_tree_column_name=\u0418\u043C\u044F controls_progress_page_action_close=\u0417\u0430\u043A\u0440\u044B\u0442\u044C \u043F\u0430\u043D\u0435\u043B\u044C \u043F\u043E\u0438\u0441\u043A\u0430 diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources_zh.properties b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources_zh.properties index f749ff227e..2647619fbc 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources_zh.properties +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources_zh.properties @@ -219,10 +219,7 @@ model_navigator_Connection = \u8FDE\u63A5 model_navigator_Connections = \u8FDE\u63A5 controls_client_home_selector_browse = \u6D4F\u89C8 ... -controls_column_info_panel_property_column_name = \u5217\u540D -controls_column_info_panel_property_column_type = \u5217\u7C7B\u578B controls_column_info_panel_property_key = \u952E -controls_column_info_panel_property_table_name = \u8868\u540D controls_driver_tree_column_connections = \u8FDE\u63A5 controls_driver_tree_column_name = \u540D\u79F0 controls_object_list_job_props_read = \u8BFB\u53D6\u5EF6\u8FDF\u5C5E\u6027 diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/jdbc/data/JDBCAbstractValueHandler.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/jdbc/data/JDBCAbstractValueHandler.java index 5143f49651..ee7fe80eab 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/jdbc/data/JDBCAbstractValueHandler.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/jdbc/data/JDBCAbstractValueHandler.java @@ -34,7 +34,10 @@ import org.jkiss.dbeaver.core.CoreMessages; import org.jkiss.dbeaver.core.DBeaverUI; import org.jkiss.dbeaver.model.DBConstants; import org.jkiss.dbeaver.model.data.*; -import org.jkiss.dbeaver.model.exec.*; +import org.jkiss.dbeaver.model.exec.DBCException; +import org.jkiss.dbeaver.model.exec.DBCExecutionContext; +import org.jkiss.dbeaver.model.exec.DBCResultSet; +import org.jkiss.dbeaver.model.exec.DBCStatement; import org.jkiss.dbeaver.model.exec.jdbc.JDBCExecutionContext; import org.jkiss.dbeaver.model.exec.jdbc.JDBCPreparedStatement; import org.jkiss.dbeaver.model.exec.jdbc.JDBCResultSet; @@ -55,9 +58,6 @@ import java.sql.SQLException; public abstract class JDBCAbstractValueHandler implements DBDValueHandler { static final Log log = LogFactory.getLog(JDBCAbstractValueHandler.class); - private static final String CELL_VALUE_INLINE_EDITOR = "org.jkiss.dbeaver.CellValueInlineEditor"; - - public static final String PROP_CATEGORY_STANDARD = "Standard"; @Override public final Object fetchValueObject(DBCExecutionContext context, DBCResultSet resultSet, DBSTypedObject type, int index) @@ -115,16 +115,6 @@ public abstract class JDBCAbstractValueHandler implements DBDValueHandler { @Override public void fillProperties(PropertySourceAbstract propertySource, DBDValueController controller) { - propertySource.addProperty( - PROP_CATEGORY_STANDARD, - "column_type", //$NON-NLS-1$ - "Data Type", - controller.getAttributeMetaData().getTypeName()); - propertySource.addProperty( - PROP_CATEGORY_STANDARD, - "column_size", //$NON-NLS-1$ - CoreMessages.model_jdbc_column_size, - controller.getAttributeMetaData().getMaxLength()); } protected abstract Object fetchColumnValue(DBCExecutionContext context, JDBCResultSet resultSet, DBSTypedObject type, int index) diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/jdbc/data/JDBCComplexValueHandler.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/jdbc/data/JDBCComplexValueHandler.java index 32df1eadcb..7a6fa043d4 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/jdbc/data/JDBCComplexValueHandler.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/jdbc/data/JDBCComplexValueHandler.java @@ -51,6 +51,8 @@ public abstract class JDBCComplexValueHandler extends JDBCAbstractValueHandler { static final Log log = LogFactory.getLog(JDBCComplexValueHandler.class); + public static final String PROP_CATEGORY_COMPLEX = "Complex"; + @Override public int getFeatures() { @@ -89,7 +91,7 @@ public abstract class JDBCComplexValueHandler extends JDBCAbstractValueHandler { Object value = controller.getValue(); if (value instanceof DBDComplexType) { propertySource.addProperty( - PROP_CATEGORY_STANDARD, + PROP_CATEGORY_COMPLEX, "object_type", //$NON-NLS-1$ CoreMessages.model_jdbc_type_name, ((DBDComplexType) value).getObjectDataType().getName()); diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/jdbc/data/JDBCContentValueHandler.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/jdbc/data/JDBCContentValueHandler.java index 648fb575ed..52cf1d728d 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/jdbc/data/JDBCContentValueHandler.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/jdbc/data/JDBCContentValueHandler.java @@ -83,6 +83,7 @@ public class JDBCContentValueHandler extends JDBCAbstractValueHandler { public static final JDBCContentValueHandler INSTANCE = new JDBCContentValueHandler(); + public static final String PROP_CATEGORY_CONTENT = "LOB"; private static final int MAX_STRING_LENGTH = 0xfffff; @Override @@ -237,14 +238,14 @@ public class JDBCContentValueHandler extends JDBCAbstractValueHandler { Object value = controller.getValue(); if (value instanceof DBDContent) { propertySource.addProperty( - PROP_CATEGORY_STANDARD, + PROP_CATEGORY_CONTENT, "content_type", //$NON-NLS-1$ CoreMessages.model_jdbc_content_type, ((DBDContent)value).getContentType()); final long contentLength = ((DBDContent) value).getContentLength(); if (contentLength >= 0) { propertySource.addProperty( - PROP_CATEGORY_STANDARD, + PROP_CATEGORY_CONTENT, "content_length", //$NON-NLS-1$ CoreMessages.model_jdbc_content_length, contentLength); @@ -254,10 +255,6 @@ public class JDBCContentValueHandler extends JDBCAbstractValueHandler { catch (Exception e) { log.warn("Could not extract LOB value information", e); //$NON-NLS-1$ } - propertySource.addProperty( - null, "max_length", //$NON-NLS-1$ - CoreMessages.model_jdbc_max_length, - controller.getAttributeMetaData().getMaxLength()); } @Override diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/jdbc/data/JDBCDateTimeValueHandler.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/jdbc/data/JDBCDateTimeValueHandler.java index c8d5f0e941..37c16496e9 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/jdbc/data/JDBCDateTimeValueHandler.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/jdbc/data/JDBCDateTimeValueHandler.java @@ -272,7 +272,7 @@ public class JDBCDateTimeValueHandler extends JDBCAbstractValueHandler { { super.fillProperties(propertySource, controller); propertySource.addProperty( - PROP_CATEGORY_STANDARD, + "Date/Time", "format", //$NON-NLS-1$ "Pattern", getFormatter(controller.getAttributeMetaData()).getPattern()); diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/jdbc/data/JDBCNumberValueHandler.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/jdbc/data/JDBCNumberValueHandler.java index a06b15b0c2..4f149205dc 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/jdbc/data/JDBCNumberValueHandler.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/jdbc/data/JDBCNumberValueHandler.java @@ -306,22 +306,6 @@ public class JDBCNumberValueHandler extends JDBCAbstractValueHandler { } } - @Override - public void fillProperties(PropertySourceAbstract propertySource, DBDValueController controller) - { - super.fillProperties(propertySource, controller); - propertySource.addProperty( - PROP_CATEGORY_STANDARD, - "precision", //$NON-NLS-1$ - CoreMessages.model_jdbc_precision, - controller.getAttributeMetaData().getPrecision()); - propertySource.addProperty( - PROP_CATEGORY_STANDARD, - "scale", //$NON-NLS-1$ - CoreMessages.model_jdbc_scale, - controller.getAttributeMetaData().getScale()); - } - public static Number convertStringToNumber(DBDDataFormatter formatter, String text, Object originalValue, DBSTypedObject type) { if (text == null || text.length() == 0) { diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/jdbc/data/JDBCObjectValueHandler.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/jdbc/data/JDBCObjectValueHandler.java index a63288ad2c..553231b390 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/jdbc/data/JDBCObjectValueHandler.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/jdbc/data/JDBCObjectValueHandler.java @@ -20,7 +20,6 @@ package org.jkiss.dbeaver.model.impl.jdbc.data; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.eclipse.jface.action.IMenuManager; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Text; @@ -36,7 +35,6 @@ import org.jkiss.dbeaver.model.exec.jdbc.JDBCResultSet; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; import org.jkiss.dbeaver.model.struct.DBSTypedObject; import org.jkiss.dbeaver.ui.dialogs.data.CursorViewDialog; -import org.jkiss.dbeaver.ui.properties.PropertySourceAbstract; import org.jkiss.utils.CommonUtils; import java.sql.ResultSet; @@ -118,17 +116,6 @@ public class JDBCObjectValueHandler extends JDBCAbstractValueHandler { return DBUtils.getDefaultValueDisplayString(value); } - @Override - public void fillContextMenu(IMenuManager menuManager, final DBDValueController controller) - throws DBCException - { - } - - @Override - public void fillProperties(PropertySourceAbstract propertySource, DBDValueController controller) - { - } - @Override public DBDValueEditor createEditor(final DBDValueController controller) throws DBException diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/jdbc/exec/JDBCColumnMetaData.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/jdbc/exec/JDBCColumnMetaData.java index 1b127bb142..4303f18852 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/jdbc/exec/JDBCColumnMetaData.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/jdbc/exec/JDBCColumnMetaData.java @@ -30,6 +30,7 @@ import org.jkiss.dbeaver.model.DBUtils; import org.jkiss.dbeaver.model.exec.DBCAttributeMetaData; import org.jkiss.dbeaver.model.exec.DBCStatement; import org.jkiss.dbeaver.model.impl.jdbc.struct.JDBCDataType; +import org.jkiss.dbeaver.model.meta.Property; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; import org.jkiss.dbeaver.model.struct.*; import org.jkiss.dbeaver.model.struct.rdb.DBSCatalog; @@ -51,6 +52,8 @@ public class JDBCColumnMetaData implements DBCAttributeMetaData, IObjectImagePro { static final Log log = LogFactory.getLog(JDBCColumnMetaData.class); + public static final String PROP_CATEGORY_COLUMN = "Column"; + private JDBCResultSetMetaData resultSetMeta; private int index; private boolean notNull; @@ -211,52 +214,60 @@ public class JDBCColumnMetaData implements DBCAttributeMetaData, IObjectImagePro return resultSetMeta; } + @Property(category = PROP_CATEGORY_COLUMN, order = 1) @Override public int getIndex() { return index; } + @Property(category = PROP_CATEGORY_COLUMN, order = 2) @Override - public boolean isRequired() + public String getName() { - return notNull; + return name; } + //@Property(category = PROP_CATEGORY_COLUMN, order = 3) @Override - public long getMaxLength() + public String getLabel() { - return displaySize; + return label; } + @Property(category = PROP_CATEGORY_COLUMN, order = 4) @Override - public String getLabel() + public String getEntityName() { - return label; + return tableMetaData != null ? tableMetaData.getEntityName() : tableName; } + @Property(category = PROP_CATEGORY_COLUMN, order = 30) @Override - public String getName() + public boolean isRequired() { - return name; + return notNull; } + //@Property(category = PROP_CATEGORY_COLUMN, order = 20) @Override - public int getPrecision() + public long getMaxLength() { - return precision; + return displaySize; } + @Property(category = PROP_CATEGORY_COLUMN, order = 21) @Override - public int getScale() + public int getPrecision() { - return scale; + return precision; } + @Property(category = PROP_CATEGORY_COLUMN, order = 22) @Override - public String getEntityName() + public int getScale() { - return tableMetaData != null ? tableMetaData.getEntityName() : tableName; + return scale; } @Override @@ -283,6 +294,7 @@ public class JDBCColumnMetaData implements DBCAttributeMetaData, IObjectImagePro return JDBCDataType.getDataKind(typeName, typeID); } + @Property(category = PROP_CATEGORY_COLUMN, order = 4) @Override public String getTypeName() { diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/ColumnInfoPanel.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/ColumnInfoPanel.java index fe47c1716a..0ee2a315b8 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/ColumnInfoPanel.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/ColumnInfoPanel.java @@ -52,9 +52,7 @@ public class ColumnInfoPanel extends Composite { protected void createPanel(DBDAttributeController valueController) { PropertyCollector infoItem = new PropertyCollector(valueController.getAttributeMetaData(), false); - infoItem.addProperty(null, "Table_Name", CoreMessages.controls_column_info_panel_property_table_name, valueController.getAttributeMetaData().getEntityName()); //$NON-NLS-1$ - infoItem.addProperty(null, "Column_Name", CoreMessages.controls_column_info_panel_property_column_name, valueController.getAttributeMetaData().getName() ); //$NON-NLS-1$ - infoItem.addProperty(null, "Column_Type", CoreMessages.controls_column_info_panel_property_column_type, valueController.getAttributeMetaData().getTypeName() ); //$NON-NLS-1$ + infoItem.collectProperties(); valueController.getValueHandler().fillProperties(infoItem, valueController); if (valueController.getValueLocator() != null) { infoItem.addProperty(null, "Key", CoreMessages.controls_column_info_panel_property_key, new CellKeyInfo(valueController) ); //$NON-NLS-1$ diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java index 456d1f0363..f7e059c657 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java @@ -93,6 +93,7 @@ import org.jkiss.dbeaver.ui.dialogs.struct.EditConstraintDialog; import org.jkiss.dbeaver.ui.preferences.PrefConstants; import org.jkiss.dbeaver.ui.preferences.PrefPageDatabaseGeneral; import org.jkiss.dbeaver.ui.properties.PropertyCollector; +import org.jkiss.dbeaver.ui.properties.tabbed.PropertyPageStandard; import org.jkiss.dbeaver.utils.ContentUtils; import org.jkiss.utils.CommonUtils; @@ -355,7 +356,7 @@ public class ResultSetViewer extends Viewer implements IDataSourceProvider, ISpr public Object getAdapter(Class adapter) { if (adapter == IPropertySheetPage.class) { - PropertySheetPage page = new PropertySheetPage(); + PropertyPageStandard page = new PropertyPageStandard(); page.setPropertySourceProvider(new IPropertySourceProvider() { @Override public IPropertySource getPropertySource(Object object) @@ -364,12 +365,13 @@ public class ResultSetViewer extends Viewer implements IDataSourceProvider, ISpr final GridPos cell = translateGridPos((GridPos)object); boolean noCellSelected = (cell.row < 0 || curRows.size() <= cell.row || cell.col < 0 || cell.col >= metaColumns.length); if (!noCellSelected) { - PropertyCollector props = new PropertyCollector(object, object, false); final ResultSetValueController valueController = new ResultSetValueController( curRows.get(cell.row), cell.col, DBDValueController.EditType.NONE, null); + PropertyCollector props = new PropertyCollector(valueController.getAttributeMetaData(), false); + props.collectProperties(); valueController.getValueHandler().fillProperties(props, valueController); return props; } -- GitLab