1GDRI70: ITPUI:ALL - TextMergeViewer highlight problems
diff --git a/bundles/org.eclipse.compare/build.properties b/bundles/org.eclipse.compare/build.properties
index d19a03c..d025c15 100644
--- a/bundles/org.eclipse.compare/build.properties
+++ b/bundles/org.eclipse.compare/build.properties
@@ -1,2 +1,2 @@
build.source.compare.jar=Eclipse Compare
-build.includes=doc,icons,plugin.jars,plugin.properties,plugin.xml
\ No newline at end of file
+build.includes=doc,exportplugin.xml,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 dccac88..e365e17 100644
--- a/bundles/org.eclipse.compare/compare/changes.html
+++ b/bundles/org.eclipse.compare/compare/changes.html
@@ -11,6 +11,32 @@
<h1>
Eclipse Platform Release Notes<br>
Compare (including example)</h1>
+Eclipse SDK Build 107 - May 17, 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>
+1GDRI70: ITPUI:ALL - TextMergeViewer highlight problems<br>
+
+<h2>
+Problem reports closed</h2>
+
+<h1>
+<hr WIDTH="100%"></h1>
Eclipse SDK Build 106 - May 14, 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 945f9f9..0a3ec05 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
@@ -99,6 +99,17 @@
* @see org.eclipse.compare.IStreamContentAccessor
*/
public class TextMergeViewer extends ContentMergeViewer {
+
+ private static final String[] GLOBAL_ACTIONS= {
+ ' ' + IWorkbenchActionConstants.UNDO,
+ ' ' + IWorkbenchActionConstants.REDO,
+ ' ' + IWorkbenchActionConstants.CUT,
+ 'r' + IWorkbenchActionConstants.COPY,
+ ' ' + IWorkbenchActionConstants.PASTE,
+ ' ' + IWorkbenchActionConstants.DELETE,
+ 'r' + IWorkbenchActionConstants.SELECT_ALL,
+ 'r' + IWorkbenchActionConstants.FIND
+ };
private static final String MY_UPDATER= "my_updater";
@@ -492,6 +503,7 @@
}
/* package */ boolean internalSetFocus() {
+ //System.out.println("internalSetFocus: ");
if (fFocusPart != null) {
StyledText st= fFocusPart.getTextWidget();
if (st != null)
@@ -635,18 +647,8 @@
return action;
}
- void connectGlobalActions(MergeSourceViewer part) {
- String[] GLOBAL_ACTIONS= {
- ' ' + IWorkbenchActionConstants.UNDO,
- ' ' + IWorkbenchActionConstants.REDO,
- ' ' + IWorkbenchActionConstants.CUT,
- 'r' + IWorkbenchActionConstants.COPY,
- ' ' + IWorkbenchActionConstants.PASTE,
- ' ' + IWorkbenchActionConstants.DELETE,
- 'r' + IWorkbenchActionConstants.SELECT_ALL,
- 'r' + IWorkbenchActionConstants.FIND
- };
-
+ void connectGlobalActions2(MergeSourceViewer part) {
+ System.out.println("connectGlobalActions: " + part);
IActionBars actionBars= CompareEditor.findActionBars(fComposite);
if (actionBars != null) {
for (int i= 0; i < GLOBAL_ACTIONS.length; i++) {
@@ -655,12 +657,12 @@
Action action= null;
if (part != null && (part.isEditable() || tag == 'r'))
action= getAction(part, name);
- if (action instanceof IUpdate) {
- ((IUpdate)action).update();
- if (!action.isEnabled())
- action= null;
- }
+
actionBars.setGlobalActionHandler(name, action);
+
+// if (action instanceof IUpdate) {
+// ((IUpdate)action).update();
+// }
}
actionBars.updateActionBars();
}
@@ -1117,10 +1119,7 @@
if (count <= 0)
return tc.getTokenStart(start);
int index= start + count - 1;
- int l= tc.getTokenLength(index);
- if (l < 0)
- System.out.println("getTokenEnd: l < 0");
- return tc.getTokenStart(index) + l;
+ return tc.getTokenStart(index) + tc.getTokenLength(index);
}
/**
@@ -1131,7 +1130,6 @@
IDocument rightDoc, String d,
IDocument leftDoc, String s) {
-
int ancestorStart= 0;
int ancestorEnd= 0;
ITokenComparator sa= null;
@@ -1507,7 +1505,6 @@
IPreferenceStore ps= CompareUIPlugin.getDefault().getPreferenceStore();
boolean b= ps.getBoolean(ComparePreferencePage.SYNCHRONIZE_SCROLLING);
-
//boolean b= Utilities.getBoolean(getCompareConfiguration(), SYNC_SCROLLING, true);
if (b != fSynchronizedScrolling)
toggleSynchMode();
@@ -1964,10 +1961,8 @@
fCurrentDiff= d;
}
- if (d != null && !d.fIsToken) {
- updateDiffBackground(oldDiff);
- updateDiffBackground(fCurrentDiff);
- }
+ updateDiffBackground(oldDiff);
+ updateDiffBackground(fCurrentDiff);
updateControls();
invalidateLines();
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewerResources.properties b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewerResources.properties
index d993980..2f66ebf 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewerResources.properties
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewerResources.properties
@@ -15,23 +15,23 @@
#####################################################
# Status messages
#####################################################
-status.same=No Change
-status.resolved=Resolved
-status.unresolved=Unresolved
-status.allresolved=All Resolved
+#status.same=No Change
+#status.resolved=Resolved
+#status.unresolved=Unresolved
+#status.allresolved=All Resolved
-status.unresolvedformat={0} (remaining differences: {1})
-status.resolvedformat={0}
+#status.unresolvedformat={0} (remaining differences: {1})
+#status.resolvedformat={0}
#####################################################
# Dialogs
#####################################################
-CantSaveProperty.title=Error while saving contents
-CantSaveProperty.message=Couldn''t save contents.\nReason: {0}
+#CantSaveProperty.title=Error while saving contents
+#CantSaveProperty.message=Couldn''t save contents.\nReason: {0}
-ContentInaccessible.title=Error while accessing content
-ContentInaccessible.message=Content currently inaccessible.
+#ContentInaccessible.title=Error while accessing content
+#ContentInaccessible.message=Content currently inaccessible.
#####################################################
# Actions
@@ -65,9 +65,9 @@
action.EnableAncestor.tooltip=Controls visibility of ancestor pane
action.EnableAncestor.image=ancestorpane_co.gif
-action.SynchMode.label=Synchonize Panes
-action.SynchMode.tooltip=Synchonize pane scrolling
-action.SynchMode.image=syncpane_co.gif
+#action.SynchMode.label=Synchonize Panes
+#action.SynchMode.tooltip=Synchonize pane scrolling
+#action.SynchMode.image=syncpane_co.gif
# Pop up menu
@@ -92,8 +92,8 @@
action.selectAll.label=Select All@Ctrl+A
action.selectAll.tooltip=Select all Changes
-action.save.label=Save@Ctrl+S
-action.save.tooltip=Save Changes
+#action.save.label=Save@Ctrl+S
+#action.save.tooltip=Save Changes
action.undo.label=Undo@Ctrl+Z
action.undo.tooltip=Undo last Operation
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/build.properties b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/build.properties
index d19a03c..d025c15 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/build.properties
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/build.properties
@@ -1,2 +1,2 @@
build.source.compare.jar=Eclipse Compare
-build.includes=doc,icons,plugin.jars,plugin.properties,plugin.xml
\ No newline at end of file
+build.includes=doc,exportplugin.xml,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 dccac88..e365e17 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,32 @@
<h1>
Eclipse Platform Release Notes<br>
Compare (including example)</h1>
+Eclipse SDK Build 107 - May 17, 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>
+1GDRI70: ITPUI:ALL - TextMergeViewer highlight problems<br>
+
+<h2>
+Problem reports closed</h2>
+
+<h1>
+<hr WIDTH="100%"></h1>
Eclipse SDK Build 106 - May 14, 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 945f9f9..0a3ec05 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
@@ -99,6 +99,17 @@
* @see org.eclipse.compare.IStreamContentAccessor
*/
public class TextMergeViewer extends ContentMergeViewer {
+
+ private static final String[] GLOBAL_ACTIONS= {
+ ' ' + IWorkbenchActionConstants.UNDO,
+ ' ' + IWorkbenchActionConstants.REDO,
+ ' ' + IWorkbenchActionConstants.CUT,
+ 'r' + IWorkbenchActionConstants.COPY,
+ ' ' + IWorkbenchActionConstants.PASTE,
+ ' ' + IWorkbenchActionConstants.DELETE,
+ 'r' + IWorkbenchActionConstants.SELECT_ALL,
+ 'r' + IWorkbenchActionConstants.FIND
+ };
private static final String MY_UPDATER= "my_updater";
@@ -492,6 +503,7 @@
}
/* package */ boolean internalSetFocus() {
+ //System.out.println("internalSetFocus: ");
if (fFocusPart != null) {
StyledText st= fFocusPart.getTextWidget();
if (st != null)
@@ -635,18 +647,8 @@
return action;
}
- void connectGlobalActions(MergeSourceViewer part) {
- String[] GLOBAL_ACTIONS= {
- ' ' + IWorkbenchActionConstants.UNDO,
- ' ' + IWorkbenchActionConstants.REDO,
- ' ' + IWorkbenchActionConstants.CUT,
- 'r' + IWorkbenchActionConstants.COPY,
- ' ' + IWorkbenchActionConstants.PASTE,
- ' ' + IWorkbenchActionConstants.DELETE,
- 'r' + IWorkbenchActionConstants.SELECT_ALL,
- 'r' + IWorkbenchActionConstants.FIND
- };
-
+ void connectGlobalActions2(MergeSourceViewer part) {
+ System.out.println("connectGlobalActions: " + part);
IActionBars actionBars= CompareEditor.findActionBars(fComposite);
if (actionBars != null) {
for (int i= 0; i < GLOBAL_ACTIONS.length; i++) {
@@ -655,12 +657,12 @@
Action action= null;
if (part != null && (part.isEditable() || tag == 'r'))
action= getAction(part, name);
- if (action instanceof IUpdate) {
- ((IUpdate)action).update();
- if (!action.isEnabled())
- action= null;
- }
+
actionBars.setGlobalActionHandler(name, action);
+
+// if (action instanceof IUpdate) {
+// ((IUpdate)action).update();
+// }
}
actionBars.updateActionBars();
}
@@ -1117,10 +1119,7 @@
if (count <= 0)
return tc.getTokenStart(start);
int index= start + count - 1;
- int l= tc.getTokenLength(index);
- if (l < 0)
- System.out.println("getTokenEnd: l < 0");
- return tc.getTokenStart(index) + l;
+ return tc.getTokenStart(index) + tc.getTokenLength(index);
}
/**
@@ -1131,7 +1130,6 @@
IDocument rightDoc, String d,
IDocument leftDoc, String s) {
-
int ancestorStart= 0;
int ancestorEnd= 0;
ITokenComparator sa= null;
@@ -1507,7 +1505,6 @@
IPreferenceStore ps= CompareUIPlugin.getDefault().getPreferenceStore();
boolean b= ps.getBoolean(ComparePreferencePage.SYNCHRONIZE_SCROLLING);
-
//boolean b= Utilities.getBoolean(getCompareConfiguration(), SYNC_SCROLLING, true);
if (b != fSynchronizedScrolling)
toggleSynchMode();
@@ -1964,10 +1961,8 @@
fCurrentDiff= d;
}
- if (d != null && !d.fIsToken) {
- updateDiffBackground(oldDiff);
- updateDiffBackground(fCurrentDiff);
- }
+ updateDiffBackground(oldDiff);
+ updateDiffBackground(fCurrentDiff);
updateControls();
invalidateLines();
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewerResources.properties b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewerResources.properties
index d993980..2f66ebf 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewerResources.properties
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewerResources.properties
@@ -15,23 +15,23 @@
#####################################################
# Status messages
#####################################################
-status.same=No Change
-status.resolved=Resolved
-status.unresolved=Unresolved
-status.allresolved=All Resolved
+#status.same=No Change
+#status.resolved=Resolved
+#status.unresolved=Unresolved
+#status.allresolved=All Resolved
-status.unresolvedformat={0} (remaining differences: {1})
-status.resolvedformat={0}
+#status.unresolvedformat={0} (remaining differences: {1})
+#status.resolvedformat={0}
#####################################################
# Dialogs
#####################################################
-CantSaveProperty.title=Error while saving contents
-CantSaveProperty.message=Couldn''t save contents.\nReason: {0}
+#CantSaveProperty.title=Error while saving contents
+#CantSaveProperty.message=Couldn''t save contents.\nReason: {0}
-ContentInaccessible.title=Error while accessing content
-ContentInaccessible.message=Content currently inaccessible.
+#ContentInaccessible.title=Error while accessing content
+#ContentInaccessible.message=Content currently inaccessible.
#####################################################
# Actions
@@ -65,9 +65,9 @@
action.EnableAncestor.tooltip=Controls visibility of ancestor pane
action.EnableAncestor.image=ancestorpane_co.gif
-action.SynchMode.label=Synchonize Panes
-action.SynchMode.tooltip=Synchonize pane scrolling
-action.SynchMode.image=syncpane_co.gif
+#action.SynchMode.label=Synchonize Panes
+#action.SynchMode.tooltip=Synchonize pane scrolling
+#action.SynchMode.image=syncpane_co.gif
# Pop up menu
@@ -92,8 +92,8 @@
action.selectAll.label=Select All@Ctrl+A
action.selectAll.tooltip=Select all Changes
-action.save.label=Save@Ctrl+S
-action.save.tooltip=Save Changes
+#action.save.label=Save@Ctrl+S
+#action.save.tooltip=Save Changes
action.undo.label=Undo@Ctrl+Z
action.undo.tooltip=Undo last Operation
