Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPawel Pogorzelski2010-05-12 15:18:29 +0000
committerPawel Pogorzelski2010-05-12 15:18:29 +0000
commitaf112f13bca1cada9b533f763070ff7ac5d414a4 (patch)
treefbe4c3659cbe354c9a15981aa149b41a2d59c383
parentee15eee9a36488cc272e85067d00c80d4d335beb (diff)
downloadeclipse.platform.team-af112f13bca1cada9b533f763070ff7ac5d414a4.tar.gz
eclipse.platform.team-af112f13bca1cada9b533f763070ff7ac5d414a4.tar.xz
eclipse.platform.team-af112f13bca1cada9b533f763070ff7ac5d414a4.zip
Bug 312641 - Change label and icon informing about capped comparison results
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareContentViewerSwitchingPane.java4
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareMessages.properties2
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/obj16/message_info.gifbin0 -> 267 bytes
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/obj16/warning_st_obj.gifbin324 -> 0 bytes
4 files changed, 3 insertions, 3 deletions
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareContentViewerSwitchingPane.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareContentViewerSwitchingPane.java
index c96d3f200..d92ad78ba 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareContentViewerSwitchingPane.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareContentViewerSwitchingPane.java
@@ -48,7 +48,7 @@ import org.eclipse.ui.PlatformUI;
public class CompareContentViewerSwitchingPane extends
CompareViewerSwitchingPane {
- private static final String OPTIMIZED_WARNING_IMAGE_NAME = "obj16/warning_st_obj.gif"; //$NON-NLS-1$
+ private static final String OPTIMIZED_INFO_IMAGE_NAME = "obj16/message_info.gif"; //$NON-NLS-1$
public static final String OPTIMIZED_ALGORITHM_USED = "OPTIMIZED_ALGORITHM_USED"; //$NON-NLS-1$
private CompareEditorInput fCompareEditorInput;
@@ -135,7 +135,7 @@ public class CompareContentViewerSwitchingPane extends
clOptimized
.setToolTipText(CompareMessages.CompareContentViewerSwitchingPane_optimizedTooltip);
clOptimized.setImage(CompareUIPlugin.getImageDescriptor(
- OPTIMIZED_WARNING_IMAGE_NAME).createImage());
+ OPTIMIZED_INFO_IMAGE_NAME).createImage());
clOptimized.setVisible(false); // hide by default
clOptimized.addDisposeListener(new DisposeListener() {
public void widgetDisposed(DisposeEvent e) {
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareMessages.properties b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareMessages.properties
index a64c01404..701afa488 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareMessages.properties
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareMessages.properties
@@ -134,7 +134,7 @@ CompareWithOtherResourceDialog_workspaceRadioButton=&Workspace
CompareContentViewerSwitchingPane_defaultViewer=Default Compare
CompareContentViewerSwitchingPane_switchButtonTooltip=Switch Compare Viewer
CompareContentViewerSwitchingPane_discoveredLabel={0} Compare
-CompareContentViewerSwitchingPane_optimized=Matching might not be optimal
+CompareContentViewerSwitchingPane_optimized=Faster comparison algorithm used
CompareContentViewerSwitchingPane_optimizedTooltip=To avoid long computation time a faster comparison algorithm has been used. As a result, the matching might not be optimal.
CompareStructureViewerSwitchingPane_defaultViewer=Default Structure Compare
CompareStructureViewerSwitchingPane_switchButtonTooltip=Switch Structure Compare Viewer
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/obj16/message_info.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/obj16/message_info.gif
new file mode 100644
index 000000000..b484d9be1
--- /dev/null
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/obj16/message_info.gif
Binary files differ
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/obj16/warning_st_obj.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/obj16/warning_st_obj.gif
deleted file mode 100644
index 2b2e50fe7..000000000
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/obj16/warning_st_obj.gif
+++ /dev/null
Binary files differ

Back to the top