Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre Weinand2002-05-14 10:02:13 +0000
committerAndre Weinand2002-05-14 10:02:13 +0000
commit7760d77961a3e7af2ea6afc66182c84d95e038b2 (patch)
tree97e76c2af52779a457fa65a047790fbc15660a85
parent6016073be97381461a096a133213a999dd185ec6 (diff)
downloadeclipse.platform.team-7760d77961a3e7af2ea6afc66182c84d95e038b2.tar.gz
eclipse.platform.team-7760d77961a3e7af2ea6afc66182c84d95e038b2.tar.xz
eclipse.platform.team-7760d77961a3e7af2ea6afc66182c84d95e038b2.zip
12719
-rw-r--r--bundles/org.eclipse.compare/buildnotes_compare.html28
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java10
-rw-r--r--bundles/org.eclipse.compare/plugin.xml2
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html28
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java10
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.xml2
6 files changed, 74 insertions, 6 deletions
diff --git a/bundles/org.eclipse.compare/buildnotes_compare.html b/bundles/org.eclipse.compare/buildnotes_compare.html
index 442d42000..ec9abf5b6 100644
--- a/bundles/org.eclipse.compare/buildnotes_compare.html
+++ b/bundles/org.eclipse.compare/buildnotes_compare.html
@@ -11,6 +11,34 @@
<h1>
Eclipse Platform Build Notes<br>
Compare</h1>
+Eclipse Build Input May 14th 2002
+
+<h2>
+What's new in this drop</h2>
+Bumped plugin version number to 2.0.0<br>
+
+<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=8373">#8373</a>: Compare With->Patch... missing mnemonic<br>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=12719">#12719</a>: "Show Pseudo-Conflicts" setting is problematic<br>
+
+<h2>
+Problem reports closed</h2>
+
+<h1>
+<hr WIDTH="100%"></h1>
Eclipse Build Input April 30th 2002
<h2>
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java
index 90a451564..6dd2c2b67 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java
@@ -138,7 +138,7 @@ public class DiffTreeViewer extends TreeViewer {
/* package */ boolean fLeftIsLocal;
private ViewerFilter fViewerFilter;
private IPropertyChangeListener fPropertyChangeListener;
- private IPropertyChangeListener fPreferenceChangeListener;
+ //private IPropertyChangeListener fPreferenceChangeListener;
private Action fCopyLeftToRightAction;
private Action fCopyRightToLeftAction;
@@ -202,6 +202,7 @@ public class DiffTreeViewer extends TreeViewer {
}
// register for notification with the Compare plugin's PreferenceStore
+ /*
fPreferenceChangeListener= new IPropertyChangeListener() {
public void propertyChange(PropertyChangeEvent event) {
if (event.getProperty().equals(ComparePreferencePage.SHOW_PSEUDO_CONFLICTS))
@@ -211,6 +212,7 @@ public class DiffTreeViewer extends TreeViewer {
IPreferenceStore ps= CompareUIPlugin.getDefault().getPreferenceStore();
if (ps != null)
ps.addPropertyChangeListener(fPreferenceChangeListener);
+ */
setContentProvider(new DiffViewerContentProvider());
@@ -224,7 +226,7 @@ public class DiffTreeViewer extends TreeViewer {
}
);
- syncShowPseudoConflictFilter();
+ // syncShowPseudoConflictFilter();
setSorter(new DiffViewerSorter());
@@ -299,12 +301,14 @@ public class DiffTreeViewer extends TreeViewer {
*/
protected void handleDispose(DisposeEvent event) {
+ /*
if (fPreferenceChangeListener != null) {
IPreferenceStore ps= CompareUIPlugin.getDefault().getPreferenceStore();
if (ps != null)
ps.removePropertyChangeListener(fPreferenceChangeListener);
fPreferenceChangeListener= null;
}
+ */
if (fCompareConfiguration != null) {
if (fPropertyChangeListener != null)
@@ -636,6 +640,7 @@ public class DiffTreeViewer extends TreeViewer {
}
}
+ /*
private void syncShowPseudoConflictFilter() {
IPreferenceStore ps= CompareUIPlugin.getDefault().getPreferenceStore();
@@ -654,6 +659,7 @@ public class DiffTreeViewer extends TreeViewer {
}
}
}
+ */
private final boolean isEditable(Object element, boolean left) {
if (element instanceof ICompareInput) {
diff --git a/bundles/org.eclipse.compare/plugin.xml b/bundles/org.eclipse.compare/plugin.xml
index 9e110c789..1debb4608 100644
--- a/bundles/org.eclipse.compare/plugin.xml
+++ b/bundles/org.eclipse.compare/plugin.xml
@@ -7,7 +7,7 @@
<plugin
name="%pluginName"
id="org.eclipse.compare"
- version="1.9.0"
+ version="2.0.0"
provider-name="Object Technology International, Inc."
class="org.eclipse.compare.internal.CompareUIPlugin">
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 442d42000..ec9abf5b6 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,34 @@
<h1>
Eclipse Platform Build Notes<br>
Compare</h1>
+Eclipse Build Input May 14th 2002
+
+<h2>
+What's new in this drop</h2>
+Bumped plugin version number to 2.0.0<br>
+
+<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=8373">#8373</a>: Compare With->Patch... missing mnemonic<br>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=12719">#12719</a>: "Show Pseudo-Conflicts" setting is problematic<br>
+
+<h2>
+Problem reports closed</h2>
+
+<h1>
+<hr WIDTH="100%"></h1>
Eclipse Build Input April 30th 2002
<h2>
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java
index 90a451564..6dd2c2b67 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java
@@ -138,7 +138,7 @@ public class DiffTreeViewer extends TreeViewer {
/* package */ boolean fLeftIsLocal;
private ViewerFilter fViewerFilter;
private IPropertyChangeListener fPropertyChangeListener;
- private IPropertyChangeListener fPreferenceChangeListener;
+ //private IPropertyChangeListener fPreferenceChangeListener;
private Action fCopyLeftToRightAction;
private Action fCopyRightToLeftAction;
@@ -202,6 +202,7 @@ public class DiffTreeViewer extends TreeViewer {
}
// register for notification with the Compare plugin's PreferenceStore
+ /*
fPreferenceChangeListener= new IPropertyChangeListener() {
public void propertyChange(PropertyChangeEvent event) {
if (event.getProperty().equals(ComparePreferencePage.SHOW_PSEUDO_CONFLICTS))
@@ -211,6 +212,7 @@ public class DiffTreeViewer extends TreeViewer {
IPreferenceStore ps= CompareUIPlugin.getDefault().getPreferenceStore();
if (ps != null)
ps.addPropertyChangeListener(fPreferenceChangeListener);
+ */
setContentProvider(new DiffViewerContentProvider());
@@ -224,7 +226,7 @@ public class DiffTreeViewer extends TreeViewer {
}
);
- syncShowPseudoConflictFilter();
+ // syncShowPseudoConflictFilter();
setSorter(new DiffViewerSorter());
@@ -299,12 +301,14 @@ public class DiffTreeViewer extends TreeViewer {
*/
protected void handleDispose(DisposeEvent event) {
+ /*
if (fPreferenceChangeListener != null) {
IPreferenceStore ps= CompareUIPlugin.getDefault().getPreferenceStore();
if (ps != null)
ps.removePropertyChangeListener(fPreferenceChangeListener);
fPreferenceChangeListener= null;
}
+ */
if (fCompareConfiguration != null) {
if (fPropertyChangeListener != null)
@@ -636,6 +640,7 @@ public class DiffTreeViewer extends TreeViewer {
}
}
+ /*
private void syncShowPseudoConflictFilter() {
IPreferenceStore ps= CompareUIPlugin.getDefault().getPreferenceStore();
@@ -654,6 +659,7 @@ public class DiffTreeViewer extends TreeViewer {
}
}
}
+ */
private final boolean isEditable(Object element, boolean left) {
if (element instanceof ICompareInput) {
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.xml b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.xml
index 9e110c789..1debb4608 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.xml
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.xml
@@ -7,7 +7,7 @@
<plugin
name="%pluginName"
id="org.eclipse.compare"
- version="1.9.0"
+ version="2.0.0"
provider-name="Object Technology International, Inc."
class="org.eclipse.compare.internal.CompareUIPlugin">

Back to the top