Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre Weinand2001-09-18 11:19:38 -0400
committerAndre Weinand2001-09-18 11:19:38 -0400
commite1c872079681b06781d00ffd92f04e85fc4c1670 (patch)
treeb61f1359aebf70850508d43b486851d089b65284
parent1019d35412cff2963f60b0e483e2540f7444a33d (diff)
downloadeclipse.platform.team-e1c872079681b06781d00ffd92f04e85fc4c1670.tar.gz
eclipse.platform.team-e1c872079681b06781d00ffd92f04e85fc4c1670.tar.xz
eclipse.platform.team-e1c872079681b06781d00ffd92f04e85fc4c1670.zip
1GJW2TP + 1GJURWJv0_136
-rw-r--r--bundles/org.eclipse.compare/buildnotes_compare.html31
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java2
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareNavigator.java5
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java13
-rw-r--r--bundles/org.eclipse.compare/plugin.properties4
-rw-r--r--bundles/org.eclipse.compare/plugin.xml2
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html31
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java2
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareNavigator.java5
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java13
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.properties4
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.xml2
12 files changed, 90 insertions, 24 deletions
diff --git a/bundles/org.eclipse.compare/buildnotes_compare.html b/bundles/org.eclipse.compare/buildnotes_compare.html
index 23bc9628d..4c8a8f5cc 100644
--- a/bundles/org.eclipse.compare/buildnotes_compare.html
+++ b/bundles/org.eclipse.compare/buildnotes_compare.html
@@ -10,7 +10,36 @@
<h1>
Eclipse Platform Build Notes<br>
-Compare (including example)</h1>
+Compare</h1>
+Eclipse SDK Build 136, September 19th, 2001
+
+<h2>
+What's new in this drop</h2>
+Changed the shortcuts for "Goto Next Difference", "Goto Previous Difference" from
+Ctrl-D/Ctrl-Shift-D to Ctrl-Alt-N/Ctrl-Alt-P to prevent SWT tree from beeping.
+
+<h3>
+API changes</h3>
+
+<h3>
+API Additions</h3>
+
+<h3>
+Other highlights</h3>
+
+<h2>
+Known deficiencies</h2>
+
+<h2>
+Problem reports fixed</h2>
+1GJW2TP: ITPJUI:WIN2000 - java compare: why beep every time?<br>
+1GJURWJ: ITPUI:WIN2000 - Hebrew + Japanese: compare view defaults to binary
+
+<h2>
+Problem reports closed</h2>
+
+<h1>
+<hr WIDTH="100%"></h1>
Eclipse SDK Build 135, September 6th, 2001
<h2>
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
index ab8bce267..c9e8aec48 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
@@ -2389,8 +2389,6 @@ public class TextMergeViewer extends ContentMergeViewer {
int vh= te.getClientArea().height;
if (vh == 0) {
- // seems to be a bug in TextEditor.getClientArea(): returns bogus value on first
- // call; as a workaround we calculate the clientArea from its container...
Rectangle trim= te.computeTrim(0, 0, 0, 0);
int scrollbarHeight= trim.height;
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareNavigator.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareNavigator.java
index 8130731b1..603973494 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareNavigator.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareNavigator.java
@@ -91,11 +91,12 @@ public class CompareNavigator {
}
public static void handleNavigationKeys(KeyEvent e) {
- if (e.character == 4) { // Control-D
+ if ((e.stateMask & SWT.ALT) != 0 &&
+ e.character == ('N'-0x40) || e.character == ('P'-0x40)) { // Control-N/P
if (e.widget instanceof Control) {
CompareNavigator nav= findNavigator((Control)e.widget);
if (nav != null)
- nav.selectChange((e.stateMask & SWT.SHIFT) == 0);
+ nav.selectChange(e.character == ('N'-0x40));
}
}
}
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 0520d425f..7d53c2d69 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
@@ -676,8 +676,8 @@ public final class CompareUIPlugin extends AbstractUIPlugin {
/**
* Guesses the file type of the given input.
- * Returns ITypedElement.TEXT_TYPE if the first 1000 bytes contain only values in the range 0-127.
- * Returns ITypedElement.UNKNOWN_TYPE if a single byte is out of this range.
+ * Returns ITypedElement.TEXT_TYPE if no line is longer than 1000 bytes.
+ * Returns ITypedElement.UNKNOWN_TYPE if a line is longer that 1000 bytes.
* Returns <code>null</code> if the input isn't an <code>IStreamContentAccessor</code>.
*/
private static String guessType(ITypedElement input) {
@@ -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' || c == '\r') // reset line length
+ lineLength= 0;
+ else
+ lineLength++;
+ if (lineLength > 1000)
return ITypedElement.UNKNOWN_TYPE;
}
return ITypedElement.TEXT_TYPE;
diff --git a/bundles/org.eclipse.compare/plugin.properties b/bundles/org.eclipse.compare/plugin.properties
index e9c6b1580..0e10d95ec 100644
--- a/bundles/org.eclipse.compare/plugin.properties
+++ b/bundles/org.eclipse.compare/plugin.properties
@@ -65,11 +65,11 @@ action.IgnoreWhiteSpace.tooltip=Ignore White Space where Applicable
action.IgnoreWhiteSpace.image=etool16/ignorews_edit.gif
action.Next.label=Next Difference
-action.Next.tooltip=Go to Next Difference Ctrl+D
+action.Next.tooltip=Go to Next Difference Ctrl+Alt+N
action.Next.image=elcl16/next_nav.gif
action.Previous.label=Previous Difference
-action.Previous.tooltip=Go to Previous Difference Ctrl+Shift+D
+action.Previous.tooltip=Go to Previous Difference Ctrl+Alt+P
action.Previous.image=elcl16/prev_nav.gif
#
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 23bc9628d..4c8a8f5cc 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
@@ -10,7 +10,36 @@
<h1>
Eclipse Platform Build Notes<br>
-Compare (including example)</h1>
+Compare</h1>
+Eclipse SDK Build 136, September 19th, 2001
+
+<h2>
+What's new in this drop</h2>
+Changed the shortcuts for "Goto Next Difference", "Goto Previous Difference" from
+Ctrl-D/Ctrl-Shift-D to Ctrl-Alt-N/Ctrl-Alt-P to prevent SWT tree from beeping.
+
+<h3>
+API changes</h3>
+
+<h3>
+API Additions</h3>
+
+<h3>
+Other highlights</h3>
+
+<h2>
+Known deficiencies</h2>
+
+<h2>
+Problem reports fixed</h2>
+1GJW2TP: ITPJUI:WIN2000 - java compare: why beep every time?<br>
+1GJURWJ: ITPUI:WIN2000 - Hebrew + Japanese: compare view defaults to binary
+
+<h2>
+Problem reports closed</h2>
+
+<h1>
+<hr WIDTH="100%"></h1>
Eclipse SDK Build 135, September 6th, 2001
<h2>
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
index ab8bce267..c9e8aec48 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
@@ -2389,8 +2389,6 @@ public class TextMergeViewer extends ContentMergeViewer {
int vh= te.getClientArea().height;
if (vh == 0) {
- // seems to be a bug in TextEditor.getClientArea(): returns bogus value on first
- // call; as a workaround we calculate the clientArea from its container...
Rectangle trim= te.computeTrim(0, 0, 0, 0);
int scrollbarHeight= trim.height;
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareNavigator.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareNavigator.java
index 8130731b1..603973494 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareNavigator.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareNavigator.java
@@ -91,11 +91,12 @@ public class CompareNavigator {
}
public static void handleNavigationKeys(KeyEvent e) {
- if (e.character == 4) { // Control-D
+ if ((e.stateMask & SWT.ALT) != 0 &&
+ e.character == ('N'-0x40) || e.character == ('P'-0x40)) { // Control-N/P
if (e.widget instanceof Control) {
CompareNavigator nav= findNavigator((Control)e.widget);
if (nav != null)
- nav.selectChange((e.stateMask & SWT.SHIFT) == 0);
+ nav.selectChange(e.character == ('N'-0x40));
}
}
}
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 0520d425f..7d53c2d69 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
@@ -676,8 +676,8 @@ public final class CompareUIPlugin extends AbstractUIPlugin {
/**
* Guesses the file type of the given input.
- * Returns ITypedElement.TEXT_TYPE if the first 1000 bytes contain only values in the range 0-127.
- * Returns ITypedElement.UNKNOWN_TYPE if a single byte is out of this range.
+ * Returns ITypedElement.TEXT_TYPE if no line is longer than 1000 bytes.
+ * Returns ITypedElement.UNKNOWN_TYPE if a line is longer that 1000 bytes.
* Returns <code>null</code> if the input isn't an <code>IStreamContentAccessor</code>.
*/
private static String guessType(ITypedElement input) {
@@ -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' || c == '\r') // reset line length
+ 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.properties b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.properties
index e9c6b1580..0e10d95ec 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.properties
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.properties
@@ -65,11 +65,11 @@ action.IgnoreWhiteSpace.tooltip=Ignore White Space where Applicable
action.IgnoreWhiteSpace.image=etool16/ignorews_edit.gif
action.Next.label=Next Difference
-action.Next.tooltip=Go to Next Difference Ctrl+D
+action.Next.tooltip=Go to Next Difference Ctrl+Alt+N
action.Next.image=elcl16/next_nav.gif
action.Previous.label=Previous Difference
-action.Previous.tooltip=Go to Previous Difference Ctrl+Shift+D
+action.Previous.tooltip=Go to Previous Difference Ctrl+Alt+P
action.Previous.image=elcl16/prev_nav.gif
#
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

Back to the top