From 6344b78c0a3215b99b8f9bd59c7f0d5be5c53c9d Mon Sep 17 00:00:00 2001 From: nmirasch Date: Fri, 9 Mar 2018 13:42:04 +0100 Subject: [PATCH] JBPM-6881 : Rename Task Administration menu to Tasks (#30) --- .../jbpm/workbench/common/client/menu/ManageSelectorImpl.java | 2 +- .../workbench/common/client/resources/i18n/Constants.java | 2 +- .../common/client/resources/i18n/Constants.properties | 2 +- .../jbpm/workbench/ht/client/resources/i18n/Constants.java | 4 ++++ .../workbench/ht/client/resources/i18n/Constants.properties | 2 ++ .../java/org/jbpm/workbench/client/ShowcaseEntryPoint.java | 4 ++-- .../main/java/org/jbpm/workbench/client/i18n/Constants.java | 4 ++++ .../org/jbpm/workbench/client/i18n/Constants.properties | 2 ++ .../org/jbpm/workbench/client/ShowcaseEntryPointTest.java | 2 +- 9 files changed, 18 insertions(+), 6 deletions(-) diff --git a/jbpm-wb-common/jbpm-wb-common-client/src/main/java/org/jbpm/workbench/common/client/menu/ManageSelectorImpl.java b/jbpm-wb-common/jbpm-wb-common-client/src/main/java/org/jbpm/workbench/common/client/menu/ManageSelectorImpl.java index fb8d6a5be5..7507d4a021 100644 --- a/jbpm-wb-common/jbpm-wb-common-client/src/main/java/org/jbpm/workbench/common/client/menu/ManageSelectorImpl.java +++ b/jbpm-wb-common/jbpm-wb-common-client/src/main/java/org/jbpm/workbench/common/client/menu/ManageSelectorImpl.java @@ -70,7 +70,7 @@ public class ManageSelectorImpl implements ManageSelector { perspectives.put(PerspectiveIds.PROCESS_INSTANCES, Constants.INSTANCE.Process_Instances()); perspectives.put(PerspectiveIds.TASKS_ADMIN, - Constants.INSTANCE.Tasks_Admin()); + Constants.INSTANCE.Tasks()); perspectives.put(PerspectiveIds.EXECUTION_ERRORS, Constants.INSTANCE.ExecutionErrors()); perspectives.put(PerspectiveIds.JOBS, diff --git a/jbpm-wb-common/jbpm-wb-common-client/src/main/java/org/jbpm/workbench/common/client/resources/i18n/Constants.java b/jbpm-wb-common/jbpm-wb-common-client/src/main/java/org/jbpm/workbench/common/client/resources/i18n/Constants.java index 0aa017f5c0..d4ca6c02e1 100644 --- a/jbpm-wb-common/jbpm-wb-common-client/src/main/java/org/jbpm/workbench/common/client/resources/i18n/Constants.java +++ b/jbpm-wb-common/jbpm-wb-common-client/src/main/java/org/jbpm/workbench/common/client/resources/i18n/Constants.java @@ -112,7 +112,7 @@ String DataSetError(String dataSet, String Process_Instances(); - String Tasks_Admin(); + String Tasks(); String Task_Inbox(); diff --git a/jbpm-wb-common/jbpm-wb-common-client/src/main/resources/org/jbpm/workbench/common/client/resources/i18n/Constants.properties b/jbpm-wb-common/jbpm-wb-common-client/src/main/resources/org/jbpm/workbench/common/client/resources/i18n/Constants.properties index 6cdffc211f..5d624dacb0 100644 --- a/jbpm-wb-common/jbpm-wb-common-client/src/main/resources/org/jbpm/workbench/common/client/resources/i18n/Constants.properties +++ b/jbpm-wb-common/jbpm-wb-common-client/src/main/resources/org/jbpm/workbench/common/client/resources/i18n/Constants.properties @@ -38,7 +38,7 @@ AdvancedFilters=Advanced Filters Process_Definitions=Process Definitions Process_Instances=Process Instances Task_Inbox=Task Inbox -Tasks_Admin=Task Administration List +Tasks=Tasks Jobs=Jobs ExecutionErrors=Execution Errors Manage=Manage diff --git a/jbpm-wb-human-tasks/jbpm-wb-human-tasks-client/src/main/java/org/jbpm/workbench/ht/client/resources/i18n/Constants.java b/jbpm-wb-human-tasks/jbpm-wb-human-tasks-client/src/main/java/org/jbpm/workbench/ht/client/resources/i18n/Constants.java index 383569434b..6076dcd04f 100644 --- a/jbpm-wb-human-tasks/jbpm-wb-human-tasks-client/src/main/java/org/jbpm/workbench/ht/client/resources/i18n/Constants.java +++ b/jbpm-wb-human-tasks/jbpm-wb-human-tasks-client/src/main/java/org/jbpm/workbench/ht/client/resources/i18n/Constants.java @@ -31,6 +31,10 @@ public interface Constants extends Messages { Constants INSTANCE = GWT.create(Constants.class); + String Task_Inbox(); + + String Tasks(); + String Grid(); String New_Task(); diff --git a/jbpm-wb-human-tasks/jbpm-wb-human-tasks-client/src/main/resources/org/jbpm/workbench/ht/client/resources/i18n/Constants.properties b/jbpm-wb-human-tasks/jbpm-wb-human-tasks-client/src/main/resources/org/jbpm/workbench/ht/client/resources/i18n/Constants.properties index 736d3f124b..2d254f56da 100644 --- a/jbpm-wb-human-tasks/jbpm-wb-human-tasks-client/src/main/resources/org/jbpm/workbench/ht/client/resources/i18n/Constants.properties +++ b/jbpm-wb-human-tasks/jbpm-wb-human-tasks-client/src/main/resources/org/jbpm/workbench/ht/client/resources/i18n/Constants.properties @@ -1,3 +1,5 @@ +Task_Inbox=Task Inbox +Tasks=Tasks Actual_Owner=Actual Owner Reminder_Details=Reminder Details Reminder=Reminder diff --git a/jbpm-wb-showcase/src/main/java/org/jbpm/workbench/client/ShowcaseEntryPoint.java b/jbpm-wb-showcase/src/main/java/org/jbpm/workbench/client/ShowcaseEntryPoint.java index 428e79ad2d..ec97b38c70 100644 --- a/jbpm-wb-showcase/src/main/java/org/jbpm/workbench/client/ShowcaseEntryPoint.java +++ b/jbpm-wb-showcase/src/main/java/org/jbpm/workbench/client/ShowcaseEntryPoint.java @@ -42,7 +42,7 @@ import org.uberfire.workbench.model.menu.MenuItem; import org.uberfire.workbench.model.menu.Menus; -import static org.jbpm.workbench.common.client.PerspectiveIds.*; +import static org.kie.workbench.common.workbench.client.PerspectiveIds.*; @EntryPoint @Bundle("i18n/HomeConstants.properties") @@ -116,7 +116,7 @@ protected List getProcessManagementViews() { MenuFactory.newSimpleItem(commonConstants.Process_Definitions()).perspective(PROCESS_DEFINITIONS).endMenu().build().getItems().get(0), MenuFactory.newSimpleItem(commonConstants.Process_Instances()).perspective(PROCESS_INSTANCES).endMenu().build().getItems().get(0), MenuFactory.newSimpleItem(constants.Process_Instances_Admin()).perspective(ProcessAdminSettingsPerspective.PERSPECTIVE_ID).endMenu().build().getItems().get(0), - MenuFactory.newSimpleItem(commonConstants.Tasks_Admin()).perspective(TASKS_ADMIN).endMenu().build().getItems().get(0), + MenuFactory.newSimpleItem(commonConstants.Tasks()).perspective(TASKS_ADMIN).endMenu().build().getItems().get(0), MenuFactory.newSimpleItem(commonConstants.ExecutionErrors()).perspective(EXECUTION_ERRORS).endMenu().build().getItems().get(0) ); } diff --git a/jbpm-wb-showcase/src/main/java/org/jbpm/workbench/client/i18n/Constants.java b/jbpm-wb-showcase/src/main/java/org/jbpm/workbench/client/i18n/Constants.java index d5b90d24e6..b851c9f9ed 100644 --- a/jbpm-wb-showcase/src/main/java/org/jbpm/workbench/client/i18n/Constants.java +++ b/jbpm-wb-showcase/src/main/java/org/jbpm/workbench/client/i18n/Constants.java @@ -31,6 +31,10 @@ public interface Constants extends Messages { Constants INSTANCE = GWT.create(Constants.class); + String Task_Inbox(); + + String Tasks(); + String Tasks_List_Admin(); String Dashboards(); diff --git a/jbpm-wb-showcase/src/main/resources/org/jbpm/workbench/client/i18n/Constants.properties b/jbpm-wb-showcase/src/main/resources/org/jbpm/workbench/client/i18n/Constants.properties index 1a280b2012..5fbce4e9f4 100644 --- a/jbpm-wb-showcase/src/main/resources/org/jbpm/workbench/client/i18n/Constants.properties +++ b/jbpm-wb-showcase/src/main/resources/org/jbpm/workbench/client/i18n/Constants.properties @@ -1,3 +1,5 @@ +Task_Inbox=Task Inbox +Tasks=Task Administration Project_Authoring=Project Authoring Authoring=Authoring Process_Management=Process Management diff --git a/jbpm-wb-showcase/src/test/java/org/jbpm/workbench/client/ShowcaseEntryPointTest.java b/jbpm-wb-showcase/src/test/java/org/jbpm/workbench/client/ShowcaseEntryPointTest.java index 17c23f2d0c..987919f64f 100644 --- a/jbpm-wb-showcase/src/test/java/org/jbpm/workbench/client/ShowcaseEntryPointTest.java +++ b/jbpm-wb-showcase/src/test/java/org/jbpm/workbench/client/ShowcaseEntryPointTest.java @@ -143,7 +143,7 @@ public void getProcessManagementViewsTest() { processManagementMenuItems.get(1).getCaption()); assertEquals(showcaseEntryPoint.constants.Process_Instances_Admin(), processManagementMenuItems.get(2).getCaption()); - assertEquals(showcaseEntryPoint.commonConstants.Tasks_Admin(), + assertEquals(showcaseEntryPoint.commonConstants.Tasks(), processManagementMenuItems.get(3).getCaption()); assertEquals(showcaseEntryPoint.commonConstants.ExecutionErrors(), processManagementMenuItems.get(4).getCaption());