Author: dgolovin Date: 2011-08-24 15:18:17 -0400 (Wed, 24 Aug 2011) New Revision: 34240 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/JSFNaturesInfoDialog.java trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/KBNaturesInfoDialog.java trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/ProjectNaturesChecker.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/util/FileUtil.java Log: code cleanup: 1. No more empty try catch blocks 2. No more early exception catch blocks Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/JSFNaturesInfoDialog.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/JSFNaturesInfoDialog.java 2011-08-24 19:03:16 UTC (rev 34239) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/JSFNaturesInfoDialog.java 2011-08-24 19:18:17 UTC (rev 34240) @@ -14,11 +14,12 @@ import java.text.MessageFormat; import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.CoreException; import org.eclipse.swt.custom.BusyIndicator; import org.eclipse.ui.PlatformUI; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.options.Preference; import org.jboss.tools.jsf.ui.JsfUIMessages; +import org.jboss.tools.jsf.ui.JsfUiPlugin; import org.jboss.tools.jsf.ui.editor.check.wizards.AddJSFCapabilitiesWizard; /** @@ -56,7 +57,8 @@ try { String value = !isRemember ? "yes" : "no"; Preference.SHOW_NATURE_WARNING.setValue(value); - } catch (CoreException e) { + } catch (XModelException e) { + JsfUiPlugin.getPluginLog().logError(e); } } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/KBNaturesInfoDialog.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/KBNaturesInfoDialog.java 2011-08-24 19:03:16 UTC (rev 34239) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/KBNaturesInfoDialog.java 2011-08-24 19:18:17 UTC (rev 34240) @@ -30,6 +30,7 @@ import org.eclipse.ui.ide.IDE; import org.eclipse.ui.internal.views.markers.MarkerSupportInternalUtilities; import org.eclipse.ui.views.markers.internal.MarkerMessages; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.options.Preference; import org.jboss.tools.jsf.ui.JsfUIMessages; import org.jboss.tools.jsf.ui.JsfUiPlugin; @@ -121,7 +122,8 @@ try { String value = !isRemember ? "yes" : "no"; Preference.SHOW_NATURE_WARNING.setValue(value); - } catch (CoreException e) { + } catch (XModelException e) { + JsfUiPlugin.getPluginLog().logError(e); } } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/ProjectNaturesChecker.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/ProjectNaturesChecker.java 2011-08-24 19:03:16 UTC (rev 34239) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/ProjectNaturesChecker.java 2011-08-24 19:18:17 UTC (rev 34240) @@ -21,6 +21,7 @@ import org.eclipse.core.runtime.QualifiedName; import org.eclipse.jdt.core.IJavaElement; import org.eclipse.jdt.core.JavaCore; +import org.eclipse.jdt.core.JavaModelException; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.IWindowListener; import org.eclipse.ui.IWorkbenchWindow; @@ -28,6 +29,7 @@ import org.jboss.tools.common.model.options.Preference; import org.jboss.tools.common.reporting.ProblemReportingHelper; import org.jboss.tools.jsf.ui.JsfUIMessages; +import org.jboss.tools.jsf.ui.JsfUiPlugin; import org.jboss.tools.jst.jsp.JspEditorPlugin; import org.jboss.tools.jst.jsp.util.FileUtil; import org.jboss.tools.jst.web.kb.IKbProject; @@ -65,7 +67,6 @@ if(windows != null) for (IWorkbenchWindow window: windows) { window.getPartService().addPartListener(partListener); } - PlatformUI.getWorkbench().addWindowListener(new WindowListener()); } @@ -111,16 +112,16 @@ IResourceDelta resourceDelta = affectedChildren[i]; if (resourceDelta.getResource() instanceof IProject) { IProject project = (IProject) resourceDelta.getResource(); - if (resourceDelta.getKind() == IResourceDelta.ADDED) { - processAddProject(project); - } else if (resourceDelta.getKind() == IResourceDelta.REMOVED) { - processRemoveProject(project); - } else { - try { - updateProjectJSFPersistents(project); - } catch (CoreException e) { - ProblemReportingHelper.reportProblem(JspEditorPlugin.PLUGIN_ID, e); + try { + if (resourceDelta.getKind() == IResourceDelta.ADDED) { + processAddProject(project); + } else if (resourceDelta.getKind() == IResourceDelta.REMOVED) { + processRemoveProject(project); + } else { + updateProjectJSFPersistents(project); } + } catch (CoreException e) { + ProblemReportingHelper.reportProblem(JspEditorPlugin.PLUGIN_ID, e); } } } @@ -141,13 +142,9 @@ projectsCollection.clear(); } - private void processAddProject(IProject project) { + private void processAddProject(IProject project) throws CoreException { addProject(project); - try { - updateProjectJSFPersistents(project); - } catch (CoreException e) { - ProblemReportingHelper.reportProblem(JspEditorPlugin.PLUGIN_ID, e); - } + updateProjectJSFPersistents(project); } private void processRemoveProject(IProject project) { @@ -159,31 +156,24 @@ IJavaElement javaElement = null; try { javaElement = FileUtil.searchForClass(JavaCore.create(project), SEARCH_CLASS); - } catch (CoreException e) { - // ignore + } finally { + if (javaElement == null) { + project.setPersistentProperty(IS_JSF_CHECK_NEED, Boolean.FALSE.toString()); + } else { + project.setPersistentProperty(IS_JSF_CHECK_NEED, Boolean.TRUE.toString()); + } } - if (javaElement == null) { - project.setPersistentProperty(IS_JSF_CHECK_NEED, Boolean.FALSE.toString()); - } else { - project.setPersistentProperty(IS_JSF_CHECK_NEED, Boolean.TRUE.toString()); - } } } - private IMarker getKBProblemMarker(IProject project) { + private IMarker getKBProblemMarker(IProject project) throws CoreException { IMarker kbProblemMarker = null; - try { - IMarker[] markers = project.findMarkers(null, false, 1); - for (int i = 0; i < markers.length; i++) { - IMarker marker = markers[i]; - String _type = marker.getType(); - if (_type != null - && _type.equals(KbBuilderMarker.KB_BUILDER_PROBLEM_MARKER_TYPE)) { - kbProblemMarker = marker; - break; - } + IMarker[] markers = project.findMarkers(null, false, 1); + for (IMarker marker : markers ) { + if (KbBuilderMarker.KB_BUILDER_PROBLEM_MARKER_TYPE.equals(marker.getType())) { + kbProblemMarker = marker; + break; } - } catch (CoreException e) { } return kbProblemMarker; } Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/util/FileUtil.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/util/FileUtil.java 2011-08-24 19:03:16 UTC (rev 34239) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/util/FileUtil.java 2011-08-24 19:18:17 UTC (rev 34240) @@ -27,6 +27,7 @@ import org.eclipse.jdt.core.search.SearchParticipant; import org.eclipse.jdt.core.search.SearchPattern; import org.eclipse.jdt.core.search.SearchRequestor; +import org.jboss.tools.jst.jsp.JspEditorPlugin; /** * @@ -35,43 +36,38 @@ */ public class FileUtil { - + + public final static int INITIAL_CAPACITY = 20; + public static IJavaElement searchForClass(IJavaProject javaProject, String className) throws JavaModelException { -// Get the search pattern - SearchPattern pattern = SearchPattern.createPattern(className, IJavaSearchConstants.TYPE, IJavaSearchConstants.DECLARATIONS, SearchPattern.R_EXACT_MATCH | SearchPattern.R_CASE_SENSITIVE); - // Get the search scope - IJavaSearchScope scope = SearchEngine.createJavaSearchScope(new IJavaElement[] { javaProject }); + // Get the search pattern + SearchPattern pattern = SearchPattern.createPattern(className, IJavaSearchConstants.TYPE, + IJavaSearchConstants.DECLARATIONS, SearchPattern.R_EXACT_MATCH | SearchPattern.R_CASE_SENSITIVE); + // Get the search scope + IJavaSearchScope scope = SearchEngine.createJavaSearchScope(new IJavaElement[] { javaProject }); - final List<SearchMatch> matches = new ArrayList<SearchMatch>(); - // Get the search requestor - SearchRequestor requestor = new SearchRequestor() { + final List<SearchMatch> matches = new ArrayList<SearchMatch>(INITIAL_CAPACITY); + // Get the search requestor + SearchRequestor requestor = new SearchRequestor() { public void acceptSearchMatch(SearchMatch match) throws CoreException { matches.add(match); } - }; + }; - // Search - SearchEngine searchEngine = new SearchEngine(); - try { - searchEngine.search(pattern, new SearchParticipant[] {SearchEngine.getDefaultSearchParticipant()}, scope, requestor, null); - } catch (CoreException ex) { - // Ignore -// ExtensionsPlugin.log(ex); - } - for (Iterator i = matches.iterator(); i != null && i.hasNext();) { - IJavaElement element = (IJavaElement)((SearchMatch)i.next()).getElement(); - String classQualifiedName = getQualifiedClassName(element); - if (className.equals(classQualifiedName)) - return element; - } - return javaProject.findType(className, new NullProgressMonitor()); - } - - private static String getQualifiedClassName(IJavaElement element) { - if(element instanceof IType) { - return ((IType)element).getFullyQualifiedName('.'); + // Search + SearchEngine searchEngine = new SearchEngine(); + try { + searchEngine.search(pattern, new SearchParticipant[] { SearchEngine.getDefaultSearchParticipant() }, scope, + requestor, null); + } catch (CoreException ex) { + JspEditorPlugin.getPluginLog().logError(ex); } - return null; - } - + for (SearchMatch match : matches) { + IJavaElement element = (IJavaElement) match.getElement(); + if(element instanceof IType && className.equals(((IType)element).getFullyQualifiedName('.'))) { + return element; + } + } + return javaProject.findType(className, new NullProgressMonitor()); + } }