Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvladt2011-04-06 16:54:23 -0400
committervladt2011-04-06 16:54:23 -0400
commit0d2fb47b89cdd49d6be6e11fa56f437347a91785 (patch)
treeee6c16d584b7d0df6427d3b57ac5d06a45adf420
parentdf104a070a510bd2a116848c17e7a54779a9ba12 (diff)
downloadm2e-core-0d2fb47b89cdd49d6be6e11fa56f437347a91785.tar.gz
m2e-core-0d2fb47b89cdd49d6be6e11fa56f437347a91785.tar.xz
m2e-core-0d2fb47b89cdd49d6be6e11fa56f437347a91785.zip
339902: Removed the changes that added dependencies on internal eclipse classes
-rw-r--r--org.eclipse.m2e.core/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/ProjectConfigurationManager.java27
2 files changed, 2 insertions, 27 deletions
diff --git a/org.eclipse.m2e.core/META-INF/MANIFEST.MF b/org.eclipse.m2e.core/META-INF/MANIFEST.MF
index 21f9c3f4..6fe64fa3 100644
--- a/org.eclipse.m2e.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.core/META-INF/MANIFEST.MF
@@ -11,9 +11,7 @@ Require-Bundle:
org.eclipse.core.resources,
org.eclipse.core.variables,
org.eclipse.core.expressions,
- org.eclipse.core.externaltools,
org.eclipse.core.filesystem,
- org.eclipse.debug.core,
org.eclipse.search,
org.eclipse.m2e.maven.runtime;bundle-version="[0.13.0,0.14.0)",
org.eclipse.m2e.archetype.common;bundle-version="[0.13.0,0.14.0)",
diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/ProjectConfigurationManager.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/ProjectConfigurationManager.java
index 40c9ce11..06bf1566 100644
--- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/ProjectConfigurationManager.java
+++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/ProjectConfigurationManager.java
@@ -27,9 +27,6 @@ import org.osgi.framework.Version;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.eclipse.core.externaltools.internal.IExternalToolConstants;
-import org.eclipse.core.externaltools.internal.model.BuilderCoreUtils;
-import org.eclipse.core.externaltools.internal.model.ExternalToolBuilder;
import org.eclipse.core.resources.ICommand;
import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IFile;
@@ -53,7 +50,6 @@ import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.SubMonitor;
import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.osgi.util.NLS;
import org.codehaus.plexus.util.StringUtils;
@@ -438,27 +434,8 @@ public class ProjectConfigurationManager implements IProjectConfigurationManager
return true;
}
- @SuppressWarnings("restriction")
- private boolean isMavenBuilderCommand(IProject project, ICommand command) throws CoreException {
- if(IMavenConstants.BUILDER_ID.equals(command.getBuilderName())) {
- return true;
- }
-
- // When a builder is disabled using the eclipse UI,
- // the builder command is converted to a build command
- // that uses ExternalToolBuilder to launch the original builder.
- if(ExternalToolBuilder.ID.equals(command.getBuilderName())) {
- String[] version = new String[] {""}; //$NON-NLS-1$
- ILaunchConfiguration launchConfig = BuilderCoreUtils.configFromBuildCommandArgs(project, command.getArguments(),
- version);
- if(launchConfig == null) {
- return false;
- }
- String builderName = launchConfig
- .getAttribute(IExternalToolConstants.ATTR_DISABLED_BUILDER, (String) null /*default value*/);
- return IMavenConstants.BUILDER_ID.equals(builderName);
- }
- return false;
+ private boolean isMavenBuilderCommand(IProject project, ICommand command) {
+ return IMavenConstants.BUILDER_ID.equals(command.getBuilderName());
}
// project creation

Back to the top