Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/DiscardChangesActionHandler.java')
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/DiscardChangesActionHandler.java14
1 files changed, 6 insertions, 8 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/DiscardChangesActionHandler.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/DiscardChangesActionHandler.java
index 689fe8a86e..455e178869 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/DiscardChangesActionHandler.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/DiscardChangesActionHandler.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (C) 2010, Roland Grunberg <rgrunber@redhat.com>
+ * Copyright (C) 2010, 2013 Roland Grunberg <rgrunber@redhat.com>
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -8,12 +8,12 @@
*
* Contributors:
* Benjamin Muskalla (Tasktop Technologies Inc.) - support for model scoping
+ * François Rey <eclipse.org_@_francois_._rey_._name> - handling of linked resources
*******************************************************************************/
package org.eclipse.egit.ui.internal.actions;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -75,12 +75,10 @@ public class DiscardChangesActionHandler extends RepositoryActionHandler {
@Override
public boolean isEnabled() {
- for (IResource res : getSelectedResources()) {
- IProject[] proj = new IProject[] { res.getProject() };
- Repository[] repositories = getRepositoriesFor(proj);
- if (repositories.length == 0)
- return false;
- Repository repository = repositories[0];
+ Repository[] repositories = getRepositories();
+ if (repositories.length == 0)
+ return false;
+ for (Repository repository : repositories) {
if (!repository.getRepositoryState().equals(RepositoryState.SAFE))
return false;
}

Back to the top