Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre Weinand2004-04-30 12:15:49 -0400
committerAndre Weinand2004-04-30 12:15:49 -0400
commit95fb880b83e598f5ba3870bd9b8f678396d3fdbc (patch)
tree2fdaf3a97bdad1250fb0dded7f62ddc7e8e8d31c
parent5a233cb177dc44023f2c24cf0601b37577ef13e3 (diff)
downloadeclipse.platform.team-95fb880b83e598f5ba3870bd9b8f678396d3fdbc.tar.gz
eclipse.platform.team-95fb880b83e598f5ba3870bd9b8f678396d3fdbc.tar.xz
eclipse.platform.team-95fb880b83e598f5ba3870bd9b8f678396d3fdbc.zip
work on "Copy All Non-conflicting..." problem
-rw-r--r--bundles/org.eclipse.compare/buildnotes_compare.html7
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java5
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html7
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java5
4 files changed, 18 insertions, 6 deletions
diff --git a/bundles/org.eclipse.compare/buildnotes_compare.html b/bundles/org.eclipse.compare/buildnotes_compare.html
index 7832f7014..eb2be695f 100644
--- a/bundles/org.eclipse.compare/buildnotes_compare.html
+++ b/bundles/org.eclipse.compare/buildnotes_compare.html
@@ -12,6 +12,13 @@
<h1>
Eclipse Platform Build Notes<br>
Compare</h1>
+Eclipse Build Input May 4th 2004
+
+<h2>
+Problem reports fixed</h2>
+
+<h1>
+<hr WIDTH="100%"></h1>
Eclipse Build Input April 27th 2004
<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 ebff2b89e..384cdafb5 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
@@ -236,7 +236,7 @@ public class TextMergeViewer extends ContentMergeViewer {
private boolean fUseSplines= true;
private boolean fUseSingleLine= true;
- private boolean fUseResolveUI= fUseSingleLine; // resolve UI only for single lines private boolean fShowSummeryIcon;
+ private boolean fUseResolveUI= true;
private String fSymbolicFontName;
@@ -681,7 +681,6 @@ public class TextMergeViewer extends ContentMergeViewer {
fShowPseudoConflicts= fPreferenceStore.getBoolean(ComparePreferencePage.SHOW_PSEUDO_CONFLICTS);
//fUseSplines= fPreferenceStore.getBoolean(ComparePreferencePage.USE_SPLINES);
fUseSingleLine= fPreferenceStore.getBoolean(ComparePreferencePage.USE_SINGLE_LINE);
- fUseResolveUI= fUseSingleLine;
//fUseResolveUI= fPreferenceStore.getBoolean(ComparePreferencePage.USE_RESOLVE_UI);
}
@@ -3005,7 +3004,7 @@ public class TextMergeViewer extends ContentMergeViewer {
} else if (key.equals(ComparePreferencePage.USE_SINGLE_LINE)) {
fUseSingleLine= fPreferenceStore.getBoolean(ComparePreferencePage.USE_SINGLE_LINE);
- fUseResolveUI= fUseSingleLine;
+// fUseResolveUI= fUseSingleLine;
fBasicCenterCurve= null;
updateResolveStatus();
invalidateLines();
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 7832f7014..eb2be695f 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
@@ -12,6 +12,13 @@
<h1>
Eclipse Platform Build Notes<br>
Compare</h1>
+Eclipse Build Input May 4th 2004
+
+<h2>
+Problem reports fixed</h2>
+
+<h1>
+<hr WIDTH="100%"></h1>
Eclipse Build Input April 27th 2004
<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 ebff2b89e..384cdafb5 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
@@ -236,7 +236,7 @@ public class TextMergeViewer extends ContentMergeViewer {
private boolean fUseSplines= true;
private boolean fUseSingleLine= true;
- private boolean fUseResolveUI= fUseSingleLine; // resolve UI only for single lines private boolean fShowSummeryIcon;
+ private boolean fUseResolveUI= true;
private String fSymbolicFontName;
@@ -681,7 +681,6 @@ public class TextMergeViewer extends ContentMergeViewer {
fShowPseudoConflicts= fPreferenceStore.getBoolean(ComparePreferencePage.SHOW_PSEUDO_CONFLICTS);
//fUseSplines= fPreferenceStore.getBoolean(ComparePreferencePage.USE_SPLINES);
fUseSingleLine= fPreferenceStore.getBoolean(ComparePreferencePage.USE_SINGLE_LINE);
- fUseResolveUI= fUseSingleLine;
//fUseResolveUI= fPreferenceStore.getBoolean(ComparePreferencePage.USE_RESOLVE_UI);
}
@@ -3005,7 +3004,7 @@ public class TextMergeViewer extends ContentMergeViewer {
} else if (key.equals(ComparePreferencePage.USE_SINGLE_LINE)) {
fUseSingleLine= fPreferenceStore.getBoolean(ComparePreferencePage.USE_SINGLE_LINE);
- fUseResolveUI= fUseSingleLine;
+// fUseResolveUI= fUseSingleLine;
fBasicCenterCurve= null;
updateResolveStatus();
invalidateLines();

Back to the top