You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2014/11/04 15:59:10 UTC
[2/3] git commit: White noise, ignore
White noise, ignore
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/bcc3e5be
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/bcc3e5be
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/bcc3e5be
Branch: refs/heads/master
Commit: bcc3e5be56a9f1595e55e6be3af77e39c6d6916f
Parents: 0054d3c
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Tue Nov 4 15:58:47 2014 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Tue Nov 4 15:58:47 2014 +0100
----------------------------------------------------------------------
.../pages/AbstractSyncTaskModalPage.java | 101 ++++++++++---------
.../org/apache/syncope/console/pages/Todo.java | 2 -
.../activiti/ActivitiUserWorkflowAdapter.java | 4 +-
3 files changed, 54 insertions(+), 53 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/bcc3e5be/console/src/main/java/org/apache/syncope/console/pages/AbstractSyncTaskModalPage.java
----------------------------------------------------------------------
diff --git a/console/src/main/java/org/apache/syncope/console/pages/AbstractSyncTaskModalPage.java b/console/src/main/java/org/apache/syncope/console/pages/AbstractSyncTaskModalPage.java
index b077638..1ab08e8 100644
--- a/console/src/main/java/org/apache/syncope/console/pages/AbstractSyncTaskModalPage.java
+++ b/console/src/main/java/org/apache/syncope/console/pages/AbstractSyncTaskModalPage.java
@@ -20,6 +20,7 @@ package org.apache.syncope.console.pages;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.common.to.AbstractSyncTaskTO;
@@ -69,6 +70,8 @@ public abstract class AbstractSyncTaskModalPage extends AbstractSchedTaskModalPa
for (ResourceTO resourceTO : resourceRestClient.getAll()) {
resourceNames.add(resourceTO.getName());
}
+
+ Collections.sort(resourceNames);
return resourceNames;
}
};
@@ -120,59 +123,59 @@ public abstract class AbstractSyncTaskModalPage extends AbstractSchedTaskModalPa
final ListView<String> actionsClasses = new ListView<String>(
"actionsClasses", new PropertyModel<List<String>>(taskTO, "actionsClassNames")) {
- private static final long serialVersionUID = 9101744072914090143L;
-
- @Override
- protected void populateItem(final ListItem<String> item) {
- final String className = item.getModelObject();
-
- final DropDownChoice<String> actionsClass = new DropDownChoice<String>(
- "actionsClass", new Model<String>(className), syncActionsClasses.getObject());
- actionsClass.setNullValid(true);
- actionsClass.setRequired(true);
- actionsClass.add(new AjaxFormComponentUpdatingBehavior(Constants.ON_CHANGE) {
-
- private static final long serialVersionUID = -1107858522700306810L;
-
- @Override
- protected void onUpdate(final AjaxRequestTarget target) {
- taskTO.getActionsClassNames().set(item.getIndex(), actionsClass.getModelObject());
- target.add(syncActionsClassNames);
- }
- });
- actionsClass.setRequired(true);
- actionsClass.setOutputMarkupId(true);
- actionsClass.setRequired(true);
- item.add(actionsClass);
-
- AjaxLink<Void> minus = new IndicatingAjaxLink<Void>("drop") {
-
- private static final long serialVersionUID = -7978723352517770644L;
+ private static final long serialVersionUID = 9101744072914090143L;
@Override
- public void onClick(final AjaxRequestTarget target) {
- taskTO.getActionsClassNames().remove(className);
- first.setVisible(taskTO.getActionsClassNames().isEmpty());
- target.add(syncActionsClassNames);
+ protected void populateItem(final ListItem<String> item) {
+ final String className = item.getModelObject();
+
+ final DropDownChoice<String> actionsClass = new DropDownChoice<String>(
+ "actionsClass", new Model<String>(className), syncActionsClasses.getObject());
+ actionsClass.setNullValid(true);
+ actionsClass.setRequired(true);
+ actionsClass.add(new AjaxFormComponentUpdatingBehavior(Constants.ON_CHANGE) {
+
+ private static final long serialVersionUID = -1107858522700306810L;
+
+ @Override
+ protected void onUpdate(final AjaxRequestTarget target) {
+ taskTO.getActionsClassNames().set(item.getIndex(), actionsClass.getModelObject());
+ target.add(syncActionsClassNames);
+ }
+ });
+ actionsClass.setRequired(true);
+ actionsClass.setOutputMarkupId(true);
+ actionsClass.setRequired(true);
+ item.add(actionsClass);
+
+ AjaxLink<Void> minus = new IndicatingAjaxLink<Void>("drop") {
+
+ private static final long serialVersionUID = -7978723352517770644L;
+
+ @Override
+ public void onClick(final AjaxRequestTarget target) {
+ taskTO.getActionsClassNames().remove(className);
+ first.setVisible(taskTO.getActionsClassNames().isEmpty());
+ target.add(syncActionsClassNames);
+ }
+ };
+ item.add(minus);
+
+ final AjaxLink<Void> plus = new IndicatingAjaxLink<Void>("add") {
+
+ private static final long serialVersionUID = -7978723352517770644L;
+
+ @Override
+ public void onClick(final AjaxRequestTarget target) {
+ taskTO.getActionsClassNames().add(StringUtils.EMPTY);
+ target.add(syncActionsClassNames);
+ }
+ };
+ plus.setOutputMarkupPlaceholderTag(true);
+ plus.setVisible(item.getIndex() == taskTO.getActionsClassNames().size() - 1);
+ item.add(plus);
}
};
- item.add(minus);
-
- final AjaxLink<Void> plus = new IndicatingAjaxLink<Void>("add") {
-
- private static final long serialVersionUID = -7978723352517770644L;
-
- @Override
- public void onClick(final AjaxRequestTarget target) {
- taskTO.getActionsClassNames().add(StringUtils.EMPTY);
- target.add(syncActionsClassNames);
- }
- };
- plus.setOutputMarkupPlaceholderTag(true);
- plus.setVisible(item.getIndex() == taskTO.getActionsClassNames().size() - 1);
- item.add(plus);
- }
- };
syncActionsClassNames.add(actionsClasses);
syncActionsClassNames.setEnabled(!syncActionsClasses.getObject().isEmpty());
http://git-wip-us.apache.org/repos/asf/syncope/blob/bcc3e5be/console/src/main/java/org/apache/syncope/console/pages/Todo.java
----------------------------------------------------------------------
diff --git a/console/src/main/java/org/apache/syncope/console/pages/Todo.java b/console/src/main/java/org/apache/syncope/console/pages/Todo.java
index 6ddbed9..a2b0d5e 100644
--- a/console/src/main/java/org/apache/syncope/console/pages/Todo.java
+++ b/console/src/main/java/org/apache/syncope/console/pages/Todo.java
@@ -216,7 +216,6 @@ public class Todo extends BasePage {
@Override
public Iterator<WorkflowFormTO> iterator(final long first, final long count) {
-
final List<WorkflowFormTO> list = restClient.getForms();
Collections.sort(list, comparator);
@@ -231,7 +230,6 @@ public class Todo extends BasePage {
@Override
public IModel<WorkflowFormTO> model(final WorkflowFormTO configuration) {
-
return new AbstractReadOnlyModel<WorkflowFormTO>() {
private static final long serialVersionUID = -2566070996511906708L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/bcc3e5be/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java b/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java
index 5fcc54f..9352c6d 100644
--- a/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java
+++ b/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java
@@ -690,8 +690,8 @@ public class ActivitiUserWorkflowAdapter extends AbstractUserWorkflowAdapter {
taskService.createTaskQuery().processInstanceId(workflowId).taskName(name).
taskVariableValueEquals(TASK_IS_FORM, Boolean.TRUE));
- forms.addAll(getForms(historyService.createHistoricTaskInstanceQuery().taskName(name)
- .taskVariableValueEquals(TASK_IS_FORM, Boolean.TRUE)));
+ forms.addAll(getForms(historyService.createHistoricTaskInstanceQuery().taskName(name).
+ taskVariableValueEquals(TASK_IS_FORM, Boolean.TRUE)));
return forms;
}