Author: danhaywood
Date: Fri Nov 23 13:11:19 2012
New Revision: 1412869
URL: http://svn.apache.org/viewvc?rev=1412869&view=rev
Log:
ISIS-232: removing '...' suffix for actions in wicket viewer
Modified:
isis/trunk/framework/viewer/wicket/wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/util/ObjectActions.java
isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/appactions/cssmenu/AppActionsCssMenuLinkFactory.java
isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/FindUsingLinkFactory.java
Modified:
isis/trunk/framework/viewer/wicket/wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/util/ObjectActions.java
URL:
http://svn.apache.org/viewvc/isis/trunk/framework/viewer/wicket/wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/util/ObjectActions.java?rev=1412869&r1=1412868&r2=1412869&view=diff
==============================================================================
---
isis/trunk/framework/viewer/wicket/wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/util/ObjectActions.java
(original)
+++
isis/trunk/framework/viewer/wicket/wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/util/ObjectActions.java
Fri Nov 23 13:11:19 2012
@@ -40,20 +40,11 @@ public final class ObjectActions {
};
}
- public static String labelFor(final ObjectAction objectAction) {
- final String actionName = ObjectActions.nameFor(objectAction);
- String actionLabel = actionName;
- if (objectAction.getParameterCount() > 0) {
- actionLabel += "...";
- }
- return actionLabel;
- }
-
public static String labelFor(final ObjectAction action, final
ObjectAdapter contextAdapter) {
- return action.promptForParameters(contextAdapter) ? labelFor(action) :
nameFor(action);
+ return action.promptForParameters(contextAdapter) ?
ObjectActions.nameFor(action) : nameFor(action);
}
- private static String nameFor(final ObjectAction noAction) {
+ public static String nameFor(final ObjectAction noAction) {
final String actionName = noAction.getName();
if (actionName != null) {
return actionName;
Modified:
isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/appactions/cssmenu/AppActionsCssMenuLinkFactory.java
URL:
http://svn.apache.org/viewvc/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/appactions/cssmenu/AppActionsCssMenuLinkFactory.java?rev=1412869&r1=1412868&r2=1412869&view=diff
==============================================================================
---
isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/appactions/cssmenu/AppActionsCssMenuLinkFactory.java
(original)
+++
isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/appactions/cssmenu/AppActionsCssMenuLinkFactory.java
Fri Nov 23 13:11:19 2012
@@ -47,7 +47,7 @@ class AppActionsCssMenuLinkFactory imple
final Class<? extends Page> pageClass =
getPageClassRegistry().getPageClass(PageType.ACTION);
final AbstractLink link = Links.newBookmarkablePageLink(linkId,
pageParameters, pageClass);
- final String actionLabel = ObjectActions.labelFor(action);
+ final String actionLabel = ObjectActions.nameFor(action);
return new LinkAndLabel(link, actionLabel);
}
Modified:
isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/FindUsingLinkFactory.java
URL:
http://svn.apache.org/viewvc/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/FindUsingLinkFactory.java?rev=1412869&r1=1412868&r2=1412869&view=diff
==============================================================================
---
isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/FindUsingLinkFactory.java
(original)
+++
isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/FindUsingLinkFactory.java
Fri Nov 23 13:11:19 2012
@@ -81,7 +81,7 @@ public final class FindUsingLinkFactory
public void onClick() {
callback.onClick(actionModel);
}
- }, ObjectActions.labelFor(action));
+ }, ObjectActions.nameFor(action));
}
}
\ No newline at end of file
