[jbosstools-commits] JBoss Tools SVN: r9344 - in trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core: scanner/lib and 1 other directories.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Fri Jul 25 20:53:49 EDT 2008
Author: dgolovin
Date: 2008-07-25 20:53:49 -0400 (Fri, 25 Jul 2008)
New Revision: 9344
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/BijectedAttribute.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamComponentMethod.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaComponentDeclaration.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamResourceVisitor.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/lib/ClassPath.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/lib/LibraryScanner.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamValidationContext.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamValidationHelper.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-351
Cleanup Seam GUI code:
1. Unnecessary catch(Exception ex) blocks were removed;
2. Catch(Exception ex) blocks were converted to catch particular exception(s) where it was possible
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/BijectedAttribute.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/BijectedAttribute.java 2008-07-26 00:41:21 UTC (rev 9343)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/BijectedAttribute.java 2008-07-26 00:53:49 UTC (rev 9344)
@@ -116,11 +116,7 @@
String[] cs = v.split(";");
List<BijectedAttributeType> list = new ArrayList<BijectedAttributeType>();
for (int i = 0; i < cs.length; i++) {
- try {
- list.add(BijectedAttributeType.valueOf(cs[i]));
- } catch (Exception e) {
- //ignore
- }
+ list.add(BijectedAttributeType.valueOf(cs[i]));
}
types = list.toArray(new BijectedAttributeType[0]);
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamComponentMethod.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamComponentMethod.java 2008-07-26 00:41:21 UTC (rev 9343)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamComponentMethod.java 2008-07-26 00:53:49 UTC (rev 9344)
@@ -143,11 +143,7 @@
if(v != null && v.length() > 0) {
String[] cs = v.split(";");
for (int i = 0; i < cs.length; i++) {
- try {
- types.add(SeamComponentMethodType.valueOf(cs[i]));
- } catch (Exception e) {
- //ignore
- }
+ types.add(SeamComponentMethodType.valueOf(cs[i]));
}
}
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaComponentDeclaration.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaComponentDeclaration.java 2008-07-26 00:41:21 UTC (rev 9343)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaComponentDeclaration.java 2008-07-26 00:53:49 UTC (rev 9344)
@@ -18,6 +18,7 @@
import java.util.Properties;
import java.util.Set;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.jdt.core.IMember;
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaModelException;
@@ -452,7 +453,7 @@
}
try {
JavaUI.openInEditor(type);
- } catch (Exception e) {
+ } catch (CoreException e) {
SeamCorePlugin.getPluginLog().logError(e);
}
}
@@ -556,7 +557,7 @@
BeanType t = null;
try {
t = BeanType.valueOf(name);
- } catch (Exception e) {
+ } catch (IllegalArgumentException e) {
continue;
}
if(t == null) continue;
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamResourceVisitor.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamResourceVisitor.java 2008-07-26 00:41:21 UTC (rev 9343)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamResourceVisitor.java 2008-07-26 00:53:49 UTC (rev 9344)
@@ -15,12 +15,14 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IResourceVisitor;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.JavaCore;
import org.jboss.tools.seam.core.SeamCorePlugin;
import org.jboss.tools.seam.internal.core.scanner.IFileScanner;
import org.jboss.tools.seam.internal.core.scanner.LoadedDeclarations;
+import org.jboss.tools.seam.internal.core.scanner.ScannerException;
import org.jboss.tools.seam.internal.core.scanner.java.JavaScanner;
import org.jboss.tools.seam.internal.core.scanner.xml.PropertiesScanner;
import org.jboss.tools.seam.internal.core.scanner.xml.XMLScanner;
@@ -64,7 +66,7 @@
LoadedDeclarations c = null;
try {
c = scanner.parse(f);
- } catch (Exception e) {
+ } catch (ScannerException e) {
SeamCorePlugin.getDefault().logError(e);
}
if(c != null) componentsLoaded(c, f);
@@ -97,7 +99,7 @@
if(!project.hasNature(JavaCore.NATURE_ID)) return null;
IJavaProject javaProject = JavaCore.create(project);
return output = javaProject.getOutputLocation();
- } catch (Exception e) {
+ } catch (CoreException e) {
SeamCorePlugin.getPluginLog().logError(e);
return null;
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/lib/ClassPath.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/lib/ClassPath.java 2008-07-26 00:41:21 UTC (rev 9343)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/lib/ClassPath.java 2008-07-26 00:53:49 UTC (rev 9344)
@@ -11,6 +11,7 @@
package org.jboss.tools.seam.internal.core.scanner.lib;
import java.io.File;
+import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLClassLoader;
@@ -99,9 +100,11 @@
newPaths = EclipseResourceUtil.getClassPath(project.getProject());
List<String> jre = EclipseResourceUtil.getJREClassPath(project.getProject());
if(jre != null) newPaths.removeAll(jre);
- } catch (Exception e) {
+ } catch (CoreException e) {
//TODO
SeamCorePlugin.getDefault().logError(e);
+ } catch(IOException e) {
+ SeamCorePlugin.getDefault().logError(e);
}
if(paths == null && newPaths == null) return false;
if((newPaths == null || paths == null) || (paths.size() != newPaths.size())) {
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/lib/LibraryScanner.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/lib/LibraryScanner.java 2008-07-26 00:41:21 UTC (rev 9343)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/lib/LibraryScanner.java 2008-07-26 00:53:49 UTC (rev 9344)
@@ -206,6 +206,7 @@
try {
ds1 = CLASS_SCANNER.parse(type, cls, sourcePath);
} catch (Exception e) {
+ // FIXME parse method should throw particular exception or catch block should be removed
SeamCorePlugin.getPluginLog().logError(e);
}
if(ds1 != null) {
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamValidationContext.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamValidationContext.java 2008-07-26 00:41:21 UTC (rev 9343)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamValidationContext.java 2008-07-26 00:53:49 UTC (rev 9344)
@@ -410,22 +410,14 @@
if(name == null || name.trim().length() == 0) continue;
String path = linkedResources[i].getAttribute("path"); //$NON-NLS-1$
if(path == null || path.trim().length() == 0) continue;
- try {
- IPath pathObject = new Path(path);
- addLinkedResource(name, pathObject);
- } catch (Exception e) {
- SeamCorePlugin.getPluginLog().logError(e);
- }
+ IPath pathObject = new Path(path);
+ addLinkedResource(name, pathObject);
}
Element[] unnamedPathElement = XMLUtilities.getChildren(root, "unnamed-path"); //$NON-NLS-1$
if(unnamedPathElement != null) for (int i = 0; i < unnamedPathElement.length; i++) {
String path = unnamedPathElement[i].getAttribute("path"); //$NON-NLS-1$
- try {
- IPath pathObject = new Path(path);
- addUnnamedResource(pathObject);
- } catch (Exception e) {
- SeamCorePlugin.getPluginLog().logError(e);
- }
+ IPath pathObject = new Path(path);
+ addUnnamedResource(pathObject);
}
}
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamValidationHelper.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamValidationHelper.java 2008-07-26 00:41:21 UTC (rev 9343)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamValidationHelper.java 2008-07-26 00:53:49 UTC (rev 9344)
@@ -46,11 +46,7 @@
*/
public ISeamProject getSeamProject() {
ISeamProject project = null;
- try {
- project = SeamCorePlugin.getSeamProject(getProject(), true);
- } catch (Exception e) {
- SeamCorePlugin.getDefault().logError(SeamCoreMessages.SEAM_VALIDATION_HELPER_CANNOT_GET_SEAM_PROJECT, e);
- }
+ project = SeamCorePlugin.getSeamProject(getProject(), true);
return project;
}
More information about the jbosstools-commits
mailing list