Author: vyemialyanchyk
Date: 2011-01-10 13:19:07 -0500 (Mon, 10 Jan 2011)
New Revision: 28053
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/ElementsFactory.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/Shape.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/SpecialOrmShape.java
Log:
https://issues.jboss.org/browse/JBIDE-8074 - fixed
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/ElementsFactory.java
===================================================================
---
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/ElementsFactory.java 2011-01-10
18:11:38 UTC (rev 28052)
+++
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/ElementsFactory.java 2011-01-10
18:19:07 UTC (rev 28053)
@@ -16,7 +16,9 @@
import java.util.Iterator;
import java.util.Set;
+import org.hibernate.HibernateException;
import org.hibernate.cfg.Configuration;
+import org.hibernate.eclipse.console.HibernateConsolePlugin;
import org.hibernate.mapping.Collection;
import org.hibernate.mapping.Column;
import org.hibernate.mapping.Component;
@@ -115,8 +117,14 @@
OrmShape s = null;
Property property = (Property)element;
if (!property.isComposite()) {
- Type type = ((Property)element).getType();
- if (type.isEntityType()) {
+ Type type = null;
+ try {
+ type = property.getType();
+ } catch (HibernateException e) {
+ //type is not accessible
+ HibernateConsolePlugin.getDefault().logErrorMessage("HibernateException: ",
e); //$NON-NLS-1$
+ }
+ if (type != null && type.isEntityType()) {
EntityType et = (EntityType) type;
Object clazz = config != null ?
config.getClassMapping(et.getAssociatedEntityName()) : null;
@@ -139,7 +147,7 @@
}
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
protected void refreshComponentReferences(ComponentShape componentShape) {
Property property = (Property)componentShape.getOrmElement();
if (!(property.getValue() instanceof Collection)) {
@@ -230,7 +238,7 @@
}
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
protected OrmShape getOrCreateDatabaseTable(Table databaseTable) {
OrmShape tableShape = null;
if (databaseTable != null) {
@@ -256,7 +264,7 @@
return tableShape;
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({ "rawtypes", "unchecked" })
protected OrmShape getOrCreatePersistentClass(PersistentClass persistentClass,
Table componentClassDatabaseTable) {
OrmShape classShape = null;
@@ -432,7 +440,7 @@
return ormShape;
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
private boolean createConnections(ExpandableShape persistentClass, ExpandableShape
dbTable) {
boolean res = false;
if (persistentClass == null || dbTable == null) {
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/Shape.java
===================================================================
---
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/Shape.java 2011-01-10
18:11:38 UTC (rev 28052)
+++
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/Shape.java 2011-01-10
18:19:07 UTC (rev 28053)
@@ -17,10 +17,13 @@
import org.eclipse.ui.IMemento;
import org.eclipse.ui.views.properties.IPropertyDescriptor;
import org.eclipse.ui.views.properties.TextPropertyDescriptor;
+import org.hibernate.HibernateException;
+import org.hibernate.eclipse.console.HibernateConsolePlugin;
import org.hibernate.mapping.Column;
import org.hibernate.mapping.Component;
import org.hibernate.mapping.Property;
import org.hibernate.mapping.Value;
+import org.hibernate.type.Type;
import org.jboss.tools.hibernate.ui.diagram.editors.model.Connection.ConnectionType;
import org.jboss.tools.hibernate.ui.view.HibernateUtils;
@@ -290,7 +293,16 @@
if (value instanceof Component) {
res = prop.getValue().toString();
} else {
- res = prop.getType().getReturnedClass().getName();
+ Type type = null;
+ try {
+ type = prop.getType();
+ } catch (HibernateException e) {
+ //type is not accessible
+ HibernateConsolePlugin.getDefault().logErrorMessage("HibernateException:
", e); //$NON-NLS-1$
+ }
+ if (type != null) {
+ res = type.getReturnedClass().getName();
+ }
}
} else if (PROPERTY_VALUE.equals(propertyId)) {
res = prop.getValue().toString();
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/SpecialOrmShape.java
===================================================================
---
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/SpecialOrmShape.java 2011-01-10
18:11:38 UTC (rev 28052)
+++
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/SpecialOrmShape.java 2011-01-10
18:19:07 UTC (rev 28053)
@@ -12,7 +12,7 @@
import java.util.Iterator;
-import org.hibernate.MappingException;
+import org.hibernate.HibernateException;
import org.hibernate.console.ConsoleConfiguration;
import org.hibernate.console.execution.ExecutionContext.Command;
import org.hibernate.eclipse.console.HibernateConsolePlugin;
@@ -60,13 +60,14 @@
type = (Type) cfg.execute(new Command() {
public Object execute() {
return fField.getValue().getType();
- }});
+ }
+ });
} else {
- try{
+ try {
type = field.getValue().getType();
- } catch (MappingException e) {
+ } catch (HibernateException e) {
//type is not accessible
- HibernateConsolePlugin.getDefault().logErrorMessage("MappingException: ",
e); //$NON-NLS-1$
+ HibernateConsolePlugin.getDefault().logErrorMessage("HibernateException:
", e); //$NON-NLS-1$
}
}
Shape bodyOrmShape = null;