Author: rob.stryker(a)jboss.com Date: 2008-06-18 18:21:12 -0400 (Wed, 18 Jun 2008) New Revision: 8836 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/plugin.xml trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/jee/AbstractClasspathContainer.java trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/jee/AbstractClasspathContainerInitializer.java trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/jee/J2EE13ClasspathContainerInitializer.java trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/jee/J2EE14ClasspathContainerInitializer.java trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/jee/J2EE50ClasspathContainerInitializer.java Log: JBIDE-2368 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/plugin.xml =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/plugin.xml 2008-06-18 19:30:00 UTC (rev 8835) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/plugin.xml 2008-06-18 22:21:12 UTC (rev 8836) @@ -69,21 +69,31 @@ <!-- J2EE Libraries --> <extension point="org.eclipse.jdt.core.classpathContainerInitializer"> - <classpathContainerInitializer - class="org.jboss.ide.eclipse.as.classpath.core.jee.J2EE13ClasspathContainerInitializer" - id="org.jboss.ide.eclipse.as.classpath.core.j2ee-1.3"> - </classpathContainerInitializer> - <classpathContainerInitializer - class="org.jboss.ide.eclipse.as.classpath.core.jee.J2EE14ClasspathContainerInitializer" - id="org.jboss.ide.eclipse.as.classpath.core.j2ee-1.4"> - </classpathContainerInitializer> - <classpathContainerInitializer - class="org.jboss.ide.eclipse.as.classpath.core.jee.J2EE50ClasspathContainerInitializer" - id="org.jboss.ide.eclipse.as.classpath.core.javaee-5.0"> - </classpathContainerInitializer> + <classpathContainerInitializer + class="org.jboss.ide.eclipse.as.classpath.core.jee.J2EE13ClasspathContainerInitializer" + id="org.jboss.ide.eclipse.as.classpath.core.j2ee-1.3"> + </classpathContainerInitializer> + <classpathContainerInitializer + class="org.jboss.ide.eclipse.as.classpath.core.jee.J2EE14ClasspathContainerInitializer" + id="org.jboss.ide.eclipse.as.classpath.core.j2ee-1.4"> + </classpathContainerInitializer> + <classpathContainerInitializer + class="org.jboss.ide.eclipse.as.classpath.core.jee.J2EE50ClasspathContainerInitializer" + id="org.jboss.ide.eclipse.as.classpath.core.javaee-5.0"> + </classpathContainerInitializer> + + <!-- Legacy ID's --> + <classpathContainerInitializer + class="org.jboss.ide.eclipse.as.classpath.core.jee.J2EE13ClasspathContainerInitializer" + id="org.jboss.ide.eclipse.jdt.core.classpath.j2ee-1.3"> + </classpathContainerInitializer> + <classpathContainerInitializer + class="org.jboss.ide.eclipse.as.classpath.core.jee.J2EE14ClasspathContainerInitializer" + id="org.jboss.ide.eclipse.jdt.core.classpath.j2ee-1.4"> + </classpathContainerInitializer> </extension> + <!-- - Cannot be enabled before resource change listening is implemented.(max) <extension point="org.eclipse.jdt.core.classpathContainerInitializer"> Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/jee/AbstractClasspathContainer.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/jee/AbstractClasspathContainer.java 2008-06-18 19:30:00 UTC (rev 8835) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/jee/AbstractClasspathContainer.java 2008-06-18 22:21:12 UTC (rev 8836) @@ -27,7 +27,6 @@ import java.net.URL; import java.util.ArrayList; -import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IStatus; @@ -91,7 +90,7 @@ } protected IClasspathEntry[] computeEntries() { - ArrayList entries = new ArrayList(); + ArrayList<IClasspathEntry> entries = new ArrayList<IClasspathEntry>(); String baseDir = getBaseDir(); if (baseDir == null) @@ -124,28 +123,24 @@ = decorations.getDecorations( getDecorationManagerKey(getPath().toString()), entryPath.toString() ); - IClasspathAttribute[] attrs = {}; - if( dec != null ) - { - sourceAttachementPath = dec.getSourceAttachmentPath(); - sourceAttachementRootPath = dec.getSourceAttachmentRootPath(); - attrs = dec.getExtraAttributes(); - } else if (jarSrcFile.exists()) { - sourceAttachementPath = new Path(jarSrcFile.toString()); - sourceAttachementRootPath = new Path("/");//$NON-NLS-1$ + IClasspathAttribute[] attrs = {}; + if( dec != null ) { + sourceAttachementPath = dec.getSourceAttachmentPath(); + sourceAttachementRootPath = dec.getSourceAttachmentRootPath(); + attrs = dec.getExtraAttributes(); + } else if (jarSrcFile.exists()) { + sourceAttachementPath = new Path(jarSrcFile.toString()); + sourceAttachementRootPath = new Path("/");//$NON-NLS-1$ + } + + IAccessRule[] access = {}; + IClasspathEntry entry = JavaCore.newLibraryEntry( entryPath, sourceAttachementPath, + sourceAttachementRootPath, access, attrs, false ); + entries.add(entry); } - - IAccessRule[] access = {}; - IClasspathEntry entry = JavaCore.newLibraryEntry( entryPath, sourceAttachementPath, sourceAttachementRootPath, access, attrs, - false ); - // IClasspathEntry entry = JavaCore.newLibraryEntry(entryPath, - // sourceAttachementPath, sourceAttachementRootPath, true); - entries.add(entry); - } } - return (IClasspathEntry[]) entries.toArray(new IClasspathEntry[entries - .size()]); + return entries.toArray(new IClasspathEntry[entries.size()]); } protected String getLibFolder() { @@ -169,8 +164,7 @@ return container; } - static ClasspathDecorationsManager getDecorationsManager() - { + static ClasspathDecorationsManager getDecorationsManager() { return decorations; } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/jee/AbstractClasspathContainerInitializer.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/jee/AbstractClasspathContainerInitializer.java 2008-06-18 19:30:00 UTC (rev 8835) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/jee/AbstractClasspathContainerInitializer.java 2008-06-18 22:21:12 UTC (rev 8836) @@ -57,13 +57,10 @@ throws CoreException { int size = containerPath.segmentCount(); if (size > 0) { - if (containerPath.segment(0).equals(this.getClasspathContainerID())) { - AbstractClasspathContainer container = this - .createClasspathContainer(containerPath); - JavaCore.setClasspathContainer(containerPath, - new IJavaProject[] { project }, - new IClasspathContainer[] { container }, null); - } + AbstractClasspathContainer container = createClasspathContainer(containerPath); + JavaCore.setClasspathContainer(containerPath, + new IJavaProject[] { project }, + new IClasspathContainer[] { container }, null); } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/jee/J2EE13ClasspathContainerInitializer.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/jee/J2EE13ClasspathContainerInitializer.java 2008-06-18 19:30:00 UTC (rev 8835) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/jee/J2EE13ClasspathContainerInitializer.java 2008-06-18 22:21:12 UTC (rev 8836) @@ -48,7 +48,7 @@ public final static String SUFFIX = "j2ee-1.3";//$NON-NLS-1$ public final static String CLASSPATH_CONTAINER = CLASSPATH_CONTAINER_PREFIX + "." + J2EE13ClasspathContainer.SUFFIX;//$NON-NLS-1$ - public final static String DESCRIPTION = "J2EE 1.3 Libraries (JBoss-IDE)"; + public final static String DESCRIPTION = "J2EE 1.3 Libraries (JBoss Tools)"; public J2EE13ClasspathContainer(IPath path) { super(path, DESCRIPTION, SUFFIX); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/jee/J2EE14ClasspathContainerInitializer.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/jee/J2EE14ClasspathContainerInitializer.java 2008-06-18 19:30:00 UTC (rev 8835) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/jee/J2EE14ClasspathContainerInitializer.java 2008-06-18 22:21:12 UTC (rev 8836) @@ -27,7 +27,7 @@ public final static String SUFFIX = "j2ee-1.4";//$NON-NLS-1$ public final static String CLASSPATH_CONTAINER = CLASSPATH_CONTAINER_PREFIX + "." + J2EE14ClasspathContainer.SUFFIX;//$NON-NLS-1$ - public final static String DESCRIPTION = "J2EE 1.4 Libraries (JBoss-IDE)"; + public final static String DESCRIPTION = "J2EE 1.4 Libraries (JBoss Tools)"; public J2EE14ClasspathContainer(IPath path) { super(path, DESCRIPTION, SUFFIX); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/jee/J2EE50ClasspathContainerInitializer.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/jee/J2EE50ClasspathContainerInitializer.java 2008-06-18 19:30:00 UTC (rev 8835) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/jee/J2EE50ClasspathContainerInitializer.java 2008-06-18 22:21:12 UTC (rev 8836) @@ -48,7 +48,7 @@ public final static String SUFFIX = "javaee-5.0";//$NON-NLS-1$ public final static String CLASSPATH_CONTAINER = CLASSPATH_CONTAINER_PREFIX + "." + J2EE50ClasspathContainer.SUFFIX;//$NON-NLS-1$ - public final static String DESCRIPTION = "J2EE 5.0 Libraries (JBoss-IDE)"; + public final static String DESCRIPTION = "J2EE 5.0 Libraries (JBoss Tools)"; public J2EE50ClasspathContainer(IPath path) { super(path, DESCRIPTION, SUFFIX);