Author: dgolovin Date: 2008-07-24 16:00:58 -0400 (Thu, 24 Jul 2008) New Revision: 9297 Modified: trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/operation/ImportStrutsWarOperation.java trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/operation/StrutsProjectAdoptOperation.java Log: Fix compilation errors Modified: trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/operation/ImportStrutsWarOperation.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/operation/ImportStrutsWarOperation.java 2008-07-24 19:31:52 UTC (rev 9296) +++ trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/operation/ImportStrutsWarOperation.java 2008-07-24 20:00:58 UTC (rev 9297) @@ -14,6 +14,7 @@ import org.eclipse.core.commands.operations.AbstractOperation; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.*; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.util.FileUtil; import org.jboss.tools.jst.web.context.*; import org.jboss.tools.struts.ui.StrutsUIPlugin; @@ -35,7 +36,7 @@ super.createWebNature(); } - protected void execute() throws Exception { + protected void execute() throws XModelException { ((ImportWebWarContext)context).prepareModules(); super.execute(); } Modified: trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/operation/StrutsProjectAdoptOperation.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/operation/StrutsProjectAdoptOperation.java 2008-07-24 19:31:52 UTC (rev 9296) +++ trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/operation/StrutsProjectAdoptOperation.java 2008-07-24 20:00:58 UTC (rev 9297) @@ -11,6 +11,8 @@ package org.jboss.tools.struts.ui.operation; import java.io.File; + +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.util.FileUtil; import org.jboss.tools.struts.StrutsProjectUtil; import org.jboss.tools.struts.StrutsUtils; @@ -25,7 +27,7 @@ super(context); } - protected void execute() throws Exception { + protected void execute() throws XModelException { AdoptProjectFinisher finisher = new AdoptProjectFinisher(); finisher.setContext(model, context); finisher.execute();