[jbosstools-commits] JBoss Tools SVN: r38391 - in trunk/jst/plugins: org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/util and 4 other directories.

Author: dgolovin Date: 2012-02-01 21:13:02 -0500 (Wed, 01 Feb 2012) New Revision: 38391 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPKbAbstractModelResource.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/util/XmlUtil.java trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/helpers/WebProcessStructureHelper.java trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/pv/handler/ProjectsResourceRedirectHandler.java trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/pv/handler/ProjectsTaglibsRedirectHandler.java trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/refactoring/WebRenameTLDWebAppChange.java trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/TaglibMapping.java Log: Exception catching code cleanup Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPKbAbstractModelResource.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPKbAbstractModelResource.java 2012-02-02 01:54:03 UTC (rev 38390) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPKbAbstractModelResource.java 2012-02-02 02:13:02 UTC (rev 38391) @@ -30,19 +30,13 @@ public WTPKbAbstractModelResource(IEditorInput fEditorInput) { this.fEditorInput = fEditorInput; fProvider = WebPromptingProvider.getInstance(); - try { - if(fEditorInput instanceof IModelObjectEditorInput) { - fXModelObject = ((IModelObjectEditorInput)fEditorInput).getXModelObject(); - } else if(fEditorInput instanceof IFileEditorInput) { - IFile file = ((IFileEditorInput)fEditorInput).getFile(); - fXModelObject = EclipseResourceUtil.getObjectByResource(file); - } - fXModel = (fXModelObject == null) ? null : fXModelObject.getModel(); - } catch (Exception x) { - JspEditorPlugin.getPluginLog().logError(x); - this.fProvider = null; - this.fXModel = null; + if(fEditorInput instanceof IModelObjectEditorInput) { + fXModelObject = ((IModelObjectEditorInput)fEditorInput).getXModelObject(); + } else if(fEditorInput instanceof IFileEditorInput) { + IFile file = ((IFileEditorInput)fEditorInput).getFile(); + fXModelObject = EclipseResourceUtil.getObjectByResource(file); } + fXModel = (fXModelObject == null) ? null : fXModelObject.getModel(); } public XModel getXModel() { Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/util/XmlUtil.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/util/XmlUtil.java 2012-02-02 01:54:03 UTC (rev 38390) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/util/XmlUtil.java 2012-02-02 02:13:02 UTC (rev 38391) @@ -11,6 +11,7 @@ package org.jboss.tools.jst.jsp.util; import java.io.FileInputStream; +import java.io.IOException; import java.util.ArrayList; import java.util.List; import javax.xml.parsers.DocumentBuilder; @@ -45,7 +46,7 @@ } finally { try { if (inStream != null) inStream.close(); - } catch (Exception e) { + } catch (IOException e) { JspEditorPlugin.getPluginLog().logError(e); } } Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/helpers/WebProcessStructureHelper.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/helpers/WebProcessStructureHelper.java 2012-02-02 01:54:03 UTC (rev 38390) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/helpers/WebProcessStructureHelper.java 2012-02-02 02:13:02 UTC (rev 38391) @@ -94,7 +94,7 @@ for (int i = 0; i < s.length; i++) { try { result[i] = Integer.parseInt(s[i]); - } catch (Exception e) { + } catch (NumberFormatException e) { WebModelPlugin.getPluginLog().logError(e); result[i] = 0; } Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/pv/handler/ProjectsResourceRedirectHandler.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/pv/handler/ProjectsResourceRedirectHandler.java 2012-02-02 01:54:03 UTC (rev 38390) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/pv/handler/ProjectsResourceRedirectHandler.java 2012-02-02 02:13:02 UTC (rev 38391) @@ -11,6 +11,7 @@ package org.jboss.tools.jst.web.model.pv.handler; import org.eclipse.core.resources.*; +import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.QualifiedName; import org.jboss.tools.common.meta.action.impl.handlers.DefaultRedirectHandler; import org.jboss.tools.common.model.XModelObject; @@ -27,7 +28,7 @@ QualifiedName n = new QualifiedName("", action.getName() + "_lastPath"); //$NON-NLS-1$ //$NON-NLS-2$ String path = p.getPersistentProperty(n); if(path != null) r = p.getWorkspace().getRoot().findMember(path); - } catch (Exception e) { + } catch (CoreException e) { WebModelPlugin.getPluginLog().logError(e); } if(r == null) r = EclipseResourceUtil.getJavaSourceRoot(p); Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/pv/handler/ProjectsTaglibsRedirectHandler.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/pv/handler/ProjectsTaglibsRedirectHandler.java 2012-02-02 01:54:03 UTC (rev 38390) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/pv/handler/ProjectsTaglibsRedirectHandler.java 2012-02-02 02:13:02 UTC (rev 38391) @@ -11,6 +11,7 @@ package org.jboss.tools.jst.web.model.pv.handler; import org.eclipse.core.resources.*; +import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.QualifiedName; import org.jboss.tools.common.meta.action.impl.handlers.DefaultRedirectHandler; import org.jboss.tools.common.model.XModelObject; @@ -27,7 +28,7 @@ QualifiedName n = new QualifiedName("", action.getName() + "_lastPath"); //$NON-NLS-1$ //$NON-NLS-2$ String path = p.getPersistentProperty(n); if(path != null) r = p.getWorkspace().getRoot().findMember(path); - } catch (Exception e) { + } catch (CoreException e) { WebModelPlugin.getPluginLog().logError(e); } XModelObject o = EclipseResourceUtil.getObjectByResource(r); Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/refactoring/WebRenameTLDWebAppChange.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/refactoring/WebRenameTLDWebAppChange.java 2012-02-02 01:54:03 UTC (rev 38390) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/refactoring/WebRenameTLDWebAppChange.java 2012-02-02 02:13:02 UTC (rev 38391) @@ -35,14 +35,10 @@ int i = oldText.lastIndexOf("/"); //$NON-NLS-1$ String newText = oldText.substring(0, i + 1) + newName; replacements.setProperty(oldText, newText); - try { - addChanges(); - } catch (Exception e) { - WebModelPlugin.getPluginLog().logError(e); - } + addChanges(); } - private void addChanges() throws Exception { + private void addChanges() { if(object == null) return; XModelObject webxml = object.getModel().getByPath("/web.xml"); //$NON-NLS-1$ XModelObject[] fs = (webxml == null) ? new XModelObject[0] : new XModelObject[]{webxml}; Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/TaglibMapping.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/TaglibMapping.java 2012-02-02 01:54:03 UTC (rev 38390) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/TaglibMapping.java 2012-02-02 02:13:02 UTC (rev 38391) @@ -11,6 +11,7 @@ package org.jboss.tools.jst.web.tld; import java.io.File; +import java.net.MalformedURLException; import java.util.HashMap; import java.util.Map; import java.util.Properties; @@ -194,7 +195,7 @@ if(r != null && r.getLocation() != null) { url = r.getLocation().toFile().toURL().toString(); } - } catch (Exception e) { + } catch (MalformedURLException e) { WebModelPlugin.getPluginLog().logError(e); } if(url != null) findTldsInFolder(webinf, url); @@ -232,7 +233,7 @@ String url = null; try { url = "jar:" + new File(location).toURL().toString() + "!/META-INF/"; //$NON-NLS-1$ //$NON-NLS-2$ - } catch (Exception e) { + } catch (MalformedURLException e) { WebModelPlugin.getPluginLog().logError("TaglibMapping:findTldsInJar:" + e.getMessage(), e); //$NON-NLS-1$ return; }