| 1 |
### Eclipse Workspace Patch 1.0
|
| 2 |
#P org.eclipse.mylyn.pde.ui
|
| 3 |
Index: src/org/eclipse/mylyn/internal/pde/ui/PdeEditingMonitor.java
|
| 4 |
===================================================================
|
| 5 |
RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/PdeEditingMonitor.java,v
|
| 6 |
retrieving revision 1.7
|
| 7 |
diff -u -r1.7 PdeEditingMonitor.java
|
| 8 |
--- src/org/eclipse/mylyn/internal/pde/ui/PdeEditingMonitor.java 21 Sep 2007 18:44:02 -0000 1.7
|
| 9 |
+++ src/org/eclipse/mylyn/internal/pde/ui/PdeEditingMonitor.java 24 Oct 2007 21:39:57 -0000
|
| 10 |
@@ -24,8 +24,8 @@
|
| 11 |
import org.eclipse.pde.core.plugin.IPluginModelBase;
|
| 12 |
import org.eclipse.pde.core.plugin.IPluginObject;
|
| 13 |
import org.eclipse.pde.internal.core.plugin.ImportObject;
|
| 14 |
-import org.eclipse.pde.internal.core.text.IDocumentAttributeNode;
|
| 15 |
-import org.eclipse.pde.internal.core.text.IDocumentElementNode;
|
| 16 |
+import org.eclipse.pde.internal.core.text.IDocumentAttribute;
|
| 17 |
+import org.eclipse.pde.internal.core.text.IDocumentNode;
|
| 18 |
import org.eclipse.pde.internal.core.text.plugin.PluginModel;
|
| 19 |
import org.eclipse.pde.internal.core.text.plugin.PluginObjectNode;
|
| 20 |
import org.eclipse.pde.internal.ui.editor.plugin.ManifestEditor;
|
| 21 |
@@ -123,11 +123,11 @@
|
| 22 |
}
|
| 23 |
}
|
| 24 |
|
| 25 |
- public static String getStringOfNode(IDocumentElementNode node) {
|
| 26 |
+ public static String getStringOfNode(IDocumentNode node) {
|
| 27 |
if (node == null)
|
| 28 |
return null;
|
| 29 |
String s = node.getXMLTagName();
|
| 30 |
- for (IDocumentAttributeNode a : node.getNodeAttributes()) {
|
| 31 |
+ for (IDocumentAttribute a : node.getNodeAttributes()) {
|
| 32 |
s += a.getAttributeName() + "=" + a.getAttributeValue();
|
| 33 |
}
|
| 34 |
return s;
|
| 35 |
@@ -187,14 +187,14 @@
|
| 36 |
/**
|
| 37 |
* COPIED FROM ManifestSourcePage
|
| 38 |
*/
|
| 39 |
- private static IDocumentElementNode findNode(IPluginObject[] nodes, int offset, boolean hashCode) {
|
| 40 |
+ private static IDocumentNode findNode(IPluginObject[] nodes, int offset, boolean hashCode) {
|
| 41 |
for (int i = 0; i < nodes.length; i++) {
|
| 42 |
- IDocumentElementNode node = (IDocumentElementNode) nodes[i];
|
| 43 |
- IDocumentElementNode[] children = node.getChildNodes();
|
| 44 |
+ IDocumentNode node = (IDocumentNode) nodes[i];
|
| 45 |
+ IDocumentNode[] children = node.getChildNodes();
|
| 46 |
|
| 47 |
// changed region - added to check the children to make it work
|
| 48 |
// properly
|
| 49 |
- IDocumentElementNode node2 = null;
|
| 50 |
+ IDocumentNode node2 = null;
|
| 51 |
if (children.length > 0)
|
| 52 |
node2 = PdeEditingMonitor.findNode(children, offset, hashCode);
|
| 53 |
// end changed region
|
| 54 |
@@ -217,11 +217,11 @@
|
| 55 |
/**
|
| 56 |
* Copy of previous, taking different arguments
|
| 57 |
*/
|
| 58 |
- private static IDocumentElementNode findNode(IDocumentElementNode[] nodes, int offset, boolean hashCode) {
|
| 59 |
+ private static IDocumentNode findNode(IDocumentNode[] nodes, int offset, boolean hashCode) {
|
| 60 |
for (int i = 0; i < nodes.length; i++) {
|
| 61 |
- IDocumentElementNode node = nodes[i];
|
| 62 |
- IDocumentElementNode[] children = node.getChildNodes();
|
| 63 |
- IDocumentElementNode node2 = null;
|
| 64 |
+ IDocumentNode node = nodes[i];
|
| 65 |
+ IDocumentNode[] children = node.getChildNodes();
|
| 66 |
+ IDocumentNode node2 = null;
|
| 67 |
if (children.length > 0)
|
| 68 |
node2 = PdeEditingMonitor.findNode(children, offset, hashCode);
|
| 69 |
if (node2 != null)
|