diff options
| author | Pawel Pogorzelski | 2010-04-08 11:48:14 +0000 |
|---|---|---|
| committer | Pawel Pogorzelski | 2010-04-08 11:48:14 +0000 |
| commit | a9dd422d83385b49cb388b4389c228e2e128f976 (patch) | |
| tree | ee2db76b9bdb97379af24a5ed17d97b09057358d | |
| parent | 0280502ecedd8221af90741ede23b01e38cb66c8 (diff) | |
| download | eclipse.platform.team-a9dd422d83385b49cb388b4389c228e2e128f976.tar.gz eclipse.platform.team-a9dd422d83385b49cb388b4389c228e2e128f976.tar.xz eclipse.platform.team-a9dd422d83385b49cb388b4389c228e2e128f976.zip | |
Bug 308456 - Label "Optimized algorithm used" appears in non populated commit dialog
2 files changed, 5 insertions, 0 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 e82273a25..c96d3f200 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 @@ -136,6 +136,7 @@ public class CompareContentViewerSwitchingPane extends .setToolTipText(CompareMessages.CompareContentViewerSwitchingPane_optimizedTooltip); clOptimized.setImage(CompareUIPlugin.getImageDescriptor( OPTIMIZED_WARNING_IMAGE_NAME).createImage()); + clOptimized.setVisible(false); // hide by default clOptimized.addDisposeListener(new DisposeListener() { public void widgetDisposed(DisposeEvent e) { Image img = clOptimized.getImage(); diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/DocumentMerger.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/DocumentMerger.java index ec829bffd..40f6d8302 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/DocumentMerger.java +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/DocumentMerger.java @@ -453,6 +453,10 @@ public class DocumentMerger { fInput.getCompareConfiguration().setProperty( CompareContentViewerSwitchingPane.OPTIMIZED_ALGORITHM_USED, new Boolean(true)); + else + fInput.getCompareConfiguration().setProperty( + CompareContentViewerSwitchingPane.OPTIMIZED_ALGORITHM_USED, + new Boolean(false)); ArrayList newAllDiffs = new ArrayList(); for (int i= 0; i < e.length; i++) { |