Provided public accessor for superclasses field. Removed field that was duplicating superclass field
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/AntEditorDocumentProvider.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/AntEditorDocumentProvider.java
index 4615473..a79410a 100644
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/AntEditorDocumentProvider.java
+++ b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/AntEditorDocumentProvider.java
@@ -234,11 +234,12 @@
*/
protected class XMLFileInfo extends FileInfo {
- public AntModel fModel;
-
public XMLFileInfo(IDocument document, IAnnotationModel annotationModel, FileSynchronizer fileSynchronizer, AntModel model) {
super(document, annotationModel, fileSynchronizer);
- fModel= model;
+ }
+
+ public AntModel getAntModel() {
+ return (AntModel)fModel;
}
};
@@ -363,7 +364,7 @@
ElementInfo info= getElementInfo(element);
if (info instanceof XMLFileInfo) {
XMLFileInfo xmlInfo= (XMLFileInfo) info;
- return xmlInfo.fModel;
+ return xmlInfo.getAntModel();
}
return null;
}
@@ -429,10 +430,9 @@
* @see org.eclipse.ui.editors.text.FileDocumentProvider#disposeElementInfo(java.lang.Object, org.eclipse.ui.texteditor.AbstractDocumentProvider.ElementInfo)
*/
protected void disposeElementInfo(Object element, ElementInfo info) {
- if (info instanceof XMLFileInfo) {
+ if (info.fModel != null && info instanceof XMLFileInfo) {
XMLFileInfo xmlInfo= (XMLFileInfo) info;
- if (xmlInfo.fModel != null)
- xmlInfo.fModel.dispose();
+ xmlInfo.getAntModel().dispose();
}
super.disposeElementInfo(element, info);
}
