Author: mdryakhlenkov Date: 2007-08-29 06:44:48 -0400 (Wed, 29 Aug 2007) New Revision: 3397 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/HibernateUtils.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmModelImageVisitor.java Log: JBIDE-862: ClassNotFoundException on open mapping diagram Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/HibernateUtils.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/HibernateUtils.java 2007-08-29 09:29:26 UTC (rev 3396) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/HibernateUtils.java 2007-08-29 10:44:48 UTC (rev 3397) @@ -17,7 +17,9 @@ } public static String getPersistentClassName(String className) { - if (className.indexOf(".") < 0) { + if (className == null) { + return ""; + } else if (className.indexOf(".") < 0) { return "default." + className; } return className; 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-29 09:29:26 UTC (rev 3396) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmModelImageVisitor.java 2007-08-29 10:44:48 UTC (rev 3397) @@ -12,6 +12,7 @@ import java.util.ResourceBundle; +import org.hibernate.MappingException; import org.hibernate.mapping.Any; import org.hibernate.mapping.Array; import org.hibernate.mapping.Bag; @@ -106,39 +107,44 @@ .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")); + try { + 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")); + } + } catch (MappingException e) { + return ViewPlugin.getImageDescriptor(BUNDLE + .getString("OrmModelImageVisitor.PersistentFieldNot_mapped")); } } if("parent".equals(field.getName()))