Update of /var/cvs/src/org/mmbase/framework
In directory james.mmbase.org:/tmp/cvs-serv21342
Modified Files:
BasicComponent.java ComponentRepository.java
Log Message:
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/framework
Index: BasicComponent.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/BasicComponent.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- BasicComponent.java 22 Feb 2008 09:06:27 -0000 1.42
+++ BasicComponent.java 22 Feb 2008 09:36:04 -0000 1.43
@@ -23,7 +23,7 @@
* components, and may be requested several blocks.
*
* @author Michiel Meeuwissen
- * @version $Id: BasicComponent.java,v 1.42 2008/02/22 09:06:27 michiel Exp $
+ * @version $Id: BasicComponent.java,v 1.43 2008/02/22 09:36:04 michiel Exp $
* @since MMBase-1.9
*/
public class BasicComponent implements Component {
@@ -123,7 +123,6 @@
a = new Action(name, actionName, new
ActionChecker.Rank(Rank.getRank(rank)));
}
a.getDescription().fillFromXml("description", element);
- a.getDescription().fillFromXml("title", element);
log.service("Registering action " + a);
ActionRepository.getInstance().add(a);
} catch (Exception e) {
@@ -145,6 +144,7 @@
Block.Type[] classification =
Block.Type.getClassification(element.getAttribute("classification"), true);
Block b = new Block(blockName, mimetype, this, classification);
b.getDescription().fillFromXml("description", element);
+ b.getTitle().fillFromXml("title", element);
log.trace("Found block: " + blockName);
b.getRenderers().put(Renderer.Type.HEAD, getRenderer("head",
element, b));
b.getRenderers().put(Renderer.Type.BODY, getRenderer("body",
element, b));
Index: ComponentRepository.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/ComponentRepository.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- ComponentRepository.java 20 Feb 2008 17:44:07 -0000 1.28
+++ ComponentRepository.java 22 Feb 2008 09:36:04 -0000 1.29
@@ -23,7 +23,7 @@
* This (singleton) class maintains all compoments which are registered in the
current MMBase.
*
* @author Michiel Meeuwissen
- * @version $Id: ComponentRepository.java,v 1.28 2008/02/20 17:44:07 michiel
Exp $
+ * @version $Id: ComponentRepository.java,v 1.29 2008/02/22 09:36:04 michiel
Exp $
* @since MMBase-1.9
*/
public class ComponentRepository {
@@ -98,6 +98,10 @@
return rep.get(name);
}
+ public Block getBlock(String componentName, String blockName) {
+ return rep.get(componentName).getBlock(blockName);
+ }
+
protected boolean resolve() {
int unsatisfied = 0;
for (Component comp : getComponents()) {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
