Author: scabanovich Date: 2007-12-13 08:56:42 -0500 (Thu, 13 Dec 2007) New Revision: 5281 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/bundle/BundleMap.java Log: JBIDE-1289 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/bundle/BundleMap.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/bundle/BundleMap.java 2007-12-13 13:13:28 UTC (rev 5280) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/bundle/BundleMap.java 2007-12-13 13:56:42 UTC (rev 5281) @@ -14,7 +14,6 @@ import java.io.IOException; import java.net.URL; import java.net.URLClassLoader; -import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; import java.util.List; @@ -78,10 +77,10 @@ if (!hasJsfProjectNatureType() || !(editor.getEditorInput() instanceof IFileEditorInput)) return; IProject project = ((IFileEditorInput)editor.getEditorInput()).getFile().getProject(); XModel model = EclipseResourceUtil.getModelNature(project).getModel(); - List l = WebPromptingProvider.getInstance().getList(model, WebPromptingProvider.JSF_REGISTERED_BUNDLES, null, null); + List<Object> l = WebPromptingProvider.getInstance().getList(model, WebPromptingProvider.JSF_REGISTERED_BUNDLES, null, null); if(l == null || l.size() < 2 || !(l.get(1) instanceof Map)) return; - Map map = (Map)l.get(1); - Iterator it = map.keySet().iterator(); + Map<?,?> map = (Map<?,?>)l.get(1); + Iterator<?> it = map.keySet().iterator(); while(it.hasNext()) { String uri = it.next().toString(); String prefix = map.get(uri).toString(); @@ -220,24 +219,7 @@ } private static String[] getJavaProjectSrcLocations(IProject project) { - String[] EMPTY = new String[0]; - if(project == null || !project.isOpen()) return EMPTY; - try { - if(!project.hasNature(JavaCore.NATURE_ID)) return EMPTY; - IJavaProject javaProject = JavaCore.create(project); - IClasspathEntry[] es = javaProject.getRawClasspath(); - ArrayList<String> l = new ArrayList<String>(); - for (int i = 0; i < es.length; i++) { - if(es[i].getEntryKind() != IClasspathEntry.CPE_SOURCE) continue; - l.add(project.findMember(es[i].getPath().removeFirstSegments(1)).getLocation().toString()); - try { - l.add(project.findMember(es[i].getOutputLocation().removeFirstSegments(1)).getLocation().toString()); - } catch (Exception e) { } - } - return (String[])l.toArray(new String[0]); - } catch (Exception e) { - return EMPTY; - } + return EclipseResourceUtil.getJavaProjectSrcLocations(project); } private void removeBundle(int hashCode, boolean refresh) {