diff -r 3e43a95fa711 xml.schema.completion/src/org/netbeans/modules/xml/schema/completion/util/CompletionUtil.java --- a/xml.schema.completion/src/org/netbeans/modules/xml/schema/completion/util/CompletionUtil.java Tue Mar 30 19:16:55 2010 +0200 +++ b/xml.schema.completion/src/org/netbeans/modules/xml/schema/completion/util/CompletionUtil.java Tue Mar 30 22:59:56 2010 +0100 @@ -313,14 +313,14 @@ ((Datatype)type).getEnumerations() == null) return null; for(Object value: ((Datatype)type).getEnumerations()) { + String str = (value!=null)?value.toString():null; if(context.getTypedChars() == null || context.getTypedChars().equals("")) { - ValueResultItem item = new ValueResultItem(attr, (String)value, context); + ValueResultItem item = new ValueResultItem(attr, str, context); result.add(item); continue; } - String str = (String)value; if(str.startsWith(context.getTypedChars())) { - ValueResultItem item = new ValueResultItem(attr, (String)value, context); + ValueResultItem item = new ValueResultItem(attr, str, context); result.add(item); } } @@ -344,7 +344,7 @@ } // namespace aware items List prefixes = getPrefixes(context, axi, cm); - if (prefixes.size() == 0) { + if (prefixes.isEmpty()) { prefixes.add(null); } for (String prefix: prefixes) {