Author: dazarov Date: 2007-08-14 12:13:04 -0400 (Tue, 14 Aug 2007) New Revision: 3130 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmLabelProvider.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmModelImageVisitor.java Log: http://jira.jboss.com/jira/browse/EXIN-427 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmLabelProvider.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmLabelProvider.java 2007-08-14 16:10:00 UTC (rev 3129) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmLabelProvider.java 2007-08-14 16:13:04 UTC (rev 3130) @@ -24,6 +24,7 @@ import org.eclipse.swt.graphics.Font; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Display; +import org.hibernate.mapping.Any; import org.hibernate.mapping.Column; import org.hibernate.mapping.Component; import org.hibernate.mapping.DependantValue; @@ -67,10 +68,11 @@ descriptor = (ImageDescriptor)ormModelImageVisitor.visitManyToOneMapping((ManyToOne) element); } else if (element instanceof OneToMany) { descriptor = (ImageDescriptor)ormModelImageVisitor.visitOneToManyMapping((OneToMany) element); + } else if (element instanceof Any) { + descriptor = (ImageDescriptor)ormModelImageVisitor.visitAnyMapping((Any) element); } else if (element instanceof SimpleValue) { descriptor = (ImageDescriptor)ormModelImageVisitor.visitSimpleValueMapping((SimpleValue) element); } else { - //throw unknownElement(element); return null; } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmModelImageVisitor.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmModelImageVisitor.java 2007-08-14 16:10:00 UTC (rev 3129) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmModelImageVisitor.java 2007-08-14 16:13:04 UTC (rev 3130) @@ -12,6 +12,7 @@ import java.util.ResourceBundle; +import org.hibernate.mapping.Any; import org.hibernate.mapping.Array; import org.hibernate.mapping.Bag; import org.hibernate.mapping.Column; @@ -23,6 +24,7 @@ import org.hibernate.mapping.ManyToOne; import org.hibernate.mapping.Map; import org.hibernate.mapping.OneToMany; +import org.hibernate.mapping.OneToOne; import org.hibernate.mapping.PersistentClassVisitor; import org.hibernate.mapping.PrimitiveArray; import org.hibernate.mapping.Property; @@ -35,96 +37,154 @@ import org.hibernate.mapping.UnionSubclass; import org.jboss.tools.hibernate.ui.view.ViewPlugin; - - /** * @author Tau - * + * */ -public class OrmModelImageVisitor implements /*IOrmModelVisitor, IHibernateMappingVisitor,*/ PersistentClassVisitor { - +public class OrmModelImageVisitor implements + /* IOrmModelVisitor, IHibernateMappingVisitor, */PersistentClassVisitor { + private ResourceBundle BUNDLE = ViewPlugin.BUNDLE_IMAGE; - + public Object visitDatabaseTable(Table table) { - return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.DatabaseTable")); //$NON-NLS-1$ + return ViewPlugin.getImageDescriptor(BUNDLE + .getString("OrmModelImageVisitor.DatabaseTable")); //$NON-NLS-1$ } public Object visitDatabaseColumn(Column column) { - if(column.isUnique()) { - return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.DatabaseUniqueKeyColumn")); - }else if (HibernateUtils.isPrimaryKey(column)&& HibernateUtils.getTable(column) != null && HibernateUtils.isForeignKey(column)){ - return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.DatabasePrimaryForeignKeysColumn")); - } else if (HibernateUtils.isPrimaryKey(column)){ - return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.DatabasePrimaryKeyColumn")); //$NON-NLS-1$ - } else if (HibernateUtils.getTable(column) != null && HibernateUtils.isForeignKey(column)){ - return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.DatabaseForeignKeyColumn")); //$NON-NLS-1$ - } else return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.DatabaseColumn")); //$NON-NLS-1$ + if (column.isUnique()) { + return ViewPlugin.getImageDescriptor(BUNDLE + .getString("OrmModelImageVisitor.DatabaseUniqueKeyColumn")); + } else if (HibernateUtils.isPrimaryKey(column) + && HibernateUtils.getTable(column) != null + && HibernateUtils.isForeignKey(column)) { + return ViewPlugin + .getImageDescriptor(BUNDLE + .getString("OrmModelImageVisitor.DatabasePrimaryForeignKeysColumn")); + } else if (HibernateUtils.isPrimaryKey(column)) { + return ViewPlugin + .getImageDescriptor(BUNDLE + .getString("OrmModelImageVisitor.DatabasePrimaryKeyColumn")); //$NON-NLS-1$ + } else if (HibernateUtils.getTable(column) != null + && HibernateUtils.isForeignKey(column)) { + return ViewPlugin + .getImageDescriptor(BUNDLE + .getString("OrmModelImageVisitor.DatabaseForeignKeyColumn")); //$NON-NLS-1$ + } else + return ViewPlugin.getImageDescriptor(BUNDLE + .getString("OrmModelImageVisitor.DatabaseColumn")); //$NON-NLS-1$ } - + public Object visitPersistentField(Property field) { - if (field !=null){ - if(field.getValue() != null){ - if(field.getValue() instanceof ManyToOne) - return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentFieldMany-to-one")); //$NON-NLS-1$ + if (field != null) { + if (field.getPersistentClass().getVersion() == field) { + return ViewPlugin + .getImageDescriptor(BUNDLE + .getString("OrmModelImageVisitor.PersistentFieldSimple_version")); } - if(field.getPersistentClass().getVersion() == field){ - return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentFieldSimple_version")); //$NON-NLS-1$ + if (field.getPersistentClass().getIdentifierProperty() == field) { + return ViewPlugin + .getImageDescriptor(BUNDLE + .getString("OrmModelImageVisitor.PersistentFieldSimple_id")); } - if(field.getPersistentClass().getIdentifierProperty() == field){ - return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentFieldSimple_id")); //$NON-NLS-1$ + if (field.getValue() != null) { + if (field.getValue() instanceof OneToOne) + return ViewPlugin + .getImageDescriptor(BUNDLE + .getString("OrmModelImageVisitor.PersistentFieldOne-to-one")); + else if (field.getValue() instanceof ManyToOne) + return ViewPlugin + .getImageDescriptor(BUNDLE + .getString("OrmModelImageVisitor.PersistentFieldMany-to-one")); + else if (field.getValue() instanceof Any) + return ViewPlugin + .getImageDescriptor(BUNDLE + .getString("OrmModelImageVisitor.PersistentFieldAny")); + + if (field.getType() != null + && field.getType().isCollectionType()) { + if (field.getValue() instanceof PrimitiveArray) + return ViewPlugin + .getImageDescriptor(BUNDLE + .getString("OrmModelImageVisitor.Collection_primitive_array")); + else if (field.getValue() instanceof Array) + return ViewPlugin + .getImageDescriptor(BUNDLE + .getString("OrmModelImageVisitor.Collection_array")); + else if (field.getValue() instanceof List) + return ViewPlugin + .getImageDescriptor(BUNDLE + .getString("OrmModelImageVisitor.Collection_list")); + else if (field.getValue() instanceof Set) + return ViewPlugin + .getImageDescriptor(BUNDLE + .getString("OrmModelImageVisitor.Collection_set")); + else if (field.getValue() instanceof Map) + return ViewPlugin + .getImageDescriptor(BUNDLE + .getString("OrmModelImageVisitor.Collection_map")); + else if (field.getValue() instanceof Bag) + return ViewPlugin + .getImageDescriptor(BUNDLE + .getString("OrmModelImageVisitor.Collection_bag")); + else if (field.getValue() instanceof IdentifierBag) + return ViewPlugin + .getImageDescriptor(BUNDLE + .getString("OrmModelImageVisitor.Collection_idbag")); + else + return ViewPlugin.getImageDescriptor(BUNDLE + .getString("OrmModelImageVisitor.Collection")); + } } - if (field.getValue() != null && field.getType() != null && field.getType().isCollectionType()) { - if(field.getValue() instanceof PrimitiveArray) - return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.Collection_primitive_array")); - else if(field.getValue() instanceof Array) - return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.Collection_array")); - else if(field.getValue() instanceof List) - return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.Collection_list")); - else if(field.getValue() instanceof Set) - return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.Collection_set")); - else if(field.getValue() instanceof Map) - return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.Collection_map")); - else if(field.getValue() instanceof Bag) - return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.Collection_bag")); - else if(field.getValue() instanceof IdentifierBag) - return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.Collection_idbag")); - else - return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.Collection")); - } } - return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentFieldSimple")); //$NON-NLS-1$ + return ViewPlugin.getImageDescriptor(BUNDLE + .getString("OrmModelImageVisitor.PersistentFieldSimple")); } public Object visitManyToOneMapping(ManyToOne field) { - return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentFieldMany-to-many")); //$NON-NLS-1$ + return ViewPlugin.getImageDescriptor(BUNDLE + .getString("OrmModelImageVisitor.PersistentFieldMany-to-many")); } public Object visitOneToManyMapping(OneToMany field) { - return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentFieldOne-to-many")); //$NON-NLS-1$ + return ViewPlugin.getImageDescriptor(BUNDLE + .getString("OrmModelImageVisitor.PersistentFieldOne-to-many")); } public Object visitSimpleValueMapping(SimpleValue field) { - return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentFieldSimple")); //$NON-NLS-1$ + return ViewPlugin.getImageDescriptor(BUNDLE + .getString("OrmModelImageVisitor.PersistentFieldSimple")); } + public Object visitAnyMapping(Any field) { + return ViewPlugin.getImageDescriptor(BUNDLE + .getString("OrmModelImageVisitor.PersistentFieldMany-to-any")); + } + public Object visitComponentMapping(Component mapping) { - if (mapping != null){ - return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentFieldComponent")); //$NON-NLS-1$ + if (mapping != null) { + return ViewPlugin + .getImageDescriptor(BUNDLE + .getString("OrmModelImageVisitor.PersistentFieldComponent")); } - return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentFieldNot_mapped")); //$NON-NLS-1$ + return ViewPlugin.getImageDescriptor(BUNDLE + .getString("OrmModelImageVisitor.PersistentFieldNot_mapped")); } public Object visitComponentKeyMapping(DependantValue mapping) { - if (mapping.getTable().getIdentifierValue() == mapping){ - return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentFieldComponent_id")); //$NON-NLS-1$ + if (mapping.getTable().getIdentifierValue() == mapping) { + return ViewPlugin + .getImageDescriptor(BUNDLE + .getString("OrmModelImageVisitor.PersistentFieldComponent_id")); //$NON-NLS-1$ } - return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentFieldSimple")); //$NON-NLS-1$ + return ViewPlugin.getImageDescriptor(BUNDLE + .getString("OrmModelImageVisitor.PersistentFieldSimple")); //$NON-NLS-1$ } - public Object accept(RootClass arg0) { - return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentClass")); //$NON-NLS-1$ + return ViewPlugin.getImageDescriptor(BUNDLE + .getString("OrmModelImageVisitor.PersistentClass")); //$NON-NLS-1$ } public Object accept(UnionSubclass arg0) {