Update of /var/cvs/src/org/mmbase/framework
In directory james.mmbase.org:/tmp/cvs-serv11171
Modified Files:
Block.java Framework.java
Log Message:
gave block-types a title (for i18n)
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/framework
Index: Block.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/Block.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- Block.java 21 Mar 2008 10:39:23 -0000 1.35
+++ Block.java 21 Mar 2008 16:08:16 -0000 1.36
@@ -21,7 +21,7 @@
*
* @author Johannes Verelst
* @author Michiel Meeuwissen
- * @version $Id: Block.java,v 1.35 2008/03/21 10:39:23 michiel Exp $
+ * @version $Id: Block.java,v 1.36 2008/03/21 16:08:16 michiel Exp $
* @since MMBase-1.9
*/
public class Block {
@@ -207,7 +207,7 @@
}
return result.toArray(new Type[] {});
}
-
+ private final LocalizedString title;
private final String name;
private final Type parent;
private int weight = 100;
@@ -216,12 +216,14 @@
private Type(String n) {
name = n;
parent = null;
+ title = new LocalizedString(name);
}
protected Type(String n, Type p) {
if (n == null) throw new IllegalArgumentException();
if (p == null) throw new IllegalArgumentException();
name = n;
parent = p;
+ title = new LocalizedString(name);
}
public List<Type> getSubTypes() {
return Collections.unmodifiableList(subs);
@@ -273,6 +275,10 @@
int s = weight - t.weight;
return s == 0 ? name.compareTo(t.name) : s;
}
+
+ public LocalizedString getTitle() {
+ return title;
+ }
}
Index: Framework.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/Framework.java,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- Framework.java 24 Feb 2008 10:46:20 -0000 1.47
+++ Framework.java 21 Mar 2008 16:08:16 -0000 1.48
@@ -27,7 +27,7 @@
*
* @author Johannes Verelst
* @author Pierre van Rooden
- * @version $Id: Framework.java,v 1.47 2008/02/24 10:46:20 michiel Exp $
+ * @version $Id: Framework.java,v 1.48 2008/03/21 16:08:16 michiel Exp $
* @since MMBase-1.9
*/
public abstract class Framework {
@@ -75,6 +75,7 @@
int weight =
Integer.parseInt(element.getAttribute("weight"));
for (Block.Type t :
Block.Type.getClassification(classification, true)) {
t.setWeight(weight);
+ t.getTitle().fillFromXml("title", element);
}
}
} catch (Exception e) {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
