diff options
author | Matthias Becker | 2016-09-22 11:02:45 +0000 |
---|---|---|
committer | Matthias Becker | 2016-09-27 06:38:22 +0000 |
commit | 5ee45ccc30b17601d1a332c034a6a9e3dd843718 (patch) | |
tree | e2ebbca438cd862c1a269a78272bbbeb37c858f5 | |
parent | b89030ec4dc43f99253fbbadfb7dde498f2e4379 (diff) | |
download | eclipse.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>
437 files changed, 587 insertions, 531 deletions
diff --git a/bundles/org.eclipse.compare.win32/icons/full/dlcl16/save.gif b/bundles/org.eclipse.compare.win32/icons/full/dlcl16/save.gif Binary files differdeleted file mode 100644 index ad505a9c2..000000000 --- a/bundles/org.eclipse.compare.win32/icons/full/dlcl16/save.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare.win32/icons/full/dlcl16/save.png b/bundles/org.eclipse.compare.win32/icons/full/dlcl16/save.png Binary files differnew file mode 100644 index 000000000..9c9fb6489 --- /dev/null +++ b/bundles/org.eclipse.compare.win32/icons/full/dlcl16/save.png diff --git a/bundles/org.eclipse.compare.win32/icons/full/dlcl16/save@2x.png b/bundles/org.eclipse.compare.win32/icons/full/dlcl16/save@2x.png Binary files differnew file mode 100644 index 000000000..ac5ba98a9 --- /dev/null +++ b/bundles/org.eclipse.compare.win32/icons/full/dlcl16/save@2x.png diff --git a/bundles/org.eclipse.compare.win32/icons/full/elcl16/editor_area.gif b/bundles/org.eclipse.compare.win32/icons/full/elcl16/editor_area.gif Binary files differdeleted file mode 100644 index 4b6b76831..000000000 --- a/bundles/org.eclipse.compare.win32/icons/full/elcl16/editor_area.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare.win32/icons/full/elcl16/editor_area.png b/bundles/org.eclipse.compare.win32/icons/full/elcl16/editor_area.png Binary files differnew file mode 100644 index 000000000..eb5ecd5bd --- /dev/null +++ b/bundles/org.eclipse.compare.win32/icons/full/elcl16/editor_area.png diff --git a/bundles/org.eclipse.compare.win32/icons/full/elcl16/editor_area@2x.png b/bundles/org.eclipse.compare.win32/icons/full/elcl16/editor_area@2x.png Binary files differnew file mode 100644 index 000000000..7b5260eda --- /dev/null +++ b/bundles/org.eclipse.compare.win32/icons/full/elcl16/editor_area@2x.png diff --git a/bundles/org.eclipse.compare.win32/icons/full/elcl16/save.gif b/bundles/org.eclipse.compare.win32/icons/full/elcl16/save.gif Binary files differdeleted file mode 100644 index 499dd0ca6..000000000 --- a/bundles/org.eclipse.compare.win32/icons/full/elcl16/save.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare.win32/icons/full/elcl16/save.png b/bundles/org.eclipse.compare.win32/icons/full/elcl16/save.png Binary files differnew file mode 100644 index 000000000..a55c29525 --- /dev/null +++ b/bundles/org.eclipse.compare.win32/icons/full/elcl16/save.png diff --git a/bundles/org.eclipse.compare.win32/icons/full/elcl16/save@2x.png b/bundles/org.eclipse.compare.win32/icons/full/elcl16/save@2x.png Binary files differnew file mode 100644 index 000000000..0ef852e7f --- /dev/null +++ b/bundles/org.eclipse.compare.win32/icons/full/elcl16/save@2x.png diff --git a/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/WordMergeViewer.properties b/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/WordMergeViewer.properties index 7b5d5c4bc..16dccd0fd 100644 --- a/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/WordMergeViewer.properties +++ b/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/WordMergeViewer.properties @@ -11,8 +11,8 @@ action.save.label=Save action.save.tooltip=Save the changes to the Word document comparison -action.save.image=save.gif +action.save.image=save.png action.inplace.label=Edit Inplace action.inplace.tooltip=Toggle whether the word document is edited in-place or in a separate window -action.inplace.image=editor_area.gif
\ No newline at end of file +action.inplace.image=editor_area.png 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 diff --git a/bundles/org.eclipse.compare/icons/full/dlcl16/ancestorpane_co.gif b/bundles/org.eclipse.compare/icons/full/dlcl16/ancestorpane_co.gif Binary files differdeleted file mode 100644 index a021812e0..000000000 --- a/bundles/org.eclipse.compare/icons/full/dlcl16/ancestorpane_co.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/dlcl16/ancestorpane_co.png b/bundles/org.eclipse.compare/icons/full/dlcl16/ancestorpane_co.png Binary files differnew file mode 100644 index 000000000..f1a17721c --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/dlcl16/ancestorpane_co.png diff --git a/bundles/org.eclipse.compare/icons/full/dlcl16/ancestorpane_co@2x.png b/bundles/org.eclipse.compare/icons/full/dlcl16/ancestorpane_co@2x.png Binary files differnew file mode 100644 index 000000000..f9846e7b0 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/dlcl16/ancestorpane_co@2x.png diff --git a/bundles/org.eclipse.compare/icons/full/dlcl16/copy_l_co.gif b/bundles/org.eclipse.compare/icons/full/dlcl16/copy_l_co.gif Binary files differdeleted file mode 100644 index 172e2a4ea..000000000 --- a/bundles/org.eclipse.compare/icons/full/dlcl16/copy_l_co.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/dlcl16/copy_l_co.png b/bundles/org.eclipse.compare/icons/full/dlcl16/copy_l_co.png Binary files differnew file mode 100644 index 000000000..ab31b88e6 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/dlcl16/copy_l_co.png diff --git a/bundles/org.eclipse.compare/icons/full/dlcl16/copy_l_co@2x.png b/bundles/org.eclipse.compare/icons/full/dlcl16/copy_l_co@2x.png Binary files differnew file mode 100644 index 000000000..33bf3dd58 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/dlcl16/copy_l_co@2x.png diff --git a/bundles/org.eclipse.compare/icons/full/dlcl16/copy_r_co.gif b/bundles/org.eclipse.compare/icons/full/dlcl16/copy_r_co.gif Binary files differdeleted file mode 100644 index 4cb42a1db..000000000 --- a/bundles/org.eclipse.compare/icons/full/dlcl16/copy_r_co.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/dlcl16/copy_r_co.png b/bundles/org.eclipse.compare/icons/full/dlcl16/copy_r_co.png Binary files differnew file mode 100644 index 000000000..d7185adf9 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/dlcl16/copy_r_co.png diff --git a/bundles/org.eclipse.compare/icons/full/dlcl16/copy_r_co@2x.png b/bundles/org.eclipse.compare/icons/full/dlcl16/copy_r_co@2x.png Binary files differnew file mode 100644 index 000000000..7f69b10f8 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/dlcl16/copy_r_co@2x.png diff --git a/bundles/org.eclipse.compare/icons/full/dlcl16/copycont_l_co.gif b/bundles/org.eclipse.compare/icons/full/dlcl16/copycont_l_co.gif Binary files differdeleted file mode 100644 index 16539cd9f..000000000 --- a/bundles/org.eclipse.compare/icons/full/dlcl16/copycont_l_co.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/dlcl16/copycont_l_co.png b/bundles/org.eclipse.compare/icons/full/dlcl16/copycont_l_co.png Binary files differnew file mode 100644 index 000000000..7765d92e8 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/dlcl16/copycont_l_co.png diff --git a/bundles/org.eclipse.compare/icons/full/dlcl16/copycont_l_co@2x.png b/bundles/org.eclipse.compare/icons/full/dlcl16/copycont_l_co@2x.png Binary files differnew file mode 100644 index 000000000..c1265fb05 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/dlcl16/copycont_l_co@2x.png diff --git a/bundles/org.eclipse.compare/icons/full/dlcl16/copycont_r_co.gif b/bundles/org.eclipse.compare/icons/full/dlcl16/copycont_r_co.gif Binary files differdeleted file mode 100644 index 036abe05f..000000000 --- a/bundles/org.eclipse.compare/icons/full/dlcl16/copycont_r_co.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/dlcl16/copycont_r_co.png b/bundles/org.eclipse.compare/icons/full/dlcl16/copycont_r_co.png Binary files differnew file mode 100644 index 000000000..51d21cb99 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/dlcl16/copycont_r_co.png diff --git a/bundles/org.eclipse.compare/icons/full/dlcl16/copycont_r_co@2x.png b/bundles/org.eclipse.compare/icons/full/dlcl16/copycont_r_co@2x.png Binary files differnew file mode 100644 index 000000000..3856a5578 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/dlcl16/copycont_r_co@2x.png diff --git a/bundles/org.eclipse.compare/icons/full/dlcl16/next_change_nav.gif b/bundles/org.eclipse.compare/icons/full/dlcl16/next_change_nav.gif Binary files differdeleted file mode 100644 index 226805054..000000000 --- a/bundles/org.eclipse.compare/icons/full/dlcl16/next_change_nav.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/dlcl16/next_change_nav.png b/bundles/org.eclipse.compare/icons/full/dlcl16/next_change_nav.png Binary files differnew file mode 100644 index 000000000..894dd6e87 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/dlcl16/next_change_nav.png diff --git a/bundles/org.eclipse.compare/icons/full/dlcl16/next_change_nav@2x.png b/bundles/org.eclipse.compare/icons/full/dlcl16/next_change_nav@2x.png Binary files differnew file mode 100644 index 000000000..b4e4787b8 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/dlcl16/next_change_nav@2x.png diff --git a/bundles/org.eclipse.compare/icons/full/dlcl16/next_diff_nav.gif b/bundles/org.eclipse.compare/icons/full/dlcl16/next_diff_nav.gif Binary files differdeleted file mode 100644 index 6e9483add..000000000 --- a/bundles/org.eclipse.compare/icons/full/dlcl16/next_diff_nav.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/dlcl16/next_diff_nav.png b/bundles/org.eclipse.compare/icons/full/dlcl16/next_diff_nav.png Binary files differnew file mode 100644 index 000000000..19133b3c3 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/dlcl16/next_diff_nav.png diff --git a/bundles/org.eclipse.compare/icons/full/dlcl16/next_diff_nav@2x.png b/bundles/org.eclipse.compare/icons/full/dlcl16/next_diff_nav@2x.png Binary files differnew file mode 100644 index 000000000..b5d577a76 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/dlcl16/next_diff_nav@2x.png diff --git a/bundles/org.eclipse.compare/icons/full/dlcl16/next_nav.gif b/bundles/org.eclipse.compare/icons/full/dlcl16/next_nav.gif Binary files differdeleted file mode 100644 index 8aacf959d..000000000 --- a/bundles/org.eclipse.compare/icons/full/dlcl16/next_nav.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/dlcl16/next_nav.png b/bundles/org.eclipse.compare/icons/full/dlcl16/next_nav.png Binary files differnew file mode 100644 index 000000000..1a71a7923 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/dlcl16/next_nav.png diff --git a/bundles/org.eclipse.compare/icons/full/dlcl16/next_nav@2x.png b/bundles/org.eclipse.compare/icons/full/dlcl16/next_nav@2x.png Binary files differnew file mode 100644 index 000000000..064c3002c --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/dlcl16/next_nav@2x.png diff --git a/bundles/org.eclipse.compare/icons/full/dlcl16/prev_change_nav.gif b/bundles/org.eclipse.compare/icons/full/dlcl16/prev_change_nav.gif Binary files differdeleted file mode 100644 index 3b3b46ed2..000000000 --- a/bundles/org.eclipse.compare/icons/full/dlcl16/prev_change_nav.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/dlcl16/prev_change_nav.png b/bundles/org.eclipse.compare/icons/full/dlcl16/prev_change_nav.png Binary files differnew file mode 100644 index 000000000..e33e63f83 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/dlcl16/prev_change_nav.png diff --git a/bundles/org.eclipse.compare/icons/full/dlcl16/prev_change_nav@2x.png b/bundles/org.eclipse.compare/icons/full/dlcl16/prev_change_nav@2x.png Binary files differnew file mode 100644 index 000000000..2f94b1161 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/dlcl16/prev_change_nav@2x.png diff --git a/bundles/org.eclipse.compare/icons/full/dlcl16/prev_diff_nav.gif b/bundles/org.eclipse.compare/icons/full/dlcl16/prev_diff_nav.gif Binary files differdeleted file mode 100644 index 458dbe3fa..000000000 --- a/bundles/org.eclipse.compare/icons/full/dlcl16/prev_diff_nav.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/dlcl16/prev_diff_nav.png b/bundles/org.eclipse.compare/icons/full/dlcl16/prev_diff_nav.png Binary files differnew file mode 100644 index 000000000..5f13782f7 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/dlcl16/prev_diff_nav.png diff --git a/bundles/org.eclipse.compare/icons/full/dlcl16/prev_diff_nav@2x.png b/bundles/org.eclipse.compare/icons/full/dlcl16/prev_diff_nav@2x.png Binary files differnew file mode 100644 index 000000000..c2ce083af --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/dlcl16/prev_diff_nav@2x.png diff --git a/bundles/org.eclipse.compare/icons/full/dlcl16/prev_nav.gif b/bundles/org.eclipse.compare/icons/full/dlcl16/prev_nav.gif Binary files differdeleted file mode 100644 index 38841abe9..000000000 --- a/bundles/org.eclipse.compare/icons/full/dlcl16/prev_nav.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/dlcl16/prev_nav.png b/bundles/org.eclipse.compare/icons/full/dlcl16/prev_nav.png Binary files differnew file mode 100644 index 000000000..7eaaff979 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/dlcl16/prev_nav.png diff --git a/bundles/org.eclipse.compare/icons/full/dlcl16/prev_nav@2x.png b/bundles/org.eclipse.compare/icons/full/dlcl16/prev_nav@2x.png Binary files differnew file mode 100644 index 000000000..0b95e38b5 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/dlcl16/prev_nav@2x.png diff --git a/bundles/org.eclipse.compare/icons/full/dlcl16/smartmode_co.gif b/bundles/org.eclipse.compare/icons/full/dlcl16/smartmode_co.gif Binary files differdeleted file mode 100644 index 0ddac91a1..000000000 --- a/bundles/org.eclipse.compare/icons/full/dlcl16/smartmode_co.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/dlcl16/smartmode_co.png b/bundles/org.eclipse.compare/icons/full/dlcl16/smartmode_co.png Binary files differnew file mode 100644 index 000000000..ef1e8e539 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/dlcl16/smartmode_co.png diff --git a/bundles/org.eclipse.compare/icons/full/dlcl16/smartmode_co@2x.png b/bundles/org.eclipse.compare/icons/full/dlcl16/smartmode_co@2x.png Binary files differnew file mode 100644 index 000000000..4ed96c528 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/dlcl16/smartmode_co@2x.png diff --git a/bundles/org.eclipse.compare/icons/full/dlcl16/switch.png b/bundles/org.eclipse.compare/icons/full/dlcl16/switch.png Binary files differindex f3132b9dc..142923bd7 100644 --- a/bundles/org.eclipse.compare/icons/full/dlcl16/switch.png +++ b/bundles/org.eclipse.compare/icons/full/dlcl16/switch.png diff --git a/bundles/org.eclipse.compare/icons/full/dlcl16/switch@2x.png b/bundles/org.eclipse.compare/icons/full/dlcl16/switch@2x.png Binary files differnew file mode 100644 index 000000000..5bd8e0851 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/dlcl16/switch@2x.png diff --git a/bundles/org.eclipse.compare/icons/full/dlcl16/syncpane_co.gif b/bundles/org.eclipse.compare/icons/full/dlcl16/syncpane_co.gif Binary files differdeleted file mode 100644 index 7da48249e..000000000 --- a/bundles/org.eclipse.compare/icons/full/dlcl16/syncpane_co.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/dlcl16/syncpane_co.png b/bundles/org.eclipse.compare/icons/full/dlcl16/syncpane_co.png Binary files differnew file mode 100644 index 000000000..cbbf40e83 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/dlcl16/syncpane_co.png diff --git a/bundles/org.eclipse.compare/icons/full/dlcl16/syncpane_co@2x.png b/bundles/org.eclipse.compare/icons/full/dlcl16/syncpane_co@2x.png Binary files differnew file mode 100644 index 000000000..0c86044b9 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/dlcl16/syncpane_co@2x.png diff --git a/bundles/org.eclipse.compare/icons/full/dlcl16/twowaycompare_co.gif b/bundles/org.eclipse.compare/icons/full/dlcl16/twowaycompare_co.gif Binary files differdeleted file mode 100644 index 8cdef204b..000000000 --- a/bundles/org.eclipse.compare/icons/full/dlcl16/twowaycompare_co.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/dlcl16/twowaycompare_co.png b/bundles/org.eclipse.compare/icons/full/dlcl16/twowaycompare_co.png Binary files differnew file mode 100644 index 000000000..fb833123b --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/dlcl16/twowaycompare_co.png diff --git a/bundles/org.eclipse.compare/icons/full/dlcl16/twowaycompare_co@2x.png b/bundles/org.eclipse.compare/icons/full/dlcl16/twowaycompare_co@2x.png Binary files differnew file mode 100644 index 000000000..84f8a2be8 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/dlcl16/twowaycompare_co@2x.png diff --git a/bundles/org.eclipse.compare/icons/full/dtool16/conflict_edit.gif b/bundles/org.eclipse.compare/icons/full/dtool16/conflict_edit.gif Binary files differdeleted file mode 100644 index 398c71927..000000000 --- a/bundles/org.eclipse.compare/icons/full/dtool16/conflict_edit.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/dtool16/conflict_edit.png b/bundles/org.eclipse.compare/icons/full/dtool16/conflict_edit.png Binary files differnew file mode 100644 index 000000000..d15bf5429 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/dtool16/conflict_edit.png diff --git a/bundles/org.eclipse.compare/icons/full/dtool16/conflict_edit@2x.png b/bundles/org.eclipse.compare/icons/full/dtool16/conflict_edit@2x.png Binary files differnew file mode 100644 index 000000000..17e7286e6 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/dtool16/conflict_edit@2x.png diff --git a/bundles/org.eclipse.compare/icons/full/dtool16/ignorews_edit.gif b/bundles/org.eclipse.compare/icons/full/dtool16/ignorews_edit.gif Binary files differdeleted file mode 100644 index 702f0a83b..000000000 --- a/bundles/org.eclipse.compare/icons/full/dtool16/ignorews_edit.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/dtool16/ignorews_edit.png b/bundles/org.eclipse.compare/icons/full/dtool16/ignorews_edit.png Binary files differnew file mode 100644 index 000000000..769b3f1bc --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/dtool16/ignorews_edit.png diff --git a/bundles/org.eclipse.compare/icons/full/dtool16/ignorews_edit@2x.png b/bundles/org.eclipse.compare/icons/full/dtool16/ignorews_edit@2x.png Binary files differnew file mode 100644 index 000000000..ad16bc384 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/dtool16/ignorews_edit@2x.png diff --git a/bundles/org.eclipse.compare/icons/full/elcl16/ancestorpane_co.gif b/bundles/org.eclipse.compare/icons/full/elcl16/ancestorpane_co.gif Binary files differdeleted file mode 100644 index ff06855e7..000000000 --- a/bundles/org.eclipse.compare/icons/full/elcl16/ancestorpane_co.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/elcl16/ancestorpane_co.png b/bundles/org.eclipse.compare/icons/full/elcl16/ancestorpane_co.png Binary files differnew file mode 100644 index 000000000..861bd2dd5 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/elcl16/ancestorpane_co.png diff --git a/bundles/org.eclipse.compare/icons/full/elcl16/ancestorpane_co@2x.png b/bundles/org.eclipse.compare/icons/full/elcl16/ancestorpane_co@2x.png Binary files differnew file mode 100644 index 000000000..f03064044 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/elcl16/ancestorpane_co@2x.png diff --git a/bundles/org.eclipse.compare/icons/full/elcl16/copy_l_co.gif b/bundles/org.eclipse.compare/icons/full/elcl16/copy_l_co.gif Binary files differdeleted file mode 100644 index e029948cf..000000000 --- a/bundles/org.eclipse.compare/icons/full/elcl16/copy_l_co.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/elcl16/copy_l_co.png b/bundles/org.eclipse.compare/icons/full/elcl16/copy_l_co.png Binary files differnew file mode 100644 index 000000000..eaff3fd8e --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/elcl16/copy_l_co.png diff --git a/bundles/org.eclipse.compare/icons/full/elcl16/copy_l_co@2x.png b/bundles/org.eclipse.compare/icons/full/elcl16/copy_l_co@2x.png Binary files differnew file mode 100644 index 000000000..12e3459e8 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/elcl16/copy_l_co@2x.png diff --git a/bundles/org.eclipse.compare/icons/full/elcl16/copy_r_co.gif b/bundles/org.eclipse.compare/icons/full/elcl16/copy_r_co.gif Binary files differdeleted file mode 100644 index 0659813a1..000000000 --- a/bundles/org.eclipse.compare/icons/full/elcl16/copy_r_co.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/elcl16/copy_r_co.png b/bundles/org.eclipse.compare/icons/full/elcl16/copy_r_co.png Binary files differnew file mode 100644 index 000000000..379bde557 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/elcl16/copy_r_co.png diff --git a/bundles/org.eclipse.compare/icons/full/elcl16/copy_r_co@2x.png b/bundles/org.eclipse.compare/icons/full/elcl16/copy_r_co@2x.png Binary files differnew file mode 100644 index 000000000..e14759a42 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/elcl16/copy_r_co@2x.png diff --git a/bundles/org.eclipse.compare/icons/full/elcl16/copycont_l_co.gif b/bundles/org.eclipse.compare/icons/full/elcl16/copycont_l_co.gif Binary files differdeleted file mode 100644 index db2b1e3d5..000000000 --- a/bundles/org.eclipse.compare/icons/full/elcl16/copycont_l_co.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/elcl16/copycont_l_co.png b/bundles/org.eclipse.compare/icons/full/elcl16/copycont_l_co.png Binary files differnew file mode 100644 index 000000000..3bb4b1f79 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/elcl16/copycont_l_co.png diff --git a/bundles/org.eclipse.compare/icons/full/elcl16/copycont_l_co@2x.png b/bundles/org.eclipse.compare/icons/full/elcl16/copycont_l_co@2x.png Binary files differnew file mode 100644 index 000000000..bebb86c15 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/elcl16/copycont_l_co@2x.png diff --git a/bundles/org.eclipse.compare/icons/full/elcl16/copycont_r_co.gif b/bundles/org.eclipse.compare/icons/full/elcl16/copycont_r_co.gif Binary files differdeleted file mode 100644 index 9ebd50a9f..000000000 --- a/bundles/org.eclipse.compare/icons/full/elcl16/copycont_r_co.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/elcl16/copycont_r_co.png b/bundles/org.eclipse.compare/icons/full/elcl16/copycont_r_co.png Binary files differnew file mode 100644 index 000000000..92a7f0472 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/elcl16/copycont_r_co.png diff --git a/bundles/org.eclipse.compare/icons/full/elcl16/copycont_r_co@2x.png b/bundles/org.eclipse.compare/icons/full/elcl16/copycont_r_co@2x.png Binary files differnew file mode 100644 index 000000000..22cbaffc7 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/elcl16/copycont_r_co@2x.png diff --git a/bundles/org.eclipse.compare/icons/full/elcl16/next_change_nav.gif b/bundles/org.eclipse.compare/icons/full/elcl16/next_change_nav.gif Binary files differdeleted file mode 100644 index 6f7b27759..000000000 --- a/bundles/org.eclipse.compare/icons/full/elcl16/next_change_nav.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/elcl16/next_change_nav.png b/bundles/org.eclipse.compare/icons/full/elcl16/next_change_nav.png Binary files differnew file mode 100644 index 000000000..68f928d1a --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/elcl16/next_change_nav.png diff --git a/bundles/org.eclipse.compare/icons/full/elcl16/next_change_nav@2x.png b/bundles/org.eclipse.compare/icons/full/elcl16/next_change_nav@2x.png Binary files differnew file mode 100644 index 000000000..4dbf85c63 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/elcl16/next_change_nav@2x.png diff --git a/bundles/org.eclipse.compare/icons/full/elcl16/next_diff_nav.gif b/bundles/org.eclipse.compare/icons/full/elcl16/next_diff_nav.gif Binary files differdeleted file mode 100644 index 79cda1359..000000000 --- a/bundles/org.eclipse.compare/icons/full/elcl16/next_diff_nav.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/elcl16/next_diff_nav.png b/bundles/org.eclipse.compare/icons/full/elcl16/next_diff_nav.png Binary files differnew file mode 100644 index 000000000..185fed40e --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/elcl16/next_diff_nav.png diff --git a/bundles/org.eclipse.compare/icons/full/elcl16/next_diff_nav@2x.png b/bundles/org.eclipse.compare/icons/full/elcl16/next_diff_nav@2x.png Binary files differnew file mode 100644 index 000000000..fce245ed8 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/elcl16/next_diff_nav@2x.png diff --git a/bundles/org.eclipse.compare/icons/full/elcl16/next_nav.gif b/bundles/org.eclipse.compare/icons/full/elcl16/next_nav.gif Binary files differdeleted file mode 100644 index 072b18445..000000000 --- a/bundles/org.eclipse.compare/icons/full/elcl16/next_nav.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/elcl16/next_nav.png b/bundles/org.eclipse.compare/icons/full/elcl16/next_nav.png Binary files differnew file mode 100644 index 000000000..9fcc646d9 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/elcl16/next_nav.png diff --git a/bundles/org.eclipse.compare/icons/full/elcl16/next_nav@2x.png b/bundles/org.eclipse.compare/icons/full/elcl16/next_nav@2x.png Binary files differnew file mode 100644 index 000000000..d46b3a062 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/elcl16/next_nav@2x.png diff --git a/bundles/org.eclipse.compare/icons/full/elcl16/next_nav_into.gif b/bundles/org.eclipse.compare/icons/full/elcl16/next_nav_into.gif Binary files differdeleted file mode 100644 index 75d165bcd..000000000 --- a/bundles/org.eclipse.compare/icons/full/elcl16/next_nav_into.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/elcl16/next_nav_into.png b/bundles/org.eclipse.compare/icons/full/elcl16/next_nav_into.png Binary files differnew file mode 100644 index 000000000..11728ec79 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/elcl16/next_nav_into.png diff --git a/bundles/org.eclipse.compare/icons/full/elcl16/next_nav_into@2x.png b/bundles/org.eclipse.compare/icons/full/elcl16/next_nav_into@2x.png Binary files differnew file mode 100644 index 000000000..9f3229360 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/elcl16/next_nav_into@2x.png diff --git a/bundles/org.eclipse.compare/icons/full/elcl16/prev_change_nav.gif b/bundles/org.eclipse.compare/icons/full/elcl16/prev_change_nav.gif Binary files differdeleted file mode 100644 index 3e79ebfa2..000000000 --- a/bundles/org.eclipse.compare/icons/full/elcl16/prev_change_nav.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/elcl16/prev_change_nav.png b/bundles/org.eclipse.compare/icons/full/elcl16/prev_change_nav.png Binary files differnew file mode 100644 index 000000000..affe807ba --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/elcl16/prev_change_nav.png diff --git a/bundles/org.eclipse.compare/icons/full/elcl16/prev_change_nav@2x.png b/bundles/org.eclipse.compare/icons/full/elcl16/prev_change_nav@2x.png Binary files differnew file mode 100644 index 000000000..5762d22d9 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/elcl16/prev_change_nav@2x.png diff --git a/bundles/org.eclipse.compare/icons/full/elcl16/prev_diff_nav.gif b/bundles/org.eclipse.compare/icons/full/elcl16/prev_diff_nav.gif Binary files differdeleted file mode 100644 index d5a96ec97..000000000 --- a/bundles/org.eclipse.compare/icons/full/elcl16/prev_diff_nav.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/elcl16/prev_diff_nav.png b/bundles/org.eclipse.compare/icons/full/elcl16/prev_diff_nav.png Binary files differnew file mode 100644 index 000000000..6681da70d --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/elcl16/prev_diff_nav.png diff --git a/bundles/org.eclipse.compare/icons/full/elcl16/prev_diff_nav@2x.png b/bundles/org.eclipse.compare/icons/full/elcl16/prev_diff_nav@2x.png Binary files differnew file mode 100644 index 000000000..e6d572ab2 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/elcl16/prev_diff_nav@2x.png diff --git a/bundles/org.eclipse.compare/icons/full/elcl16/prev_nav.gif b/bundles/org.eclipse.compare/icons/full/elcl16/prev_nav.gif Binary files differdeleted file mode 100644 index 091e88400..000000000 --- a/bundles/org.eclipse.compare/icons/full/elcl16/prev_nav.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/elcl16/prev_nav.png b/bundles/org.eclipse.compare/icons/full/elcl16/prev_nav.png Binary files differnew file mode 100644 index 000000000..f2e6a039c --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/elcl16/prev_nav.png diff --git a/bundles/org.eclipse.compare/icons/full/elcl16/prev_nav@2x.png b/bundles/org.eclipse.compare/icons/full/elcl16/prev_nav@2x.png Binary files differnew file mode 100644 index 000000000..8e26ea4b4 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/elcl16/prev_nav@2x.png diff --git a/bundles/org.eclipse.compare/icons/full/elcl16/prev_nav_into.gif b/bundles/org.eclipse.compare/icons/full/elcl16/prev_nav_into.gif Binary files differdeleted file mode 100644 index ea342e6ce..000000000 --- a/bundles/org.eclipse.compare/icons/full/elcl16/prev_nav_into.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/elcl16/prev_nav_into.png b/bundles/org.eclipse.compare/icons/full/elcl16/prev_nav_into.png Binary files differnew file mode 100644 index 000000000..ffb735a5c --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/elcl16/prev_nav_into.png diff --git a/bundles/org.eclipse.compare/icons/full/elcl16/prev_nav_into@2x.png b/bundles/org.eclipse.compare/icons/full/elcl16/prev_nav_into@2x.png Binary files differnew file mode 100644 index 000000000..5ac405704 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/elcl16/prev_nav_into@2x.png diff --git a/bundles/org.eclipse.compare/icons/full/elcl16/smartmode_co.gif b/bundles/org.eclipse.compare/icons/full/elcl16/smartmode_co.gif Binary files differdeleted file mode 100644 index 542dddca3..000000000 --- a/bundles/org.eclipse.compare/icons/full/elcl16/smartmode_co.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/elcl16/smartmode_co.png b/bundles/org.eclipse.compare/icons/full/elcl16/smartmode_co.png Binary files differnew file mode 100644 index 000000000..3b2a2d2d1 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/elcl16/smartmode_co.png diff --git a/bundles/org.eclipse.compare/icons/full/elcl16/smartmode_co@2x.png b/bundles/org.eclipse.compare/icons/full/elcl16/smartmode_co@2x.png Binary files differnew file mode 100644 index 000000000..f939a4dd7 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/elcl16/smartmode_co@2x.png diff --git a/bundles/org.eclipse.compare/icons/full/elcl16/switch.png b/bundles/org.eclipse.compare/icons/full/elcl16/switch.png Binary files differindex 96cef47ee..09b8d8563 100644 --- a/bundles/org.eclipse.compare/icons/full/elcl16/switch.png +++ b/bundles/org.eclipse.compare/icons/full/elcl16/switch.png diff --git a/bundles/org.eclipse.compare/icons/full/elcl16/switch@2x.png b/bundles/org.eclipse.compare/icons/full/elcl16/switch@2x.png Binary files differnew file mode 100644 index 000000000..bda7d5a59 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/elcl16/switch@2x.png diff --git a/bundles/org.eclipse.compare/icons/full/elcl16/syncpane_co.gif b/bundles/org.eclipse.compare/icons/full/elcl16/syncpane_co.gif Binary files differdeleted file mode 100644 index 2644c2ad6..000000000 --- a/bundles/org.eclipse.compare/icons/full/elcl16/syncpane_co.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/elcl16/syncpane_co.png b/bundles/org.eclipse.compare/icons/full/elcl16/syncpane_co.png Binary files differnew file mode 100644 index 000000000..6a83c1e3f --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/elcl16/syncpane_co.png diff --git a/bundles/org.eclipse.compare/icons/full/elcl16/syncpane_co@2x.png b/bundles/org.eclipse.compare/icons/full/elcl16/syncpane_co@2x.png Binary files differnew file mode 100644 index 000000000..ce42092ee --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/elcl16/syncpane_co@2x.png diff --git a/bundles/org.eclipse.compare/icons/full/elcl16/twowaycompare_co.gif b/bundles/org.eclipse.compare/icons/full/elcl16/twowaycompare_co.gif Binary files differdeleted file mode 100644 index 12788bafa..000000000 --- a/bundles/org.eclipse.compare/icons/full/elcl16/twowaycompare_co.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/elcl16/twowaycompare_co.png b/bundles/org.eclipse.compare/icons/full/elcl16/twowaycompare_co.png Binary files differnew file mode 100644 index 000000000..5a40dc80d --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/elcl16/twowaycompare_co.png diff --git a/bundles/org.eclipse.compare/icons/full/elcl16/twowaycompare_co@2x.png b/bundles/org.eclipse.compare/icons/full/elcl16/twowaycompare_co@2x.png Binary files differnew file mode 100644 index 000000000..018291550 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/elcl16/twowaycompare_co@2x.png diff --git a/bundles/org.eclipse.compare/icons/full/etool16/conflict_edit.gif b/bundles/org.eclipse.compare/icons/full/etool16/conflict_edit.gif Binary files differdeleted file mode 100644 index 48a7d1d58..000000000 --- a/bundles/org.eclipse.compare/icons/full/etool16/conflict_edit.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/etool16/conflict_edit.png b/bundles/org.eclipse.compare/icons/full/etool16/conflict_edit.png Binary files differnew file mode 100644 index 000000000..0172cfce8 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/etool16/conflict_edit.png diff --git a/bundles/org.eclipse.compare/icons/full/etool16/conflict_edit@2x.png b/bundles/org.eclipse.compare/icons/full/etool16/conflict_edit@2x.png Binary files differnew file mode 100644 index 000000000..f0a769030 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/etool16/conflict_edit@2x.png diff --git a/bundles/org.eclipse.compare/icons/full/etool16/ignorews_edit.gif b/bundles/org.eclipse.compare/icons/full/etool16/ignorews_edit.gif Binary files differdeleted file mode 100644 index 0b22e4a1a..000000000 --- a/bundles/org.eclipse.compare/icons/full/etool16/ignorews_edit.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/etool16/ignorews_edit.png b/bundles/org.eclipse.compare/icons/full/etool16/ignorews_edit.png Binary files differnew file mode 100644 index 000000000..e31080820 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/etool16/ignorews_edit.png diff --git a/bundles/org.eclipse.compare/icons/full/etool16/ignorews_edit@2x.png b/bundles/org.eclipse.compare/icons/full/etool16/ignorews_edit@2x.png Binary files differnew file mode 100644 index 000000000..e965b526d --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/etool16/ignorews_edit@2x.png diff --git a/bundles/org.eclipse.compare/icons/full/eview16/compare_view.png b/bundles/org.eclipse.compare/icons/full/eview16/compare_view.png Binary files differnew file mode 100644 index 000000000..07fb14ee9 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/eview16/compare_view.png diff --git a/bundles/org.eclipse.compare/icons/full/eview16/compare_view@2x.png b/bundles/org.eclipse.compare/icons/full/eview16/compare_view@2x.png Binary files differnew file mode 100644 index 000000000..89c631a38 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/eview16/compare_view@2x.png diff --git a/bundles/org.eclipse.compare/icons/full/obj16/date_obj.png b/bundles/org.eclipse.compare/icons/full/obj16/date_obj.png Binary files differnew file mode 100644 index 000000000..ddcc80683 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/obj16/date_obj.png diff --git a/bundles/org.eclipse.compare/icons/full/obj16/date_obj@2x.png b/bundles/org.eclipse.compare/icons/full/obj16/date_obj@2x.png Binary files differnew file mode 100644 index 000000000..1021a6350 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/obj16/date_obj@2x.png diff --git a/bundles/org.eclipse.compare/icons/full/obj16/day_obj.gif b/bundles/org.eclipse.compare/icons/full/obj16/day_obj.gif Binary files differdeleted file mode 100644 index 4fc84e4c3..000000000 --- a/bundles/org.eclipse.compare/icons/full/obj16/day_obj.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/obj16/hunk_obj.gif b/bundles/org.eclipse.compare/icons/full/obj16/hunk_obj.gif Binary files differdeleted file mode 100644 index 353b6f38c..000000000 --- a/bundles/org.eclipse.compare/icons/full/obj16/hunk_obj.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/obj16/hunk_obj.png b/bundles/org.eclipse.compare/icons/full/obj16/hunk_obj.png Binary files differnew file mode 100644 index 000000000..6f6bcb48f --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/obj16/hunk_obj.png diff --git a/bundles/org.eclipse.compare/icons/full/obj16/hunk_obj@2x.png b/bundles/org.eclipse.compare/icons/full/obj16/hunk_obj@2x.png Binary files differnew file mode 100644 index 000000000..8ae395f8e --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/obj16/hunk_obj@2x.png diff --git a/bundles/org.eclipse.compare/icons/full/obj16/message_info.gif b/bundles/org.eclipse.compare/icons/full/obj16/message_info.gif Binary files differdeleted file mode 100644 index b484d9be1..000000000 --- a/bundles/org.eclipse.compare/icons/full/obj16/message_info.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/obj16/message_info.png b/bundles/org.eclipse.compare/icons/full/obj16/message_info.png Binary files differnew file mode 100644 index 000000000..7fe40bbfc --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/obj16/message_info.png diff --git a/bundles/org.eclipse.compare/icons/full/obj16/message_info@2x.png b/bundles/org.eclipse.compare/icons/full/obj16/message_info@2x.png Binary files differnew file mode 100644 index 000000000..a10214e11 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/obj16/message_info@2x.png diff --git a/bundles/org.eclipse.compare/icons/full/obj16/resource_obj.gif b/bundles/org.eclipse.compare/icons/full/obj16/resource_obj.gif Binary files differdeleted file mode 100644 index 3bd4e3605..000000000 --- a/bundles/org.eclipse.compare/icons/full/obj16/resource_obj.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/obj16/resource_obj.png b/bundles/org.eclipse.compare/icons/full/obj16/resource_obj.png Binary files differnew file mode 100644 index 000000000..eb6b492d9 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/obj16/resource_obj.png diff --git a/bundles/org.eclipse.compare/icons/full/obj16/resource_obj@2x.png b/bundles/org.eclipse.compare/icons/full/obj16/resource_obj@2x.png Binary files differnew file mode 100644 index 000000000..a8909618b --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/obj16/resource_obj@2x.png diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/add_ov.gif b/bundles/org.eclipse.compare/icons/full/ovr16/add_ov.gif Binary files differdeleted file mode 100644 index c123a2b13..000000000 --- a/bundles/org.eclipse.compare/icons/full/ovr16/add_ov.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/add_ov.png b/bundles/org.eclipse.compare/icons/full/ovr16/add_ov.png Binary files differnew file mode 100644 index 000000000..6005d8546 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/ovr16/add_ov.png diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/add_ov@2x.png b/bundles/org.eclipse.compare/icons/full/ovr16/add_ov@2x.png Binary files differnew file mode 100644 index 000000000..c85222ddc --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/ovr16/add_ov@2x.png diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/chg_ov.gif b/bundles/org.eclipse.compare/icons/full/ovr16/chg_ov.gif Binary files differdeleted file mode 100644 index 2b1b8d677..000000000 --- a/bundles/org.eclipse.compare/icons/full/ovr16/chg_ov.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/chg_ov.png b/bundles/org.eclipse.compare/icons/full/ovr16/chg_ov.png Binary files differnew file mode 100644 index 000000000..e44589376 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/ovr16/chg_ov.png diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/chg_ov@2x.png b/bundles/org.eclipse.compare/icons/full/ovr16/chg_ov@2x.png Binary files differnew file mode 100644 index 000000000..dd2c9145f --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/ovr16/chg_ov@2x.png diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/confadd_ov.gif b/bundles/org.eclipse.compare/icons/full/ovr16/confadd_ov.gif Binary files differdeleted file mode 100644 index 65101e939..000000000 --- a/bundles/org.eclipse.compare/icons/full/ovr16/confadd_ov.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/confadd_ov.png b/bundles/org.eclipse.compare/icons/full/ovr16/confadd_ov.png Binary files differnew file mode 100644 index 000000000..0949993fa --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/ovr16/confadd_ov.png diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/confadd_ov@2x.png b/bundles/org.eclipse.compare/icons/full/ovr16/confadd_ov@2x.png Binary files differnew file mode 100644 index 000000000..97024b25f --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/ovr16/confadd_ov@2x.png diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/confchg_ov.gif b/bundles/org.eclipse.compare/icons/full/ovr16/confchg_ov.gif Binary files differdeleted file mode 100644 index ee805f9ed..000000000 --- a/bundles/org.eclipse.compare/icons/full/ovr16/confchg_ov.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/confchg_ov.png b/bundles/org.eclipse.compare/icons/full/ovr16/confchg_ov.png Binary files differnew file mode 100644 index 000000000..228071da8 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/ovr16/confchg_ov.png diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/confchg_ov@2x.png b/bundles/org.eclipse.compare/icons/full/ovr16/confchg_ov@2x.png Binary files differnew file mode 100644 index 000000000..dbe4efa29 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/ovr16/confchg_ov@2x.png diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/confdel_ov.gif b/bundles/org.eclipse.compare/icons/full/ovr16/confdel_ov.gif Binary files differdeleted file mode 100644 index 980c0f84f..000000000 --- a/bundles/org.eclipse.compare/icons/full/ovr16/confdel_ov.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/confdel_ov.png b/bundles/org.eclipse.compare/icons/full/ovr16/confdel_ov.png Binary files differnew file mode 100644 index 000000000..f976a319a --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/ovr16/confdel_ov.png diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/confdel_ov@2x.png b/bundles/org.eclipse.compare/icons/full/ovr16/confdel_ov@2x.png Binary files differnew file mode 100644 index 000000000..18190f732 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/ovr16/confdel_ov@2x.png diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/del_ov.gif b/bundles/org.eclipse.compare/icons/full/ovr16/del_ov.gif Binary files differdeleted file mode 100644 index ef0207c62..000000000 --- a/bundles/org.eclipse.compare/icons/full/ovr16/del_ov.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/del_ov.png b/bundles/org.eclipse.compare/icons/full/ovr16/del_ov.png Binary files differnew file mode 100644 index 000000000..df71f0afc --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/ovr16/del_ov.png diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/del_ov@2x.png b/bundles/org.eclipse.compare/icons/full/ovr16/del_ov@2x.png Binary files differnew file mode 100644 index 000000000..11e16b6b2 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/ovr16/del_ov@2x.png diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/error_ov.gif b/bundles/org.eclipse.compare/icons/full/ovr16/error_ov.gif Binary files differdeleted file mode 100644 index 0bc60689c..000000000 --- a/bundles/org.eclipse.compare/icons/full/ovr16/error_ov.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/error_ov.png b/bundles/org.eclipse.compare/icons/full/ovr16/error_ov.png Binary files differnew file mode 100644 index 000000000..ac730c849 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/ovr16/error_ov.png diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/error_ov@2x.png b/bundles/org.eclipse.compare/icons/full/ovr16/error_ov@2x.png Binary files differnew file mode 100644 index 000000000..12f6520fe --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/ovr16/error_ov@2x.png diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/inadd_ov.gif b/bundles/org.eclipse.compare/icons/full/ovr16/inadd_ov.gif Binary files differdeleted file mode 100644 index 05a9f5a68..000000000 --- a/bundles/org.eclipse.compare/icons/full/ovr16/inadd_ov.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/inadd_ov.png b/bundles/org.eclipse.compare/icons/full/ovr16/inadd_ov.png Binary files differnew file mode 100644 index 000000000..8c87b7389 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/ovr16/inadd_ov.png diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/inadd_ov@2x.png b/bundles/org.eclipse.compare/icons/full/ovr16/inadd_ov@2x.png Binary files differnew file mode 100644 index 000000000..095fdbdc3 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/ovr16/inadd_ov@2x.png diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/inchg_ov.gif b/bundles/org.eclipse.compare/icons/full/ovr16/inchg_ov.gif Binary files differdeleted file mode 100644 index 12d4a9732..000000000 --- a/bundles/org.eclipse.compare/icons/full/ovr16/inchg_ov.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/inchg_ov.png b/bundles/org.eclipse.compare/icons/full/ovr16/inchg_ov.png Binary files differnew file mode 100644 index 000000000..9c35b0cf8 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/ovr16/inchg_ov.png diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/inchg_ov@2x.png b/bundles/org.eclipse.compare/icons/full/ovr16/inchg_ov@2x.png Binary files differnew file mode 100644 index 000000000..d48e8ad39 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/ovr16/inchg_ov@2x.png diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/indel_ov.gif b/bundles/org.eclipse.compare/icons/full/ovr16/indel_ov.gif Binary files differdeleted file mode 100644 index 373a68f14..000000000 --- a/bundles/org.eclipse.compare/icons/full/ovr16/indel_ov.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/indel_ov.png b/bundles/org.eclipse.compare/icons/full/ovr16/indel_ov.png Binary files differnew file mode 100644 index 000000000..ff37ce2d5 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/ovr16/indel_ov.png diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/indel_ov@2x.png b/bundles/org.eclipse.compare/icons/full/ovr16/indel_ov@2x.png Binary files differnew file mode 100644 index 000000000..262eff567 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/ovr16/indel_ov@2x.png diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/merged_ov.gif b/bundles/org.eclipse.compare/icons/full/ovr16/merged_ov.gif Binary files differdeleted file mode 100644 index 874a6dcea..000000000 --- a/bundles/org.eclipse.compare/icons/full/ovr16/merged_ov.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/merged_ov.png b/bundles/org.eclipse.compare/icons/full/ovr16/merged_ov.png Binary files differnew file mode 100644 index 000000000..ac2009536 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/ovr16/merged_ov.png diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/merged_ov@2x.png b/bundles/org.eclipse.compare/icons/full/ovr16/merged_ov@2x.png Binary files differnew file mode 100644 index 000000000..9083d8b1b --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/ovr16/merged_ov@2x.png diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/outadd_ov.gif b/bundles/org.eclipse.compare/icons/full/ovr16/outadd_ov.gif Binary files differdeleted file mode 100644 index 63fb2967c..000000000 --- a/bundles/org.eclipse.compare/icons/full/ovr16/outadd_ov.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/outadd_ov.png b/bundles/org.eclipse.compare/icons/full/ovr16/outadd_ov.png Binary files differnew file mode 100644 index 000000000..8c2c822af --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/ovr16/outadd_ov.png diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/outadd_ov@2x.png b/bundles/org.eclipse.compare/icons/full/ovr16/outadd_ov@2x.png Binary files differnew file mode 100644 index 000000000..cf0ff6551 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/ovr16/outadd_ov@2x.png diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/outchg_ov.gif b/bundles/org.eclipse.compare/icons/full/ovr16/outchg_ov.gif Binary files differdeleted file mode 100644 index 78321d74d..000000000 --- a/bundles/org.eclipse.compare/icons/full/ovr16/outchg_ov.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/outchg_ov.png b/bundles/org.eclipse.compare/icons/full/ovr16/outchg_ov.png Binary files differnew file mode 100644 index 000000000..2e70f67aa --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/ovr16/outchg_ov.png diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/outchg_ov@2x.png b/bundles/org.eclipse.compare/icons/full/ovr16/outchg_ov@2x.png Binary files differnew file mode 100644 index 000000000..cec6aaaa0 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/ovr16/outchg_ov@2x.png diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/outdel_ov.gif b/bundles/org.eclipse.compare/icons/full/ovr16/outdel_ov.gif Binary files differdeleted file mode 100644 index 7182e5596..000000000 --- a/bundles/org.eclipse.compare/icons/full/ovr16/outdel_ov.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/outdel_ov.png b/bundles/org.eclipse.compare/icons/full/ovr16/outdel_ov.png Binary files differnew file mode 100644 index 000000000..0cfa71e1e --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/ovr16/outdel_ov.png diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/outdel_ov@2x.png b/bundles/org.eclipse.compare/icons/full/ovr16/outdel_ov@2x.png Binary files differnew file mode 100644 index 000000000..824246f0c --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/ovr16/outdel_ov@2x.png 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 differdeleted file mode 100644 index 0ac0cea9e..000000000 --- a/bundles/org.eclipse.compare/icons/full/ovr16/r_inadd_ov.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/r_inadd_ov.png b/bundles/org.eclipse.compare/icons/full/ovr16/r_inadd_ov.png Binary files differnew file mode 100644 index 000000000..d55b1eb6b --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/ovr16/r_inadd_ov.png diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/r_inadd_ov@2x.png b/bundles/org.eclipse.compare/icons/full/ovr16/r_inadd_ov@2x.png Binary files differnew file mode 100644 index 000000000..78152fe74 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/ovr16/r_inadd_ov@2x.png 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 differdeleted file mode 100644 index c330c0c9f..000000000 --- a/bundles/org.eclipse.compare/icons/full/ovr16/r_inchg_ov.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/r_inchg_ov.png b/bundles/org.eclipse.compare/icons/full/ovr16/r_inchg_ov.png Binary files differnew file mode 100644 index 000000000..d30129bbf --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/ovr16/r_inchg_ov.png diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/r_inchg_ov@2x.png b/bundles/org.eclipse.compare/icons/full/ovr16/r_inchg_ov@2x.png Binary files differnew file mode 100644 index 000000000..9a89aa141 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/ovr16/r_inchg_ov@2x.png 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 differdeleted file mode 100644 index 5acab6778..000000000 --- a/bundles/org.eclipse.compare/icons/full/ovr16/r_indel_ov.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/r_indel_ov.png b/bundles/org.eclipse.compare/icons/full/ovr16/r_indel_ov.png Binary files differnew file mode 100644 index 000000000..450f8c941 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/ovr16/r_indel_ov.png diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/r_indel_ov@2x.png b/bundles/org.eclipse.compare/icons/full/ovr16/r_indel_ov@2x.png Binary files differnew file mode 100644 index 000000000..c2691ba8d --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/ovr16/r_indel_ov@2x.png 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 differdeleted file mode 100644 index 69607651f..000000000 --- a/bundles/org.eclipse.compare/icons/full/ovr16/r_outadd_ov.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/r_outadd_ov.png b/bundles/org.eclipse.compare/icons/full/ovr16/r_outadd_ov.png Binary files differnew file mode 100644 index 000000000..5fd383948 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/ovr16/r_outadd_ov.png diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/r_outadd_ov@2x.png b/bundles/org.eclipse.compare/icons/full/ovr16/r_outadd_ov@2x.png Binary files differnew file mode 100644 index 000000000..0329d343e --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/ovr16/r_outadd_ov@2x.png 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 differdeleted file mode 100644 index 17ba1af4f..000000000 --- a/bundles/org.eclipse.compare/icons/full/ovr16/r_outchg_ov.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/r_outchg_ov.png b/bundles/org.eclipse.compare/icons/full/ovr16/r_outchg_ov.png Binary files differnew file mode 100644 index 000000000..485219308 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/ovr16/r_outchg_ov.png diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/r_outchg_ov@2x.png b/bundles/org.eclipse.compare/icons/full/ovr16/r_outchg_ov@2x.png Binary files differnew file mode 100644 index 000000000..c184cb096 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/ovr16/r_outchg_ov@2x.png 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 differdeleted file mode 100644 index ef6b8b745..000000000 --- a/bundles/org.eclipse.compare/icons/full/ovr16/r_outdel_ov.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/r_outdel_ov.png b/bundles/org.eclipse.compare/icons/full/ovr16/r_outdel_ov.png Binary files differnew file mode 100644 index 000000000..dfb05463f --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/ovr16/r_outdel_ov.png diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/r_outdel_ov@2x.png b/bundles/org.eclipse.compare/icons/full/ovr16/r_outdel_ov@2x.png Binary files differnew file mode 100644 index 000000000..63412633e --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/ovr16/r_outdel_ov@2x.png diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/removed_ov.gif b/bundles/org.eclipse.compare/icons/full/ovr16/removed_ov.gif Binary files differdeleted file mode 100644 index 045d88f09..000000000 --- a/bundles/org.eclipse.compare/icons/full/ovr16/removed_ov.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/removed_ov.png b/bundles/org.eclipse.compare/icons/full/ovr16/removed_ov.png Binary files differnew file mode 100644 index 000000000..57d762d0e --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/ovr16/removed_ov.png diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/removed_ov@2x.png b/bundles/org.eclipse.compare/icons/full/ovr16/removed_ov@2x.png Binary files differnew file mode 100644 index 000000000..83494a4ba --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/ovr16/removed_ov@2x.png diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/warning_ov.gif b/bundles/org.eclipse.compare/icons/full/ovr16/warning_ov.gif Binary files differdeleted file mode 100644 index 2b2e50fe7..000000000 --- a/bundles/org.eclipse.compare/icons/full/ovr16/warning_ov.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/warning_ov.png b/bundles/org.eclipse.compare/icons/full/ovr16/warning_ov.png Binary files differnew file mode 100644 index 000000000..bd1268dcc --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/ovr16/warning_ov.png diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/warning_ov@2x.png b/bundles/org.eclipse.compare/icons/full/ovr16/warning_ov@2x.png Binary files differnew file mode 100644 index 000000000..25131c584 --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/ovr16/warning_ov@2x.png diff --git a/bundles/org.eclipse.compare/icons/full/wizban/applypatch_wizban.png b/bundles/org.eclipse.compare/icons/full/wizban/applypatch_wizban.png Binary files differindex 30839984c..6685ce374 100644 --- a/bundles/org.eclipse.compare/icons/full/wizban/applypatch_wizban.png +++ b/bundles/org.eclipse.compare/icons/full/wizban/applypatch_wizban.png diff --git a/bundles/org.eclipse.compare/icons/full/wizban/applypatch_wizban@2x.png b/bundles/org.eclipse.compare/icons/full/wizban/applypatch_wizban@2x.png Binary files differnew file mode 100644 index 000000000..2e9058cee --- /dev/null +++ b/bundles/org.eclipse.compare/icons/full/wizban/applypatch_wizban@2x.png diff --git a/bundles/org.eclipse.compare/plugin.properties b/bundles/org.eclipse.compare/plugin.properties index d314944f8..020faec70 100644 --- a/bundles/org.eclipse.compare/plugin.properties +++ b/bundles/org.eclipse.compare/plugin.properties @@ -116,7 +116,7 @@ ComparePreferencePage.showMoreInfo.label= &Show additional compare information i ComparePreferencePage.ignoreWhitespace.label= Ignore &white space ComparePreferencePage.saveBeforePatching.label= A&utomatically save dirty editors before browsing patches -ComparePreferencePage.regex.description=Enter regular expressions used to identify added or removed lines in a patch\n(e.g. '^\\+\\s*\\S' for an added line with at least one word character). +ComparePreferencePage.regex.description=Enter regular expressions used to identify added or removed lines in a patch\n(e.g. '^\\+\\s*\\S' for an added line with at least one word character). ComparePreferencePage.regexAdded.label=Added lines ComparePreferencePage.regexRemoved.label=Removed lines @@ -177,15 +177,15 @@ CompareEditorInput.defaultTitle= Compare # action.IgnoreWhiteSpace.label=Ignore White Space action.IgnoreWhiteSpace.tooltip=Ignore White Space Where Applicable -action.IgnoreWhiteSpace.image=etool16/ignorews_edit.gif +action.IgnoreWhiteSpace.image=etool16/ignorews_edit.png action.Next.label=Next Difference action.Next.tooltip=Next Difference -action.Next.image=elcl16/next_diff_nav.gif +action.Next.image=elcl16/next_diff_nav.png action.Previous.label=Previous Difference action.Previous.tooltip=Previous Difference -action.Previous.image=elcl16/prev_diff_nav.gif +action.Previous.image=elcl16/prev_diff_nav.png # # Built in Structure Creators diff --git a/bundles/org.eclipse.compare/plugin.xml b/bundles/org.eclipse.compare/plugin.xml index f3acf4641..347239b3c 100644 --- a/bundles/org.eclipse.compare/plugin.xml +++ b/bundles/org.eclipse.compare/plugin.xml @@ -6,7 +6,7 @@ are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html - + Contributors: IBM Corporation - initial API and implementation --> @@ -74,7 +74,7 @@ </description> </fontDefinition> </extension> - + <extension id="rejectedPatchMarker" name="%rejectedPatchMarker.name" @@ -90,13 +90,13 @@ point="org.eclipse.ui.editors"> <editor name="%defaultCompareEditor.name" - icon="$nl$/icons/full/eview16/compare_view.gif" + icon="$nl$/icons/full/eview16/compare_view.png" contributorClass="org.eclipse.compare.internal.CompareEditorContributor" class="org.eclipse.compare.internal.CompareEditor" id="org.eclipse.compare.CompareEditor"> </editor> </extension> - + <extension point="org.eclipse.ui.preferencePages"> <page @@ -107,14 +107,14 @@ <keywordReference id="org.eclipse.compare.general"/> </page> </extension> - + <extension point="org.eclipse.ui.keywords"> <keyword label="%preferenceKeywords.general" id="org.eclipse.compare.general"/> </extension> - + <!-- commands and their bindings --> <extension @@ -126,7 +126,7 @@ id="org.eclipse.compare.compareEditorScope"> </context> </extension> - + <extension point="org.eclipse.ui.commands"> <category @@ -184,7 +184,7 @@ name="%Command.compareWithOther.name"> </command> </extension> - + <extension point="org.eclipse.ui.popupMenus"> <objectContribution @@ -286,7 +286,7 @@ </action> </objectContribution> </extension> - + <extension point="org.eclipse.compare.streamMergers"> <streamMerger @@ -299,7 +299,7 @@ streamMergerId="org.eclipse.compare.internal.merge.TextStreamMerger"> </contentTypeBinding> </extension> - + <extension point="org.eclipse.compare.structureCreators"> <structureCreator @@ -308,7 +308,7 @@ id="org.eclipse.compare.ZipFileStructureCreator"> </structureCreator> </extension> - + <extension point="org.eclipse.compare.contentMergeViewers"> <viewer @@ -334,7 +334,7 @@ contentMergeViewerId="org.eclipse.compare.TextMergeViewerCreator"> </contentTypeBinding> </extension> - + <extension point="org.eclipse.compare.contentViewers"> <viewer diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/catchup_rls.gif b/bundles/org.eclipse.team.ui/icons/full/dlcl16/catchup_rls.gif Binary files differdeleted file mode 100644 index b22c4d1f2..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/dlcl16/catchup_rls.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/catchup_rls.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/catchup_rls.png Binary files differnew file mode 100644 index 000000000..b03f14e18 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/catchup_rls.png diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/catchup_rls@2x.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/catchup_rls@2x.png Binary files differnew file mode 100644 index 000000000..a69d1d911 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/catchup_rls@2x.png diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/catchuprelease_rls.gif b/bundles/org.eclipse.team.ui/icons/full/dlcl16/catchuprelease_rls.gif Binary files differdeleted file mode 100644 index 92ad07000..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/dlcl16/catchuprelease_rls.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/catchuprelease_rls.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/catchuprelease_rls.png Binary files differnew file mode 100644 index 000000000..cce26d421 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/catchuprelease_rls.png diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/catchuprelease_rls@2x.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/catchuprelease_rls@2x.png Binary files differnew file mode 100644 index 000000000..103ed9959 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/catchuprelease_rls@2x.png diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/checkin_action.gif b/bundles/org.eclipse.team.ui/icons/full/dlcl16/checkin_action.gif Binary files differdeleted file mode 100644 index 9c244761d..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/dlcl16/checkin_action.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/checkin_action.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/checkin_action.png Binary files differnew file mode 100644 index 000000000..51d21cb99 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/checkin_action.png diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/checkin_action@2x.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/checkin_action@2x.png Binary files differnew file mode 100644 index 000000000..3856a5578 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/checkin_action@2x.png diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/checkout_action.gif b/bundles/org.eclipse.team.ui/icons/full/dlcl16/checkout_action.gif Binary files differdeleted file mode 100644 index 64d44db79..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/dlcl16/checkout_action.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/checkout_action.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/checkout_action.png Binary files differnew file mode 100644 index 000000000..7765d92e8 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/checkout_action.png diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/checkout_action@2x.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/checkout_action@2x.png Binary files differnew file mode 100644 index 000000000..c1265fb05 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/checkout_action@2x.png diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/clear_co.gif b/bundles/org.eclipse.team.ui/icons/full/dlcl16/clear_co.gif Binary files differdeleted file mode 100644 index 6775edfab..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/dlcl16/clear_co.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/clear_co.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/clear_co.png Binary files differnew file mode 100644 index 000000000..5848f399b --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/clear_co.png diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/collapseall.gif b/bundles/org.eclipse.team.ui/icons/full/dlcl16/collapseall.gif Binary files differdeleted file mode 100644 index 7dc0de513..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/dlcl16/collapseall.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/collapseall.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/collapseall.png Binary files differnew file mode 100644 index 000000000..957f39420 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/collapseall.png diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/conflict_synch.gif b/bundles/org.eclipse.team.ui/icons/full/dlcl16/conflict_synch.gif Binary files differdeleted file mode 100644 index eaf1ca331..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/dlcl16/conflict_synch.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/filter_change.gif b/bundles/org.eclipse.team.ui/icons/full/dlcl16/filter_change.gif Binary files differdeleted file mode 100644 index f6142713a..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/dlcl16/filter_change.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/filter_change.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/filter_change.png Binary files differnew file mode 100644 index 000000000..e54535c9f --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/filter_change.png diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/filter_history.gif b/bundles/org.eclipse.team.ui/icons/full/dlcl16/filter_history.gif Binary files differdeleted file mode 100644 index f6142713a..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/dlcl16/filter_history.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/filter_history.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/filter_history.png Binary files differnew file mode 100644 index 000000000..e54535c9f --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/filter_history.png diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/flatLayout.gif b/bundles/org.eclipse.team.ui/icons/full/dlcl16/flatLayout.gif Binary files differdeleted file mode 100644 index 19d1680f6..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/dlcl16/flatLayout.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/flatLayout.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/flatLayout.png Binary files differnew file mode 100644 index 000000000..061b593ca --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/flatLayout.png diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/hierarchicalLayout.gif b/bundles/org.eclipse.team.ui/icons/full/dlcl16/hierarchicalLayout.gif Binary files differdeleted file mode 100644 index 564469b06..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/dlcl16/hierarchicalLayout.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/hierarchicalLayout.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/hierarchicalLayout.png Binary files differnew file mode 100644 index 000000000..64822eaa0 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/hierarchicalLayout.png diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/history_nav.gif b/bundles/org.eclipse.team.ui/icons/full/dlcl16/history_nav.gif Binary files differdeleted file mode 100644 index 2d2758991..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/dlcl16/history_nav.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/history_nav.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/history_nav.png Binary files differnew file mode 100644 index 000000000..ac4b72174 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/history_nav.png diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/history_nav@2x.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/history_nav@2x.png Binary files differnew file mode 100644 index 000000000..01b594967 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/history_nav@2x.png diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/ignorefiles.gif b/bundles/org.eclipse.team.ui/icons/full/dlcl16/ignorefiles.gif Binary files differdeleted file mode 100644 index 04767acc5..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/dlcl16/ignorefiles.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/ignorefiles.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/ignorefiles.png Binary files differnew file mode 100644 index 000000000..51692e81c --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/ignorefiles.png diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/ignorews_edit.gif b/bundles/org.eclipse.team.ui/icons/full/dlcl16/ignorews_edit.gif Binary files differdeleted file mode 100644 index 73f06e711..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/dlcl16/ignorews_edit.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/ignorews_edit.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/ignorews_edit.png Binary files differnew file mode 100644 index 000000000..769b3f1bc --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/ignorews_edit.png diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/ignorews_edit@2x.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/ignorews_edit@2x.png Binary files differnew file mode 100644 index 000000000..ad16bc384 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/ignorews_edit@2x.png diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/incom_synch.gif b/bundles/org.eclipse.team.ui/icons/full/dlcl16/incom_synch.gif Binary files differdeleted file mode 100644 index 21606219f..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/dlcl16/incom_synch.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/incom_synch.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/incom_synch.png Binary files differnew file mode 100644 index 000000000..8283a3467 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/incom_synch.png diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/incom_synch@2x.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/incom_synch@2x.png Binary files differnew file mode 100644 index 000000000..0b2e58a1e --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/incom_synch@2x.png diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/newstream_wiz.gif b/bundles/org.eclipse.team.ui/icons/full/dlcl16/newstream_wiz.gif Binary files differdeleted file mode 100644 index 6e8d4be05..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/dlcl16/newstream_wiz.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/newstream_wiz.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/newstream_wiz.png Binary files differnew file mode 100644 index 000000000..9378df281 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/newstream_wiz.png diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/newstream_wiz@2x.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/newstream_wiz@2x.png Binary files differnew file mode 100644 index 000000000..c87178613 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/newstream_wiz@2x.png diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/next_nav.gif b/bundles/org.eclipse.team.ui/icons/full/dlcl16/next_nav.gif Binary files differdeleted file mode 100644 index bd0be79ed..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/dlcl16/next_nav.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/next_nav.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/next_nav.png Binary files differnew file mode 100644 index 000000000..1a71a7923 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/next_nav.png diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/outgo_synch.gif b/bundles/org.eclipse.team.ui/icons/full/dlcl16/outgo_synch.gif Binary files differdeleted file mode 100644 index 91d18c776..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/dlcl16/outgo_synch.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/outgo_synch.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/outgo_synch.png Binary files differnew file mode 100644 index 000000000..3872beaf2 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/outgo_synch.png diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/outgo_synch@2x.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/outgo_synch@2x.png Binary files differnew file mode 100644 index 000000000..e0d816d76 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/outgo_synch@2x.png diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/participant_rem.gif b/bundles/org.eclipse.team.ui/icons/full/dlcl16/participant_rem.gif Binary files differdeleted file mode 100644 index 559e46298..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/dlcl16/participant_rem.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/participant_rem.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/participant_rem.png Binary files differnew file mode 100644 index 000000000..bbafa4952 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/participant_rem.png diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/participant_rem@2x.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/participant_rem@2x.png Binary files differindex 1133544b0..bc0c8d90d 100644 --- a/bundles/org.eclipse.team.ui/icons/full/dlcl16/participant_rem@2x.png +++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/participant_rem@2x.png diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/participant_remall.gif b/bundles/org.eclipse.team.ui/icons/full/dlcl16/participant_remall.gif Binary files differdeleted file mode 100644 index ecd1be568..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/dlcl16/participant_remall.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/participant_remall.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/participant_remall.png Binary files differnew file mode 100644 index 000000000..77786efad --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/participant_remall.png diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/pin.gif b/bundles/org.eclipse.team.ui/icons/full/dlcl16/pin.gif Binary files differdeleted file mode 100644 index 61615d57d..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/dlcl16/pin.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/pin.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/pin.png Binary files differnew file mode 100644 index 000000000..1eb68766f --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/pin.png diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/prev_nav.gif b/bundles/org.eclipse.team.ui/icons/full/dlcl16/prev_nav.gif Binary files differdeleted file mode 100644 index 13be66065..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/dlcl16/prev_nav.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/prev_nav.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/prev_nav.png Binary files differnew file mode 100644 index 000000000..7eaaff979 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/prev_nav.png diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/refresh.gif b/bundles/org.eclipse.team.ui/icons/full/dlcl16/refresh.gif Binary files differdeleted file mode 100644 index 1f551897c..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/dlcl16/refresh.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/refresh.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/refresh.png Binary files differnew file mode 100644 index 000000000..6adce3ac9 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/refresh.png diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/refresh_remote.gif b/bundles/org.eclipse.team.ui/icons/full/dlcl16/refresh_remote.gif Binary files differdeleted file mode 100644 index 64d0a65af..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/dlcl16/refresh_remote.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/refresh_remote.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/refresh_remote.png Binary files differnew file mode 100644 index 000000000..70a0a4694 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/refresh_remote.png diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/refresh_remote@2x.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/refresh_remote@2x.png Binary files differnew file mode 100644 index 000000000..bfc32b221 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/refresh_remote@2x.png diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/release_rls.gif b/bundles/org.eclipse.team.ui/icons/full/dlcl16/release_rls.gif Binary files differdeleted file mode 100644 index 6dbae8a4c..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/dlcl16/release_rls.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/release_rls.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/release_rls.png Binary files differnew file mode 100644 index 000000000..aa804d2fc --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/release_rls.png diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/release_rls@2x.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/release_rls@2x.png Binary files differnew file mode 100644 index 000000000..c232361a1 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/release_rls@2x.png diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/rem_co.gif b/bundles/org.eclipse.team.ui/icons/full/dlcl16/rem_co.gif Binary files differdeleted file mode 100644 index bb19dea97..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/dlcl16/rem_co.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/rem_co.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/rem_co.png Binary files differnew file mode 100644 index 000000000..a67bf4b80 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/rem_co.png diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/site_element.gif b/bundles/org.eclipse.team.ui/icons/full/dlcl16/site_element.gif Binary files differdeleted file mode 100644 index f5c165936..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/dlcl16/site_element.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/site_element.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/site_element.png Binary files differnew file mode 100644 index 000000000..70c722e05 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/site_element.png diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/site_element@2x.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/site_element@2x.png Binary files differnew file mode 100644 index 000000000..a5da6ee9d --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/site_element@2x.png diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/synced.gif b/bundles/org.eclipse.team.ui/icons/full/dlcl16/synced.gif Binary files differdeleted file mode 100644 index 4f6e43a52..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/dlcl16/synced.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/synced.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/synced.png Binary files differnew file mode 100644 index 000000000..ecc2c1dd1 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/synced.png diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/synch_participants.gif b/bundles/org.eclipse.team.ui/icons/full/dlcl16/synch_participants.gif Binary files differdeleted file mode 100644 index 14a075e1e..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/dlcl16/synch_participants.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/synch_participants.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/synch_participants.png Binary files differnew file mode 100644 index 000000000..94ed99fb1 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/synch_participants.png diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/synch_participants@2x.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/synch_participants@2x.png Binary files differnew file mode 100644 index 000000000..f0d5b3c54 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/synch_participants@2x.png diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/syncpane_co.gif b/bundles/org.eclipse.team.ui/icons/full/dlcl16/syncpane_co.gif Binary files differdeleted file mode 100644 index 7da48249e..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/dlcl16/syncpane_co.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/syncpane_co.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/syncpane_co.png Binary files differnew file mode 100644 index 000000000..cbbf40e83 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/syncpane_co.png diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/syncpane_co@2x.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/syncpane_co@2x.png Binary files differnew file mode 100644 index 000000000..0c86044b9 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/syncpane_co@2x.png diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/catchup_rls.gif b/bundles/org.eclipse.team.ui/icons/full/elcl16/catchup_rls.gif Binary files differdeleted file mode 100644 index ccfdd8cd2..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/elcl16/catchup_rls.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/catchup_rls.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/catchup_rls.png Binary files differnew file mode 100644 index 000000000..b03f14e18 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/catchup_rls.png diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/catchup_rls@2x.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/catchup_rls@2x.png Binary files differnew file mode 100644 index 000000000..a69d1d911 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/catchup_rls@2x.png diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/catchuprelease_rls.gif b/bundles/org.eclipse.team.ui/icons/full/elcl16/catchuprelease_rls.gif Binary files differdeleted file mode 100644 index 4e8cfdcf3..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/elcl16/catchuprelease_rls.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/catchuprelease_rls.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/catchuprelease_rls.png Binary files differnew file mode 100644 index 000000000..cce26d421 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/catchuprelease_rls.png diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/catchuprelease_rls@2x.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/catchuprelease_rls@2x.png Binary files differnew file mode 100644 index 000000000..103ed9959 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/catchuprelease_rls@2x.png diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/checkin_action.gif b/bundles/org.eclipse.team.ui/icons/full/elcl16/checkin_action.gif Binary files differdeleted file mode 100644 index 876f3eb16..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/elcl16/checkin_action.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/checkin_action.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/checkin_action.png Binary files differnew file mode 100644 index 000000000..51d21cb99 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/checkin_action.png diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/checkin_action@2x.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/checkin_action@2x.png Binary files differnew file mode 100644 index 000000000..3856a5578 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/checkin_action@2x.png diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/checkout_action.gif b/bundles/org.eclipse.team.ui/icons/full/elcl16/checkout_action.gif Binary files differdeleted file mode 100644 index 5055a5d7c..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/elcl16/checkout_action.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/checkout_action.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/checkout_action.png Binary files differnew file mode 100644 index 000000000..7765d92e8 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/checkout_action.png diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/checkout_action@2x.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/checkout_action@2x.png Binary files differnew file mode 100644 index 000000000..c1265fb05 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/checkout_action@2x.png diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/clear_co.gif b/bundles/org.eclipse.team.ui/icons/full/elcl16/clear_co.gif Binary files differdeleted file mode 100644 index af30a42f8..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/elcl16/clear_co.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/clear_co.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/clear_co.png Binary files differnew file mode 100644 index 000000000..9f0b9af26 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/clear_co.png diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/collapseall.gif b/bundles/org.eclipse.team.ui/icons/full/elcl16/collapseall.gif Binary files differdeleted file mode 100644 index a2d80a904..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/elcl16/collapseall.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/collapseall.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/collapseall.png Binary files differnew file mode 100644 index 000000000..92cc57892 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/collapseall.png diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/conflict_synch.gif b/bundles/org.eclipse.team.ui/icons/full/elcl16/conflict_synch.gif Binary files differdeleted file mode 100644 index c5862f263..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/elcl16/conflict_synch.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/conflict_synch.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/conflict_synch.png Binary files differnew file mode 100644 index 000000000..d15bf5429 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/conflict_synch.png diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/conflict_synch@2x.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/conflict_synch@2x.png Binary files differnew file mode 100644 index 000000000..17e7286e6 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/conflict_synch@2x.png diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/filter_change.gif b/bundles/org.eclipse.team.ui/icons/full/elcl16/filter_change.gif Binary files differdeleted file mode 100644 index 6fe6f0e10..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/elcl16/filter_change.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/filter_change.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/filter_change.png Binary files differnew file mode 100644 index 000000000..50b14d8e5 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/filter_change.png diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/filter_history.gif b/bundles/org.eclipse.team.ui/icons/full/elcl16/filter_history.gif Binary files differdeleted file mode 100644 index 6fe6f0e10..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/elcl16/filter_history.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/filter_history.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/filter_history.png Binary files differnew file mode 100644 index 000000000..50b14d8e5 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/filter_history.png diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/flatLayout.gif b/bundles/org.eclipse.team.ui/icons/full/elcl16/flatLayout.gif Binary files differdeleted file mode 100644 index bdef87928..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/elcl16/flatLayout.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/flatLayout.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/flatLayout.png Binary files differnew file mode 100644 index 000000000..13f83a237 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/flatLayout.png diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/hierarchicalLayout.gif b/bundles/org.eclipse.team.ui/icons/full/elcl16/hierarchicalLayout.gif Binary files differdeleted file mode 100644 index a6099a13f..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/elcl16/hierarchicalLayout.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/hierarchicalLayout.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/hierarchicalLayout.png Binary files differnew file mode 100644 index 000000000..665aa5cee --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/hierarchicalLayout.png diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/history_nav.gif b/bundles/org.eclipse.team.ui/icons/full/elcl16/history_nav.gif Binary files differdeleted file mode 100644 index b3a769d9a..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/elcl16/history_nav.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/history_nav.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/history_nav.png Binary files differnew file mode 100644 index 000000000..ac4b72174 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/history_nav.png diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/history_nav@2x.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/history_nav@2x.png Binary files differnew file mode 100644 index 000000000..01b594967 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/history_nav@2x.png diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/ignorefiles.gif b/bundles/org.eclipse.team.ui/icons/full/elcl16/ignorefiles.gif Binary files differdeleted file mode 100644 index 04767acc5..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/elcl16/ignorefiles.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/ignorefiles.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/ignorefiles.png Binary files differnew file mode 100644 index 000000000..7092465a8 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/ignorefiles.png diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/ignorews_edit.gif b/bundles/org.eclipse.team.ui/icons/full/elcl16/ignorews_edit.gif Binary files differdeleted file mode 100644 index 7f280f5dc..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/elcl16/ignorews_edit.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/ignorews_edit.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/ignorews_edit.png Binary files differnew file mode 100644 index 000000000..769b3f1bc --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/ignorews_edit.png diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/ignorews_edit@2x.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/ignorews_edit@2x.png Binary files differnew file mode 100644 index 000000000..ad16bc384 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/ignorews_edit@2x.png diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/incom_synch.gif b/bundles/org.eclipse.team.ui/icons/full/elcl16/incom_synch.gif Binary files differdeleted file mode 100644 index e99ebfcb5..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/elcl16/incom_synch.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/incom_synch.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/incom_synch.png Binary files differnew file mode 100644 index 000000000..8283a3467 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/incom_synch.png diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/incom_synch@2x.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/incom_synch@2x.png Binary files differnew file mode 100644 index 000000000..0b2e58a1e --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/incom_synch@2x.png diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/newstream_wiz.gif b/bundles/org.eclipse.team.ui/icons/full/elcl16/newstream_wiz.gif Binary files differdeleted file mode 100644 index 045e32c58..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/elcl16/newstream_wiz.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/newstream_wiz.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/newstream_wiz.png Binary files differnew file mode 100644 index 000000000..9378df281 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/newstream_wiz.png diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/newstream_wiz@2x.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/newstream_wiz@2x.png Binary files differnew file mode 100644 index 000000000..c87178613 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/newstream_wiz@2x.png diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/next_nav.gif b/bundles/org.eclipse.team.ui/icons/full/elcl16/next_nav.gif Binary files differdeleted file mode 100644 index 072b18445..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/elcl16/next_nav.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/next_nav.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/next_nav.png Binary files differnew file mode 100644 index 000000000..9fcc646d9 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/next_nav.png diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/outgo_synch.gif b/bundles/org.eclipse.team.ui/icons/full/elcl16/outgo_synch.gif Binary files differdeleted file mode 100644 index f5b1a16af..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/elcl16/outgo_synch.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/outgo_synch.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/outgo_synch.png Binary files differnew file mode 100644 index 000000000..3872beaf2 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/outgo_synch.png diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/outgo_synch@2x.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/outgo_synch@2x.png Binary files differnew file mode 100644 index 000000000..e0d816d76 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/outgo_synch@2x.png diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/participant_rem.gif b/bundles/org.eclipse.team.ui/icons/full/elcl16/participant_rem.gif Binary files differdeleted file mode 100644 index 2cd9c5444..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/elcl16/participant_rem.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/participant_rem.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/participant_rem.png Binary files differnew file mode 100644 index 000000000..020ea5f5b --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/participant_rem.png diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/participant_remall.gif b/bundles/org.eclipse.team.ui/icons/full/elcl16/participant_remall.gif Binary files differdeleted file mode 100644 index 28a3785aa..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/elcl16/participant_remall.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/participant_remall.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/participant_remall.png Binary files differnew file mode 100644 index 000000000..cf17733a1 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/participant_remall.png diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/pin.gif b/bundles/org.eclipse.team.ui/icons/full/elcl16/pin.gif Binary files differdeleted file mode 100644 index ec50b70fa..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/elcl16/pin.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/pin.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/pin.png Binary files differnew file mode 100644 index 000000000..aec9a52c7 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/pin.png diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/prev_nav.gif b/bundles/org.eclipse.team.ui/icons/full/elcl16/prev_nav.gif Binary files differdeleted file mode 100644 index 07164754e..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/elcl16/prev_nav.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/prev_nav.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/prev_nav.png Binary files differnew file mode 100644 index 000000000..f2e6a039c --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/prev_nav.png diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/refresh.gif b/bundles/org.eclipse.team.ui/icons/full/elcl16/refresh.gif Binary files differdeleted file mode 100644 index 3ca04d06f..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/elcl16/refresh.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/refresh.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/refresh.png Binary files differnew file mode 100644 index 000000000..ff32a35ea --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/refresh.png diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/refresh_remote.gif b/bundles/org.eclipse.team.ui/icons/full/elcl16/refresh_remote.gif Binary files differdeleted file mode 100644 index fb4fa878a..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/elcl16/refresh_remote.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/refresh_remote.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/refresh_remote.png Binary files differnew file mode 100644 index 000000000..70a0a4694 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/refresh_remote.png diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/refresh_remote@2x.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/refresh_remote@2x.png Binary files differnew file mode 100644 index 000000000..bfc32b221 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/refresh_remote@2x.png diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/release_rls.gif b/bundles/org.eclipse.team.ui/icons/full/elcl16/release_rls.gif Binary files differdeleted file mode 100644 index cef8c2f8f..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/elcl16/release_rls.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/release_rls.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/release_rls.png Binary files differnew file mode 100644 index 000000000..aa804d2fc --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/release_rls.png diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/release_rls@2x.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/release_rls@2x.png Binary files differnew file mode 100644 index 000000000..c232361a1 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/release_rls@2x.png diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/rem_co.gif b/bundles/org.eclipse.team.ui/icons/full/elcl16/rem_co.gif Binary files differdeleted file mode 100644 index 64b438488..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/elcl16/rem_co.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/rem_co.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/rem_co.png Binary files differnew file mode 100644 index 000000000..a0259ccf3 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/rem_co.png diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/site_element.gif b/bundles/org.eclipse.team.ui/icons/full/elcl16/site_element.gif Binary files differdeleted file mode 100644 index 13ce11b14..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/elcl16/site_element.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/site_element.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/site_element.png Binary files differnew file mode 100644 index 000000000..70c722e05 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/site_element.png diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/site_element@2x.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/site_element@2x.png Binary files differnew file mode 100644 index 000000000..a5da6ee9d --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/site_element@2x.png diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/synced.gif b/bundles/org.eclipse.team.ui/icons/full/elcl16/synced.gif Binary files differdeleted file mode 100644 index 870934b69..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/elcl16/synced.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/synced.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/synced.png Binary files differnew file mode 100644 index 000000000..1b61dc78a --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/synced.png diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/synch_participants.gif b/bundles/org.eclipse.team.ui/icons/full/elcl16/synch_participants.gif Binary files differdeleted file mode 100644 index a0b7b914e..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/elcl16/synch_participants.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/synch_participants.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/synch_participants.png Binary files differnew file mode 100644 index 000000000..94ed99fb1 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/synch_participants.png diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/synch_participants@2x.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/synch_participants@2x.png Binary files differnew file mode 100644 index 000000000..f0d5b3c54 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/synch_participants@2x.png diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/syncpane_co.gif b/bundles/org.eclipse.team.ui/icons/full/elcl16/syncpane_co.gif Binary files differdeleted file mode 100644 index 2644c2ad6..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/elcl16/syncpane_co.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/syncpane_co.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/syncpane_co.png Binary files differnew file mode 100644 index 000000000..cbbf40e83 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/syncpane_co.png diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/syncpane_co@2x.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/syncpane_co@2x.png Binary files differnew file mode 100644 index 000000000..0c86044b9 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/syncpane_co@2x.png diff --git a/bundles/org.eclipse.team.ui/icons/full/eview16/compare_view.png b/bundles/org.eclipse.team.ui/icons/full/eview16/compare_view.png Binary files differnew file mode 100644 index 000000000..07fb14ee9 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/eview16/compare_view.png diff --git a/bundles/org.eclipse.team.ui/icons/full/eview16/compare_view@2x.png b/bundles/org.eclipse.team.ui/icons/full/eview16/compare_view@2x.png Binary files differnew file mode 100644 index 000000000..89c631a38 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/eview16/compare_view@2x.png diff --git a/bundles/org.eclipse.team.ui/icons/full/eview16/history_view.png b/bundles/org.eclipse.team.ui/icons/full/eview16/history_view.png Binary files differnew file mode 100644 index 000000000..a3339a07c --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/eview16/history_view.png diff --git a/bundles/org.eclipse.team.ui/icons/full/eview16/history_view@2x.png b/bundles/org.eclipse.team.ui/icons/full/eview16/history_view@2x.png Binary files differnew file mode 100644 index 000000000..138d8090e --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/eview16/history_view@2x.png diff --git a/bundles/org.eclipse.team.ui/icons/full/eview16/synch_synch.png b/bundles/org.eclipse.team.ui/icons/full/eview16/synch_synch.png Binary files differnew file mode 100644 index 000000000..ddf8f76d2 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/eview16/synch_synch.png diff --git a/bundles/org.eclipse.team.ui/icons/full/eview16/synch_synch@2x.png b/bundles/org.eclipse.team.ui/icons/full/eview16/synch_synch@2x.png Binary files differnew file mode 100644 index 000000000..be77ccb5c --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/eview16/synch_synch@2x.png diff --git a/bundles/org.eclipse.team.ui/icons/full/obj/changeset_obj.gif b/bundles/org.eclipse.team.ui/icons/full/obj/changeset_obj.gif Binary files differdeleted file mode 100644 index f98800321..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/obj/changeset_obj.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/obj/changeset_obj.png b/bundles/org.eclipse.team.ui/icons/full/obj/changeset_obj.png Binary files differnew file mode 100644 index 000000000..d8573569d --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/obj/changeset_obj.png diff --git a/bundles/org.eclipse.team.ui/icons/full/obj/changeset_obj@2x.png b/bundles/org.eclipse.team.ui/icons/full/obj/changeset_obj@2x.png Binary files differnew file mode 100644 index 000000000..991ac9708 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/obj/changeset_obj@2x.png diff --git a/bundles/org.eclipse.team.ui/icons/full/obj/compressed_folder_obj.gif b/bundles/org.eclipse.team.ui/icons/full/obj/compressed_folder_obj.gif Binary files differdeleted file mode 100644 index 45b1ea559..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/obj/compressed_folder_obj.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/obj/compressed_folder_obj.png b/bundles/org.eclipse.team.ui/icons/full/obj/compressed_folder_obj.png Binary files differnew file mode 100644 index 000000000..5c80414f2 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/obj/compressed_folder_obj.png diff --git a/bundles/org.eclipse.team.ui/icons/full/obj/compressed_folder_obj@2x.png b/bundles/org.eclipse.team.ui/icons/full/obj/compressed_folder_obj@2x.png Binary files differnew file mode 100644 index 000000000..87c7e3aac --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/obj/compressed_folder_obj@2x.png diff --git a/bundles/org.eclipse.team.ui/icons/full/obj/dates.gif b/bundles/org.eclipse.team.ui/icons/full/obj/dates.gif Binary files differdeleted file mode 100644 index 96aae05cb..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/obj/dates.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/obj/dates.png b/bundles/org.eclipse.team.ui/icons/full/obj/dates.png Binary files differnew file mode 100644 index 000000000..ddcc80683 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/obj/dates.png diff --git a/bundles/org.eclipse.team.ui/icons/full/obj/dates@2x.png b/bundles/org.eclipse.team.ui/icons/full/obj/dates@2x.png Binary files differnew file mode 100644 index 000000000..1021a6350 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/obj/dates@2x.png diff --git a/bundles/org.eclipse.team.ui/icons/full/obj/export_projectset.gif b/bundles/org.eclipse.team.ui/icons/full/obj/export_projectset.gif Binary files differdeleted file mode 100644 index 5ba6aee56..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/obj/export_projectset.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/obj/export_projectset.png b/bundles/org.eclipse.team.ui/icons/full/obj/export_projectset.png Binary files differnew file mode 100644 index 000000000..99f034ead --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/obj/export_projectset.png diff --git a/bundles/org.eclipse.team.ui/icons/full/obj/export_projectset@2x.png b/bundles/org.eclipse.team.ui/icons/full/obj/export_projectset@2x.png Binary files differnew file mode 100644 index 000000000..5edd1e663 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/obj/export_projectset@2x.png diff --git a/bundles/org.eclipse.team.ui/icons/full/obj/hunk_obj.gif b/bundles/org.eclipse.team.ui/icons/full/obj/hunk_obj.gif Binary files differdeleted file mode 100644 index 353b6f38c..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/obj/hunk_obj.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/obj/hunk_obj.png b/bundles/org.eclipse.team.ui/icons/full/obj/hunk_obj.png Binary files differnew file mode 100644 index 000000000..6f6bcb48f --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/obj/hunk_obj.png diff --git a/bundles/org.eclipse.team.ui/icons/full/obj/hunk_obj@2x.png b/bundles/org.eclipse.team.ui/icons/full/obj/hunk_obj@2x.png Binary files differnew file mode 100644 index 000000000..8ae395f8e --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/obj/hunk_obj@2x.png diff --git a/bundles/org.eclipse.team.ui/icons/full/obj/ignoreprefs.gif b/bundles/org.eclipse.team.ui/icons/full/obj/ignoreprefs.gif Binary files differdeleted file mode 100644 index 04767acc5..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/obj/ignoreprefs.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/obj/ignoreprefs.png b/bundles/org.eclipse.team.ui/icons/full/obj/ignoreprefs.png Binary files differnew file mode 100644 index 000000000..ba0f0952a --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/obj/ignoreprefs.png diff --git a/bundles/org.eclipse.team.ui/icons/full/obj/ignoreprefs@2x.png b/bundles/org.eclipse.team.ui/icons/full/obj/ignoreprefs@2x.png Binary files differnew file mode 100644 index 000000000..80d3f7924 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/obj/ignoreprefs@2x.png diff --git a/bundles/org.eclipse.team.ui/icons/full/obj/import_projectset.gif b/bundles/org.eclipse.team.ui/icons/full/obj/import_projectset.gif Binary files differdeleted file mode 100644 index a61fdd316..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/obj/import_projectset.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/obj/import_projectset.png b/bundles/org.eclipse.team.ui/icons/full/obj/import_projectset.png Binary files differnew file mode 100644 index 000000000..e468cc6ca --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/obj/import_projectset.png diff --git a/bundles/org.eclipse.team.ui/icons/full/obj/import_projectset@2x.png b/bundles/org.eclipse.team.ui/icons/full/obj/import_projectset@2x.png Binary files differnew file mode 100644 index 000000000..924148af4 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/obj/import_projectset@2x.png diff --git a/bundles/org.eclipse.team.ui/icons/full/obj/local_entry_tbl.gif b/bundles/org.eclipse.team.ui/icons/full/obj/local_entry_tbl.gif Binary files differdeleted file mode 100644 index 4822bf86c..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/obj/local_entry_tbl.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/obj/local_entry_tbl.png b/bundles/org.eclipse.team.ui/icons/full/obj/local_entry_tbl.png Binary files differnew file mode 100644 index 000000000..3cb05d94d --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/obj/local_entry_tbl.png diff --git a/bundles/org.eclipse.team.ui/icons/full/obj/local_entry_tbl@2x.png b/bundles/org.eclipse.team.ui/icons/full/obj/local_entry_tbl@2x.png Binary files differnew file mode 100644 index 000000000..0958018a3 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/obj/local_entry_tbl@2x.png diff --git a/bundles/org.eclipse.team.ui/icons/full/obj/resource_model.gif b/bundles/org.eclipse.team.ui/icons/full/obj/resource_model.gif Binary files differdeleted file mode 100644 index 33be7d827..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/obj/resource_model.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/obj/resource_model.png b/bundles/org.eclipse.team.ui/icons/full/obj/resource_model.png Binary files differnew file mode 100644 index 000000000..78c97c3d5 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/obj/resource_model.png diff --git a/bundles/org.eclipse.team.ui/icons/full/obj/share_project.gif b/bundles/org.eclipse.team.ui/icons/full/obj/share_project.gif Binary files differdeleted file mode 100644 index e9cb24495..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/obj/share_project.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/obj/share_project.png b/bundles/org.eclipse.team.ui/icons/full/obj/share_project.png Binary files differnew file mode 100644 index 000000000..da3a6efd1 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/obj/share_project.png diff --git a/bundles/org.eclipse.team.ui/icons/full/obj/share_project@2x.png b/bundles/org.eclipse.team.ui/icons/full/obj/share_project@2x.png Binary files differnew file mode 100644 index 000000000..06a36fb5b --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/obj/share_project@2x.png diff --git a/bundles/org.eclipse.team.ui/icons/full/obj/workspace_obj.gif b/bundles/org.eclipse.team.ui/icons/full/obj/workspace_obj.gif Binary files differdeleted file mode 100644 index ca14cfca4..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/obj/workspace_obj.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/obj/workspace_obj.png b/bundles/org.eclipse.team.ui/icons/full/obj/workspace_obj.png Binary files differnew file mode 100644 index 000000000..0ec245ca5 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/obj/workspace_obj.png diff --git a/bundles/org.eclipse.team.ui/icons/full/obj/workspace_obj@2x.png b/bundles/org.eclipse.team.ui/icons/full/obj/workspace_obj@2x.png Binary files differnew file mode 100644 index 000000000..967acdb0c --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/obj/workspace_obj@2x.png diff --git a/bundles/org.eclipse.team.ui/icons/full/ovr/checkedout_ov.gif b/bundles/org.eclipse.team.ui/icons/full/ovr/checkedout_ov.gif Binary files differdeleted file mode 100644 index 0053b5698..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/ovr/checkedout_ov.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/ovr/checkedout_ov.png b/bundles/org.eclipse.team.ui/icons/full/ovr/checkedout_ov.png Binary files differnew file mode 100644 index 000000000..8fc197aa0 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/ovr/checkedout_ov.png diff --git a/bundles/org.eclipse.team.ui/icons/full/ovr/checkedout_ov@2x.png b/bundles/org.eclipse.team.ui/icons/full/ovr/checkedout_ov@2x.png Binary files differnew file mode 100644 index 000000000..414d0a450 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/ovr/checkedout_ov@2x.png diff --git a/bundles/org.eclipse.team.ui/icons/full/ovr/confchg_ov.gif b/bundles/org.eclipse.team.ui/icons/full/ovr/confchg_ov.gif Binary files differdeleted file mode 100644 index fce456a49..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/ovr/confchg_ov.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/ovr/confchg_ov.png b/bundles/org.eclipse.team.ui/icons/full/ovr/confchg_ov.png Binary files differnew file mode 100644 index 000000000..228071da8 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/ovr/confchg_ov.png diff --git a/bundles/org.eclipse.team.ui/icons/full/ovr/confchg_ov@2x.png b/bundles/org.eclipse.team.ui/icons/full/ovr/confchg_ov@2x.png Binary files differnew file mode 100644 index 000000000..dbe4efa29 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/ovr/confchg_ov@2x.png diff --git a/bundles/org.eclipse.team.ui/icons/full/ovr/dirty_ov.gif b/bundles/org.eclipse.team.ui/icons/full/ovr/dirty_ov.gif Binary files differdeleted file mode 100644 index dc0b8c016..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/ovr/dirty_ov.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/ovr/dirty_ov.png b/bundles/org.eclipse.team.ui/icons/full/ovr/dirty_ov.png Binary files differnew file mode 100644 index 000000000..e8aebdb4b --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/ovr/dirty_ov.png diff --git a/bundles/org.eclipse.team.ui/icons/full/ovr/dirty_ov@2x.png b/bundles/org.eclipse.team.ui/icons/full/ovr/dirty_ov@2x.png Binary files differnew file mode 100644 index 000000000..6510ea406 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/ovr/dirty_ov@2x.png diff --git a/bundles/org.eclipse.team.ui/icons/full/ovr/error_co.gif b/bundles/org.eclipse.team.ui/icons/full/ovr/error_co.gif Binary files differdeleted file mode 100644 index 119dcccd5..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/ovr/error_co.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/ovr/error_co.png b/bundles/org.eclipse.team.ui/icons/full/ovr/error_co.png Binary files differnew file mode 100644 index 000000000..276f454f4 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/ovr/error_co.png diff --git a/bundles/org.eclipse.team.ui/icons/full/ovr/error_co@2x.png b/bundles/org.eclipse.team.ui/icons/full/ovr/error_co@2x.png Binary files differnew file mode 100644 index 000000000..927f13be2 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/ovr/error_co@2x.png diff --git a/bundles/org.eclipse.team.ui/icons/full/ovr/pinned_ovr.gif b/bundles/org.eclipse.team.ui/icons/full/ovr/pinned_ovr.gif Binary files differdeleted file mode 100644 index 2f3b201a6..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/ovr/pinned_ovr.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/ovr/pinned_ovr.png b/bundles/org.eclipse.team.ui/icons/full/ovr/pinned_ovr.png Binary files differnew file mode 100644 index 000000000..0832872f6 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/ovr/pinned_ovr.png diff --git a/bundles/org.eclipse.team.ui/icons/full/ovr/pinned_ovr@2x.png b/bundles/org.eclipse.team.ui/icons/full/ovr/pinned_ovr@2x.png Binary files differnew file mode 100644 index 000000000..746ec4c65 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/ovr/pinned_ovr@2x.png diff --git a/bundles/org.eclipse.team.ui/icons/full/ovr/version_controlled.gif b/bundles/org.eclipse.team.ui/icons/full/ovr/version_controlled.gif Binary files differdeleted file mode 100644 index eb71a3c74..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/ovr/version_controlled.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/ovr/version_controlled.png b/bundles/org.eclipse.team.ui/icons/full/ovr/version_controlled.png Binary files differnew file mode 100644 index 000000000..e0edaced7 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/ovr/version_controlled.png diff --git a/bundles/org.eclipse.team.ui/icons/full/ovr/version_controlled@2x.png b/bundles/org.eclipse.team.ui/icons/full/ovr/version_controlled@2x.png Binary files differnew file mode 100644 index 000000000..e04d1e468 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/ovr/version_controlled@2x.png diff --git a/bundles/org.eclipse.team.ui/icons/full/ovr/waiting_ovr.gif b/bundles/org.eclipse.team.ui/icons/full/ovr/waiting_ovr.gif Binary files differdeleted file mode 100644 index 7fe247650..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/ovr/waiting_ovr.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/ovr/waiting_ovr.png b/bundles/org.eclipse.team.ui/icons/full/ovr/waiting_ovr.png Binary files differnew file mode 100644 index 000000000..d21891da2 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/ovr/waiting_ovr.png diff --git a/bundles/org.eclipse.team.ui/icons/full/ovr/waiting_ovr@2x.png b/bundles/org.eclipse.team.ui/icons/full/ovr/waiting_ovr@2x.png Binary files differnew file mode 100644 index 000000000..4f0903044 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/ovr/waiting_ovr@2x.png diff --git a/bundles/org.eclipse.team.ui/icons/full/ovr/warning_co.gif b/bundles/org.eclipse.team.ui/icons/full/ovr/warning_co.gif Binary files differdeleted file mode 100644 index ee2dac4a9..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/ovr/warning_co.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/ovr/warning_co.png b/bundles/org.eclipse.team.ui/icons/full/ovr/warning_co.png Binary files differnew file mode 100644 index 000000000..863348ef1 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/ovr/warning_co.png diff --git a/bundles/org.eclipse.team.ui/icons/full/ovr/warning_co@2x.png b/bundles/org.eclipse.team.ui/icons/full/ovr/warning_co@2x.png Binary files differnew file mode 100644 index 000000000..104587dd3 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/ovr/warning_co@2x.png diff --git a/bundles/org.eclipse.team.ui/icons/full/wizban/export_projectset_wizban.png b/bundles/org.eclipse.team.ui/icons/full/wizban/export_projectset_wizban.png Binary files differindex 5a3407a20..60fb6f47a 100644 --- a/bundles/org.eclipse.team.ui/icons/full/wizban/export_projectset_wizban.png +++ b/bundles/org.eclipse.team.ui/icons/full/wizban/export_projectset_wizban.png diff --git a/bundles/org.eclipse.team.ui/icons/full/wizban/export_projectset_wizban@2x.png b/bundles/org.eclipse.team.ui/icons/full/wizban/export_projectset_wizban@2x.png Binary files differnew file mode 100644 index 000000000..7c0cd7005 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/wizban/export_projectset_wizban@2x.png diff --git a/bundles/org.eclipse.team.ui/icons/full/wizban/import_projectset_wizban.png b/bundles/org.eclipse.team.ui/icons/full/wizban/import_projectset_wizban.png Binary files differindex 50476bea3..35ba3fe1e 100644 --- a/bundles/org.eclipse.team.ui/icons/full/wizban/import_projectset_wizban.png +++ b/bundles/org.eclipse.team.ui/icons/full/wizban/import_projectset_wizban.png diff --git a/bundles/org.eclipse.team.ui/icons/full/wizban/import_projectset_wizban@2x.png b/bundles/org.eclipse.team.ui/icons/full/wizban/import_projectset_wizban@2x.png Binary files differnew file mode 100644 index 000000000..108d98208 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/wizban/import_projectset_wizban@2x.png diff --git a/bundles/org.eclipse.team.ui/icons/full/wizban/keylock.gif b/bundles/org.eclipse.team.ui/icons/full/wizban/keylock.gif Binary files differdeleted file mode 100644 index 2efb6ffb5..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/wizban/keylock.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/wizban/keylock.png b/bundles/org.eclipse.team.ui/icons/full/wizban/keylock.png Binary files differnew file mode 100644 index 000000000..06701beb3 --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/wizban/keylock.png diff --git a/bundles/org.eclipse.team.ui/icons/full/wizban/keylock@2x.png b/bundles/org.eclipse.team.ui/icons/full/wizban/keylock@2x.png Binary files differnew file mode 100644 index 000000000..1147eafcb --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/wizban/keylock@2x.png diff --git a/bundles/org.eclipse.team.ui/icons/full/wizban/lockkey.gif b/bundles/org.eclipse.team.ui/icons/full/wizban/lockkey.gif Binary files differdeleted file mode 100644 index d122742ab..000000000 --- a/bundles/org.eclipse.team.ui/icons/full/wizban/lockkey.gif +++ /dev/null diff --git a/bundles/org.eclipse.team.ui/icons/full/wizban/share_wizban.png b/bundles/org.eclipse.team.ui/icons/full/wizban/share_wizban.png Binary files differindex 5b2c7af8d..b2d6c0dba 100644 --- a/bundles/org.eclipse.team.ui/icons/full/wizban/share_wizban.png +++ b/bundles/org.eclipse.team.ui/icons/full/wizban/share_wizban.png diff --git a/bundles/org.eclipse.team.ui/icons/full/wizban/share_wizban@2x.png b/bundles/org.eclipse.team.ui/icons/full/wizban/share_wizban@2x.png Binary files differnew file mode 100644 index 000000000..a62e05c9b --- /dev/null +++ b/bundles/org.eclipse.team.ui/icons/full/wizban/share_wizban@2x.png diff --git a/bundles/org.eclipse.team.ui/plugin.xml b/bundles/org.eclipse.team.ui/plugin.xml index 6ccfea999..eab035794 100644 --- a/bundles/org.eclipse.team.ui/plugin.xml +++ b/bundles/org.eclipse.team.ui/plugin.xml @@ -6,7 +6,7 @@ are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html - + Contributors: IBM Corporation - initial API and implementation --> @@ -39,7 +39,7 @@ id="org.eclipse.team.ui.team.projectSet" label="%PreferenceKeywords.ProjectSet"> </keyword> - </extension> + </extension> <extension point="org.eclipse.ui.preferencePages"> <page @@ -142,7 +142,7 @@ </adapt> </not> </enablement> - </objectContribution> + </objectContribution> <objectContribution objectClass="org.eclipse.core.resources.IFile" nameFilter="*.psf" @@ -288,7 +288,7 @@ </category> <view name="%SyncView.name" - icon="$nl$/icons/full/eview16/synch_synch.gif" + icon="$nl$/icons/full/eview16/synch_synch.png" fastViewWidthRatio="0.25" category="org.eclipse.team.ui" allowMultiple="true" @@ -299,12 +299,12 @@ allowMultiple="true" category="org.eclipse.team.ui" class="org.eclipse.team.internal.ui.history.GenericHistoryView" - icon="icons/full/eview16/history_view.gif" + icon="icons/full/eview16/history_view.png" id="org.eclipse.team.ui.GenericHistoryView" name="%HistoryView"/> <!-- <view name="%CompareView.name" - icon="$nl$/icons/full/eview16/compare_view.gif" + icon="$nl$/icons/full/eview16/compare_view.png" fastViewWidthRatio="0.25" category="org.eclipse.team.ui" class="org.eclipse.team.internal.ui.synchronize.CompareView" @@ -316,11 +316,11 @@ point="org.eclipse.ui.perspectives"> <perspective name="%Synchronizing.perspective" - icon="$nl$/icons/full/eview16/synch_synch.gif" + icon="$nl$/icons/full/eview16/synch_synch.png" class="org.eclipse.team.internal.ui.synchronize.TeamSynchronizingPerspective" id="org.eclipse.team.ui.TeamSynchronizingPerspective"> <description> - %Synchronizing.perspective.description + %Synchronizing.perspective.description </description> </perspective> </extension> @@ -343,10 +343,10 @@ name="%Team" id="org.eclipse.team.ui.importWizards"> </category> - + <wizard name="%ProjectSetImportWizard.name" - icon="$nl$/icons/full/obj/import_projectset.gif" + icon="$nl$/icons/full/obj/import_projectset.png" class="org.eclipse.team.internal.ui.wizards.ProjectSetImportWizard" category="org.eclipse.team.ui.importWizards" id="org.eclipse.team.ui.ProjectSetImportWizard"> @@ -370,7 +370,7 @@ </category> <wizard name="%ProjectSetExportWizard.name" - icon="$nl$/icons/full/obj/export_projectset.gif" + icon="$nl$/icons/full/obj/export_projectset.png" class="org.eclipse.team.internal.ui.wizards.ProjectSetExportWizard" category="org.eclipse.team.ui.exportWizards" id="org.eclipse.team.ui.ProjectSetExportWizard"> @@ -434,7 +434,7 @@ categoryId="org.eclipse.ui.category.perspectives" id="org.eclipse.team.ui.TeamSynchronizingPerspective"/> </extension> - + <extension point="org.eclipse.ui.bindings"> <key @@ -498,7 +498,7 @@ label="%Command.syncAll.name" tooltip="%Command.syncAll.name" class="org.eclipse.team.internal.ui.synchronize.actions.GlobalRefreshAction" - icon="$nl$/icons/full/elcl16/synch_participants.gif" + icon="$nl$/icons/full/elcl16/synch_participants.png" style="pulldown" id="org.eclipse.team.ui.synchronizeAll"> </action> @@ -519,16 +519,16 @@ tooltip="%ApplyPatch.tooltip"/> </actionSet> </extension> - + <!-- file modification validator --> - + <extension point="org.eclipse.team.core.defaultFileModificationValidator"> <validator class="org.eclipse.team.internal.ui.DefaultUIFileModificationValidator"/> </extension> - + <!-- adapter factory --> - + <extension point="org.eclipse.core.runtime.adapters"> <factory @@ -565,7 +565,7 @@ name="%ResourcesContentExtension" priority="lowest"> <enablement> - <or> + <or> <instanceof value="org.eclipse.core.internal.resources.mapping.ResourceModelProvider"/> <instanceof value="org.eclipse.core.resources.IResource"/> <instanceof value="org.eclipse.team.core.mapping.ISynchronizationScope"/> @@ -591,9 +591,9 @@ viewerId="org.eclipse.team.ui.navigatorViewer"> <popupMenu allowsPlatformContributions="false" - id="org.eclipse.team.ui.navigatorViewer#PopupMenu"> - <insertionPoint name="file"/> - <insertionPoint name="edit"/> + id="org.eclipse.team.ui.navigatorViewer#PopupMenu"> + <insertionPoint name="file"/> + <insertionPoint name="edit"/> <insertionPoint name="synchronize"/> <insertionPoint name="navigate" @@ -603,26 +603,26 @@ separator="true"/> <insertionPoint name="other" - separator="true"/> + separator="true"/> <insertionPoint name="sort" separator="true"/> <insertionPoint name="additions" - separator="true"/> + separator="true"/> <insertionPoint name="properties" separator="true"/> </popupMenu> </viewer> </extension> - + <!-- *************** Synchronize View Participant **************** --> <extension point="org.eclipse.team.ui.synchronizeParticipants"> <participant class="org.eclipse.team.ui.synchronize.ModelSynchronizeParticipant" - icon="$nl$/icons/full/eview16/synch_synch.gif" + icon="$nl$/icons/full/eview16/synch_synch.png" id="org.eclipse.team.ui.synchronization_context_synchronize_participant" name="%ModelSyncParticipant" persistent="false"> @@ -634,7 +634,7 @@ point="org.eclipse.team.ui.teamContentProviders"> <teamContentProvider contentExtensionId="org.eclipse.team.ui.resourceContent" - icon="$nl$/icons/full/obj/workspace_obj.gif" + icon="$nl$/icons/full/obj/workspace_obj.png" modelProviderId="org.eclipse.core.resources.modelProvider" preferencePage="org.eclipse.team.internal.ui.preferences.ResourceModelPreferencePage" supportsFlatLayout="true"/> @@ -648,14 +648,14 @@ id="interactive" value="true"/> </triggerPoint> - </extension> - + </extension> + <!-- ******* Export/Import ignored resources ******** --> <extension point="org.eclipse.ui.preferenceTransfer"> <transfer id="org.eclipse.team.transfer.ignores" - icon="$nl$/icons/full/obj/ignoreprefs.gif" + icon="$nl$/icons/full/obj/ignoreprefs.png" name="%ignoresTransferName"> <mapping scope="instance"> @@ -668,14 +668,14 @@ </mapping> </transfer> </extension> - + <!-- ******* Apply Patch in Sync View ******** --> <extension point="org.eclipse.team.ui.synchronizeWizards"> <wizard class="org.eclipse.team.internal.ui.synchronize.patch.ApplyPatchSynchronizationWizard" description="%PatchSyncWizard_description" - icon="icons/full/obj/hunk_obj.gif" + icon="icons/full/obj/hunk_obj.png" id="org.eclipse.team.ui.applyPatchWizard" name="%PatchSyncWizard"> </wizard> @@ -684,7 +684,7 @@ point="org.eclipse.team.ui.synchronizeParticipants"> <participant class="org.eclipse.team.internal.ui.synchronize.patch.ApplyPatchModelSynchronizeParticipant" - icon="icons/full/obj/hunk_obj.gif" + icon="icons/full/obj/hunk_obj.png" id="org.eclipse.team.ui.applyPatchModelParticipant" name="%PatchSyncParticipant" persistent="false"> @@ -702,7 +702,7 @@ point="org.eclipse.ui.navigator.navigatorContent"> <navigatorContent contentProvider="org.eclipse.team.internal.ui.synchronize.patch.PatchSyncContentProvider" - icon="icons/full/obj/hunk_obj.gif" + icon="icons/full/obj/hunk_obj.png" id="org.eclipse.team.ui.patchSyncNavigatorContent" labelProvider="org.eclipse.team.internal.ui.synchronize.patch.PatchSyncLabelProvider" name="%PatchNavigatorContent" @@ -785,7 +785,7 @@ point="org.eclipse.team.ui.teamContentProviders"> <teamContentProvider contentExtensionId="org.eclipse.team.ui.patchSyncNavigatorContent" - icon="icons/full/obj/hunk_obj.gif" + icon="icons/full/obj/hunk_obj.png" modelProviderId="org.eclipse.team.ui.patchModelProvider"> </teamContentProvider> </extension> diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIPlugin.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIPlugin.java index a5464bb12..91d0ebf9c 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIPlugin.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIPlugin.java @@ -48,6 +48,57 @@ import org.osgi.framework.*; */ public class TeamUIPlugin extends AbstractUIPlugin { + /*==================================================================== + * Constants defining overlays file names + *====================================================================*/ + + private final String IMG_DIRTY_OVR_FILE = "ovr/dirty_ov.png"; //$NON-NLS-1$ + private final String IMG_CHECKEDIN_OVR_FILE = "ovr/version_controlled.png"; //$NON-NLS-1$ + private final String IMG_CHECKEDOUT_OVR_FILE = "ovr/checkedout_ov.png"; //$NON-NLS-1$ + private final String IMG_CONFLICT_OVR_FILE = "ovr/confchg_ov.png"; //$NON-NLS-1$ + private final String IMG_ERROR_OVR_FILE = "ovr/error_co.png"; //$NON-NLS-1$ + private final String IMG_WARNING_OVR_FILE = "ovr/warning_co.png"; //$NON-NLS-1$ + private final String IMG_HOURGLASS_OVR_FILE = "ovr/waiting_ovr.png"; //$NON-NLS-1$ + private final String IMG_DLG_SYNC_INCOMING_FILE = "elcl16/incom_synch.png"; //$NON-NLS-1$ + private final String IMG_DLG_SYNC_OUTGOING_FILE = "elcl16/outgo_synch.png"; //$NON-NLS-1$ + private final String IMG_DLG_SYNC_CONFLICTING_FILE = "elcl16/conflict_synch.png"; //$NON-NLS-1$ + private final String IMG_REFRESH_FILE = "elcl16/refresh.png"; //$NON-NLS-1$ + private final String IMG_REFRESH_REMOTE_FILE = "elcl16/refresh_remote.png"; //$NON-NLS-1$ + private final String IMG_LINK_WITH_FILE = "elcl16/synced.png"; //$NON-NLS-1$ + private final String IMG_IGNORE_WHITESPACE_FILE = "elcl16/ignorews_edit.png"; //$NON-NLS-1$ + private final String IMG_COLLAPSE_ALL_FILE = "elcl16/collapseall.png"; //$NON-NLS-1$ + private final String IMG_SYNC_MODE_CATCHUP_FILE = "elcl16/catchup_rls.png"; //$NON-NLS-1$ + private final String IMG_SYNC_MODE_RELEASE_FILE = "elcl16/release_rls.png"; //$NON-NLS-1$ + private final String IMG_SYNC_MODE_FREE_FILE = "elcl16/catchuprelease_rls.png"; //$NON-NLS-1$ + private final String IMG_DLG_SYNC_INCOMING_DISABLED_FILE = "dlcl16/incom_synch.png"; //$NON-NLS-1$ + private final String IMG_DLG_SYNC_OUTGOING_DISABLED_FILE = "dlcl16/outgo_synch.png"; //$NON-NLS-1$ + private final String IMG_DLG_SYNC_CONFLICTING_DISABLED_FILE = "dlcl16/conflict_synch.png"; //$NON-NLS-1$ + private final String IMG_REFRESH_DISABLED_FILE = "dlcl16/refresh.png"; //$NON-NLS-1$ + private final String IMG_REFRESH_REMOTE_DISABLED_FILE = "dlcl16/refresh_remote.png"; //$NON-NLS-1$ + private final String IMG_LINK_WITH_DISABLED_FILE = "dlcl16/synced.png"; //$NON-NLS-1$ + private final String IMG_IGNORE_WHITESPACE_DISABLED_FILE = "dlcl16/ignorews_edit.png"; //$NON-NLS-1$ + private final String IMG_COLLAPSE_ALL_DISABLED_FILE = "dlcl16/collapseall.png"; //$NON-NLS-1$ + private final String IMG_SYNC_MODE_CATCHUP_DISABLED_FILE = "dlcl16/catchup_rls.png"; //$NON-NLS-1$ + private final String IMG_SYNC_MODE_RELEASE_DISABLED_FILE = "dlcl16/release_rls.png"; //$NON-NLS-1$ + private final String IMG_SYNC_MODE_FREE_DISABLED_FILE = "dlcl16/catchuprelease_rls.png"; //$NON-NLS-1$ + private final String IMG_WIZBAN_SHARE_FILE = "wizban/share_wizban.png"; //$NON-NLS-1$ + private final String IMG_PROJECTSET_IMPORT_BANNER_FILE = "wizban/import_projectset_wizban.png"; //$NON-NLS-1$ + private final String IMG_PROJECTSET_EXPORT_BANNER_FILE = "wizban/export_projectset_wizban.png"; //$NON-NLS-1$ + private final String IMG_KEY_LOCK_FILE = "wizban/keylock.png"; //$NON-NLS-1$ + private final String IMG_PINNED_FILE = "elcl16/pin.png"; //$NON-NLS-1$ + private final String IMG_PREVIOUS_FILE = "elcl16/prev_nav.png"; //$NON-NLS-1$ + private final String IMG_SITE_ELEMENT_FILE = "elcl16/site_element.png"; //$NON-NLS-1$ + private final String IMG_CHANGE_FILTER_FILE = "elcl16/change_filter.png"; //$NON-NLS-1$ + private final String IMG_COMPRESSED_FOLDER_FILE = "obj/compressed_folder_obj.png"; //$NON-NLS-1$ + private final String IMG_HIERARCHICAL_FILE = "elcl16/hierarchicalLayout.png"; //$NON-NLS-1$ + private final String IMG_FLAT_FILE = "elcl16/flatLayout.png"; //$NON-NLS-1$ + private final String IMG_SYNC_VIEW_FILE = "eview16/synch_synch.png"; //$NON-NLS-1$ + private final String IMG_CHANGE_SET_FILE = "obj/changeset_obj.png"; //$NON-NLS-1$ + private final String IMG_COMPARE_VIEW_FILE = "eview16/compare_view.png"; //$NON-NLS-1$ + private final String IMG_DATES_CATEGORY_FILE = "obj/dates.png"; //$NON-NLS-1$ + private final String IMG_LOCALREVISION_TABLE_FILE = "obj/local_entry_tbl.png"; //$NON-NLS-1$ + + private static TeamUIPlugin instance; // image paths @@ -310,12 +361,12 @@ public class TeamUIPlugin extends AbstractUIPlugin { * @param id the identifier for the image * @param baseURL the base URL for the image */ - private static void createImageDescriptor(TeamUIPlugin plugin, String id) { + private static void createImageDescriptor(TeamUIPlugin plugin, String id, String fileName) { // Delegate to the plugin instance to avoid concurrent class loading problems - plugin.privateCreateImageDescriptor(id); + plugin.privateCreateImageDescriptor(id, fileName); } - private void privateCreateImageDescriptor(String id) { - ImageDescriptor desc = ImageDescriptor.createFromURL(getImageUrl(id)); + private void privateCreateImageDescriptor(String id, String fileName) { + ImageDescriptor desc = ImageDescriptor.createFromURL(getImageUrl(fileName)); imageDescriptors.put(id, desc); } @@ -332,7 +383,7 @@ public class TeamUIPlugin extends AbstractUIPlugin { } private ImageDescriptor privateGetImageDescriptor(String id) { if(! imageDescriptors.containsKey(id)) { - createImageDescriptor(getPlugin(), id); + createImageDescriptor(getPlugin(), id, id); } return imageDescriptors.get(id); } @@ -356,59 +407,67 @@ public class TeamUIPlugin extends AbstractUIPlugin { */ private void initializeImages(TeamUIPlugin plugin) { // Overlays - createImageDescriptor(plugin, ISharedImages.IMG_DIRTY_OVR); - createImageDescriptor(plugin, ISharedImages.IMG_CONFLICT_OVR); - createImageDescriptor(plugin, ISharedImages.IMG_CHECKEDIN_OVR); - createImageDescriptor(plugin, ISharedImages.IMG_CHECKEDOUT_OVR); - createImageDescriptor(plugin, ISharedImages.IMG_ERROR_OVR); - createImageDescriptor(plugin, ISharedImages.IMG_WARNING_OVR); - createImageDescriptor(plugin, ISharedImages.IMG_HOURGLASS_OVR); + createImageDescriptor(plugin, ISharedImages.IMG_DIRTY_OVR, IMG_DIRTY_OVR_FILE); + createImageDescriptor(plugin, ISharedImages.IMG_CONFLICT_OVR, IMG_CONFLICT_OVR_FILE); + createImageDescriptor(plugin, ISharedImages.IMG_CHECKEDIN_OVR, IMG_CHECKEDIN_OVR_FILE); + createImageDescriptor(plugin, ISharedImages.IMG_CHECKEDOUT_OVR, IMG_CHECKEDOUT_OVR_FILE); + createImageDescriptor(plugin, ISharedImages.IMG_ERROR_OVR, IMG_ERROR_OVR_FILE); + createImageDescriptor(plugin, ISharedImages.IMG_WARNING_OVR, IMG_WARNING_OVR_FILE); + createImageDescriptor(plugin, ISharedImages.IMG_HOURGLASS_OVR, IMG_HOURGLASS_OVR_FILE); // Target Management Icons - createImageDescriptor(plugin, ITeamUIImages.IMG_SITE_ELEMENT); + createImageDescriptor(plugin, ITeamUIImages.IMG_SITE_ELEMENT, IMG_SITE_ELEMENT_FILE); // Sync View Icons - createImageDescriptor(plugin, ITeamUIImages.IMG_DLG_SYNC_INCOMING); - createImageDescriptor(plugin, ITeamUIImages.IMG_DLG_SYNC_OUTGOING); - createImageDescriptor(plugin, ITeamUIImages.IMG_DLG_SYNC_CONFLICTING); - createImageDescriptor(plugin, ITeamUIImages.IMG_REFRESH); - createImageDescriptor(plugin, ITeamUIImages.IMG_CHANGE_FILTER); - createImageDescriptor(plugin, ITeamUIImages.IMG_IGNORE_WHITESPACE); - createImageDescriptor(plugin, ITeamUIImages.IMG_COLLAPSE_ALL); - createImageDescriptor(plugin, ITeamUIImages.IMG_COLLAPSE_ALL_ENABLED); - - createImageDescriptor(plugin, ITeamUIImages.IMG_DLG_SYNC_INCOMING_DISABLED); - createImageDescriptor(plugin, ITeamUIImages.IMG_DLG_SYNC_OUTGOING_DISABLED); - createImageDescriptor(plugin, ITeamUIImages.IMG_DLG_SYNC_CONFLICTING_DISABLED); - createImageDescriptor(plugin, ITeamUIImages.IMG_REFRESH_DISABLED); - createImageDescriptor(plugin, ITeamUIImages.IMG_IGNORE_WHITESPACE_DISABLED); - - createImageDescriptor(plugin, ITeamUIImages.IMG_SYNC_MODE_CATCHUP); - createImageDescriptor(plugin, ITeamUIImages.IMG_SYNC_MODE_RELEASE); - createImageDescriptor(plugin, ITeamUIImages.IMG_SYNC_MODE_FREE); - - createImageDescriptor(plugin, ITeamUIImages.IMG_SYNC_MODE_CATCHUP_DISABLED); - createImageDescriptor(plugin, ITeamUIImages.IMG_SYNC_MODE_RELEASE_DISABLED); - createImageDescriptor(plugin, ITeamUIImages.IMG_SYNC_MODE_FREE_DISABLED); - - createImageDescriptor(plugin, ITeamUIImages.IMG_SYNC_MODE_CATCHUP_ENABLED); - createImageDescriptor(plugin, ITeamUIImages.IMG_SYNC_MODE_RELEASE_ENABLED); - createImageDescriptor(plugin, ITeamUIImages.IMG_SYNC_MODE_FREE_ENABLED); + createImageDescriptor(plugin, ITeamUIImages.IMG_DLG_SYNC_INCOMING, IMG_DLG_SYNC_INCOMING_FILE); + createImageDescriptor(plugin, ITeamUIImages.IMG_DLG_SYNC_OUTGOING, IMG_DLG_SYNC_OUTGOING_FILE); + createImageDescriptor(plugin, ITeamUIImages.IMG_DLG_SYNC_CONFLICTING, IMG_DLG_SYNC_CONFLICTING_FILE); + createImageDescriptor(plugin, ITeamUIImages.IMG_REFRESH, IMG_REFRESH_FILE); + createImageDescriptor(plugin, ITeamUIImages.IMG_REFRESH_REMOTE, IMG_REFRESH_REMOTE_FILE); + createImageDescriptor(plugin, ITeamUIImages.IMG_LINK_WITH, IMG_LINK_WITH_FILE); + createImageDescriptor(plugin, ITeamUIImages.IMG_CHANGE_FILTER, IMG_CHANGE_FILTER_FILE); + createImageDescriptor(plugin, ITeamUIImages.IMG_IGNORE_WHITESPACE, IMG_IGNORE_WHITESPACE_FILE); + createImageDescriptor(plugin, ITeamUIImages.IMG_COLLAPSE_ALL, IMG_COLLAPSE_ALL_FILE); + + createImageDescriptor(plugin, ITeamUIImages.IMG_DLG_SYNC_INCOMING_DISABLED, IMG_DLG_SYNC_INCOMING_DISABLED_FILE); + createImageDescriptor(plugin, ITeamUIImages.IMG_DLG_SYNC_OUTGOING_DISABLED, IMG_DLG_SYNC_OUTGOING_DISABLED_FILE); + createImageDescriptor(plugin, ITeamUIImages.IMG_DLG_SYNC_CONFLICTING_DISABLED, IMG_DLG_SYNC_CONFLICTING_DISABLED_FILE); + createImageDescriptor(plugin, ITeamUIImages.IMG_REFRESH_DISABLED, IMG_REFRESH_DISABLED_FILE); + createImageDescriptor(plugin, ITeamUIImages.IMG_REFRESH_REMOTE_DISABLED, IMG_REFRESH_REMOTE_DISABLED_FILE); + createImageDescriptor(plugin, ITeamUIImages.IMG_LINK_WITH_DISABLED, IMG_LINK_WITH_DISABLED_FILE); + createImageDescriptor(plugin, ITeamUIImages.IMG_IGNORE_WHITESPACE_DISABLED, IMG_IGNORE_WHITESPACE_DISABLED_FILE); + createImageDescriptor(plugin, ITeamUIImages.IMG_COLLAPSE_ALL_DISABLED, IMG_COLLAPSE_ALL_DISABLED_FILE); + + createImageDescriptor(plugin, ITeamUIImages.IMG_SYNC_MODE_CATCHUP, IMG_SYNC_MODE_CATCHUP_FILE); + createImageDescriptor(plugin, ITeamUIImages.IMG_SYNC_MODE_RELEASE, IMG_SYNC_MODE_RELEASE_FILE); + createImageDescriptor(plugin, ITeamUIImages.IMG_SYNC_MODE_FREE, IMG_SYNC_MODE_FREE_FILE); + + createImageDescriptor(plugin, ITeamUIImages.IMG_SYNC_MODE_CATCHUP_DISABLED, IMG_SYNC_MODE_CATCHUP_DISABLED_FILE); + createImageDescriptor(plugin, ITeamUIImages.IMG_SYNC_MODE_RELEASE_DISABLED, IMG_SYNC_MODE_RELEASE_DISABLED_FILE); + createImageDescriptor(plugin, ITeamUIImages.IMG_SYNC_MODE_FREE_DISABLED, IMG_SYNC_MODE_FREE_DISABLED_FILE); + + createImageDescriptor(plugin, ITeamUIImages.IMG_KEY_LOCK, IMG_KEY_LOCK_FILE); + createImageDescriptor(plugin, ITeamUIImages.IMG_PINNED, IMG_PINNED_FILE); + createImageDescriptor(plugin, ITeamUIImages.IMG_PREVIOUS, IMG_PREVIOUS_FILE); + createImageDescriptor(plugin, ITeamUIImages.IMG_SITE_ELEMENT, IMG_SITE_ELEMENT_FILE); + createImageDescriptor(plugin, ITeamUIImages.IMG_WIZBAN_SHARE, IMG_WIZBAN_SHARE_FILE); // Wizard banners - createImageDescriptor(plugin, ITeamUIImages.IMG_PROJECTSET_IMPORT_BANNER); - createImageDescriptor(plugin, ITeamUIImages.IMG_PROJECTSET_EXPORT_BANNER); - createImageDescriptor(plugin, ITeamUIImages.IMG_WIZBAN_SHARE); + createImageDescriptor(plugin, ITeamUIImages.IMG_PROJECTSET_IMPORT_BANNER, IMG_PROJECTSET_IMPORT_BANNER_FILE); + createImageDescriptor(plugin, ITeamUIImages.IMG_PROJECTSET_EXPORT_BANNER, IMG_PROJECTSET_EXPORT_BANNER_FILE); // Live Sync View icons - createImageDescriptor(plugin, ITeamUIImages.IMG_COMPRESSED_FOLDER); - createImageDescriptor(plugin, ITeamUIImages.IMG_SYNC_VIEW); - createImageDescriptor(plugin, ITeamUIImages.IMG_HIERARCHICAL); + createImageDescriptor(plugin, ITeamUIImages.IMG_COMPRESSED_FOLDER, IMG_COMPRESSED_FOLDER_FILE); + createImageDescriptor(plugin, ITeamUIImages.IMG_SYNC_VIEW, IMG_SYNC_VIEW_FILE); + createImageDescriptor(plugin, ITeamUIImages.IMG_CHANGE_SET, IMG_CHANGE_SET_FILE); + + createImageDescriptor(plugin, ITeamUIImages.IMG_HIERARCHICAL, IMG_HIERARCHICAL_FILE); + createImageDescriptor(plugin, ITeamUIImages.IMG_FLAT, IMG_FLAT_FILE); // Local History Page - createImageDescriptor(plugin, ITeamUIImages.IMG_DATES_CATEGORY); - createImageDescriptor(plugin, ITeamUIImages.IMG_COMPARE_VIEW); - createImageDescriptor(plugin, ITeamUIImages.IMG_LOCALREVISION_TABLE); + createImageDescriptor(plugin, ITeamUIImages.IMG_DATES_CATEGORY, IMG_DATES_CATEGORY_FILE); + createImageDescriptor(plugin, ITeamUIImages.IMG_COMPARE_VIEW, IMG_COMPARE_VIEW_FILE); + createImageDescriptor(plugin, ITeamUIImages.IMG_LOCALREVISION_TABLE, IMG_LOCALREVISION_TABLE_FILE); } private URL getImageUrl(String relative) { diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/actions.properties b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/actions.properties index 5b8aaad3a..72e8d0730 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/actions.properties +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/actions.properties @@ -15,7 +15,7 @@ action.collapseAll.label=Collapse All action.collapseAll.tooltip=Collapse All action.collapseAll.description=Collapse All -action.collapseAll.image=collapseall.gif +action.collapseAll.image=collapseall.png action.configureSchedulel.label=&Schedule... action.configureSchedulel.tooltip=Schedule a Background Synchronization @@ -27,57 +27,57 @@ action.refreshWithRemote.description=Synchronize action.directionFilterIncoming.label=&Incoming action.directionFilterIncoming.tooltip=Incoming Mode action.directionFilterIncoming.description=Incoming Mode (shows incoming changes and conflicts) -action.directionFilterIncoming.image=catchup_rls.gif +action.directionFilterIncoming.image=catchup_rls.png action.directionFilterOutgoing.label=&Outgoing action.directionFilterOutgoing.tooltip=Outgoing Mode action.directionFilterOutgoing.description=Outgoing Mode (shows outgoing changes and conflicts) -action.directionFilterOutgoing.image=release_rls.gif +action.directionFilterOutgoing.image=release_rls.png action.directionFilterConflicts.label=&Conflicts action.directionFilterConflicts.tooltip=Conflicts Mode action.directionFilterConflicts.description=Conflicts Mode (shows conflicts) -action.directionFilterConflicts.image=conflict_synch.gif +action.directionFilterConflicts.image=conflict_synch.png action.directionFilterBoth.label=&Both action.directionFilterBoth.tooltip=Incoming/Outgoing Mode action.directionFilterBoth.description=Incoming/Outgoing Mode (shows outgoing changes, incoming changes, and conflicts) -action.directionFilterBoth.image=catchuprelease_rls.gif +action.directionFilterBoth.image=catchuprelease_rls.png action.refreshSubscriber.label=Synchronizations action.refreshSubscriber.tooltip=Synchronizations action.refreshSubscriber.description=Synchronizations -action.refreshSubscriber.image=synch_participants.gif +action.refreshSubscriber.image=synch_participants.png action.comparisonCriteria.label=Comparison Criteria action.comparisonCriteria.tooltip=Select the comparison method action.comparisonCriteria.description=Select the comparison method -action.comparisonCriteria.image=showsync_rn.gif +action.comparisonCriteria.image=showsync_rn.png action.navigateNext.label=Ne&xt Difference action.navigateNext.tooltip=Next Difference action.navigateNext.description=Show Next Difference -action.navigateNext.image=next_nav.gif +action.navigateNext.image=next_nav.png action.navigatePrevious.label=Pre&vious Difference action.navigatePrevious.tooltip=Previous Difference action.navigatePrevious.description=Show Previous Difference -action.navigatePrevious.image=prev_nav.gif +action.navigatePrevious.image=prev_nav.png action.removePage.label=&Remove Current Synchronization action.removePage.tooltip=Remove Current Synchronization action.removePage.description=Remove Current Synchronization -action.removePage.image=participant_rem.gif +action.removePage.image=participant_rem.png action.removeAllPage.label=Remove &Un-Pinned Synchronizations action.removeAllPage.tooltip=Remove Un-Pinned Synchronizations action.removeAllPage.description=Remove Un-Pinned Synchronizations -action.removeAllPage.image=participant_remall.gif +action.removeAllPage.image=participant_remall.png action.pinParticipant.label=Pi&n Current Synchronization action.pinParticipant.tooltip=Pin Current Synchronization action.pinParticipant.description=Pin Current Synchronization -action.pinParticipant.image=pin.gif +action.pinParticipant.image=pin.png action.expandAll.label=E&xpand All action.open.label=&Open @@ -98,12 +98,12 @@ action.restoreRemovedFromView.label=Restore Removed &Items action.mergeAll.label=Merge action.mergeAll.tooltip=Merge All Non-Conflicting Changes action.mergeAll.description=Merge All Non-Conflicting Changes -action.mergeAll.image=checkout_action.gif +action.mergeAll.image=checkout_action.png action.replaceAll.label=Replace All action.replaceAll.tooltip=Replace the local elements with the corresponding remote changes action.replaceAll.description=Replace All -action.replaceAll.image=checkout_action.gif +action.replaceAll.image=checkout_action.png action.reversePatch.label=Re&verse Patch action.reversePatch.tooltip=Rollbacks the changes introduced by the patch @@ -130,8 +130,8 @@ action.replace.label=&Replace action.pickModels.label=Select Model action.pickModels.tooltip=Select the model to be displayed action.pickModels.description=Select the model to be displayed -action.pickModels.image=hierarchicalLayout.gif +action.pickModels.image=hierarchicalLayout.png action.previousHistory.label=Show Previous Histories action.previousHistory.tooltip=Show Previous Histories -action.previousHistory.image=history_nav.gif +action.previousHistory.image=history_nav.png diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/ShowSynchronizeParticipantAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/ShowSynchronizeParticipantAction.java index d9c23a8dc..3463f86b3 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/ShowSynchronizeParticipantAction.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/ShowSynchronizeParticipantAction.java @@ -73,8 +73,8 @@ public class ShowSynchronizeParticipantAction extends Action implements IPropert private static final class ParticipantOverlay extends CompositeImageDescriptor { - private ImageData pinnedData = TeamUIPlugin.getImageDescriptor("ovr/pinned_ovr.gif").getImageData(); //$NON-NLS-1$ - private ImageData scheduledData = TeamUIPlugin.getImageDescriptor("ovr/waiting_ovr.gif").getImageData(); //$NON-NLS-1$ + private ImageData pinnedData = TeamUIPlugin.getImageDescriptor("ovr/pinned_ovr.png").getImageData(); //$NON-NLS-1$ + private ImageData scheduledData = TeamUIPlugin.getImageDescriptor("ovr/waiting_ovr.png").getImageData(); //$NON-NLS-1$ private ImageData imageData; private ISynchronizeParticipant participant; @@ -113,4 +113,3 @@ public class ShowSynchronizeParticipantAction extends Action implements IPropert } } } - |