Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre Weinand2002-12-13 10:46:04 +0000
committerAndre Weinand2002-12-13 10:46:04 +0000
commit0c1de82425a07fdcc91fc560264606d4c902223a (patch)
tree1d615d18df196ad625a82bcf8a1d90efc5028477
parenta619a480ae27f0307172974544a3e6029d17999f (diff)
downloadeclipse.platform.team-0c1de82425a07fdcc91fc560264606d4c902223a.tar.gz
eclipse.platform.team-0c1de82425a07fdcc91fc560264606d4c902223a.tar.xz
eclipse.platform.team-0c1de82425a07fdcc91fc560264606d4c902223a.zip
ui work
Diffstat
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java42
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java42
2 files changed, 28 insertions, 56 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 5c4b09946..f0a611b3d 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
@@ -262,7 +262,7 @@ public class TextMergeViewer extends ContentMergeViewer {
// points for center curves
private double[] fBasicCenterCurve;
- private MenuManager fCenterMenuManager;
+// private MenuManager fCenterMenuManager;
private Menu fCenterMenu;
private Button fCenterButton;
private Diff fButtonDiff;
@@ -1235,7 +1235,6 @@ public class TextMergeViewer extends ContentMergeViewer {
if (diff != null && diff.isResolved()/*!diff.isUnresolvedIncomingOrConflicting()*/ )
diff= null;
if (diff != fButtonDiff) {
- //setCurrentDiff(diff, false);
if (diff != null) {
if (fLeft.isEditable() && diff.isUnresolvedIncoming()) {
fButtonDiff= diff;
@@ -1259,19 +1258,6 @@ public class TextMergeViewer extends ContentMergeViewer {
}
}
);
-// canvas.addMouseTrackListener(
-// new MouseTrackAdapter() {
-// public void mouseEnter(MouseEvent e) {
-// System.out.println("enter");
-// if (fCenterButton != null)
-// fCenterButton.setVisible(false);
-// }
-// public void mouseExit(MouseEvent e) {
-// if (fCenterButton != null)
-// fCenterButton.setVisible(false);
-// }
-// }
-// );
fCenterButton= new Button(canvas, "carbon".equals(SWT.getPlatform()) ? SWT.FLAT : SWT.PUSH);
fCenterButton.setText("<");
@@ -1289,19 +1275,19 @@ public class TextMergeViewer extends ContentMergeViewer {
}
);
- fCenterMenuManager= new MenuManager();
- fCenterMenuManager.setRemoveAllWhenShown(true);
- fCenterMenuManager.addMenuListener(
- new IMenuListener() {
- public void menuAboutToShow(IMenuManager manager) {
- updateControls();
- if (fCopyDiffRightToLeftItem != null)
- manager.add(fCopyDiffRightToLeftItem.getAction());
- if (fCopyDiffLeftToRightItem != null)
- manager.add(fCopyDiffLeftToRightItem.getAction());
- }
- }
- );
+// fCenterMenuManager= new MenuManager();
+// fCenterMenuManager.setRemoveAllWhenShown(true);
+// fCenterMenuManager.addMenuListener(
+// new IMenuListener() {
+// public void menuAboutToShow(IMenuManager manager) {
+// updateControls();
+// if (fCopyDiffRightToLeftItem != null)
+// manager.add(fCopyDiffRightToLeftItem.getAction());
+// if (fCopyDiffLeftToRightItem != null)
+// manager.add(fCopyDiffLeftToRightItem.getAction());
+// }
+// }
+// );
}
return canvas;
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 5c4b09946..f0a611b3d 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
@@ -262,7 +262,7 @@ public class TextMergeViewer extends ContentMergeViewer {
// points for center curves
private double[] fBasicCenterCurve;
- private MenuManager fCenterMenuManager;
+// private MenuManager fCenterMenuManager;
private Menu fCenterMenu;
private Button fCenterButton;
private Diff fButtonDiff;
@@ -1235,7 +1235,6 @@ public class TextMergeViewer extends ContentMergeViewer {
if (diff != null && diff.isResolved()/*!diff.isUnresolvedIncomingOrConflicting()*/ )
diff= null;
if (diff != fButtonDiff) {
- //setCurrentDiff(diff, false);
if (diff != null) {
if (fLeft.isEditable() && diff.isUnresolvedIncoming()) {
fButtonDiff= diff;
@@ -1259,19 +1258,6 @@ public class TextMergeViewer extends ContentMergeViewer {
}
}
);
-// canvas.addMouseTrackListener(
-// new MouseTrackAdapter() {
-// public void mouseEnter(MouseEvent e) {
-// System.out.println("enter");
-// if (fCenterButton != null)
-// fCenterButton.setVisible(false);
-// }
-// public void mouseExit(MouseEvent e) {
-// if (fCenterButton != null)
-// fCenterButton.setVisible(false);
-// }
-// }
-// );
fCenterButton= new Button(canvas, "carbon".equals(SWT.getPlatform()) ? SWT.FLAT : SWT.PUSH);
fCenterButton.setText("<");
@@ -1289,19 +1275,19 @@ public class TextMergeViewer extends ContentMergeViewer {
}
);
- fCenterMenuManager= new MenuManager();
- fCenterMenuManager.setRemoveAllWhenShown(true);
- fCenterMenuManager.addMenuListener(
- new IMenuListener() {
- public void menuAboutToShow(IMenuManager manager) {
- updateControls();
- if (fCopyDiffRightToLeftItem != null)
- manager.add(fCopyDiffRightToLeftItem.getAction());
- if (fCopyDiffLeftToRightItem != null)
- manager.add(fCopyDiffLeftToRightItem.getAction());
- }
- }
- );
+// fCenterMenuManager= new MenuManager();
+// fCenterMenuManager.setRemoveAllWhenShown(true);
+// fCenterMenuManager.addMenuListener(
+// new IMenuListener() {
+// public void menuAboutToShow(IMenuManager manager) {
+// updateControls();
+// if (fCopyDiffRightToLeftItem != null)
+// manager.add(fCopyDiffRightToLeftItem.getAction());
+// if (fCopyDiffLeftToRightItem != null)
+// manager.add(fCopyDiffLeftToRightItem.getAction());
+// }
+// }
+// );
}
return canvas;

Back to the top