Fix: redundant modifySourceFolderOutput classpath configurer method was

removing "optional" attribute from source folder paths.
rgladwell · Sep 2, 2012 · 2b490f900153cd34fff1cec47fe5aeffabe44d87 · 2b490f9
1 parent 13b5ff8
commit 2b490f900153cd34fff1cec47fe5aeffabe44d87
diff --git a/...ndroid/src/main/java/me/gladwell/eclipse/m2e/android/AndroidMavenProjectConfigurator.java b/...ndroid/src/main/java/me/gladwell/eclipse/m2e/android/AndroidMavenProjectConfigurator.java
@@ -99,7 +99,6 @@ public void configureRawClasspath(ProjectConfigurationRequest request, IClasspat
 		final IJavaProject javaProject = JavaCore.create(request.getProject());
 		try {
 			classpathConfigurer.addGenFolder(javaProject, project, classpath);
-			classpathConfigurer.modifySourceFolderOutput(javaProject, project, classpath);
 			classpathConfigurer.removeJreClasspathContainer(classpath);
 			classpathConfigurer.markMavenContainerExported(classpath);
 		} catch (Exception e) {

diff --git a/...c/main/java/me/gladwell/eclipse/m2e/android/configuration/AndroidClasspathConfigurer.java b/...c/main/java/me/gladwell/eclipse/m2e/android/configuration/AndroidClasspathConfigurer.java
@@ -17,7 +17,6 @@
 
 	public void addGenFolder(IJavaProject javaProject, AndroidProject project, IClasspathDescriptor classpath);
 	public void removeNonRuntimeDependencies(AndroidProject project, IClasspathDescriptor classpath);
-	public void modifySourceFolderOutput(IJavaProject javaProject, AndroidProject project, IClasspathDescriptor classpath);
 	public void markMavenContainerExported(IClasspathDescriptor classpath);
 	public void removeJreClasspathContainer(IClasspathDescriptor classpath);
 

diff --git a/...n/java/me/gladwell/eclipse/m2e/android/configuration/MavenAndroidClasspathConfigurer.java b/...n/java/me/gladwell/eclipse/m2e/android/configuration/MavenAndroidClasspathConfigurer.java
@@ -55,16 +55,6 @@ public void removeJreClasspathContainer(IClasspathDescriptor classpath) {
 		}
 	}
 
-	public void modifySourceFolderOutput(IJavaProject javaProject, AndroidProject project, IClasspathDescriptor classpath) {
-		for(IClasspathEntry entry : classpath.getEntries()) {
-			if(entry.getOutputLocation() != null && entry.getEntryKind() == IClasspathEntry.CPE_SOURCE
-					&& !entry.getOutputLocation().equals(javaProject.getPath().append(ANDROID_CLASSES_FOLDER))) {
-				classpath.removeEntry(entry.getPath());
-				classpath.addSourceEntry(entry.getPath(), javaProject.getPath().append(ANDROID_CLASSES_FOLDER), false);
-			}
-		}
-	}
-
 	public void markMavenContainerExported(IClasspathDescriptor classpath) {
 		for(IClasspathEntry entry : classpath.getEntries()) {
 			if(entry.getEntryKind() == IClasspathEntry.CPE_CONTAINER) {