diff options
Diffstat (limited to 'bundles')
28 files changed, 234 insertions, 102 deletions
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareConfiguration.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareConfiguration.java index 6dd413d97..5eab85110 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareConfiguration.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareConfiguration.java @@ -50,24 +50,38 @@ public class CompareConfiguration { private static ImageDescriptor[] fgImages= new ImageDescriptor[16];
private static Object fgDummy= new Object();
private static HashMap fgMap= new HashMap(20);
+ private static boolean fLeftIsLocal= true;
static {
- int INCOMING= Differencer.LEFT;
- int OUTGOING= Differencer.RIGHT;
fgImages[Differencer.ADDITION]= CompareUIPlugin.getImageDescriptor("ovr16/add_ov.gif");
- fgImages[INCOMING + Differencer.ADDITION]= CompareUIPlugin.getImageDescriptor("ovr16/inadd_ov.gif");
- fgImages[OUTGOING + Differencer.ADDITION]= CompareUIPlugin.getImageDescriptor("ovr16/outadd_ov.gif");
+ if (fLeftIsLocal) {
+ fgImages[Differencer.LEFT + Differencer.ADDITION]= CompareUIPlugin.getImageDescriptor("ovr16/r_inadd_ov.gif");
+ fgImages[Differencer.RIGHT + Differencer.ADDITION]= CompareUIPlugin.getImageDescriptor("ovr16/r_outadd_ov.gif");
+ } else {
+ fgImages[Differencer.LEFT + Differencer.ADDITION]= CompareUIPlugin.getImageDescriptor("ovr16/inadd_ov.gif");
+ fgImages[Differencer.RIGHT + Differencer.ADDITION]= CompareUIPlugin.getImageDescriptor("ovr16/outadd_ov.gif");
+ }
fgImages[Differencer.CONFLICTING + Differencer.ADDITION]= CompareUIPlugin.getImageDescriptor("ovr16/confadd_ov.gif");
fgImages[Differencer.DELETION]= CompareUIPlugin.getImageDescriptor("ovr16/del_ov.gif");
- fgImages[INCOMING + Differencer.DELETION]= CompareUIPlugin.getImageDescriptor("ovr16/indel_ov.gif");
- fgImages[OUTGOING + Differencer.DELETION]= CompareUIPlugin.getImageDescriptor("ovr16/outdel_ov.gif");
+ if (fLeftIsLocal) {
+ fgImages[Differencer.LEFT + Differencer.DELETION]= CompareUIPlugin.getImageDescriptor("ovr16/r_indel_ov.gif");
+ fgImages[Differencer.RIGHT + Differencer.DELETION]= CompareUIPlugin.getImageDescriptor("ovr16/r_outdel_ov.gif");
+ } else {
+ fgImages[Differencer.LEFT + Differencer.DELETION]= CompareUIPlugin.getImageDescriptor("ovr16/indel_ov.gif");
+ fgImages[Differencer.RIGHT + Differencer.DELETION]= CompareUIPlugin.getImageDescriptor("ovr16/outdel_ov.gif");
+ }
fgImages[Differencer.CONFLICTING + Differencer.DELETION]= CompareUIPlugin.getImageDescriptor("ovr16/confdel_ov.gif");
//fgImages[Differencer.CHANGE]= CompareUIPlugin.getImageDescriptor("ovr16/chg_ov.gif");
- fgImages[INCOMING + Differencer.CHANGE]= CompareUIPlugin.getImageDescriptor("ovr16/inchg_ov.gif");
- fgImages[OUTGOING + Differencer.CHANGE]= CompareUIPlugin.getImageDescriptor("ovr16/outchg_ov.gif");
+ if (fLeftIsLocal) {
+ fgImages[Differencer.LEFT + Differencer.CHANGE]= CompareUIPlugin.getImageDescriptor("ovr16/r_inchg_ov.gif");
+ fgImages[Differencer.RIGHT + Differencer.CHANGE]= CompareUIPlugin.getImageDescriptor("ovr16/r_outchg_ov.gif");
+ } else {
+ fgImages[Differencer.LEFT + Differencer.CHANGE]= CompareUIPlugin.getImageDescriptor("ovr16/inchg_ov.gif");
+ fgImages[Differencer.RIGHT + Differencer.CHANGE]= CompareUIPlugin.getImageDescriptor("ovr16/outchg_ov.gif");
+ }
fgImages[Differencer.CONFLICTING + Differencer.CHANGE]= CompareUIPlugin.getImageDescriptor("ovr16/confchg_ov.gif");
}
@@ -88,7 +102,7 @@ public class CompareConfiguration { */
public CompareConfiguration() {
- setProperty("LEFT_IS_LOCAL", new Boolean(true));
+ setProperty("LEFT_IS_LOCAL", new Boolean(fLeftIsLocal));
IPreferenceStore ps= CompareUIPlugin.getDefault().getPreferenceStore();
if (ps != null) {
@@ -125,7 +139,7 @@ public class CompareConfiguration { }
Image b= a[kind];
if (b == null) {
- b= new DiffImage(base, fgImages[kind], WIDTH).createImage();
+ b= new DiffImage(base, fgImages[kind], WIDTH, fLeftIsLocal).createImage();
CompareUI.disposeOnShutdown(b);
a[kind]= b;
}
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java index dfa8a1d8e..26bf27b1a 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java @@ -232,10 +232,7 @@ public abstract class ContentMergeViewer extends ContentViewer implements IPrope private IPropertyChangeListener fPropertyChangeListener;
private ICompareInputChangeListener fCompareInputChangeListener;
private ListenerList fListenerList;
- boolean fAllowSave= true;
-
- //private boolean fLeftDirty; // left side is dirty
- //private boolean fRightDirty; // right side is dirty
+ boolean fConfirmSave= true;
private double fHSplit= HSPLIT; // width ratio of left and right panes
private double fVSplit= VSPLIT; // height ratio of ancestor and bottom panes
@@ -277,6 +274,7 @@ public abstract class ContentMergeViewer extends ContentViewer implements IPrope fBundle= bundle;
fAncestorEnabled= Utilities.getBoolean(cc, ANCESTOR_ENABLED, fAncestorEnabled);
+ fConfirmSave= Utilities.getBoolean(cc, CompareEditor.CONFIRM_SAVE_PROPERTY, fConfirmSave);
setContentProvider(new MergeViewerContentProvider(cc));
@@ -503,7 +501,7 @@ public abstract class ContentMergeViewer extends ContentViewer implements IPrope if (fLeftSaveAction.isEnabled() || fRightSaveAction.isEnabled()) {
// post alert
- if (fAllowSave) {
+ if (fConfirmSave) {
Shell shell= fComposite.getShell();
MessageDialog dialog= new MessageDialog(shell,
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareAction.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareAction.java index 3ac313e7e..df37053ea 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareAction.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareAction.java @@ -17,8 +17,10 @@ public class CompareAction implements IActionDelegate { private ResourceCompareInput fInput;
public void run(IAction action) {
- if (fInput != null)
+ if (fInput != null) {
CompareUI.openCompareEditor(fInput);
+ fInput= null; // don't reuse this input!
+ }
}
public void selectionChanged(IAction action, ISelection selection) {
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditor.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditor.java index 3272deb0d..b0b764b66 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditor.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditor.java @@ -33,6 +33,8 @@ import org.eclipse.compare.*; */
public class CompareEditor extends EditorPart implements IPropertyChangeListener {
+ public final static String CONFIRM_SAVE_PROPERTY= "org.eclipse.compare.internal.CONFIRM_SAVE_PROPERTY";
+
private IActionBars fActionBars;
@@ -50,7 +52,10 @@ public class CompareEditor extends EditorPart implements IPropertyChangeListener if (!(input instanceof CompareEditorInput))
throw new PartInitException("Invalid Input: Must be CompareEditorInput");
-
+
+ CompareConfiguration cc= getCompareConfiguration();
+ cc.setProperty(CONFIRM_SAVE_PROPERTY, new Boolean(false));
+
CompareEditorInput cei= (CompareEditorInput) input;
setSite(site);
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/DiffImage.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/DiffImage.java index b9035139f..0a86a3b0b 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/DiffImage.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/DiffImage.java @@ -19,6 +19,7 @@ public class DiffImage extends CompositeImageDescriptor { private Image fBaseImage;
private ImageDescriptor fOverlayImage;
private int fWidth;
+ private boolean fLeft= true;
public DiffImage(Image base, ImageDescriptor overlay, int w) {
fBaseImage= base;
@@ -26,28 +27,46 @@ public class DiffImage extends CompositeImageDescriptor { fWidth= w;
}
+ public DiffImage(Image base, ImageDescriptor overlay, int w, boolean onLeft) {
+ fBaseImage= base;
+ fOverlayImage= overlay;
+ fWidth= w;
+ fLeft= onLeft;
+ }
+
protected Point getSize() {
return new Point(fWidth, HEIGHT);
}
protected void drawCompositeImage(int width, int height) {
-
- if (fBaseImage != null) {
- ImageData base= fBaseImage.getImageData();
- if (base == null)
- base= DEFAULT_IMAGE_DATA;
- //try {
+ if (fLeft) {
+ if (fBaseImage != null) {
+ ImageData base= fBaseImage.getImageData();
+ if (base == null)
+ base= DEFAULT_IMAGE_DATA;
drawImage(base, fWidth - base.width, 0);
- //} catch (ArrayIndexOutOfBoundsException ex) {
- // workaround for PR 1GCQKWP
- //}
- }
-
- if (fOverlayImage != null) {
- ImageData dir= fOverlayImage.getImageData();
- if (dir == null)
- dir= DEFAULT_IMAGE_DATA;
- drawImage(dir, 0, (HEIGHT - dir.height) / 2);
+ }
+
+ if (fOverlayImage != null) {
+ ImageData overlay= fOverlayImage.getImageData();
+ if (overlay == null)
+ overlay= DEFAULT_IMAGE_DATA;
+ drawImage(overlay, 0, (HEIGHT - overlay.height) / 2);
+ }
+ } else {
+ if (fBaseImage != null) {
+ ImageData base= fBaseImage.getImageData();
+ if (base == null)
+ base= DEFAULT_IMAGE_DATA;
+ drawImage(base, 0, 0);
+ }
+
+ if (fOverlayImage != null) {
+ ImageData overlay= fOverlayImage.getImageData();
+ if (overlay == null)
+ overlay= DEFAULT_IMAGE_DATA;
+ drawImage(overlay, fWidth - overlay.width+1, (HEIGHT - overlay.height) / 2);
+ }
}
}
}
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 d2b7adf6d..3d7cbe246 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 @@ -368,21 +368,21 @@ public class DiffTreeViewer extends TreeViewer { // Utilities.initAction(fCopyRightToLeftAction, fBundle, "action.TakeRight.");
// toolbarManager.appendToGroup("merge", fCopyRightToLeftAction);
-// fNextAction= new Action() {
-// public void run() {
-// navigate(true);
-// }
-// };
-// Utilities.initAction(fNextAction, fBundle, "action.NextDiff.");
-// toolbarManager.appendToGroup("navigation", fNextAction);
-//
-// fPreviousAction= new Action() {
-// public void run() {
-// navigate(false);
-// }
-// };
-// Utilities.initAction(fPreviousAction, fBundle, "action.PrevDiff.");
-// toolbarManager.appendToGroup("navigation", fPreviousAction);
+ fNextAction= new Action() {
+ public void run() {
+ navigate(true);
+ }
+ };
+ Utilities.initAction(fNextAction, fBundle, "action.NextDiff.");
+ toolbarManager.appendToGroup("navigation", fNextAction);
+
+ fPreviousAction= new Action() {
+ public void run() {
+ navigate(false);
+ }
+ };
+ Utilities.initAction(fPreviousAction, fBundle, "action.PrevDiff.");
+ toolbarManager.appendToGroup("navigation", fPreviousAction);
}
/**
diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/r_inadd_ov.gif b/bundles/org.eclipse.compare/icons/full/ovr16/r_inadd_ov.gif Binary files differnew file mode 100644 index 000000000..7bcd18c83 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/ovr16/r_inadd_ov.gif diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/r_inchg_ov.gif b/bundles/org.eclipse.compare/icons/full/ovr16/r_inchg_ov.gif Binary files differnew file mode 100644 index 000000000..dc9bfc62d --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/ovr16/r_inchg_ov.gif diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/r_indel_ov.gif b/bundles/org.eclipse.compare/icons/full/ovr16/r_indel_ov.gif Binary files differnew file mode 100644 index 000000000..b497f8fe2 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/ovr16/r_indel_ov.gif diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/r_outadd_ov.gif b/bundles/org.eclipse.compare/icons/full/ovr16/r_outadd_ov.gif Binary files differnew file mode 100644 index 000000000..38ba2ae76 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/ovr16/r_outadd_ov.gif diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/r_outchg_ov.gif b/bundles/org.eclipse.compare/icons/full/ovr16/r_outchg_ov.gif Binary files differnew file mode 100644 index 000000000..afe6b1736 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/ovr16/r_outchg_ov.gif diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/r_outdel_ov.gif b/bundles/org.eclipse.compare/icons/full/ovr16/r_outdel_ov.gif Binary files differnew file mode 100644 index 000000000..8b6438dc2 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/ovr16/r_outdel_ov.gif diff --git a/bundles/org.eclipse.compare/plugin.properties b/bundles/org.eclipse.compare/plugin.properties index fb96c7492..1f4711283 100644 --- a/bundles/org.eclipse.compare/plugin.properties +++ b/bundles/org.eclipse.compare/plugin.properties @@ -36,13 +36,13 @@ TextFont.label=Text Font: # Toolbar actions
#
action.IgnoreWhiteSpace.label=Ignore White Space
-action.IgnoreWhiteSpace.tooltip=Ignore white space where applicable
+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
+action.Next.tooltip=Go to Next Difference Ctrl+N
action.Next.image=elcl16/next_nav.gif
action.Previous.label=Previous Difference
-action.Previous.tooltip=Go to previous difference
+action.Previous.tooltip=Go to Previous Difference Ctrl+P
action.Previous.image=elcl16/prev_nav.gif
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareConfiguration.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareConfiguration.java index 6dd413d97..5eab85110 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareConfiguration.java +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareConfiguration.java @@ -50,24 +50,38 @@ public class CompareConfiguration { private static ImageDescriptor[] fgImages= new ImageDescriptor[16];
private static Object fgDummy= new Object();
private static HashMap fgMap= new HashMap(20);
+ private static boolean fLeftIsLocal= true;
static {
- int INCOMING= Differencer.LEFT;
- int OUTGOING= Differencer.RIGHT;
fgImages[Differencer.ADDITION]= CompareUIPlugin.getImageDescriptor("ovr16/add_ov.gif");
- fgImages[INCOMING + Differencer.ADDITION]= CompareUIPlugin.getImageDescriptor("ovr16/inadd_ov.gif");
- fgImages[OUTGOING + Differencer.ADDITION]= CompareUIPlugin.getImageDescriptor("ovr16/outadd_ov.gif");
+ if (fLeftIsLocal) {
+ fgImages[Differencer.LEFT + Differencer.ADDITION]= CompareUIPlugin.getImageDescriptor("ovr16/r_inadd_ov.gif");
+ fgImages[Differencer.RIGHT + Differencer.ADDITION]= CompareUIPlugin.getImageDescriptor("ovr16/r_outadd_ov.gif");
+ } else {
+ fgImages[Differencer.LEFT + Differencer.ADDITION]= CompareUIPlugin.getImageDescriptor("ovr16/inadd_ov.gif");
+ fgImages[Differencer.RIGHT + Differencer.ADDITION]= CompareUIPlugin.getImageDescriptor("ovr16/outadd_ov.gif");
+ }
fgImages[Differencer.CONFLICTING + Differencer.ADDITION]= CompareUIPlugin.getImageDescriptor("ovr16/confadd_ov.gif");
fgImages[Differencer.DELETION]= CompareUIPlugin.getImageDescriptor("ovr16/del_ov.gif");
- fgImages[INCOMING + Differencer.DELETION]= CompareUIPlugin.getImageDescriptor("ovr16/indel_ov.gif");
- fgImages[OUTGOING + Differencer.DELETION]= CompareUIPlugin.getImageDescriptor("ovr16/outdel_ov.gif");
+ if (fLeftIsLocal) {
+ fgImages[Differencer.LEFT + Differencer.DELETION]= CompareUIPlugin.getImageDescriptor("ovr16/r_indel_ov.gif");
+ fgImages[Differencer.RIGHT + Differencer.DELETION]= CompareUIPlugin.getImageDescriptor("ovr16/r_outdel_ov.gif");
+ } else {
+ fgImages[Differencer.LEFT + Differencer.DELETION]= CompareUIPlugin.getImageDescriptor("ovr16/indel_ov.gif");
+ fgImages[Differencer.RIGHT + Differencer.DELETION]= CompareUIPlugin.getImageDescriptor("ovr16/outdel_ov.gif");
+ }
fgImages[Differencer.CONFLICTING + Differencer.DELETION]= CompareUIPlugin.getImageDescriptor("ovr16/confdel_ov.gif");
//fgImages[Differencer.CHANGE]= CompareUIPlugin.getImageDescriptor("ovr16/chg_ov.gif");
- fgImages[INCOMING + Differencer.CHANGE]= CompareUIPlugin.getImageDescriptor("ovr16/inchg_ov.gif");
- fgImages[OUTGOING + Differencer.CHANGE]= CompareUIPlugin.getImageDescriptor("ovr16/outchg_ov.gif");
+ if (fLeftIsLocal) {
+ fgImages[Differencer.LEFT + Differencer.CHANGE]= CompareUIPlugin.getImageDescriptor("ovr16/r_inchg_ov.gif");
+ fgImages[Differencer.RIGHT + Differencer.CHANGE]= CompareUIPlugin.getImageDescriptor("ovr16/r_outchg_ov.gif");
+ } else {
+ fgImages[Differencer.LEFT + Differencer.CHANGE]= CompareUIPlugin.getImageDescriptor("ovr16/inchg_ov.gif");
+ fgImages[Differencer.RIGHT + Differencer.CHANGE]= CompareUIPlugin.getImageDescriptor("ovr16/outchg_ov.gif");
+ }
fgImages[Differencer.CONFLICTING + Differencer.CHANGE]= CompareUIPlugin.getImageDescriptor("ovr16/confchg_ov.gif");
}
@@ -88,7 +102,7 @@ public class CompareConfiguration { */
public CompareConfiguration() {
- setProperty("LEFT_IS_LOCAL", new Boolean(true));
+ setProperty("LEFT_IS_LOCAL", new Boolean(fLeftIsLocal));
IPreferenceStore ps= CompareUIPlugin.getDefault().getPreferenceStore();
if (ps != null) {
@@ -125,7 +139,7 @@ public class CompareConfiguration { }
Image b= a[kind];
if (b == null) {
- b= new DiffImage(base, fgImages[kind], WIDTH).createImage();
+ b= new DiffImage(base, fgImages[kind], WIDTH, fLeftIsLocal).createImage();
CompareUI.disposeOnShutdown(b);
a[kind]= b;
}
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java index dfa8a1d8e..26bf27b1a 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java @@ -232,10 +232,7 @@ public abstract class ContentMergeViewer extends ContentViewer implements IPrope private IPropertyChangeListener fPropertyChangeListener;
private ICompareInputChangeListener fCompareInputChangeListener;
private ListenerList fListenerList;
- boolean fAllowSave= true;
-
- //private boolean fLeftDirty; // left side is dirty
- //private boolean fRightDirty; // right side is dirty
+ boolean fConfirmSave= true;
private double fHSplit= HSPLIT; // width ratio of left and right panes
private double fVSplit= VSPLIT; // height ratio of ancestor and bottom panes
@@ -277,6 +274,7 @@ public abstract class ContentMergeViewer extends ContentViewer implements IPrope fBundle= bundle;
fAncestorEnabled= Utilities.getBoolean(cc, ANCESTOR_ENABLED, fAncestorEnabled);
+ fConfirmSave= Utilities.getBoolean(cc, CompareEditor.CONFIRM_SAVE_PROPERTY, fConfirmSave);
setContentProvider(new MergeViewerContentProvider(cc));
@@ -503,7 +501,7 @@ public abstract class ContentMergeViewer extends ContentViewer implements IPrope if (fLeftSaveAction.isEnabled() || fRightSaveAction.isEnabled()) {
// post alert
- if (fAllowSave) {
+ if (fConfirmSave) {
Shell shell= fComposite.getShell();
MessageDialog dialog= new MessageDialog(shell,
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareAction.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareAction.java index 3ac313e7e..df37053ea 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareAction.java +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareAction.java @@ -17,8 +17,10 @@ public class CompareAction implements IActionDelegate { private ResourceCompareInput fInput;
public void run(IAction action) {
- if (fInput != null)
+ if (fInput != null) {
CompareUI.openCompareEditor(fInput);
+ fInput= null; // don't reuse this input!
+ }
}
public void selectionChanged(IAction action, ISelection selection) {
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditor.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditor.java index 3272deb0d..b0b764b66 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditor.java +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditor.java @@ -33,6 +33,8 @@ import org.eclipse.compare.*; */
public class CompareEditor extends EditorPart implements IPropertyChangeListener {
+ public final static String CONFIRM_SAVE_PROPERTY= "org.eclipse.compare.internal.CONFIRM_SAVE_PROPERTY";
+
private IActionBars fActionBars;
@@ -50,7 +52,10 @@ public class CompareEditor extends EditorPart implements IPropertyChangeListener if (!(input instanceof CompareEditorInput))
throw new PartInitException("Invalid Input: Must be CompareEditorInput");
-
+
+ CompareConfiguration cc= getCompareConfiguration();
+ cc.setProperty(CONFIRM_SAVE_PROPERTY, new Boolean(false));
+
CompareEditorInput cei= (CompareEditorInput) input;
setSite(site);
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/DiffImage.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/DiffImage.java index b9035139f..0a86a3b0b 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/DiffImage.java +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/DiffImage.java @@ -19,6 +19,7 @@ public class DiffImage extends CompositeImageDescriptor { private Image fBaseImage;
private ImageDescriptor fOverlayImage;
private int fWidth;
+ private boolean fLeft= true;
public DiffImage(Image base, ImageDescriptor overlay, int w) {
fBaseImage= base;
@@ -26,28 +27,46 @@ public class DiffImage extends CompositeImageDescriptor { fWidth= w;
}
+ public DiffImage(Image base, ImageDescriptor overlay, int w, boolean onLeft) {
+ fBaseImage= base;
+ fOverlayImage= overlay;
+ fWidth= w;
+ fLeft= onLeft;
+ }
+
protected Point getSize() {
return new Point(fWidth, HEIGHT);
}
protected void drawCompositeImage(int width, int height) {
-
- if (fBaseImage != null) {
- ImageData base= fBaseImage.getImageData();
- if (base == null)
- base= DEFAULT_IMAGE_DATA;
- //try {
+ if (fLeft) {
+ if (fBaseImage != null) {
+ ImageData base= fBaseImage.getImageData();
+ if (base == null)
+ base= DEFAULT_IMAGE_DATA;
drawImage(base, fWidth - base.width, 0);
- //} catch (ArrayIndexOutOfBoundsException ex) {
- // workaround for PR 1GCQKWP
- //}
- }
-
- if (fOverlayImage != null) {
- ImageData dir= fOverlayImage.getImageData();
- if (dir == null)
- dir= DEFAULT_IMAGE_DATA;
- drawImage(dir, 0, (HEIGHT - dir.height) / 2);
+ }
+
+ if (fOverlayImage != null) {
+ ImageData overlay= fOverlayImage.getImageData();
+ if (overlay == null)
+ overlay= DEFAULT_IMAGE_DATA;
+ drawImage(overlay, 0, (HEIGHT - overlay.height) / 2);
+ }
+ } else {
+ if (fBaseImage != null) {
+ ImageData base= fBaseImage.getImageData();
+ if (base == null)
+ base= DEFAULT_IMAGE_DATA;
+ drawImage(base, 0, 0);
+ }
+
+ if (fOverlayImage != null) {
+ ImageData overlay= fOverlayImage.getImageData();
+ if (overlay == null)
+ overlay= DEFAULT_IMAGE_DATA;
+ drawImage(overlay, fWidth - overlay.width+1, (HEIGHT - overlay.height) / 2);
+ }
}
}
}
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 d2b7adf6d..3d7cbe246 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 @@ -368,21 +368,21 @@ public class DiffTreeViewer extends TreeViewer { // Utilities.initAction(fCopyRightToLeftAction, fBundle, "action.TakeRight.");
// toolbarManager.appendToGroup("merge", fCopyRightToLeftAction);
-// fNextAction= new Action() {
-// public void run() {
-// navigate(true);
-// }
-// };
-// Utilities.initAction(fNextAction, fBundle, "action.NextDiff.");
-// toolbarManager.appendToGroup("navigation", fNextAction);
-//
-// fPreviousAction= new Action() {
-// public void run() {
-// navigate(false);
-// }
-// };
-// Utilities.initAction(fPreviousAction, fBundle, "action.PrevDiff.");
-// toolbarManager.appendToGroup("navigation", fPreviousAction);
+ fNextAction= new Action() {
+ public void run() {
+ navigate(true);
+ }
+ };
+ Utilities.initAction(fNextAction, fBundle, "action.NextDiff.");
+ toolbarManager.appendToGroup("navigation", fNextAction);
+
+ fPreviousAction= new Action() {
+ public void run() {
+ navigate(false);
+ }
+ };
+ Utilities.initAction(fPreviousAction, fBundle, "action.PrevDiff.");
+ toolbarManager.appendToGroup("navigation", fPreviousAction);
}
/**
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/r_inadd_ov.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/r_inadd_ov.gif Binary files differnew file mode 100644 index 000000000..7bcd18c83 --- /dev/null +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/r_inadd_ov.gif diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/r_inchg_ov.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/r_inchg_ov.gif Binary files differnew file mode 100644 index 000000000..dc9bfc62d --- /dev/null +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/r_inchg_ov.gif diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/r_indel_ov.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/r_indel_ov.gif Binary files differnew file mode 100644 index 000000000..b497f8fe2 --- /dev/null +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/r_indel_ov.gif diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/r_outadd_ov.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/r_outadd_ov.gif Binary files differnew file mode 100644 index 000000000..38ba2ae76 --- /dev/null +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/r_outadd_ov.gif diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/r_outchg_ov.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/r_outchg_ov.gif Binary files differnew file mode 100644 index 000000000..afe6b1736 --- /dev/null +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/r_outchg_ov.gif diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/r_outdel_ov.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/r_outdel_ov.gif Binary files differnew file mode 100644 index 000000000..8b6438dc2 --- /dev/null +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/r_outdel_ov.gif 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 fb96c7492..1f4711283 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.properties +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.properties @@ -36,13 +36,13 @@ TextFont.label=Text Font: # Toolbar actions
#
action.IgnoreWhiteSpace.label=Ignore White Space
-action.IgnoreWhiteSpace.tooltip=Ignore white space where applicable
+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
+action.Next.tooltip=Go to Next Difference Ctrl+N
action.Next.image=elcl16/next_nav.gif
action.Previous.label=Previous Difference
-action.Previous.tooltip=Go to previous difference
+action.Previous.tooltip=Go to Previous Difference Ctrl+P
action.Previous.image=elcl16/prev_nav.gif
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/readme_compare.html b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/readme_compare.html index eaf9c16cd..8b7a82b58 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/readme_compare.html +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/readme_compare.html @@ -11,6 +11,34 @@ <h1>
Eclipse Platform Release Notes<br>
Compare (including example)</h1>
+Eclipse SDK Build 118 - June 2, 2001
+
+<h2>
+What's new in this drop</h2>
+Changed copyright notices for Compare Examples.
+
+<h3>
+API changes</h3>
+
+<h3>
+API Additions</h3>
+
+<h3>
+Other highlights</h3>
+
+<h2>
+Known deficiencies</h2>
+
+<h2>
+Problem reports fixed</h2>
+1GEOOUI: ITPUI:WINNT - Compare results shouldn't reuse CompareEditor<br>
+1GENTE1: ITPUI:WINNT - Mirrored icons for Left_Is_Local mode<br>
+
+<h2>
+Problem reports closed</h2>
+
+<h1>
+<hr WIDTH="100%"></h1>
Eclipse SDK Build 117 - June 1, 2001
<h2>
diff --git a/bundles/org.eclipse.compare/readme_compare.html b/bundles/org.eclipse.compare/readme_compare.html index eaf9c16cd..8b7a82b58 100644 --- a/bundles/org.eclipse.compare/readme_compare.html +++ b/bundles/org.eclipse.compare/readme_compare.html @@ -11,6 +11,34 @@ <h1>
Eclipse Platform Release Notes<br>
Compare (including example)</h1>
+Eclipse SDK Build 118 - June 2, 2001
+
+<h2>
+What's new in this drop</h2>
+Changed copyright notices for Compare Examples.
+
+<h3>
+API changes</h3>
+
+<h3>
+API Additions</h3>
+
+<h3>
+Other highlights</h3>
+
+<h2>
+Known deficiencies</h2>
+
+<h2>
+Problem reports fixed</h2>
+1GEOOUI: ITPUI:WINNT - Compare results shouldn't reuse CompareEditor<br>
+1GENTE1: ITPUI:WINNT - Mirrored icons for Left_Is_Local mode<br>
+
+<h2>
+Problem reports closed</h2>
+
+<h1>
+<hr WIDTH="100%"></h1>
Eclipse SDK Build 117 - June 1, 2001
<h2>
|
