[jbosstools-commits] JBoss Tools SVN: r7082 - in trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web: browser/wtp and 8 other directories.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Mon Mar 24 11:21:06 EDT 2008
Author: scabanovich
Date: 2008-03-24 11:21:06 -0400 (Mon, 24 Mar 2008)
New Revision: 7082
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/browser/AbstractBrowserContext.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/browser/wtp/RunOnServerContext.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/AdoptWebProjectContext.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/ImportWebProjectContext.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/AutolayoutWebProcessHandler.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/CreateJSPFileSupport.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/DeleteTLDHandler.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/FindItemOnDiagramHandler.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/FindReferringItemHandler.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/JumpToTransitionTargetHandler.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/RegisterInServerXmlHandler.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/RunOnServerHandler.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/ShowHideCommentsHandler.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/UnregisterInServerXmlHandler.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddJarToLibrarySetSupport.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddLibrarySetSupport.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddLibraryToVersionSupport.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddPageTemplateSupport.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddProjectTemplateSupport.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddVersionSupport.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/CreateTemplateFromPageHandler.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/CreateTemplateFromProjectHandler.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/CreateWebPrjHandler.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/EditProjectTemplateSupport.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/helpers/NewWebProjectHelper.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/TLDValidatorImpl.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/CreateInCollapsedHandler.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/CreateTLDVariableSupport.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/DeleteValidatorHandler.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/ExpandTLDHandler.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/ImportTLDToPaletteSupport.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/ValidateTLDHandler.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tomcat/ResetFileDateHandler.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/webapp/model/handlers/CreateWebAppErrorPageSupport.java
Log:
JBIDE-893
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/browser/AbstractBrowserContext.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/browser/AbstractBrowserContext.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/browser/AbstractBrowserContext.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -12,6 +12,7 @@
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 abstract class AbstractBrowserContext implements IBrowserContext {
@@ -37,9 +38,9 @@
public void init() {
}
- public void execute(XModelObject object) throws Exception {
+ public void execute(XModelObject object) throws XModelException {
setLastRunObject(object);
- if(url == null) throw new Exception("Cannot open " + DefaultCreateHandler.title(object, false));
+ if(url == null) throw new XModelException("Cannot open " + DefaultCreateHandler.title(object, false));
doExecute(lastRunUrl);
if(lastRunUrl.equals(url)) {
history.add(lastRunObject, url);
@@ -48,7 +49,7 @@
}
}
- protected abstract void doExecute(String lastRunUrl) throws Exception;
+ protected abstract void doExecute(String lastRunUrl) throws XModelException;
boolean isLastRunObjectUpToDate(XModelObject o) {
if(o == null) return (lastRunObject == null);
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/browser/wtp/RunOnServerContext.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/browser/wtp/RunOnServerContext.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/browser/wtp/RunOnServerContext.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -27,6 +27,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.options.PreferenceModelUtilities;
import org.jboss.tools.common.model.plugin.ModelPlugin;
@@ -108,7 +109,7 @@
return null;
}
- protected void doExecute(String lastRunUrl) throws Exception {
+ protected void doExecute(String lastRunUrl) throws XModelException {
ServiceDialog d = PreferenceModelUtilities.getPreferenceModel().getService();
IServer server = ServerManager.getInstance().getSelectedServer();
if(server == null) {
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/AdoptWebProjectContext.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/AdoptWebProjectContext.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/AdoptWebProjectContext.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -17,6 +17,7 @@
import org.jboss.tools.common.meta.action.impl.SpecialWizardSupport;
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.util.XModelObjectLoaderUtil;
import org.jboss.tools.common.util.FileUtil;
@@ -100,15 +101,15 @@
}
}
- public void setWebXMLLocation(String location) throws Exception {
+ public void setWebXMLLocation(String location) throws XModelException {
location = location.replace('\\', '/');
if(location.equals(webxmlLocation)) return;
modules = new XModelObject[0];
File f = new File(location);
- if(!f.isFile()) throw new Exception("File " + location + " does not exist.");
+ if(!f.isFile()) throw new XModelException("File " + location + " does not exist.");
String body = FileUtil.readFile(f);
String entity = support.getTarget().getModel().getEntityRecognizer().getEntityName("xml", body);
- if(entity == null || !entity.startsWith("FileWebApp")) throw new Exception("File " + location + "is not recognized as web descriptor file.");
+ if(entity == null || !entity.startsWith("FileWebApp")) throw new XModelException("File " + location + "is not recognized as web descriptor file.");
XModelObject webxml = null;
try {
webxml = support.getTarget().getModel().createModelObject(entity, null);
@@ -117,10 +118,10 @@
XModelObjectLoaderUtil.getObjectLoader(webxml).load(webxml);
webxml.getChildren();
} catch (Exception e) {
- throw new Exception("Cannot load web descriptor file " + location + ".");
+ throw new XModelException("Cannot load web descriptor file " + location + ".");
}
if("yes".equals(webxml.getAttributeValue("isIncorrect")))
- throw new Exception("Web descriptor file " + location + "is corrupted.");
+ throw new XModelException("Web descriptor file " + location + "is corrupted.");
webxmlLocation = location;
modules = createModulesInfo(webxml, new File(webinfLocation));
}
@@ -216,16 +217,16 @@
return null;
}
- public void validateModules() throws Exception {
+ public void validateModules() throws XModelException {
for (int i = 0; i < modules.length; i++) {
String n = getModuleName(modules[i]);
String uri = modules[i].getAttributeValue("URI");
String path = modules[i].getAttributeValue("path on disk");
- if(path.length() == 0) throw new Exception("Path on disk for URI " + uri + " is not set.");
- if(!new File(path).isFile()) throw new Exception("Path on disk " + path + "\nfor URI " + uri + " does not exist.");
+ if(path.length() == 0) throw new XModelException("Path on disk for URI " + uri + " is not set.");
+ if(!new File(path).isFile()) throw new XModelException("Path on disk " + path + "\nfor URI " + uri + " does not exist.");
path = modules[i].getAttributeValue("root");
- if(path.length() == 0) throw new Exception("Root for " + n + " is not set.");
- if(!new File(path).isDirectory()) throw new Exception("Root " + path + "\nfor " + n + " does not exist.");
+ if(path.length() == 0) throw new XModelException("Root for " + n + " is not set.");
+ if(!new File(path).isDirectory()) throw new XModelException("Root " + path + "\nfor " + n + " does not exist.");
}
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/ImportWebProjectContext.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/ImportWebProjectContext.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/ImportWebProjectContext.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -20,6 +20,7 @@
import org.eclipse.osgi.util.NLS;
import org.jboss.tools.common.meta.XAttribute;
+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.filesystems.impl.AbstractXMLFileImpl;
@@ -231,10 +232,10 @@
}
}
- protected void loadWebXML(String body, String location) throws Exception {
+ protected void loadWebXML(String body, String location) throws XModelException {
String entity = getTarget().getModel().getEntityRecognizer().getEntityName("xml", body); //$NON-NLS-1$
if(entity == null || !entity.startsWith("FileWebApp")) { //$NON-NLS-1$
- throw new Exception(NLS.bind(WebUIMessages.FILE_ISNOT_RECOGNIZED, location));
+ throw new XModelException(NLS.bind(WebUIMessages.FILE_ISNOT_RECOGNIZED, location));
}
try {
webxml = getTarget().getModel().createModelObject(entity, null);
@@ -244,13 +245,13 @@
webxml.getChildren();
} catch (Exception e) {
String webXMLErrorMessage = NLS.bind(WebUIMessages.CANNOT_LOAD_WEBDESCRIPTOR,location);
- throw new Exception(webXMLErrorMessage);
+ throw new XModelException(webXMLErrorMessage);
}
if("yes".equals(webxml.getAttributeValue("isIncorrect"))) { //$NON-NLS-1$ //$NON-NLS-2$
String[] errors = ((AbstractXMLFileImpl)webxml).getErrors();
String error = (errors == null || errors.length == 0) ? "" : ": " + errors[0]; //$NON-NLS-1$ //$NON-NLS-2$
String webXMLErrorMessage = NLS.bind(WebUIMessages.WEBDESCRIPTOR_FILE_IS_CORRUPTED, error);
- throw new Exception(webXMLErrorMessage);
+ throw new XModelException(webXMLErrorMessage);
}
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/AutolayoutWebProcessHandler.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/AutolayoutWebProcessHandler.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/AutolayoutWebProcessHandler.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -13,7 +13,6 @@
import java.util.*;
import org.jboss.tools.common.model.*;
import org.jboss.tools.common.model.impl.XModelImpl;
-import org.jboss.tools.common.model.util.ClassLoaderUtil;
import org.jboss.tools.common.model.util.ModelFeatureFactory;
import org.jboss.tools.common.meta.action.impl.*;
import org.jboss.tools.jst.web.messages.xpl.WebUIMessages;
@@ -29,7 +28,7 @@
return (object != null || object.isObjectEditable());
}
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
if(!isEnabled(object)) return;
ServiceDialog d = object.getModel().getService();
String mes = WebUIMessages.YOU_WANT_TO_REARRANGE_THE_DIAGRAM_ELEMENTS;
@@ -52,7 +51,7 @@
}
}
- protected Items getItemsInstance() throws Exception {
+ protected Items getItemsInstance() {
String clsname = action.getProperty("items-class"); //$NON-NLS-1$
return (Items)ModelFeatureFactory.getInstance().createFeatureInstance(clsname);
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/CreateJSPFileSupport.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/CreateJSPFileSupport.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/CreateJSPFileSupport.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -15,6 +15,7 @@
import java.util.*;
import org.jboss.tools.common.meta.action.impl.WizardDataValidator;
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.files.handlers.*;
import org.jboss.tools.common.model.options.PreferenceModelUtilities;
@@ -49,9 +50,13 @@
return new String[]{BACK, FINISH, CANCEL, HELP};
}
- public void action(String name) throws Exception {
+ public void action(String name) throws XModelException {
if(NEXT.equals(name)) {
- initSelectedTaglibs();
+ try {
+ initSelectedTaglibs();
+ } catch (IOException e) {
+ throw new XModelException(e);
+ }
setStepId(1);
} else if(BACK.equals(name)) {
saveSelectedTaglibs();
@@ -177,9 +182,9 @@
return;
}
String body = getTemplateBody();
- Set existing = taglibs.getTaglibsFromTemplate(body);
+ Set<String> existing = taglibs.getTaglibsFromTemplate(body);
StringBuffer sb = new StringBuffer();
- Iterator it = existing.iterator();
+ Iterator<String> it = existing.iterator();
while(it.hasNext()) {
String s = it.next().toString();
if(sb.length() > 0) sb.append(";");
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/DeleteTLDHandler.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/DeleteTLDHandler.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/DeleteTLDHandler.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -19,7 +19,7 @@
public class DeleteTLDHandler extends DeleteFileHandler {
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
boolean unregister = false;
if(getHelper(object).isRegistered(object.getModel(), object)) {
String checkboxMessage = WebUIMessages.DELETE_REFERENCE_FROM_WEBDESCRIPTOR;
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/FindItemOnDiagramHandler.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/FindItemOnDiagramHandler.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/FindItemOnDiagramHandler.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -25,7 +25,7 @@
return (object != null && object.isActive());
}
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
p = new Properties();
p.put("object", object);
String help = action.getProperty("help");
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/FindReferringItemHandler.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/FindReferringItemHandler.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/FindReferringItemHandler.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -26,7 +26,7 @@
return (object != null && object.isActive());
}
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
if(!isEnabled(object)) return;
XModelObject[] os = getReferringObjects(object);
if(os.length == 0) {
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/JumpToTransitionTargetHandler.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/JumpToTransitionTargetHandler.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/JumpToTransitionTargetHandler.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -12,6 +12,7 @@
import java.util.Properties;
import org.jboss.tools.common.meta.action.impl.AbstractHandler;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.util.FindObjectHelper;
import org.jboss.tools.jst.web.model.helpers.WebProcessStructureHelper;
@@ -27,7 +28,7 @@
return true;
}
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
p = new Properties();
p.put("object", object);
p.put("help", "JSFProcess_SelectItem");
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/RegisterInServerXmlHandler.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/RegisterInServerXmlHandler.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/RegisterInServerXmlHandler.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -38,7 +38,7 @@
return false;
}
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
SpecialWizard wizard = SpecialWizardFactory.createSpecialWizard("org.jboss.tools.jst.web.ui.wizards.appregister.AppRegisterWizard");
if(p == null) p = new Properties();
p.setProperty("title", action.getDisplayName());
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/RunOnServerHandler.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/RunOnServerHandler.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/RunOnServerHandler.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -44,7 +44,7 @@
}
}
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
if(!isEnabled(object)) return;
context.execute(object);
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/ShowHideCommentsHandler.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/ShowHideCommentsHandler.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/ShowHideCommentsHandler.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -29,7 +29,7 @@
return true;
}
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
if(!isEnabled(object)) return;
String attr = object.getAttributeValue("hide comments");
attr = ("no".equals(attr)) ? "yes" : "no";
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/UnregisterInServerXmlHandler.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/UnregisterInServerXmlHandler.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/UnregisterInServerXmlHandler.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -19,6 +19,7 @@
import org.jboss.tools.common.meta.action.impl.AbstractHandler;
import org.jboss.tools.common.meta.action.impl.XActionImpl;
import org.jboss.tools.common.model.ServiceDialog;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.jst.web.messages.xpl.WebUIMessages;
@@ -48,7 +49,7 @@
return false;
}
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
String name = object.getAttributeValue("application name"); //$NON-NLS-1$
if(p != null && "true".equals(p.getProperty("unregisterFromAllServers"))) {
unregisterFromAllServers(object);
@@ -68,7 +69,7 @@
return RegistrationHelper.isRegistered(EclipseResourceUtil.getProject(object));
}
- void unregisterFromAllServers(XModelObject object) throws Exception {
+ void unregisterFromAllServers(XModelObject object) throws XModelException {
IProject project = EclipseResourceUtil.getProject(object);
IServer[] ss = ServerManager.getInstance().getServers();
for (int i = 0; i < ss.length; i++) {
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddJarToLibrarySetSupport.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddJarToLibrarySetSupport.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddJarToLibrarySetSupport.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -40,7 +40,7 @@
librarySet = (LibrarySet)getProperties().get("librarySet"); //$NON-NLS-1$
}
- public void action(String name) throws Exception {
+ public void action(String name) throws XModelException {
if(OK.equals(name) || FINISH.equals(name)) {
execute();
setFinished(true);
@@ -49,7 +49,7 @@
}
}
- protected void execute() throws Exception {
+ protected void execute() throws XModelException {
String location = extractStepData(0).getProperty("location"); //$NON-NLS-1$
String jarname = librarySet.addJar(location);
getProperties().setProperty("jarname", jarname); //$NON-NLS-1$
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddLibrarySetSupport.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddLibrarySetSupport.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddLibrarySetSupport.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -32,7 +32,7 @@
return p.getProperty("name"); //$NON-NLS-1$
}
- public void action(String name) throws Exception {
+ public void action(String name) throws XModelException {
if(OK.equals(name) || FINISH.equals(name)) {
execute();
setFinished(true);
@@ -41,7 +41,7 @@
}
}
- protected void execute() throws Exception {
+ protected void execute() throws XModelException {
String name = extractStepData(0).getProperty("name"); //$NON-NLS-1$
LibrarySets.getInstance().addLibrarySet(name);
getProperties().setProperty("name", name); //$NON-NLS-1$
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddLibraryToVersionSupport.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddLibraryToVersionSupport.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddLibraryToVersionSupport.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -17,6 +17,7 @@
import org.jboss.tools.common.meta.action.XActionInvoker;
import org.jboss.tools.common.meta.action.impl.*;
import org.jboss.tools.common.model.XModel;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.options.PreferenceModelUtilities;
import org.jboss.tools.jst.web.messages.xpl.WebUIMessages;
import org.jboss.tools.jst.web.project.helpers.*;
@@ -64,7 +65,7 @@
if(pl.length > 0) setAttributeValue(0, "name", pl[0]); //$NON-NLS-1$
}
- public void action(String name) throws Exception {
+ public void action(String name) throws XModelException {
if(OK.equals(name) || FINISH.equals(name)) {
execute();
setFinished(true);
@@ -73,7 +74,7 @@
}
}
- protected void execute() throws Exception {
+ protected void execute() throws XModelException {
String name = extractStepData(0).getProperty("name"); //$NON-NLS-1$
version.addLibrary(name);
getProperties().setProperty("name", name); //$NON-NLS-1$
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddPageTemplateSupport.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddPageTemplateSupport.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddPageTemplateSupport.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -22,6 +22,7 @@
import org.jboss.tools.common.meta.action.impl.SpecialWizardSupport;
import org.jboss.tools.common.meta.action.impl.WizardDataValidator;
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.options.PreferenceModelUtilities;
import org.jboss.tools.common.model.plugin.ModelPlugin;
@@ -61,7 +62,7 @@
setAttributeValue(0, "name", selection.getAttributeValue("name")); //$NON-NLS-1$ //$NON-NLS-2$
}
- public void action(String name) throws Exception {
+ public void action(String name) throws XModelException {
if(OK.equals(name) || FINISH.equals(name)) {
execute();
setFinished(true);
@@ -70,7 +71,7 @@
}
}
- protected void execute() throws Exception {
+ protected void execute() throws XModelException {
Properties p0 = extractStepData(0);
String name = p0.getProperty("name"); //$NON-NLS-1$
String path = p0.getProperty("page path"); //$NON-NLS-1$
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddProjectTemplateSupport.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddProjectTemplateSupport.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddProjectTemplateSupport.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -18,6 +18,7 @@
import org.jboss.tools.common.meta.action.XActionInvoker;
import org.jboss.tools.common.meta.action.impl.*;
import org.jboss.tools.common.model.XModel;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.options.PreferenceModelUtilities;
import org.jboss.tools.common.model.plugin.ModelPlugin;
import org.jboss.tools.common.model.project.IModelNature;
@@ -142,7 +143,7 @@
}
}
- protected void prepareStep(int nextStep) throws Exception {
+ protected void prepareStep(int nextStep) throws XModelException {
if(nextStep == RESOURCES_STEP) {
getProperties().put("ResourcesStep", steps[RESOURCES_STEP]); //$NON-NLS-1$
resourcesStep.init();
@@ -152,7 +153,7 @@
}
}
- protected void execute() throws Exception {
+ protected void execute() throws XModelException {
Properties p0 = extractStepData(0);
String name = p0.getProperty("name"); //$NON-NLS-1$
IProject project = getSelectedProject();
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddVersionSupport.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddVersionSupport.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddVersionSupport.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -17,6 +17,7 @@
import org.jboss.tools.common.meta.action.XActionInvoker;
import org.jboss.tools.common.meta.action.impl.*;
import org.jboss.tools.common.model.XModel;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.options.PreferenceModelUtilities;
import org.jboss.tools.jst.web.messages.xpl.WebUIMessages;
import org.jboss.tools.jst.web.project.helpers.LibrarySets;
@@ -54,7 +55,7 @@
setAttributeValue(0, "templates location", location); //$NON-NLS-1$
}
- public void action(String name) throws Exception {
+ public void action(String name) throws XModelException {
if(OK.equals(name) || FINISH.equals(name)) {
execute();
setFinished(true);
@@ -63,7 +64,7 @@
}
}
- protected void execute() throws Exception {
+ protected void execute() throws XModelException {
String name = extractStepData(0).getProperty("name"); //$NON-NLS-1$
versions.addVersion(extractStepData(0));
getProperties().setProperty("name", name); //$NON-NLS-1$
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/CreateTemplateFromPageHandler.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/CreateTemplateFromPageHandler.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/CreateTemplateFromPageHandler.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -13,6 +13,7 @@
import java.util.Properties;
import org.jboss.tools.common.meta.action.impl.AbstractHandler;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.jst.web.project.helpers.AbstractWebProjectTemplate;
@@ -25,7 +26,7 @@
return EclipseResourceUtil.getModelNature(EclipseResourceUtil.getProject(object)) != null;
}
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
AbstractWebProjectTemplate template = WebProjectTemplateFactory.getTemplate(object);
if(template != null) {
template.addPageTemplate(object);
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/CreateTemplateFromProjectHandler.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/CreateTemplateFromProjectHandler.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/CreateTemplateFromProjectHandler.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -13,6 +13,7 @@
import java.util.Properties;
import org.eclipse.core.resources.IProject;
import org.jboss.tools.common.meta.action.impl.AbstractHandler;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.jst.web.project.helpers.AbstractWebProjectTemplate;
@@ -30,7 +31,7 @@
return false;
}
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
AbstractWebProjectTemplate template = WebProjectTemplateFactory.getTemplate(object);
IProject project = EclipseResourceUtil.getProject(object);
if(template != null && project != null) {
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/CreateWebPrjHandler.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/CreateWebPrjHandler.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/CreateWebPrjHandler.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -14,6 +14,7 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor;
/**
@@ -25,12 +26,16 @@
public CreateWebPrjHandler() {}
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
if (p == null) p = new Properties();
helper.createProject(object, p);
IProject project = (IProject)object.getModel().getProperties().get("project");
- project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
+ try {
+ project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
+ } catch (CoreException e) {
+ throw new XModelException(e);
+ }
}
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/EditProjectTemplateSupport.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/EditProjectTemplateSupport.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/EditProjectTemplateSupport.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -15,6 +15,7 @@
import org.eclipse.osgi.util.NLS;
import org.jboss.tools.common.meta.action.impl.*;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.jst.web.messages.xpl.WebUIMessages;
import org.jboss.tools.jst.web.project.helpers.*;
@@ -54,7 +55,7 @@
}
}
- public void action(String name) throws Exception {
+ public void action(String name) throws XModelException {
if("Save".equals(name)) { //$NON-NLS-1$
name = FINISH;
}
@@ -65,7 +66,7 @@
return new String[]{"Save", CANCEL}; //$NON-NLS-1$
}
- protected void execute() throws Exception {
+ protected void execute() throws XModelException {
projectTemplate.commit();
getProperties().setProperty("name", projectTemplate.getName()); //$NON-NLS-1$
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/helpers/NewWebProjectHelper.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/helpers/NewWebProjectHelper.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/helpers/NewWebProjectHelper.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -29,6 +29,7 @@
import org.jboss.tools.common.meta.action.impl.handlers.DefaultCreateHandler;
import org.jboss.tools.common.model.XModel;
import org.jboss.tools.common.model.XModelConstants;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.filesystems.impl.FileSystemsImpl;
import org.jboss.tools.common.model.impl.XModelImpl;
@@ -48,12 +49,12 @@
public NewWebProjectHelper() {}
- public void createProject(XModelObject object, Properties p) throws Exception {
+ public void createProject(XModelObject object, Properties p) throws XModelException {
XModel model = object.getModel();
((XModelImpl)model).waitForLoading();
XModelObject webxml = WebAppHelper.getWebApp(model);
- if(webxml == null) throw new Exception("Cannot find web.xml");
+ if(webxml == null) throw new XModelException("Cannot find web.xml");
String location = ((IFile)webxml.getAdapter(IFile.class)).getLocation().toString();
XModelObject webinf = model.getByPath("FileSystems/WEB-INF");
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/TLDValidatorImpl.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/TLDValidatorImpl.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/TLDValidatorImpl.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -28,7 +28,7 @@
return true;
}
- public void delete() throws Exception {
+ public void delete() throws XModelException {
XModelObject[] cs = getChildren();
for (int i = 0; i < cs.length; i++) {
DefaultRemoveHandler.removeFromParent(cs[i]);
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/CreateInCollapsedHandler.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/CreateInCollapsedHandler.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/CreateInCollapsedHandler.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -19,7 +19,7 @@
public CreateInCollapsedHandler() {}
- public void executeHandler(XModelObject object, Properties prop) throws Exception {
+ public void executeHandler(XModelObject object, Properties prop) throws XModelException {
if("false".equals(object.get("expanded")))
XActionInvoker.invoke("SetExpanded", object, null);
super.executeHandler(object, prop);
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/CreateTLDVariableSupport.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/CreateTLDVariableSupport.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/CreateTLDVariableSupport.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -17,6 +17,7 @@
import org.jboss.tools.common.meta.action.impl.handlers.DefaultCreateHandler;
import org.jboss.tools.common.meta.action.impl.handlers.DefaultEditHandler;
import org.jboss.tools.common.meta.key.WizardKeys;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.util.XModelObjectLoaderUtil;
import org.jboss.tools.jst.web.messages.xpl.WebUIMessages;
@@ -36,7 +37,7 @@
return new String[]{FINISH, CANCEL, HELP};
}
- public void action(String name) throws Exception {
+ public void action(String name) throws XModelException {
if(FINISH.equals(name)) {
execute();
setFinished(true);
@@ -47,7 +48,7 @@
}
}
- void execute() throws Exception {
+ void execute() throws XModelException {
Properties p = extractStepData(0);
if(action != null && action.getName().equals("Edit")) { //$NON-NLS-1$
edit(p);
@@ -57,12 +58,12 @@
getProperties().setProperty("done", "true"); //$NON-NLS-1$ //$NON-NLS-2$
}
- void create(Properties p) throws Exception {
+ void create(Properties p) throws XModelException {
XModelObject c = XModelObjectLoaderUtil.createValidObject(getTarget().getModel(), getEntityData()[0].getModelEntity().getName(), p);
DefaultCreateHandler.addCreatedObject(getTarget(), c, getProperties());
}
- void edit(Properties p) throws Exception {
+ void edit(Properties p) throws XModelException {
DefaultEditHandler.edit(getTarget(), p);
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/DeleteValidatorHandler.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/DeleteValidatorHandler.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/DeleteValidatorHandler.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -17,7 +17,7 @@
public class DeleteValidatorHandler extends AbstractHandler {
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
if(!isEnabled(object)) return;
((TLDValidatorImpl)object).delete();
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/ExpandTLDHandler.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/ExpandTLDHandler.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/ExpandTLDHandler.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -32,7 +32,7 @@
return true;
}
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
if(!isEnabled(object)) return;
String v = ("true".equals(object.get("expanded"))) ? "false" : "true";
object.setAttributeValue("expanded", v);
@@ -40,7 +40,7 @@
m.fireStructureChanged(object);
}
- public void executeHandler(XModelObject object, XModelObject[] objects, java.util.Properties p) throws Exception {
+ public void executeHandler(XModelObject object, XModelObject[] objects, java.util.Properties p) throws XModelException {
if(!isEnabled(object, objects)) return;
if(object == null || objects == null || objects.length < 2) {
executeHandler(object, p);
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/ImportTLDToPaletteSupport.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/ImportTLDToPaletteSupport.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/ImportTLDToPaletteSupport.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -20,6 +20,7 @@
import org.jboss.tools.common.meta.action.impl.SpecialWizardSupport;
import org.jboss.tools.common.meta.action.impl.WizardDataValidator;
import org.jboss.tools.common.meta.action.impl.handlers.DefaultCreateHandler;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.options.PreferenceModelUtilities;
import org.jboss.tools.jst.web.WebModelPlugin;
@@ -70,7 +71,7 @@
getProperties().put("groups", groups.keySet().toArray(new String[0])); //$NON-NLS-1$
}
- public void action(String name) throws Exception {
+ public void action(String name) throws XModelException {
if(OK.equals(name) || FINISH.equals(name)) {
execute();
setFinished(true);
@@ -79,7 +80,7 @@
}
}
- protected void execute() throws Exception {
+ protected void execute() throws XModelException {
Properties p0 = extractStepData(0);
String name = p0.getProperty("name"); //$NON-NLS-1$
String path = p0.getProperty("tld"); //$NON-NLS-1$
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/ValidateTLDHandler.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/ValidateTLDHandler.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/ValidateTLDHandler.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -25,7 +25,7 @@
return (e != null && e.length() > 0);
}
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
if(p == null) p = new Properties();
p.setProperty("toErrorTab", "true");
XActionInvoker.invoke("Open", object, p);
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tomcat/ResetFileDateHandler.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tomcat/ResetFileDateHandler.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tomcat/ResetFileDateHandler.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -21,7 +21,7 @@
return (object != null && getParentFolder(object) != null);
}
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
FolderImpl f = getParentFolder(object);
if(f != null) f.changeChildTimeStamp(object);
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/webapp/model/handlers/CreateWebAppErrorPageSupport.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/webapp/model/handlers/CreateWebAppErrorPageSupport.java 2008-03-24 15:20:14 UTC (rev 7081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/webapp/model/handlers/CreateWebAppErrorPageSupport.java 2008-03-24 15:21:06 UTC (rev 7082)
@@ -17,6 +17,7 @@
import org.jboss.tools.common.meta.action.impl.handlers.DefaultCreateHandler;
import org.jboss.tools.common.meta.action.impl.handlers.DefaultEditHandler;
import org.jboss.tools.common.meta.key.WizardKeys;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.util.XModelObjectLoaderUtil;
import org.jboss.tools.jst.web.messages.xpl.WebUIMessages;
@@ -34,7 +35,7 @@
return new String[]{FINISH, CANCEL, HELP};
}
- public void action(String name) throws Exception {
+ public void action(String name) throws XModelException {
if(FINISH.equals(name)) {
execute();
setFinished(true);
@@ -45,7 +46,7 @@
}
}
- void execute() throws Exception {
+ void execute() throws XModelException {
Properties p = extractStepData(0);
if(action != null && action.getName().equals("Edit")) { //$NON-NLS-1$
edit(p);
@@ -55,12 +56,12 @@
getProperties().setProperty("done", "true"); //$NON-NLS-1$ //$NON-NLS-2$
}
- void create(Properties p) throws Exception {
+ void create(Properties p) throws XModelException {
XModelObject c = XModelObjectLoaderUtil.createValidObject(getTarget().getModel(), getEntityData()[0].getModelEntity().getName(), p);
DefaultCreateHandler.addCreatedObject(getTarget(), c, getProperties());
}
- void edit(Properties p) throws Exception {
+ void edit(Properties p) throws XModelException {
DefaultEditHandler.edit(getTarget(), p);
}
More information about the jbosstools-commits
mailing list