Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre Weinand2003-02-05 10:58:36 +0000
committerAndre Weinand2003-02-05 10:58:36 +0000
commite0f4bfc4cd0d046a596208338381def899cce5bc (patch)
tree08e9fadf821c77fde670a2377e50fba659467a6f
parent5ab22102dd1e39953b149d3453b9d1be95c26e96 (diff)
downloadeclipse.platform.team-e0f4bfc4cd0d046a596208338381def899cce5bc.tar.gz
eclipse.platform.team-e0f4bfc4cd0d046a596208338381def899cce5bc.tar.xz
eclipse.platform.team-e0f4bfc4cd0d046a596208338381def899cce5bc.zip
renamed two iconsv20030205
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java4
-rw-r--r--bundles/org.eclipse.compare/icons/full/obj16/resolved.gif (renamed from bundles/org.eclipse.compare/icons/full/obj16/OK.gif)bin839 -> 839 bytes
-rw-r--r--bundles/org.eclipse.compare/icons/full/obj16/unresolved.gif (renamed from bundles/org.eclipse.compare/icons/full/obj16/NOT_OK.gif)bin833 -> 833 bytes
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java4
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/obj16/resolved.gif (renamed from bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/obj16/OK.gif)bin839 -> 839 bytes
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/obj16/unresolved.gif (renamed from bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/obj16/NOT_OK.gif)bin833 -> 833 bytes
6 files changed, 4 insertions, 4 deletions
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
index 778f5df33..5e83db18a 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
@@ -2586,14 +2586,14 @@ public class TextMergeViewer extends ContentMergeViewer {
if (hasIncoming) {
if (unresolved) {
if (fNOTOKImage == null) {
- ImageDescriptor id= CompareUIPlugin.getImageDescriptor("obj16/NOT_OK.gif"); //$NON-NLS-1$
+ ImageDescriptor id= CompareUIPlugin.getImageDescriptor("obj16/unresolved.gif"); //$NON-NLS-1$
if (id != null)
fNOTOKImage= id.createImage(fSummaryCanvas.getDisplay());
}
c= fNOTOKImage;
} else {
if (fOKImage == null) {
- ImageDescriptor id= CompareUIPlugin.getImageDescriptor("obj16/OK.gif"); //$NON-NLS-1$
+ ImageDescriptor id= CompareUIPlugin.getImageDescriptor("obj16/resolved.gif"); //$NON-NLS-1$
if (id != null)
fOKImage= id.createImage(fSummaryCanvas.getDisplay());
}
diff --git a/bundles/org.eclipse.compare/icons/full/obj16/OK.gif b/bundles/org.eclipse.compare/icons/full/obj16/resolved.gif
index 96d149cb8..96d149cb8 100644
--- a/bundles/org.eclipse.compare/icons/full/obj16/OK.gif
+++ b/bundles/org.eclipse.compare/icons/full/obj16/resolved.gif
Binary files differ
diff --git a/bundles/org.eclipse.compare/icons/full/obj16/NOT_OK.gif b/bundles/org.eclipse.compare/icons/full/obj16/unresolved.gif
index 95b2ad5fa..95b2ad5fa 100644
--- a/bundles/org.eclipse.compare/icons/full/obj16/NOT_OK.gif
+++ b/bundles/org.eclipse.compare/icons/full/obj16/unresolved.gif
Binary files differ
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
index 778f5df33..5e83db18a 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
@@ -2586,14 +2586,14 @@ public class TextMergeViewer extends ContentMergeViewer {
if (hasIncoming) {
if (unresolved) {
if (fNOTOKImage == null) {
- ImageDescriptor id= CompareUIPlugin.getImageDescriptor("obj16/NOT_OK.gif"); //$NON-NLS-1$
+ ImageDescriptor id= CompareUIPlugin.getImageDescriptor("obj16/unresolved.gif"); //$NON-NLS-1$
if (id != null)
fNOTOKImage= id.createImage(fSummaryCanvas.getDisplay());
}
c= fNOTOKImage;
} else {
if (fOKImage == null) {
- ImageDescriptor id= CompareUIPlugin.getImageDescriptor("obj16/OK.gif"); //$NON-NLS-1$
+ ImageDescriptor id= CompareUIPlugin.getImageDescriptor("obj16/resolved.gif"); //$NON-NLS-1$
if (id != null)
fOKImage= id.createImage(fSummaryCanvas.getDisplay());
}
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/obj16/OK.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/obj16/resolved.gif
index 96d149cb8..96d149cb8 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/obj16/OK.gif
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/obj16/resolved.gif
Binary files differ
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/obj16/NOT_OK.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/obj16/unresolved.gif
index 95b2ad5fa..95b2ad5fa 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/obj16/NOT_OK.gif
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/obj16/unresolved.gif
Binary files differ

Back to the top