Author: xcoulon Date: 2011-06-17 07:54:22 -0400 (Fri, 17 Jun 2011) New Revision: 32157 Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/configuration/ProjectNatureUtils.java trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/metamodel/Applications.java trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/cnf/UriMappingsContentProvider.java trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/metamodel/MediaTypeCapabilitiesTestCase.java Log: Fixing issues Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/configuration/ProjectNatureUtils.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/configuration/ProjectNatureUtils.java 2011-06-17 00:32:15 UTC (rev 32156) +++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/configuration/ProjectNatureUtils.java 2011-06-17 11:54:22 UTC (rev 32157) @@ -30,8 +30,9 @@ * Hidden constructor of the utility class. */ private ProjectNatureUtils() { - + } + /** * Check if a nature identified by its ID is installed on a given project. * @@ -56,10 +57,15 @@ /** * Adds the nature identified by its ID to the given project. * - * @param project the project - * @param natureId the nature id - * @return true if the nature was actually added to the project, false if it was already installed - * @throws CoreException in case of underlying exception (the nature may not be installed) + * @param project + * the project + * @param natureId + * the nature id + * @return true if the nature was actually added to the project, false if it + * was already installed + * @throws CoreException + * in case of underlying exception (the nature may not be + * installed) */ public static boolean installProjectNature(final IProject project, final String natureId) throws CoreException { if (isProjectNatureInstalled(project, natureId)) { @@ -95,7 +101,7 @@ // remove builder from project String[] newNatureIds = new String[natures.length - 1]; System.arraycopy(natures, 0, newNatureIds, 0, i); - System.arraycopy(natures, i + 1, newNatureIds, 0, natures.length - i - 1); + System.arraycopy(natures, i + 1, newNatureIds, i, natures.length - i - 1); desc.setNatureIds(newNatureIds); project.setDescription(desc, null); return true; Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/metamodel/Applications.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/metamodel/Applications.java 2011-06-17 00:32:15 UTC (rev 32156) +++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/metamodel/Applications.java 2011-06-17 11:54:22 UTC (rev 32157) @@ -40,12 +40,15 @@ */ @Override public List<Application> addFrom(IJavaElement scope, IProgressMonitor progressMonitor) throws CoreException { + List<Application> addedApps = new ArrayList<Application>(); IType applicationType = JdtUtils.resolveType(javax.ws.rs.core.Application.class.getName(), metamodel.getJavaProject(), progressMonitor); + if (applicationType == null) { + return addedApps; + } ITypeHierarchy applicationTypeHierarchy = JdtUtils .resolveTypeHierarchy(applicationType, false, progressMonitor); IType[] subtypes = applicationTypeHierarchy.getAllSubtypes(applicationType); - List<Application> addedApps = new ArrayList<Application>(); if (subtypes.length > 1) { List<String> s = new ArrayList<String>(); for (IType t : subtypes) { Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/cnf/UriMappingsContentProvider.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/cnf/UriMappingsContentProvider.java 2011-06-17 00:32:15 UTC (rev 32156) +++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/cnf/UriMappingsContentProvider.java 2011-06-17 11:54:22 UTC (rev 32157) @@ -61,9 +61,11 @@ if (job.belongsTo(ResourcesPlugin.FAMILY_AUTO_BUILD) || job.belongsTo(ResourcesPlugin.FAMILY_AUTO_REFRESH) || job.belongsTo(ResourcesPlugin.FAMILY_MANUAL_BUILD) - || job.belongsTo(ResourcesPlugin.FAMILY_MANUAL_REFRESH)) { + || job.belongsTo(ResourcesPlugin.FAMILY_MANUAL_REFRESH) + && job.getState() == Job.RUNNING) { // joining running job - Logger.debug("Joining Running job: " + job.getName()); + Logger.debug("Joining Running job: " + job.getName() + "(blocking=" + + job.isBlocking() + "/state=" + job.getState() + ")"); job.join(); Logger.debug("Job finished: " + job.getName()); } Modified: trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/metamodel/MediaTypeCapabilitiesTestCase.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/metamodel/MediaTypeCapabilitiesTestCase.java 2011-06-17 00:32:15 UTC (rev 32156) +++ trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/metamodel/MediaTypeCapabilitiesTestCase.java 2011-06-17 11:54:22 UTC (rev 32157) @@ -3,8 +3,10 @@ import static org.junit.Assert.fail; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; +@Ignore public class MediaTypeCapabilitiesTestCase { @Before