Update of /var/cvs/contributions/didactor2/src/core/java/nl/didactor/component
In directory james.mmbase.org:/tmp/cvs-serv15048/core/java/nl/didactor/component
Modified Files:
Component.java MMBaseComponent.java
Log Message:
See also:
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/core/java/nl/didactor/component
Index: Component.java
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/core/java/nl/didactor/component/Component.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- Component.java 4 Dec 2008 13:06:35 -0000 1.31
+++ Component.java 2 Jan 2009 09:36:10 -0000 1.32
@@ -24,7 +24,7 @@
/**
* @javadoc
- * @version $Id: Component.java,v 1.31 2008/12/04 13:06:35 michiel Exp $
+ * @version $Id: Component.java,v 1.32 2009/01/02 09:36:10 michiel Exp $
*/
public abstract class Component {
private static final Logger log =
Logging.getLoggerInstance(Component.class);
@@ -96,7 +96,7 @@
if
(ResourceLoader.getConfigurationRoot().getResource("di_components/" +
xml).openConnection().getDoInput()) {
doc =
ResourceLoader.getConfigurationRoot().getDocument("di_components/" + xml, true,
Component.class);
} else if
(ResourceLoader.getConfigurationRoot().getResource("components/" +
xml).openConnection().getDoInput()) {
- // legacy support, didactor used to use that dir, but it is
not resereved for mmbase components.
+ // legacy support, didactor used to use that dir, but it is
now resereved for mmbase components.
doc =
ResourceLoader.getConfigurationRoot().getDocument("components/" + xml, true,
Component.class);
}
@@ -345,13 +345,14 @@
org.mmbase.bridge.NodeList settingrel =
nl.didactor.util.GetRelation.getRelations(id, node.getNumber(), "settingrel",
cloud);
if (settingrel.size() == 0) {
- // This is not a setting of this component itself,
defaultVAlue is left to fall back.
+ // This is not a setting of this component itself,
defaultValue is left to fall back.
return null;
}
if (settingrel.size() > 1) {
log.warn("Too many relations from " + id + " to " +
node.getNumber() +" (" + settingrel.size() + "). Picking first one!");
}
org.mmbase.bridge.Node settingRelNode = settingrel.getNode(0);
+
settingNodes = settingRelNode.getRelatedNodes("settings");
}
Index: MMBaseComponent.java
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/core/java/nl/didactor/component/MMBaseComponent.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- MMBaseComponent.java 24 Nov 2008 15:07:32 -0000 1.7
+++ MMBaseComponent.java 2 Jan 2009 09:36:10 -0000 1.8
@@ -13,7 +13,7 @@
/**
* The didactor component wrapping an mmbase component.
* @author Michiel Meeuwissen
- * @version $Id: MMBaseComponent.java,v 1.7 2008/11/24 15:07:32 michiel Exp $
+ * @version $Id: MMBaseComponent.java,v 1.8 2009/01/02 09:36:10 michiel Exp $
*/
public class MMBaseComponent extends nl.didactor.component.Component {
@@ -25,6 +25,7 @@
EDUCATIONS("education", PROVIDERS),
CLASSES("class", EDUCATIONS),
PEOPLE("people");
+
private final String ref;
private final Scope implies;
Scope(String r) {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
