Author: scabanovich Date: 2008-03-24 10:52:36 -0400 (Mon, 24 Mar 2008) New Revision: 7070 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/handlers/DeleteUniqueHandler.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/handlers/PasteUniqueHandler.java Log: JBIDE-893 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/handlers/DeleteUniqueHandler.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/handlers/DeleteUniqueHandler.java 2008-03-24 12:09:28 UTC (rev 7069) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/handlers/DeleteUniqueHandler.java 2008-03-24 14:52:36 UTC (rev 7070) @@ -14,19 +14,20 @@ import org.jboss.tools.common.meta.action.impl.handlers.DefaultCreateHandler; import org.jboss.tools.common.meta.action.impl.handlers.DefaultRemoveHandler; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.undo.XTransactionUndo; import org.jboss.tools.common.model.util.XModelObjectLoaderUtil; public class DeleteUniqueHandler extends DefaultRemoveHandler { - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { if(!isEnabled(object)) return; String transactionName = "delete " + DefaultCreateHandler.title(object, false); executeInTransaction(object, p, transactionName, XTransactionUndo.REMOVE); } - protected void transaction(XModelObject object, Properties p) throws Exception { + protected void transaction(XModelObject object, Properties p) throws XModelException { XModelObject parent = object.getParent(); removeFromParent(object); String entity = action.getProperty("entity"); Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/handlers/PasteUniqueHandler.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/handlers/PasteUniqueHandler.java 2008-03-24 12:09:28 UTC (rev 7069) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/handlers/PasteUniqueHandler.java 2008-03-24 14:52:36 UTC (rev 7070) @@ -16,12 +16,13 @@ import org.jboss.tools.common.meta.action.impl.handlers.DefaultRemoveHandler; import org.jboss.tools.common.meta.action.impl.handlers.PasteHandler; import org.jboss.tools.common.model.XModelBuffer; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.ServiceDialog; public class PasteUniqueHandler extends PasteHandler { - protected void execute(XModelObject parent, int sourceIndex, boolean isDrop, Properties p) throws Exception { + protected void execute(XModelObject parent, int sourceIndex, boolean isDrop, Properties p) throws XModelException { XModelBuffer buffer = parent.getModel().getModelBuffer(); boolean isParent = isParent(parent, buffer.copy(sourceIndex)); if(isParent) {