Author: sdumitriu
Date: 2007-09-08 01:49:00 +0200 (Sat, 08 Sep 2007)
New Revision: 4845
Modified:
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/objects/classes/ListClass.java
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/objects/classes/StaticListClass.java
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/objects/meta/ListMetaClass.java
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/objects/meta/StaticListMetaClass.java
Log:
XWIKI-1722: NPE when upgrading to 1.2 M1
XWIKI-1723: multiselect separators are not defined for all list property types
Fixed.
Modified:
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/objects/classes/ListClass.java
===================================================================
---
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/objects/classes/ListClass.java
2007-09-07 22:37:15 UTC (rev 4844)
+++
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/objects/classes/ListClass.java
2007-09-07 23:49:00 UTC (rev 4845)
@@ -72,11 +72,18 @@
this(null);
}
- public String getSeparators()
- {
- return null;
+ public String getSeparators() {
+ String separators = getStringValue("separators");
+ if (separators == null || separators.equals("")) {
+ separators = "|,";
+ }
+ return separators;
}
+ public void setSeparators(String separators) {
+ setStringValue("separators", separators);
+ }
+
public String getDisplayType()
{
return getStringValue("displayType");
Modified:
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/objects/classes/StaticListClass.java
===================================================================
---
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/objects/classes/StaticListClass.java
2007-09-07 22:37:15 UTC (rev 4844)
+++
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/objects/classes/StaticListClass.java
2007-09-07 23:49:00 UTC (rev 4845)
@@ -46,14 +46,6 @@
setStringValue("values", values);
}
- public String getSeparators() {
- return getStringValue("separators");
- }
-
- public void setSeparators(String separators) {
- setStringValue("separators", separators);
- }
-
public List getList(XWikiContext context) {
String values = getValues();
return getListFromString(values);
Modified:
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/objects/meta/ListMetaClass.java
===================================================================
---
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/objects/meta/ListMetaClass.java
2007-09-07 22:37:15 UTC (rev 4844)
+++
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/objects/meta/ListMetaClass.java
2007-09-07 23:49:00 UTC (rev 4845)
@@ -68,10 +68,16 @@
size_class.setNumberType("integer");
safeput("size", size_class);
+ StringClass separators_class = new StringClass(this);
+ separators_class.setName("separators");
+ separators_class.setPrettyName("Multiselect separators (for editing)");
+ separators_class.setSize(5);
+ safeput("separators", separators_class);
+
StringClass separator_class = new StringClass(this);
separator_class.setName("separator");
- separator_class.setPrettyName("Join separator");
- separator_class.setSize(20);
+ separator_class.setPrettyName("Join separator (for display)");
+ separator_class.setSize(5);
safeput("separator", separator_class);
StaticListClass sort_class = new StaticListClass(this);
Modified:
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/objects/meta/StaticListMetaClass.java
===================================================================
---
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/objects/meta/StaticListMetaClass.java
2007-09-07 22:37:15 UTC (rev 4844)
+++
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/objects/meta/StaticListMetaClass.java
2007-09-07 23:49:00 UTC (rev 4845)
@@ -39,12 +39,6 @@
values_class.setPrettyName("Values");
values_class.setSize(40);
safeput("values", values_class);
-
- StringClass separators_class = new StringClass(this);
- separators_class.setName("separators");
- separators_class.setPrettyName("Separators");
- separators_class.setSize(5);
- safeput("separators", separators_class);
}
public BaseCollection newObject(XWikiContext context) {
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
