Author: bpoussin Date: 2013-02-23 15:19:09 +0100 (Sat, 23 Feb 2013) New Revision: 1540 Url: http://nuiton.org/projects/wikitty/repository/revisions/1540 Log: suppression de concatenation avec +"."+ Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyImpl.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyImpl.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyImpl.java 2013-02-23 02:48:47 UTC (rev 1539) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyImpl.java 2013-02-23 14:19:09 UTC (rev 1540) @@ -371,7 +371,7 @@ */ protected void setFieldDirty(String ext, String fieldName, Object oldValue, Object newValue) { - String key = ext + "." + fieldName; + String key = WikittyUtil.getFQFieldName(ext, fieldName); incrementVersion(key); getPropertyChangeSupport().firePropertyChange(key, oldValue, newValue); } @@ -417,10 +417,12 @@ public void removeExtension(String ext) { Collection<WikittyExtension> exts = getExtensionDependencies(ext, true); + exts.add(extensions.get(ext)); for (WikittyExtension e : exts) { - extensions.remove(e.getName()); + String extName = e.getName(); + extensions.remove(extName); for (String field : e.getFieldNames()) { - fieldValue.remove(field); + fieldValue.remove(WikittyUtil.getFQFieldName(extName, field)); } } } @@ -667,9 +669,9 @@ } throw new WikittyException(String.format( "field '%s' is not a valid field. acceptable %s are: %s", - ext + "." + fieldName, type, list)); + WikittyUtil.getFQFieldName(ext, fieldName), type, list)); } - String key = ext + "." + fieldName; + String key = WikittyUtil.getFQFieldName(ext, fieldName); Object result = fieldValue.get(key); return result; } @@ -686,7 +688,7 @@ } catch (WikittyException eee) { throw new WikittyException(String.format( "field '%s' is not a valid byte[]", - ext + "." + fieldName), eee); + WikittyUtil.getFQFieldName(ext, fieldName)), eee); } } @@ -702,7 +704,7 @@ } catch (WikittyException eee) { throw new WikittyException(String.format( "field '%s' is not a valid boolean", - ext + "." + fieldName), eee); + WikittyUtil.getFQFieldName(ext, fieldName)), eee); } } @@ -718,7 +720,7 @@ } catch (WikittyException eee) { throw new WikittyException(String.format( "field '%s' is not a valid numeric", - ext + "." + fieldName), eee); + WikittyUtil.getFQFieldName(ext, fieldName)), eee); } } @@ -734,7 +736,7 @@ } catch (WikittyException eee) { throw new WikittyException(String.format( "field '%s' is not a valid int", - ext + "." + fieldName), eee); + WikittyUtil.getFQFieldName(ext, fieldName)), eee); } } @@ -750,7 +752,7 @@ } catch (WikittyException eee) { throw new WikittyException(String.format( "field '%s' is not a valid int", - ext + "." + fieldName), eee); + WikittyUtil.getFQFieldName(ext, fieldName)), eee); } } @@ -766,7 +768,7 @@ } catch (WikittyException eee) { throw new WikittyException(String.format( "field '%s' is not a valid float", - ext + "." + fieldName), eee); + WikittyUtil.getFQFieldName(ext, fieldName)), eee); } } @@ -782,7 +784,7 @@ } catch (WikittyException eee) { throw new WikittyException(String.format( "field '%s' is not a valid float", - ext + "." + fieldName), eee); + WikittyUtil.getFQFieldName(ext, fieldName)), eee); } } @@ -798,7 +800,7 @@ } catch (WikittyException eee) { throw new WikittyException(String.format( "field '%s' is not a valid String", - ext + "." + fieldName), eee); + WikittyUtil.getFQFieldName(ext, fieldName)), eee); } } @@ -814,7 +816,7 @@ } catch (WikittyException eee) { throw new WikittyException(String.format( "field '%s' is not a valid Date", - ext + "." + fieldName), eee); + WikittyUtil.getFQFieldName(ext, fieldName)), eee); } } @@ -857,7 +859,7 @@ } catch (Exception eee) { throw new WikittyException(String.format( "Can't get value to field '%s'", - ext + "." + fieldName), eee); + WikittyUtil.getFQFieldName(ext, fieldName)), eee); } } @@ -901,7 +903,7 @@ } catch (Exception eee) { throw new WikittyException(String.format( "Can't get value to field '%s'", - ext + "." + fieldName), eee); + WikittyUtil.getFQFieldName(ext, fieldName)), eee); } } @@ -960,7 +962,7 @@ // if upper bound reached, throw an exception throw new WikittyException(String.format( "Can't add value for field '%s', upper bound is reached", - ext + "." + fieldName)); + WikittyUtil.getFQFieldName(ext, fieldName))); } col.add(validValue); // if user pass in argument object that permit to take wikitty, @@ -975,7 +977,7 @@ } catch (Exception eee) { throw new WikittyException(String.format( "Can't add value to field '%s'", - ext + "." + fieldName), eee); + WikittyUtil.getFQFieldName(ext, fieldName)), eee); } } @@ -993,7 +995,7 @@ if (col.size() - 1 < type.getLowerBound()) { throw new WikittyException(String.format( "Can't remove value for field '%s', lower bound is reached", - ext + "." + fieldName)); + WikittyUtil.getFQFieldName(ext, fieldName))); } else { if (col.remove(validValue)) { // field is dirty only if remove is done @@ -1005,7 +1007,7 @@ } catch (Exception eee) { throw new WikittyException(String.format( "Can't remove value for field '%s'", - ext + "." + fieldName), eee); + WikittyUtil.getFQFieldName(ext, fieldName)), eee); } } @@ -1018,7 +1020,7 @@ if (type.getLowerBound() > 0) { throw new WikittyException(String.format( "Can't clear values for field '%s', lower bound is > 0", - ext + "." + fieldName)); + WikittyUtil.getFQFieldName(ext, fieldName))); } try { Collection col = (Collection) getFieldAsObject(ext, fieldName); @@ -1029,7 +1031,7 @@ } catch (Exception eee) { throw new WikittyException(String.format( "Can't clear value for field '%s'", - ext + "." + fieldName), eee); + WikittyUtil.getFQFieldName(ext, fieldName)), eee); } }