Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDani Megert2013-04-26 10:42:32 +0000
committerRobin Stocker2013-04-27 10:47:10 +0000
commit075d105063da0c6d5b69563fbb2d13f4f262af60 (patch)
tree5689f2ba53b08806d5fdca5caed79be1eb640496 /org.eclipse.egit.ui
parente3fb20fbd8862441eb5a11e059a2ef98e7f8d7bc (diff)
downloadegit-075d105063da0c6d5b69563fbb2d13f4f262af60.tar.gz
egit-075d105063da0c6d5b69563fbb2d13f4f262af60.tar.xz
egit-075d105063da0c6d5b69563fbb2d13f4f262af60.zip
Polish "Move 'Untrack' to Advanced Menu"
Bug: 345777 Change-Id: Ic8cb5fc015b4e0080719f406e599bd09da642e07 Signed-off-by: Dani Megert <Daniel_Megert@ch.ibm.com> Signed-off-by: Robin Stocker <robin@nibor.org>
Diffstat (limited to 'org.eclipse.egit.ui')
-rw-r--r--org.eclipse.egit.ui/plugin.xml19
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/ActionCommands.java5
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/UntrackAction.java25
3 files changed, 9 insertions, 40 deletions
diff --git a/org.eclipse.egit.ui/plugin.xml b/org.eclipse.egit.ui/plugin.xml
index 20c43b6e40..185a81729a 100644
--- a/org.eclipse.egit.ui/plugin.xml
+++ b/org.eclipse.egit.ui/plugin.xml
@@ -1781,19 +1781,17 @@
</activeWhen>
</handler>
<handler
+ class="org.eclipse.egit.ui.internal.actions.UntrackActionHandler"
commandId="org.eclipse.egit.ui.team.Untrack">
<activeWhen>
<iterate>
- <and>
- <or>
- <instanceof value="org.eclipse.core.resources.IResource" />
- <adapt type="org.eclipse.core.resources.IResource" />
- </or>
- <test
- property="projectPersistentProperty"
- value="org.eclipse.team.core.repository=org.eclipse.egit.core.GitProvider"/>
- </and>
- </iterate>
+ <adapt type="org.eclipse.core.resources.IResource">
+ <test
+ property="org.eclipse.core.resources.projectPersistentProperty"
+ args="org.eclipse.team.core.repository, org.eclipse.egit.core.GitProvider">
+ </test>
+ </adapt>
+ </iterate>
</activeWhen>
</handler>
</extension>
@@ -4739,7 +4737,6 @@
</command>
<command
categoryId="org.eclipse.egit.ui.commandCategory"
- defaultHandler="org.eclipse.egit.ui.internal.actions.UntrackActionHandler"
id="org.eclipse.egit.ui.team.Untrack"
name="%UntrackCommand.name">
</command>
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/ActionCommands.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/ActionCommands.java
index c4f1866668..d825f4133d 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/ActionCommands.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/ActionCommands.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010 SAP AG.
+ * Copyright (c) 2010, 2013 SAP AG and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -125,9 +125,6 @@ public class ActionCommands {
/** "Track" action command id */
public static final String TRACK_ACTION = "org.eclipse.egit.ui.team.Track"; //$NON-NLS-1$
- /** "Untrack" action command id */
- public static final String UNTRACK_ACTION = "org.eclipse.egit.ui.internal.actions.Untrack"; //$NON-NLS-1$
-
/** "Pull from upstream configuration" action command id */
public static final String PULL_FROM_UPSTREAM_CONFIG = "org.eclipse.egit.ui.team.PullFromUpstreamConfig"; //$NON-NLS-1$
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/UntrackAction.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/UntrackAction.java
deleted file mode 100644
index cc2b95d876..0000000000
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/UntrackAction.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (C) 2011, Mathias Kinzler <mathias.kinzler@sap.com >
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-package org.eclipse.egit.ui.internal.actions;
-
-import org.eclipse.egit.core.op.TagOperation;
-
-/**
- * An action for creating tag.
- *
- * @see TagOperation
- */
-public class UntrackAction extends RepositoryAction {
- /**
- *
- */
- public UntrackAction() {
- super(ActionCommands.UNTRACK_ACTION, new UntrackActionHandler());
- }
-}

Back to the top