Author: scabanovich Date: 2008-04-04 12:24:01 -0400 (Fri, 04 Apr 2008) New Revision: 7346 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/FileTilesLoader.java trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/handlers/TilesDefinitionAdopt.java trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/helpers/TilesStructureHelper.java Log: JBIDE-893 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/FileTilesLoader.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/FileTilesLoader.java 2008-04-04 16:23:01 UTC (rev 7345) +++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/FileTilesLoader.java 2008-04-04 16:24:01 UTC (rev 7346) @@ -14,6 +14,7 @@ import java.io.StringWriter; import org.jboss.tools.common.meta.XModelEntity; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.XModelObjectConstants; import org.jboss.tools.common.model.filesystems.FileAuxiliary; @@ -117,6 +118,9 @@ f.setUpdateLock(); try { f.edit(body, true); + } catch (XModelException e) { + //TODO throw XModelException + throw new RuntimeException(e); } finally { f.releaseUpdateLock(); } Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/handlers/TilesDefinitionAdopt.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/handlers/TilesDefinitionAdopt.java 2008-04-04 16:23:01 UTC (rev 7345) +++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/handlers/TilesDefinitionAdopt.java 2008-04-04 16:24:01 UTC (rev 7346) @@ -24,13 +24,13 @@ (entity.equals("FileJSP") || entity.startsWith("FileHTML"))); } - public void adopt(XModelObject target, XModelObject object, java.util.Properties p) { + public void adopt(XModelObject target, XModelObject object, java.util.Properties p) throws XModelException { String entity = object.getModelEntity().getName(); if(entity.startsWith("StrutsAction")) adoptAction(target, object); if(entity.equals("FileJSP") || entity.startsWith("FileHTML")) adoptPage(target, object); } - private void adoptAction(XModelObject target, XModelObject object) { + private void adoptAction(XModelObject target, XModelObject object) throws XModelException { String path = object.getAttributeValue("path"); XModelObject cg = object; while(cg != null && !cg.getModelEntity().getName().startsWith("StrutsConfig")) cg = cg.getParent(); @@ -38,7 +38,7 @@ target.getModel().changeObjectAttribute(target, "controllerUrl", path); } - private void adoptPage(XModelObject target, XModelObject object) { + private void adoptPage(XModelObject target, XModelObject object) throws XModelException { String path = XModelObjectLoaderUtil.getResourcePath(object); if(path == null) return; XModelObject fs = object; Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/helpers/TilesStructureHelper.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/helpers/TilesStructureHelper.java 2008-04-04 16:23:01 UTC (rev 7345) +++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/helpers/TilesStructureHelper.java 2008-04-04 16:24:01 UTC (rev 7346) @@ -91,7 +91,7 @@ return true; } - public void makeLink(XModelObject sourceItem, XModelObject targetItem) { + public void makeLink(XModelObject sourceItem, XModelObject targetItem) throws XModelException { XModelObject sourceReference = getReference(sourceItem); if(sourceReference == null) return; sourceReference.getModel().editObjectAttribute(sourceReference, ATT_EXTENDS, targetItem.getAttributeValue(ATT_NAME));