Author: echatellier Date: 2010-07-29 21:38:32 +0200 (Thu, 29 Jul 2010) New Revision: 210 Url: http://nuiton.org/repositories/revision/wikitty/210 Log: #784 : Change static field name for field name in generated BusinessEntity #785 : constant is not used in generated code Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceSecurity.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityAbstractGenerator.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityInterfaceGenerator.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/TreeTest.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java 2010-07-29 18:54:32 UTC (rev 209) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java 2010-07-29 19:38:32 UTC (rev 210) @@ -519,7 +519,7 @@ // Store node with have deleted node as parent Criteria criteria = - Search.query().eq(TreeNode.FQ_FIELD_PARENT, id).criteria(); + Search.query().eq(TreeNode.FQ_FIELD_TREENODE_PARENT, id).criteria(); List<String> wikittyNodesId = findAllByCriteria( securityToken, transaction, criteria).getAll(); for (String wikittyNodeId : wikittyNodesId) { @@ -532,7 +532,7 @@ } // Store node with have deleted child - criteria = Search.query().eq(TreeNode.FQ_FIELD_CHILDREN, id).criteria(); + criteria = Search.query().eq(TreeNode.FQ_FIELD_TREENODE_CHILDREN, id).criteria(); wikittyNodesId = findAllByCriteria( securityToken, transaction, criteria).getAll(); for (String wikittyNodeId : wikittyNodesId) { Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceSecurity.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceSecurity.java 2010-07-29 18:54:32 UTC (rev 209) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceSecurity.java 2010-07-29 19:38:32 UTC (rev 210) @@ -554,7 +554,7 @@ */ protected boolean isAdmin(String securityToken, String userId, Wikitty w) { boolean result = isMember( - securityToken, userId, w, WikittyAuthorisation.FIELD_ADMIN); + securityToken, userId, w, WikittyAuthorisation.FIELD_WIKITTYAUTHORISATION_ADMIN); return result; } @@ -568,7 +568,7 @@ */ protected boolean isWriter(String securityToken, String userId, Wikitty w) { boolean result = isMember( - securityToken, userId, w, WikittyAuthorisation.FIELD_WRITER); + securityToken, userId, w, WikittyAuthorisation.FIELD_WIKITTYAUTHORISATION_WRITER); return result; } @@ -597,7 +597,7 @@ // il y a des readers sur l'objet actuel, il faut donc checker // comme pour les autres droits en parent aussi les parents result = isMember( - securityToken, userId, w, WikittyAuthorisation.FIELD_READER); + securityToken, userId, w, WikittyAuthorisation.FIELD_WIKITTYAUTHORISATION_READER); } } return result; @@ -614,7 +614,7 @@ if (appAdminGroupId == null) { // 1er fois, on le recherche group = ws.findByCriteria(securityToken, Search.query().eq( - WikittyGroup.FQ_FIELD_NAME, WIKITTY_APPADMIN_GROUP_NAME).criteria()); + WikittyGroup.FQ_FIELD_WIKITTYGROUP_NAME, WIKITTY_APPADMIN_GROUP_NAME).criteria()); // group peut-etre null s'il n'existe pas } else { // on a deja fait la recherche precedement, on essaie de reutilise Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityAbstractGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityAbstractGenerator.java 2010-07-29 18:54:32 UTC (rev 209) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityAbstractGenerator.java 2010-07-29 19:38:32 UTC (rev 210) @@ -145,8 +145,8 @@ if (attr.isNavigable() && !attr.isStatic() && (attr.getStereotypes() == null || attr.getStereotypes().isEmpty())) { /*{ if (result) { - Object f1 = w1.getFieldAsObject(<%=EXT_NAME%>, FIELD_<%=attr.getName().toUpperCase()%>); - Object f2 = w2.getFieldAsObject(<%=EXT_NAME%>, FIELD_<%=attr.getName().toUpperCase()%>); + Object f1 = w1.getFieldAsObject(<%=EXT_NAME%>, FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%>); + Object f2 = w2.getFieldAsObject(<%=EXT_NAME%>, FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%>); result = f1 == f2 || (f1 != null && f1.equals(f2)); } }*/ @@ -171,9 +171,9 @@ && (attr.getStereotypes() == null || attr.getStereotypes().isEmpty())) { if ((attr.getMaxMultiplicity() != 0 && attr.getMaxMultiplicity() != 1)) { //TODO ymartel 20090812: when dataType "List", "Set" or "Collection" in model, must be here! - generateCollectionAttributeAccessors(output, attr); + generateCollectionAttributeAccessors(output, clazz, attr); } else { - generateWikittyAttributeAccessors(output, attr); + generateWikittyAttributeAccessors(output, clazz, attr); } } } @@ -321,7 +321,7 @@ } protected void generateWikittyAttributeAccessors(Writer output, - ObjectModelAttribute attr) throws IOException { + ObjectModelClass clazz, ObjectModelAttribute attr) throws IOException { EXT_NAME = "EXT_" + attr.getDeclaringElement().getName().toUpperCase(); @@ -342,13 +342,13 @@ /*{ public void set<%=attrNameCapitalized%>(<%=attrType%> <%=attrName%>) { - Object oldValue = getField(<%=EXT_NAME%>, "<%=attrName%>"); - getWikitty().setField(<%=EXT_NAME%>, "<%=attrName%>", <%=attrName%>); - getPropertyChangeSupport().firePropertyChange("<%=attrName%>", oldValue, <%=attrName%>); + Object oldValue = getField(<%=EXT_NAME%>, FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%>); + getWikitty().setField(<%=EXT_NAME%>, FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%>, <%=attrName%>); + getPropertyChangeSupport().firePropertyChange(FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%>, oldValue, <%=attrName%>); } public <%=attrType%> get<%=attrNameCapitalized%>() { - <%=attrType%> result = getWikitty().getFieldAs<%=methodAccessName%>(<%=EXT_NAME%>, "<%=attrName%>"); + <%=attrType%> result = getWikitty().getFieldAs<%=methodAccessName%>(<%=EXT_NAME%>, FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%>); return result; } @@ -393,7 +393,7 @@ } protected void generateCollectionAttributeAccessors(Writer output, - ObjectModelAttribute attr) throws IOException { + ObjectModelClass clazz, ObjectModelAttribute attr) throws IOException { EXT_NAME = "EXT_" + attr.getDeclaringElement().getName().toUpperCase(); @@ -412,23 +412,23 @@ String attrName = attr.getName(); String attrNameCapitalized = EugengoUtils.toUpperCaseFirstLetter(attrName); /*{ public <%=attrType%> get<%=attrNameCapitalized%>() { - <%=attrType%> result = getWikitty().getFieldAs<%=methodAccessName%>(<%=EXT_NAME%>, "<%=attrName%>", <%=getClassAndGeneric(attrType)[1]%>.class); + <%=attrType%> result = getWikitty().getFieldAs<%=methodAccessName%>(<%=EXT_NAME%>, FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%>, <%=getClassAndGeneric(attrType)[1]%>.class); return result; } public void add<%=attrNameCapitalized%>(<%=elementType%> element) { - getWikitty().addToField(<%=EXT_NAME%>, "<%=attrName%>", element); - getPropertyChangeSupport().firePropertyChange("<%=attrName%>", null, get<%=attrNameCapitalized%>()); + getWikitty().addToField(<%=EXT_NAME%>, FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%>, element); + getPropertyChangeSupport().firePropertyChange(FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%>, null, get<%=attrNameCapitalized%>()); } public void remove<%=attrNameCapitalized%>(<%=elementType%> element) { - getWikitty().removeFromField(<%=EXT_NAME%>, "<%=attrName%>", element); - getPropertyChangeSupport().firePropertyChange("<%=attrName%>", null, get<%=attrNameCapitalized%>()); + getWikitty().removeFromField(<%=EXT_NAME%>, FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%>, element); + getPropertyChangeSupport().firePropertyChange(FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%>, null, get<%=attrNameCapitalized%>()); } public void clear<%=attrNameCapitalized%>() { - getWikitty().clearField(<%=EXT_NAME%>, "<%=attrName%>"); - getPropertyChangeSupport().firePropertyChange("<%=attrName%>", null, get<%=attrNameCapitalized%>()); + getWikitty().clearField(<%=EXT_NAME%>, FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%>); + getPropertyChangeSupport().firePropertyChange(FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%>, null, get<%=attrNameCapitalized%>()); } }*/ Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityInterfaceGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityInterfaceGenerator.java 2010-07-29 18:54:32 UTC (rev 209) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityInterfaceGenerator.java 2010-07-29 19:38:32 UTC (rev 210) @@ -96,8 +96,8 @@ for (ObjectModelAttribute attr : clazz.getAttributes()) { if (attr.isNavigable() && !attr.isStatic() && (attr.getStereotypes() == null || attr.getStereotypes().isEmpty())) { -/*{ static final public String FIELD_<%=attr.getName().toUpperCase()%> = "<%=attr.getName()%>"; - static final public String FQ_FIELD_<%=attr.getName().toUpperCase()%> = <%=EXT_NAME%> + ".<%=attr.getName()%>"; +/*{ static final public String FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%> = "<%=attr.getName()%>"; + static final public String FQ_FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%> = <%=EXT_NAME%> + ".<%=attr.getName()%>"; }*/ } } Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java 2010-07-29 18:54:32 UTC (rev 209) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java 2010-07-29 19:38:32 UTC (rev 210) @@ -133,8 +133,8 @@ if (attr.isNavigable() && !attr.isStatic() && (attr.getStereotypes() == null || attr.getStereotypes().isEmpty())) { /*{ if (result) { - Object f1 = w1.getFieldAsObject(<%=EXT_NAME%>, FIELD_<%=attr.getName().toUpperCase()%>); - Object f2 = w2.getFieldAsObject(<%=EXT_NAME%>, FIELD_<%=attr.getName().toUpperCase()%>); + Object f1 = w1.getFieldAsObject(<%=EXT_NAME%>, <%=clazz.getName()%>.FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%>); + Object f2 = w2.getFieldAsObject(<%=EXT_NAME%>, <%=clazz.getName()%>.FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%>); result = f1 == f2 || (f1 != null && f1.equals(f2)); } }*/ @@ -159,9 +159,9 @@ && (attr.getStereotypes() == null || attr.getStereotypes().isEmpty())) { if ((attr.getMaxMultiplicity() != 0 && attr.getMaxMultiplicity() != 1)) { //TODO ymartel 20090812: when dataType "List", "Set" or "Collection" in model, must be here! - generateCollectionAttributeAccessors(output, attr); + generateCollectionAttributeAccessors(output, clazz, attr); } else { - generateWikittyAttributeAccessors(output, attr); + generateWikittyAttributeAccessors(output, clazz, attr); } } } @@ -182,7 +182,7 @@ } protected void generateWikittyAttributeAccessors(Writer output, - ObjectModelAttribute attr) throws IOException { + ObjectModelClass clazz, ObjectModelAttribute attr) throws IOException { EXT_NAME = "EXT_" + attr.getDeclaringElement().getName().toUpperCase(); @@ -192,7 +192,7 @@ } else { return; } - + // FIXME EC-20100421 cette methode peut retourner List<String> // et generer la methode getWikitty().getFieldAsList<String>() // qui ne peut pas compiler @@ -203,11 +203,11 @@ /*{ static public void set<%=attrNameCapitalized%>(Wikitty w, <%=attrType%> <%=attrName%>) { - w.setField(<%=EXT_NAME%>, "<%=attrName%>", <%=attrName%>); + w.setField(<%=EXT_NAME%>, <%=clazz.getName()%>.FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%>, <%=attrName%>); } static public <%=attrType%> get<%=attrNameCapitalized%>(Wikitty w) { - <%=attrType%> result = w.getFieldAs<%=methodAccessName%>(<%=EXT_NAME%>, "<%=attrName%>"); + <%=attrType%> result = w.getFieldAs<%=methodAccessName%>(<%=EXT_NAME%>, <%=clazz.getName()%>.FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%>); return result; } @@ -252,7 +252,7 @@ } protected void generateCollectionAttributeAccessors(Writer output, - ObjectModelAttribute attr) throws IOException { + ObjectModelClass clazz, ObjectModelAttribute attr) throws IOException { EXT_NAME = "EXT_" + attr.getDeclaringElement().getName().toUpperCase(); @@ -271,20 +271,20 @@ String attrName = attr.getName(); String attrNameCapitalized = EugengoUtils.toUpperCaseFirstLetter(attrName); /*{ static public <%=attrType%> get<%=attrNameCapitalized%>(Wikitty w) { - <%=attrType%> result = w.getFieldAs<%=methodAccessName%>(<%=EXT_NAME%>, "<%=attrName%>", <%=getClassAndGeneric(attrType)[1]%>.class); + <%=attrType%> result = w.getFieldAs<%=methodAccessName%>(<%=EXT_NAME%>, <%=clazz.getName()%>.FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%>, <%=getClassAndGeneric(attrType)[1]%>.class); return result; } static public void add<%=attrNameCapitalized%>(Wikitty w, <%=elementType%> element) { - w.addToField(<%=EXT_NAME%>, "<%=attrName%>", element); + w.addToField(<%=EXT_NAME%>, <%=clazz.getName()%>.FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%>, element); } static public void remove<%=attrNameCapitalized%>(Wikitty w, <%=elementType%> element) { - w.removeFromField(<%=EXT_NAME%>, "<%=attrName%>", element); + w.removeFromField(<%=EXT_NAME%>, <%=clazz.getName()%>.FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%>, element); } static public void clear<%=attrNameCapitalized%>(Wikitty w) { - w.clearField(<%=EXT_NAME%>, "<%=attrName%>"); + w.clearField(<%=EXT_NAME%>, <%=clazz.getName()%>.FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%>); } }*/ Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java =================================================================== --- trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java 2010-07-29 18:54:32 UTC (rev 209) +++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java 2010-07-29 19:38:32 UTC (rev 210) @@ -237,7 +237,7 @@ // is root return null; } - parentId = (String) doc.getFieldValue(TreeNode.FQ_FIELD_PARENT); + parentId = (String) doc.getFieldValue(TreeNode.FQ_FIELD_TREENODE_PARENT); parents.put(nodeId, parentId); } @@ -295,7 +295,7 @@ Collection<String> excludedChildNodeIds = getExcludedNodeIds(id); // Find all node contain child - SolrQuery query = new SolrQuery(SOLR_QUERY_PARSER + TreeNode.FQ_FIELD_CHILDREN + "_s:" + id); + SolrQuery query = new SolrQuery(SOLR_QUERY_PARSER + TreeNode.FQ_FIELD_TREENODE_CHILDREN + "_s:" + id); QueryResponse response = solrServer.query(query); SolrDocumentList updateDocs = response.getResults(); @@ -497,13 +497,13 @@ if(w.hasExtension(TreeNode.EXT_TREENODE)) { - Set<String> children = w.getFieldAsSet(TreeNode.EXT_TREENODE, TreeNode.FIELD_CHILDREN, String.class); + Set<String> children = w.getFieldAsSet(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_CHILDREN, String.class); reindexChildTreeNode.putIncludedChildren(id, children); // Search deleted children SolrDocument treeNodeDoc = findById(id); if(treeNodeDoc != null) { - Collection oldChildren = treeNodeDoc.getFieldValues(TreeNode.FQ_FIELD_CHILDREN + "_s"); + Collection oldChildren = treeNodeDoc.getFieldValues(TreeNode.FQ_FIELD_TREENODE_CHILDREN + "_s"); if(oldChildren != null) { // if no more children, remove all old children if(children == null) { @@ -520,7 +520,7 @@ } // Get new parent id (may be the same old parent) - String parentId = w.getFieldAsString(TreeNode.EXT_TREENODE, TreeNode.FIELD_PARENT); + String parentId = w.getFieldAsString(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_PARENT); reindexChildTreeNode.putParent(id, parentId); } @@ -713,7 +713,7 @@ public Integer findNodeCount(WikittyTransaction transaction, Wikitty w, Criteria filter) { String wikittyId = w.getId(); - String parent = w.getFieldAsWikitty(TreeNode.EXT_TREENODE, TreeNode.FIELD_PARENT); + String parent = w.getFieldAsWikitty(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_PARENT); if(parent == null) { parent = TREENODE_ROOT; } else { @@ -734,7 +734,7 @@ public Map<String, Integer> findAllChildrenCount(WikittyTransaction transaction, Wikitty w, Criteria filter) { String wikittyId = w.getId(); - String parent = w.getFieldAsWikitty(TreeNode.EXT_TREENODE, TreeNode.FIELD_PARENT); + String parent = w.getFieldAsWikitty(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_PARENT); if(parent == null) { parent = TREENODE_ROOT; } else { @@ -761,7 +761,7 @@ log.debug("Facet result " + counts); // Find all children, add the other node not found with facet - criteria = Search.query().eq(TreeNode.FQ_FIELD_PARENT, wikittyId).criteria() + criteria = Search.query().eq(TreeNode.FQ_FIELD_TREENODE_PARENT, wikittyId).criteria() .setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS); search = findAllByCriteria(transaction, criteria); Modified: trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/TreeTest.java =================================================================== --- trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/TreeTest.java 2010-07-29 18:54:32 UTC (rev 209) +++ trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/TreeTest.java 2010-07-29 19:38:32 UTC (rev 210) @@ -132,7 +132,7 @@ Wikitty node = findNode(nodeName); assertNotNull(node); - node.addToField(TreeNode.EXT_TREENODE, TreeNode.FIELD_CHILDREN, leaf.getId()); + node.addToField(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_CHILDREN, leaf.getId()); ws.store(null, node); } @@ -140,7 +140,7 @@ * Find node by name */ protected Wikitty findNode(String nodeName) { - Criteria criteria = Search.query().eq(TreeNode.FQ_FIELD_NAME, nodeName).criteria(); + Criteria criteria = Search.query().eq(TreeNode.FQ_FIELD_TREENODE_NAME, nodeName).criteria(); Wikitty wikitty = ws.findByCriteria(null, criteria); return wikitty; } @@ -162,7 +162,7 @@ // Sum value in node Set<String> values = node.getFieldAsSet(TreeNode.EXT_TREENODE, - TreeNode.FIELD_CHILDREN, String.class); + TreeNode.FIELD_TREENODE_CHILDREN, String.class); if(values != null) { sum = values.size(); } @@ -291,7 +291,7 @@ // Add it in the node2 (now: two values in it) Wikitty node = findNode("node2"); assertNotNull(node); - node.addToField(TreeNode.EXT_TREENODE, TreeNode.FIELD_CHILDREN, leaf.getId()); + node.addToField(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_CHILDREN, leaf.getId()); ws.store(null, node); // now, there is one more value for the root node @@ -342,8 +342,8 @@ // Remove a value on node2 Wikitty node = findNode("node11"); - List<String> leafs = node.getFieldAsList(TreeNode.EXT_TREENODE, TreeNode.FIELD_CHILDREN, String.class); - node.removeFromField(TreeNode.EXT_TREENODE, TreeNode.FIELD_CHILDREN, leafs.get(0)); + List<String> leafs = node.getFieldAsList(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_CHILDREN, String.class); + node.removeFromField(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_CHILDREN, leafs.get(0)); ws.store(null, node); // now, there is one more value for the root node @@ -382,7 +382,7 @@ int childSum2 = sum(node2); // Move node 1 in mode 2 - node121.setField(TreeNode.EXT_TREENODE, TreeNode.FIELD_PARENT, node2); + node121.setField(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_PARENT, node2); ws.store(null, node121); // now, there is less value node 121 for the node 1 @@ -404,11 +404,11 @@ String valueId = value.getId(); Wikitty node31 = findNode("node31"); - node31.addToField(TreeNode.EXT_TREENODE, TreeNode.FIELD_CHILDREN, valueId); + node31.addToField(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_CHILDREN, valueId); ws.store(null, node31); Wikitty node32 = findNode("node32"); - node32.addToField(TreeNode.EXT_TREENODE, TreeNode.FIELD_CHILDREN, valueId); + node32.addToField(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_CHILDREN, valueId); ws.store(null, node32); Wikitty node3 = findNode("node3");
participants (1)
-
echatellier＠users.nuiton.org