diff --git a/src/main/java/neatlogic/framework/process/constvalue/ProcessStepHandlerType.java b/src/main/java/neatlogic/framework/process/constvalue/ProcessStepHandlerType.java index 527ffaa6c4aed8981690e6e448752f5659c593f6..a6658c4d492eab51bc54b7bc4b8235f3c0b79f89 100644 --- a/src/main/java/neatlogic/framework/process/constvalue/ProcessStepHandlerType.java +++ b/src/main/java/neatlogic/framework/process/constvalue/ProcessStepHandlerType.java @@ -17,23 +17,22 @@ package neatlogic.framework.process.constvalue; import neatlogic.framework.process.stephandler.core.IProcessStepHandlerType; -import neatlogic.framework.util.I18n; +import neatlogic.framework.util.$; public enum ProcessStepHandlerType implements IProcessStepHandlerType { - START("start", "start", new I18n("开始")), - OMNIPOTENT("omnipotent", "process", new I18n("通用节点")), - END("end", "end", new I18n("结束")), - CONDITION("condition", "converge", new I18n("条件")), - DISTRIBUTARY("distributary", "converge", new I18n("分流")), - OCTOPUS("octopus", "process", new I18n("自动化")), - AUTOMATIC("automatic", "process", new I18n("自动处理")), - TIMER("timer", "process", new I18n("定时节点")); + START("start", "start", "term.itsm.start"), + OMNIPOTENT("omnipotent", "process", "term.itsm.omnipotent"), + END("end", "end", "term.itsm.end"), + CONDITION("condition", "converge", "term.itsm.condition"), + DISTRIBUTARY("distributary", "converge", "term.itsm.distributary"), + AUTOMATIC("automatic", "process", "term.itsm.automatic"), + TIMER("timer", "process", "term.itsm.timer"); private final String handler; - private final I18n name; + private final String name; private final String type; - ProcessStepHandlerType(String _handler, String _type, I18n _name) { + ProcessStepHandlerType(String _handler, String _type, String _name) { this.handler = _handler; this.type = _type; this.name = _name; @@ -44,7 +43,7 @@ public enum ProcessStepHandlerType implements IProcessStepHandlerType { } public String getName() { - return name.toString(); + return $.t(name); } public String getType() { diff --git a/src/main/java/neatlogic/framework/process/notify/constvalue/ProcessNotifyPolicyHandlerGroup.java b/src/main/java/neatlogic/framework/process/notify/constvalue/ProcessNotifyPolicyHandlerGroup.java index 09573a165f79384322046f9e1b5d889b22050ee9..057fdc0083a9e379f1fc4f125bb51f9e653c775c 100644 --- a/src/main/java/neatlogic/framework/process/notify/constvalue/ProcessNotifyPolicyHandlerGroup.java +++ b/src/main/java/neatlogic/framework/process/notify/constvalue/ProcessNotifyPolicyHandlerGroup.java @@ -18,7 +18,7 @@ package neatlogic.framework.process.notify.constvalue; import neatlogic.framework.notify.core.INotifyPolicyHandlerGroup; import neatlogic.framework.util.$; - +@Deprecated public enum ProcessNotifyPolicyHandlerGroup implements INotifyPolicyHandlerGroup { TASKSTEP("TaskStep", "工单步骤"); private final String value;