ERD attributes filter

plugins/org.jkiss.dbeaver.ext.erd/src/org/jkiss/dbeaver/ext/erd/model/ERDDecoratorDefault.java

@@ -177,13 +177,7 @@ public class ERDDecoratorDefault implements ERDDecorator {
                     entity.getDataSource().getContainer().getObjectFilter(firstAttr.getClass(), entity, false);
                 if (!CommonUtils.isEmpty(attributes)) {
                     for (DBSEntityAttribute attribute : attributes) {
-                        if (attribute instanceof DBSEntityAssociation) {
-                            // skip attributes which are associations
-                            // usual thing in some systems like WMI/CIM model
-                            continue;
-                        }
-                        if (DBUtils.isHiddenObject(attribute) || DBUtils.isInheritedObject(attribute)) {
-                            // Skip hidden attributes
+                        if (!isAttributeVisible(erdEntity, attribute)) {
                             continue;
                         }
                         if (columnFilter != null && !columnFilter.matches(attribute.getName())) {
@@ -216,6 +210,19 @@ public class ERDDecoratorDefault implements ERDDecorator {
         }
     }
 
+    protected boolean isAttributeVisible(ERDEntity erdEntity, DBSEntityAttribute attribute) {
+        if (attribute instanceof DBSEntityAssociation) {
+            // skip attributes which are associations
+            // usual thing in some systems like WMI/CIM model
+            return false;
+        }
+        if (DBUtils.isHiddenObject(attribute) || DBUtils.isInheritedObject(attribute)) {
+            // Skip hidden attributes
+            return false;
+        }
+        return true;
+    }
+
     @Override
     public ERDAssociation createAutoAssociation(ERDContainer diagram, DBSEntityAssociation association, ERDEntity sourceEntity, ERDEntity targetEntity, boolean reflect) {
         // Allow all auto-associations