Blame eclipse-idreplace.patch
|
Andrew Overholt |
84dcc5c |
### Eclipse Workspace Patch 1.0
|
|
Andrew Overholt |
84dcc5c |
#P org.eclipse.pde.build
|
|
Andrew Overholt |
84dcc5c |
Index: src_ant/org/eclipse/pde/internal/build/tasks/IdReplaceTask.java
|
|
Andrew Overholt |
84dcc5c |
===================================================================
|
|
Andrew Overholt |
84dcc5c |
RCS file: /cvsroot/eclipse/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/IdReplaceTask.java,v
|
|
Andrew Overholt |
84dcc5c |
retrieving revision 1.31.4.2
|
|
Andrew Overholt |
84dcc5c |
diff -u -r1.31.4.2 IdReplaceTask.java
|
|
Andrew Overholt |
84dcc5c |
--- src_ant/org/eclipse/pde/internal/build/tasks/IdReplaceTask.java 20 Aug 2007 15:02:51 -0000 1.31.4.2
|
|
Andrew Overholt |
84dcc5c |
+++ src_ant/org/eclipse/pde/internal/build/tasks/IdReplaceTask.java 2 Oct 2007 18:06:52 -0000
|
|
Andrew Overholt |
84dcc5c |
@@ -243,7 +243,7 @@
|
|
Andrew Overholt |
84dcc5c |
}
|
|
Andrew Overholt |
84dcc5c |
|
|
Andrew Overholt |
84dcc5c |
startVersionId++;
|
|
Andrew Overholt |
84dcc5c |
- String replacementVersion = null;
|
|
Andrew Overholt |
84dcc5c |
+ String replacementVersion = "";
|
|
Andrew Overholt |
84dcc5c |
Version v = new Version(new String(versionId));
|
|
Andrew Overholt |
84dcc5c |
String lookupKey = new String(elementId) + ':' + v.getMajor() + '.' + v.getMinor() + '.' + v.getMicro();
|
|
Andrew Overholt |
84dcc5c |
if (isPlugin) {
|
|
Andrew Overholt |
84dcc5c |
@@ -251,13 +251,14 @@
|
|
Andrew Overholt |
84dcc5c |
} else {
|
|
Andrew Overholt |
84dcc5c |
replacementVersion = (String) featureIds.get(lookupKey);
|
|
Andrew Overholt |
84dcc5c |
}
|
|
Andrew Overholt |
84dcc5c |
+ int change = 0;
|
|
Andrew Overholt |
84dcc5c |
if (replacementVersion == null) {
|
|
Andrew Overholt |
84dcc5c |
System.err.println("Could not find " + new String(elementId)); //$NON-NLS-1$
|
|
Andrew Overholt |
84dcc5c |
} else {
|
|
Andrew Overholt |
84dcc5c |
buffer.replace(startVersionId, endVersionId, replacementVersion);
|
|
Andrew Overholt |
84dcc5c |
contentChanged = true;
|
|
Andrew Overholt |
84dcc5c |
+ change = endVersionId - startVersionId - replacementVersion.length();
|
|
Andrew Overholt |
84dcc5c |
}
|
|
Andrew Overholt |
84dcc5c |
- int change = endVersionId - startVersionId - replacementVersion.length();
|
|
Andrew Overholt |
84dcc5c |
startElement = (endElementId > endVersionId) ? endElementId - change: endVersionId - change;
|
|
Andrew Overholt |
84dcc5c |
}
|
|
Andrew Overholt |
84dcc5c |
|