1GK0388: ITPJCORE:WIN2000 - replace with local history: selecting (workspace) deletes source

8 files changed, 72 insertions, 10 deletions

diff --git a/bundles/org.eclipse.compare/buildnotes_compare.html b/bundles/org.eclipse.compare/buildnotes_compare.html
index 3bbf50bcd..b79409db9 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 (including example)</h1>

+Eclipse SDK Build 201, September xxth, 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>

+1GJURWJ: ITPUI:WIN2000 - Hebrew + Japanese: compare view defaults to binary<br>

+1GK0388: ITPJCORE:WIN2000 - replace with local history: selecting (workspace) deletes source<br>

+

+<h2>

+Problem reports closed</h2>

+

+<h1>

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

 Eclipse SDK Build 200, September 13th, 2001

 

 <h2>

@@ -30,7 +57,6 @@ new method EditionSelectionDialog.setAddMode(boolean)<br>
 new method CompareEditorInput.saveChanges(...)<br>

 new method TextMergeViewer.createLineComparator(IDocument document, IRegion region, boolean ignoreWhiteSpace)<br>

 

-

 <h3>

 Other highlights</h3>

 

diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java
index c5a4e0152..e3f368075 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java
@@ -816,7 +816,7 @@ public class EditionSelectionDialog extends Dialog {
 			setInput(null);

 		}

 		if (fCommitButton != null)

-			fCommitButton.setEnabled(fSelectedItem != null);

+			fCommitButton.setEnabled(fSelectedItem != null && fTargetPair.getItem() != fSelectedItem);

 	}

 }

 

diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java
index 6c1e8a789..e0997bb18 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java
@@ -688,11 +688,16 @@ public final class CompareUIPlugin extends AbstractUIPlugin {
 				is= sca.getContents();

 				if (is == null)

 					return null;

-				for (int i= 0; i < 1000; i++) {

+				int lineLength= 0;

+				while (true) {

 					int c= is.read();

 					if (c == -1)	// EOF

 						break;

-					if (c >= 128)

+					if (c == '\n')

+						lineLength= 0;

+					else

+						lineLength++;

+					if (lineLength > 1000)

 						return ITypedElement.UNKNOWN_TYPE;

 				}

 				return ITypedElement.TEXT_TYPE;

diff --git a/bundles/org.eclipse.compare/plugin.xml b/bundles/org.eclipse.compare/plugin.xml
index cbbfa3b97..54c8a8657 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="binary"

+			extensions="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 3bbf50bcd..b79409db9 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 (including example)</h1>

+Eclipse SDK Build 201, September xxth, 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>

+1GJURWJ: ITPUI:WIN2000 - Hebrew + Japanese: compare view defaults to binary<br>

+1GK0388: ITPJCORE:WIN2000 - replace with local history: selecting (workspace) deletes source<br>

+

+<h2>

+Problem reports closed</h2>

+

+<h1>

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

 Eclipse SDK Build 200, September 13th, 2001

 

 <h2>

@@ -30,7 +57,6 @@ new method EditionSelectionDialog.setAddMode(boolean)<br>
 new method CompareEditorInput.saveChanges(...)<br>

 new method TextMergeViewer.createLineComparator(IDocument document, IRegion region, boolean ignoreWhiteSpace)<br>

 

-

 <h3>

 Other highlights</h3>

 

diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java
index c5a4e0152..e3f368075 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java
@@ -816,7 +816,7 @@ public class EditionSelectionDialog extends Dialog {
 			setInput(null);

 		}

 		if (fCommitButton != null)

-			fCommitButton.setEnabled(fSelectedItem != null);

+			fCommitButton.setEnabled(fSelectedItem != null && fTargetPair.getItem() != fSelectedItem);

 	}

 }

 

diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java
index 6c1e8a789..e0997bb18 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java
@@ -688,11 +688,16 @@ public final class CompareUIPlugin extends AbstractUIPlugin {
 				is= sca.getContents();

 				if (is == null)

 					return null;

-				for (int i= 0; i < 1000; i++) {

+				int lineLength= 0;

+				while (true) {

 					int c= is.read();

 					if (c == -1)	// EOF

 						break;

-					if (c >= 128)

+					if (c == '\n')

+						lineLength= 0;

+					else

+						lineLength++;

+					if (lineLength > 1000)

 						return ITypedElement.UNKNOWN_TYPE;

 				}

 				return ITypedElement.TEXT_TYPE;

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 cbbfa3b97..54c8a8657 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="binary"

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

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

 		</viewer>

 		<viewer