Author: rob.stryker(a)jboss.com Date: 2011-06-24 00:35:20 -0400 (Fri, 24 Jun 2011) New Revision: 32342 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ProjectRuntimeClasspathProvider.java trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/WebtoolsProjectJBossClasspathContainerInitializer.java Log: JBIDE-9228 - deprecated some classes, added protections, switched constants Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ProjectRuntimeClasspathProvider.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ProjectRuntimeClasspathProvider.java 2011-06-24 04:10:26 UTC (rev 32341) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ProjectRuntimeClasspathProvider.java 2011-06-24 04:35:20 UTC (rev 32342) @@ -34,7 +34,6 @@ import org.eclipse.wst.common.project.facet.core.runtime.IRuntimeComponent; import org.eclipse.wst.server.core.IRuntime; import org.eclipse.wst.server.core.ServerCore; -import org.jboss.ide.eclipse.as.classpath.core.ClasspathConstants; import org.jboss.ide.eclipse.as.classpath.core.ClasspathCorePlugin; import org.jboss.ide.eclipse.as.classpath.core.Messages; import org.jboss.ide.eclipse.as.classpath.core.runtime.WebtoolsProjectJBossClasspathContainerInitializer.WebtoolsProjectJBossClasspathContainer; @@ -82,19 +81,18 @@ // Bad name, I know, but checks if this is // an ear, war, ejb, or other top level facet protected boolean isPrimaryFacet(IProjectFacet facet) { - - return facet.equals(WebtoolsProjectJBossClasspathContainerInitializer.WEB_FACET) - || facet.equals(WebtoolsProjectJBossClasspathContainerInitializer.EJB_FACET) - || facet.equals(WebtoolsProjectJBossClasspathContainerInitializer.EAR_FACET) - || facet.equals(WebtoolsProjectJBossClasspathContainerInitializer.CONNECTOR_FACET) - || facet.equals(WebtoolsProjectJBossClasspathContainerInitializer.APP_CLIENT_FACET); + return facet.getId().equals(WebtoolsProjectJBossClasspathContainerInitializer.FACET_WEB) + || facet.getId().equals(WebtoolsProjectJBossClasspathContainerInitializer.FACET_EJB) + || facet.getId().equals(WebtoolsProjectJBossClasspathContainerInitializer.FACET_EAR) + || facet.getId().equals(WebtoolsProjectJBossClasspathContainerInitializer.FACET_CONNECTOR) + || facet.getId().equals(WebtoolsProjectJBossClasspathContainerInitializer.FACET_APP_CLIENT); } // Also a bad name, but facets the server automatically knows // how to provide classpath entries for protected boolean isSecondaryFacet(IProjectFacet facet) { - return facet.equals(WebtoolsProjectJBossClasspathContainerInitializer.JSF_FACET) - || facet.equals(WebtoolsProjectJBossClasspathContainerInitializer.JPA_FACET); + return facet.getId().equals(WebtoolsProjectJBossClasspathContainerInitializer.FACET_JSF) + || facet.getId().equals(WebtoolsProjectJBossClasspathContainerInitializer.FACET_JPA); } public static final class Factory implements IAdapterFactory { Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/WebtoolsProjectJBossClasspathContainerInitializer.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/WebtoolsProjectJBossClasspathContainerInitializer.java 2011-06-24 04:10:26 UTC (rev 32341) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/WebtoolsProjectJBossClasspathContainerInitializer.java 2011-06-24 04:35:20 UTC (rev 32342) @@ -48,18 +48,21 @@ */ public class WebtoolsProjectJBossClasspathContainerInitializer extends ClasspathContainerInitializer implements ClasspathConstants { + public static IProjectFacet getSafeFacet(String id) { + return ProjectFacetsManager.isProjectFacetDefined(id) ? ProjectFacetsManager.getProjectFacet(id) : null; + } - public static final IProjectFacet WEB_FACET = ProjectFacetsManager.getProjectFacet(FACET_WEB); - public static final IProjectFacet EJB_FACET = ProjectFacetsManager.getProjectFacet(FACET_EJB); - public static final IProjectFacet EAR_FACET = ProjectFacetsManager.getProjectFacet(FACET_EAR); - public static final IProjectFacet UTILITY_FACET = ProjectFacetsManager.getProjectFacet(FACET_UTILITY); - public static final IProjectFacet CONNECTOR_FACET = ProjectFacetsManager.getProjectFacet(FACET_CONNECTOR); - public static final IProjectFacet APP_CLIENT_FACET = ProjectFacetsManager.getProjectFacet(FACET_APP_CLIENT); +// @Deprecated public static final IProjectFacet WEB_FACET = getSafeFacet(FACET_WEB); +// @Deprecated public static final IProjectFacet EJB_FACET = getSafeFacet(FACET_EJB); +// @Deprecated public static final IProjectFacet EAR_FACET = getSafeFacet(FACET_EAR); +// @Deprecated public static final IProjectFacet UTILITY_FACET = getSafeFacet(FACET_UTILITY); +// @Deprecated public static final IProjectFacet CONNECTOR_FACET = getSafeFacet(FACET_CONNECTOR); +// @Deprecated public static final IProjectFacet APP_CLIENT_FACET = getSafeFacet(FACET_APP_CLIENT); +// +// @Deprecated public static final IProjectFacet JSF_FACET = getSafeFacet(FACET_JSF); +// @Deprecated public static final IProjectFacet JPA_FACET = getSafeFacet(FACET_JPA); - public static final IProjectFacet JSF_FACET = ProjectFacetsManager.getProjectFacet(FACET_JSF); - public static final IProjectFacet JPA_FACET = ProjectFacetsManager.getProjectFacet(FACET_JPA); - public WebtoolsProjectJBossClasspathContainerInitializer() { // TODO Auto-generated constructor stub } @@ -155,7 +158,7 @@ } protected boolean isEjb30(String facetId, String facetVersion) { - if( facetId.equals(EJB_FACET.getId()) && facetVersion.equals(V3_0)) + if( facetId.equals(FACET_EJB) && facetVersion.equals(V3_0)) return true; return false; } @@ -187,13 +190,13 @@ IPath homePath = new Path(serverHome); IPath configPath = homePath.append(SERVER).append(configName); ArrayList<IClasspathEntry> list = new ArrayList<IClasspathEntry>(); - if (facetId.equals(WEB_FACET.getId())) { + if (facetId.equals(FACET_WEB)) { IPath jsfDir = configPath.append(DEPLOY).append(JBOSS_WEB_DEPLOYER).append(JSF_LIB); list.add(getEntry(configPath.append(LIB).append(JSP_API_JAR))); list.add(getEntry(homePath.append(CLIENT).append(SERVLET_API_JAR))); list.add(getEntry(jsfDir.append(JSF_API_JAR))); list.add(getEntry(jsfDir.append(JSF_IMPL_JAR))); - } else if( facetId.equals(EJB_FACET.getId()) && !isEjb30(facetId, facetVersion)) { + } else if( facetId.equals(FACET_EJB) && !isEjb30(facetId, facetVersion)) { list.add(getEntry(homePath.append(CLIENT).append(JBOSS_J2EE_JAR))); } else if( isEjb30(facetId, facetVersion)) { // path roots @@ -216,9 +219,9 @@ // persistence jar list.add(getEntry(client.append(EJB3_PERSISTENCE_JAR))); - } else if( facetId.equals(EAR_FACET.getId())) { + } else if( facetId.equals(FACET_EAR)) { list.add(getEntry(homePath.append(CLIENT).append(JBOSS_J2EE_JAR))); - } else if( facetId.equals(APP_CLIENT_FACET.getId())) { + } else if( facetId.equals(FACET_APP_CLIENT)) { list.add(getEntry(homePath.append(CLIENT).append(JBOSSALL_CLIENT_JAR))); } return list.toArray(new IClasspathEntry[list.size()]); @@ -228,12 +231,12 @@ IPath homePath = new Path(serverHome); IPath configPath = homePath.append(SERVER).append(configName); ArrayList<IClasspathEntry> list = new ArrayList<IClasspathEntry>(); - if (facetId.equals(WEB_FACET.getId())) { + if (facetId.equals(FACET_WEB)) { IPath jsfDir = configPath.append(DEPLOY).append(JBOSSWEB_TOMCAT55_SAR).append(JSF_LIB); list.add(getEntry(configPath.append(LIB).append(JAVAX_SERVLET_JSP_JAR))); list.add(getEntry(homePath.append(CLIENT).append(JAVAX_SERVLET_JAR))); list.addAll(Arrays.asList(getEntries(jsfDir))); - } else if( facetId.equals(EJB_FACET.getId()) && !isEjb30(facetId, facetVersion)) { + } else if( facetId.equals(FACET_EJB) && !isEjb30(facetId, facetVersion)) { list.add(getEntry(homePath.append(CLIENT).append(JBOSS_J2EE_JAR))); } else if( isEjb30(facetId, facetVersion)) { // path roots @@ -253,9 +256,9 @@ // hibernate list.add(getEntry(homePath.append(CLIENT).append(HIBERNATE_CLIENT_JAR))); - } else if( facetId.equals(EAR_FACET.getId())) { + } else if( facetId.equals(FACET_EAR)) { list.add(getEntry(homePath.append(CLIENT).append(JBOSS_J2EE_JAR))); - } else if( facetId.equals(APP_CLIENT_FACET.getId())) { + } else if( facetId.equals(FACET_APP_CLIENT)) { list.add(JavaRuntime.newArchiveRuntimeClasspathEntry(homePath.append(CLIENT).append(JBOSSALL_CLIENT_JAR)).getClasspathEntry()); } return list.toArray(new IClasspathEntry[list.size()]); @@ -266,14 +269,14 @@ IPath homePath = new Path(serverHome); IPath configPath = homePath.append(SERVER).append(configName); ArrayList<IClasspathEntry> list = new ArrayList<IClasspathEntry>(); - if (facetId.equals(WEB_FACET.getId())) { + if (facetId.equals(FACET_WEB)) { IPath p = configPath.append(DEPLOY).append(JBOSSWEB_TOMCAT_50_SAR); list.add(getEntry(p.append(JSP_API_JAR))); list.add(getEntry(p.append(SERVLET_API_JAR))); - } else if( (facetId.equals(EJB_FACET.getId()) && !isEjb30(facetId, facetVersion)) - || facetId.equals(EAR_FACET.getId()) ) { + } else if( (facetId.equals(FACET_EJB) && !isEjb30(facetId, facetVersion)) + || facetId.equals(FACET_EAR) ) { list.add(getEntry(homePath.append(CLIENT).append(JBOSS_J2EE_JAR))); - } else if( facetId.equals(APP_CLIENT_FACET.getId())) { + } else if( facetId.equals(FACET_APP_CLIENT)) { list.add(getEntry(homePath.append(CLIENT).append(JBOSSALL_CLIENT_JAR))); } return list.toArray(new IClasspathEntry[list.size()]);