Google Git Google Git
Sign in
eclipse/platform/eclipse.platform.team/refs/heads/r1_0^!/.
commit
47b45ecf04280245b11678883c5981bef5bfc67c
[log]
author
Andre Weinand <aweinand>
Wed Sep 26 12:48:46 2001 +0000
committer
Andre Weinand <aweinand>
Wed Sep 26 12:48:46 2001 +0000
tree
31cb1f184d78bff0525d9242868f8b3788e20e65
parent
e1c872079681b06781d00ffd92f04e85fc4c1670 [diff] 
1GJYMG4: ITPUI:WINNT - no context help for some menus/dialogs

diff --git a/bundles/org.eclipse.compare/buildnotes_compare.html b/bundles/org.eclipse.compare/buildnotes_compare.html
index 4c8a8f5..3b4a3c3 100644
--- a/bundles/org.eclipse.compare/buildnotes_compare.html
+++ b/bundles/org.eclipse.compare/buildnotes_compare.html

@@ -11,6 +11,32 @@
 <h1>

 Eclipse Platform Build Notes<br>

 Compare</h1>

+Eclipse SDK Build 137, September 26th, 2001

+

+<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>

+1GJYMG4: ITPUI:WINNT - no context help for some menus/dialogs<br>

+

+<h2>

+Problem reports closed</h2>

+

+<h1>

+<hr WIDTH="100%"></h1>

 Eclipse SDK Build 136, September 19th, 2001

 

 <h2>


diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java
index afcf6f8..fbbe30b 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java

@@ -13,6 +13,9 @@
 import org.eclipse.ui.texteditor.PropagatingFontFieldEditor;

 import org.eclipse.ui.IWorkbench;

 import org.eclipse.ui.IWorkbenchPreferencePage;

+import org.eclipse.ui.help.DialogPageContextComputer;

+import org.eclipse.ui.help.WorkbenchHelp;

+

 
 public class ComparePreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {

 		

@@ -22,6 +25,8 @@
 	public static final String INITIALLY_SHOW_ANCESTOR_PANE= PREFIX + "InitiallyShowAncestorPane"; //$NON-NLS-1$

 	public static final String TEXT_FONT= PREFIX + "TextFont"; //$NON-NLS-1$

 

+	private static final String HELP_CONTEXT_ID= "compare_viewers_preference_page_context";

+	

 

 	public ComparePreferencePage() {

 		super(GRID);

@@ -38,6 +43,12 @@
 	public void init(IWorkbench workbench) {

 	}	

 

+	public void createControl(Composite parent) {

+		// 1GJYMG4: ITPUI:WINNT - no context help for some menus/dialogs

+		super.createControl(parent);

+		WorkbenchHelp.setHelp(parent, new DialogPageContextComputer(this, HELP_CONTEXT_ID));

+	}	

+

 	protected IPreferenceStore doGetPreferenceStore() {

 		return CompareUIPlugin.getDefault().getPreferenceStore();

 	}


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 dcd1e7e..c56012b 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

@@ -287,7 +287,7 @@
 		if (fPreferenceChangeListener != null) {

 			IPreferenceStore ps= CompareUIPlugin.getDefault().getPreferenceStore();

 			if (ps != null)

-				ps.addPropertyChangeListener(fPreferenceChangeListener);

+				ps.removePropertyChangeListener(fPreferenceChangeListener);

 			fPreferenceChangeListener= null;

 		}

 				


diff --git a/bundles/org.eclipse.compare/plugin.xml b/bundles/org.eclipse.compare/plugin.xml
index 54c8a86..77aa1ee 100644
--- a/bundles/org.eclipse.compare/plugin.xml
+++ b/bundles/org.eclipse.compare/plugin.xml

@@ -124,7 +124,7 @@
 	

 	<extension point="org.eclipse.compare.contentMergeViewers">

 		<viewer

-			extensions="class,exe,dll,binary"

+			extensions="zip,jar,class,exe,dll,binary"

 			class="org.eclipse.compare.internal.BinaryCompareViewerCreator">

 		</viewer>

 		<viewer


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 4c8a8f5..3b4a3c3 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,32 @@
 <h1>

 Eclipse Platform Build Notes<br>

 Compare</h1>

+Eclipse SDK Build 137, September 26th, 2001

+

+<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>

+1GJYMG4: ITPUI:WINNT - no context help for some menus/dialogs<br>

+

+<h2>

+Problem reports closed</h2>

+

+<h1>

+<hr WIDTH="100%"></h1>

 Eclipse SDK Build 136, September 19th, 2001

 

 <h2>


diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java
index afcf6f8..fbbe30b 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java

@@ -13,6 +13,9 @@
 import org.eclipse.ui.texteditor.PropagatingFontFieldEditor;

 import org.eclipse.ui.IWorkbench;

 import org.eclipse.ui.IWorkbenchPreferencePage;

+import org.eclipse.ui.help.DialogPageContextComputer;

+import org.eclipse.ui.help.WorkbenchHelp;

+

 
 public class ComparePreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {

 		

@@ -22,6 +25,8 @@
 	public static final String INITIALLY_SHOW_ANCESTOR_PANE= PREFIX + "InitiallyShowAncestorPane"; //$NON-NLS-1$

 	public static final String TEXT_FONT= PREFIX + "TextFont"; //$NON-NLS-1$

 

+	private static final String HELP_CONTEXT_ID= "compare_viewers_preference_page_context";

+	

 

 	public ComparePreferencePage() {

 		super(GRID);

@@ -38,6 +43,12 @@
 	public void init(IWorkbench workbench) {

 	}	

 

+	public void createControl(Composite parent) {

+		// 1GJYMG4: ITPUI:WINNT - no context help for some menus/dialogs

+		super.createControl(parent);

+		WorkbenchHelp.setHelp(parent, new DialogPageContextComputer(this, HELP_CONTEXT_ID));

+	}	

+

 	protected IPreferenceStore doGetPreferenceStore() {

 		return CompareUIPlugin.getDefault().getPreferenceStore();

 	}


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 dcd1e7e..c56012b 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

@@ -287,7 +287,7 @@
 		if (fPreferenceChangeListener != null) {

 			IPreferenceStore ps= CompareUIPlugin.getDefault().getPreferenceStore();

 			if (ps != null)

-				ps.addPropertyChangeListener(fPreferenceChangeListener);

+				ps.removePropertyChangeListener(fPreferenceChangeListener);

 			fPreferenceChangeListener= null;

 		}

 				


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 54c8a86..77aa1ee 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.xml
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.xml

@@ -124,7 +124,7 @@
 	

 	<extension point="org.eclipse.compare.contentMergeViewers">

 		<viewer

-			extensions="class,exe,dll,binary"

+			extensions="zip,jar,class,exe,dll,binary"

 			class="org.eclipse.compare.internal.BinaryCompareViewerCreator">

 		</viewer>

 		<viewer