From f46accfcf64640d8f0bc2a4b9facc066ebdc7327 Mon Sep 17 00:00:00 2001 From: Serge Rider Date: Tue, 27 Apr 2021 13:07:17 +0300 Subject: [PATCH] Property length introduced Former-commit-id: 59287e633d51b3421b86a6aa79c4a8e470c44f39 --- .../dbeaver/ext/db2/model/DB2DataType.java | 3 +- .../jkiss/dbeaver/ext/db2/model/DB2Index.java | 3 +- .../dbeaver/ext/db2/model/DB2Package.java | 3 +- .../dbeaver/ext/db2/model/DB2Routine.java | 3 +- .../dbeaver/ext/db2/model/DB2Schema.java | 3 +- .../dbeaver/ext/db2/model/DB2Sequence.java | 3 +- .../ext/db2/model/DB2StorageGroup.java | 3 +- .../dbeaver/ext/db2/model/DB2TableBase.java | 3 +- .../dbeaver/ext/db2/model/DB2TableColumn.java | 3 +- .../ext/db2/model/DB2TableUniqueKey.java | 3 +- .../dbeaver/ext/db2/model/DB2Tablespace.java | 3 +- .../dbeaver/ext/db2/model/DB2Trigger.java | 3 +- .../dbeaver/ext/db2/model/DB2ViewBase.java | 3 +- .../dbeaver/ext/db2/model/DB2XMLSchema.java | 3 +- .../ext/db2/model/fed/DB2RemoteServer.java | 3 +- .../db2/model/fed/DB2RemoteServerOption.java | 3 +- .../dbeaver/ext/db2/model/fed/DB2Wrapper.java | 3 +- .../ext/db2/model/module/DB2Module.java | 3 +- .../ext/db2/model/security/DB2Role.java | 3 +- .../ext/exasol/model/ExasolConnection.java | 3 +- .../ext/exasol/model/ExasolDataType.java | 3 +- .../ext/exasol/model/ExasolFunction.java | 3 +- .../ext/exasol/model/ExasolSchema.java | 3 +- .../ext/exasol/model/ExasolScript.java | 3 +- .../ext/exasol/model/ExasolTableBase.java | 3 +- .../ext/exasol/model/ExasolTableColumn.java | 3 +- .../exasol/model/ExasolTableUniqueKey.java | 3 +- .../dbeaver/ext/exasol/model/ExasolView.java | 3 +- .../model/security/ExasolBaseObjectGrant.java | 3 +- .../model/security/ExasolConnectionGrant.java | 3 +- .../ext/exasol/model/security/ExasolRole.java | 3 +- .../model/security/ExasolSecurityPolicy.java | 3 +- .../model/security/ExasolSystemGrant.java | 3 +- .../ext/exasol/model/security/ExasolUser.java | 3 +- .../firebird/model/FireBirdTableColumn.java | 3 +- .../ext/generic/model/GenericDataType.java | 3 +- .../ext/generic/model/GenericSequence.java | 3 +- .../ext/generic/model/GenericSynonym.java | 3 +- .../ext/generic/model/GenericTableBase.java | 3 +- .../ext/generic/model/GenericTableColumn.java | 3 +- .../ext/generic/model/GenericTableIndex.java | 3 +- .../ext/generic/model/GenericTrigger.java | 3 +- .../model/GreenplumExternalTable.java | 3 +- .../ext/mssql/model/SQLServerDatabase.java | 3 +- .../ext/mssql/model/SQLServerProcedure.java | 3 +- .../ext/mssql/model/SQLServerSchema.java | 8 ++++-- .../ext/mssql/model/SQLServerSequence.java | 3 +- .../ext/mssql/model/SQLServerTableBase.java | 3 +- .../model/SQLServerTableCheckConstraint.java | 3 +- .../ext/mssql/model/SQLServerTableColumn.java | 2 +- .../ext/mssql/model/SQLServerTableIndex.java | 3 +- .../model/generic/SQLServerGenericTable.java | 3 +- .../dbeaver/ext/mysql/model/MySQLCharset.java | 3 +- .../dbeaver/ext/mysql/model/MySQLEvent.java | 3 +- .../ext/mysql/model/MySQLPartition.java | 3 +- .../dbeaver/ext/mysql/model/MySQLTable.java | 2 +- .../ext/mysql/model/MySQLTableColumn.java | 3 +- .../ext/mysql/model/MySQLTableIndex.java | 3 +- .../ext/oracle/model/OracleTableBase.java | 7 ++--- .../ext/oracle/model/OracleTableColumn.java | 7 ++--- .../ext/oracle/model/OracleTrigger.java | 3 +- .../postgresql/model/PostgreAggregate.java | 3 +- .../postgresql/model/PostgreAttribute.java | 12 ++++---- .../ext/postgresql/model/PostgreDatabase.java | 7 ++--- .../ext/postgresql/model/PostgreIndex.java | 3 +- .../postgresql/model/PostgreProcedure.java | 3 +- .../ext/postgresql/model/PostgreSchema.java | 3 +- .../postgresql/model/PostgreTableBase.java | 5 ++-- .../model/PostgreTableConstraintBase.java | 3 +- .../ext/postgresql/model/PostgreTrigger.java | 3 +- .../redshift/RedshiftExternalSchema.java | 3 +- .../ext/sqlite/model/SQLiteDataType.java | 3 +- .../model/VerticaProjectionColumn.java | 3 +- .../ext/vertica/model/VerticaTableColumn.java | 3 +- .../model/impl/struct/AbstractProcedure.java | 3 +- .../model/impl/struct/AbstractTrigger.java | 3 +- .../jkiss/dbeaver/model/meta/Property.java | 3 +- .../dbeaver/model/meta/PropertyLength.java | 28 +++++++++++++++++++ .../properties/ObjectPropertyDescriptor.java | 13 ++++----- .../registry/DataSourceDescriptor.java | 3 +- .../registry/driver/DriverDescriptor.java | 3 +- .../dbeaver/ui/controls/CustomFormEditor.java | 3 +- .../ui/properties/PropertyEditorUtils.java | 3 +- 83 files changed, 202 insertions(+), 108 deletions(-) create mode 100644 plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/meta/PropertyLength.java diff --git a/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2DataType.java b/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2DataType.java index 01516cd448..d3b6c27236 100644 --- a/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2DataType.java +++ b/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2DataType.java @@ -34,6 +34,7 @@ import org.jkiss.dbeaver.model.exec.DBCLogicalOperator; import org.jkiss.dbeaver.model.impl.DBObjectNameCaseTransformer; import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils; import org.jkiss.dbeaver.model.meta.Property; +import org.jkiss.dbeaver.model.meta.PropertyLength; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor; import org.jkiss.dbeaver.model.struct.DBSDataType; @@ -362,7 +363,7 @@ public class DB2DataType extends DB2Object implements DBSDataType, DB @Nullable @Override - @Property(viewable = false, editable = false, multiline = true) + @Property(viewable = false, editable = false, length = PropertyLength.MULTILINE) public String getDescription() { return remarks; diff --git a/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2Index.java b/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2Index.java index f3b071826a..55f12013c3 100644 --- a/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2Index.java +++ b/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2Index.java @@ -31,6 +31,7 @@ import org.jkiss.dbeaver.model.impl.DBObjectNameCaseTransformer; import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils; import org.jkiss.dbeaver.model.impl.jdbc.struct.JDBCTableIndex; import org.jkiss.dbeaver.model.meta.Property; +import org.jkiss.dbeaver.model.meta.PropertyLength; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; import org.jkiss.dbeaver.model.struct.cache.DBSObjectCache; import org.jkiss.dbeaver.model.struct.rdb.DBSIndexType; @@ -257,7 +258,7 @@ public class DB2Index extends JDBCTableIndex { @Nullable @Override - @Property(viewable = false, editable = false, multiline = true) + @Property(viewable = false, editable = false, length = PropertyLength.MULTILINE) public String getDescription() { return remarks; diff --git a/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2Package.java b/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2Package.java index 3400df013b..1bb7ba2292 100644 --- a/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2Package.java +++ b/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2Package.java @@ -28,6 +28,7 @@ import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils; import org.jkiss.dbeaver.model.impl.jdbc.cache.JDBCObjectSimpleCache; import org.jkiss.dbeaver.model.meta.Association; import org.jkiss.dbeaver.model.meta.Property; +import org.jkiss.dbeaver.model.meta.PropertyLength; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor; import org.jkiss.dbeaver.model.struct.DBSObject; @@ -215,7 +216,7 @@ public class DB2Package extends DB2SchemaObject implements DBPRefreshableObject @Nullable @Override - @Property(viewable = false, multiline = true, order = 9) + @Property(viewable = false, length = PropertyLength.MULTILINE, order = 9) public String getDescription() { return remarks; diff --git a/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2Routine.java b/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2Routine.java index 0593603d38..c2435300a4 100644 --- a/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2Routine.java +++ b/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2Routine.java @@ -32,6 +32,7 @@ import org.jkiss.dbeaver.model.*; import org.jkiss.dbeaver.model.exec.DBCException; import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils; import org.jkiss.dbeaver.model.meta.Property; +import org.jkiss.dbeaver.model.meta.PropertyLength; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; import org.jkiss.dbeaver.model.struct.DBSObject; import org.jkiss.dbeaver.model.struct.DBSObjectContainer; @@ -380,7 +381,7 @@ public class DB2Routine extends DB2Object @Nullable @Override - @Property(viewable = false, multiline = true) + @Property(viewable = false, length = PropertyLength.MULTILINE) public String getDescription() { return remarks; diff --git a/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2Schema.java b/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2Schema.java index 9f4cb68c05..e42ed25033 100644 --- a/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2Schema.java +++ b/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2Schema.java @@ -36,6 +36,7 @@ import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils; import org.jkiss.dbeaver.model.impl.jdbc.cache.JDBCObjectSimpleCache; import org.jkiss.dbeaver.model.meta.Association; import org.jkiss.dbeaver.model.meta.Property; +import org.jkiss.dbeaver.model.meta.PropertyLength; import org.jkiss.dbeaver.model.preferences.DBPPropertySource; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; import org.jkiss.dbeaver.model.struct.DBSObject; @@ -524,7 +525,7 @@ public class DB2Schema extends DB2GlobalObject implements DBSSchema, DBPRefresha @Nullable @Override - @Property(viewable = false, editable = false, multiline = true) + @Property(viewable = false, editable = false, length = PropertyLength.MULTILINE) public String getDescription() { return remarks; diff --git a/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2Sequence.java b/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2Sequence.java index b066958d13..56b5f705b1 100644 --- a/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2Sequence.java +++ b/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2Sequence.java @@ -28,6 +28,7 @@ import org.jkiss.dbeaver.ext.db2.model.dict.DB2YesNo; import org.jkiss.dbeaver.model.DBPRefreshableObject; import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils; import org.jkiss.dbeaver.model.meta.Property; +import org.jkiss.dbeaver.model.meta.PropertyLength; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; import org.jkiss.dbeaver.model.struct.DBSObject; import org.jkiss.dbeaver.model.struct.rdb.DBSSequence; @@ -306,7 +307,7 @@ public class DB2Sequence extends DB2SchemaObject implements DBSSequence, DBPRefr @Nullable @Override - @Property(viewable = false, editable = true, updatable = true, multiline = true) + @Property(viewable = false, editable = true, updatable = true, length = PropertyLength.MULTILINE) public String getDescription() { return remarks; diff --git a/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2StorageGroup.java b/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2StorageGroup.java index 6d99993fc3..dffaad45b0 100644 --- a/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2StorageGroup.java +++ b/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2StorageGroup.java @@ -25,6 +25,7 @@ import org.jkiss.dbeaver.ext.db2.model.dict.DB2YesNo; import org.jkiss.dbeaver.model.DBPNamedObject; import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils; import org.jkiss.dbeaver.model.meta.Property; +import org.jkiss.dbeaver.model.meta.PropertyLength; import java.sql.ResultSet; import java.sql.Timestamp; @@ -125,7 +126,7 @@ public class DB2StorageGroup extends DB2GlobalObject implements DBPNamedObject { @Nullable @Override - @Property(viewable = false, multiline = true) + @Property(viewable = false, length = PropertyLength.MULTILINE) public String getDescription() { return remarks; diff --git a/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2TableBase.java b/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2TableBase.java index 1535d5b711..020df8096c 100644 --- a/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2TableBase.java +++ b/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2TableBase.java @@ -35,6 +35,7 @@ import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils; import org.jkiss.dbeaver.model.impl.jdbc.struct.JDBCTable; import org.jkiss.dbeaver.model.meta.Association; import org.jkiss.dbeaver.model.meta.Property; +import org.jkiss.dbeaver.model.meta.PropertyLength; import org.jkiss.dbeaver.model.preferences.DBPPropertySource; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; import org.jkiss.dbeaver.model.struct.DBSObject; @@ -263,7 +264,7 @@ public abstract class DB2TableBase extends JDBCTable @Nullable @Override - @Property(viewable = false, order = 99, editable = true, updatable = true, multiline = true) + @Property(viewable = false, order = 99, editable = true, updatable = true, length = PropertyLength.MULTILINE) public String getDescription() { return remarks; diff --git a/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2TableColumn.java b/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2TableColumn.java index d1b762a64e..d2ae81638f 100644 --- a/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2TableColumn.java +++ b/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2TableColumn.java @@ -34,6 +34,7 @@ import org.jkiss.dbeaver.model.impl.DBPositiveNumberTransformer; import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils; import org.jkiss.dbeaver.model.impl.jdbc.struct.JDBCTableColumn; import org.jkiss.dbeaver.model.meta.Property; +import org.jkiss.dbeaver.model.meta.PropertyLength; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; import org.jkiss.dbeaver.model.struct.DBSDataType; import org.jkiss.dbeaver.model.struct.DBSTypedObjectEx; @@ -337,7 +338,7 @@ public class DB2TableColumn extends JDBCTableColumn @Nullable @Override - @Property(viewable = true, order = 999, editable = true, updatable = true, multiline = true) + @Property(viewable = true, order = 999, editable = true, updatable = true, length = PropertyLength.MULTILINE) public String getDescription() { return remarks; diff --git a/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2TableUniqueKey.java b/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2TableUniqueKey.java index 1994d66a8d..a136ce10de 100644 --- a/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2TableUniqueKey.java +++ b/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2TableUniqueKey.java @@ -30,6 +30,7 @@ import org.jkiss.dbeaver.model.DBUtils; import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils; import org.jkiss.dbeaver.model.impl.jdbc.struct.JDBCTableConstraint; import org.jkiss.dbeaver.model.meta.Property; +import org.jkiss.dbeaver.model.meta.PropertyLength; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; import org.jkiss.dbeaver.model.struct.DBSEntityAttributeRef; import org.jkiss.dbeaver.model.struct.DBSEntityConstraintType; @@ -141,7 +142,7 @@ public class DB2TableUniqueKey extends JDBCTableConstraint { @Nullable @Override - @Property(viewable = true, editable = false, multiline = true, order = 4) + @Property(viewable = true, editable = false, length = PropertyLength.MULTILINE, order = 4) public String getDescription() { return remarks; diff --git a/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2Tablespace.java b/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2Tablespace.java index 73be2484e8..729aeac543 100644 --- a/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2Tablespace.java +++ b/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2Tablespace.java @@ -32,6 +32,7 @@ import org.jkiss.dbeaver.model.DBPRefreshableObject; import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils; import org.jkiss.dbeaver.model.meta.Association; import org.jkiss.dbeaver.model.meta.Property; +import org.jkiss.dbeaver.model.meta.PropertyLength; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor; import org.jkiss.dbeaver.model.struct.DBSObject; @@ -261,7 +262,7 @@ public class DB2Tablespace extends DB2GlobalObject implements DBPNamedObject, DB @Nullable @Override - @Property(viewable = false, multiline = true) + @Property(viewable = false, length = PropertyLength.MULTILINE) public String getDescription() { return remarks; diff --git a/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2Trigger.java b/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2Trigger.java index 8bc95ab8dc..5fa3454b18 100644 --- a/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2Trigger.java +++ b/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2Trigger.java @@ -29,6 +29,7 @@ import org.jkiss.dbeaver.model.exec.DBCException; import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils; import org.jkiss.dbeaver.model.meta.Association; import org.jkiss.dbeaver.model.meta.Property; +import org.jkiss.dbeaver.model.meta.PropertyLength; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; import org.jkiss.dbeaver.model.sql.format.SQLFormatUtils; import org.jkiss.dbeaver.model.struct.DBSObject; @@ -334,7 +335,7 @@ public class DB2Trigger extends DB2SchemaObject implements DBSTrigger, DB2Source @Nullable @Override - @Property(viewable = false, multiline = true) + @Property(viewable = false, length = PropertyLength.MULTILINE) public String getDescription() { return remarks; diff --git a/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2ViewBase.java b/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2ViewBase.java index 6d23126342..16aaac5259 100644 --- a/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2ViewBase.java +++ b/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2ViewBase.java @@ -28,6 +28,7 @@ import org.jkiss.dbeaver.model.exec.DBCException; import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils; import org.jkiss.dbeaver.model.meta.Association; import org.jkiss.dbeaver.model.meta.Property; +import org.jkiss.dbeaver.model.meta.PropertyLength; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; import org.jkiss.dbeaver.model.sql.format.SQLFormatUtils; import org.jkiss.dbeaver.model.struct.DBSObject; @@ -136,7 +137,7 @@ public abstract class DB2ViewBase extends DB2TableBase implements DB2SourceObjec @Nullable @Override - @Property(viewable = false, editable = false, updatable = false, multiline = true) + @Property(viewable = false, editable = false, updatable = false, length = PropertyLength.MULTILINE) public String getDescription() { return super.getDescription(); diff --git a/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2XMLSchema.java b/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2XMLSchema.java index 2ef88c1435..055784a120 100644 --- a/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2XMLSchema.java +++ b/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2XMLSchema.java @@ -30,6 +30,7 @@ import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils; import org.jkiss.dbeaver.model.impl.jdbc.cache.JDBCObjectSimpleCache; import org.jkiss.dbeaver.model.meta.Association; import org.jkiss.dbeaver.model.meta.Property; +import org.jkiss.dbeaver.model.meta.PropertyLength; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; import org.jkiss.dbeaver.model.struct.DBSObject; import org.jkiss.dbeaver.model.struct.cache.DBSObjectCache; @@ -178,7 +179,7 @@ public class DB2XMLSchema extends DB2SchemaObject implements DBPRefreshableObjec @Nullable @Override - @Property(viewable = false, order = 20, updatable = true, multiline = true) + @Property(viewable = false, order = 20, updatable = true, length = PropertyLength.MULTILINE) public String getDescription() { return remarks; diff --git a/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/fed/DB2RemoteServer.java b/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/fed/DB2RemoteServer.java index c1f1ec356b..c41bc0bdb3 100644 --- a/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/fed/DB2RemoteServer.java +++ b/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/fed/DB2RemoteServer.java @@ -26,6 +26,7 @@ import org.jkiss.dbeaver.model.DBPRefreshableObject; import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils; import org.jkiss.dbeaver.model.meta.Association; import org.jkiss.dbeaver.model.meta.Property; +import org.jkiss.dbeaver.model.meta.PropertyLength; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor; import org.jkiss.dbeaver.model.struct.DBSObject; @@ -114,7 +115,7 @@ public class DB2RemoteServer extends DB2GlobalObject implements DBPRefreshableOb return version; } - @Property(viewable = true, editable = false, multiline = true, order = 5) + @Property(viewable = true, editable = false, length = PropertyLength.MULTILINE, order = 5) public String getRemarks() { return remarks; diff --git a/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/fed/DB2RemoteServerOption.java b/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/fed/DB2RemoteServerOption.java index 9092ae37c7..50c8696b53 100644 --- a/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/fed/DB2RemoteServerOption.java +++ b/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/fed/DB2RemoteServerOption.java @@ -22,6 +22,7 @@ import org.jkiss.dbeaver.ext.db2.DB2Constants; import org.jkiss.dbeaver.ext.db2.model.DB2Object; import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils; import org.jkiss.dbeaver.model.meta.Property; +import org.jkiss.dbeaver.model.meta.PropertyLength; import java.sql.ResultSet; import java.sql.Timestamp; @@ -91,7 +92,7 @@ public class DB2RemoteServerOption extends DB2Object { return createTime; } - @Property(viewable = true, editable = false, multiline = true, order = 5) + @Property(viewable = true, editable = false, length = PropertyLength.MULTILINE, order = 5) public String getRemarks() { return remarks; diff --git a/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/fed/DB2Wrapper.java b/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/fed/DB2Wrapper.java index 67aabd3f02..64ecc77bd0 100644 --- a/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/fed/DB2Wrapper.java +++ b/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/fed/DB2Wrapper.java @@ -26,6 +26,7 @@ import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils; import org.jkiss.dbeaver.model.impl.jdbc.cache.JDBCObjectSimpleCache; import org.jkiss.dbeaver.model.meta.Association; import org.jkiss.dbeaver.model.meta.Property; +import org.jkiss.dbeaver.model.meta.PropertyLength; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; import org.jkiss.dbeaver.model.struct.DBSObject; import org.jkiss.dbeaver.model.struct.cache.DBSObjectCache; @@ -115,7 +116,7 @@ public class DB2Wrapper extends DB2GlobalObject implements DBPRefreshableObject return library; } - @Property(viewable = true, multiline = true, order = 5) + @Property(viewable = true, length = PropertyLength.MULTILINE, order = 5) public String getRemarks() { return remarks; diff --git a/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/module/DB2Module.java b/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/module/DB2Module.java index fb402428b6..b4dd2f91f4 100644 --- a/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/module/DB2Module.java +++ b/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/module/DB2Module.java @@ -28,6 +28,7 @@ import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils; import org.jkiss.dbeaver.model.impl.jdbc.cache.JDBCObjectSimpleCache; import org.jkiss.dbeaver.model.meta.Association; import org.jkiss.dbeaver.model.meta.Property; +import org.jkiss.dbeaver.model.meta.PropertyLength; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; import org.jkiss.dbeaver.model.struct.DBSObject; import org.jkiss.dbeaver.model.struct.cache.DBSObjectCache; @@ -205,7 +206,7 @@ public class DB2Module extends DB2SchemaObject implements DBSProcedureContainer, @Nullable @Override - @Property(viewable = false, multiline = true) + @Property(viewable = false, length = PropertyLength.MULTILINE) public String getDescription() { return remarks; diff --git a/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/security/DB2Role.java b/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/security/DB2Role.java index 6357bcddfc..ea55256863 100644 --- a/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/security/DB2Role.java +++ b/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/security/DB2Role.java @@ -29,6 +29,7 @@ import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils; import org.jkiss.dbeaver.model.impl.jdbc.cache.JDBCObjectSimpleCache; import org.jkiss.dbeaver.model.meta.Association; import org.jkiss.dbeaver.model.meta.Property; +import org.jkiss.dbeaver.model.meta.PropertyLength; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor; import org.jkiss.dbeaver.model.struct.DBSObject; @@ -131,7 +132,7 @@ public class DB2Role extends DB2Grantee implements DBPSaveableObject, DBARole, D @Nullable @Override - @Property(viewable = true, multiline = true) + @Property(viewable = true, length = PropertyLength.MULTILINE) public String getDescription() { return remarks; diff --git a/plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/model/ExasolConnection.java b/plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/model/ExasolConnection.java index 40204eb721..b6a91c9271 100644 --- a/plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/model/ExasolConnection.java +++ b/plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/model/ExasolConnection.java @@ -26,6 +26,7 @@ import org.jkiss.dbeaver.model.DBPSaveableObject; import org.jkiss.dbeaver.model.DBPScriptObject; import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils; import org.jkiss.dbeaver.model.meta.Property; +import org.jkiss.dbeaver.model.meta.PropertyLength; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; import org.jkiss.dbeaver.model.struct.DBSObject; @@ -131,7 +132,7 @@ public class ExasolConnection } @Override - @Property(viewable = true, editable= true, updatable=true, multiline = true, order = 50) + @Property(viewable = true, editable= true, updatable=true, length = PropertyLength.MULTILINE, order = 50) public String getDescription() { return this.comment; diff --git a/plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/model/ExasolDataType.java b/plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/model/ExasolDataType.java index 05f6a0de32..705a9729b8 100644 --- a/plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/model/ExasolDataType.java +++ b/plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/model/ExasolDataType.java @@ -30,6 +30,7 @@ import org.jkiss.dbeaver.model.exec.DBCLogicalOperator; import org.jkiss.dbeaver.model.impl.DBObjectNameCaseTransformer; import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils; import org.jkiss.dbeaver.model.meta.Property; +import org.jkiss.dbeaver.model.meta.PropertyLength; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; import org.jkiss.dbeaver.model.struct.DBSDataType; import org.jkiss.dbeaver.model.struct.DBSObject; @@ -269,7 +270,7 @@ public class ExasolDataType extends ExasolObject implements DBSDataTy @Nullable @Override - @Property(viewable = false, editable = false, multiline = true) + @Property(viewable = false, editable = false, length = PropertyLength.MULTILINE) public String getDescription() { return null; } diff --git a/plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/model/ExasolFunction.java b/plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/model/ExasolFunction.java index aeb9f1f333..ac823c780e 100644 --- a/plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/model/ExasolFunction.java +++ b/plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/model/ExasolFunction.java @@ -11,6 +11,7 @@ import org.jkiss.dbeaver.model.DBUtils; import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils; import org.jkiss.dbeaver.model.impl.struct.AbstractProcedure; import org.jkiss.dbeaver.model.meta.Property; +import org.jkiss.dbeaver.model.meta.PropertyLength; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; import org.jkiss.dbeaver.model.struct.DBSObject; import org.jkiss.dbeaver.model.struct.rdb.DBSProcedure; @@ -113,7 +114,7 @@ public class ExasolFunction @Nullable @Override - @Property(viewable = true, editable = true, updatable = true, multiline = true, order = 11) + @Property(viewable = true, editable = true, updatable = true, length = PropertyLength.MULTILINE, order = 11) public String getDescription() { return this.remarks; } diff --git a/plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/model/ExasolSchema.java b/plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/model/ExasolSchema.java index 442d023b69..92ae2ad967 100644 --- a/plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/model/ExasolSchema.java +++ b/plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/model/ExasolSchema.java @@ -36,6 +36,7 @@ import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils; import org.jkiss.dbeaver.model.meta.Association; import org.jkiss.dbeaver.model.meta.IPropertyValueListProvider; import org.jkiss.dbeaver.model.meta.Property; +import org.jkiss.dbeaver.model.meta.PropertyLength; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor; import org.jkiss.dbeaver.model.struct.DBSObject; @@ -324,7 +325,7 @@ public class ExasolSchema extends ExasolGlobalObject implements DBSSchema, DBPNa return createTime; } - @Property(viewable = true, editable = true, updatable = true, multiline = true, order = 3) + @Property(viewable = true, editable = true, updatable = true, length = PropertyLength.MULTILINE, order = 3) public String getDescription() { return remarks; } diff --git a/plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/model/ExasolScript.java b/plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/model/ExasolScript.java index 2926f0772b..b3f91f7ce1 100644 --- a/plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/model/ExasolScript.java +++ b/plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/model/ExasolScript.java @@ -30,6 +30,7 @@ import org.jkiss.dbeaver.model.DBUtils; import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils; import org.jkiss.dbeaver.model.impl.struct.AbstractProcedure; import org.jkiss.dbeaver.model.meta.Property; +import org.jkiss.dbeaver.model.meta.PropertyLength; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; import org.jkiss.dbeaver.model.struct.rdb.DBSProcedure; import org.jkiss.dbeaver.model.struct.rdb.DBSProcedureParameter; @@ -112,7 +113,7 @@ public class ExasolScript extends AbstractProcedure @Nullable @Override - @Property(viewable = true, order = 999, editable = true, updatable = true, multiline = true) + @Property(viewable = true, order = 999, editable = true, updatable = true, length = PropertyLength.MULTILINE) public String getDescription() { return remarks; } diff --git a/plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/model/ExasolTableUniqueKey.java b/plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/model/ExasolTableUniqueKey.java index 630dd72b1a..bb811b058d 100644 --- a/plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/model/ExasolTableUniqueKey.java +++ b/plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/model/ExasolTableUniqueKey.java @@ -26,6 +26,7 @@ import org.jkiss.dbeaver.model.*; import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils; import org.jkiss.dbeaver.model.impl.jdbc.struct.JDBCTableConstraint; import org.jkiss.dbeaver.model.meta.Property; +import org.jkiss.dbeaver.model.meta.PropertyLength; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; import org.jkiss.dbeaver.model.struct.DBSEntityAttributeRef; import org.jkiss.dbeaver.model.struct.DBSEntityConstraintType; @@ -113,7 +114,7 @@ public class ExasolTableUniqueKey extends JDBCTableConstraint imple @Nullable @Override - @Property(viewable = false, editable = false, multiline = true, order = 4) + @Property(viewable = false, editable = false, length = PropertyLength.MULTILINE, order = 4) public String getDescription() { return null; } diff --git a/plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/model/ExasolView.java b/plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/model/ExasolView.java index fe028cb10b..3baa6944c0 100644 --- a/plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/model/ExasolView.java +++ b/plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/model/ExasolView.java @@ -30,6 +30,7 @@ import org.jkiss.dbeaver.model.exec.jdbc.JDBCStatement; import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils; import org.jkiss.dbeaver.model.impl.jdbc.cache.JDBCStructCache; import org.jkiss.dbeaver.model.meta.Property; +import org.jkiss.dbeaver.model.meta.PropertyLength; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor; import org.jkiss.dbeaver.model.struct.DBSEntityAssociation; @@ -77,7 +78,7 @@ public class ExasolView extends ExasolTableBase implements ExasolSourceObject, D @Override - @Property(viewable = true, editable = false, updatable = false, multiline = true, order = 40) + @Property(viewable = true, editable = false, updatable = false, length = PropertyLength.MULTILINE, order = 40) public String getDescription() { return super.getDescription(); } diff --git a/plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/model/security/ExasolBaseObjectGrant.java b/plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/model/security/ExasolBaseObjectGrant.java index 86531e4e5f..92ac169fc4 100644 --- a/plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/model/security/ExasolBaseObjectGrant.java +++ b/plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/model/security/ExasolBaseObjectGrant.java @@ -24,6 +24,7 @@ import org.jkiss.dbeaver.ext.exasol.tools.ExasolUtils; import org.jkiss.dbeaver.model.access.DBAPrivilege; import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils; import org.jkiss.dbeaver.model.meta.Property; +import org.jkiss.dbeaver.model.meta.PropertyLength; import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor; import org.jkiss.utils.CommonUtils; @@ -194,7 +195,7 @@ public class ExasolBaseObjectGrant implements DBAPrivilege { } @Override - @Property(hidden = true, multiline = true) + @Property(hidden = true, length = PropertyLength.MULTILINE) public String getDescription() { // No Description available diff --git a/plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/model/security/ExasolConnectionGrant.java b/plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/model/security/ExasolConnectionGrant.java index 290226965a..51f5e1731c 100644 --- a/plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/model/security/ExasolConnectionGrant.java +++ b/plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/model/security/ExasolConnectionGrant.java @@ -24,6 +24,7 @@ import org.jkiss.dbeaver.model.DBPDataSource; import org.jkiss.dbeaver.model.access.DBAPrivilege; import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils; import org.jkiss.dbeaver.model.meta.Property; +import org.jkiss.dbeaver.model.meta.PropertyLength; import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor; import org.jkiss.dbeaver.model.struct.DBSObject; @@ -60,7 +61,7 @@ public class ExasolConnectionGrant } @Override - @Property(hidden = true, multiline = true) + @Property(hidden = true, length = PropertyLength.MULTILINE) public String getDescription() { return null; diff --git a/plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/model/security/ExasolRole.java b/plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/model/security/ExasolRole.java index e40510498c..d33f4ca5a7 100644 --- a/plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/model/security/ExasolRole.java +++ b/plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/model/security/ExasolRole.java @@ -23,6 +23,7 @@ import org.jkiss.dbeaver.model.DBPNamedObject2; import org.jkiss.dbeaver.model.access.DBARole; import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils; import org.jkiss.dbeaver.model.meta.Property; +import org.jkiss.dbeaver.model.meta.PropertyLength; import org.jkiss.dbeaver.model.struct.DBSObject; import java.sql.ResultSet; @@ -64,7 +65,7 @@ public class ExasolRole extends ExasolGrantee implements DBARole, DBPNamedObjec return name; } - @Property(viewable = true, updatable=true, editable=true, multiline = true, order = 10) + @Property(viewable = true, updatable=true, editable=true, length = PropertyLength.MULTILINE, order = 10) public String getDescription() { return description; } diff --git a/plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/model/security/ExasolSecurityPolicy.java b/plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/model/security/ExasolSecurityPolicy.java index de599b7d8f..a191048eeb 100644 --- a/plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/model/security/ExasolSecurityPolicy.java +++ b/plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/model/security/ExasolSecurityPolicy.java @@ -8,6 +8,7 @@ import org.jkiss.dbeaver.model.DBPRefreshableObject; import org.jkiss.dbeaver.model.DBPSaveableObject; import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils; import org.jkiss.dbeaver.model.meta.Property; +import org.jkiss.dbeaver.model.meta.PropertyLength; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; import org.jkiss.dbeaver.model.struct.DBSObject; import org.jkiss.utils.CommonUtils; @@ -113,7 +114,7 @@ public class ExasolSecurityPolicy implements DBPRefreshableObject, DBPSaveableOb @Override - @Property(viewable = true, order = 20, multiline= true) + @Property(viewable = true, order = 20, length = PropertyLength.MULTILINE) public String getDescription() { return description; } diff --git a/plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/model/security/ExasolSystemGrant.java b/plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/model/security/ExasolSystemGrant.java index 2f75f5651a..f5fd07fae0 100644 --- a/plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/model/security/ExasolSystemGrant.java +++ b/plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/model/security/ExasolSystemGrant.java @@ -23,6 +23,7 @@ import org.jkiss.dbeaver.model.DBPDataSource; import org.jkiss.dbeaver.model.access.DBAPrivilege; import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils; import org.jkiss.dbeaver.model.meta.Property; +import org.jkiss.dbeaver.model.meta.PropertyLength; import org.jkiss.dbeaver.model.struct.DBSObject; import java.sql.ResultSet; @@ -58,7 +59,7 @@ public class ExasolSystemGrant implements DBAPrivilege { } @Override - @Property(hidden=true, multiline = true) + @Property(hidden=true, length = PropertyLength.MULTILINE) public String getDescription() { return ""; diff --git a/plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/model/security/ExasolUser.java b/plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/model/security/ExasolUser.java index 1192ec720a..453d8526a9 100644 --- a/plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/model/security/ExasolUser.java +++ b/plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/model/security/ExasolUser.java @@ -26,6 +26,7 @@ import org.jkiss.dbeaver.model.DBPSaveableObject; import org.jkiss.dbeaver.model.access.DBAUser; import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils; import org.jkiss.dbeaver.model.meta.Property; +import org.jkiss.dbeaver.model.meta.PropertyLength; import org.jkiss.utils.CommonUtils; import java.math.BigDecimal; @@ -184,7 +185,7 @@ public class ExasolUser extends ExasolGrantee } @Override - @Property(viewable = true, updatable=true, editable=true, multiline = true, order = 150) + @Property(viewable = true, updatable=true, editable=true, length = PropertyLength.MULTILINE, order = 150) public String getDescription() { return this.description; diff --git a/plugins/org.jkiss.dbeaver.ext.firebird/src/org/jkiss/dbeaver/ext/firebird/model/FireBirdTableColumn.java b/plugins/org.jkiss.dbeaver.ext.firebird/src/org/jkiss/dbeaver/ext/firebird/model/FireBirdTableColumn.java index e0ba73090b..f21623afdf 100644 --- a/plugins/org.jkiss.dbeaver.ext.firebird/src/org/jkiss/dbeaver/ext/firebird/model/FireBirdTableColumn.java +++ b/plugins/org.jkiss.dbeaver.ext.firebird/src/org/jkiss/dbeaver/ext/firebird/model/FireBirdTableColumn.java @@ -24,6 +24,7 @@ import org.jkiss.dbeaver.model.DBPDataKind; import org.jkiss.dbeaver.model.DBPNamedObject2; import org.jkiss.dbeaver.model.exec.jdbc.JDBCResultSet; import org.jkiss.dbeaver.model.meta.Property; +import org.jkiss.dbeaver.model.meta.PropertyLength; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; import org.jkiss.dbeaver.model.struct.DBSTypedObjectExt4; @@ -94,7 +95,7 @@ public class FireBirdTableColumn extends GenericTableColumn implements DBPNamedO @Nullable @Override - @Property(viewable = true, editable = true, updatable = true, multiline = true, order = 100) + @Property(viewable = true, editable = true, updatable = true, length = PropertyLength.MULTILINE, order = 100) public String getDescription() { return super.getDescription(); diff --git a/plugins/org.jkiss.dbeaver.ext.generic/src/org/jkiss/dbeaver/ext/generic/model/GenericDataType.java b/plugins/org.jkiss.dbeaver.ext.generic/src/org/jkiss/dbeaver/ext/generic/model/GenericDataType.java index 7a63afd109..3c08c6d803 100644 --- a/plugins/org.jkiss.dbeaver.ext.generic/src/org/jkiss/dbeaver/ext/generic/model/GenericDataType.java +++ b/plugins/org.jkiss.dbeaver.ext.generic/src/org/jkiss/dbeaver/ext/generic/model/GenericDataType.java @@ -20,6 +20,7 @@ import org.jkiss.code.NotNull; import org.jkiss.code.Nullable; import org.jkiss.dbeaver.model.impl.jdbc.struct.JDBCDataType; import org.jkiss.dbeaver.model.meta.Property; +import org.jkiss.dbeaver.model.meta.PropertyLength; import org.jkiss.dbeaver.model.struct.DBSTypedObject; /** @@ -45,7 +46,7 @@ public class GenericDataType extends JDBCDataType @Nullable @Override - @Property(viewable = true, multiline = true, order = 100) + @Property(viewable = true, length = PropertyLength.MULTILINE, order = 100) public String getDescription() { return super.getDescription(); diff --git a/plugins/org.jkiss.dbeaver.ext.generic/src/org/jkiss/dbeaver/ext/generic/model/GenericSequence.java b/plugins/org.jkiss.dbeaver.ext.generic/src/org/jkiss/dbeaver/ext/generic/model/GenericSequence.java index 5f38bee451..a7e6918ab4 100644 --- a/plugins/org.jkiss.dbeaver.ext.generic/src/org/jkiss/dbeaver/ext/generic/model/GenericSequence.java +++ b/plugins/org.jkiss.dbeaver.ext.generic/src/org/jkiss/dbeaver/ext/generic/model/GenericSequence.java @@ -22,6 +22,7 @@ import org.jkiss.dbeaver.model.DBPEvaluationContext; import org.jkiss.dbeaver.model.DBPQualifiedObject; import org.jkiss.dbeaver.model.DBUtils; import org.jkiss.dbeaver.model.meta.Property; +import org.jkiss.dbeaver.model.meta.PropertyLength; import org.jkiss.dbeaver.model.struct.DBSObject; import org.jkiss.dbeaver.model.struct.rdb.DBSSequence; @@ -62,7 +63,7 @@ public class GenericSequence implements DBSSequence, DBPQualifiedObject @Nullable @Override - @Property(viewable = true, multiline = true, order = 10) + @Property(viewable = true, length = PropertyLength.MULTILINE, order = 10) public String getDescription() { return description; } diff --git a/plugins/org.jkiss.dbeaver.ext.generic/src/org/jkiss/dbeaver/ext/generic/model/GenericSynonym.java b/plugins/org.jkiss.dbeaver.ext.generic/src/org/jkiss/dbeaver/ext/generic/model/GenericSynonym.java index 86276b6323..02ea57b262 100644 --- a/plugins/org.jkiss.dbeaver.ext.generic/src/org/jkiss/dbeaver/ext/generic/model/GenericSynonym.java +++ b/plugins/org.jkiss.dbeaver.ext.generic/src/org/jkiss/dbeaver/ext/generic/model/GenericSynonym.java @@ -22,6 +22,7 @@ import org.jkiss.dbeaver.model.DBPEvaluationContext; import org.jkiss.dbeaver.model.DBPQualifiedObject; import org.jkiss.dbeaver.model.DBUtils; import org.jkiss.dbeaver.model.meta.Property; +import org.jkiss.dbeaver.model.meta.PropertyLength; import org.jkiss.dbeaver.model.struct.DBSAlias; import org.jkiss.dbeaver.model.struct.DBSObject; @@ -55,7 +56,7 @@ public abstract class GenericSynonym implements DBSAlias, DBSObject, DBPQualifie @Nullable @Override - @Property(viewable = true, multiline = true, order = 10) + @Property(viewable = true, length = PropertyLength.MULTILINE, order = 10) public String getDescription() { return description; } diff --git a/plugins/org.jkiss.dbeaver.ext.generic/src/org/jkiss/dbeaver/ext/generic/model/GenericTableBase.java b/plugins/org.jkiss.dbeaver.ext.generic/src/org/jkiss/dbeaver/ext/generic/model/GenericTableBase.java index 8bbb28bd93..a83feb9330 100644 --- a/plugins/org.jkiss.dbeaver.ext.generic/src/org/jkiss/dbeaver/ext/generic/model/GenericTableBase.java +++ b/plugins/org.jkiss.dbeaver.ext.generic/src/org/jkiss/dbeaver/ext/generic/model/GenericTableBase.java @@ -34,6 +34,7 @@ import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils; import org.jkiss.dbeaver.model.impl.jdbc.struct.JDBCTable; import org.jkiss.dbeaver.model.meta.Association; import org.jkiss.dbeaver.model.meta.Property; +import org.jkiss.dbeaver.model.meta.PropertyLength; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; import org.jkiss.dbeaver.model.struct.DBSDataContainer; import org.jkiss.dbeaver.model.struct.DBSEntityConstraintType; @@ -226,7 +227,7 @@ public abstract class GenericTableBase extends JDBCTable implem @Nullable @Override - @Property(viewable = true, editableExpr = "object.dataSource.metaModel.tableColumnCommentEditable", updatableExpr = "object.dataSource.metaModel.tableColumnCommentEditable", multiline = true, order = 100) + @Property(viewable = true, editableExpr = "object.dataSource.metaModel.tableColumnCommentEditable", updatableExpr = "object.dataSource.metaModel.tableColumnCommentEditable", length = PropertyLength.MULTILINE, order = 100) public String getDescription() { return remarks; diff --git a/plugins/org.jkiss.dbeaver.ext.generic/src/org/jkiss/dbeaver/ext/generic/model/GenericTableIndex.java b/plugins/org.jkiss.dbeaver.ext.generic/src/org/jkiss/dbeaver/ext/generic/model/GenericTableIndex.java index 33c616b2ff..a813621e8c 100644 --- a/plugins/org.jkiss.dbeaver.ext.generic/src/org/jkiss/dbeaver/ext/generic/model/GenericTableIndex.java +++ b/plugins/org.jkiss.dbeaver.ext.generic/src/org/jkiss/dbeaver/ext/generic/model/GenericTableIndex.java @@ -22,6 +22,7 @@ import org.jkiss.dbeaver.model.DBPEvaluationContext; import org.jkiss.dbeaver.model.DBUtils; import org.jkiss.dbeaver.model.impl.jdbc.struct.JDBCTableIndex; import org.jkiss.dbeaver.model.meta.Property; +import org.jkiss.dbeaver.model.meta.PropertyLength; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; import org.jkiss.dbeaver.model.struct.rdb.DBSIndexType; @@ -80,7 +81,7 @@ public class GenericTableIndex extends JDBCTableIndex im @Nullable @Override - @Property(viewable = true, editable = true, updatable = true, multiline = true, order = 100) + @Property(viewable = true, editable = true, updatable = true, length = PropertyLength.MULTILINE, order = 100) public String getDescription() { return description; } diff --git a/plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/model/SQLServerTableIndex.java b/plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/model/SQLServerTableIndex.java index 2cf31e9c9d..15f0a2c8b5 100644 --- a/plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/model/SQLServerTableIndex.java +++ b/plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/model/SQLServerTableIndex.java @@ -28,6 +28,7 @@ import org.jkiss.dbeaver.model.exec.jdbc.JDBCSession; import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils; import org.jkiss.dbeaver.model.impl.jdbc.struct.JDBCTableIndex; import org.jkiss.dbeaver.model.meta.Property; +import org.jkiss.dbeaver.model.meta.PropertyLength; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; import org.jkiss.dbeaver.model.sql.SQLUtils; import org.jkiss.dbeaver.model.struct.DBSObjectWithScript; @@ -130,7 +131,7 @@ public class SQLServerTableIndex extends JDBCTableIndex implements DBSTa return description; } - @Property(viewable = true, multiline = true, order = 16) + @Property(viewable = true, length = PropertyLength.MULTILINE, order = 16) public String getComment() { return comment; diff --git a/plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/model/MySQLTable.java b/plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/model/MySQLTable.java index c36bd28ac6..c47ed26e96 100644 --- a/plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/model/MySQLTable.java +++ b/plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/model/MySQLTable.java @@ -76,7 +76,7 @@ public class MySQLTable extends MySQLTableBase implements DBPObjectStatistics @Property(viewable = true, editable = true, updatable = true, order = 4) public long getAutoIncrement() { return autoIncrement; } @Property(viewable = false, editable = true, updatable = true, listProvider = CharsetListProvider.class, order = 5) public MySQLCharset getCharset() { return charset; } @Property(viewable = false, editable = true, updatable = true, listProvider = CollationListProvider.class, order = 6) public MySQLCollation getCollation() { return collation; } - @Property(viewable = true, editable = true, updatable = true, multiline = true, order = 100) public String getDescription() { return description; } + @Property(viewable = true, editable = true, updatable = true, length = PropertyLength.MULTILINE, order = 100) public String getDescription() { return description; } @Property(category = CATEGORY_STATISTICS, viewable = false, order = 10) public long getRowCount() { return rowCount; } @Property(category = CATEGORY_STATISTICS, viewable = false, order = 11) public long getAvgRowLength() { return avgRowLength; } diff --git a/plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/model/MySQLTableColumn.java b/plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/model/MySQLTableColumn.java index 05772f8fca..bc0e4da226 100644 --- a/plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/model/MySQLTableColumn.java +++ b/plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/model/MySQLTableColumn.java @@ -30,6 +30,7 @@ import org.jkiss.dbeaver.model.impl.jdbc.struct.JDBCColumnKeyType; import org.jkiss.dbeaver.model.impl.jdbc.struct.JDBCTableColumn; import org.jkiss.dbeaver.model.meta.IPropertyValueListProvider; import org.jkiss.dbeaver.model.meta.Property; +import org.jkiss.dbeaver.model.meta.PropertyLength; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; import org.jkiss.dbeaver.model.sql.SQLConstants; import org.jkiss.dbeaver.model.sql.SQLUtils; @@ -372,7 +373,7 @@ public class MySQLTableColumn extends JDBCTableColumn implements this.collation = collation; } - @Property(viewable = true, editable = true, updatable = true, multiline = true, order = 100) + @Property(viewable = true, editable = true, updatable = true, length = PropertyLength.MULTILINE, order = 100) public String getComment() { return comment; diff --git a/plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/model/MySQLTableIndex.java b/plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/model/MySQLTableIndex.java index a52d567797..9f94fc3ea3 100644 --- a/plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/model/MySQLTableIndex.java +++ b/plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/model/MySQLTableIndex.java @@ -26,6 +26,7 @@ import org.jkiss.dbeaver.model.DBUtils; import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils; import org.jkiss.dbeaver.model.impl.jdbc.struct.JDBCTableIndex; import org.jkiss.dbeaver.model.meta.Property; +import org.jkiss.dbeaver.model.meta.PropertyLength; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; import org.jkiss.dbeaver.model.struct.rdb.DBSIndexType; import org.jkiss.dbeaver.model.struct.rdb.DBSTableIndex; @@ -110,7 +111,7 @@ public class MySQLTableIndex extends JDBCTableIndex im @Nullable @Override - @Property(viewable = true, multiline = true, order = 100) + @Property(viewable = true, length = PropertyLength.MULTILINE, order = 100) public String getDescription() { return indexComment; diff --git a/plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/model/OracleTableBase.java b/plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/model/OracleTableBase.java index 7dc38da1b8..6771935442 100644 --- a/plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/model/OracleTableBase.java +++ b/plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/model/OracleTableBase.java @@ -32,10 +32,7 @@ import org.jkiss.dbeaver.model.impl.jdbc.cache.JDBCObjectCache; import org.jkiss.dbeaver.model.impl.jdbc.cache.JDBCStructCache; import org.jkiss.dbeaver.model.impl.jdbc.struct.JDBCTable; import org.jkiss.dbeaver.model.impl.jdbc.struct.JDBCTableColumn; -import org.jkiss.dbeaver.model.meta.Association; -import org.jkiss.dbeaver.model.meta.IPropertyCacheValidator; -import org.jkiss.dbeaver.model.meta.LazyProperty; -import org.jkiss.dbeaver.model.meta.Property; +import org.jkiss.dbeaver.model.meta.*; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; import org.jkiss.dbeaver.model.struct.DBSObject; import org.jkiss.dbeaver.model.struct.DBSObjectState; @@ -139,7 +136,7 @@ public abstract class OracleTableBase extends JDBCTable implemen return getComment(monitor); } - @Property(viewable = true, editable = true, updatable = true, multiline = true, order = 100) + @Property(viewable = true, editable = true, updatable = true, length = PropertyLength.MULTILINE, order = 100) @LazyProperty(cacheValidator = CommentLoadValidator.class) public String getComment(DBRProgressMonitor monitor) { if (comment == null) { diff --git a/plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/model/OracleTrigger.java b/plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/model/OracleTrigger.java index dbf8c74986..9b80bf531a 100644 --- a/plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/model/OracleTrigger.java +++ b/plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/model/OracleTrigger.java @@ -28,6 +28,7 @@ import org.jkiss.dbeaver.model.edit.DBEPersistAction; import org.jkiss.dbeaver.model.exec.DBCException; import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils; import org.jkiss.dbeaver.model.meta.Property; +import org.jkiss.dbeaver.model.meta.PropertyLength; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; import org.jkiss.dbeaver.model.struct.DBSObject; import org.jkiss.dbeaver.model.struct.DBSObjectState; @@ -152,7 +153,7 @@ public abstract class OracleTrigger extends OracleObje @Nullable @Override - @Property(multiline = true, order = 11) + @Property(length = PropertyLength.MULTILINE, order = 11) public String getDescription() { return description; diff --git a/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreAggregate.java b/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreAggregate.java index 190426c9c3..5c799f5234 100644 --- a/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreAggregate.java +++ b/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreAggregate.java @@ -22,6 +22,7 @@ import org.jkiss.dbeaver.model.DBPObjectWithLazyDescription; import org.jkiss.dbeaver.model.DBPOverloadedObject; import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils; import org.jkiss.dbeaver.model.meta.Property; +import org.jkiss.dbeaver.model.meta.PropertyLength; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; import org.jkiss.dbeaver.model.struct.DBSObject; @@ -116,7 +117,7 @@ public class PostgreAggregate implements PostgreObject, DBPOverloadedObject, DBP } @Override - @Property(viewable = true, multiline = true, order = 100) + @Property(viewable = true, length = PropertyLength.MULTILINE, order = 100) public String getDescription(DBRProgressMonitor monitor) throws DBException { return function == null ? null : function.getDescription(); } diff --git a/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreAttribute.java b/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreAttribute.java index e0b1bff639..49301ad6ca 100644 --- a/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreAttribute.java +++ b/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreAttribute.java @@ -27,10 +27,7 @@ import org.jkiss.dbeaver.model.exec.jdbc.JDBCResultSet; import org.jkiss.dbeaver.model.impl.DBPositiveNumberTransformer; import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils; import org.jkiss.dbeaver.model.impl.jdbc.struct.JDBCTableColumn; -import org.jkiss.dbeaver.model.meta.IPropertyValueListProvider; -import org.jkiss.dbeaver.model.meta.IPropertyValueTransformer; -import org.jkiss.dbeaver.model.meta.IPropertyValueValidator; -import org.jkiss.dbeaver.model.meta.Property; +import org.jkiss.dbeaver.model.meta.*; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor; import org.jkiss.dbeaver.model.struct.DBSEntity; @@ -40,7 +37,10 @@ import org.jkiss.dbeaver.model.struct.DBSTypedObjectExt4; import org.jkiss.utils.CommonUtils; import java.sql.Types; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Comparator; +import java.util.List; /** * PostgreAttribute @@ -366,7 +366,7 @@ public abstract class PostgreAttribute @Nullable @Override - @Property(viewable = true, editable = true, updatable = true, multiline = true, order = 100) + @Property(viewable = true, editable = true, updatable = true, length = PropertyLength.MULTILINE, order = 100) public String getDescription() { return description; } diff --git a/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreDatabase.java b/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreDatabase.java index fb4d16cd4d..575992a56b 100644 --- a/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreDatabase.java +++ b/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreDatabase.java @@ -34,10 +34,7 @@ import org.jkiss.dbeaver.model.impl.jdbc.JDBCRemoteInstance; import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils; import org.jkiss.dbeaver.model.impl.jdbc.cache.JDBCObjectCache; import org.jkiss.dbeaver.model.impl.jdbc.cache.JDBCObjectLookupCache; -import org.jkiss.dbeaver.model.meta.Association; -import org.jkiss.dbeaver.model.meta.ForTest; -import org.jkiss.dbeaver.model.meta.IPropertyValueListProvider; -import org.jkiss.dbeaver.model.meta.Property; +import org.jkiss.dbeaver.model.meta.*; import org.jkiss.dbeaver.model.preferences.DBPPropertySource; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor; @@ -290,7 +287,7 @@ public class PostgreDatabase extends JDBCRemoteInstance } @Override - @Property(viewable = true, editable = true, updatable = true, multiline = true, order = 100) + @Property(viewable = true, editable = true, updatable = true, length = PropertyLength.MULTILINE, order = 100) public String getDescription(DBRProgressMonitor monitor) { if (!getDataSource().getServerType().supportsDatabaseDescription()) { return null; diff --git a/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreIndex.java b/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreIndex.java index 476d0e6aea..00b8625a23 100644 --- a/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreIndex.java +++ b/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreIndex.java @@ -27,6 +27,7 @@ import org.jkiss.dbeaver.model.exec.jdbc.JDBCSession; import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils; import org.jkiss.dbeaver.model.impl.jdbc.struct.JDBCTableIndex; import org.jkiss.dbeaver.model.meta.Property; +import org.jkiss.dbeaver.model.meta.PropertyLength; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; import org.jkiss.dbeaver.model.struct.rdb.DBSIndexType; import org.jkiss.utils.ByteNumberFormat; @@ -213,7 +214,7 @@ public class PostgreIndex extends JDBCTableIndex { @@ -52,7 +53,7 @@ public class SQLiteDataType extends JDBCDataType { @Nullable @Override - @Property(viewable = true, multiline = true, order = 100) + @Property(viewable = true, length = PropertyLength.MULTILINE, order = 100) public String getDescription() { return super.getDescription(); diff --git a/plugins/org.jkiss.dbeaver.ext.vertica/src/org/jkiss/dbeaver/ext/vertica/model/VerticaProjectionColumn.java b/plugins/org.jkiss.dbeaver.ext.vertica/src/org/jkiss/dbeaver/ext/vertica/model/VerticaProjectionColumn.java index 93ea55c657..1fb44659a9 100644 --- a/plugins/org.jkiss.dbeaver.ext.vertica/src/org/jkiss/dbeaver/ext/vertica/model/VerticaProjectionColumn.java +++ b/plugins/org.jkiss.dbeaver.ext.vertica/src/org/jkiss/dbeaver/ext/vertica/model/VerticaProjectionColumn.java @@ -24,6 +24,7 @@ import org.jkiss.dbeaver.model.exec.jdbc.JDBCResultSet; import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils; import org.jkiss.dbeaver.model.impl.jdbc.struct.JDBCTableColumn; import org.jkiss.dbeaver.model.meta.Property; +import org.jkiss.dbeaver.model.meta.PropertyLength; /** * VerticaProjectionColumn @@ -97,7 +98,7 @@ public class VerticaProjectionColumn extends JDBCTableColumn return super.getPrecision(); } - @Property(viewable = true, editable = true, updatable = true, multiline = true, order = 100) + @Property(viewable = true, editable = true, updatable = true, length = PropertyLength.MULTILINE, order = 100) @Override public String getDescription() { return description; diff --git a/plugins/org.jkiss.dbeaver.ext.vertica/src/org/jkiss/dbeaver/ext/vertica/model/VerticaTableColumn.java b/plugins/org.jkiss.dbeaver.ext.vertica/src/org/jkiss/dbeaver/ext/vertica/model/VerticaTableColumn.java index e82414c4a6..6465c50b0c 100644 --- a/plugins/org.jkiss.dbeaver.ext.vertica/src/org/jkiss/dbeaver/ext/vertica/model/VerticaTableColumn.java +++ b/plugins/org.jkiss.dbeaver.ext.vertica/src/org/jkiss/dbeaver/ext/vertica/model/VerticaTableColumn.java @@ -20,6 +20,7 @@ import org.jkiss.code.Nullable; import org.jkiss.dbeaver.ext.generic.model.GenericTableBase; import org.jkiss.dbeaver.ext.generic.model.GenericTableColumn; import org.jkiss.dbeaver.model.meta.Property; +import org.jkiss.dbeaver.model.meta.PropertyLength; /** * VerticaTableColumn @@ -62,7 +63,7 @@ public class VerticaTableColumn extends GenericTableColumn @Nullable @Override - @Property(viewable = true, editable = true, updatable = true, multiline = true, order = 100) + @Property(viewable = true, editable = true, updatable = true, length = PropertyLength.MULTILINE, order = 100) public String getDescription() { return super.getDescription(); diff --git a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/struct/AbstractProcedure.java b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/struct/AbstractProcedure.java index caf965cc88..16a0769dfd 100644 --- a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/struct/AbstractProcedure.java +++ b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/struct/AbstractProcedure.java @@ -20,6 +20,7 @@ import org.jkiss.code.NotNull; import org.jkiss.code.Nullable; import org.jkiss.dbeaver.model.*; import org.jkiss.dbeaver.model.meta.Property; +import org.jkiss.dbeaver.model.meta.PropertyLength; import org.jkiss.dbeaver.model.struct.DBSObject; import org.jkiss.dbeaver.model.struct.DBSObjectContainer; import org.jkiss.dbeaver.model.struct.rdb.DBSProcedure; @@ -72,7 +73,7 @@ public abstract class AbstractProcedure< @Nullable @Override - @Property(viewable = true, multiline = true, order = 100) + @Property(viewable = true, length = PropertyLength.MULTILINE, order = 100) public String getDescription() { return description; diff --git a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/struct/AbstractTrigger.java b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/struct/AbstractTrigger.java index 3314cd0461..9615e40c7b 100644 --- a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/struct/AbstractTrigger.java +++ b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/struct/AbstractTrigger.java @@ -22,6 +22,7 @@ import org.jkiss.dbeaver.model.DBPQualifiedObject; import org.jkiss.dbeaver.model.DBPSaveableObject; import org.jkiss.dbeaver.model.meta.IPropertyValueListProvider; import org.jkiss.dbeaver.model.meta.Property; +import org.jkiss.dbeaver.model.meta.PropertyLength; import org.jkiss.dbeaver.model.struct.DBSActionTiming; import org.jkiss.dbeaver.model.struct.rdb.DBSManipulationType; import org.jkiss.dbeaver.model.struct.rdb.DBSTrigger; @@ -86,7 +87,7 @@ public abstract class AbstractTrigger implements DBSTrigger, DBPQualifiedObject, @Nullable @Override - @Property(viewable = true, multiline = true, order = 100) + @Property(viewable = true, length = PropertyLength.MULTILINE, order = 100) public String getDescription() { return description; diff --git a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/meta/Property.java b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/meta/Property.java index a0edfe606d..c31bd152b3 100644 --- a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/meta/Property.java +++ b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/meta/Property.java @@ -30,6 +30,7 @@ import java.text.Format; @Retention(RetentionPolicy.RUNTIME) public @interface Property { + String DEFAULT_LOCAL_STRING = "#"; //NON-NLS-1 String RESOURCE_TYPE_NAME = "name"; //NON-NLS-1 String RESOURCE_TYPE_DESCRIPTION = "description"; //NON-NLS-1 @@ -88,7 +89,7 @@ public @interface Property /** * Multiline properties usually contain some big texts */ - boolean multiline() default false; + PropertyLength length() default PropertyLength.LONG; /** * Specific properties ae rendered separate from others diff --git a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/meta/PropertyLength.java b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/meta/PropertyLength.java new file mode 100644 index 0000000000..1cad21b8e9 --- /dev/null +++ b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/meta/PropertyLength.java @@ -0,0 +1,28 @@ +/* + * DBeaver - Universal Database Manager + * Copyright (C) 2010-2021 DBeaver Corp and others + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jkiss.dbeaver.model.meta; + +/** + * Property + */ +public enum PropertyLength { + TINY, // 1 character + SHORT, // <= 20 characters + MEDIUM, // <= 64 characters + LONG, // Full line length. The default + MULTILINE // Multi-line long text +} diff --git a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/runtime/properties/ObjectPropertyDescriptor.java b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/runtime/properties/ObjectPropertyDescriptor.java index e5d19a668c..f2ef3c5355 100644 --- a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/runtime/properties/ObjectPropertyDescriptor.java +++ b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/runtime/properties/ObjectPropertyDescriptor.java @@ -22,10 +22,7 @@ import org.jkiss.code.Nullable; import org.jkiss.dbeaver.model.DBPPersistedObject; import org.jkiss.dbeaver.model.exec.DBExecUtils; import org.jkiss.dbeaver.model.impl.AbstractDescriptor; -import org.jkiss.dbeaver.model.meta.IPropertyValueListProvider; -import org.jkiss.dbeaver.model.meta.IPropertyValueTransformer; -import org.jkiss.dbeaver.model.meta.IPropertyValueValidator; -import org.jkiss.dbeaver.model.meta.Property; +import org.jkiss.dbeaver.model.meta.*; import org.jkiss.dbeaver.model.preferences.DBPPropertyDescriptor; import org.jkiss.dbeaver.model.preferences.DBPPropertySource; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; @@ -156,8 +153,8 @@ public class ObjectPropertyDescriptor extends ObjectAttributeDescriptor implemen return propType == Boolean.class || propType == Boolean.TYPE; } - public boolean isMultiLine() { - return propInfo.multiline(); + public PropertyLength getLength() { + return propInfo.length(); } public boolean isSpecific() { @@ -236,7 +233,7 @@ public class ObjectPropertyDescriptor extends ObjectAttributeDescriptor implemen if (this.isNumeric()) features.add("numeric"); if (this.isNameProperty()) features.add("name"); - if (this.isMultiLine()) features.add("multiline"); + if (this.getLength() == PropertyLength.MULTILINE) features.add("multiline"); if (this.isExpensive()) features.add("expensive"); if (this.isEditPossible()) features.add("editPossible"); if (this.isLinkPossible()) features.add("linkPossible"); @@ -266,7 +263,7 @@ public class ObjectPropertyDescriptor extends ObjectAttributeDescriptor implemen return this.isNameProperty(); case "multiline": - return this.isMultiLine(); + return this.getLength() == PropertyLength.MULTILINE; case "expensive": return this.isExpensive(); case "editPossible": diff --git a/plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/DataSourceDescriptor.java b/plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/DataSourceDescriptor.java index a64367df94..e4905c1a77 100644 --- a/plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/DataSourceDescriptor.java +++ b/plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/DataSourceDescriptor.java @@ -43,6 +43,7 @@ import org.jkiss.dbeaver.model.exec.DBExecUtils; import org.jkiss.dbeaver.model.impl.SimpleExclusiveLock; import org.jkiss.dbeaver.model.impl.data.DefaultValueHandler; import org.jkiss.dbeaver.model.meta.Property; +import org.jkiss.dbeaver.model.meta.PropertyLength; import org.jkiss.dbeaver.model.navigator.DBNBrowseSettings; import org.jkiss.dbeaver.model.net.*; import org.jkiss.dbeaver.model.preferences.DBPPropertySource; @@ -347,7 +348,7 @@ public class DataSourceDescriptor @Nullable @Override - @Property(viewable = true, multiline = true, order = 2) + @Property(viewable = true, length = PropertyLength.MULTILINE, order = 2) public String getDescription() { return description; diff --git a/plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/driver/DriverDescriptor.java b/plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/driver/DriverDescriptor.java index 4321bb3fc7..c4448e111d 100644 --- a/plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/driver/DriverDescriptor.java +++ b/plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/driver/DriverDescriptor.java @@ -29,6 +29,7 @@ import org.jkiss.dbeaver.model.connection.*; import org.jkiss.dbeaver.model.impl.AbstractDescriptor; import org.jkiss.dbeaver.model.impl.PropertyDescriptor; import org.jkiss.dbeaver.model.meta.Property; +import org.jkiss.dbeaver.model.meta.PropertyLength; import org.jkiss.dbeaver.model.navigator.meta.DBXTreeNode; import org.jkiss.dbeaver.model.preferences.DBPPreferenceStore; import org.jkiss.dbeaver.model.preferences.DBPPropertyDescriptor; @@ -502,7 +503,7 @@ public class DriverDescriptor extends AbstractDescriptor implements DBPDriver { } @Override - @Property(viewable = true, multiline = true, order = 100) + @Property(viewable = true, length = PropertyLength.MULTILINE, order = 100) public String getDescription() { return description; } diff --git a/plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/controls/CustomFormEditor.java b/plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/controls/CustomFormEditor.java index 6e1b66b661..068267f42b 100644 --- a/plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/controls/CustomFormEditor.java +++ b/plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/controls/CustomFormEditor.java @@ -33,6 +33,7 @@ import org.jkiss.dbeaver.model.data.DBDDisplayFormat; import org.jkiss.dbeaver.model.edit.DBECommandContext; import org.jkiss.dbeaver.model.edit.DBEObjectRenamer; import org.jkiss.dbeaver.model.meta.IPropertyValueListProvider; +import org.jkiss.dbeaver.model.meta.PropertyLength; import org.jkiss.dbeaver.model.preferences.DBPPropertyDescriptor; import org.jkiss.dbeaver.model.preferences.DBPPropertySource; import org.jkiss.dbeaver.model.struct.DBSObject; @@ -281,7 +282,7 @@ public class CustomFormEditor { link.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); return link; } else if (isTextPropertyType(propType)) { - if (property instanceof ObjectPropertyDescriptor && ((ObjectPropertyDescriptor) property).isMultiLine()) { + if (property instanceof ObjectPropertyDescriptor && ((ObjectPropertyDescriptor) property).getLength() == PropertyLength.MULTILINE) { Label label = UIUtils.createControlLabel(parent, property.getDisplayName()); label.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING)); Text editor = new Text(parent, SWT.BORDER | SWT.MULTI | SWT.V_SCROLL | SWT.WRAP | (readOnly ? SWT.READ_ONLY : SWT.NONE)); diff --git a/plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/properties/PropertyEditorUtils.java b/plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/properties/PropertyEditorUtils.java index 2661237ed4..f3957a6a94 100644 --- a/plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/properties/PropertyEditorUtils.java +++ b/plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/properties/PropertyEditorUtils.java @@ -26,6 +26,7 @@ import org.jkiss.dbeaver.Log; import org.jkiss.dbeaver.model.DBPNamedObject; import org.jkiss.dbeaver.model.meta.IPropertyValueListProvider; import org.jkiss.dbeaver.model.meta.IPropertyValueValidator; +import org.jkiss.dbeaver.model.meta.PropertyLength; import org.jkiss.dbeaver.model.preferences.DBPPropertyDescriptor; import org.jkiss.dbeaver.model.preferences.DBPPropertySource; import org.jkiss.dbeaver.runtime.properties.ObjectPropertyDescriptor; @@ -78,7 +79,7 @@ public class PropertyEditorUtils { } Class propertyType = property.getDataType(); if (propertyType == null || CharSequence.class.isAssignableFrom(propertyType)) { - if (property instanceof ObjectPropertyDescriptor && ((ObjectPropertyDescriptor) property).isMultiLine()) { + if (property instanceof ObjectPropertyDescriptor && ((ObjectPropertyDescriptor) property).getLength() == PropertyLength.MULTILINE) { AdvancedTextCellEditor editor = new AdvancedTextCellEditor(parent); setValidator(editor, property, object); return editor; -- GitLab