Author: achabatar Date: 2007-12-12 08:14:07 -0500 (Wed, 12 Dec 2007) New Revision: 5257 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 trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmModelNameVisitor.java Log: http://jira.jboss.com/jira/browse/JBIDE-1417 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-12-12 13:14:01 UTC (rev 5256) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmLabelProvider.java 2007-12-12 13:14:07 UTC (rev 5257) @@ -28,13 +28,16 @@ import org.hibernate.mapping.Column; import org.hibernate.mapping.Component; import org.hibernate.mapping.DependantValue; +import org.hibernate.mapping.JoinedSubclass; import org.hibernate.mapping.ManyToOne; import org.hibernate.mapping.OneToMany; import org.hibernate.mapping.Property; import org.hibernate.mapping.RootClass; import org.hibernate.mapping.SimpleValue; +import org.hibernate.mapping.SingleTableSubclass; import org.hibernate.mapping.Subclass; import org.hibernate.mapping.Table; +import org.hibernate.mapping.UnionSubclass; public class OrmLabelProvider extends LabelProvider implements IColorProvider, IFontProvider { @@ -53,6 +56,14 @@ if (element instanceof RootClass) { descriptor = (ImageDescriptor) ((RootClass) element).accept(ormModelImageVisitor); + } else if (element instanceof UnionSubclass) { + descriptor = (ImageDescriptor) ((UnionSubclass) element).accept(ormModelImageVisitor); + } else if (element instanceof SingleTableSubclass) { + descriptor = (ImageDescriptor) ((SingleTableSubclass) element).accept(ormModelImageVisitor); + } else if (element instanceof JoinedSubclass) { + descriptor = (ImageDescriptor) ((JoinedSubclass) element).accept(ormModelImageVisitor); + } else if (element instanceof Subclass) { + descriptor = (ImageDescriptor) ((Subclass) element).accept(ormModelImageVisitor); } else if (element instanceof Property) { descriptor = (ImageDescriptor)ormModelImageVisitor.visitPersistentField((Property) element); } else if (element instanceof Table) { 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-12-12 13:14:01 UTC (rev 5256) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmModelImageVisitor.java 2007-12-12 13:14:07 UTC (rev 5257) @@ -12,7 +12,6 @@ import java.util.ResourceBundle; -import org.hibernate.MappingException; import org.hibernate.mapping.Any; import org.hibernate.mapping.Array; import org.hibernate.mapping.Bag; @@ -42,8 +41,7 @@ * @author Tau * */ -public class OrmModelImageVisitor implements - /* IOrmModelVisitor, IHibernateMappingVisitor, */PersistentClassVisitor { +public class OrmModelImageVisitor implements PersistentClassVisitor { private ResourceBundle BUNDLE = ViewPlugin.BUNDLE_IMAGE; @@ -202,19 +200,23 @@ } public Object accept(UnionSubclass arg0) { - return null; + return ViewPlugin.getImageDescriptor(BUNDLE + .getString("OrmModelImageVisitor.PersistentClass")); //$NON-NLS-1$ } public Object accept(SingleTableSubclass arg0) { - return null; + return ViewPlugin.getImageDescriptor(BUNDLE + .getString("OrmModelImageVisitor.PersistentClass")); //$NON-NLS-1$ } public Object accept(JoinedSubclass arg0) { - return null; + return ViewPlugin.getImageDescriptor(BUNDLE + .getString("OrmModelImageVisitor.PersistentClass")); //$NON-NLS-1$ } public Object accept(Subclass arg0) { - return null; + return ViewPlugin.getImageDescriptor(BUNDLE + .getString("OrmModelImageVisitor.PersistentClass")); //$NON-NLS-1$ } } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmModelNameVisitor.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmModelNameVisitor.java 2007-12-12 13:14:01 UTC (rev 5256) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmModelNameVisitor.java 2007-12-12 13:14:07 UTC (rev 5257) @@ -49,6 +49,28 @@ public Object visitDatabaseColumn(Column column, Object argument) { + String type = getColumnSqlType(column, argument); + + StringBuffer name = new StringBuffer(); + name.append(column.getName()); + + if (type != null) { + name.append(" ["); + name.append(type != null ? type.toUpperCase() : ""); + name.append(column.isNullable() ? " Nullable" : ""); + name.append(HibernateUtils.getTable(column) != null + && HibernateUtils.isPrimaryKey(column) ? " PK" : ""); + name.append(HibernateUtils.getTable(column) != null + && HibernateUtils.isForeignKey(column) ? " FK" : ""); + name.append("]"); + } + + return name.toString(); + + } + + public String getColumnSqlType(Column column, Object argument) { + Configuration cfg = null; Mapping mapping = null; Dialect dialect = null; @@ -83,24 +105,7 @@ } } - String type = column.getSqlType(dialect, mapping); - - StringBuffer name = new StringBuffer(); - name.append(column.getName()); - - if (type != null) { - name.append(" ["); - name.append(type != null ? type.toUpperCase() : ""); - name.append(column.isNullable() ? " Nullable" : ""); - name.append(HibernateUtils.getTable(column) != null - && HibernateUtils.isPrimaryKey(column) ? " PK" : ""); - name.append(HibernateUtils.getTable(column) != null - && HibernateUtils.isForeignKey(column) ? " FK" : ""); - name.append("]"); - } - - return name.toString(); - + return column.getSqlType(dialect, mapping); } public Object visitPersistentClass(RootClass clazz, Object argument) { @@ -167,8 +172,6 @@ name.append(typeString); } -// return name.toString(); - Value value = field.getValue(); String typeName = (String) value.accept(new TypeNameValueVisitor(false));