This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Fix: redundant modifySourceFolderOutput classpath configurer method was

removing "optional" attribute from source folder paths.
  • Loading branch information...
rgladwell committed Sep 2, 2012
1 parent 13b5ff8 commit 2b490f900153cd34fff1cec47fe5aeffabe44d87
@@ -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) {
@@ -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);
@@ -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) {

0 comments on commit 2b490f9

Please sign in to comment.