Author: scabanovich Date: 2008-04-04 08:47:57 -0400 (Fri, 04 Apr 2008) New Revision: 7330 Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/FacesConfigLoader.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFEntityRecognizer.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DeleteManagedBeanHandler.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/JSFRenameManagedPropertyChange.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/RenameManagedBeanHandler.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/refactoring/JSFPagesRefactoringChange.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/refactoring/JSFRenameFolderFacesConfigChange.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/refactoring/JSFRenamePageFacesConfigChange.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/helpers/JSFPageUpdateManager.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/helpers/bean/BeanHelper.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFPromptingProvider.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/AddJSFCapabilitiesSupport.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/JSFCapabilities.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/LibrariesPerformer.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/JSFWatcherContributor.java Log: JBIDE-895 Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/FacesConfigLoader.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/FacesConfigLoader.java 2008-04-04 12:46:49 UTC (rev 7329) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/FacesConfigLoader.java 2008-04-04 12:47:57 UTC (rev 7330) @@ -22,7 +22,6 @@ import org.jboss.tools.common.model.filesystems.impl.*; import org.jboss.tools.common.model.loaders.impl.SimpleWebFileLoader; import org.jboss.tools.common.model.util.*; -import org.jboss.tools.common.xml.SAXValidator; import org.jboss.tools.jsf.JSFModelPlugin; import org.jboss.tools.jst.web.model.*; @@ -33,7 +32,7 @@ boolean isLight = false; public void load(XModelObject object) { - String entity = object.getModelEntity().getName(); +// String entity = object.getModelEntity().getName(); String body = XModelObjectLoaderUtil.getTempBody(object); @@ -155,7 +154,7 @@ XModelObjectLoaderUtil.setTempBody(process, sw.toString()); aux.write(object.getParent(), object, process); return true; - } catch (Exception exc) { + } catch (IOException exc) { JSFModelPlugin.getPluginLog().logError(exc); return false; } @@ -177,17 +176,20 @@ ? XMLUtil.createDocumentElement(object.getModelEntity().getXMLSubPath()) : XMLUtil.createDocumentElement(object.getModelEntity().getXMLSubPath(), DOC_QUALIFIEDNAME, publicId, systemId, null); + util.setup(null, false); + util.saveAttributes(element, object); + util.saveChildren(element, object); + util.saveFinalComment(element, object); + element.removeAttribute("NAME"); + element.removeAttribute("EXTENSION"); try { - util.setup(null, false); - util.saveAttributes(element, object); - util.saveChildren(element, object); - util.saveFinalComment(element, object); - element.removeAttribute("NAME"); - element.removeAttribute("EXTENSION"); return SimpleWebFileLoader.serialize(element, object); - } catch (Exception e) { + } catch (IOException e) { JSFModelPlugin.getPluginLog().logError(e); return null; + } catch (XModelException e) { + JSFModelPlugin.getPluginLog().logError(e); + return null; } } @@ -455,11 +457,7 @@ XMLUtil.createElement(element, "null-value"); } else { Element ce = XMLUtil.createElement(element, "value"); - try { - saveAttribute(ce, "#text", cs[i].getAttributeValue("value")); - } catch (Exception t) { - JSFModelPlugin.log("Error in saving list entries", t); - } + saveAttribute(ce, "#text", cs[i].getAttributeValue("value")); } } } Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFEntityRecognizer.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFEntityRecognizer.java 2008-04-04 12:46:49 UTC (rev 7329) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFEntityRecognizer.java 2008-04-04 12:47:57 UTC (rev 7330) @@ -10,6 +10,8 @@ ******************************************************************************/ package org.jboss.tools.jsf.model; +import java.io.IOException; + import org.jboss.tools.common.model.loaders.*; import org.jboss.tools.common.xml.XMLEntityResolver; import org.jboss.tools.jsf.JSFModelPlugin; @@ -21,7 +23,7 @@ Class<?> c = JSFEntityRecognizer.class; XMLEntityResolver.registerPublicEntity(DOC_PUBLICID, c, "/meta/web-facesconfig_1_0.dtd"); XMLEntityResolver.registerPublicEntity(DOC_PUBLICID_11, c, "/meta/web-facesconfig_1_1.dtd"); - } catch (Exception e) { + } catch (IOException e) { JSFModelPlugin.getPluginLog().logError(e); } } Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DeleteManagedBeanHandler.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DeleteManagedBeanHandler.java 2008-04-04 12:46:49 UTC (rev 7329) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DeleteManagedBeanHandler.java 2008-04-04 12:47:57 UTC (rev 7330) @@ -63,14 +63,9 @@ IType type = beans.getType(object.getAttributeValue("managed-bean-class")); if(type == null || type.isBinary()) return null; ICompilationUnit u = type.getCompilationUnit(); - if(u == null) return null; - try { - IFile file = ModelPlugin.getWorkspace().getRoot().getFile(u.getPath()); - return (file == null || !file.exists()) ? null : file; - } catch (Exception e) { - //ignore - return null; - } + if(u == null || u.getPath() == null) return null; + IFile file = ModelPlugin.getWorkspace().getRoot().getFile(u.getPath()); + return (file == null || !file.isAccessible() || !file.exists()) ? null : file; } } Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/JSFRenameManagedPropertyChange.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/JSFRenameManagedPropertyChange.java 2008-04-04 12:46:49 UTC (rev 7329) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/JSFRenameManagedPropertyChange.java 2008-04-04 12:47:57 UTC (rev 7330) @@ -20,7 +20,6 @@ import org.jboss.tools.common.model.filesystems.impl.FileAnyImpl; import org.jboss.tools.common.model.impl.XModelObjectImpl; import org.jboss.tools.common.model.util.*; -import org.jboss.tools.jsf.JSFModelPlugin; import org.jboss.tools.jsf.messages.JSFUIMessages; public class JSFRenameManagedPropertyChange extends TextFileChange { @@ -73,11 +72,9 @@ if(ok) { return super.perform(pm); } - try { + if(beanProperty != null) { beanProperty.getModel().changeObjectAttribute(beanProperty, "property-name", newName); - } catch (Exception e) { - JSFModelPlugin.getPluginLog().logError(e); - } + } return null; } Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/RenameManagedBeanHandler.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/RenameManagedBeanHandler.java 2008-04-04 12:46:49 UTC (rev 7329) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/RenameManagedBeanHandler.java 2008-04-04 12:47:57 UTC (rev 7330) @@ -11,6 +11,8 @@ package org.jboss.tools.jsf.model.handlers.bean; import java.util.Properties; + +import org.eclipse.core.runtime.CoreException; import org.eclipse.jdt.core.*; import org.eclipse.jdt.ui.refactoring.RenameSupport; import org.eclipse.swt.widgets.Display; @@ -67,12 +69,12 @@ public void run() { try { runInternal(); - } catch (Exception e) { + } catch (CoreException e) { ProblemReportingHelper.reportProblem("org.jboss.tools.jsf", e); } } - public void runInternal() throws Exception { + public void runInternal() throws CoreException { RenameSupport renameSupport = RenameSupport.create(type, null, RenameSupport.UPDATE_REFERENCES); if (!renameSupport.preCheck().isOK()) return; IElementChangedListener listener = new JavaElementChangedListener(object, type); Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/refactoring/JSFPagesRefactoringChange.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/refactoring/JSFPagesRefactoringChange.java 2008-04-04 12:46:49 UTC (rev 7329) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/refactoring/JSFPagesRefactoringChange.java 2008-04-04 12:47:57 UTC (rev 7330) @@ -16,7 +16,6 @@ import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.filesystems.FileSystemsHelper; import org.jboss.tools.common.model.refactoring.RefactoringHelper; -import org.jboss.tools.jsf.JSFModelPlugin; public class JSFPagesRefactoringChange extends CompositeChange { protected String newName; @@ -28,18 +27,14 @@ this.model = model; this.newName = newName; this.replacements = replacements; - try { - addChanges(); - } catch (Exception e) { - JSFModelPlugin.getPluginLog().logError(e); - } + addChanges(); } public XModel getModel() { return model; } - private void addChanges() throws Exception { + private void addChanges() { if(model == null) return; XModelObject webRoot = FileSystemsHelper.getWebRoot(model); if(webRoot == null) return; Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/refactoring/JSFRenameFolderFacesConfigChange.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/refactoring/JSFRenameFolderFacesConfigChange.java 2008-04-04 12:46:49 UTC (rev 7329) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/refactoring/JSFRenameFolderFacesConfigChange.java 2008-04-04 12:47:57 UTC (rev 7330) @@ -21,7 +21,6 @@ import org.jboss.tools.common.meta.action.XActionInvoker; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.filesystems.impl.FolderImpl; -import org.jboss.tools.jsf.JSFModelPlugin; import org.jboss.tools.jsf.messages.JSFUIMessages; import org.jboss.tools.jsf.model.ReferenceGroupImpl; import org.jboss.tools.jsf.model.handlers.RenameViewSupport; @@ -58,14 +57,10 @@ parent = parent.getParent(); } replacements.setProperty(">" + oldPath, ">" + newPath); - try { - addChanges(); - } catch (Exception e) { - JSFModelPlugin.getPluginLog().logError(e); - } + addChanges(); } - private void addChanges() throws Exception { + private void addChanges() { if(object == null) return; XModelObject root = JSFProjectsTree.getProjectsRoot(object.getModel()); XModelObject conf = (root == null) ? null : root.getChildByPath("Configuration"); Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/refactoring/JSFRenamePageFacesConfigChange.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/refactoring/JSFRenamePageFacesConfigChange.java 2008-04-04 12:46:49 UTC (rev 7329) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/refactoring/JSFRenamePageFacesConfigChange.java 2008-04-04 12:47:57 UTC (rev 7330) @@ -21,7 +21,6 @@ import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.filesystems.impl.FolderImpl; import org.jboss.tools.common.model.util.XModelObjectLoaderUtil; -import org.jboss.tools.jsf.JSFModelPlugin; import org.jboss.tools.jsf.messages.JSFUIMessages; import org.jboss.tools.jsf.model.ReferenceGroupImpl; import org.jboss.tools.jsf.model.handlers.RenameViewSupport; @@ -50,11 +49,7 @@ int i = oldText.lastIndexOf("/"); newText = oldText.substring(0, i + 1) + newName; replacements.setProperty(oldText, newText); - try { - addChanges(); - } catch (Exception e) { - JSFModelPlugin.getPluginLog().logError(e); - } + addChanges(); } public JSFRenamePageFacesConfigChange(XModelObject object, String name, XModelObject newParent) { @@ -65,14 +60,10 @@ String oldText = XModelObjectLoaderUtil.getResourcePath(object); String newText = XModelObjectLoaderUtil.getResourcePath(newParent) + "/" + name; replacements.setProperty(oldText, newText); - try { - addChanges(); - } catch (Exception e) { - JSFModelPlugin.getPluginLog().logError(e); - } + addChanges(); } - private void addChanges() throws Exception { + private void addChanges() { if(object == null) return; XModelObject root = JSFProjectsTree.getProjectsRoot(object.getModel()); XModelObject conf = (root == null) ? null : root.getChildByPath("Configuration"); Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/helpers/JSFPageUpdateManager.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/helpers/JSFPageUpdateManager.java 2008-04-04 12:46:49 UTC (rev 7329) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/helpers/JSFPageUpdateManager.java 2008-04-04 12:47:57 UTC (rev 7330) @@ -136,13 +136,13 @@ synchronized(this) { try { wait(); - } catch (Exception e) { + } catch (InterruptedException e) { //ignore } } try { Thread.sleep(250); - } catch (Exception e) { + } catch (InterruptedException e) { //ignore } if(stopped) break; @@ -164,11 +164,7 @@ public void run() { if(!isLocked()) { - try { - updateAll(); - } catch (Exception t) { - JSFModelPlugin.log("Error while running page update", t); - } + updateAll(); } } Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/helpers/bean/BeanHelper.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/helpers/bean/BeanHelper.java 2008-04-04 12:46:49 UTC (rev 7329) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/helpers/bean/BeanHelper.java 2008-04-04 12:47:57 UTC (rev 7330) @@ -13,6 +13,7 @@ import java.util.*; import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; import org.eclipse.jdt.core.*; import org.jboss.tools.common.model.XModelObject; @@ -53,8 +54,8 @@ IJavaProject p = type.getJavaProject(); IType stype = null; try { - stype = p.findType(st); - } catch (Exception e) { + if(p != null) stype = p.findType(st); + } catch (JavaModelException e) { //ignore } return (stype == null) ? null : getJavaProperties(stype); @@ -62,13 +63,10 @@ public static IJavaProject getJavaProject(XModelObject context) { if(context == null) return null; - try { - IProject project = EclipseResourceUtil.getResource(context).getProject(); - return EclipseResourceUtil.getJavaProject(project); - } catch (Exception e) { - //ignore - return null; - } + IResource r = EclipseResourceUtil.getResource(context); + if(r == null) return null; + IProject project = r.getProject(); + return EclipseResourceUtil.getJavaProject(project); } public static IMethod findGetter(IType type, String property) throws JavaModelException { Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFPromptingProvider.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFPromptingProvider.java 2008-04-04 12:46:49 UTC (rev 7329) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFPromptingProvider.java 2008-04-04 12:47:57 UTC (rev 7330) @@ -13,6 +13,7 @@ import java.util.*; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.CoreException; import org.jboss.tools.common.model.java.handlers.OpenJavaSourceHandler; import org.eclipse.jdt.core.IType; @@ -53,7 +54,7 @@ } } - private List<Object> getListInternal(XModel model, String id, String prefix, Properties properties) throws Exception { + private List<Object> getListInternal(XModel model, String id, String prefix, Properties properties) throws CoreException { String error = null; if(JSF_BUNDLES.equals(id)) return getBundles(model); if(JSF_REGISTERED_BUNDLES.equals(id)) { @@ -138,7 +139,7 @@ list.addAll(map.keySet()); return list; } - if(error != null) throw new Exception(error); + if(error != null) throw new XModelException(error); return EMPTY_LIST; } Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/AddJSFCapabilitiesSupport.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/AddJSFCapabilitiesSupport.java 2008-04-04 12:46:49 UTC (rev 7329) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/AddJSFCapabilitiesSupport.java 2008-04-04 12:47:57 UTC (rev 7330) @@ -11,11 +11,11 @@ package org.jboss.tools.jsf.project.capabilities; import java.lang.reflect.InvocationTargetException; + import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.operation.*; import org.jboss.tools.common.meta.action.impl.*; import org.jboss.tools.common.model.*; -import org.jboss.tools.jsf.JSFModelPlugin; public class AddJSFCapabilitiesSupport extends SpecialWizardSupport { static String ATTR_CAPABILITY = "capability"; @@ -30,11 +30,7 @@ } public void reset() { - try { - performer.init(getTarget().getModel()); - } catch (Exception e) { - JSFModelPlugin.getPluginLog().logError(e); - } + performer.init(getTarget().getModel()); getProperties().put("CapabilitiesPerformer", performer); } @@ -70,10 +66,12 @@ final Executor executor = new Executor(); try { context.run(false, true, executor); - } catch (Exception e) { + } catch (InvocationTargetException e) { throw new XModelException(e); + } catch (InterruptedException e) { + throw new XModelException(e); } - if(executor.exception != null) throw new XModelException(executor.exception); + if(executor.exception != null) XModelException.rethrow(executor.exception); getProperties().put("addedCapabilities", (executor.added != null) ? executor.added : new String[0]); return !executor.cancelled; } @@ -85,6 +83,11 @@ public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { monitor.beginTask("" + getTitle(), getTaskCount()); + try { + XJob.waitForJob(); + } catch (InterruptedException e) { + //ignore + } PerformerContext context = new PerformerContext(monitor); try { IPerformerItem[] items = performer.getChildren(); Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/JSFCapabilities.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/JSFCapabilities.java 2008-04-04 12:46:49 UTC (rev 7329) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/JSFCapabilities.java 2008-04-04 12:47:57 UTC (rev 7330) @@ -16,8 +16,6 @@ import org.jboss.tools.common.model.loaders.XObjectLoader; import org.jboss.tools.common.model.options.PreferenceModelUtilities; import org.jboss.tools.common.model.util.*; -import org.jboss.tools.common.reporting.ProblemReportingHelper; -import org.jboss.tools.jsf.messages.JSFUIMessages; public class JSFCapabilities extends ExtraRootImpl { private static final long serialVersionUID = 1L; @@ -25,11 +23,7 @@ public static JSFCapabilities getInstance() { if(instance == null) { - try { - createInstance(); - } catch (Exception t) { - ProblemReportingHelper.reportProblem("org.jboss.tools.jsf", JSFUIMessages.CANNOT_LOAD_JSF_CAPABILITIES, t); - } + createInstance(); } return instance; } Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/LibrariesPerformer.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/LibrariesPerformer.java 2008-04-04 12:46:49 UTC (rev 7329) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/LibrariesPerformer.java 2008-04-04 12:47:57 UTC (rev 7330) @@ -11,6 +11,7 @@ package org.jboss.tools.jsf.project.capabilities; import java.io.File; +import java.io.IOException; import java.util.*; import org.eclipse.core.resources.*; @@ -188,7 +189,7 @@ String webRoot = WebProject.getInstance(model).getWebRootLocation(); try { FileUtil.unzip(new File(webRoot), source.getAbsolutePath()); - } catch (Exception e) { + } catch (IOException e) { //ignore } zip = true; @@ -207,7 +208,7 @@ IProject p = EclipseResourceUtil.getProject(model.getRoot()); if(p != null) try { p.refreshLocal(IResource.DEPTH_INFINITE, null); - } catch (Exception e) { + } catch (CoreException e) { //ignore } } Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/JSFWatcherContributor.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/JSFWatcherContributor.java 2008-04-04 12:46:49 UTC (rev 7329) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/JSFWatcherContributor.java 2008-04-04 12:47:57 UTC (rev 7330) @@ -35,7 +35,7 @@ public String getError() { try { checkCorrectness(); - } catch (Exception e) { + } catch (XModelException e) { return e.getMessage(); } return null;