You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by mg...@apache.org on 2015/10/16 23:34:22 UTC
isis git commit: ISIS-1007: Minor simplification
Repository: isis
Updated Branches:
refs/heads/master 342da9cfb -> 94ba26825
ISIS-1007: Minor simplification
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/94ba2682
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/94ba2682
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/94ba2682
Branch: refs/heads/master
Commit: 94ba268253d053cc81d326e5ace33814c96c73bb
Parents: 342da9c
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Oct 16 23:28:00 2015 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Oct 16 23:28:00 2015 +0200
----------------------------------------------------------------------
.../java/org/apache/isis/core/runtime/system/IsisSystem.java | 7 ++++---
.../actionmenu/entityactions/AdditionalLinksPanel.java | 7 ++++---
.../ui/components/actions/ActionParametersFormPanel.java | 7 ++++---
3 files changed, 12 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/94ba2682/core/runtime/src/main/java/org/apache/isis/core/runtime/system/IsisSystem.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/IsisSystem.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/IsisSystem.java
index 0bec918..84fda30 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/IsisSystem.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/IsisSystem.java
@@ -300,9 +300,10 @@ public class IsisSystem implements DebugSelection, ApplicationScopedComponent {
// as used by the Wicket UI
final TranslationService translationService = lookupService(TranslationService.class);
- translationService.translate(IsisSystem.class.getName(), MSG_ARE_YOU_SURE);
- translationService.translate(IsisSystem.class.getName(), MSG_CONFIRM);
- translationService.translate(IsisSystem.class.getName(), MSG_CANCEL);
+ final String context = IsisSystem.class.getName();
+ translationService.translate(context, MSG_ARE_YOU_SURE);
+ translationService.translate(context, MSG_CONFIRM);
+ translationService.translate(context, MSG_CANCEL);
} finally {
IsisContext.closeSession();
http://git-wip-us.apache.org/repos/asf/isis/blob/94ba2682/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksPanel.java
index 8268419..39e240a 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksPanel.java
@@ -131,9 +131,10 @@ public class AdditionalLinksPanel extends PanelAbstract<ListOfLinksModel> {
final TranslationService translationService =
getPersistenceSession().getServicesInjector().lookupService(TranslationService.class);
- final String areYouSure = translationService.translate(IsisSystem.class.getName(), IsisSystem.MSG_ARE_YOU_SURE);
- final String confirm = translationService.translate(IsisSystem.class.getName(), IsisSystem.MSG_CONFIRM);
- final String cancel = translationService.translate(IsisSystem.class.getName(), IsisSystem.MSG_CANCEL);
+ final String context = IsisSystem.class.getName();
+ final String areYouSure = translationService.translate(context, IsisSystem.MSG_ARE_YOU_SURE);
+ final String confirm = translationService.translate(context, IsisSystem.MSG_CONFIRM);
+ final String cancel = translationService.translate(context, IsisSystem.MSG_CANCEL);
confirmationConfig.withTitle(areYouSure);
confirmationConfig.withBtnOkLabel(confirm);
http://git-wip-us.apache.org/repos/asf/isis/blob/94ba2682/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.java
index 9c09f46..58282ac 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.java
@@ -231,9 +231,10 @@ public class ActionParametersFormPanel extends PanelAbstract<ActionModel> {
final TranslationService translationService =
getPersistenceSession().getServicesInjector().lookupService(TranslationService.class);
- final String areYouSure = translationService.translate(IsisSystem.class.getName(), IsisSystem.MSG_ARE_YOU_SURE);
- final String confirm = translationService.translate(IsisSystem.class.getName(), IsisSystem.MSG_CONFIRM);
- final String cancel = translationService.translate(IsisSystem.class.getName(), IsisSystem.MSG_CANCEL);
+ final String context = IsisSystem.class.getName();
+ final String areYouSure = translationService.translate(context, IsisSystem.MSG_ARE_YOU_SURE);
+ final String confirm = translationService.translate(context, IsisSystem.MSG_CONFIRM);
+ final String cancel = translationService.translate(context, IsisSystem.MSG_CANCEL);
confirmationConfig.withTitle(areYouSure);
confirmationConfig.withBtnOkLabel(confirm);