opendev/gerrit
Code Issues Proposed changes

Allow UiCommands to appear in more than one place

Browse Source 
Some commands might want to list themselves in multiple contexts.
Support this by asking them to return a set describing where they
can be positioned.

Change-Id: I401e032f3a574f6c485abb1c1dd5bfa7d792f2ab
This commit is contained in:
Shawn Pearce
2013-05-10 17:41:10 -07:00
parent cfbd2e9982
commit 2bcfc66424
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/UiCommand.java
View File

@@ -17,12 +17,14 @@ package com.google.gerrit.extensions.webui;
import com.google.gerrit.extensions.restapi.RestResource; import com.google.gerrit.extensions.restapi.RestResource;
import com.google.gerrit.extensions.restapi.RestView; import com.google.gerrit.extensions.restapi.RestView;
import java.util.Set;
public interface UiCommand<R extends RestResource> extends RestView<R> { public interface UiCommand<R extends RestResource> extends RestView<R> {
public static enum Place { public static enum Place {
PATCHSET_ACTION_PANEL; PATCHSET_ACTION_PANEL;
}; };
Place getPlace(); Set<Place> getPlaces();
String getLabel(R resource); String getLabel(R resource);
String getTitle(R resource); String getTitle(R resource);
boolean isVisible(R resource); boolean isVisible(R resource);

4
gerrit-server/src/main/java/com/google/gerrit/server/extensions/webui/UiCommands.java
View File

@@ -19,6 +19,7 @@ import com.google.common.base.Predicate;
import com.google.common.base.Predicates; import com.google.common.base.Predicates;
import com.google.common.collect.Iterables; import com.google.common.collect.Iterables;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import com.google.gerrit.common.data.UiCommandDetail; import com.google.gerrit.common.data.UiCommandDetail;
import com.google.gerrit.extensions.registration.DynamicMap; import com.google.gerrit.extensions.registration.DynamicMap;
import com.google.gerrit.extensions.restapi.ChildCollection; import com.google.gerrit.extensions.restapi.ChildCollection;
@@ -99,7 +100,8 @@ public class UiCommands {
} }
UiCommand<R> cmd = (UiCommand<R>) view; UiCommand<R> cmd = (UiCommand<R>) view;
if (!places.contains(cmd.getPlace()) || !cmd.isVisible(resource)) { if (Sets.intersection(cmd.getPlaces(), places).isEmpty()
|| !cmd.isVisible(resource)) {
return null; return null;
} }