Author: dgolovin Date: 2011-09-08 15:16:03 -0400 (Thu, 08 Sep 2011) New Revision: 34590 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreBuilder.java trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/AbstractHyperlink.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamResourceVisitor.java Log: Code cleanup XMode.getWorkspace() replaced with original ResourcesPlugin.getWorkspace() Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreBuilder.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreBuilder.java 2011-09-08 18:42:12 UTC (rev 34589) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreBuilder.java 2011-09-08 19:16:03 UTC (rev 34590) @@ -402,7 +402,7 @@ IClasspathEntry[] es = javaProject.getResolvedClasspath(true); for (int i = 0; i < es.length; i++) { if(es[i].getEntryKind() == IClasspathEntry.CPE_SOURCE) { - IResource findMember = ModelPlugin.getWorkspace().getRoot().findMember(es[i].getPath()); + IResource findMember = ResourcesPlugin.getWorkspace().getRoot().findMember(es[i].getPath()); if(findMember != null && findMember.exists()) { ps.add(findMember.getFullPath()); } Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/AbstractHyperlink.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/AbstractHyperlink.java 2011-09-08 18:42:12 UTC (rev 34589) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/AbstractHyperlink.java 2011-09-08 19:16:03 UTC (rev 34590) @@ -115,7 +115,7 @@ return null; wsRelativePath = wsRelativePath.substring(0, i); IPath path = new Path(wsRelativePath); - IResource r = ModelPlugin.getWorkspace().getRoot().findMember( + IResource r = ResourcesPlugin.getWorkspace().getRoot().findMember( path); if (r != null && r.exists()) { XModelObject o = EclipseResourceUtil @@ -145,7 +145,7 @@ } if (wsRelativePath.startsWith("/")) { //$NON-NLS-1$ IPath path = new Path(wsRelativePath); - IResource r = ModelPlugin.getWorkspace().getRoot().findMember( + IResource r = ResourcesPlugin.getWorkspace().getRoot().findMember( path); if (r != null && r.exists() && r instanceof IFile) return (IFile) r; 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 2011-09-08 18:42:12 UTC (rev 34589) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamResourceVisitor.java 2011-09-08 19:16:03 UTC (rev 34590) @@ -20,6 +20,7 @@ import org.eclipse.core.resources.IResourceDelta; import org.eclipse.core.resources.IResourceDeltaVisitor; import org.eclipse.core.resources.IResourceVisitor; +import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.jdt.core.IClasspathEntry; @@ -119,7 +120,7 @@ IClasspathEntry[] es = javaProject.getResolvedClasspath(true); for (int i = 0; i < es.length; i++) { if(es[i].getEntryKind() == IClasspathEntry.CPE_SOURCE) { - IResource findMember = ModelPlugin.getWorkspace().getRoot().findMember(es[i].getPath()); + IResource findMember = ResourcesPlugin.getWorkspace().getRoot().findMember(es[i].getPath()); if(findMember != null && findMember.exists()) { ps.add(findMember.getFullPath()); } @@ -129,8 +130,8 @@ } } } - srcs = ps.toArray(new IPath[0]); - outs = os.toArray(new IPath[0]); + srcs = ps.toArray(new IPath[ps.size()]); + outs = os.toArray(new IPath[os.size()]); } catch(CoreException ce) { ModelPlugin.getPluginLog().logError("Error while locating java source roots for " + project, ce); }