Freeze #2 input
diff --git a/bundles/org.eclipse.compare/.build_submit b/bundles/org.eclipse.compare/.build_submit
deleted file mode 100644
index 8ea20ec..0000000
--- a/bundles/org.eclipse.compare/.build_submit
+++ /dev/null
@@ -1,4 +0,0 @@
-plugin.xml
-plugin.properties
-doc
-icons
\ No newline at end of file
diff --git a/bundles/org.eclipse.compare/.vcm_meta b/bundles/org.eclipse.compare/.vcm_meta
index aae2e1b..fb5d12f 100644
--- a/bundles/org.eclipse.compare/.vcm_meta
+++ b/bundles/org.eclipse.compare/.vcm_meta
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<project-description>
<nature id="org.eclipse.jdt.core.javanature"/>
<builder name="org.eclipse.jdt.core.javabuilder">
diff --git a/bundles/org.eclipse.compare/build.properties b/bundles/org.eclipse.compare/build.properties
new file mode 100644
index 0000000..d19a03c
--- /dev/null
+++ b/bundles/org.eclipse.compare/build.properties
@@ -0,0 +1,2 @@
+build.source.compare.jar=Eclipse Compare
+build.includes=doc,icons,plugin.jars,plugin.properties,plugin.xml
\ No newline at end of file
diff --git a/bundles/org.eclipse.compare/compare/changes.html b/bundles/org.eclipse.compare/compare/changes.html
index 262bbe5..dccac88 100644
--- a/bundles/org.eclipse.compare/compare/changes.html
+++ b/bundles/org.eclipse.compare/compare/changes.html
@@ -11,6 +11,34 @@
<h1>
Eclipse Platform Release Notes<br>
Compare (including example)</h1>
+Eclipse SDK Build 106 - May 14, 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>
+1GDDQN8: ITPVCM:WIN2000 - catchup compare does not show content if file starts with .<br>
+1GD7B5D: ITPVCM:ALL - no button label when comparing<br>
+
+<h2>
+Problem reports closed</h2>
+1GD3MNN: ITPVCM:WINNT - Missing icons in compare dialog<br>
+
+<h1>
+<hr WIDTH="100%"></h1>
Eclipse SDK Build 105 - May 10, 2001
<h2>
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 5804752..0a48513 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java
@@ -156,8 +156,9 @@
* todayFormat MessageFormat format string if date is todays date; arg 0 is date
* yesterdayFormat MessageFormat format string if date is yesterdays date; arg 0 is date
* dayFormat MessageFormat format string if date is any other date; arg 0 is date
- * editionLabel String label for editions side of compare viewer; arg 0 is the date
- * targetLabel String label for target side of compare viewer; arg 0 is
+ * editionLabel String label for editions side of compare viewer; arg 0 is the date
+ * targetLabel String label for target side of compare viewer
+ * buttonLabel String label for OK button; default is IDialogConstants.OK_LABEL
* </pre>
*
* @param parent if not <code>null</code> the new dialog stays on top of this parent shell
@@ -492,7 +493,7 @@
* Method declared on Dialog.
*/
protected void createButtonsForButtonBar(Composite parent) {
- String buttonLabel= Utilities.getString(fBundle, "buttonLabel", "buttonLabel");
+ String buttonLabel= Utilities.getString(fBundle, "buttonLabel", IDialogConstants.OK_LABEL);
fCommitButton= createButton(parent, IDialogConstants.OK_ID, buttonLabel, true);
fCommitButton.setEnabled(false);
createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false);
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 edb6a17..fd4228f 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
@@ -618,8 +618,10 @@
String leftType= guessType(input.getLeft());
String rightType= guessType(input.getRight());
- if (leftType != null && rightType != null) {
- if (ITypedElement.TEXT_TYPE.equals(leftType) && ITypedElement.TEXT_TYPE.equals(rightType))
+ if (leftType != null || rightType != null) {
+ boolean right_text= rightType != null && ITypedElement.TEXT_TYPE.equals(rightType);
+ boolean left_text= leftType != null && ITypedElement.TEXT_TYPE.equals(leftType);
+ if ((leftType == null && right_text) || (left_text && rightType == null) || (left_text && right_text))
type= ITypedElement.TEXT_TYPE;
else
type= "binary";
@@ -689,9 +691,13 @@
InputStream is= sca.getContents();
if (is == null)
return null;
- for (int i= 0; i < 1000; i++)
- if (is.read() >= 128)
+ for (int i= 0; i < 1000; i++) {
+ int c= is.read();
+ if (c == -1) // EOF
+ break;
+ if (c >= 128)
return ITypedElement.UNKNOWN_TYPE;
+ }
return ITypedElement.TEXT_TYPE;
} catch (CoreException ex) {
// be silent and return UNKNOWN_TYPE
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/.build_submit b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/.build_submit
deleted file mode 100644
index 8ea20ec..0000000
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/.build_submit
+++ /dev/null
@@ -1,4 +0,0 @@
-plugin.xml
-plugin.properties
-doc
-icons
\ No newline at end of file
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/.vcm_meta b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/.vcm_meta
index aae2e1b..fb5d12f 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/.vcm_meta
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/.vcm_meta
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<project-description>
<nature id="org.eclipse.jdt.core.javanature"/>
<builder name="org.eclipse.jdt.core.javabuilder">
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/build.properties b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/build.properties
new file mode 100644
index 0000000..d19a03c
--- /dev/null
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/build.properties
@@ -0,0 +1,2 @@
+build.source.compare.jar=Eclipse Compare
+build.includes=doc,icons,plugin.jars,plugin.properties,plugin.xml
\ No newline at end of file
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/changes.html b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/changes.html
index 262bbe5..dccac88 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/changes.html
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/changes.html
@@ -11,6 +11,34 @@
<h1>
Eclipse Platform Release Notes<br>
Compare (including example)</h1>
+Eclipse SDK Build 106 - May 14, 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>
+1GDDQN8: ITPVCM:WIN2000 - catchup compare does not show content if file starts with .<br>
+1GD7B5D: ITPVCM:ALL - no button label when comparing<br>
+
+<h2>
+Problem reports closed</h2>
+1GD3MNN: ITPVCM:WINNT - Missing icons in compare dialog<br>
+
+<h1>
+<hr WIDTH="100%"></h1>
Eclipse SDK Build 105 - May 10, 2001
<h2>
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 5804752..0a48513 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
@@ -156,8 +156,9 @@
* todayFormat MessageFormat format string if date is todays date; arg 0 is date
* yesterdayFormat MessageFormat format string if date is yesterdays date; arg 0 is date
* dayFormat MessageFormat format string if date is any other date; arg 0 is date
- * editionLabel String label for editions side of compare viewer; arg 0 is the date
- * targetLabel String label for target side of compare viewer; arg 0 is
+ * editionLabel String label for editions side of compare viewer; arg 0 is the date
+ * targetLabel String label for target side of compare viewer
+ * buttonLabel String label for OK button; default is IDialogConstants.OK_LABEL
* </pre>
*
* @param parent if not <code>null</code> the new dialog stays on top of this parent shell
@@ -492,7 +493,7 @@
* Method declared on Dialog.
*/
protected void createButtonsForButtonBar(Composite parent) {
- String buttonLabel= Utilities.getString(fBundle, "buttonLabel", "buttonLabel");
+ String buttonLabel= Utilities.getString(fBundle, "buttonLabel", IDialogConstants.OK_LABEL);
fCommitButton= createButton(parent, IDialogConstants.OK_ID, buttonLabel, true);
fCommitButton.setEnabled(false);
createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false);
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 edb6a17..fd4228f 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
@@ -618,8 +618,10 @@
String leftType= guessType(input.getLeft());
String rightType= guessType(input.getRight());
- if (leftType != null && rightType != null) {
- if (ITypedElement.TEXT_TYPE.equals(leftType) && ITypedElement.TEXT_TYPE.equals(rightType))
+ if (leftType != null || rightType != null) {
+ boolean right_text= rightType != null && ITypedElement.TEXT_TYPE.equals(rightType);
+ boolean left_text= leftType != null && ITypedElement.TEXT_TYPE.equals(leftType);
+ if ((leftType == null && right_text) || (left_text && rightType == null) || (left_text && right_text))
type= ITypedElement.TEXT_TYPE;
else
type= "binary";
@@ -689,9 +691,13 @@
InputStream is= sca.getContents();
if (is == null)
return null;
- for (int i= 0; i < 1000; i++)
- if (is.read() >= 128)
+ for (int i= 0; i < 1000; i++) {
+ int c= is.read();
+ if (c == -1) // EOF
+ break;
+ if (c >= 128)
return ITypedElement.UNKNOWN_TYPE;
+ }
return ITypedElement.TEXT_TYPE;
} catch (CoreException ex) {
// be silent and return UNKNOWN_TYPE
