Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Becker2016-09-22 11:02:45 +0000
committerMatthias Becker2016-09-27 06:38:22 +0000
commit5ee45ccc30b17601d1a332c034a6a9e3dd843718 (patch)
treee2ebbca438cd862c1a269a78272bbbeb37c858f5 /bundles/org.eclipse.compare/compare
parentb89030ec4dc43f99253fbbadfb7dde498f2e4379 (diff)
downloadeclipse.platform.team-5ee45ccc30b17601d1a332c034a6a9e3dd843718.tar.gz
eclipse.platform.team-5ee45ccc30b17601d1a332c034a6a9e3dd843718.tar.xz
eclipse.platform.team-5ee45ccc30b17601d1a332c034a6a9e3dd843718.zip
Bug 501803: Use png files for compare editor instead of gif filesY20160929-1000
Replace GIF icons with normal and high resolution PNG icons in: - org.eclipse.compare - org.eclipse.compare.win32 - org.eclipse.team.ui Change-Id: I185ad058e202933d4f6c10479576f866bd62b37b Signed-off-by: Matthias Becker <ma.becker@sap.com>
Diffstat (limited to 'bundles/org.eclipse.compare/compare')
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareConfiguration.java105
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java205
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java248
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewerResources.properties20
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryAction.properties4
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryDialog.java162
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareContentViewerSwitchingPane.java12
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareWithEditionAction.properties4
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ICompareUIConstants.java42
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ImageMergeViewerResources.properties6
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ReplaceWithEditionAction.properties4
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewerResources.properties10
12 files changed, 410 insertions, 412 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 7a5ef8b09..021451528 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareConfiguration.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareConfiguration.java
@@ -81,36 +81,36 @@ public class CompareConfiguration {
static {
// Not swapped (a.k.a. left is local)
- fgImages[Differencer.ADDITION]= CompareUIPlugin.getImageDescriptor("ovr16/add_ov.gif"); //$NON-NLS-1$
- fgImages[Differencer.LEFT + Differencer.ADDITION]= CompareUIPlugin.getImageDescriptor("ovr16/r_inadd_ov.gif"); //$NON-NLS-1$
- fgImages[Differencer.RIGHT + Differencer.ADDITION]= CompareUIPlugin.getImageDescriptor("ovr16/r_outadd_ov.gif"); //$NON-NLS-1$
+ fgImages[Differencer.ADDITION]= CompareUIPlugin.getImageDescriptor("ovr16/add_ov.png"); //$NON-NLS-1$
+ fgImages[Differencer.LEFT + Differencer.ADDITION]= CompareUIPlugin.getImageDescriptor("ovr16/r_inadd_ov.png"); //$NON-NLS-1$
+ fgImages[Differencer.RIGHT + Differencer.ADDITION]= CompareUIPlugin.getImageDescriptor("ovr16/r_outadd_ov.png"); //$NON-NLS-1$
- fgImages[Differencer.DELETION]= CompareUIPlugin.getImageDescriptor("ovr16/del_ov.gif"); //$NON-NLS-1$
- fgImages[Differencer.LEFT + Differencer.DELETION]= CompareUIPlugin.getImageDescriptor("ovr16/r_indel_ov.gif"); //$NON-NLS-1$
- fgImages[Differencer.RIGHT + Differencer.DELETION]= CompareUIPlugin.getImageDescriptor("ovr16/r_outdel_ov.gif"); //$NON-NLS-1$
+ fgImages[Differencer.DELETION]= CompareUIPlugin.getImageDescriptor("ovr16/del_ov.png"); //$NON-NLS-1$
+ fgImages[Differencer.LEFT + Differencer.DELETION]= CompareUIPlugin.getImageDescriptor("ovr16/r_indel_ov.png"); //$NON-NLS-1$
+ fgImages[Differencer.RIGHT + Differencer.DELETION]= CompareUIPlugin.getImageDescriptor("ovr16/r_outdel_ov.png"); //$NON-NLS-1$
- fgImages[Differencer.LEFT + Differencer.CHANGE]= CompareUIPlugin.getImageDescriptor("ovr16/r_inchg_ov.gif"); //$NON-NLS-1$
- fgImages[Differencer.RIGHT + Differencer.CHANGE]= CompareUIPlugin.getImageDescriptor("ovr16/r_outchg_ov.gif"); //$NON-NLS-1$
+ fgImages[Differencer.LEFT + Differencer.CHANGE]= CompareUIPlugin.getImageDescriptor("ovr16/r_inchg_ov.png"); //$NON-NLS-1$
+ fgImages[Differencer.RIGHT + Differencer.CHANGE]= CompareUIPlugin.getImageDescriptor("ovr16/r_outchg_ov.png"); //$NON-NLS-1$
+
+ fgImages[Differencer.CONFLICTING + Differencer.ADDITION]= CompareUIPlugin.getImageDescriptor("ovr16/confadd_ov.png"); //$NON-NLS-1$
+ fgImages[Differencer.CONFLICTING + Differencer.DELETION]= CompareUIPlugin.getImageDescriptor("ovr16/confdel_ov.png"); //$NON-NLS-1$
+ fgImages[Differencer.CONFLICTING + Differencer.CHANGE]= CompareUIPlugin.getImageDescriptor("ovr16/confchg_ov.png"); //$NON-NLS-1$
- fgImages[Differencer.CONFLICTING + Differencer.ADDITION]= CompareUIPlugin.getImageDescriptor("ovr16/confadd_ov.gif"); //$NON-NLS-1$
- fgImages[Differencer.CONFLICTING + Differencer.DELETION]= CompareUIPlugin.getImageDescriptor("ovr16/confdel_ov.gif"); //$NON-NLS-1$
- fgImages[Differencer.CONFLICTING + Differencer.CHANGE]= CompareUIPlugin.getImageDescriptor("ovr16/confchg_ov.gif"); //$NON-NLS-1$
-
// Mirrored (a.k.a. right is local)
- fgImages[16 + Differencer.ADDITION]= CompareUIPlugin.getImageDescriptor("ovr16/add_ov.gif"); //$NON-NLS-1$
- fgImages[16 + Differencer.LEFT + Differencer.ADDITION]= CompareUIPlugin.getImageDescriptor("ovr16/inadd_ov.gif"); //$NON-NLS-1$
- fgImages[16 + Differencer.RIGHT + Differencer.ADDITION]= CompareUIPlugin.getImageDescriptor("ovr16/outadd_ov.gif"); //$NON-NLS-1$
+ fgImages[16 + Differencer.ADDITION]= CompareUIPlugin.getImageDescriptor("ovr16/add_ov.png"); //$NON-NLS-1$
+ fgImages[16 + Differencer.LEFT + Differencer.ADDITION]= CompareUIPlugin.getImageDescriptor("ovr16/inadd_ov.png"); //$NON-NLS-1$
+ fgImages[16 + Differencer.RIGHT + Differencer.ADDITION]= CompareUIPlugin.getImageDescriptor("ovr16/outadd_ov.png"); //$NON-NLS-1$
- fgImages[16 + Differencer.DELETION]= CompareUIPlugin.getImageDescriptor("ovr16/del_ov.gif"); //$NON-NLS-1$
- fgImages[16 + Differencer.LEFT + Differencer.DELETION]= CompareUIPlugin.getImageDescriptor("ovr16/indel_ov.gif"); //$NON-NLS-1$
- fgImages[16 + Differencer.RIGHT + Differencer.DELETION]= CompareUIPlugin.getImageDescriptor("ovr16/outdel_ov.gif"); //$NON-NLS-1$
+ fgImages[16 + Differencer.DELETION]= CompareUIPlugin.getImageDescriptor("ovr16/del_ov.png"); //$NON-NLS-1$
+ fgImages[16 + Differencer.LEFT + Differencer.DELETION]= CompareUIPlugin.getImageDescriptor("ovr16/indel_ov.png"); //$NON-NLS-1$
+ fgImages[16 + Differencer.RIGHT + Differencer.DELETION]= CompareUIPlugin.getImageDescriptor("ovr16/outdel_ov.png"); //$NON-NLS-1$
- fgImages[16 + Differencer.LEFT + Differencer.CHANGE]= CompareUIPlugin.getImageDescriptor("ovr16/inchg_ov.gif"); //$NON-NLS-1$
- fgImages[16 + Differencer.RIGHT + Differencer.CHANGE]= CompareUIPlugin.getImageDescriptor("ovr16/outchg_ov.gif"); //$NON-NLS-1$
+ fgImages[16 + Differencer.LEFT + Differencer.CHANGE]= CompareUIPlugin.getImageDescriptor("ovr16/inchg_ov.png"); //$NON-NLS-1$
+ fgImages[16 + Differencer.RIGHT + Differencer.CHANGE]= CompareUIPlugin.getImageDescriptor("ovr16/outchg_ov.png"); //$NON-NLS-1$
- fgImages[16 + Differencer.CONFLICTING + Differencer.ADDITION]= CompareUIPlugin.getImageDescriptor("ovr16/confadd_ov.gif"); //$NON-NLS-1$
- fgImages[16 + Differencer.CONFLICTING + Differencer.DELETION]= CompareUIPlugin.getImageDescriptor("ovr16/confdel_ov.gif"); //$NON-NLS-1$
- fgImages[16 + Differencer.CONFLICTING + Differencer.CHANGE]= CompareUIPlugin.getImageDescriptor("ovr16/confchg_ov.gif"); //$NON-NLS-1$
+ fgImages[16 + Differencer.CONFLICTING + Differencer.ADDITION]= CompareUIPlugin.getImageDescriptor("ovr16/confadd_ov.png"); //$NON-NLS-1$
+ fgImages[16 + Differencer.CONFLICTING + Differencer.DELETION]= CompareUIPlugin.getImageDescriptor("ovr16/confdel_ov.png"); //$NON-NLS-1$
+ fgImages[16 + Differencer.CONFLICTING + Differencer.CHANGE]= CompareUIPlugin.getImageDescriptor("ovr16/confchg_ov.png"); //$NON-NLS-1$
}
private IPreferenceStore fPreferenceStore;
@@ -128,7 +128,7 @@ public class CompareConfiguration {
private DefaultLabelProvider labelProvider = new DefaultLabelProvider();
private boolean fDisposed;
private LocalResourceManager fResourceManager;
- private Set<Integer> fIgnoredChanges = new HashSet<>(6);
+ private Set<Integer> fIgnoredChanges = new HashSet<>(6);
private class DefaultLabelProvider extends LabelProvider implements ICompareInputLabelProvider, ILabelProviderListener {
private Map<ICompareInput, ICompareInputLabelProvider> labelProviders = new HashMap<>();
@@ -248,7 +248,7 @@ public class CompareConfiguration {
}
return super.getText(element);
}
-
+
@Override
public void dispose() {
for (Iterator<ICompareInputLabelProvider> iterator = labelProviders.values().iterator(); iterator.hasNext();) {
@@ -260,7 +260,7 @@ public class CompareConfiguration {
defaultLabelProvider = null;
labelProviders.clear();
}
-
+
@Override
public void labelProviderChanged(LabelProviderChangedEvent event) {
fireLabelProviderChanged(new LabelProviderChangedEvent(this, event.getElements()));
@@ -281,7 +281,7 @@ public class CompareConfiguration {
* The given preference store is used to connect this configuration
* with the Compare preference page properties <code>ComparePreferencePage.INITIALLY_SHOW_ANCESTOR_PANE</code>,
* <code>CompareConfiguration.IGNORE_WHITESPACE</code> and {@link #MIRRORED}
- *
+ *
* @param prefStore the preference store which this configuration holds onto.
* @since 2.0
*/
@@ -308,7 +308,7 @@ public class CompareConfiguration {
public CompareConfiguration() {
this(CompareUIPlugin.getDefault().getPreferenceStore());
}
-
+
/**
* Returns the preference store of this configuration.
* @return the preference store of this configuration.
@@ -317,7 +317,7 @@ public class CompareConfiguration {
public IPreferenceStore getPreferenceStore() {
return fPreferenceStore;
}
-
+
/**
* Returns an image showing the specified change kind.
* The different kind of changes are defined in the <code>Differencer</code>.
@@ -336,7 +336,7 @@ public class CompareConfiguration {
ResourceManager rm = getResourceManager();
return rm.createImage(id);
}
-
+
private synchronized ResourceManager getResourceManager() {
if (fResourceManager == null) {
fResourceManager = new LocalResourceManager(JFaceResources.getResources());
@@ -347,7 +347,7 @@ public class CompareConfiguration {
/**
* Returns an image showing the specified change kind applied to a
* given base image. The different kind of changes are defined in the <code>Differencer</code>.
- * Typically an implementation would build a composite image
+ * Typically an implementation would build a composite image
* from the given base image and an image representing the change kind.
* Newly created images are remembered by this class and
* disposed when the <code>dispose</code> method is called.
@@ -367,7 +367,7 @@ public class CompareConfiguration {
/**
* <b>Only the views are mirrored. All model values for left and right are not changed!</b>
- *
+ *
* @return true if the left and right side of the viewer are mirrored. Default is false.
* @since 3.7
*/
@@ -379,7 +379,7 @@ public class CompareConfiguration {
private ImageDescriptor getImageDescriptor(int kind) {
return fgImages[(kind & 15) + (isMirrored() ? 16 : 0)];
}
-
+
/**
* Dispose of this compare configuration.
* This method is called if the compare configuration is no longer used.
@@ -448,7 +448,7 @@ public class CompareConfiguration {
}
//---- ancestor
-
+
/**
* Sets the label to use for the ancestor of compare/merge viewers.
* This label will be used if the element for which a label
@@ -493,13 +493,13 @@ public class CompareConfiguration {
*
* @param element the input object of a compare/merge viewer or <code>null</code>
* @return the image for the ancestor side or <code>null</code>
- */
+ */
public Image getAncestorImage(Object element) {
return labelProvider.getAncestorImage(element);
}
//---- left side
-
+
/**
* Controls whether the left side of a merge viewer is editable.
*
@@ -508,10 +508,10 @@ public class CompareConfiguration {
public void setLeftEditable(boolean editable) {
fLeftEditable= editable;
}
-
+
/**
* Returns whether the left hand side of a merge viewer is editable.
- *
+ *
* @return <code>true</code> if the left hand side is editable
*/
public boolean isLeftEditable() {
@@ -530,7 +530,7 @@ public class CompareConfiguration {
public void setLeftLabel(String label) {
fLeftLabel= label;
}
-
+
/**
* Returns the label for the left hand side of compare/merge viewers.
* This label is typically shown in the title of the left side of a compare viewer.
@@ -562,11 +562,11 @@ public class CompareConfiguration {
*
* @param element the input object of a compare/merge viewer or <code>null</code>
* @return the image for the left hand side or <code>null</code>
- */
+ */
public Image getLeftImage(Object element) {
return labelProvider.getLeftImage(element);
}
-
+
//---- right side
/**
@@ -577,10 +577,10 @@ public class CompareConfiguration {
public void setRightEditable(boolean editable) {
fRightEditable= editable;
}
-
+
/**
* Returns whether the right hand side of a merge viewer is editable.
- *
+ *
* @return <code>true</code> if the right hand side is editable
*/
public boolean isRightEditable() {
@@ -635,7 +635,7 @@ public class CompareConfiguration {
public Image getRightImage(Object element) {
return labelProvider.getRightImage(element);
}
-
+
/**
* Return the container of the compare associated with this configuration.
* @return the container of the compare associated with this configuration
@@ -657,10 +657,10 @@ public class CompareConfiguration {
public void setContainer(ICompareContainer container) {
fContainer = container;
}
-
+
/**
* Return the label provider that is used to determine the
- * text and labels return by this compare configuration.
+ * text and labels return by this compare configuration.
* @return the label provider that is used to determine the
* text and labels return by this compare configuration
* @see #getAncestorImage(Object)
@@ -674,11 +674,11 @@ public class CompareConfiguration {
public ICompareInputLabelProvider getLabelProvider() {
return labelProvider;
}
-
+
/**
* Set the label provider for the given compare input. The compare configuration
* will not dispose of the label provider when the configuration is disposed.
- * It is up to the provider of the label provider to ensure that it is
+ * It is up to the provider of the label provider to ensure that it is
* disposed when it is no longer needed.
* @param input the compare input
* @param labelProvider the label provider for the compare input
@@ -687,7 +687,7 @@ public class CompareConfiguration {
public void setLabelProvider(ICompareInput input, ICompareInputLabelProvider labelProvider) {
this.labelProvider.setLabelProvider(input, labelProvider);
}
-
+
/**
* Set the default label provider for this configuration. The default label
* provider is used when a particular label provider has not been assigned
@@ -696,7 +696,7 @@ public class CompareConfiguration {
* The compare configuration will not dispose of the label provider when the
* configuration is disposed. It is up to the provider of the label provider
* to ensure that it is disposed when it is no longer needed.
- *
+ *
* @param labelProvider the default label provider
* @since 3.3
*/
@@ -708,7 +708,7 @@ public class CompareConfiguration {
* Set whether given change kind should be ignored while computing
* differences between documents. Changes specified by this method will be
* excluded from a comparison result.
- *
+ *
* @param kind
* type of change, possible values are:
* {@link RangeDifference#CHANGE}
@@ -730,7 +730,7 @@ public class CompareConfiguration {
/**
* Return if a given change kind is ignored while computing differences
* between documents.
- *
+ *
* @param kind
* type of change, possible values are:
* {@link RangeDifference#CHANGE}
@@ -745,4 +745,3 @@ public class CompareConfiguration {
}
}
-
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java
index 45504d95f..c47431c0d 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.compare;
+package org.eclipse.compare;
import java.lang.reflect.InvocationTargetException;
import java.util.ResourceBundle;
@@ -140,19 +140,19 @@ import org.eclipse.ui.texteditor.ITextEditorExtension3;
* if one of these underlying models is dirty. It is the responsibility of subclasses that
* implement this interface to call {@link #setDirty(boolean)} when the dirty state of
* any of the models managed by the subclass change dirty state.
- *
+ *
* @see CompareUI
* @see CompareEditorInput
*/
public abstract class CompareEditorInput extends PlatformObject implements IEditorInput, IPropertyChangeNotifier, IRunnableWithProgress, ICompareContainer {
private static final boolean DEBUG= false;
-
+
/**
* The name of the "dirty" property (value <code>"DIRTY_STATE"</code>).
*/
public static final String DIRTY_STATE= "DIRTY_STATE"; //$NON-NLS-1$
-
+
/**
* The name of the "title" property. This property is fired when the title
* of the compare input changes. Clients should also re-obtain the tool tip
@@ -161,7 +161,7 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
* @since 3.3
*/
public static final String PROP_TITLE= ICompareUIConstants.PROP_TITLE;
-
+
/**
* The name of the "title image" property. This property is fired when the title
* image of the compare input changes.
@@ -169,7 +169,7 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
* @since 3.3
*/
public static final String PROP_TITLE_IMAGE= ICompareUIConstants.PROP_TITLE_IMAGE;
-
+
/**
* The name of the "selected edition" property. This property is fired when the selected
* edition of the compare input changes.
@@ -179,9 +179,9 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
*/
public static final String PROP_SELECTED_EDITION= ICompareUIConstants.PROP_SELECTED_EDITION;
- private static final String COMPARE_EDITOR_IMAGE_NAME= "eview16/compare_view.gif"; //$NON-NLS-1$
+ private static final String COMPARE_EDITOR_IMAGE_NAME= "eview16/compare_view.png"; //$NON-NLS-1$
private static Image fgTitleImage;
-
+
private Splitter fComposite;
private CompareConfiguration fCompareConfiguration;
private CompareViewerPane fStructureInputPane;
@@ -197,7 +197,7 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
private boolean fLeftDirty = false;
private boolean fRightDirty = false;
private IPropertyChangeListener fDirtyStateListener;
-
+
boolean fStructureCompareOnSingleClick= true;
private ICompareContainer fContainer;
@@ -206,7 +206,7 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
private InternalOutlineViewerCreator fOutlineView;
private ViewerDescriptor fContentViewerDescriptor;
private ViewerDescriptor fStructureViewerDescriptor;
-
+
private class InternalOutlineViewerCreator extends OutlineViewerCreator {
private OutlineViewerCreator getWrappedCreator() {
if (fContentInputPane != null) {
@@ -266,7 +266,7 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
IPreferenceStore ps= configuration.getPreferenceStore();
if (ps != null)
fStructureCompareOnSingleClick= ps.getBoolean(ComparePreferencePage.OPEN_STRUCTURE_COMPARE);
-
+
fContainer = configuration.getContainer();
configuration.setContainer(this);
}
@@ -274,12 +274,12 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
private boolean structureCompareOnSingleClick() {
return fStructureCompareOnSingleClick;
}
-
+
private boolean isShowStructureInOutlineView() {
Object object= getCompareConfiguration().getProperty(CompareConfiguration.USE_OUTLINE_VIEW);
return object instanceof Boolean && ((Boolean)object).booleanValue();
}
-
+
/* (non Javadoc)
* see IAdaptable.getAdapter
*/
@@ -319,7 +319,7 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
}
}
}
-
+
if (adapter == ITextEditorExtension3.class) {
if (fContentInputPane != null) {
Viewer v = fContentInputPane.getViewer();
@@ -344,28 +344,28 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
);
return fNavigator;
}
-
+
/* (non Javadoc)
* see IEditorInput.getImageDescriptor
*/
public ImageDescriptor getImageDescriptor() {
return null;
}
-
+
/* (non Javadoc)
* see IEditorInput.getToolTipText
*/
public String getToolTipText() {
return getTitle();
}
-
+
/* (non Javadoc)
* see IEditorInput.getName
*/
public String getName() {
return getTitle();
}
-
+
/**
* Returns <code>null</code> since this editor cannot be persisted.
*
@@ -374,7 +374,7 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
public IPersistableElement getPersistable() {
return null;
}
-
+
/**
* Returns <code>false</code> to indicate that this input
* should not appear in the "File Most Recently Used" menu.
@@ -384,21 +384,21 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
public boolean exists() {
return false;
}
-
+
/*
* FIXME!
*/
protected void setMessage(String message) {
fMessage= message;
}
-
+
/*
* FIXME!
*/
public String getMessage() {
return fMessage;
}
-
+
/**
* Returns the title which will be used in the compare editor's title bar.
* It can be set with <code>setTitle</code>.
@@ -410,11 +410,11 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
return Utilities.getString("CompareEditorInput.defaultTitle"); //$NON-NLS-1$
return fTitle;
}
-
+
/**
* Sets the title which will be used when presenting the compare result.
* This method must be called before the editor is opened.
- *
+ *
* @param title the title to use for the CompareEditor
*/
public void setTitle(String title) {
@@ -422,7 +422,7 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
fTitle= title;
Utilities.firePropertyChange(fListenerList, this, PROP_TITLE, oldTitle, title);
}
-
+
/**
* Returns the title image which will be used in the compare editor's title bar.
* Returns the title image which will be used when presenting the compare result.
@@ -438,7 +438,7 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
}
return fgTitleImage;
}
-
+
/**
* Returns the configuration object for the viewers within the compare editor.
* Returns the configuration which was passed to the constructor.
@@ -467,7 +467,7 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
toolBarManager.add(ignoreWhitespace);
toolBarManager.add(showPseudoConflicts);
}
-
+
/**
* Runs the compare operation and stores the compare result.
*
@@ -507,7 +507,7 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
*/
protected abstract Object prepareInput(IProgressMonitor monitor)
throws InvocationTargetException, InterruptedException;
-
+
/**
* Returns the compare result computed by the most recent call to the
* <code>run</code> method. Returns <code>null</code> if no
@@ -519,7 +519,7 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
public Object getCompareResult() {
return fInput;
}
-
+
/**
* Create the SWT controls that are used to display the result of the compare operation.
* Creates the SWT Controls and sets up the wiring between the individual panes.
@@ -536,9 +536,9 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
fComposite= new Splitter(parent, SWT.VERTICAL);
fComposite.setData(this);
-
+
Control outline= createOutlineContents(fComposite, SWT.HORIZONTAL);
-
+
fContentInputPane= createContentViewerSwitchingPane(fComposite, SWT.BORDER | SWT.FLAT, this);
if (fFocusPane == null)
@@ -546,14 +546,14 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
if (outline != null)
fComposite.setVisible(outline, false);
fComposite.setVisible(fContentInputPane, true);
-
+
if (fStructureInputPane != null && fComposite.getChildren().length == 2)
fComposite.setWeights(new int[] { 30, 70 });
-
+
fComposite.layout();
feedInput();
-
+
fComposite.addDisposeListener(new DisposeListener() {
public void widgetDisposed(DisposeEvent e) {
/*
@@ -585,7 +585,7 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
contentsCreated();
return fComposite;
}
-
+
/**
* @param parent the parent control under which the control must be created
* @param style the style of widget to construct
@@ -597,14 +597,14 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
protected CompareViewerSwitchingPane createContentViewerSwitchingPane(Splitter parent, int style, CompareEditorInput cei) {
return new CompareContentViewerSwitchingPane(parent, style, cei);
}
-
+
/**
* Callback that occurs when the UI associated with this compare editor
* input is disposed. This method will only be invoked if the UI has been
* created (i.e. after the call to {@link #createContents(Composite)}.
* Subclasses can extend this method but ensure that the overridden method
* is invoked.
- *
+ *
* @since 3.3
*/
protected void handleDispose() {
@@ -619,7 +619,7 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
fNavigator = null;
fCompareConfiguration.dispose();
}
-
+
/**
* Callback that occurs after the control for the input has
* been created. If this method gets invoked then {@link #handleDispose()}
@@ -644,13 +644,13 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
fStructureInputPane= createStructureInputPane(h);
if (hasChildren(getCompareResult()))
fFocusPane= fStructureInputPane;
-
+
fStructurePane1= new CompareStructureViewerSwitchingPane(h, SWT.BORDER | SWT.FLAT, true, this);
h.setVisible(fStructurePane1, false);
-
+
fStructurePane2= new CompareStructureViewerSwitchingPane(h, SWT.BORDER | SWT.FLAT, true, this);
h.setVisible(fStructurePane2, false);
-
+
// setup the wiring for top left pane
fStructureInputPane.addOpenListener(
new IOpenListener() {
@@ -677,7 +677,7 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
}
}
);
-
+
fStructurePane1.addSelectionChangedListener(
new ISelectionChangedListener() {
public void selectionChanged(SelectionChangedEvent e) {
@@ -716,7 +716,7 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
}
};
}
-
+
/* private */ boolean hasChildren(Object input) {
if (input instanceof IDiffContainer) {
IDiffContainer dn= (IDiffContainer) input;
@@ -764,7 +764,7 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
private boolean hasUnusableContentViewer() {
return fContentInputPane.isEmpty() || fContentInputPane.getViewer() instanceof BinaryCompareViewer;
}
-
+
private boolean isCustomStructureInputPane() {
return !(fStructureInputPane instanceof CompareViewerSwitchingPane);
}
@@ -785,7 +785,7 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
Object input= getElement(selection);
internalSetContentPaneInput(input);
if (!Utilities.okToUse(fStructurePane1) || !Utilities.okToUse(fStructurePane2))
- return;
+ return;
if (structureCompareOnSingleClick() || hasUnusableContentViewer())
fStructurePane1.setInput(input);
fStructurePane2.setInput(null); // clear downstream pane
@@ -796,7 +796,7 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
}
);
}
-
+
private void feedDefault1(final ISelection selection) {
BusyIndicator.showWhile(fComposite.getDisplay(),
new Runnable() {
@@ -807,7 +807,7 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
}
);
}
-
+
private void feed2(final ISelection selection) {
BusyIndicator.showWhile(fComposite.getDisplay(),
new Runnable() {
@@ -825,7 +825,7 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
}
);
}
-
+
private void feed3(final ISelection selection) {
BusyIndicator.showWhile(fComposite.getDisplay(),
new Runnable() {
@@ -837,16 +837,16 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
}
}
);
-
+
}
-
+
private void internalSetContentPaneInput(Object input) {
Object oldInput = fContentInputPane.getInput();
fContentInputPane.setInput(input);
if (fOutlineView != null)
fOutlineView.fireInputChange(oldInput, input);
}
-
+
/**
* Returns the first element of the given selection if the selection
* is a <code>IStructuredSelection</code> with exactly one element. Returns
@@ -863,27 +863,27 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
}
return null;
}
-
+
/**
* Asks this input to take focus within its container (editor).
- *
+ *
* @noreference Clients should not call this method but they may override if
* they implement a different layout with different visual
* components. Clients are free to call the inherited method.
- *
+ *
* @deprecated Please use {@link #setFocus2()} instead.
*/
public void setFocus() {
setFocus2();
}
-
+
/**
* Asks this input to take focus within its container (editor).
- *
+ *
* @noreference Clients should not call this method but they may override if
* they implement a different layout with different visual
* components. Clients are free to call the inherited method.
- *
+ *
* @return <code>true</code> if the input got focus, and <code>false</code>
* if it was unable to.
* @since 3.5
@@ -895,7 +895,7 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
return fComposite.setFocus();
return false;
}
-
+
/**
* Factory method for creating a differences viewer for the top left pane.
* It is called from <code>createContents</code> and returns a <code>DiffTreeViewer</code>.
@@ -953,14 +953,14 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
Viewer newViewer = fContentViewerDescriptor != null ? fContentViewerDescriptor.createViewer(oldViewer, parent,
fCompareConfiguration) : CompareUI.findContentViewer(oldViewer,
input, parent, fCompareConfiguration);
-
+
boolean isNewViewer= newViewer != oldViewer;
if (DEBUG) System.out.println("CompareEditorInput.findContentViewer: " + isNewViewer); //$NON-NLS-1$
-
+
if (isNewViewer && newViewer instanceof IPropertyChangeNotifier) {
final IPropertyChangeNotifier dsp= (IPropertyChangeNotifier) newViewer;
dsp.addPropertyChangeListener(fDirtyStateListener);
-
+
Control c= newViewer.getControl();
c.addDisposeListener(
new DisposeListener() {
@@ -970,10 +970,10 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
}
);
}
-
+
return newViewer;
}
-
+
/**
* @param vd
* the content viewer descriptor
@@ -1015,16 +1015,16 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
public ViewerDescriptor getStructureViewerDescriptor() {
return this.fStructureViewerDescriptor;
}
-
+
/**
* Returns <code>true</code> if there are unsaved changes in either left or
* right side. The value returned is the value of the
* <code>DIRTY_STATE</code> property of this input object.
- *
+ *
* Returns <code>true</code> if left or right side has unsaved changes
* Subclasses don't have to override if the functionality provided by
* <code>setDirty</code> is sufficient.
- *
+ *
* @return <code>true</code> if there are changes that need to be saved
*/
public boolean isSaveNeeded() {
@@ -1033,7 +1033,7 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
/**
* Returns <code>true</code> if there are unsaved changes for left side.
- *
+ *
* @return <code>true</code> if there are changes that need to be saved
* @noreference This method is not intended to be referenced by clients.
*/
@@ -1043,14 +1043,14 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
/**
* Returns <code>true</code> if there are unsaved changes for right side.
- *
+ *
* @return <code>true</code> if there are changes that need to be saved
* @noreference This method is not intended to be referenced by clients.
*/
protected boolean isRightSaveNeeded() {
return fRightDirty;
}
-
+
/**
* Returns <code>true</code> if there are unsaved changes.
* The method should be called by any parts or dialogs
@@ -1063,7 +1063,7 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
public boolean isDirty() {
return isSaveNeeded();
}
-
+
/**
* Sets the dirty state of this input to the given value and sends out a
* <code>PropertyChangeEvent</code> if the new value differs from the old
@@ -1072,7 +1072,7 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
* inconsistent state. The dirty state of compare input should be based only
* on the information if there are changes in viewers for left or right
* side.
- *
+ *
* @param dirty
* the dirty state for this compare input
*/
@@ -1094,7 +1094,7 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
* changes in left viewer, results in inconsistent state. The dirty state of
* compare input should be based only on the information if there are
* changes in viewers for left side.
- *
+ *
* @param dirty
* the dirty state for this compare input
* @since 3.7
@@ -1120,7 +1120,7 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
* changes in right viewer, results in inconsistent state. The dirty state
* of compare input should be based only on the information if there are
* changes in viewers for right side.
- *
+ *
* @param dirty
* the dirty state for this compare input
* @since 3.7
@@ -1142,7 +1142,7 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
* Method adds or removes viewers that changed left or right side of this
* compare input. Any modification of any of the list of viewers may result
* in dirty state change.
- *
+ *
* @param source
* the object that fired <code>PropertyChangeEvent</code>
* modifying the dirty state
@@ -1175,7 +1175,7 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
Utilities.firePropertyChange(fListenerList, this, DIRTY_STATE, Boolean.valueOf(oldDirty), Boolean.valueOf(newDirty));
}
}
-
+
/* (non Javadoc)
* see IPropertyChangeNotifier.addListener
*/
@@ -1204,7 +1204,7 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
public void save(IProgressMonitor pm) {
// empty default implementation
}
-
+
/**
* Save any unsaved changes.
* Subclasses must override to save any changes.
@@ -1216,7 +1216,7 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
* @since 2.0
*/
public void saveChanges(IProgressMonitor monitor) throws CoreException {
-
+
flushViewers(monitor);
save(monitor);
@@ -1234,7 +1234,7 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
flushViewer(fStructurePane2, monitor);
flushViewer(fContentInputPane, monitor);
}
-
+
/**
* @param monitor
* @noreference This method is not intended to be referenced by clients.
@@ -1258,7 +1258,7 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
flushViewer(fStructurePane2, monitor);
flushRightViewer(fContentInputPane, monitor);
}
-
+
private static void flushViewer(CompareViewerPane pane, IProgressMonitor pm) {
if (pane != null) {
IFlushable flushable = (IFlushable)Utilities.getAdapter(pane, IFlushable.class);
@@ -1266,7 +1266,7 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
flushable.flush(pm);
}
}
-
+
private static void flushLeftViewer(CompareViewerPane pane, IProgressMonitor pm) {
if (pane != null) {
IFlushable2 flushable = (IFlushable2)Utilities.getAdapter(pane, IFlushable2.class);
@@ -1294,7 +1294,7 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
fContainer.addCompareInputChangeListener(input, listener);
}
}
-
+
/* (non-Javadoc)
* @see org.eclipse.compare.ICompareContainer#removeCompareInputChangeListener(org.eclipse.compare.structuremergeviewer.ICompareInput, org.eclipse.compare.structuremergeviewer.ICompareInputChangeListener)
*/
@@ -1306,7 +1306,7 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
fContainer.removeCompareInputChangeListener(input, listener);
}
}
-
+
/* (non-Javadoc)
* @see org.eclipse.compare.ICompareContainer#registerContextMenu(org.eclipse.jface.action.MenuManager, org.eclipse.jface.viewers.ISelectionProvider)
*/
@@ -1314,7 +1314,7 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
if (fContainer != null)
fContainer.registerContextMenu(menu, selectionProvider);
}
-
+
/* (non-Javadoc)
* @see org.eclipse.compare.ICompareContainer#setStatusMessage(java.lang.String)
*/
@@ -1347,7 +1347,7 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
}
return null;
}
-
+
/* (non-Javadoc)
* @see org.eclipse.compare.ICompareContainer#getServiceLocator()
*/
@@ -1359,7 +1359,7 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
}
return serviceLocator;
}
-
+
/* (non-Javadoc)
* @see org.eclipse.compare.ICompareContainer#getWorkbenchPart()
*/
@@ -1368,7 +1368,7 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
return fContainer.getWorkbenchPart();
return null;
}
-
+
/* (non-Javadoc)
* @see org.eclipse.jface.operation.IRunnableContext#run(boolean, boolean, org.eclipse.jface.operation.IRunnableWithProgress)
*/
@@ -1378,12 +1378,12 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
if (fContainer != null)
fContainer.run(fork, cancelable, runnable);
}
-
+
public void runAsynchronously(IRunnableWithProgress runnable) {
if (fContainer != null)
fContainer.runAsynchronously(runnable);
}
-
+
/**
* Set the container of this input to the given container
* @param container the container
@@ -1404,7 +1404,7 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
public final ICompareContainer getContainer() {
return fContainer;
}
-
+
/**
* Fire the given property change event to all listeners
* registered with this compare editor input.
@@ -1414,7 +1414,7 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
protected void firePropertyChange(PropertyChangeEvent event) {
Utilities.firePropertyChange(fListenerList, event);
}
-
+
/**
* Return whether this compare editor input can be run as a job.
* By default, <code>false</code> is returned since traditionally inputs
@@ -1441,7 +1441,7 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
public boolean belongsTo(Object family) {
return family == this;
}
-
+
/**
* Return whether this input is intended to be used to select
* a particular edition of an element in a dialog. The result
@@ -1457,7 +1457,7 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
public boolean isEditionSelectionDialog() {
return false;
}
-
+
/**
* Return the label to be used for the <code>OK</code>
* button when this input is displayed in a dialog.
@@ -1475,7 +1475,7 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
return CompareMessages.CompareEditorInput_0;
return IDialogConstants.OK_LABEL;
}
-
+
/**
* Return the label used for the <code>CANCEL</code>
* button when this input is shown in a compare dialog
@@ -1491,14 +1491,14 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
return getCompareConfiguration().isLeftEditable()
|| getCompareConfiguration().isRightEditable();
}
-
+
/**
* The <code>OK</code> button was pressed in a dialog. If one or both of
* the sides of the input is editable then any changes will be saved. If the
* input is for edition selection (see {@link #isEditionSelectionDialog()}),
* it is up to subclasses to override this method in order to perform the
* appropriate operation on the selected edition.
- *
+ *
* @return whether the dialog should be closed or not.
* @since 3.3
*/
@@ -1509,7 +1509,7 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
}
return true;
}
-
+
/**
* The <code>CANCEL</code> button was pressed in a dialog.
* By default, nothing is done. Subclasses may override.
@@ -1518,7 +1518,7 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
public void cancelPressed() {
// Do nothing
}
-
+
private boolean saveChanges() {
try {
PlatformUI.getWorkbench().getProgressService().run(true, true, new IRunnableWithProgress() {
@@ -1529,7 +1529,7 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
throw new InvocationTargetException(e);
}
}
-
+
});
return true;
} catch (InterruptedException x) {
@@ -1543,7 +1543,7 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
}
return false;
}
-
+
/**
* Return the selected edition or <code>null</code> if no edition is selected.
* The result of this method should only be considered if {@link #isEditionSelectionDialog()}
@@ -1558,12 +1558,12 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
IStructuredSelection ss = (IStructuredSelection) selection;
if (!ss.isEmpty())
return ss.getFirstElement();
-
+
}
}
return null;
}
-
+
/**
* Set the help context id for this input.
* @param helpContextId the help context id.
@@ -1572,6 +1572,5 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
public void setHelpContextId(String helpContextId) {
this.fHelpContextId = helpContextId;
}
-
-}
+}
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 a2f805d4c..7d87b3e93 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java
@@ -96,35 +96,35 @@ import org.eclipse.compare.structuremergeviewer.IStructureCreator;
*
* @see IModificationDate
* @see ITypedElement
- *
+ *
* @deprecated Use an <code>org.eclipse.team.ui.history.IHistoryPageSource</code> in conjunction with
* the <code>org.eclipse.team.ui.history.IHistoryView</code> or a <code>HistoryPageCompareEditorInput</code>.
* For sub-file elements, a <code>org.eclipse.team.ui.history.ElementLocalHistoryPageSource</code> can be used.
* @noextend This class is not intended to be subclassed by clients.
*/
public class EditionSelectionDialog extends ResizableDialog {
-
+
/**
* An item in an underlying edition.
*/
private static class Pair {
-
+
private ITypedElement fEdition;
private ITypedElement fItem;
private String fContent;
private IStructureCreator fStructureCreator;
private boolean fHasError= false;
-
+
Pair(IStructureCreator structureCreator, ITypedElement edition, ITypedElement item) {
fStructureCreator= structureCreator;
fEdition= edition;
fItem= item;
}
-
+
Pair(IStructureCreator structureCreator, ITypedElement edition) {
this(structureCreator, edition, edition);
}
-
+
ITypedElement getEdition() {
return fEdition;
}
@@ -132,7 +132,7 @@ public class EditionSelectionDialog extends ResizableDialog {
ITypedElement getItem() {
return fItem;
}
-
+
/*
* The content is lazily loaded
*/
@@ -156,7 +156,7 @@ public class EditionSelectionDialog extends ResizableDialog {
}
return fContent;
}
-
+
public boolean equals(Object other) {
if (other != null && other.getClass() == getClass()) {
if (getContent().equals(((Pair)other).getContent()))
@@ -169,7 +169,7 @@ public class EditionSelectionDialog extends ResizableDialog {
return getContent().hashCode();
}
}
-
+
// Configuration options
private CompareConfiguration fCompareConfiguration;
private ArrayList fArrayList= new ArrayList();
@@ -187,7 +187,7 @@ public class EditionSelectionDialog extends ResizableDialog {
private boolean fStructureCompare= false;
/** allow for multiple selection */
private boolean fMultiSelect= false;
-
+
/**
* Maps from members to their corresponding editions.
* Has only a single entry if dialog is used in "Replace" (and not "Add") mode.
@@ -205,7 +205,7 @@ public class EditionSelectionDialog extends ResizableDialog {
private ITypedElement fSelectedItem;
private String fTitleArg;
private Image fTitleImage;
-
+
// SWT controls
private CompareViewerSwitchingPane fContentPane;
private Button fCommitButton;
@@ -217,7 +217,7 @@ public class EditionSelectionDialog extends ResizableDialog {
private Image fTimeImage;
private CompareViewerSwitchingPane fStructuredComparePane;
private Label statusLabel;
-
+
/**
* Creates a new modal, resizable dialog.
* Various titles, icons, and labels are configured from the given resource bundle.
@@ -234,7 +234,7 @@ public class EditionSelectionDialog extends ResizableDialog {
* yesterdayFormat MessageFormat format string if date is yesterdays date; arg 0 is date
* dayFormat MessageFormat format string if date is any other date; arg 0 is date
* editionLabel String label for editions side of compare viewer; arg 0 is the date
- * targetLabel String label for target side of compare viewer
+ * targetLabel String label for target side of compare viewer
* buttonLabel String label for OK button; default is IDialogConstants.OK_LABEL
* </pre>
*
@@ -244,7 +244,7 @@ public class EditionSelectionDialog extends ResizableDialog {
public EditionSelectionDialog(Shell parent, ResourceBundle bundle) {
super(parent, bundle);
}
-
+
private CompareConfiguration getCompareConfiguration() {
if (fCompareConfiguration == null) {
fCompareConfiguration= new CompareConfiguration();
@@ -264,37 +264,37 @@ public class EditionSelectionDialog extends ResizableDialog {
}
return fCompareConfiguration;
}
-
+
/**
* Sets the help context for this dialog.
- *
+ *
* @param contextId the help context id.
* @since 3.2
*/
public void setHelpContextId(String contextId) {
super.setHelpContextId(contextId);
}
-
+
/**
* Sets an additional and optional argument for the edition pane's title.
- *
+ *
* @param titleArgument an optional argument for the edition pane's title
* @since 2.0
*/
public void setEditionTitleArgument(String titleArgument) {
fTitleArg= titleArgument;
}
-
+
/**
* Sets an optional image for the edition pane's title.
- *
+ *
* @param titleImage an optional image for the edition pane's title
* @since 2.0
*/
public void setEditionTitleImage(Image titleImage) {
fTitleImage= titleImage;
}
-
+
/**
* Select the previous edition (presenting a UI).
*
@@ -310,7 +310,7 @@ public class EditionSelectionDialog extends ResizableDialog {
public ITypedElement selectPreviousEdition(final ITypedElement target, ITypedElement[] inputEditions, Object ppath) {
Assert.isNotNull(target);
fTargetPair= new Pair(null, target);
-
+
// sort input editions
final int count= inputEditions.length;
final IModificationDate[] editions= new IModificationDate[count];
@@ -318,7 +318,7 @@ public class EditionSelectionDialog extends ResizableDialog {
editions[i]= (IModificationDate) inputEditions[i];
if (count > 1)
internalSort(editions);
-
+
// find StructureCreator if ppath is not null
IStructureCreator structureCreator= null;
if (ppath != null) {
@@ -332,7 +332,7 @@ public class EditionSelectionDialog extends ResizableDialog {
// does not work in add mode
return null;
}
-
+
if (structureCreator != null) {
Pair pair= createPair(structureCreator, ppath, target);
if (pair != null)
@@ -340,32 +340,32 @@ public class EditionSelectionDialog extends ResizableDialog {
else
ppath= null; // couldn't extract item because of error
}
-
+
// from front (newest) to back (oldest)
for (int i= 0; i < count; i++) {
-
+
ITypedElement edition= (ITypedElement) editions[i];
Pair pair= null;
-
+
if (structureCreator != null && ppath != null) {
// extract sub element from edition
pair= createPair(structureCreator, ppath, edition);
} else {
pair= new Pair(null, edition);
}
-
+
if (pair != null && pair.fHasError)
return null;
-
+
if (pair != null && !fTargetPair.equals(pair)) {
return pair.fItem;
}
}
-
+
// nothing found
return null;
}
-
+
/**
* Presents this modal dialog with the functionality described in the class comment above.
*
@@ -378,10 +378,10 @@ public class EditionSelectionDialog extends ResizableDialog {
* it is an <code>ITypedElement</code> returned from <code>IStructureCreator.locate(path, item)</code>
*/
public ITypedElement selectEdition(final ITypedElement target, ITypedElement[] inputEditions, Object ppath) {
-
+
Assert.isNotNull(target);
fTargetPair= new Pair(null, target);
-
+
// sort input editions
final int count= inputEditions.length;
final IModificationDate[] editions= new IModificationDate[count];
@@ -389,7 +389,7 @@ public class EditionSelectionDialog extends ResizableDialog {
editions[i]= (IModificationDate) inputEditions[i];
if (count > 1)
internalSort(editions);
-
+
// find StructureCreator if ppath is not null
IStructureCreator structureCreator= null;
if (ppath != null) {
@@ -401,7 +401,7 @@ public class EditionSelectionDialog extends ResizableDialog {
if (!fAddMode) {
// replace mode
-
+
if (structureCreator != null) {
Pair pair= createPair(structureCreator, ppath, target);
if (pair != null)
@@ -409,31 +409,31 @@ public class EditionSelectionDialog extends ResizableDialog {
else
ppath= null; // couldn't extract item because of error
}
-
+
// set the left and right labels for the compare viewer
String targetLabel= getTargetLabel(target, fTargetPair.getItem());
if (fTargetIsRight)
getCompareConfiguration().setRightLabel(targetLabel);
else
getCompareConfiguration().setLeftLabel(targetLabel);
-
+
if (structureCreator != null && ppath != null) { // extract sub element
-
+
final IStructureCreator sc= structureCreator;
final Object path= ppath;
-
+
// construct the comparer thread
// and perform the background extract
fThread= new Thread() {
public void run() {
-
+
// from front (newest) to back (oldest)
for (int i= 0; i < count; i++) {
-
+
if (fEditionTree == null || fEditionTree.isDisposed())
break;
ITypedElement edition= (ITypedElement) editions[i];
-
+
// extract sub element from edition
Pair pair= createPair(sc, path, edition);
if (pair != null)
@@ -445,20 +445,20 @@ public class EditionSelectionDialog extends ResizableDialog {
} else {
// create tree widget
create();
-
+
// from front (newest) to back (oldest)
for (int i= 0; i < count; i++)
addMemberEdition(new Pair(null, (ITypedElement) editions[i]));
}
-
+
} else {
// add mode
final Object container= ppath;
Assert.isNotNull(container);
-
+
if (structureCreator == null)
return null; // error
-
+
// extract all elements of container
final HashSet current= new HashSet();
IStructureComparator sco= structureCreator.locate(container, target);
@@ -468,21 +468,21 @@ public class EditionSelectionDialog extends ResizableDialog {
for (int i= 0; i < children.length; i++)
current.add(children[i]);
}
-
+
final IStructureCreator sc= structureCreator;
-
+
// construct the comparer thread
// and perform the background extract
fThread= new Thread() {
public void run() {
-
+
// from front (newest) to back (oldest)
for (int i= 0; i < count; i++) {
-
+
if (fEditionTree == null || fEditionTree.isDisposed())
break;
ITypedElement edition= (ITypedElement) editions[i];
-
+
IStructureComparator sco2= sc.locate(container, edition);
if (sco2 != null) {
Object[] children= sco2.getChildren();
@@ -499,14 +499,14 @@ public class EditionSelectionDialog extends ResizableDialog {
}
};
}
-
+
open();
-
+
if (getReturnCode() == OK)
return fSelectedItem;
return null;
}
-
+
private Pair createPair(IStructureCreator sc, Object path, ITypedElement input) {
IStructureComparator scmp= sc.locate(path, input);
if (scmp == null && sc.getStructure(input) == null) { // parse error
@@ -539,7 +539,7 @@ public class EditionSelectionDialog extends ResizableDialog {
public void setTargetIsRight(boolean isRight) {
fTargetIsRight= isRight;
}
-
+
/**
* Controls whether the <code>EditionSelectionDialog</code> is in 'add' mode
* or 'replace' mode (the default).
@@ -551,10 +551,10 @@ public class EditionSelectionDialog extends ResizableDialog {
fAddMode= addMode;
fMultiSelect= addMode;
}
-
+
/**
* Controls whether the <code>EditionSelectionDialog</code> is in 'compare' mode
- * or 'add/replace' (the default) mode.
+ * or 'add/replace' (the default) mode.
*
* @param compareMode if true dialog is in 'add' mode.
* @since 2.0
@@ -563,7 +563,7 @@ public class EditionSelectionDialog extends ResizableDialog {
fCompareMode= compareMode;
fStructureCompare= fCompareMode && !fAddMode;
}
-
+
/**
* Returns the input target that has been specified with the most recent call
* to <code>selectEdition</code>. If a not <code>null</code> path was specified this method
@@ -578,11 +578,11 @@ public class EditionSelectionDialog extends ResizableDialog {
public ITypedElement getTarget() {
return fTargetPair.getItem();
}
-
+
/**
* Returns the editions that have been selected with the most
* recent call to <code>selectEdition</code>.
- *
+ *
* @return the selected editions as an array.
* @since 2.1
*/
@@ -591,7 +591,7 @@ public class EditionSelectionDialog extends ResizableDialog {
if (fMemberSelection != null) {
Iterator iter= fArrayList.iterator();
while (iter.hasNext()) {
- Object edition= iter.next();
+ Object edition= iter.next();
Object item= fMemberSelection.get(edition);
if (item != null)
result.add(item);
@@ -600,7 +600,7 @@ public class EditionSelectionDialog extends ResizableDialog {
result.add(fSelectedItem);
return (ITypedElement[]) result.toArray(new ITypedElement[result.size()]);
}
-
+
/**
* Returns a label for identifying the target side of a compare viewer.
* This implementation extracts the value for the key "targetLabel" from the resource bundle
@@ -623,7 +623,7 @@ public class EditionSelectionDialog extends ResizableDialog {
format= Utilities.getString(fBundle, "targetLabel"); //$NON-NLS-1$
if (format == null)
format= "x{0}"; //$NON-NLS-1$
-
+
return formatString(format, target.getName());
}
@@ -633,7 +633,7 @@ public class EditionSelectionDialog extends ResizableDialog {
return MessageFormat.format(string, variable);
return string;
}
-
+
private boolean hasDoubleQuotes(String string) {
return string.indexOf("''") != -1; //$NON-NLS-1$
}
@@ -666,17 +666,17 @@ public class EditionSelectionDialog extends ResizableDialog {
format= Utilities.getString(fBundle, "editionLabel"); //$NON-NLS-1$
if (format == null)
format= "x{0}"; //$NON-NLS-1$
-
+
String date= ""; //$NON-NLS-1$
if (selectedEdition instanceof IModificationDate) {
long modDate= ((IModificationDate)selectedEdition).getModificationDate();
date= DateFormat.getDateTimeInstance().format(new Date(modDate));
}
-
+
return formatString(format, date);
}
-
+
/**
* Returns a label for identifying a node in the edition tree viewer.
* This implementation extracts the value for the key "workspaceTreeFormat" or
@@ -706,7 +706,7 @@ public class EditionSelectionDialog extends ResizableDialog {
String ds= DateFormat.getTimeInstance().format(date);
return formatString(format, ds);
}
-
+
/**
* Returns an image for identifying the edition side of a compare viewer.
* This implementation extracts the value for the key "editionLabel" from the resource bundle
@@ -727,7 +727,7 @@ public class EditionSelectionDialog extends ResizableDialog {
return selectedEdition.getImage();
if (selectedEdition instanceof HistoryItem) {
if (fTimeImage == null) {
- String iconName= Utilities.getString(fBundle, "timeIcon", "obj16/resource_obj.gif"); //$NON-NLS-1$ //$NON-NLS-2$
+ String iconName= Utilities.getString(fBundle, "timeIcon", "obj16/resource_obj.png"); //$NON-NLS-1$ //$NON-NLS-2$
ImageDescriptor id= CompareUIPlugin.getImageDescriptor(iconName);
if (id != null)
fTimeImage= id.createImage();
@@ -736,16 +736,16 @@ public class EditionSelectionDialog extends ResizableDialog {
}
return null;
}
-
+
/* (non Javadoc)
* Creates SWT control tree.
*/
protected synchronized Control createDialogArea(Composite parent2) {
-
+
Composite parent= (Composite) super.createDialogArea(parent2);
getShell().setText(Utilities.getString(fBundle, "title")); //$NON-NLS-1$
-
+
Splitter vsplitter= new Splitter(parent, SWT.VERTICAL);
vsplitter.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL
| GridData.VERTICAL_ALIGN_FILL | GridData.GRAB_VERTICAL));
@@ -762,20 +762,20 @@ public class EditionSelectionDialog extends ResizableDialog {
fDateImage= null;
}
if (fTimeImage != null) {
- fTimeImage.dispose();
+ fTimeImage.dispose();
fTimeImage= null;
}
}
}
);
-
+
if (fAddMode) {
// we need two panes: the left for the elements, the right one for the editions
Splitter hsplitter= new Splitter(vsplitter, SWT.HORIZONTAL);
-
+
fMemberPane= new CompareViewerPane(hsplitter, SWT.BORDER | SWT.FLAT);
fMemberPane.setText(Utilities.getString(fBundle, "memberPaneTitle")); //$NON-NLS-1$
-
+
int flags= SWT.H_SCROLL | SWT.V_SCROLL;
if (fMultiSelect)
flags|= SWT.CHECK;
@@ -791,10 +791,10 @@ public class EditionSelectionDialog extends ResizableDialog {
fArrayList.add(data);
else
fArrayList.remove(data);
-
+
if (fCommitButton != null)
fCommitButton.setEnabled(fArrayList.size() > 0);
-
+
fMemberTable.setSelection(new TableItem[] { ti });
}
}
@@ -804,13 +804,13 @@ public class EditionSelectionDialog extends ResizableDialog {
);
fMemberPane.setContent(fMemberTable);
fMemberTable.setFocus();
-
+
fEditionPane= new CompareViewerPane(hsplitter, SWT.BORDER | SWT.FLAT);
} else {
if (fStructureCompare) {
// we need two panes: the left for the elements, the right one for the structured diff
Splitter hsplitter= new Splitter(vsplitter, SWT.HORIZONTAL);
-
+
fEditionPane= new CompareViewerPane(hsplitter, SWT.BORDER | SWT.FLAT);
fStructuredComparePane= new CompareViewerSwitchingPane(hsplitter, SWT.BORDER | SWT.FLAT, true) {
protected Viewer getViewer(Viewer oldViewer, Object input) {
@@ -838,7 +838,7 @@ public class EditionSelectionDialog extends ResizableDialog {
if (fTitleImage != null)
fEditionPane.setImage(fTitleImage);
}
-
+
fEditionTree= new Tree(fEditionPane, SWT.H_SCROLL | SWT.V_SCROLL);
fEditionTree.addSelectionListener(
new SelectionAdapter() {
@@ -850,28 +850,28 @@ public class EditionSelectionDialog extends ResizableDialog {
}
}
);
- fEditionPane.setContent(fEditionTree);
-
+ fEditionPane.setContent(fEditionTree);
+
// now start the thread (and forget about it)
if (fThread != null) {
fThread.start();
fThread= null;
}
-
+
fContentPane= new CompareViewerSwitchingPane(vsplitter, SWT.BORDER | SWT.FLAT) {
protected Viewer getViewer(Viewer oldViewer, Object input) {
- return CompareUI.findContentViewer(oldViewer, input, this, getCompareConfiguration());
+ return CompareUI.findContentViewer(oldViewer, input, this, getCompareConfiguration());
}
};
vsplitter.setWeights(new int[] { 30, 70 });
-
+
statusLabel = new Label(parent, SWT.NONE);
statusLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- applyDialogFont(parent);
+ applyDialogFont(parent);
return parent;
- }
-
+ }
+
/* (non-Javadoc)
* Method declared on Dialog.
*/
@@ -900,11 +900,11 @@ public class EditionSelectionDialog extends ResizableDialog {
}
//---- private stuff ----------------------------------------------------------------------------------------
-
+
/*
* Asynchroneously sends a Pair (or null) to the UI thread.
*/
- private void sendPair(final Pair pair) {
+ private void sendPair(final Pair pair) {
if (fEditionTree != null && !fEditionTree.isDisposed()) {
Display display= fEditionTree.getDisplay();
display.asyncExec(
@@ -916,8 +916,8 @@ public class EditionSelectionDialog extends ResizableDialog {
);
}
}
-
- private static void internalSort(IModificationDate[] keys) {
+
+ private static void internalSort(IModificationDate[] keys) {
Arrays.sort(keys, new Comparator() {
public int compare(Object o1, Object o2) {
IModificationDate d1= (IModificationDate) o1;
@@ -931,7 +931,7 @@ public class EditionSelectionDialog extends ResizableDialog {
}
});
}
-
+
/*
* Adds the given Pair to the member editions.
* If HIDE_IDENTICAL is true the new Pair is only added if its contents
@@ -940,9 +940,9 @@ public class EditionSelectionDialog extends ResizableDialog {
* in the member or edition viewer.
*/
private void addMemberEdition(Pair pair) {
-
+
if (pair == null) { // end of list of pairs
- if (fMemberTable != null) {
+ if (fMemberTable != null) {
if (!fMemberTable.isDisposed() && fMemberTable.getItemCount() == 0) {
if (fMultiSelect) {
fMemberTable.dispose();
@@ -960,12 +960,12 @@ public class EditionSelectionDialog extends ResizableDialog {
}
return;
}
-
+
if (fMemberEditions == null)
fMemberEditions= new HashMap();
if (fMultiSelect && fMemberSelection == null)
fMemberSelection= new HashMap();
-
+
ITypedElement item= pair.getItem();
List editions= (List) fMemberEditions.get(item);
if (editions == null) {
@@ -974,7 +974,7 @@ public class EditionSelectionDialog extends ResizableDialog {
if (fMemberTable != null && !fMemberTable.isDisposed()) {
ITypedElement te= item;
String name= te.getName();
-
+
// find position
TableItem[] items= fMemberTable.getItems();
int where= items.length;
@@ -985,7 +985,7 @@ public class EditionSelectionDialog extends ResizableDialog {
break;
}
}
-
+
TableItem ti= new TableItem(fMemberTable, where, SWT.NULL);
ti.setImage(te.getImage());
ti.setText(name);
@@ -1001,24 +1001,24 @@ public class EditionSelectionDialog extends ResizableDialog {
return; // don't add since the new one is equal to old
}
editions.add(pair);
-
+
if (!fAddMode || editions == fCurrentEditions)
addEdition(pair);
}
-
+
/*
* Returns the number of s since Jan 1st, 1970.
* The given date is converted to GMT and daylight saving is taken into account too.
*/
private long dayNumber(long date) {
int ONE_DAY_MS= 24*60*60 * 1000; // one day in milli seconds
-
+
Calendar calendar= Calendar.getInstance();
long localTimeOffset= calendar.get(Calendar.ZONE_OFFSET) + calendar.get(Calendar.DST_OFFSET);
-
+
return (date + localTimeOffset) / ONE_DAY_MS;
}
-
+
/*
* Adds the given Pair to the edition tree.
* It takes care of creating tree nodes for different dates.
@@ -1026,25 +1026,25 @@ public class EditionSelectionDialog extends ResizableDialog {
private void addEdition(Pair pair) {
if (fEditionTree == null || fEditionTree.isDisposed())
return;
-
+
// find last day
TreeItem[] days= fEditionTree.getItems();
TreeItem lastDay= null;
if (days.length > 0)
lastDay= days[days.length-1];
-
+
boolean first= lastDay == null;
-
+
ITypedElement edition= pair.getEdition();
ITypedElement item= pair.getItem();
-
- long ldate= ((IModificationDate)edition).getModificationDate();
+
+ long ldate= ((IModificationDate)edition).getModificationDate();
long day= dayNumber(ldate);
Date date= new Date(ldate);
if (lastDay == null || day != dayNumber(((Date)lastDay.getData()).getTime())) {
lastDay= new TreeItem(fEditionTree, SWT.NONE);
if (fDateImage == null) {
- String iconName= Utilities.getString(fBundle, "dateIcon", "obj16/day_obj.gif"); //$NON-NLS-2$ //$NON-NLS-1$
+ String iconName= Utilities.getString(fBundle, "dateIcon", "obj16/day_obj.png"); //$NON-NLS-2$ //$NON-NLS-1$
ImageDescriptor id= CompareUIPlugin.getImageDescriptor(iconName);
if (id != null)
fDateImage= id.createImage();
@@ -1052,7 +1052,7 @@ public class EditionSelectionDialog extends ResizableDialog {
lastDay.setImage(fDateImage);
String df= DateFormat.getDateInstance().format(date);
long today= dayNumber(System.currentTimeMillis());
-
+
String formatKey;
if (day == today)
formatKey= "todayFormat"; //$NON-NLS-1$
@@ -1068,16 +1068,16 @@ public class EditionSelectionDialog extends ResizableDialog {
}
TreeItem ti= new TreeItem(lastDay, SWT.NONE);
ti.setImage(getEditionImage(edition, item));
-
+
String s= getShortEditionLabel(edition, item, date);
if (pair.fHasError) {
String pattern= Utilities.getString(fBundle, "parseErrorFormat"); //$NON-NLS-1$
s= MessageFormat.format(pattern, s);
}
ti.setText(s);
-
+
ti.setData(pair);
-
+
// determine selected TreeItem
TreeItem selection= first ? ti : null;
if (fMemberSelection != null) {
@@ -1095,11 +1095,11 @@ public class EditionSelectionDialog extends ResizableDialog {
fEditionTree.setFocus();
feedInput(selection);
}
-
+
if (first) // expand first node
lastDay.setExpanded(true);
}
-
+
/*
* Feeds selection from member viewer to edition viewer.
*/
@@ -1110,11 +1110,11 @@ public class EditionSelectionDialog extends ResizableDialog {
if (editions != fCurrentEditions) {
fCurrentEditions= editions;
fEditionTree.removeAll();
-
+
String pattern= Utilities.getString(fBundle, "treeTitleFormat"); //$NON-NLS-1$
String title= MessageFormat.format(pattern, new Object[] { ((Item)w).getText() });
fEditionPane.setText(title);
-
+
Iterator iter= editions.iterator();
while (iter.hasNext()) {
Object item= iter.next();
@@ -1124,7 +1124,7 @@ public class EditionSelectionDialog extends ResizableDialog {
}
}
}
-
+
private void setInput(Object input) {
if (!fCompare && input instanceof ICompareInput) {
ICompareInput ci= (ICompareInput) input;
@@ -1137,7 +1137,7 @@ public class EditionSelectionDialog extends ResizableDialog {
if (fStructuredComparePane != null)
fStructuredComparePane.setInput(input);
}
-
+
/*
* Feeds selection from edition viewer to content (and structure) viewer.
*/
@@ -1148,11 +1148,11 @@ public class EditionSelectionDialog extends ResizableDialog {
Pair pair= (Pair) input;
fSelectedItem= pair.getItem();
isOK= !pair.fHasError;
-
+
ITypedElement edition= pair.getEdition();
String editionLabel= getEditionLabel(edition, fSelectedItem);
Image editionImage= getEditionImage(edition, fSelectedItem);
-
+
if (fAddMode) {
if (fMemberSelection != null)
fMemberSelection.put(fCurrentEditions, fSelectedItem);
@@ -1182,7 +1182,7 @@ public class EditionSelectionDialog extends ResizableDialog {
fCommitButton.setEnabled(isOK && fSelectedItem != null && fTargetPair.getItem() != fSelectedItem);
}
}
-
+
/*
* Feeds selection from structure viewer to content viewer.
*/
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 281d9e50e..ee0261bd6 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
@@ -29,49 +29,49 @@ tooComplexError.message= Too many differences. Turn on the 'Ignore White Space'
action.CopyLeftToRight.label=Copy Left to Right
action.CopyLeftToRight.tooltip=Copy All Non-Conflicting Changes from Left to Right
-action.CopyLeftToRight.image=copy_r_co.gif
+action.CopyLeftToRight.image=copy_r_co.png
action.CopyRightToLeft.label=Copy Right to Left
action.CopyRightToLeft.tooltip=Copy All Non-Conflicting Changes from Right to Left
-action.CopyRightToLeft.image=copy_l_co.gif
+action.CopyRightToLeft.image=copy_l_co.png
action.CopyDiffLeftToRight.label=Copy Current Change to Right
action.CopyDiffLeftToRight.tooltip=Copy Current Change from Left to Right
-action.CopyDiffLeftToRight.image=copycont_r_co.gif
+action.CopyDiffLeftToRight.image=copycont_r_co.png
action.CopyDiffRightToLeft.label=Copy Current Change to Left
action.CopyDiffRightToLeft.tooltip=Copy Current Change from Right to Left
-action.CopyDiffRightToLeft.image=copycont_l_co.gif
+action.CopyDiffRightToLeft.image=copycont_l_co.png
action.NextDiff.label=Next Difference
action.NextDiff.tooltip=Next Difference
-action.NextDiff.image=next_diff_nav.gif
+action.NextDiff.image=next_diff_nav.png
action.PrevDiff.label=Previous Difference
action.PrevDiff.tooltip=Previous Difference
-action.PrevDiff.image=prev_diff_nav.gif
+action.PrevDiff.image=prev_diff_nav.png
action.NextChange.label=Next Change
action.NextChange.tooltip=Next Change
-action.NextChange.image=next_change_nav.gif
+action.NextChange.image=next_change_nav.png
action.PrevChange.label=Previous Change
action.PrevChange.tooltip=Previous Change
-action.PrevChange.image=prev_change_nav.gif
+action.PrevChange.image=prev_change_nav.png
action.EnableAncestor.label=Enable Ancestor Pane
action.EnableAncestor.tooltip.unchecked=Show Ancestor Pane
action.EnableAncestor.tooltip.checked=Hide Ancestor Pane
action.EnableAncestor.description.unchecked=Show Ancestor Pane
action.EnableAncestor.description.checked=Hide Ancestor Pane
-action.EnableAncestor.image=ancestorpane_co.gif
+action.EnableAncestor.image=ancestorpane_co.png
action.IgnoreAncestor.label=Ignore Ancestor
action.IgnoreAncestor.tooltip.unchecked=Two-Way Compare (Ignore Ancestor)
action.IgnoreAncestor.tooltip.checked=Three-Way Compare
action.IgnoreAncestor.description.unchecked=Two-Way Compare (Ignore Ancestor)
action.IgnoreAncestor.description.checked=Three-Way Compare
-action.IgnoreAncestor.image=twowaycompare_co.gif
+action.IgnoreAncestor.image=twowaycompare_co.png
action.SwitchLeftAndRight.label=Swap Left and Right View
action.SwitchLeftAndRight.tooltip=Swap Left and Right View
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryAction.properties b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryAction.properties
index a3779b1fb..b366f4077 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryAction.properties
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryAction.properties
@@ -18,8 +18,8 @@ title= Restore from Local History
memberPaneTitle= {0} - Available Files in Local History:
treeTitleFormat= Local History of ''{0}''
-dateIcon= obj16/day_obj.gif
-timeIcon= obj16/resource_obj.gif
+dateIcon= obj16/day_obj.png
+timeIcon= obj16/resource_obj.png
memberDescription= Check files to restore from local history:
editionDescription= Select an edition of a file:
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryDialog.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryDialog.java
index 23231bb83..05715989c 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryDialog.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryDialog.java
@@ -36,11 +36,11 @@ import org.eclipse.compare.*;
public class AddFromHistoryDialog extends ResizableDialog {
-
+
static class HistoryInput implements ITypedElement, IEncodedStreamContentAccessor, IModificationDate {
IFile fFile;
IFileState fFileState;
-
+
HistoryInput(IFile file, IFileState fileState) {
fFile= file;
fFileState= fileState;
@@ -72,20 +72,20 @@ public class AddFromHistoryDialog extends ResizableDialog {
return fFileState.getModificationTime();
}
}
-
+
static class FileHistory {
private IFile fFile;
private IFileState[] fStates;
private int fSelected;
-
+
FileHistory(IFile file) {
fFile= file;
}
-
+
IFile getFile() {
return fFile;
}
-
+
IFileState[] getStates() {
if (fStates == null) {
try {
@@ -96,11 +96,11 @@ public class AddFromHistoryDialog extends ResizableDialog {
}
return fStates;
}
-
+
IFileState getSelectedState() {
return getStates()[fSelected];
}
-
+
void setSelected(IFileState state) {
for (int i= 0; i < fStates.length; i++) {
if (fStates[i] == state) {
@@ -109,11 +109,11 @@ public class AddFromHistoryDialog extends ResizableDialog {
}
}
}
-
+
HistoryInput getHistoryInput() {
return new HistoryInput(fFile, getSelectedState());
}
-
+
boolean isSelected(int index) {
return index == fSelected;
}
@@ -136,26 +136,26 @@ public class AddFromHistoryDialog extends ResizableDialog {
public AddFromHistoryDialog(Shell parent, ResourceBundle bundle) {
super(parent, bundle);
-
- String iconName= Utilities.getString(fBundle, "dateIcon", "obj16/day_obj.gif"); //$NON-NLS-2$ //$NON-NLS-1$
+
+ String iconName= Utilities.getString(fBundle, "dateIcon", "obj16/day_obj.png"); //$NON-NLS-2$ //$NON-NLS-1$
ImageDescriptor id= CompareUIPlugin.getImageDescriptor(iconName);
if (id != null)
fDateImage= id.createImage();
- iconName= Utilities.getString(fBundle, "timeIcon", "obj16/resource_obj.gif"); //$NON-NLS-1$ //$NON-NLS-2$
+ iconName= Utilities.getString(fBundle, "timeIcon", "obj16/resource_obj.png"); //$NON-NLS-1$ //$NON-NLS-2$
id= CompareUIPlugin.getImageDescriptor(iconName);
if (id != null)
fTimeImage= id.createImage();
}
-
+
public boolean select(IContainer root, IFile[] inputFiles) {
-
+
create(); // create widgets
-
+
String format= Utilities.getString(fBundle, "memberPaneTitle"); //$NON-NLS-1$
String title= MessageFormat.format(format, root.getName());
fMemberPane.setImage(CompareUI.getImage(root));
fMemberPane.setText(title);
-
+
// sort input files
final int count= inputFiles.length;
final IFile[] files= new IFile[count];
@@ -163,20 +163,20 @@ public class AddFromHistoryDialog extends ResizableDialog {
files[i]= inputFiles[i];
if (count > 1)
internalSort(files, 0, count-1);
-
-
+
+
String prefix= root.getFullPath().toString();
-
+
if (fMemberTable != null && !fMemberTable.isDisposed()) {
for (int i = 0; i < files.length; i++) {
IFile file = files[i];
String path = file.getFullPath().toString();
-
+
// ignore a recently deleted file at the same path as the
// container
if (path.equals(prefix))
continue;
-
+
if (path.startsWith(prefix))
path = path.substring(prefix.length() + 1);
TableItem ti = new TableItem(fMemberTable, SWT.NONE);
@@ -185,12 +185,12 @@ public class AddFromHistoryDialog extends ResizableDialog {
ti.setData(new FileHistory(file));
}
}
-
+
open();
-
+
return (getReturnCode() == OK) && (fArrayList.size() > 0);
}
-
+
HistoryInput[] getSelected() {
HistoryInput[] selected= new HistoryInput[fArrayList.size()];
Iterator iter= fArrayList.iterator();
@@ -200,13 +200,13 @@ public class AddFromHistoryDialog extends ResizableDialog {
}
return selected;
}
-
+
protected synchronized Control createDialogArea(Composite parent2) {
-
+
Composite parent= (Composite) super.createDialogArea(parent2);
getShell().setText(Utilities.getString(fBundle, "title")); //$NON-NLS-1$
-
+
org.eclipse.compare.Splitter vsplitter= new org.eclipse.compare.Splitter(parent, SWT.VERTICAL);
vsplitter.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL
| GridData.VERTICAL_ALIGN_FILL | GridData.GRAB_VERTICAL));
@@ -221,10 +221,10 @@ public class AddFromHistoryDialog extends ResizableDialog {
}
}
);
-
+
// we need two panes: the left for the elements, the right one for the editions
Splitter hsplitter= new Splitter(vsplitter, SWT.HORIZONTAL);
-
+
Composite c= new Composite(hsplitter, SWT.NONE);
GridLayout layout= new GridLayout();
layout.marginWidth= 0;
@@ -249,7 +249,7 @@ public class AddFromHistoryDialog extends ResizableDialog {
fArrayList.add(ti.getData());
else
fArrayList.remove(ti.getData());
-
+
if (fCommitButton != null)
fCommitButton.setEnabled(fArrayList.size() > 0);
}
@@ -259,9 +259,9 @@ public class AddFromHistoryDialog extends ResizableDialog {
}
}
);
-
+
fMemberPane.setContent(fMemberTable);
-
+
c= new Composite(hsplitter, SWT.NONE);
layout= new GridLayout();
layout.marginWidth= 0;
@@ -274,7 +274,7 @@ public class AddFromHistoryDialog extends ResizableDialog {
fEditionPane= new CompareViewerPane(c, SWT.BORDER | SWT.FLAT);
gd= new GridData(GridData.FILL_HORIZONTAL | GridData.FILL_VERTICAL);
fEditionPane.setLayoutData(gd);
-
+
fEditionTree= new Tree(fEditionPane, SWT.H_SCROLL | SWT.V_SCROLL);
fEditionTree.addSelectionListener(
new SelectionAdapter() {
@@ -283,19 +283,19 @@ public class AddFromHistoryDialog extends ResizableDialog {
}
}
);
- fEditionPane.setContent(fEditionTree);
-
+ fEditionPane.setContent(fEditionTree);
+
applyDialogFont(parent); // to avoid applying font to compare viewer
fContentPane= new CompareViewerSwitchingPane(vsplitter, SWT.BORDER | SWT.FLAT) {
protected Viewer getViewer(Viewer oldViewer, Object input) {
- return CompareUI.findContentViewer(oldViewer, input, this, fCompareConfiguration);
+ return CompareUI.findContentViewer(oldViewer, input, this, fCompareConfiguration);
}
};
vsplitter.setWeights(new int[] { 30, 70 });
-
+
return parent;
}
-
+
/*
* Feeds selection from member viewer to edition viewer.
*/
@@ -304,18 +304,18 @@ public class AddFromHistoryDialog extends ResizableDialog {
if (w != null)
data= w.getData();
if (data instanceof FileHistory) {
-
+
FileHistory h= (FileHistory) data;
fCurrentFileHistory= h;
-
+
IFile file= h.getFile();
IFileState[] states= h.getStates();
-
+
fEditionPane.setImage(CompareUI.getImage(file));
String pattern= Utilities.getString(fBundle, "treeTitleFormat"); //$NON-NLS-1$
String title= MessageFormat.format(pattern, file.getName());
fEditionPane.setText(title);
-
+
if (fEditionTree != null) {
fEditionTree.setRedraw(false);
fEditionTree.removeAll();
@@ -327,7 +327,7 @@ public class AddFromHistoryDialog extends ResizableDialog {
} else
fCurrentFileHistory= null;
}
-
+
/*
* Adds the given Pair to the edition tree.
* It takes care of creating tree nodes for different dates.
@@ -335,16 +335,16 @@ public class AddFromHistoryDialog extends ResizableDialog {
private void addEdition(HistoryInput input, boolean isSelected) {
if (fEditionTree == null || fEditionTree.isDisposed())
return;
-
+
IFileState state= input.fFileState;
-
+
// find last day
TreeItem[] days= fEditionTree.getItems();
TreeItem lastDay= null;
if (days.length > 0)
lastDay= days[days.length-1];
-
- long ldate= state.getModificationTime();
+
+ long ldate= state.getModificationTime();
long day= dayNumber(ldate);
Date date= new Date(ldate);
if (lastDay == null || day != dayNumber(((Date)lastDay.getData()).getTime())) {
@@ -352,7 +352,7 @@ public class AddFromHistoryDialog extends ResizableDialog {
lastDay.setImage(fDateImage);
String df= DateFormat.getDateInstance().format(date);
long today= dayNumber(System.currentTimeMillis());
-
+
String formatKey;
if (day == today)
formatKey= "todayFormat"; //$NON-NLS-1$
@@ -377,20 +377,20 @@ public class AddFromHistoryDialog extends ResizableDialog {
feedContent(ti);
}
}
-
+
/*
* Returns the number of s since Jan 1st, 1970.
* The given date is converted to GMT and daylight saving is taken into account too.
*/
private long dayNumber(long date) {
int ONE_DAY_MS= 24*60*60 * 1000; // one day in milli seconds
-
+
Calendar calendar= Calendar.getInstance();
long localTimeOffset= calendar.get(Calendar.ZONE_OFFSET) + calendar.get(Calendar.DST_OFFSET);
-
+
return (date + localTimeOffset) / ONE_DAY_MS;
}
-
+
/*
* Feeds the tree viewer's selection to the contentviewer
*/
@@ -402,7 +402,7 @@ public class AddFromHistoryDialog extends ResizableDialog {
fContentPane.setInput(selected);
fContentPane.setText(getEditionLabel(selected));
fContentPane.setImage(fTimeImage);
-
+
if (fCurrentFileHistory != null)
fCurrentFileHistory.setSelected(selected.fFileState);
} else {
@@ -410,20 +410,20 @@ public class AddFromHistoryDialog extends ResizableDialog {
}
}
}
-
+
protected String getEditionLabel(HistoryInput input) {
String format= Utilities.getString(fBundle, "historyEditionLabel", null); //$NON-NLS-1$
if (format == null)
format= Utilities.getString(fBundle, "editionLabel"); //$NON-NLS-1$
if (format == null)
format= "x{0}"; //$NON-NLS-1$
-
+
long modDate= input.getModificationDate();
String date= DateFormat.getDateTimeInstance().format(new Date(modDate));
-
+
return MessageFormat.format(format, date);
}
-
+
/* (non-Javadoc)
* Method declared on Dialog.
*/
@@ -434,7 +434,7 @@ public class AddFromHistoryDialog extends ResizableDialog {
fCommitButton.setEnabled(false);
createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false);
}
-
+
/*
* Returns true if the pathname of f1 comes after f2
*/
@@ -444,7 +444,7 @@ public class AddFromHistoryDialog extends ResizableDialog {
int l1= ss1.length;
int l2= ss2.length;
int n= Math.max(l1, l2);
-
+
for (int i= 0; i < n; i++) {
String s1= i < l1 ? ss1[i] : ""; //$NON-NLS-1$
String s2= i < l2 ? ss2[i] : ""; //$NON-NLS-1$
@@ -454,33 +454,33 @@ public class AddFromHistoryDialog extends ResizableDialog {
}
return false;
}
-
- private static void internalSort(IFile[] keys, int left, int right) {
-
+
+ private static void internalSort(IFile[] keys, int left, int right) {
+
int original_left= left;
int original_right= right;
-
- IFile mid= keys[(left + right) / 2];
- do {
+
+ IFile mid= keys[(left + right) / 2];
+ do {
while (greaterThan(keys[left], mid))
- left++;
-
+ left++;
+
while (greaterThan(mid, keys[right]))
- right--;
-
- if (left <= right) {
- IFile tmp= keys[left];
- keys[left]= keys[right];
- keys[right]= tmp;
- left++;
- right--;
- }
+ right--;
+
+ if (left <= right) {
+ IFile tmp= keys[left];
+ keys[left]= keys[right];
+ keys[right]= tmp;
+ left++;
+ right--;
+ }
} while (left <= right);
-
+
if (original_left < right)
- internalSort(keys, original_left, right);
-
+ internalSort(keys, original_left, right);
+
if (left < original_right)
- internalSort(keys, left, original_right);
+ internalSort(keys, left, original_right);
}
}
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareContentViewerSwitchingPane.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareContentViewerSwitchingPane.java
index b50f30d46..f1b6a24c1 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareContentViewerSwitchingPane.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareContentViewerSwitchingPane.java
@@ -55,7 +55,7 @@ import org.eclipse.compare.structuremergeviewer.ICompareInput;
public class CompareContentViewerSwitchingPane extends
CompareViewerSwitchingPane {
- private static final String OPTIMIZED_INFO_IMAGE_NAME = "obj16/message_info.gif"; //$NON-NLS-1$
+ private static final String OPTIMIZED_INFO_IMAGE_NAME = "obj16/message_info.png"; //$NON-NLS-1$
public static final String OPTIMIZED_ALGORITHM_USED = "OPTIMIZED_ALGORITHM_USED"; //$NON-NLS-1$
public static final String DISABLE_CAPPING_TEMPORARILY = "DISABLE_CAPPING_TEMPORARILY"; //$NON-NLS-1$
@@ -206,7 +206,7 @@ public class CompareContentViewerSwitchingPane extends
if (menuShowing)
return;
menuShowing= true;
-
+
ViewerDescriptor[] vd = CompareUIPlugin.getDefault()
.findContentViewerDescriptor(getViewer(), getInput(),
getCompareConfiguration());
@@ -222,7 +222,7 @@ public class CompareContentViewerSwitchingPane extends
defaultItem.setSelection(fSelectedViewerDescriptor == null);
new MenuItem(menu, SWT.SEPARATOR);
-
+
// add others
for (int i = 0; i < vd.length; i++) {
final ViewerDescriptor vdi = vd[i];
@@ -239,14 +239,14 @@ public class CompareContentViewerSwitchingPane extends
item.addSelectionListener(createSelectionListener(vdi));
item.setSelection(vdi == fSelectedViewerDescriptor);
}
-
+
// 2. show
Rectangle bounds = toolBar.getItem(0).getBounds();
Point topLeft = new Point(bounds.x, bounds.y + bounds.height);
topLeft = toolBar.toDisplay(topLeft);
menu.setLocation(topLeft.x, topLeft.y);
menu.setVisible(true);
-
+
// 3. dispose on close
menu.addMenuListener(new MenuAdapter() {
public void menuHidden(MenuEvent e) {
@@ -305,7 +305,7 @@ public class CompareContentViewerSwitchingPane extends
}
}
}
-
+
public void addMouseListener(MouseListener listener) {
Composite c = (Composite) getTopLeft();
Control[] children = c.getChildren();
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareWithEditionAction.properties b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareWithEditionAction.properties
index 46c3c605b..13b7f6f51 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareWithEditionAction.properties
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareWithEditionAction.properties
@@ -16,8 +16,8 @@
title= Compare with Local History
treeTitleFormat= Local History of ''{0}''
-dateIcon= obj16/day_obj.gif
-timeIcon= obj16/resource_obj.gif
+dateIcon= obj16/day_obj.png
+timeIcon= obj16/resource_obj.png
treeFormat= {0}
workspaceTreeFormat= {0} (Workspace File)
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ICompareUIConstants.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ICompareUIConstants.java
index 8c0641678..2b92c3af3 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ICompareUIConstants.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ICompareUIConstants.java
@@ -13,35 +13,35 @@ package org.eclipse.compare.internal;
public interface ICompareUIConstants {
public final String PREFIX = CompareUIPlugin.getPluginId() + "."; //$NON-NLS-1$
-
- public static final String DTOOL_NEXT= "dlcl16/next_nav.gif"; //$NON-NLS-1$
- public static final String ETOOL_NEXT= "elcl16/next_nav.gif"; //$NON-NLS-1$
+
+ public static final String DTOOL_NEXT= "dlcl16/next_nav.png"; //$NON-NLS-1$
+ public static final String ETOOL_NEXT= "elcl16/next_nav.png"; //$NON-NLS-1$
public static final String CTOOL_NEXT= ETOOL_NEXT;
-
- public static final String DTOOL_PREV= "dlcl16/prev_nav.gif"; //$NON-NLS-1$
- public static final String ETOOL_PREV= "elcl16/prev_nav.gif"; //$NON-NLS-1$
+
+ public static final String DTOOL_PREV= "dlcl16/prev_nav.png"; //$NON-NLS-1$
+ public static final String ETOOL_PREV= "elcl16/prev_nav.png"; //$NON-NLS-1$
public static final String CTOOL_PREV= ETOOL_PREV;
-
- public static final String HUNK_OBJ = "obj16/hunk_obj.gif"; //$NON-NLS-1$
-
- public static final String ERROR_OVERLAY= "ovr16/error_ov.gif"; //$NON-NLS-1$
- public static final String IS_MERGED_OVERLAY= "ovr16/merged_ov.gif"; //$NON-NLS-1$
- public static final String REMOVED_OVERLAY= "ovr16/removed_ov.gif"; //$NON-NLS-1$
- public static final String WARNING_OVERLAY= "ovr16/warning_ov.gif"; //$NON-NLS-1$
-
- public static final String RETARGET_PROJECT= "eview16/compare_view.gif"; //$NON-NLS-1$
-
- public static final String IGNORE_WHITESPACE_ENABLED= "etool16/ignorews_edit.gif"; //$NON-NLS-1$
- public static final String IGNORE_WHITESPACE_DISABLED= "dtool16/ignorews_edit.gif"; //$NON-NLS-1$
-
+
+ public static final String HUNK_OBJ = "obj16/hunk_obj.png"; //$NON-NLS-1$
+
+ public static final String ERROR_OVERLAY= "ovr16/error_ov.png"; //$NON-NLS-1$
+ public static final String IS_MERGED_OVERLAY= "ovr16/merged_ov.png"; //$NON-NLS-1$
+ public static final String REMOVED_OVERLAY= "ovr16/removed_ov.png"; //$NON-NLS-1$
+ public static final String WARNING_OVERLAY= "ovr16/warning_ov.png"; //$NON-NLS-1$
+
+ public static final String RETARGET_PROJECT= "eview16/compare_view.png"; //$NON-NLS-1$
+
+ public static final String IGNORE_WHITESPACE_ENABLED= "etool16/ignorews_edit.png"; //$NON-NLS-1$
+ public static final String IGNORE_WHITESPACE_DISABLED= "dtool16/ignorews_edit.png"; //$NON-NLS-1$
+
public static final String PROP_ANCESTOR_VISIBLE = PREFIX + "AncestorVisible"; //$NON-NLS-1$
public static final String PROP_IGNORE_ANCESTOR = PREFIX + "IgnoreAncestor"; //$NON-NLS-1$
public static final String PROP_TITLE = PREFIX + "Title"; //$NON-NLS-1$
public static final String PROP_TITLE_IMAGE = PREFIX + "TitleImage"; //$NON-NLS-1$
public static final String PROP_SELECTED_EDITION = PREFIX + "SelectedEdition"; //$NON-NLS-1$
-
+
public static final int COMPARE_IMAGE_WIDTH= 22;
-
+
public static final String PREF_NAVIGATION_END_ACTION= PREFIX + "NavigationEndAction"; //$NON-NLS-1$
public static final String PREF_NAVIGATION_END_ACTION_LOCAL= PREFIX + "NavigationEndActionLocal"; //$NON-NLS-1$
public static final String PREF_VALUE_PROMPT = "prompt"; //$NON-NLS-1$
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ImageMergeViewerResources.properties b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ImageMergeViewerResources.properties
index 197855ca8..291dd84f1 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ImageMergeViewerResources.properties
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ImageMergeViewerResources.properties
@@ -21,15 +21,15 @@ title= Image Compare
action.CopyLeftToRight.label= Copy Left to Right
action.CopyLeftToRight.tooltip= Copy Image from Left to Right
-action.CopyLeftToRight.image= elcl16/copy_r_co.gif
+action.CopyLeftToRight.image= elcl16/copy_r_co.png
action.CopyRightToLeft.label= Copy Right to Left
action.CopyRightToLeft.tooltip= Copy Image from Right to Left
-action.CopyRightToLeft.image= elcl16/copy_l_co.gif
+action.CopyRightToLeft.image= elcl16/copy_l_co.png
action.EnableAncestor.label= Enable Ancestor Pane
action.EnableAncestor.tooltip= Control Visibility of Ancestor Pane
-action.EnableAncestor.image= elcl16/ancestorpane_co.gif
+action.EnableAncestor.image= elcl16/ancestorpane_co.png
action.SwitchLeftAndRight.label=Swap Left and Right View
action.SwitchLeftAndRight.tooltip=Swap Left and Right View
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ReplaceWithEditionAction.properties b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ReplaceWithEditionAction.properties
index 2c8527b09..0ea9588f8 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ReplaceWithEditionAction.properties
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ReplaceWithEditionAction.properties
@@ -16,8 +16,8 @@
title= Replace from Local History
treeTitleFormat= Local History of ''{0}''
-dateIcon= obj16/day_obj.gif
-timeIcon= obj16/resource_obj.gif
+dateIcon= obj16/day_obj.png
+timeIcon= obj16/resource_obj.png
treeFormat= {0}
workspaceTreeFormat= {0} (Workspace File)
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewerResources.properties b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewerResources.properties
index 99dd9af02..bd7e2ffda 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewerResources.properties
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewerResources.properties
@@ -28,7 +28,7 @@ emptyMenuItem= <Empty Menu>
action.Smart.label=Smart
action.Smart.tooltip=Guess Similar Elements
-action.Smart.image=smartmode_co.gif
+action.Smart.image=smartmode_co.png
action.ExpandAll.label=Expand All
action.ExpandAll.tooltip=Expand All Nodes
@@ -38,16 +38,16 @@ action.CompareContents.tooltip= Show Content Comparison
action.NextDiff.label=Next
action.NextDiff.tooltip=Select Next Change
-action.NextDiff.image=next_nav.gif
+action.NextDiff.image=next_nav.png
action.PrevDiff.label=Previous
action.PrevDiff.tooltip=Select Previous Change
-action.PrevDiff.image=prev_nav.gif
+action.PrevDiff.image=prev_nav.png
action.TakeLeft.label=Copy Left to Right
action.TakeLeft.tooltip=Copy Selected Nodes from Left to Right
-action.TakeLeft.image=copycont_r_co.gif
+action.TakeLeft.image=copycont_r_co.png
action.TakeRight.label=Copy Right to Left
action.TakeRight.tooltip=Copy Selected Nodes from Right to Left
-action.TakeRight.image=copycont_l_co.gif
+action.TakeRight.image=copycont_l_co.png

Back to the top