Author: dgolovin Date: 2011-08-19 18:49:07 -0400 (Fri, 19 Aug 2011) New Revision: 34106 Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ClassPathUpdate.java trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/ClassHyperlink.java trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/ClassMethodHyperlink.java trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/log/StatusFactory.java Log: Code cleanup related style and complexity Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/log/StatusFactory.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/log/StatusFactory.java 2011-08-19 22:42:47 UTC (rev 34105) +++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/log/StatusFactory.java 2011-08-19 22:49:07 UTC (rev 34106) @@ -18,19 +18,12 @@ public final static int UNDEFINED_ERROR = 0; public final static String UNSPECIFIED_MESSAGE = null; public final static String EMPTY_MESSAGE = ""; //$NON-NLS-1$ - public final static String EMPTY_PLUGIN = ""; //$NON-NLS-1$ public static IStatus getInstance(int severity, String pluginId, int code, String message, Throwable t) { - return new Status(severity, pluginId == null ? EMPTY_PLUGIN : pluginId, - code, checkMessage(message, t), t); + return new Status(severity, pluginId, code, checkMessage(message, t), t); } - public static IStatus getInstance(int severity, int code, String message, - Throwable t) { - return getInstance(severity, EMPTY_PLUGIN, code, message, t); - } - public static IStatus getInstance(int severity, String pluginId, String message, Throwable t) { return getInstance(severity, pluginId, UNDEFINED_ERROR, message, t); @@ -76,10 +69,8 @@ if (t != null && t.getMessage() != null) { return t.getMessage(); } - return EMPTY_MESSAGE; } - return message; } } Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ClassPathUpdate.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ClassPathUpdate.java 2011-08-19 22:42:47 UTC (rev 34105) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ClassPathUpdate.java 2011-08-19 22:49:07 UTC (rev 34106) @@ -39,7 +39,7 @@ String entity = model.getRoot().getModelEntity().getName(); if("RootDummy".equals(entity)) { //$NON-NLS-1$ String pn = (project == null) ? "?" : project.getName(); //$NON-NLS-1$ - throw new IllegalArgumentException("Project " + pn + " is corrupted."); //$NON-NLS-1$ //$NON-NLS-2$ + throw new IllegalStateException("Project " + pn + " is corrupted."); //$NON-NLS-1$ //$NON-NLS-2$ } this.model = model; } Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/ClassHyperlink.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/ClassHyperlink.java 2011-08-19 22:42:47 UTC (rev 34105) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/ClassHyperlink.java 2011-08-19 22:49:07 UTC (rev 34106) @@ -139,10 +139,9 @@ } private IJavaElement searchForClass(final String className) { - IFile documentFile = getFile(); - + IJavaElement result = null; try { - + IFile documentFile = getFile(); IProject project = null; if (documentFile == null) { IWorkbenchPage workbenchPage = ExtensionsPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage(); @@ -155,7 +154,7 @@ JarEntryResource jarEntryFile = (JarEntryResource) jarEntryEditorInput.getStorage(); IJavaProject parentProject = getProjectForJarResource(jarEntryFile); if (parentProject != null) { - return searchForClass(parentProject, className); + result = searchForClass(parentProject, className); } } else if (editorInput instanceof IStorageEditorInput) { IStorageEditorInput moeInput = (IStorageEditorInput)editorInput; @@ -163,7 +162,7 @@ if (storage instanceof JarEntryFile) { IJavaProject parentProject = getProjectForJarResource((JarEntryFile)storage); if (parentProject != null) { - return searchForClass(parentProject, className); + result = searchForClass(parentProject, className); } } IPath p = storage.getFullPath(); @@ -174,17 +173,14 @@ project = documentFile.getProject(); } - if(project == null || !project.isOpen()) - return null; - if(!project.hasNature(JavaCore.NATURE_ID)) - return null; - IJavaProject javaProject = JavaCore.create(project); - return searchForClass(javaProject, className); - + if(result==null && project != null && project.isOpen() && project.hasNature(JavaCore.NATURE_ID)) { + IJavaProject javaProject = JavaCore.create(project); + result = searchForClass(javaProject, className); + } } catch (CoreException x) { ExtensionsPlugin.getPluginLog().logError("Error while looking for class " + className, x); //$NON-NLS-1$ - return null; } + return result; } private IJavaProject getProjectForJarResource(JarEntryResource jarResource){ Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/ClassMethodHyperlink.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/ClassMethodHyperlink.java 2011-08-19 22:42:47 UTC (rev 34105) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/ClassMethodHyperlink.java 2011-08-19 22:49:07 UTC (rev 34106) @@ -138,41 +138,43 @@ } } - protected IJavaElement searchForClassMethod(IJavaProject javaProject, String className, String methodName) { - try { -// Get the search pattern - SearchPattern pattern = SearchPattern.createPattern(className + "." + methodName, IJavaSearchConstants.METHOD, IJavaSearchConstants.DECLARATIONS, SearchPattern.R_EXACT_MATCH | SearchPattern.R_CASE_SENSITIVE); //$NON-NLS-1$ - - // Get the search scope - IJavaSearchScope scope = SearchEngine.createJavaSearchScope(new IJavaElement[] { javaProject }); + protected IJavaElement searchForClassMethod(IJavaProject javaProject, + String className, String methodName) { + // Get the search pattern + SearchPattern pattern = SearchPattern + .createPattern( + className + "." + methodName, IJavaSearchConstants.METHOD, IJavaSearchConstants.DECLARATIONS, SearchPattern.R_EXACT_MATCH | SearchPattern.R_CASE_SENSITIVE); //$NON-NLS-1$ - final List<SearchMatch> matches = new ArrayList<SearchMatch>(); - // Get the search requestor - SearchRequestor requestor = new SearchRequestor() { - public void acceptSearchMatch(SearchMatch match) throws CoreException { + // 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() { + 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 - } - for (Iterator i = matches.iterator(); i != null && i.hasNext();) { - return (IJavaElement)((SearchMatch)i.next()).getElement(); - } - return null; - } finally { - // + // Search + SearchEngine searchEngine = new SearchEngine(); + try { + searchEngine.search(pattern, new SearchParticipant[] { SearchEngine + .getDefaultSearchParticipant() }, scope, requestor, null); + } catch (CoreException ex) { + // ignore } + for (Iterator i = matches.iterator(); i != null && i.hasNext();) { + return (IJavaElement) ((SearchMatch) i.next()).getElement(); + } + return null; } protected IJavaElement searchForClassMethod(String className, String methodName) { IFile documentFile = getFile(); - + IJavaElement result = null; try { IProject project = null; if (documentFile == null) { @@ -189,18 +191,14 @@ project = documentFile.getProject(); } - if(project == null || !project.isOpen()) - return null; - if(!project.hasNature(JavaCore.NATURE_ID)) - return null; - IJavaProject javaProject = JavaCore.create(project); - return searchForClassMethod(javaProject, className, methodName); - + if(project != null && project.isOpen() && project.hasNature(JavaCore.NATURE_ID)) { + IJavaProject javaProject = JavaCore.create(project); + result = searchForClassMethod(javaProject, className, methodName); + } } catch (CoreException x) { ExtensionsPlugin.getPluginLog().logError("Error while looking for method " + methodName + " of class " + className, x); //$NON-NLS-1$ //$NON-NLS-2$ - return null; } - + return result; } protected String getAttributeValue(Node node, String attrName) {