From fb5caea787457032c66039113350a84eaf67b274 Mon Sep 17 00:00:00 2001 From: Frederik Heremans Date: Fri, 1 Mar 2013 10:25:42 +0100 Subject: [PATCH] Deprecating MAX and MIN values for priority on Task, moved to explorer --- .../impl/persistence/entity/TaskEntity.java | 2 +- .../main/java/org/activiti/engine/task/Task.java | 15 +++++++++++++++ .../java/org/activiti/explorer/Constants.java | 5 +++++ .../explorer/ui/task/PriorityComboBox.java | 7 ++++--- .../activiti/explorer/ui/task/PriorityLabel.java | 7 ++++--- 5 files changed, 29 insertions(+), 7 deletions(-) diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/TaskEntity.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/TaskEntity.java index c3399722a4..5ec48cefc6 100644 --- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/TaskEntity.java +++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/TaskEntity.java @@ -64,7 +64,7 @@ public class TaskEntity extends VariableScopeImpl implements Task, DelegateTask, protected String name; protected String description; - protected int priority = Task.PRIORITY_NORMAL; + protected int priority = DEFAULT_PRIORITY; protected Date createTime; // The time when the task has been created protected Date dueDate; protected int suspensionState = SuspensionState.ACTIVE.getStateCode(); diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/task/Task.java b/modules/activiti-engine/src/main/java/org/activiti/engine/task/Task.java index 1db5612065..09432d406d 100644 --- a/modules/activiti-engine/src/main/java/org/activiti/engine/task/Task.java +++ b/modules/activiti-engine/src/main/java/org/activiti/engine/task/Task.java @@ -21,9 +21,24 @@ import java.util.Date; * @author Joram Barrez */ public interface Task { + + /** + * Default value used for priority when a new {@link Task} is created. + */ + int DEFAULT_PRIORITY = 50; + /** + * @deprecated Will be removed in 5.13 + */ int PRIORITY_MINIUM = 0; + /** + * @deprecated Will be removed in 5.13 + */ int PRIORITY_NORMAL = 50; + + /** + * @deprecated Will be removed in 5.13 + */ int PRIORITY_MAXIMUM = 100; /** DB id of the task. */ diff --git a/modules/activiti-explorer/src/main/java/org/activiti/explorer/Constants.java b/modules/activiti-explorer/src/main/java/org/activiti/explorer/Constants.java index c35cde5c3e..cdfa4be281 100644 --- a/modules/activiti-explorer/src/main/java/org/activiti/explorer/Constants.java +++ b/modules/activiti-explorer/src/main/java/org/activiti/explorer/Constants.java @@ -44,6 +44,11 @@ public class Constants { // Default diagram image extension, when name cannot be deducted from resource name public static final String DEFAULT_DIAGRAM_IMAGE_EXTENSION = "png"; + // Task priority values + public static final int TASK_PRIORITY_LOW = 0; + public static final int TASK_PRIORITY_MEDIUM = 50; + public static final int TASK_PRIORITY_HIGH = 100; + // MIMETYPES public static final String MIMETYPE_BPM = "image/bpm"; public static final String MIMETYPE_GIF = "image/gif"; diff --git a/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/task/PriorityComboBox.java b/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/task/PriorityComboBox.java index d6b4f0b891..ccd0163b51 100644 --- a/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/task/PriorityComboBox.java +++ b/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/task/PriorityComboBox.java @@ -15,6 +15,7 @@ package org.activiti.explorer.ui.task; import java.util.Arrays; import org.activiti.engine.task.Task; +import org.activiti.explorer.Constants; import org.activiti.explorer.I18nManager; import org.activiti.explorer.Messages; @@ -52,11 +53,11 @@ public class PriorityComboBox extends ComboBox { public int getPriority() { String value = getValue().toString(); if (i18nManager.getMessage(Messages.TASK_PRIORITY_LOW).equals(value)) { - return Task.PRIORITY_MINIUM; + return Constants.TASK_PRIORITY_LOW; } else if (i18nManager.getMessage(Messages.TASK_PRIORITY_MEDIUM).equals(value)) { - return Task.PRIORITY_NORMAL; + return Constants.TASK_PRIORITY_MEDIUM; } else { - return Task.PRIORITY_MAXIMUM; + return Constants.TASK_PRIORITY_HIGH; } } diff --git a/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/task/PriorityLabel.java b/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/task/PriorityLabel.java index 251289875a..55ea3c6125 100644 --- a/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/task/PriorityLabel.java +++ b/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/task/PriorityLabel.java @@ -13,6 +13,7 @@ package org.activiti.explorer.ui.task; import org.activiti.engine.task.Task; +import org.activiti.explorer.Constants; import org.activiti.explorer.I18nManager; import org.activiti.explorer.Messages; import org.activiti.explorer.ui.mainlayout.ExplorerLayout; @@ -47,13 +48,13 @@ public class PriorityLabel extends Label { public void setValue(Object newValue) { if (newValue instanceof Integer) { priority = (Integer) newValue; - if (priority < Task.PRIORITY_NORMAL) { + if (priority < Constants.TASK_PRIORITY_MEDIUM) { super.setValue(i18nManager.getMessage(Messages.TASK_PRIORITY_LOW)); addStyleName(ExplorerLayout.STYLE_TASK_HEADER_PRIORITY_LOW); - } else if (priority == Task.PRIORITY_NORMAL) { + } else if (priority == Constants.TASK_PRIORITY_MEDIUM) { super.setValue(i18nManager.getMessage(Messages.TASK_PRIORITY_MEDIUM)); addStyleName(ExplorerLayout.STYLE_TASK_HEADER_PRIORITY_MEDIUM); - } else if (priority > Task.PRIORITY_NORMAL) { + } else if (priority > Constants.TASK_PRIORITY_MEDIUM) { super.setValue(i18nManager.getMessage(Messages.TASK_PRIORITY_HIGH)); addStyleName(ExplorerLayout.STYLE_TASK_HEADER_PRIORITY_HIGH); } -- GitLab