Skip to content

Commit dde6c0e

Browse files
HannesWellHannesWell
committed
Use IPath type instead of o.e.core.runtime.Path where suitable
1 parent d5616ec commit dde6c0e

File tree

59 files changed

+134
-127
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+134
-127
lines changed

‎apitools/org.eclipse.pde.api.tools.tests/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: %Bundle-Name
44
Bundle-SymbolicName: org.eclipse.pde.api.tools.tests
5-
Bundle-Version: 1.3.100.qualifier
5+
Bundle-Version: 1.3.200.qualifier
66
Bundle-Vendor: %Bundle-Vendor
77
Require-Bundle: org.eclipse.core.runtime,
88
org.junit,

‎apitools/org.eclipse.pde.api.tools.tests/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
are made available under the terms of the Eclipse Distribution License v1.0
66
which accompanies this distribution, and is available at
77
http://www.eclipse.org/org/documents/edl-v10.php
8-
8+
99
Contributors:
1010
Igor Fedorenko - initial implementation
1111
-->
@@ -18,7 +18,7 @@
1818
<relativePath>../../</relativePath>
1919
</parent>
2020
<artifactId>org.eclipse.pde.api.tools.tests</artifactId>
21-
<version>1.3.100-SNAPSHOT</version>
21+
<version>1.3.200-SNAPSHOT</version>
2222
<packaging>eclipse-test-plugin</packaging>
2323
<properties>
2424
<code.ignoredWarnings>-warn:-discouraged</code.ignoredWarnings>

‎apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/builder/tests/ApiTestingEnvironment.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import org.eclipse.core.runtime.CoreException;
3131
import org.eclipse.core.runtime.IPath;
3232
import org.eclipse.core.runtime.NullProgressMonitor;
33-
import org.eclipse.core.runtime.Path;
3433
import org.eclipse.jdt.core.IJavaModelMarker;
3534
import org.eclipse.jdt.core.IJavaProject;
3635
import org.eclipse.jdt.core.JavaCore;
@@ -92,7 +91,7 @@ public IPath addProject(String projectName, String compliance) throws Unsupporte
9291
if (compliance != null) {
9392
setProjectCompliance(javaProject, compliance);
9493
}
95-
return project != null ? project.getFullPath() : Path.EMPTY;
94+
return project != null ? project.getFullPath() : IPath.EMPTY;
9695
}
9796

9897
/**

‎apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/model/tests/TagScannerTests.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424

2525
import org.eclipse.core.runtime.CoreException;
2626
import org.eclipse.core.runtime.IPath;
27-
import org.eclipse.core.runtime.Path;
2827
import org.eclipse.jdt.core.JavaCore;
2928
import org.eclipse.pde.api.tools.internal.ApiDescription;
3029
import org.eclipse.pde.api.tools.internal.CompilationUnit;
@@ -84,7 +83,7 @@ protected IApiTypeContainer newArchiveClassFileContainer(IPath path) {
8483
* @return a new compilation unit
8584
*/
8685
private CompilationUnit getCompilationUnit(String name) {
87-
Path path = (Path) SRC_LOC.append(name);
86+
IPath path = SRC_LOC.append(name);
8887
return new CompilationUnit(path.toOSString(), IApiCoreConstants.UTF_8);
8988
}
9089

@@ -495,7 +494,7 @@ public void testMultiInnerInterfaceDefaultPackage() {
495494

496495
// Bug 402393 - The description returned is for the parent element
497496
// and is expected because the root type has a restricted sub-type
498-
//Bug 539513 - Incorrect warning on nested interface
497+
//Bug 539513 - Incorrect warning on nested interface
499498
// Api description of inner nested interface should contain the relevant restrictions
500499
// only when there is no restriction, then parent's restriction should be used
501500
assertNotNull("the description for TestInterface4$Inner2 should exist", description); //$NON-NLS-1$
@@ -526,7 +525,7 @@ public void testMultiInnerInterfaceAnnotations() {
526525

527526
// Bug 402393 - The description returned is for the parent element
528527
// and is expected because the root type has a restricted sub-type
529-
//Bug 539513 - Incorrect warning on nested interface
528+
//Bug 539513 - Incorrect warning on nested interface
530529
// Api description of inner nested interface should contain the relevant restrictions
531530
// only when there is no restriction, then parent's restriction should be used
532531
assertNotNull("the description for TestInterface5$Inner2 should exist", description); //$NON-NLS-1$

‎apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/wizards/DirectoryBasedApiBaselineWizardPage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ private String getUpdatedLocationForMacOS(String newPath) {
218218
// On Mac OS, if user selects *.app, then location
219219
// should be reset to *.app/Contents/Eclipse if that exists
220220
if (System.getProperty("os.name").startsWith("Mac")) {//$NON-NLS-1$ //$NON-NLS-2$
221-
Path nPath = new Path(newPath);
221+
IPath nPath = new Path(newPath);
222222
if (nPath.lastSegment() == null) {
223223
return newLoc;
224224
}

‎apitools/org.eclipse.pde.api.tools/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.pde.api.tools;singleton:=true
55
Bundle-Version: 1.3.100.qualifier
66
Bundle-Vendor: %providerName
77
Bundle-Localization: plugin
8-
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.25.0,4.0.0)",
8+
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.27.0,4.0.0)",
99
org.eclipse.pde.core;bundle-version="[3.3.102,4.0.0)",
1010
org.eclipse.jdt.core;bundle-version="[3.22.0,4.0.0)",
1111
org.eclipse.jdt.launching;bundle-version="[3.6.100,4.0.0)",

‎apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/ApiAnalysisBuilder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -844,7 +844,7 @@ boolean hasFatalProblems(IProject project) throws CoreException {
844844
if (hasFatalProblem) {
845845
task = () -> {
846846
cleanupMarkers(project);
847-
IApiProblem problem = ApiProblemFactory.newFatalProblem(Path.EMPTY.toString(), new String[] { project.getName() }, IApiProblem.FATAL_JDT_BUILDPATH_PROBLEM);
847+
IApiProblem problem = ApiProblemFactory.newFatalProblem("", new String[] { project.getName() }, IApiProblem.FATAL_JDT_BUILDPATH_PROBLEM); //$NON-NLS-1$
848848
createMarkerForProblem(IApiProblem.CATEGORY_FATAL_PROBLEM, IApiMarkerConstants.FATAL_PROBLEM_MARKER, problem);
849849
};
850850
} else {
@@ -1262,7 +1262,7 @@ IPluginModelBase getCurrentModel() {
12621262
loop: for (int i = 0, max = workspaceModels.length; i < max; i++) {
12631263
desc = workspaceModels[i].getBundleDescription();
12641264
if (desc != null) {
1265-
Path path = new Path(desc.getLocation());
1265+
IPath path = new Path(desc.getLocation());
12661266
if (path.equals(location)) {
12671267
currentModel = workspaceModels[i];
12681268
break loop;

‎apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/BaseApiAnalyzer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ private boolean checkIfNested(IApiComponent component) {
320320
IWorkspace workspace = ResourcesPlugin.getWorkspace();
321321
IWorkspaceRoot root = workspace.getRoot();
322322
IProject[] projects = root.getProjects();
323-
Path componentLocation = new Path(component.getLocation());
323+
IPath componentLocation = new Path(component.getLocation());
324324
for (IProject project : projects) {
325325
IPath projectLocation = project.getLocation();
326326
if (projectLocation != null && projectLocation.isPrefixOf(componentLocation)) {
@@ -1913,7 +1913,7 @@ private IApiProblem createCompatibilityProblem(final IDelta delta, final IApiCom
19131913
* @return a new API component resolution problem or <code>null</code>
19141914
*/
19151915
private void createApiComponentResolutionProblem(final IApiComponent component, final String message) {
1916-
IApiProblem problem = ApiProblemFactory.newApiComponentResolutionProblem(Path.EMPTY.toString(), new String[] {
1916+
IApiProblem problem = ApiProblemFactory.newApiComponentResolutionProblem("", new String[] { //$NON-NLS-1$
19171917
component.getSymbolicName(), message }, new String[] { IApiMarkerConstants.API_MARKER_ATTR_ID }, new Object[] { Integer.valueOf(IApiMarkerConstants.API_COMPONENT_RESOLUTION_MARKER_ID) }, IElementDescriptor.RESOURCE, IApiProblem.API_COMPONENT_RESOLUTION);
19181918
addProblem(problem);
19191919
}

‎apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ApiModelFactory.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -340,8 +340,7 @@ public static IApiBaseline newApiBaselineFromTarget(String name, ITargetDefiniti
340340
/**
341341
* Create predictable location description for a target definition. Form is
342342
* <code>target:/targetSeq/definitionLocation</code>. A location must be
343-
* compatible with
344-
* {@link org.eclipse.core.runtime.Path#fromPortableString(String)}.
343+
* compatible with {@link IPath#fromPortableString(String)}.
345344
*
346345
* @param definition the target platform definition
347346
* @return an encoded location
@@ -364,7 +363,7 @@ private static String generateTargetLocation(ITargetDefinition definition) {
364363
*
365364
* @param definition
366365
* @return a stable identifier, in portable OS format as per
367-
* {@link org.eclipse.core.runtime.Path#fromPortableString(String)}.
366+
* {@link IPath#fromPortableString(String)}.
368367
*/
369368
private static String getDefinitionIdentifier(ITargetDefinition definition) {
370369
ITargetHandle targetHandle = definition.getHandle();

‎build/org.eclipse.pde.build/META-INF/MANIFEST.MF

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: %pluginName
44
Bundle-SymbolicName: org.eclipse.pde.build;singleton:=true
5-
Bundle-Version: 3.12.0.qualifier
5+
Bundle-Version: 3.12.100.qualifier
66
Bundle-ClassPath: pdebuild.jar
77
Bundle-Activator: org.eclipse.pde.internal.build.BuildActivator
88
Bundle-Vendor: %providerName
@@ -18,7 +18,7 @@ Export-Package: org.eclipse.pde.build,
1818
org.eclipse.pde.internal.build.site;x-friends:="org.eclipse.pde.core,org.eclipse.pde.ui",
1919
org.eclipse.pde.internal.build.site.compatibility;x-internal:=true,
2020
org.eclipse.pde.internal.build.tasks;x-internal:=true
21-
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.25.0,4.0.0)",
21+
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.27.0,4.0.0)",
2222
org.eclipse.ant.core;bundle-version="[3.1.100,4.0.0)",
2323
org.eclipse.equinox.p2.jarprocessor;bundle-version="[1.0.1,2.0.0)",
2424
org.eclipse.equinox.p2.publisher;bundle-version="1.1.0",

‎build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/AbstractScriptGenerator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@ protected String findFile(String location, boolean makeRelative) {
477477
BundleHelper.getDefault().getLog().log(e.getStatus());
478478
return null;
479479
}
480-
Path path = new Path(location);
480+
IPath path = new Path(location);
481481
String id = path.segment(0);
482482
BundleDescription[] matches = state.getState().getBundles(id);
483483
if (matches != null && matches.length != 0) {
@@ -536,7 +536,7 @@ protected String findConfigFile(ProductFile productFile, String os) {
536536
return null;
537537
}
538538

539-
private String checkFile(IPath base, Path target, boolean makeRelative) {
539+
private String checkFile(IPath base, IPath target, boolean makeRelative) {
540540
IPath path = base.append(target.removeFirstSegments(1));
541541
String result = path.toOSString();
542542
if (!new File(result).exists())

‎build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/P2ConfigScriptGenerator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ protected void generateGatherBinPartsTarget() {
457457
ArrayList<FileSet> binaryBundles = new ArrayList<>();
458458
script.printTargetDeclaration(TARGET_GATHER_BIN_PARTS, null, null, null, null);
459459
for (BundleDescription plugin : plugins) {
460-
Path pluginLocation = new Path(plugin.getLocation());
460+
IPath pluginLocation = new Path(plugin.getLocation());
461461
if (Utils.isBinary(plugin))
462462
binaryBundles.add(new FileSet(pluginLocation.removeLastSegments(1).toOSString(), null, pluginLocation.lastSegment(), null, null, null, null));
463463
else

‎build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ClasspathComputer3_0.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ private void addPathAndCheck(BundleDescription model, IPath basePath, String lib
396396

397397
String path = null;
398398
String subPath = null;
399-
Path libraryPath = new Path(libraryName);
399+
IPath libraryPath = new Path(libraryName);
400400
if (libraryPath.isAbsolute()) {
401401
path = libraryPath.toOSString();
402402
} else if ("jar".equalsIgnoreCase(basePath.getFileExtension())) { //$NON-NLS-1$
@@ -464,7 +464,7 @@ private void addSelf(BundleDescription model, ModelBuildScriptGenerator.Compiled
464464
//Potential pb: here there maybe a nasty case where the libraries variable may refer to something which is part of the base
465465
//but $xx$ will replace it by the $xx instead of $basexx. The solution is for the user to use the explicitly set the content
466466
// of its build.property file
467-
addPathAndCheck(model, Path.EMPTY, libraryName, modelProperties, classpath);
467+
addPathAndCheck(model, IPath.EMPTY, libraryName, modelProperties, classpath);
468468
}
469469
}
470470
} else {
@@ -474,15 +474,15 @@ private void addSelf(BundleDescription model, ModelBuildScriptGenerator.Compiled
474474
if (element.equals(jar.getName(false)))
475475
break;
476476
addDevEntries(model, location, classpath, Utils.getArrayFromString((String) modelProperties.get(PROPERTY_OUTPUT_PREFIX + element)), modelProperties);
477-
addPathAndCheck(model, Path.EMPTY, element, modelProperties, classpath);
477+
addPathAndCheck(model, IPath.EMPTY, element, modelProperties, classpath);
478478
}
479479
// Then we add all the "pure libraries" (the one that does not contain source)
480480
String[] libraries = getClasspathEntries(model);
481481
for (String libraryName : libraries) {
482482
if (modelProperties.get(PROPERTY_SOURCE_PREFIX + libraryName) == null) {
483483
//Potential pb: if the pure library is something that is being compiled (which is supposetly not the case, but who knows...)
484-
//the user will get $basexx instead of $ws
485-
addPathAndCheck(model, Path.EMPTY, libraryName, modelProperties, classpath);
484+
//the user will get $basexx instead of $ws
485+
addPathAndCheck(model, IPath.EMPTY, libraryName, modelProperties, classpath);
486486
}
487487
}
488488
}

‎build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ModelBuildScriptGenerator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ private void generateGatherLogTarget() throws CoreException {
462462
destinations.add(destination);
463463
}
464464
String logFolder = (availableJar.getType() == CompiledEntry.FOLDER) ? getJARLocation(name) : getTempJARFolderLocation(name);
465-
Path logPath = new Path(logFolder + Utils.getPropertyFormat(PROPERTY_LOG_EXTENSION));
465+
IPath logPath = new Path(logFolder + Utils.getPropertyFormat(PROPERTY_LOG_EXTENSION));
466466
FileSet logSet = new FileSet(logPath.removeLastSegments(1).toString(), null, logPath.lastSegment(), null, null, null, null);
467467
script.printCopyTask(null, destination.toString(), new FileSet[] {logSet}, false, false);
468468
}
@@ -1335,7 +1335,7 @@ private List<Object> getPrequisitePaths() throws CoreException {
13351335
try {
13361336
BundleDescription bundle = state.getBundle(Long.valueOf(id2).longValue());
13371337
if (bundle != null && !Utils.isBinary(bundle)) {
1338-
Path bundleLocation = new Path(bundle.getLocation());
1338+
IPath bundleLocation = new Path(bundle.getLocation());
13391339
results.add(bundleLocation.append("compilation.problem")); //$NON-NLS-1$
13401340
results.add(Utils.getPropertyFormat(PROPERTY_PLUGIN_TEMP) + '/' + getNormalizedName(bundle) + "/compilation.problem"); //$NON-NLS-1$
13411341
}

‎build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/SourceGenerator.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -307,12 +307,12 @@ private BuildTimeFeature createSourceFeature(Feature featureExample) throws Core
307307

308308
private void create30SourceFragment(FeatureEntry fragment, FeatureEntry plugin) throws CoreException {
309309
// create the directory for the plugin
310-
Path sourceFragmentDirURL = new Path(getWorkingDirectory() + '/' + DEFAULT_PLUGIN_LOCATION + '/' + getSourcePluginName(fragment, true));
310+
IPath sourceFragmentDirURL = new Path(getWorkingDirectory() + '/' + DEFAULT_PLUGIN_LOCATION + '/' + getSourcePluginName(fragment, true));
311311
File sourceFragmentDir = new File(sourceFragmentDirURL.toOSString());
312312
new File(sourceFragmentDir, "META-INF").mkdirs(); //$NON-NLS-1$
313313
try {
314314
// read the content of the template file
315-
Path fragmentPath = new Path(TEMPLATE + "/30/fragment/" + Constants.BUNDLE_FILENAME_DESCRIPTOR);//$NON-NLS-1$
315+
IPath fragmentPath = new Path(TEMPLATE + "/30/fragment/" + Constants.BUNDLE_FILENAME_DESCRIPTOR);//$NON-NLS-1$
316316
URL templateLocation = BundleHelper.getDefault().find(fragmentPath);
317317
if (templateLocation == null) {
318318
IStatus status = new Status(IStatus.WARNING, PI_PDEBUILD, IPDEBuildConstants.EXCEPTION_READING_FILE, NLS.bind(Messages.error_readingDirectory, fragmentPath), null);
@@ -671,7 +671,7 @@ private FeatureEntry create30SourcePlugin(BuildTimeFeature sourceFeature) throws
671671

672672
// Create the MANIFEST.MF
673673
StringBuffer buffer;
674-
Path templateManifest = new Path(TEMPLATE + "/30/plugin/" + Constants.BUNDLE_FILENAME_DESCRIPTOR); //$NON-NLS-1$
674+
IPath templateManifest = new Path(TEMPLATE + "/30/plugin/" + Constants.BUNDLE_FILENAME_DESCRIPTOR); //$NON-NLS-1$
675675
URL templateManifestURL = BundleHelper.getDefault().find(templateManifest);
676676
if (templateManifestURL == null) {
677677
IStatus status = new Status(IStatus.WARNING, PI_PDEBUILD, IPDEBuildConstants.EXCEPTION_READING_FILE, NLS.bind(Messages.error_readingDirectory, templateManifest), null);

‎build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/fetch/CVSFetchTaskFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ private String asReference(String repoLocation, String module, String projectNam
295295
buffer.append(sep);
296296
buffer.append(module);
297297

298-
Path modulePath = new Path(module);
298+
IPath modulePath = new Path(module);
299299
if (!modulePath.lastSegment().equals(projectName)) {
300300
buffer.append(";project=\""); //$NON-NLS-1$
301301
buffer.append(projectName);

‎build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/fetch/GETFetchFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ private void printGetTask(IPath destination, IAntScript script, Map<String, Obje
165165
// if we have a feature or un-packed plug-in then we need to unzip it
166166
boolean unpack = Boolean.valueOf((String) entryInfos.get(UNPACK)).booleanValue();
167167
if (unpack || ELEMENT_TYPE_FEATURE.equals(entryInfos.get(KEY_ELEMENT_TYPE))) {
168-
Path destPath = new Path(dest);
168+
IPath destPath = new Path(dest);
169169
String unzipped = destPath.removeLastSegments(1).toOSString();
170170
if (destPath.getFileExtension().equalsIgnoreCase("jar")) { //$NON-NLS-1$
171171
unzipped = destPath.removeFileExtension().toOSString();

‎build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/packager/PackageConfigScriptGenerator.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ private String getFinalName(BundleDescription bundle, String shape) {
6969
final String JAR = "jar"; //$NON-NLS-1$
7070
final String DOT_JAR = '.' + JAR;
7171
if (!AbstractScriptGenerator.getPropertyAsBoolean(IBuildPropertiesConstants.PROPERTY_PACKAGER_AS_NORMALIZER)) {
72-
Path path = new Path(bundle.getLocation());
72+
IPath path = new Path(bundle.getLocation());
7373
if (shape.equals(ShapeAdvisor.FILE) && !JAR.equalsIgnoreCase(path.getFileExtension()))
7474
return path.lastSegment().concat(DOT_JAR);
7575
return path.lastSegment();
@@ -81,7 +81,7 @@ private String getFinalName(BundleDescription bundle, String shape) {
8181

8282
private String getFinalName(BuildTimeFeature feature) {
8383
if (!AbstractScriptGenerator.getPropertyAsBoolean(IBuildPropertiesConstants.PROPERTY_PACKAGER_AS_NORMALIZER)) {
84-
Path featurePath = new Path(feature.getURL().getPath());
84+
IPath featurePath = new Path(feature.getURL().getPath());
8585
return featurePath.segment(featurePath.segmentCount() - 2);
8686
}
8787
return feature.getId() + "_" + feature.getVersion(); //$NON-NLS-1$
@@ -105,7 +105,7 @@ protected void generateGatherBinPartsTarget() { //TODO Here we should try to use
105105
ArrayList<FileSet> p2Features = BuildDirector.p2Gathering ? new ArrayList<>() : null;
106106
ArrayList<FileSet> p2Bundles = BuildDirector.p2Gathering ? new ArrayList<>() : null;
107107
for (BundleDescription plugin2 : plugins) {
108-
Path pluginLocation = new Path(plugin2.getLocation());
108+
IPath pluginLocation = new Path(plugin2.getLocation());
109109
String location = pluginLocation.toOSString();
110110
boolean isFolder = isFolder(pluginLocation);
111111

@@ -172,7 +172,7 @@ public String getTargetName() {
172172
return "package" + '.' + getTargetElement() + (config.length() > 0 ? "." : "") + config; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
173173
}
174174

175-
private boolean isFolder(Path pluginLocation) {
175+
private boolean isFolder(IPath pluginLocation) {
176176
return pluginLocation.toFile().isDirectory();
177177
}
178178

‎build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/publisher/compatibility/RootFileTouchpointAdvice.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import java.util.HashMap;
1818
import java.util.Map;
1919

20+
import org.eclipse.core.runtime.IPath;
2021
import org.eclipse.core.runtime.Path;
2122
import org.eclipse.equinox.internal.p2.publisher.eclipse.ProductFile;
2223
import org.eclipse.equinox.p2.metadata.ITouchpointData;
@@ -61,7 +62,7 @@ public ITouchpointData getTouchpointData(ITouchpointData existingData) {
6162
if (launcherFile.exists()) {
6263
configInstruction = "setLauncherName(name:" + launcherName + ");"; //$NON-NLS-1$ //$NON-NLS-2$
6364
if (Constants.OS_MACOSX.equals(os)) {
64-
Path path = new Path(launcherFile.getAbsolutePath());
65+
IPath path = new Path(launcherFile.getAbsolutePath());
6566
File appFolder = path.removeLastSegments(3).toFile();
6667
configInstruction += "chmod(targetDir:${installFolder}/" + appFolder.getName() + "/Contents/MacOS/, targetFile:" + launcherFile.getName() + ", permissions:755);"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
6768
} else if (!Constants.OS_WIN32.equals(os)) {

‎ds/org.eclipse.pde.ds.annotations/META-INF/MANIFEST.MF

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: %Bundle-Name
44
Bundle-SymbolicName: org.eclipse.pde.ds.annotations;singleton:=true
5-
Bundle-Version: 1.3.0.qualifier
5+
Bundle-Version: 1.3.100.qualifier
66
Bundle-Activator: org.eclipse.pde.ds.internal.annotations.Activator
77
Bundle-Vendor: %Bundle-Vendor
88
Require-Bundle: org.eclipse.ui;bundle-version="[3.105.0,4.0.0)",
9-
org.eclipse.core.runtime;bundle-version="[3.9.0,4.0.0)",
9+
org.eclipse.core.runtime;bundle-version="[3.27.0,4.0.0)",
1010
org.eclipse.pde.ui;bundle-version="[3.8.0,4.0.0)",
1111
org.eclipse.jdt.core;bundle-version="[3.9.0,4.0.0)",
1212
org.eclipse.pde.ds.core;bundle-version="[1.1.0,1.4.0)",

0 commit comments

Comments
 (0)