Author: dazarov Date: 2007-08-13 11:22:46 -0400 (Mon, 13 Aug 2007) New Revision: 3100 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-13 15:16:12 UTC (rev 3099) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmLabelProvider.java 2007-08-13 15:22:46 UTC (rev 3100) @@ -54,13 +54,13 @@ if (element instanceof RootClass) { descriptor = (ImageDescriptor) ((RootClass) element).accept(ormModelImageVisitor); } else if (element instanceof Property) { - descriptor = (ImageDescriptor)ormModelImageVisitor.visitPersistentField((Property) element, null); + descriptor = (ImageDescriptor)ormModelImageVisitor.visitPersistentField((Property) element); } else if (element instanceof Table) { descriptor = (ImageDescriptor)ormModelImageVisitor.visitDatabaseTable((Table) element); } else if (element instanceof Column) { descriptor = (ImageDescriptor)ormModelImageVisitor.visitDatabaseColumn((Column) element); } else if (element instanceof DependantValue) { - descriptor = (ImageDescriptor)ormModelImageVisitor.visitComponentKeyMapping((DependantValue) element, null); + descriptor = (ImageDescriptor)ormModelImageVisitor.visitComponentKeyMapping((DependantValue) element); } else if (element instanceof Component) { descriptor = (ImageDescriptor)ormModelImageVisitor.visitComponentMapping((Component) element); } else if (element instanceof ManyToOne) { 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-13 15:16:12 UTC (rev 3099) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmModelImageVisitor.java 2007-08-13 15:22:46 UTC (rev 3100) @@ -45,10 +45,6 @@ private ResourceBundle BUNDLE = ViewPlugin.BUNDLE_IMAGE; - private static Integer ID = new Integer(1); - private static Integer VER = new Integer(2); - - public Object visitDatabaseTable(Table table) { return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.DatabaseTable")); //$NON-NLS-1$ } @@ -66,7 +62,7 @@ } - public Object visitPersistentField(Property field, Object argument) { + public Object visitPersistentField(Property field) { if (field !=null){ if(field.getValue() != null){ if(field.getValue() instanceof ManyToOne) @@ -119,16 +115,13 @@ return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentFieldNot_mapped")); //$NON-NLS-1$ } - public Object visitComponentKeyMapping(DependantValue mapping, Object argument) { - if (argument == ID){ + public Object visitComponentKeyMapping(DependantValue mapping) { + 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$ } - public Object visitDatabaseColumn(Column column, Object argument) { - return null; - } public Object accept(RootClass arg0) { return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentClass")); //$NON-NLS-1$