Formatierung korrigiert
git-svn-id: https://svn.libreccm.org/ccm/trunk@2446 8810af33-2d31-482b-a856-94f89814c4dfmaster
parent
92498b46c9
commit
a430009ed2
|
|
@ -137,6 +137,7 @@ class ItemLifecycleSelectForm extends BaseForm {
|
||||||
m_startDate =
|
m_startDate =
|
||||||
new Date(new DateParameter(START_DATE) {
|
new Date(new DateParameter(START_DATE) {
|
||||||
|
|
||||||
|
@Override
|
||||||
protected final Calendar getCalendar(final HttpServletRequest sreq) {
|
protected final Calendar getCalendar(final HttpServletRequest sreq) {
|
||||||
final Calendar cal = super.getCalendar(sreq);
|
final Calendar cal = super.getCalendar(sreq);
|
||||||
|
|
||||||
|
|
@ -187,6 +188,7 @@ class ItemLifecycleSelectForm extends BaseForm {
|
||||||
m_endDate =
|
m_endDate =
|
||||||
new Date(new DateParameter(END_DATE) {
|
new Date(new DateParameter(END_DATE) {
|
||||||
|
|
||||||
|
@Override
|
||||||
protected final Calendar getCalendar(final HttpServletRequest sreq) {
|
protected final Calendar getCalendar(final HttpServletRequest sreq) {
|
||||||
final Calendar cal = super.getCalendar(sreq);
|
final Calendar cal = super.getCalendar(sreq);
|
||||||
|
|
||||||
|
|
@ -263,6 +265,7 @@ class ItemLifecycleSelectForm extends BaseForm {
|
||||||
|
|
||||||
private class OptionPrinter implements PrintListener {
|
private class OptionPrinter implements PrintListener {
|
||||||
|
|
||||||
|
@Override
|
||||||
public final void prepare(final PrintEvent e) {
|
public final void prepare(final PrintEvent e) {
|
||||||
final ContentSection section =
|
final ContentSection section =
|
||||||
CMS.getContext().getContentSection();
|
CMS.getContext().getContentSection();
|
||||||
|
|
@ -295,6 +298,7 @@ class ItemLifecycleSelectForm extends BaseForm {
|
||||||
|
|
||||||
private class InitListener implements FormInitListener {
|
private class InitListener implements FormInitListener {
|
||||||
|
|
||||||
|
@Override
|
||||||
public final void init(final FormSectionEvent e) {
|
public final void init(final FormSectionEvent e) {
|
||||||
final PageState state = e.getPageState();
|
final PageState state = e.getPageState();
|
||||||
|
|
||||||
|
|
@ -377,6 +381,7 @@ class ItemLifecycleSelectForm extends BaseForm {
|
||||||
*/
|
*/
|
||||||
private class ProcessListener implements FormProcessListener {
|
private class ProcessListener implements FormProcessListener {
|
||||||
|
|
||||||
|
@Override
|
||||||
public final void process(final FormSectionEvent e)
|
public final void process(final FormSectionEvent e)
|
||||||
throws FormProcessException {
|
throws FormProcessException {
|
||||||
final PageState state = e.getPageState();
|
final PageState state = e.getPageState();
|
||||||
|
|
@ -386,6 +391,7 @@ class ItemLifecycleSelectForm extends BaseForm {
|
||||||
if (CMSConfig.getInstance().getThreadedPublishing()) {
|
if (CMSConfig.getInstance().getThreadedPublishing()) {
|
||||||
final Runnable threadAction = new Runnable() {
|
final Runnable threadAction = new Runnable() {
|
||||||
|
|
||||||
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
PublishLock.getInstance().lock(item);
|
PublishLock.getInstance().lock(item);
|
||||||
publisher.publish();
|
publisher.publish();
|
||||||
|
|
@ -395,6 +401,7 @@ class ItemLifecycleSelectForm extends BaseForm {
|
||||||
final Thread thread = new Thread(threadAction);
|
final Thread thread = new Thread(threadAction);
|
||||||
thread.setUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
|
thread.setUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
|
||||||
|
|
||||||
|
@Override
|
||||||
public void uncaughtException(final Thread thread,
|
public void uncaughtException(final Thread thread,
|
||||||
final Throwable ex) {
|
final Throwable ex) {
|
||||||
PublishLock.getInstance().setError(item);
|
PublishLock.getInstance().setError(item);
|
||||||
|
|
@ -845,6 +852,7 @@ class ItemLifecycleSelectForm extends BaseForm {
|
||||||
|
|
||||||
private class ValidationListener implements FormValidationListener {
|
private class ValidationListener implements FormValidationListener {
|
||||||
|
|
||||||
|
@Override
|
||||||
public void validate(FormSectionEvent e) throws FormProcessException {
|
public void validate(FormSectionEvent e) throws FormProcessException {
|
||||||
final PageState state = e.getPageState();
|
final PageState state = e.getPageState();
|
||||||
|
|
||||||
|
|
@ -996,6 +1004,7 @@ class ItemLifecycleSelectForm extends BaseForm {
|
||||||
|
|
||||||
public class TimeZonePrinter implements PrintListener {
|
public class TimeZonePrinter implements PrintListener {
|
||||||
|
|
||||||
|
@Override
|
||||||
public void prepare(PrintEvent e) {
|
public void prepare(PrintEvent e) {
|
||||||
final Label target = (Label) e.getTarget();
|
final Label target = (Label) e.getTarget();
|
||||||
if (ContentSection.getConfig().getHideTimezone()) {
|
if (ContentSection.getConfig().getHideTimezone()) {
|
||||||
|
|
|
||||||
|
|
@ -19,16 +19,15 @@
|
||||||
package com.arsdigita.cms.ui.workflow;
|
package com.arsdigita.cms.ui.workflow;
|
||||||
|
|
||||||
import com.arsdigita.bebop.ActionLink;
|
import com.arsdigita.bebop.ActionLink;
|
||||||
import com.arsdigita.bebop.PageState;
|
|
||||||
import com.arsdigita.bebop.Label;
|
import com.arsdigita.bebop.Label;
|
||||||
import com.arsdigita.bebop.event.ActionListener;
|
import com.arsdigita.bebop.PageState;
|
||||||
import com.arsdigita.bebop.event.ActionEvent;
|
import com.arsdigita.bebop.event.ActionEvent;
|
||||||
import com.arsdigita.cms.workflow.CMSTask;
|
import com.arsdigita.bebop.event.ActionListener;
|
||||||
import com.arsdigita.cms.SecurityManager;
|
|
||||||
import com.arsdigita.cms.CMS;
|
import com.arsdigita.cms.CMS;
|
||||||
import com.arsdigita.workflow.simple.Workflow;
|
import com.arsdigita.cms.SecurityManager;
|
||||||
|
import com.arsdigita.cms.workflow.CMSTask;
|
||||||
import com.arsdigita.web.Web;
|
import com.arsdigita.web.Web;
|
||||||
|
import com.arsdigita.workflow.simple.Workflow;
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -59,6 +58,7 @@ final class ItemWorkflowItemPane extends BaseWorkflowItemPane {
|
||||||
}
|
}
|
||||||
|
|
||||||
private final class TaskSelectionRequestLocal extends TaskRequestLocal {
|
private final class TaskSelectionRequestLocal extends TaskRequestLocal {
|
||||||
|
@Override
|
||||||
protected final Object initialValue(final PageState state) {
|
protected final Object initialValue(final PageState state) {
|
||||||
final String id = m_assigned.getRowSelectionModel().getSelectedKey
|
final String id = m_assigned.getRowSelectionModel().getSelectedKey
|
||||||
(state).toString();
|
(state).toString();
|
||||||
|
|
@ -80,12 +80,14 @@ final class ItemWorkflowItemPane extends BaseWorkflowItemPane {
|
||||||
addActionListener(new Listener());
|
addActionListener(new Listener());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
public final boolean isVisible(final PageState state) {
|
public final boolean isVisible(final PageState state) {
|
||||||
final Workflow workflow = m_workflow.getWorkflow(state);
|
final Workflow workflow = m_workflow.getWorkflow(state);
|
||||||
return workflow.getProcessState() == Workflow.STARTED;
|
return workflow.getProcessState() == Workflow.STARTED;
|
||||||
}
|
}
|
||||||
|
|
||||||
private class Listener implements ActionListener {
|
private class Listener implements ActionListener {
|
||||||
|
@Override
|
||||||
public final void actionPerformed(final ActionEvent e) {
|
public final void actionPerformed(final ActionEvent e) {
|
||||||
final PageState state = e.getPageState();
|
final PageState state = e.getPageState();
|
||||||
|
|
||||||
|
|
@ -106,6 +108,7 @@ final class ItemWorkflowItemPane extends BaseWorkflowItemPane {
|
||||||
addActionListener(new Listener());
|
addActionListener(new Listener());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
public final boolean isVisible(final PageState state) {
|
public final boolean isVisible(final PageState state) {
|
||||||
final Workflow workflow = m_workflow.getWorkflow(state);
|
final Workflow workflow = m_workflow.getWorkflow(state);
|
||||||
|
|
||||||
|
|
@ -114,6 +117,7 @@ final class ItemWorkflowItemPane extends BaseWorkflowItemPane {
|
||||||
}
|
}
|
||||||
|
|
||||||
private class Listener implements ActionListener {
|
private class Listener implements ActionListener {
|
||||||
|
@Override
|
||||||
public final void actionPerformed(final ActionEvent e) {
|
public final void actionPerformed(final ActionEvent e) {
|
||||||
final PageState state = e.getPageState();
|
final PageState state = e.getPageState();
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -85,6 +85,7 @@ public final class TaskFinishForm extends CommentAddForm {
|
||||||
|
|
||||||
private class InitListener implements FormInitListener {
|
private class InitListener implements FormInitListener {
|
||||||
|
|
||||||
|
@Override
|
||||||
public final void init(final FormSectionEvent e) {
|
public final void init(final FormSectionEvent e) {
|
||||||
s_log.debug("Initializing task finish");
|
s_log.debug("Initializing task finish");
|
||||||
|
|
||||||
|
|
@ -106,6 +107,7 @@ public final class TaskFinishForm extends CommentAddForm {
|
||||||
|
|
||||||
private class ValidationListener implements FormValidationListener {
|
private class ValidationListener implements FormValidationListener {
|
||||||
|
|
||||||
|
@Override
|
||||||
public final void validate(final FormSectionEvent e)
|
public final void validate(final FormSectionEvent e)
|
||||||
throws FormProcessException {
|
throws FormProcessException {
|
||||||
s_log.debug("Validating task finish");
|
s_log.debug("Validating task finish");
|
||||||
|
|
@ -121,6 +123,7 @@ public final class TaskFinishForm extends CommentAddForm {
|
||||||
|
|
||||||
private class ProcessListener implements FormProcessListener {
|
private class ProcessListener implements FormProcessListener {
|
||||||
|
|
||||||
|
@Override
|
||||||
public final void process(final FormSectionEvent e)
|
public final void process(final FormSectionEvent e)
|
||||||
throws FormProcessException {
|
throws FormProcessException {
|
||||||
s_log.debug("Processing task finish");
|
s_log.debug("Processing task finish");
|
||||||
|
|
|
||||||
|
|
@ -166,6 +166,7 @@ public class Workflow extends Task {
|
||||||
* restored instance.
|
* restored instance.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
@Override
|
||||||
protected void initialize() {
|
protected void initialize() {
|
||||||
super.initialize();
|
super.initialize();
|
||||||
|
|
||||||
|
|
@ -185,6 +186,7 @@ public class Workflow extends Task {
|
||||||
*
|
*
|
||||||
* @return the base data object type.
|
* @return the base data object type.
|
||||||
*/
|
*/
|
||||||
|
@Override
|
||||||
public String getBaseDataObjectType() {
|
public String getBaseDataObjectType() {
|
||||||
return BASE_DATA_OBJECT_TYPE;
|
return BASE_DATA_OBJECT_TYPE;
|
||||||
}
|
}
|
||||||
|
|
@ -570,6 +572,7 @@ public class Workflow extends Task {
|
||||||
*
|
*
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
@Override
|
||||||
synchronized void updateState() {
|
synchronized void updateState() {
|
||||||
super.updateState();
|
super.updateState();
|
||||||
|
|
||||||
|
|
@ -623,6 +626,7 @@ public class Workflow extends Task {
|
||||||
*
|
*
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
@Override
|
||||||
public synchronized Object clone() {
|
public synchronized Object clone() {
|
||||||
Workflow workflowClone = new Workflow(getLabel(), getDescription());
|
Workflow workflowClone = new Workflow(getLabel(), getDescription());
|
||||||
//copyAttributes(workflowClone);
|
//copyAttributes(workflowClone);
|
||||||
|
|
@ -712,6 +716,7 @@ public class Workflow extends Task {
|
||||||
*
|
*
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
@Override
|
||||||
public void enable() {
|
public void enable() {
|
||||||
|
|
||||||
int taskState = getState();
|
int taskState = getState();
|
||||||
|
|
@ -745,6 +750,7 @@ public class Workflow extends Task {
|
||||||
*
|
*
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
@Override
|
||||||
public void disableEvt() {
|
public void disableEvt() {
|
||||||
Task tempTask = null;
|
Task tempTask = null;
|
||||||
stop(null);
|
stop(null);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue