Skip to content

Commit

Permalink
Must rename RelocateAction to avoid linkage errors when using older v…
Browse files Browse the repository at this point in the history
…ersions of the cloudbees-folders-plus plugin.

(Until that is updated, most items will show two Move links, which is ugly but harmless.)
  • Loading branch information
jglick committed Jan 9, 2014
1 parent c006194 commit 282c9b9
Showing 1 changed file with 6 additions and 3 deletions.
Expand Up @@ -42,6 +42,8 @@
import java.util.concurrent.atomic.AtomicReference;
import jenkins.model.Jenkins;
import jenkins.model.TransientActionFactory;
import org.kohsuke.accmod.Restricted;
import org.kohsuke.accmod.restrictions.NoExternalUse;
import org.kohsuke.stapler.HttpResponse;
import org.kohsuke.stapler.QueryParameter;
import org.kohsuke.stapler.StaplerRequest;
Expand All @@ -50,7 +52,8 @@
/**
* Does the actual work of relocating an item.
*/
public class RelocateAction implements Action {
@Restricted(NoExternalUse.class)
public class RelocationAction implements Action {

/**
* The permission required to move an item.
Expand All @@ -67,7 +70,7 @@ public class RelocateAction implements Action {
*
* @param item the item that would be moved.
*/
public RelocateAction(Item item) {
public RelocationAction(Item item) {
this.item = item;
}

Expand Down Expand Up @@ -174,7 +177,7 @@ public static class TransientActionFactoryImpl extends TransientActionFactory<It

@Override
public Collection<? extends Action> createFor(Item target) {
return Collections.singleton(new RelocateAction(target));
return Collections.singleton(new RelocationAction(target));
}
}

Expand Down

0 comments on commit 282c9b9

Please sign in to comment.