diff options
| author | Andre Weinand | 2002-03-05 12:12:00 +0000 |
|---|---|---|
| committer | Andre Weinand | 2002-03-05 12:12:00 +0000 |
| commit | 6e002137f6f34296e738085a27e9f8b09ebdc81e (patch) | |
| tree | 6bab07a257f0d865e86b7ec94bb67ff9c77f42c4 /bundles | |
| parent | 345bb47a4c17d4b087fcab221814e1449319088f (diff) | |
| download | eclipse.platform.team-6e002137f6f34296e738085a27e9f8b09ebdc81e.tar.gz eclipse.platform.team-6e002137f6f34296e738085a27e9f8b09ebdc81e.tar.xz eclipse.platform.team-6e002137f6f34296e738085a27e9f8b09ebdc81e.zip | |
finished #9869
Diffstat (limited to 'bundles')
6 files changed, 66 insertions, 4 deletions
diff --git a/bundles/org.eclipse.compare/buildnotes_compare.html b/bundles/org.eclipse.compare/buildnotes_compare.html index 48bf1e839..0c0ce4004 100644 --- a/bundles/org.eclipse.compare/buildnotes_compare.html +++ b/bundles/org.eclipse.compare/buildnotes_compare.html @@ -11,6 +11,33 @@ <h1>
Eclipse Platform Build Notes<br>
Compare</h1>
+Eclipse Build Input March 5th 2002
+
+<h2>
+What's new in this drop</h2>
+
+<h3>
+API changes</h3>
+
+<h3>
+API Additions</h3>
+
+<h3>
+Other highlights</h3>
+
+<h2>
+Known deficiencies</h2>
+
+<h2>
+Problem reports fixed</h2>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=9869">#9869</a>: Need more support for creating/deleting resources<br>
+
+
+<h2>
+Problem reports closed</h2>
+
+<h1>
+<hr WIDTH="100%"></h1>
Eclipse Build Input February 26th 2002
<h2>
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/MergeViewerContentProvider.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/MergeViewerContentProvider.java index 5ddbc17f1..d193501e5 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/MergeViewerContentProvider.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/MergeViewerContentProvider.java @@ -95,6 +95,8 @@ public class MergeViewerContentProvider implements IMergeViewerContentProvider { }
if (left instanceof IEditableContent)
((IEditableContent)left).setContent(bytes);
+ if (node instanceof ResourceCompareInput.MyDiffNode)
+ ((ResourceCompareInput.MyDiffNode)node).fireChange();
} else {
node.copy(false);
}
@@ -143,6 +145,8 @@ public class MergeViewerContentProvider implements IMergeViewerContentProvider { }
if (right instanceof IEditableContent)
((IEditableContent)right).setContent(bytes);
+ if (node instanceof ResourceCompareInput.MyDiffNode)
+ ((ResourceCompareInput.MyDiffNode)node).fireChange();
} else {
node.copy(true);
}
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ResourceCompareInput.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ResourceCompareInput.java index 7909e1847..ad53bbac8 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ResourceCompareInput.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ResourceCompareInput.java @@ -37,7 +37,7 @@ class ResourceCompareInput extends CompareEditorInput { private DiffTreeViewer fDiffViewer;
- private class MyDiffNode extends DiffNode {
+ class MyDiffNode extends DiffNode {
private boolean fDirty= false;
private ITypedElement fLastId;
@@ -47,7 +47,7 @@ class ResourceCompareInput extends CompareEditorInput { public MyDiffNode(IDiffContainer parent, int description, ITypedElement ancestor, ITypedElement left, ITypedElement right) {
super(parent, description, ancestor, left, right);
}
- protected void fireChange() {
+ public void fireChange() {
super.fireChange();
setDirty(true);
fDirty= true;
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html index 48bf1e839..0c0ce4004 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html @@ -11,6 +11,33 @@ <h1>
Eclipse Platform Build Notes<br>
Compare</h1>
+Eclipse Build Input March 5th 2002
+
+<h2>
+What's new in this drop</h2>
+
+<h3>
+API changes</h3>
+
+<h3>
+API Additions</h3>
+
+<h3>
+Other highlights</h3>
+
+<h2>
+Known deficiencies</h2>
+
+<h2>
+Problem reports fixed</h2>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=9869">#9869</a>: Need more support for creating/deleting resources<br>
+
+
+<h2>
+Problem reports closed</h2>
+
+<h1>
+<hr WIDTH="100%"></h1>
Eclipse Build Input February 26th 2002
<h2>
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/MergeViewerContentProvider.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/MergeViewerContentProvider.java index 5ddbc17f1..d193501e5 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/MergeViewerContentProvider.java +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/MergeViewerContentProvider.java @@ -95,6 +95,8 @@ public class MergeViewerContentProvider implements IMergeViewerContentProvider { }
if (left instanceof IEditableContent)
((IEditableContent)left).setContent(bytes);
+ if (node instanceof ResourceCompareInput.MyDiffNode)
+ ((ResourceCompareInput.MyDiffNode)node).fireChange();
} else {
node.copy(false);
}
@@ -143,6 +145,8 @@ public class MergeViewerContentProvider implements IMergeViewerContentProvider { }
if (right instanceof IEditableContent)
((IEditableContent)right).setContent(bytes);
+ if (node instanceof ResourceCompareInput.MyDiffNode)
+ ((ResourceCompareInput.MyDiffNode)node).fireChange();
} else {
node.copy(true);
}
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ResourceCompareInput.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ResourceCompareInput.java index 7909e1847..ad53bbac8 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ResourceCompareInput.java +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ResourceCompareInput.java @@ -37,7 +37,7 @@ class ResourceCompareInput extends CompareEditorInput { private DiffTreeViewer fDiffViewer;
- private class MyDiffNode extends DiffNode {
+ class MyDiffNode extends DiffNode {
private boolean fDirty= false;
private ITypedElement fLastId;
@@ -47,7 +47,7 @@ class ResourceCompareInput extends CompareEditorInput { public MyDiffNode(IDiffContainer parent, int description, ITypedElement ancestor, ITypedElement left, ITypedElement right) {
super(parent, description, ancestor, left, right);
}
- protected void fireChange() {
+ public void fireChange() {
super.fireChange();
setDirty(true);
fDirty= true;
|