Author: scabanovich Date: 2008-04-04 12:20:03 -0400 (Fri, 04 Apr 2008) New Revision: 7341 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/handlers/FolderOwnerAdopt.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/helpers/ColumnsStructureHelper.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/helpers/HibernateTypeHelper.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/helpers/IdStructureHelper.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/HibernateMapImpl.java Log: JBIDE-893 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/handlers/FolderOwnerAdopt.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/handlers/FolderOwnerAdopt.java 2008-04-04 16:19:31 UTC (rev 7340) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/handlers/FolderOwnerAdopt.java 2008-04-04 16:20:03 UTC (rev 7341) @@ -16,6 +16,7 @@ import org.jboss.tools.common.meta.XChild; import org.jboss.tools.common.meta.XModelEntity; import org.jboss.tools.common.meta.action.XActionInvoker; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; public class FolderOwnerAdopt implements XAdoptManager { @@ -25,7 +26,7 @@ return false; } - public void adopt(XModelObject target, XModelObject object, Properties p) { + public void adopt(XModelObject target, XModelObject object, Properties p) throws XModelException { if(isAdoptableGrandChild(target, object)) { XModelObject folder = getFolderForChild(target, object); if(folder == null) return; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/helpers/ColumnsStructureHelper.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/helpers/ColumnsStructureHelper.java 2008-04-04 16:19:31 UTC (rev 7340) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/helpers/ColumnsStructureHelper.java 2008-04-04 16:20:03 UTC (rev 7341) @@ -18,6 +18,7 @@ import org.jboss.tools.common.meta.XModelEntity; import org.jboss.tools.common.meta.action.impl.handlers.DefaultCreateHandler; import org.jboss.tools.common.model.XModel; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; public class ColumnsStructureHelper { @@ -126,7 +127,7 @@ return c; } - public static void mergeColumnDataToAttribute(XModelObject attribute, XModelObject column) { + public static void mergeColumnDataToAttribute(XModelObject attribute, XModelObject column) throws XModelException { if(column == null || attribute == null) return; if(column.isActive() && attribute.isActive()) column = column.copy(); XAttribute[] as = column.getModelEntity().getAttributes(); @@ -180,12 +181,12 @@ // return dc; // } - public static void replaceColumnDeclarationWithChild(XModelObject attrReference, Properties p) { + public static void replaceColumnDeclarationWithChild(XModelObject attrReference, Properties p) throws XModelException { XModelObject c = newColumn(attrReference.getModel(), p); replaceColumnDeclarationWithChild(attrReference, c); } - public static void replaceColumnDeclarationWithChild(XModelObject attrReference, XModelObject column) { + public static void replaceColumnDeclarationWithChild(XModelObject attrReference, XModelObject column) throws XModelException { DefaultCreateHandler.addCreatedObject(attrReference, column, -1); XModelObject c = newColumn(attrReference.getModel(), attrReference.getAttributeValue("name")); mergeColumnDataToAttribute(attrReference, c); Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/helpers/HibernateTypeHelper.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/helpers/HibernateTypeHelper.java 2008-04-04 16:19:31 UTC (rev 7340) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/helpers/HibernateTypeHelper.java 2008-04-04 16:20:03 UTC (rev 7341) @@ -14,6 +14,7 @@ import java.util.Properties; import java.util.Set; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.util.XModelObjectLoaderUtil; @@ -128,7 +129,7 @@ return result; } - public static void mergeAttributes(XModelObject destination, XModelObject source) { + public static void mergeAttributes(XModelObject destination, XModelObject source) throws XModelException { XModelObjectLoaderUtil.mergeAttributes(destination, source); if (destination.getModelEntity().getAttribute("type") != null && Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/helpers/IdStructureHelper.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/helpers/IdStructureHelper.java 2008-04-04 16:19:31 UTC (rev 7340) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/helpers/IdStructureHelper.java 2008-04-04 16:20:03 UTC (rev 7341) @@ -15,6 +15,7 @@ import org.jboss.tools.common.model.ServiceDialog; import org.jboss.tools.common.model.XModel; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.engines.impl.EnginesLoader; import org.jboss.tools.common.model.util.XModelObjectLoaderUtil; @@ -71,7 +72,7 @@ } } - public static XModelObject[] getAsAttributes(XModelObject id) { + public static XModelObject[] getAsAttributes(XModelObject id) throws XModelException { String name = id.getAttributeValue("name"); if(name.length() == 0) return new XModelObject[0]; String entity = id.getModelEntity().getName(); @@ -104,7 +105,7 @@ return new XModelObject[0]; } - public static XModelObject getAsAttribute(XModelObject key) { + public static XModelObject getAsAttribute(XModelObject key) throws XModelException { String ec = key.getModelEntity().getName(); String er = ("HibernateKeyProperty".equals(ec)) ? "HibernateProperty" : ("HibernateKeyManyToOne".equals(ec)) ? "HibernateManyToOne" @@ -115,7 +116,7 @@ return a; } - public static List getAsColumns(XModelObject id) { + public static List getAsColumns(XModelObject id) throws XModelException { List<XModelObject> list = new ArrayList<XModelObject>(); // String name = id.getAttributeValue("name"); // if(name.length() == 0) return list; @@ -132,7 +133,7 @@ return list; } - private static void addColumnsToList(XModelObject o, List<XModelObject> list) { + private static void addColumnsToList(XModelObject o, List<XModelObject> list) throws XModelException { XModelObject[] cs = o.getChildren("HibernateColumn"); if(cs.length > 0) { for (int i = 0; i < cs.length; i++) list.add(cs[i].copy()); Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/HibernateMapImpl.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/HibernateMapImpl.java 2008-04-04 16:19:31 UTC (rev 7340) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/HibernateMapImpl.java 2008-04-04 16:20:03 UTC (rev 7341) @@ -13,6 +13,7 @@ import java.util.Properties; import org.jboss.tools.common.meta.action.XActionInvoker; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; public class HibernateMapImpl extends OrderedObject2Impl { @@ -38,7 +39,7 @@ return super.setAttributeValue(name, value); } - protected void onAttributeValueEdit(String name, String oldValue, String newValue) { + protected void onAttributeValueEdit(String name, String oldValue, String newValue) throws XModelException { if(newValue == null || newValue.equals(oldValue)) return; if("index".equals(name)) { String actionName =