### Eclipse Workspace Patch 1.0
#P org.eclipse.mylyn.pde.ui
Index: src/org/eclipse/mylyn/internal/pde/ui/PdeEditingMonitor.java
===================================================================
RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/PdeEditingMonitor.java,v
retrieving revision 1.7
diff -u -r1.7 PdeEditingMonitor.java
--- src/org/eclipse/mylyn/internal/pde/ui/PdeEditingMonitor.java 21 Sep 2007 18:44:02 -0000 1.7
+++ src/org/eclipse/mylyn/internal/pde/ui/PdeEditingMonitor.java 24 Oct 2007 21:39:57 -0000
@@ -24,8 +24,8 @@
import org.eclipse.pde.core.plugin.IPluginModelBase;
import org.eclipse.pde.core.plugin.IPluginObject;
import org.eclipse.pde.internal.core.plugin.ImportObject;
-import org.eclipse.pde.internal.core.text.IDocumentAttributeNode;
-import org.eclipse.pde.internal.core.text.IDocumentElementNode;
+import org.eclipse.pde.internal.core.text.IDocumentAttribute;
+import org.eclipse.pde.internal.core.text.IDocumentNode;
import org.eclipse.pde.internal.core.text.plugin.PluginModel;
import org.eclipse.pde.internal.core.text.plugin.PluginObjectNode;
import org.eclipse.pde.internal.ui.editor.plugin.ManifestEditor;
@@ -123,11 +123,11 @@
}
}
- public static String getStringOfNode(IDocumentElementNode node) {
+ public static String getStringOfNode(IDocumentNode node) {
if (node == null)
return null;
String s = node.getXMLTagName();
- for (IDocumentAttributeNode a : node.getNodeAttributes()) {
+ for (IDocumentAttribute a : node.getNodeAttributes()) {
s += a.getAttributeName() + "=" + a.getAttributeValue();
}
return s;
@@ -187,14 +187,14 @@
/**
* COPIED FROM ManifestSourcePage
*/
- private static IDocumentElementNode findNode(IPluginObject[] nodes, int offset, boolean hashCode) {
+ private static IDocumentNode findNode(IPluginObject[] nodes, int offset, boolean hashCode) {
for (int i = 0; i < nodes.length; i++) {
- IDocumentElementNode node = (IDocumentElementNode) nodes[i];
- IDocumentElementNode[] children = node.getChildNodes();
+ IDocumentNode node = (IDocumentNode) nodes[i];
+ IDocumentNode[] children = node.getChildNodes();
// changed region - added to check the children to make it work
// properly
- IDocumentElementNode node2 = null;
+ IDocumentNode node2 = null;
if (children.length > 0)
node2 = PdeEditingMonitor.findNode(children, offset, hashCode);
// end changed region
@@ -217,11 +217,11 @@
/**
* Copy of previous, taking different arguments
*/
- private static IDocumentElementNode findNode(IDocumentElementNode[] nodes, int offset, boolean hashCode) {
+ private static IDocumentNode findNode(IDocumentNode[] nodes, int offset, boolean hashCode) {
for (int i = 0; i < nodes.length; i++) {
- IDocumentElementNode node = nodes[i];
- IDocumentElementNode[] children = node.getChildNodes();
- IDocumentElementNode node2 = null;
+ IDocumentNode node = nodes[i];
+ IDocumentNode[] children = node.getChildNodes();
+ IDocumentNode node2 = null;
if (children.length > 0)
node2 = PdeEditingMonitor.findNode(children, offset, hashCode);
if (node2 != null)