diff options
14 files changed, 126 insertions, 72 deletions
diff --git a/bundles/org.eclipse.compare/.classpath b/bundles/org.eclipse.compare/.classpath index 5655a5e90..ec08fb8ee 100644 --- a/bundles/org.eclipse.compare/.classpath +++ b/bundles/org.eclipse.compare/.classpath @@ -6,8 +6,7 @@ <classpathentry kind="lib" path="/org.eclipse.core.runtime/runtime.jar" sourcepath="/org.eclipse.core.runtime/runtimesrc.zip"/> <classpathentry kind="lib" path="/org.eclipse.core.resources/resources.jar"/> - <classpathentry kind="lib" path="/org.eclipse.help/help.jar" - rootpath="" sourcepath="/org.eclipse.help/helpsrc.zip"/> + <classpathentry kind="lib" path="/org.eclipse.help/help.jar" sourcepath="/org.eclipse.help/helpsrc.zip"/> <classpathentry kind="var" path="JRE_LIB"/> <classpathentry kind="lib" path="/org.eclipse.swt/swt.jar" sourcepath="/org.eclipse.swt/swtsrc.zip"/> <classpathentry kind="output" path="bin"/> diff --git a/bundles/org.eclipse.compare/buildnotes_compare.html b/bundles/org.eclipse.compare/buildnotes_compare.html index 7f36ae486..8bb5c9a86 100644 --- a/bundles/org.eclipse.compare/buildnotes_compare.html +++ b/bundles/org.eclipse.compare/buildnotes_compare.html @@ -45,9 +45,12 @@ Problem reports fixed</h2> 1GBM0IL: ITPUI:WINNT - CompareEditorInput#save should throw CoreException<br>
1GI99LE: ITPUI:ALL - Compare viewer does not show last line when horizontal scroll bar is present<br>
1GBB34N: ITPJUI:WIN2000 - Compare Viewer doesn't scroll to last line<br>
+1GGZ8DO: ITPJUI:WIN - MergeViewer invalid selection range<br>
+1GIIBHM: ITPUI:WIN2000 - Problems when comparing zip files<br>
<h2>
Problem reports closed</h2>
+1GF9Y9C: ITPUI:WIN2000 - DCR: only get ancestor pane contents if pane is visible<br>
<h1>
<hr WIDTH="100%"></h1>
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 e15e6353b..d216df6f8 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java @@ -146,13 +146,16 @@ public class EditionSelectionDialog extends Dialog { }
}
+ // Configuration options
+ /** use a side-by-side compare viewer */
+ private boolean fCompare= true;
+ /** show target on right hand side */
+ private boolean fTargetIsRight= false;
+ /** hide entries which have identical content */
private boolean fHideIdentical= true;
-
- private Button fCommitButton;
+ /** replace mode */
private boolean fReplaceMode= true;
-
- private ResourceBundle fBundle;
- private boolean fTargetIsRight= false;
+ private CompareConfiguration fCompareConfiguration;
/**
* Maps from members to their corresponding editions.
@@ -162,21 +165,20 @@ public class EditionSelectionDialog extends Dialog { /** The editions of the current selected member */
private List fCurrentEditions;
private Thread fThread;
-
+ private ResourceBundle fBundle;
private Pair fTargetPair;
/** The selected edition in the edition viewer */
private ITypedElement fSelectedItem;
+ // SWT controls
+ private CompareViewerSwitchingPane fContentPane;
+ private Button fCommitButton;
private Table fMemberTable;
private Pane fMemberPane;
-
private Tree fEditionTree;
private Pane fEditionPane;
private Image fDateImage;
- private Image fTimeImage;
-
- private CompareViewerSwitchingPane fContentPane;
- private CompareConfiguration fCompareConfiguration;
+ private Image fTimeImage;
/**
* Creates a new modal, resizable dialog.
@@ -533,7 +535,7 @@ public class EditionSelectionDialog extends Dialog { fContentPane= new CompareViewerSwitchingPane(vsplitter, SWT.NONE) {
protected Viewer getViewer(Viewer oldViewer, Object input) {
- return CompareUIPlugin.findContentViewer(oldViewer, input, this, fCompareConfiguration);
+ return CompareUIPlugin.findContentViewer(oldViewer, input, this, fCompareConfiguration);
}
};
vsplitter.setWeights(new int[] { 30, 70 });
@@ -768,6 +770,17 @@ public class EditionSelectionDialog extends Dialog { }
}
+ private void setInput(Object input) {
+ if (!fCompare && input instanceof ICompareInput) {
+ ICompareInput ci= (ICompareInput) input;
+ if (fTargetIsRight)
+ input= ci.getLeft();
+ else
+ input= ci.getRight();
+ }
+ fContentPane.setInput(input);
+ }
+
/*
* Feeds selection from edition viewer to content viewer.
*/
@@ -780,20 +793,20 @@ public class EditionSelectionDialog extends Dialog { String editionLabel= getEditionLabel(pair.getEdition(), fSelectedItem);
if (!fReplaceMode) {
- fContentPane.setInput(fSelectedItem);
+ setInput(fSelectedItem);
fContentPane.setText(editionLabel);
} else {
if (fTargetIsRight) {
fCompareConfiguration.setLeftLabel(editionLabel);
- fContentPane.setInput(new DiffNode(fSelectedItem, fTargetPair.getItem()));
+ setInput(new DiffNode(fSelectedItem, fTargetPair.getItem()));
} else {
fCompareConfiguration.setRightLabel(editionLabel);
- fContentPane.setInput(new DiffNode(fTargetPair.getItem(), fSelectedItem));
+ setInput(new DiffNode(fTargetPair.getItem(), fSelectedItem));
}
}
} else {
fSelectedItem= null;
- fContentPane.setInput(null);
+ setInput(null);
}
if (fCommitButton != null)
fCommitButton.setEnabled(fSelectedItem != null);
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 995417ae1..458c07d1e 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 @@ -2510,18 +2510,18 @@ public class TextMergeViewer extends ContentMergeViewer { */
private void updateVScrollBar() {
- if (Utilities.okToUse(fVScrollBar) && fSynchronizedScrolling /* && fVScrollBar.isVisible() */) {
- int selection= fVScrollBar.getSelection();
+ if (Utilities.okToUse(fVScrollBar) && fSynchronizedScrolling) {
+// int selection= fVScrollBar.getSelection();
int virtualHeight= getVirtualHeight();
int viewPortHeight= getViewportHeight();
int pageIncrement= viewPortHeight-1;
int thumb= (viewPortHeight > virtualHeight) ? virtualHeight : viewPortHeight;
-// fVScrollBar.setPageIncrement(pageIncrement);
-// fVScrollBar.setMaximum(virtualHeight); // XXX: sometimes the last line isn't visible
-// fVScrollBar.setThumb(thumb);
+ fVScrollBar.setPageIncrement(pageIncrement);
+ fVScrollBar.setMaximum(virtualHeight); // XXX: sometimes the last line isn't visible
+ fVScrollBar.setThumb(thumb);
- fVScrollBar.setValues(selection, 0, virtualHeight, thumb, 1, pageIncrement);
+ //fVScrollBar.setValues(selection, 0, virtualHeight, thumb, 1, pageIncrement);
}
}
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..6c1e8a789 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 @@ -628,7 +628,7 @@ public final class CompareUIPlugin extends AbstractUIPlugin { }
return null;
}
-
+
/**
* Determines the type of the given threeway input by analyzing
* the types (file extension) of the individual parts.
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ZipStructureCreator.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ZipStructureCreator.java index 16e808f76..90d74d176 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ZipStructureCreator.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ZipStructureCreator.java @@ -140,6 +140,19 @@ public class ZipStructureCreator implements IStructureCreator { void setBytes(byte[] buffer) {
fContents= buffer;
}
+
+ void appendBytes(byte[] buffer, int length) {
+ if (length > 0) {
+ int oldLen= 0;
+ if (fContents != null)
+ oldLen= fContents.length;
+ byte[] newBuf= new byte[oldLen + length];
+ if (oldLen > 0)
+ System.arraycopy(fContents, 0, newBuf, 0, oldLen);
+ System.arraycopy(buffer, 0, newBuf, oldLen, length);
+ fContents= newBuf;
+ }
+ }
}
private String fTitle;
@@ -193,6 +206,13 @@ public class ZipStructureCreator implements IStructureCreator { } while (length > 0);
ze.setBytes(buffer);
+ } else {
+ byte[] buffer= new byte[1024];
+ int n;
+ do {
+ n= zip.read(buffer, 0, 1024);
+ ze.appendBytes(buffer, n);
+ } while (n >= 0);
}
}
zip.closeEntry();
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java index 9096c3dde..0e9994aae 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java @@ -315,16 +315,8 @@ public class DiffTreeViewer extends TreeViewer { super.inputChanged(in, oldInput);
//expandToLevel(2);
-// Control c= getControl();
-// Display display= c.getDisplay();
-// display.asyncExec(
-// new Runnable() {
-// public void run() {
- navigate(true);
- updateActions();
-// }
-// }
-// );
+ navigate(true);
+ updateActions();
}
/**
@@ -362,7 +354,7 @@ public class DiffTreeViewer extends TreeViewer { // };
// Utilities.initAction(fCopyLeftToRightAction, fBundle, "action.TakeLeft.");
// toolbarManager.appendToGroup("merge", fCopyLeftToRightAction);
-//
+
// fCopyRightToLeftAction= new Action() {
// public void run() {
// copySelected(false);
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/.classpath b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/.classpath index 5655a5e90..ec08fb8ee 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/.classpath +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/.classpath @@ -6,8 +6,7 @@ <classpathentry kind="lib" path="/org.eclipse.core.runtime/runtime.jar" sourcepath="/org.eclipse.core.runtime/runtimesrc.zip"/> <classpathentry kind="lib" path="/org.eclipse.core.resources/resources.jar"/> - <classpathentry kind="lib" path="/org.eclipse.help/help.jar" - rootpath="" sourcepath="/org.eclipse.help/helpsrc.zip"/> + <classpathentry kind="lib" path="/org.eclipse.help/help.jar" sourcepath="/org.eclipse.help/helpsrc.zip"/> <classpathentry kind="var" path="JRE_LIB"/> <classpathentry kind="lib" path="/org.eclipse.swt/swt.jar" sourcepath="/org.eclipse.swt/swtsrc.zip"/> <classpathentry kind="output" path="bin"/> 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 7f36ae486..8bb5c9a86 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 @@ -45,9 +45,12 @@ Problem reports fixed</h2> 1GBM0IL: ITPUI:WINNT - CompareEditorInput#save should throw CoreException<br>
1GI99LE: ITPUI:ALL - Compare viewer does not show last line when horizontal scroll bar is present<br>
1GBB34N: ITPJUI:WIN2000 - Compare Viewer doesn't scroll to last line<br>
+1GGZ8DO: ITPJUI:WIN - MergeViewer invalid selection range<br>
+1GIIBHM: ITPUI:WIN2000 - Problems when comparing zip files<br>
<h2>
Problem reports closed</h2>
+1GF9Y9C: ITPUI:WIN2000 - DCR: only get ancestor pane contents if pane is visible<br>
<h1>
<hr WIDTH="100%"></h1>
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 e15e6353b..d216df6f8 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 @@ -146,13 +146,16 @@ public class EditionSelectionDialog extends Dialog { }
}
+ // Configuration options
+ /** use a side-by-side compare viewer */
+ private boolean fCompare= true;
+ /** show target on right hand side */
+ private boolean fTargetIsRight= false;
+ /** hide entries which have identical content */
private boolean fHideIdentical= true;
-
- private Button fCommitButton;
+ /** replace mode */
private boolean fReplaceMode= true;
-
- private ResourceBundle fBundle;
- private boolean fTargetIsRight= false;
+ private CompareConfiguration fCompareConfiguration;
/**
* Maps from members to their corresponding editions.
@@ -162,21 +165,20 @@ public class EditionSelectionDialog extends Dialog { /** The editions of the current selected member */
private List fCurrentEditions;
private Thread fThread;
-
+ private ResourceBundle fBundle;
private Pair fTargetPair;
/** The selected edition in the edition viewer */
private ITypedElement fSelectedItem;
+ // SWT controls
+ private CompareViewerSwitchingPane fContentPane;
+ private Button fCommitButton;
private Table fMemberTable;
private Pane fMemberPane;
-
private Tree fEditionTree;
private Pane fEditionPane;
private Image fDateImage;
- private Image fTimeImage;
-
- private CompareViewerSwitchingPane fContentPane;
- private CompareConfiguration fCompareConfiguration;
+ private Image fTimeImage;
/**
* Creates a new modal, resizable dialog.
@@ -533,7 +535,7 @@ public class EditionSelectionDialog extends Dialog { fContentPane= new CompareViewerSwitchingPane(vsplitter, SWT.NONE) {
protected Viewer getViewer(Viewer oldViewer, Object input) {
- return CompareUIPlugin.findContentViewer(oldViewer, input, this, fCompareConfiguration);
+ return CompareUIPlugin.findContentViewer(oldViewer, input, this, fCompareConfiguration);
}
};
vsplitter.setWeights(new int[] { 30, 70 });
@@ -768,6 +770,17 @@ public class EditionSelectionDialog extends Dialog { }
}
+ private void setInput(Object input) {
+ if (!fCompare && input instanceof ICompareInput) {
+ ICompareInput ci= (ICompareInput) input;
+ if (fTargetIsRight)
+ input= ci.getLeft();
+ else
+ input= ci.getRight();
+ }
+ fContentPane.setInput(input);
+ }
+
/*
* Feeds selection from edition viewer to content viewer.
*/
@@ -780,20 +793,20 @@ public class EditionSelectionDialog extends Dialog { String editionLabel= getEditionLabel(pair.getEdition(), fSelectedItem);
if (!fReplaceMode) {
- fContentPane.setInput(fSelectedItem);
+ setInput(fSelectedItem);
fContentPane.setText(editionLabel);
} else {
if (fTargetIsRight) {
fCompareConfiguration.setLeftLabel(editionLabel);
- fContentPane.setInput(new DiffNode(fSelectedItem, fTargetPair.getItem()));
+ setInput(new DiffNode(fSelectedItem, fTargetPair.getItem()));
} else {
fCompareConfiguration.setRightLabel(editionLabel);
- fContentPane.setInput(new DiffNode(fTargetPair.getItem(), fSelectedItem));
+ setInput(new DiffNode(fTargetPair.getItem(), fSelectedItem));
}
}
} else {
fSelectedItem= null;
- fContentPane.setInput(null);
+ setInput(null);
}
if (fCommitButton != null)
fCommitButton.setEnabled(fSelectedItem != null);
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 995417ae1..458c07d1e 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 @@ -2510,18 +2510,18 @@ public class TextMergeViewer extends ContentMergeViewer { */
private void updateVScrollBar() {
- if (Utilities.okToUse(fVScrollBar) && fSynchronizedScrolling /* && fVScrollBar.isVisible() */) {
- int selection= fVScrollBar.getSelection();
+ if (Utilities.okToUse(fVScrollBar) && fSynchronizedScrolling) {
+// int selection= fVScrollBar.getSelection();
int virtualHeight= getVirtualHeight();
int viewPortHeight= getViewportHeight();
int pageIncrement= viewPortHeight-1;
int thumb= (viewPortHeight > virtualHeight) ? virtualHeight : viewPortHeight;
-// fVScrollBar.setPageIncrement(pageIncrement);
-// fVScrollBar.setMaximum(virtualHeight); // XXX: sometimes the last line isn't visible
-// fVScrollBar.setThumb(thumb);
+ fVScrollBar.setPageIncrement(pageIncrement);
+ fVScrollBar.setMaximum(virtualHeight); // XXX: sometimes the last line isn't visible
+ fVScrollBar.setThumb(thumb);
- fVScrollBar.setValues(selection, 0, virtualHeight, thumb, 1, pageIncrement);
+ //fVScrollBar.setValues(selection, 0, virtualHeight, thumb, 1, pageIncrement);
}
}
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..6c1e8a789 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 @@ -628,7 +628,7 @@ public final class CompareUIPlugin extends AbstractUIPlugin { }
return null;
}
-
+
/**
* Determines the type of the given threeway input by analyzing
* the types (file extension) of the individual parts.
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ZipStructureCreator.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ZipStructureCreator.java index 16e808f76..90d74d176 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ZipStructureCreator.java +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ZipStructureCreator.java @@ -140,6 +140,19 @@ public class ZipStructureCreator implements IStructureCreator { void setBytes(byte[] buffer) {
fContents= buffer;
}
+
+ void appendBytes(byte[] buffer, int length) {
+ if (length > 0) {
+ int oldLen= 0;
+ if (fContents != null)
+ oldLen= fContents.length;
+ byte[] newBuf= new byte[oldLen + length];
+ if (oldLen > 0)
+ System.arraycopy(fContents, 0, newBuf, 0, oldLen);
+ System.arraycopy(buffer, 0, newBuf, oldLen, length);
+ fContents= newBuf;
+ }
+ }
}
private String fTitle;
@@ -193,6 +206,13 @@ public class ZipStructureCreator implements IStructureCreator { } while (length > 0);
ze.setBytes(buffer);
+ } else {
+ byte[] buffer= new byte[1024];
+ int n;
+ do {
+ n= zip.read(buffer, 0, 1024);
+ ze.appendBytes(buffer, n);
+ } while (n >= 0);
}
}
zip.closeEntry();
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java index 9096c3dde..0e9994aae 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java @@ -315,16 +315,8 @@ public class DiffTreeViewer extends TreeViewer { super.inputChanged(in, oldInput);
//expandToLevel(2);
-// Control c= getControl();
-// Display display= c.getDisplay();
-// display.asyncExec(
-// new Runnable() {
-// public void run() {
- navigate(true);
- updateActions();
-// }
-// }
-// );
+ navigate(true);
+ updateActions();
}
/**
@@ -362,7 +354,7 @@ public class DiffTreeViewer extends TreeViewer { // };
// Utilities.initAction(fCopyLeftToRightAction, fBundle, "action.TakeLeft.");
// toolbarManager.appendToGroup("merge", fCopyLeftToRightAction);
-//
+
// fCopyRightToLeftAction= new Action() {
// public void run() {
// copySelected(false);
|