summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Dail2012-06-28 17:28:17 (EDT)
committer Curtis Windatt2012-06-28 17:28:17 (EDT)
commitb99906645b684060122828ac25a7c65bba6e30dc (patch)
tree0dc8c8e1bec488332e5f4a4eb2e9f92656018f1d
parent900497555e347b2da8b2fa04cdea228518bd830f (diff)
downloadeclipse.pde.ui-b99906645b684060122828ac25a7c65bba6e30dc.zip
eclipse.pde.ui-b99906645b684060122828ac25a7c65bba6e30dc.tar.gz
eclipse.pde.ui-b99906645b684060122828ac25a7c65bba6e30dc.tar.bz2
Bug 327371 - Plugin launch configuration does not include Bundle-Classpath jar filesv20120628-212817I20120703-0800
-rw-r--r--ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/ClasspathHelper.java10
1 files changed, 4 insertions, 6 deletions
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/ClasspathHelper.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/ClasspathHelper.java
index 70a85f8..457793b 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/ClasspathHelper.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/ClasspathHelper.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2011 IBM Corporation and others.
+ * Copyright (c) 2003, 2012 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -165,7 +165,7 @@ public class ClasspathHelper {
}
// creates a map whose key is a Path to the source directory/jar and the value is a Path output directory or jar.
- private static Map getClasspathMap(IProject project, boolean checkExcluded, boolean onlyJarsIfLinked, boolean absolutePaths) throws JavaModelException {
+ private static Map getClasspathMap(IProject project, boolean checkExcluded, boolean absolutePaths) throws JavaModelException {
List excluded = getFoldersToExclude(project, checkExcluded);
IJavaProject jProject = JavaCore.create(project);
HashMap map = new HashMap();
@@ -190,8 +190,6 @@ public class ClasspathHelper {
// make the path either relative or absolute
if (file != null) {
boolean isLinked = file.isLinked(IResource.CHECK_ANCESTORS);
- if (entries[i].getEntryKind() != IClasspathEntry.CPE_SOURCE && !isLinked && onlyJarsIfLinked)
- continue;
output = (isLinked || absolutePaths) ? file.getLocation().makeAbsolute() : output.makeRelative();
} else
continue;
@@ -270,7 +268,7 @@ public class ClasspathHelper {
IPluginLibrary[] libraries = base.getLibraries();
try {
if (project.hasNature(JavaCore.NATURE_ID)) {
- Map classpathMap = getClasspathMap(project, checkExcluded, !base.getId().equals(PDECore.getDefault().getModelManager().getSystemBundleId()), false);
+ Map classpathMap = getClasspathMap(project, checkExcluded, false);
IFile file = PDEProject.getBuildProperties(project);
IPath filePath = file.getLocation();
boolean searchBuild = filePath != null && filePath.toFile().exists();
@@ -340,7 +338,7 @@ public class ClasspathHelper {
if (frags[i].getUnderlyingResource() != null) {
try {
IProject project = frags[i].getUnderlyingResource().getProject();
- Map classpathMap = getClasspathMap(project, checkExcluded, false, true);
+ Map classpathMap = getClasspathMap(project, checkExcluded, true);
IFile file = PDEProject.getBuildProperties(project);
IBuild build = null;
if (file.exists()) {