Author: dgolovin Date: 2007-09-10 14:54:30 -0400 (Mon, 10 Sep 2007) New Revision: 3510 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/context/AdoptWebProjectContext.java trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/ImportWebDirProjectContext.java Log: fixes for : http://jira.jboss.org/jira/browse/JBIDE-759 http://jira.jboss.org/jira/browse/JBIDE-351 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 2007-09-10 18:54:26 UTC (rev 3509) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/browser/AbstractBrowserContext.java 2007-09-10 18:54:30 UTC (rev 3510) @@ -73,7 +73,7 @@ } } else updateRunPath(); synchronized (monitor) { - try { monitor.notifyAll(); } catch (Exception e) {} + monitor.notifyAll(); } } 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 2007-09-10 18:54:26 UTC (rev 3509) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/AdoptWebProjectContext.java 2007-09-10 18:54:30 UTC (rev 3510) @@ -11,6 +11,7 @@ package org.jboss.tools.jst.web.context; import java.io.File; +import java.io.IOException; import java.util.Properties; import java.util.StringTokenizer; @@ -19,6 +20,7 @@ import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.util.XModelObjectLoaderUtil; import org.jboss.tools.common.util.FileUtil; +import org.jboss.tools.jst.web.WebModelPlugin; import org.jboss.tools.jst.web.project.WebModuleConstants; import org.jboss.tools.jst.web.project.WebModuleImpl; @@ -139,7 +141,9 @@ if(parent.indexOf("..") >= 0) try { parent = new File(parent).getCanonicalPath().replace('\\', '/'); - } catch (Exception t) {} + } catch (IOException t) { + WebModelPlugin.getPluginLog().logError(t); + } Properties p = new Properties(); p.setProperty("name", name); p.setProperty("URI", uri); @@ -200,9 +204,13 @@ src = loc + "/../../JavaSource"; sf = new File(src); if(sf.isDirectory()) { - try { - return sf.getCanonicalPath().replace('\\', '/'); - } catch (Exception e) {} + + try { + return sf.getCanonicalPath().replace('\\', '/'); + } catch (IOException e) { + WebModelPlugin.getPluginLog().logError(e); + } + return src; } return null; Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/ImportWebDirProjectContext.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/ImportWebDirProjectContext.java 2007-09-10 18:54:26 UTC (rev 3509) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/ImportWebDirProjectContext.java 2007-09-10 18:54:30 UTC (rev 3510) @@ -12,12 +12,15 @@ import java.io.File; import java.util.Properties; + import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.CoreException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.loaders.impl.SerializingLoader; import org.jboss.tools.common.model.util.EclipseResourceUtil; import org.jboss.tools.common.model.util.XModelObjectLoaderUtil; import org.jboss.tools.common.util.FileUtil; +import org.jboss.tools.jst.web.WebModelPlugin; import org.jboss.tools.jst.web.messages.xpl.WebUIMessages; public abstract class ImportWebDirProjectContext extends ImportWebProjectContext { @@ -189,7 +192,9 @@ try { IProject p = getProjectHandle(); if(p.exists()) p.refreshLocal(IProject.DEPTH_INFINITE, null); - } catch (Exception e) {} + } catch (CoreException e) { + WebModelPlugin.getPluginLog().logError(e); + } } public abstract String getNatureID();