From 1f464db892d7d2a7a4eeda44ea220739c76020f6 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Fri, 12 Oct 2012 17:30:54 +0200
Subject: [PATCH] OO-348: add a marker class for steps wizard
---
.../admin/user/UsermanagerUserSearchController.java | 3 ++-
.../org/olat/admin/user/imp/UserImportController.java | 3 ++-
.../olat/commons/info/ui/InfoDisplayController.java | 2 +-
.../dispatcher/mapper/manager/MapperServiceImpl.java | 1 -
.../generic/wizard/StepsMainRunController.java | 11 ++++-------
.../control/generic/wizard/_content/stepslayout.html | 2 +-
.../org/olat/course/editor/EditorMainController.java | 2 +-
.../olat/course/member/MembersOverviewController.java | 6 ++++--
.../ui/main/AbstractBusinessGroupListController.java | 8 ++++----
.../java/org/olat/ldap/ui/LDAPAdminController.java | 2 +-
.../collect/ArtefactWizzardStepsController.java | 3 ++-
.../ui/artefacts/collect/EPAddArtefactController.java | 6 +++---
.../org/olat/repository/handlers/CourseHandler.java | 2 +-
.../olat/test/guidemo/wizard/GuiDemoStepsRunner.java | 2 +-
14 files changed, 27 insertions(+), 26 deletions(-)
diff --git a/src/main/java/org/olat/admin/user/UsermanagerUserSearchController.java b/src/main/java/org/olat/admin/user/UsermanagerUserSearchController.java
index 1ff9cad45c9..81b7d6bd4b3 100644
--- a/src/main/java/org/olat/admin/user/UsermanagerUserSearchController.java
+++ b/src/main/java/org/olat/admin/user/UsermanagerUserSearchController.java
@@ -491,7 +491,8 @@ public class UsermanagerUserSearchController extends BasicController implements
};
removeAsListenerAndDispose(userBulkChangeStepsController);
- userBulkChangeStepsController = new StepsMainRunController(ureq, getWindowControl(), start, finish, null, translate("bulkChange.title"));
+ userBulkChangeStepsController = new StepsMainRunController(ureq, getWindowControl(), start, finish, null,
+ translate("bulkChange.title"), "o_sel_user_bulk_change_wizard");
listenTo(userBulkChangeStepsController);
getWindowControl().pushAsModalDialog(userBulkChangeStepsController.getInitialComponent());
diff --git a/src/main/java/org/olat/admin/user/imp/UserImportController.java b/src/main/java/org/olat/admin/user/imp/UserImportController.java
index 7a90225ef40..27e486f79e6 100644
--- a/src/main/java/org/olat/admin/user/imp/UserImportController.java
+++ b/src/main/java/org/olat/admin/user/imp/UserImportController.java
@@ -204,7 +204,8 @@ public class UserImportController extends BasicController {
};
- importStepsController = new StepsMainRunController(ureq, getWindowControl(), start, finish, null, translate("title"));
+ importStepsController = new StepsMainRunController(ureq, getWindowControl(), start, finish, null,
+ translate("title"), "o_sel_user_import_wizard");
listenTo(importStepsController);
getWindowControl().pushAsModalDialog(importStepsController.getInitialComponent());
}
diff --git a/src/main/java/org/olat/commons/info/ui/InfoDisplayController.java b/src/main/java/org/olat/commons/info/ui/InfoDisplayController.java
index 50c2a2a2a86..9539bb49c94 100644
--- a/src/main/java/org/olat/commons/info/ui/InfoDisplayController.java
+++ b/src/main/java/org/olat/commons/info/ui/InfoDisplayController.java
@@ -329,7 +329,7 @@ public class InfoDisplayController extends FormBasicController {
if(source == newInfoLink) {
start = new CreateInfoStep(ureq, sendMailOptions);
newInfoWizard = new StepsMainRunController(ureq, getWindowControl(), start, new FinishedCallback(),
- new CancelCallback(), translate("create_message"));
+ new CancelCallback(), translate("create_message"), "o_sel_info_messages_create_wizard");
listenTo(newInfoWizard);
getWindowControl().pushAsModalDialog(newInfoWizard.getInitialComponent());
} else if(deleteLinks.contains(source)) {
diff --git a/src/main/java/org/olat/core/dispatcher/mapper/manager/MapperServiceImpl.java b/src/main/java/org/olat/core/dispatcher/mapper/manager/MapperServiceImpl.java
index 20830fbb728..fa80c1b9358 100644
--- a/src/main/java/org/olat/core/dispatcher/mapper/manager/MapperServiceImpl.java
+++ b/src/main/java/org/olat/core/dispatcher/mapper/manager/MapperServiceImpl.java
@@ -142,7 +142,6 @@ public class MapperServiceImpl implements MapperService {
Calendar cal = Calendar.getInstance();
cal.add(Calendar.HOUR_OF_DAY, -6);
mapperDao.deleteMapperByDate(cal.getTime());
- System.out.println("Slay mapper zombie: " + cal.getTime());
}
@Override
diff --git a/src/main/java/org/olat/core/gui/control/generic/wizard/StepsMainRunController.java b/src/main/java/org/olat/core/gui/control/generic/wizard/StepsMainRunController.java
index aa7743fd527..e90eff0f032 100644
--- a/src/main/java/org/olat/core/gui/control/generic/wizard/StepsMainRunController.java
+++ b/src/main/java/org/olat/core/gui/control/generic/wizard/StepsMainRunController.java
@@ -119,9 +119,8 @@ public class StepsMainRunController extends FormBasicController implements Gener
private Stack<Step> steps;
private Event lastEvent;
private boolean doAfterDispatch;
- Step nextStep;
+ private Step nextStep;
private ControllerCreator nextChildCreator;
- private int maxSteps;
private StepRunnerCallback cancel;
private StepRunnerCallback finish;
private boolean finishCycle = false;
@@ -131,12 +130,13 @@ public class StepsMainRunController extends FormBasicController implements Gener
* @param control
*/
public StepsMainRunController(UserRequest ureq, WindowControl control, Step startStep, StepRunnerCallback finish,
- StepRunnerCallback cancel, String wizardTitle) {
+ StepRunnerCallback cancel, String wizardTitle, String elementCssClass) {
super(ureq, control, "stepslayout");
this.finish = finish;
this.cancel = cancel;
flc.contextPut("wizardTitle", wizardTitle);
+ flc.contextPut("elementCssClass", elementCssClass);
this.startStep = startStep;
steps = new Stack<Step>();
@@ -173,8 +173,7 @@ public class StepsMainRunController extends FormBasicController implements Gener
*/
@Override
protected void doDispose() {
- // TODO Auto-generated method stub
-
+ //
}
/*
@@ -279,12 +278,10 @@ public class StepsMainRunController extends FormBasicController implements Gener
formLayout.add(closeLink);
// add all step titles, but disabled.
Step tmp = startStep;
- maxSteps = 0;
do {
FormItem title = tmp.getStepTitle();
title.setEnabled(false);
stepTitleLinks.add(title);
- maxSteps++;
tmp = tmp.nextStep();
} while (tmp != Step.NOSTEP);
// init buttons and the like
diff --git a/src/main/java/org/olat/core/gui/control/generic/wizard/_content/stepslayout.html b/src/main/java/org/olat/core/gui/control/generic/wizard/_content/stepslayout.html
index 2a993765d07..f0c669ec8d0 100644
--- a/src/main/java/org/olat/core/gui/control/generic/wizard/_content/stepslayout.html
+++ b/src/main/java/org/olat/core/gui/control/generic/wizard/_content/stepslayout.html
@@ -1,4 +1,4 @@
-<div class="b_wizard">
+<div class="b_wizard #if($elementCssClass) $elementCssClass #end">
<div class="b_wizard_header_wrapper">
<div class="b_wizard_header">
<div class="b_wizard_header_title">
diff --git a/src/main/java/org/olat/course/editor/EditorMainController.java b/src/main/java/org/olat/course/editor/EditorMainController.java
index b93639c3649..bdf04717db0 100644
--- a/src/main/java/org/olat/course/editor/EditorMainController.java
+++ b/src/main/java/org/olat/course/editor/EditorMainController.java
@@ -639,7 +639,7 @@ public class EditorMainController extends MainLayoutBasicController implements G
}
};
- publishStepsController = new StepsMainRunController(ureq, getWindowControl(), start, finish, null, translate("publish.wizard.title") );
+ publishStepsController = new StepsMainRunController(ureq, getWindowControl(), start, finish, null, translate("publish.wizard.title"), "o_sel_course_publish_wizard");
listenTo(publishStepsController);
getWindowControl().pushAsModalDialog(publishStepsController.getInitialComponent());
diff --git a/src/main/java/org/olat/course/member/MembersOverviewController.java b/src/main/java/org/olat/course/member/MembersOverviewController.java
index 845e7a904f7..a14767445ab 100644
--- a/src/main/java/org/olat/course/member/MembersOverviewController.java
+++ b/src/main/java/org/olat/course/member/MembersOverviewController.java
@@ -218,7 +218,8 @@ public class MembersOverviewController extends BasicController implements Activa
}
};
- importMembersWizard = new StepsMainRunController(ureq, getWindowControl(), start, finish, null, translate("import.member"));
+ importMembersWizard = new StepsMainRunController(ureq, getWindowControl(), start, finish, null,
+ translate("import.member"), "o_sel_course_member_import_1_wizard");
listenTo(importMembersWizard);
getWindowControl().pushAsModalDialog(importMembersWizard.getInitialComponent());
}
@@ -235,7 +236,8 @@ public class MembersOverviewController extends BasicController implements Activa
}
};
- importMembersWizard = new StepsMainRunController(ureq, getWindowControl(), start, finish, null, translate("import.member"));
+ importMembersWizard = new StepsMainRunController(ureq, getWindowControl(), start, finish, null,
+ translate("import.member"), "o_sel_course_member_import_logins_wizard");
listenTo(importMembersWizard);
getWindowControl().pushAsModalDialog(importMembersWizard.getInitialComponent());
}
diff --git a/src/main/java/org/olat/group/ui/main/AbstractBusinessGroupListController.java b/src/main/java/org/olat/group/ui/main/AbstractBusinessGroupListController.java
index 9971ff10a67..9aa8ebd33f6 100644
--- a/src/main/java/org/olat/group/ui/main/AbstractBusinessGroupListController.java
+++ b/src/main/java/org/olat/group/ui/main/AbstractBusinessGroupListController.java
@@ -479,7 +479,7 @@ public abstract class AbstractBusinessGroupListController extends BasicControlle
}
};
- businessGroupWizard = new StepsMainRunController(ureq, getWindowControl(), start, finish, null, translate("copy.group"));
+ businessGroupWizard = new StepsMainRunController(ureq, getWindowControl(), start, finish, null, translate("copy.group"), "o_sel_group_copy_wizard");
listenTo(businessGroupWizard);
getWindowControl().pushAsModalDialog(businessGroupWizard.getInitialComponent());
}
@@ -544,7 +544,7 @@ public abstract class AbstractBusinessGroupListController extends BasicControlle
}
};
- businessGroupWizard = new StepsMainRunController(ureq, getWindowControl(), start, finish, null, translate("config.group"));
+ businessGroupWizard = new StepsMainRunController(ureq, getWindowControl(), start, finish, null, translate("config.group"), "o_sel_groups_config_wizard");
listenTo(businessGroupWizard);
getWindowControl().pushAsModalDialog(businessGroupWizard.getInitialComponent());
}
@@ -569,7 +569,7 @@ public abstract class AbstractBusinessGroupListController extends BasicControlle
}
};
- businessGroupWizard = new StepsMainRunController(ureq, getWindowControl(), start, finish, null, translate("email.group"));
+ businessGroupWizard = new StepsMainRunController(ureq, getWindowControl(), start, finish, null, translate("email.group"), "o_sel_groups_email_wizard");
listenTo(businessGroupWizard);
getWindowControl().pushAsModalDialog(businessGroupWizard.getInitialComponent());
}
@@ -659,7 +659,7 @@ public abstract class AbstractBusinessGroupListController extends BasicControlle
}
};
- businessGroupWizard = new StepsMainRunController(ureq, getWindowControl(), start, finish, null, translate("merge.group"));
+ businessGroupWizard = new StepsMainRunController(ureq, getWindowControl(), start, finish, null, translate("merge.group"), "o_sel_groups_merge_wizard");
listenTo(businessGroupWizard);
getWindowControl().pushAsModalDialog(businessGroupWizard.getInitialComponent());
diff --git a/src/main/java/org/olat/ldap/ui/LDAPAdminController.java b/src/main/java/org/olat/ldap/ui/LDAPAdminController.java
index 62456adbe75..a9dfd260669 100644
--- a/src/main/java/org/olat/ldap/ui/LDAPAdminController.java
+++ b/src/main/java/org/olat/ldap/ui/LDAPAdminController.java
@@ -210,7 +210,7 @@ public class LDAPAdminController extends BasicController implements GenericEvent
};
deleteStepController = new StepsMainRunController(ureq, getWindowControl(), start, finishCallback, null,
- translate("admin.deleteUser.title"));
+ translate("admin.deleteUser.title"), "o_sel_ldap_delete_user_wizard");
listenTo(deleteStepController);
getWindowControl().pushAsModalDialog(deleteStepController.getInitialComponent());
}
diff --git a/src/main/java/org/olat/portfolio/ui/artefacts/collect/ArtefactWizzardStepsController.java b/src/main/java/org/olat/portfolio/ui/artefacts/collect/ArtefactWizzardStepsController.java
index 8d5f5934b41..9bc1991cedf 100755
--- a/src/main/java/org/olat/portfolio/ui/artefacts/collect/ArtefactWizzardStepsController.java
+++ b/src/main/java/org/olat/portfolio/ui/artefacts/collect/ArtefactWizzardStepsController.java
@@ -178,7 +178,8 @@ public class ArtefactWizzardStepsController extends BasicController {
if (artefact == null && ores != null) prepareNewArtefact();
Step start = new EPCollectStep00(ureq, artefact);
StepRunnerCallback finish = new EPArtefactWizzardStepCallback(tmpFolder);
- collectStepsCtrl = new StepsMainRunController(ureq, getWindowControl(), start, finish, null, translate("collect.wizzard.title"));
+ collectStepsCtrl = new StepsMainRunController(ureq, getWindowControl(), start, finish, null,
+ translate("collect.wizzard.title"), "o_sel_artefact_add_wizard");
listenTo(collectStepsCtrl);
getWindowControl().pushAsModalDialog(collectStepsCtrl.getInitialComponent());
}
diff --git a/src/main/java/org/olat/portfolio/ui/artefacts/collect/EPAddArtefactController.java b/src/main/java/org/olat/portfolio/ui/artefacts/collect/EPAddArtefactController.java
index b8d4c6d7808..517416b788c 100644
--- a/src/main/java/org/olat/portfolio/ui/artefacts/collect/EPAddArtefactController.java
+++ b/src/main/java/org/olat/portfolio/ui/artefacts/collect/EPAddArtefactController.java
@@ -193,7 +193,7 @@ public class EPAddArtefactController extends BasicController {
Step start = new EPCreateTextArtefactStep00(ureq, artefact1, vfsTemp);
StepRunnerCallback finish = new EPArtefactWizzardStepCallback(vfsTemp);
collectStepsCtrl = new StepsMainRunController(ureq, getWindowControl(), start, finish, null,
- translate("create.text.artefact.wizzard.title"));
+ translate("create.text.artefact.wizzard.title"), "o_sel_artefact_add_wizard o_sel_artefact_add_text_wizard");
listenTo(collectStepsCtrl);
getWindowControl().pushAsModalDialog(collectStepsCtrl.getInitialComponent());
}
@@ -216,7 +216,7 @@ public class EPAddArtefactController extends BasicController {
Step start = new EPCreateFileArtefactStep00(ureq, artefact1, vfsTemp);
StepRunnerCallback finish = new EPArtefactWizzardStepCallback(vfsTemp);
collectStepsCtrl = new StepsMainRunController(ureq, getWindowControl(), start, finish, null,
- translate("create.file.artefact.wizzard.title"));
+ translate("create.file.artefact.wizzard.title"), "o_sel_artefact_add_wizard o_sel_artefact_add_file_wizard");
listenTo(collectStepsCtrl);
getWindowControl().pushAsModalDialog(collectStepsCtrl.getInitialComponent());
}
@@ -231,7 +231,7 @@ public class EPAddArtefactController extends BasicController {
Step start = new EPCreateLiveBlogArtefactStep00(ureq, artefact1);
StepRunnerCallback finish = new EPArtefactWizzardStepCallback(); // no vfsTemp!, blog doesn't need a directory
collectStepsCtrl = new StepsMainRunController(ureq, getWindowControl(), start, finish, null,
- translate("create.blog.artefact.wizzard.title"));
+ translate("create.blog.artefact.wizzard.title"), "o_sel_artefact_add_wizard o_sel_artefact_add_blog_wizard");
listenTo(collectStepsCtrl);
getWindowControl().pushAsModalDialog(collectStepsCtrl.getInitialComponent());
}
diff --git a/src/main/java/org/olat/repository/handlers/CourseHandler.java b/src/main/java/org/olat/repository/handlers/CourseHandler.java
index a676a595239..8a325f47ea4 100644
--- a/src/main/java/org/olat/repository/handlers/CourseHandler.java
+++ b/src/main/java/org/olat/repository/handlers/CourseHandler.java
@@ -204,7 +204,7 @@ public class CourseHandler implements RepositoryHandler {
}
};
Step start = new CcStep00(ureq, courseConfig, repoEntry);
- StepsMainRunController ccSMRC = new StepsMainRunController(ureq, wControl, start, finishCallback, null, cceTranslator.translate("coursecreation.title"));
+ StepsMainRunController ccSMRC = new StepsMainRunController(ureq, wControl, start, finishCallback, null, cceTranslator.translate("coursecreation.title"), "o_sel_course_create_wizard");
return ccSMRC;
}
diff --git a/src/main/java/org/olat/test/guidemo/wizard/GuiDemoStepsRunner.java b/src/main/java/org/olat/test/guidemo/wizard/GuiDemoStepsRunner.java
index a3acc54a572..c04ee1a32a4 100644
--- a/src/main/java/org/olat/test/guidemo/wizard/GuiDemoStepsRunner.java
+++ b/src/main/java/org/olat/test/guidemo/wizard/GuiDemoStepsRunner.java
@@ -126,7 +126,7 @@ public class GuiDemoStepsRunner extends BasicController {
}
};
- smrc = new StepsMainRunController(ureq, getWindowControl(), start, finishCallback, null, "A Workflow");
+ smrc = new StepsMainRunController(ureq, getWindowControl(), start, finishCallback, null, "A Workflow", "o_sel_demo_wizard");
listenTo(smrc);
getWindowControl().pushAsModalDialog(smrc.getInitialComponent());
--
GitLab