Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Sawicki2012-02-11 10:27:19 +0000
committerMatthias Sohn2012-02-11 10:27:19 +0000
commit6152c2acffcec6dd47fed4f8ec14e9cda398f512 (patch)
treefc0798e056fb145b81b45dd4314c769e43719099
parent5fa082ee31d6f1b13c5f0027a4736215db78ef00 (diff)
downloadegit-6152c2acffcec6dd47fed4f8ec14e9cda398f512.tar.gz
egit-6152c2acffcec6dd47fed4f8ec14e9cda398f512.tar.xz
egit-6152c2acffcec6dd47fed4f8ec14e9cda398f512.zip
[stagingView] Disable open action when submodule is selected
Change-Id: I1afb08c26696238bfe54ae744d4dac7337066024 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java23
1 files changed, 17 insertions, 6 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java
index ecdcb901c2..0055b27808 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java
@@ -788,6 +788,8 @@ public class StagingView extends ViewPart {
if (selection.isEmpty())
return;
StagingEntry stagingEntry = (StagingEntry) selection.getFirstElement();
+ if (stagingEntry.isSubmodule())
+ return;
switch (stagingEntry.getState()) {
case ADDED:
case CHANGED:
@@ -818,13 +820,22 @@ public class StagingView extends ViewPart {
if (selection.isEmpty())
return;
- menuMgr.add(new Action(
+ boolean submoduleSelected = false;
+ for (Object item : selection.toArray())
+ if (((StagingEntry) item).isSubmodule()) {
+ submoduleSelected = true;
+ break;
+ }
+
+ Action openWorkingTreeVersion = new Action(
UIText.CommitFileDiffViewer_OpenWorkingTreeVersionInEditorMenuLabel) {
- @Override
- public void run() {
- openSelectionInEditor(tableViewer.getSelection());
- }
- });
+ @Override
+ public void run() {
+ openSelectionInEditor(tableViewer.getSelection());
+ }
+ };
+ openWorkingTreeVersion.setEnabled(!submoduleSelected);
+ menuMgr.add(openWorkingTreeVersion);
StagingEntry stagingEntry = (StagingEntry) selection.getFirstElement();
switch (stagingEntry.getState()) {

Back to the top