Update of
/var/cvs/contributions/didactor2/src/assessment/java/nl/didactor/component/assessment
In directory
james.mmbase.org:/tmp/cvs-serv2244/java/nl/didactor/component/assessment
Modified Files:
LessonChecker.java
Log Message:
See also:
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/assessment/java/nl/didactor/component/assessment
Index: LessonChecker.java
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/assessment/java/nl/didactor/component/assessment/LessonChecker.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- LessonChecker.java 8 Jan 2009 12:28:08 -0000 1.5
+++ LessonChecker.java 8 Jan 2009 13:46:18 -0000 1.6
@@ -24,7 +24,7 @@
* Functionality are made accessible to front-end jsps using (node) functions
(see e.g. people.xml).
*
- * @version $Id: LessonChecker.java,v 1.5 2009/01/08 12:28:08 michiel Exp $
+ * @version $Id: LessonChecker.java,v 1.6 2009/01/08 13:46:18 michiel Exp $
*/
public class LessonChecker {
@@ -54,7 +54,7 @@
* education and to this component, if that setting is true.
*/
- protected static List<Node> getLessons(@Required @Name("education") Node
education) {
+ public static List<Node> getLessons(@Required @Name("node") Node
education) {
List<Node> result = new ArrayList<Node>();
Cloud cloud = education.getCloud();
NodeQuery q = Queries.createRelatedNodesQuery(education,
@@ -76,21 +76,14 @@
return result;
}
- protected static List<Node> getLearnBlocks(@Required @Name("education")
Node education) {
- List<Node> result = new ArrayList<Node>();
+ private static List<Node> getLearnBlocks(Node education) {
Cloud cloud = education.getCloud();
NodeQuery q = Queries.createRelatedNodesQuery(education,
cloud.getNodeManager("learnblocks"),
"posrel",
"destination");
Queries.addSortOrders(q, "posrel.pos", "UP");
- NodeList relatedLearnBlocks = q.getNodeManager().getList(q);
-
- for (Node learnBlock : relatedLearnBlocks) {
- boolean related =
Queries.count(AssessmentField.getRelationsQuery(learnBlock)) > 0;
- result.add(learnBlock);
- }
- return result;
+ return q.getNodeManager().getList(q);
}
@@ -173,7 +166,6 @@
}
}
}
-
return resultSet;
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
