- Wikitty-commits - mailman.cloud.codelutin.com

r146 - trunk/wikitty-api/src/test/java/org/nuiton/wikitty/memory
by bpoussin＠users.nuiton.org 22 Jun '10

22 Jun '10

Author: bpoussin Date: 2010-06-22 19:13:36 +0200 (Tue, 22 Jun 2010) New Revision: 146 Url: http://nuiton.org/repositories/revision/wikitty/146 Log: suppression d'import non utilise Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/memory/InMemoryStorageTest.java Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/memory/InMemoryStorageTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/memory/InMemoryStorageTest.java 2010-06-22 17:12:42 UTC (rev 145) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/memory/InMemoryStorageTest.java 2010-06-22 17:13:36 UTC (rev 146) @@ -9,21 +9,16 @@ import java.util.Arrays; import java.util.Collection; import java.util.Date; -import java.util.LinkedList; -import java.util.List; import org.junit.Before; import org.junit.Test; -import org.nuiton.wikitty.Criteria; import org.nuiton.wikitty.ExtensionFactory; -import org.nuiton.wikitty.PagedResult; import org.nuiton.wikitty.Wikitty; import org.nuiton.wikitty.WikittyExtension; import org.nuiton.wikitty.WikittyServiceInMemory; import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.FieldType.TYPE; import org.nuiton.wikitty.api.AbstractTestApi; -import org.nuiton.wikitty.search.Search; public class InMemoryStorageTest extends AbstractTestApi {

1 0

r145 - in trunk/wikitty-api/src: main/java/org/nuiton/wikitty test/java/org/nuiton/wikitty/api
by bpoussin＠users.nuiton.org 22 Jun '10

22 Jun '10

Author: bpoussin Date: 2010-06-22 19:12:42 +0200 (Tue, 22 Jun 2010) New Revision: 145 Url: http://nuiton.org/repositories/revision/wikitty/145 Log: ajout de la validation des entites avant la sauvegarde: - check des champs notNull (a tester) Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/ExtensionFactoryTest.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-06-22 17:03:49 UTC (rev 144) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java 2010-06-22 17:12:42 UTC (rev 145) @@ -130,9 +130,27 @@ return true; } + protected void checkConstraint(Collection<Wikitty> wikitties) { + for(Wikitty w : wikitties) { + for(WikittyExtension ext : w.getExtensions()) { + for (String fieldName : ext.getFieldNames()) { + FieldType type = ext.getFieldType(fieldName); + if (type.isNotNull()) { + if (null == w.getFqField(fieldName)) { + throw new WikittyException(String.format( + "Field %s must not be null", fieldName)); + } + } + } + } + } + } + @Override public UpdateResponse store(String securityToken, WikittyTransaction transaction, Collection<Wikitty> wikitties, boolean disableAutoVersionIncrement) { + checkConstraint(wikitties); + // update/store extension if necessary Set<WikittyExtension> allExtensions = new HashSet<WikittyExtension>(); for (Wikitty w : wikitties) { Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/ExtensionFactoryTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/ExtensionFactoryTest.java 2010-06-22 17:03:49 UTC (rev 144) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/ExtensionFactoryTest.java 2010-06-22 17:12:42 UTC (rev 145) @@ -15,6 +15,7 @@ public void testExtensionFactory() throws Exception { WikittyExtension ext = ExtensionFactory.create("testExtension", "1.0") .addField("name", TYPE.STRING) + .notNull() .addField("phoneNumbers", TYPE.STRING) .minOccur(2) .maxOccur(10) @@ -25,14 +26,15 @@ assertEquals("testExtension", ext.getName()); assertEquals("1.0", ext.getVersion()); - checkField( ext, "name", TYPE.STRING, 0, 1, false); - checkField( ext, "phoneNumbers", TYPE.STRING, 2, 10, false); - checkField( ext, "matricule", TYPE.NUMERIC, 0, 1, true); - checkField( ext, "fired", TYPE.BOOLEAN, 0, 1, false); + checkField( ext, "name", TYPE.STRING, 0, 1, false, true); + checkField( ext, "phoneNumbers", TYPE.STRING, 2, 10, false, false); + checkField( ext, "matricule", TYPE.NUMERIC, 0, 1, true, false); + checkField( ext, "fired", TYPE.BOOLEAN, 0, 1, false, false); } - private void checkField( WikittyExtension ext, String fieldName, TYPE type, int min, int max, boolean unique) { + private void checkField( WikittyExtension ext, String fieldName, TYPE type, + int min, int max, boolean unique, boolean notNull) { FieldType fieldType = ext.getFieldType(fieldName); String str = "Checking " + ext.getName() + "." + fieldName + " field..."; assertNotNull(str, fieldType ); @@ -40,6 +42,7 @@ assertEquals(str, min, fieldType.getLowerBound()); assertEquals(str, max, fieldType.getUpperBound()); assertEquals(str, unique, fieldType.isUnique()); + assertEquals(str, notNull, fieldType.isNotNull()); }

1 0

r144 - in trunk: wikitty-api/src/main/java/org/nuiton/wikitty wikitty-generators/src/main/java/org/nuiton/wikitty/generator
by bpoussin＠users.nuiton.org 22 Jun '10

22 Jun '10

Author: bpoussin Date: 2010-06-22 19:03:49 +0200 (Tue, 22 Jun 2010) New Revision: 144 Url: http://nuiton.org/repositories/revision/wikitty/144 Log: modification du support de: - unique - notNull Maintenant ce sont de vrai tag value Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/FieldFactory.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/FieldType.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyExtension.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityAbstractGenerator.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/FieldFactory.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/FieldFactory.java 2010-06-22 14:42:44 UTC (rev 143) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/FieldFactory.java 2010-06-22 17:03:49 UTC (rev 144) @@ -31,7 +31,7 @@ } protected void append() { - FieldType fieldType = new FieldType(type, minOccur, maxOccur, unique, minOccur > 0); + FieldType fieldType = new FieldType(type, minOccur, maxOccur); for (Map.Entry<String, String> entry : tagValues.entrySet()) { String tag = entry.getKey(); String value = entry.getValue(); @@ -51,7 +51,7 @@ } public FieldFactory unique() { - unique = true; + addTagValue(FieldType.UNIQUE, "true"); return this; } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/FieldType.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/FieldType.java 2010-06-22 14:42:44 UTC (rev 143) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/FieldType.java 2010-06-22 17:03:49 UTC (rev 144) @@ -38,6 +38,11 @@ /** serialVersionUID. */ private static final long serialVersionUID = -4375308750387837026L; + /** tag/value use for unique */ + static public String UNIQUE = "unique"; + /** tag/value use for not null */ + static public String NOT_NULL = "notNull"; + static public enum TYPE { BOOLEAN, DATE, NUMERIC, STRING, WIKITTY; @@ -58,8 +63,6 @@ protected TYPE type; protected int lowerBound; protected int upperBound; - protected boolean unique = false; - protected boolean notNull = false; /** used to store tag/value used by client side ex: editor=xhtml */ Map<String, String> tagValues = new HashMap<String, String>(); @@ -73,12 +76,6 @@ this.upperBound = upperBound; } - public FieldType(TYPE type, int lowerBound, int upperBound, boolean unique, boolean notNull) { - this(type, lowerBound, upperBound); - this.unique = unique; - this.notNull = notNull; - } - public void addTagValue(String tag, String value) { tagValues.put(tag, value); } @@ -124,12 +121,6 @@ result += "[" + lowerBound + "-*]"; } } - if (isUnique()) { - result += " unique"; - } - if (isNotNull()) { - result += " not null"; - } result += WikittyUtil.tagValuesToString(tagValues); return result; } @@ -221,11 +212,11 @@ } public boolean isUnique() { - return unique; + return "true".equalsIgnoreCase(getTagValue(UNIQUE)); } public boolean isNotNull() { - return notNull; + return "true".equalsIgnoreCase(getTagValue(NOT_NULL)); } } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyExtension.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyExtension.java 2010-06-22 14:42:44 UTC (rev 143) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyExtension.java 2010-06-22 17:03:49 UTC (rev 144) @@ -139,7 +139,8 @@ nextFields = new LinkedHashMap<String, FieldType>(); for (Map.Entry<String, FieldType> entry : fields.entrySet()) { FieldType type = entry.getValue(); - FieldType nextType = new FieldType(type.getType(), type.getLowerBound(), type.getUpperBound(), type.isUnique(), type.isNotNull()); + FieldType nextType = new FieldType( + type.getType(), type.getLowerBound(), type.getUpperBound()); Set<String> tagNames = type.getTagNames(); if (tagNames != null) { for (String tagName : tagNames) { Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2010-06-22 14:42:44 UTC (rev 143) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2010-06-22 17:03:49 UTC (rev 144) @@ -92,16 +92,17 @@ static protected Pattern tagValuesPattern = Pattern.compile( tagValuesPatternString, Pattern.DOTALL); /** - * Field pattern parser <li>group 1: type (string) <li>group 2: name - * (string) <li>group 3: lower bound (number) can be null <li>group 4: upper - * bound (number) can be null, mutualy exclusif with group 5 <li>group 5: - * upper bound (n or *) can be null <li>group 6: unique can be null <li> - * group 7: not null can be null <li>group 8: all tag/value (toto=titi - * tutu=tata;lala tata="truc bidulle") + * Field pattern parser + * <li>group 1: type (string) + * <li>group 2: name (string) + * <li>group 3: lower bound (number) can be null + * <li>group 4: upper bound (number) can be null, mutualy exclusif with group 5 + * <li>group 5: upper bound (n or *) can be null + * <li>group 6: all tag/value (toto=titi tutu=tata;lala tata="truc bidulle") */ static protected Pattern fieldPattern = Pattern .compile( - "\\s*(\\w+)\\s+(\\w+)(?:\\s*\\[(\\d+)-(?:(\\d+)|([\\*n]))\\])?(?:\\s+(unique))?(?:\\s+(not null))?((?:\\s+" + "\\s*(\\w+)\\s+(\\w+)(?:\\s*\\[(\\d+)-(?:(\\d+)|([\\*n]))\\])?((?:\\s+" + tagValuesPatternString + ")*)", Pattern.DOTALL); /** @@ -126,17 +127,13 @@ if (upper != null) { fieldType.upperBound = Integer.parseInt(upper); } + String noupper = match.group(5); if (noupper != null) { fieldType.upperBound = FieldType.NOLIMIT; } - String uniqueString = match.group(6); - fieldType.unique = uniqueString != null; - String notNullString = match.group(7); - fieldType.notNull = notNullString != null; - - String tagValues = match.group(8); + String tagValues = match.group(6); Map<String, String> tagValuesMap = tagValuesToMap(tagValues); fieldType.setTagValues(tagValuesMap); 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-06-22 14:42:44 UTC (rev 143) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityAbstractGenerator.java 2010-06-22 17:03:49 UTC (rev 144) @@ -287,18 +287,20 @@ // FIXME EC-20100420 attr.isUnique() always return true for // attributes (maybe use tagValue instead) - String unique = attr.isUnique() ? " unique" : ""; + String unique = ""; + boolean isCollection = (attr.getMaxMultiplicity() != 0 + && attr.getMaxMultiplicity() != 1); + if (isCollection && attr.isUnique()) { + unique = " unique=true"; + } String tagValues = ""; - if ("designation".equals(attr.getName())) { - System.out.println("+++ DEBUG +++ " + attr.getName() + " " + attr.getTagValues()); - } for (String tag : attr.getTagValues().keySet()) { - // EC20100611 : documentation has no sense in wikitty extension definition - if (!"documentation".equals(tag)) { - String value = attr.getTagValue(tag); - tagValues += " " + tag + "=" + value; - } + String value = attr.getTagValue(tag); + value = value.replaceAll("\n", "\\n"); + value = value.replaceAll("\"", "\\\""); + + tagValues += " " + tag + "=\\\"" + value + "\\\""; } /*{"<%=attrType%> <%=attrName%><%=card%><%=unique%><%=tagValues%>"}*/

1 0

r143 - trunk/wikitty-ui-zk
by echatellier＠users.nuiton.org 22 Jun '10

22 Jun '10

Author: echatellier Date: 2010-06-22 16:42:44 +0200 (Tue, 22 Jun 2010) New Revision: 143 Url: http://nuiton.org/repositories/revision/wikitty/143 Log: Fix modules dependencies Modified: trunk/wikitty-ui-zk/pom.xml Modified: trunk/wikitty-ui-zk/pom.xml =================================================================== --- trunk/wikitty-ui-zk/pom.xml 2010-06-22 14:40:56 UTC (rev 142) +++ trunk/wikitty-ui-zk/pom.xml 2010-06-22 14:42:44 UTC (rev 143) @@ -16,6 +16,19 @@ <artifactId>wikitty-ui-zk</artifactId> <dependencies> + + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-api</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-jdbc-impl</artifactId> + <version>${project.version}</version> + </dependency> +  <dependency> <groupId>junit</groupId> @@ -72,12 +85,6 @@ </dependency> <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-jdbc-impl</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> <version>1.2.136</version> @@ -138,20 +145,6 @@ <version>1.0.0</version> </dependency> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-api</artifactId> - <version>2.0-SNAPSHOT</version> - <type>jar</type> - </dependency> - - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-jdbc-impl</artifactId> - <version>2.0-SNAPSHOT</version> - <type>jar</type> - </dependency> - </dependencies>

1 0

r142 - trunk/wikitty-ui-zk
by echatellier＠users.nuiton.org 22 Jun '10

22 Jun '10

Author: echatellier Date: 2010-06-22 16:40:56 +0200 (Tue, 22 Jun 2010) New Revision: 142 Url: http://nuiton.org/repositories/revision/wikitty/142 Log: Remove duplicate artifact Modified: trunk/wikitty-ui-zk/pom.xml Modified: trunk/wikitty-ui-zk/pom.xml =================================================================== --- trunk/wikitty-ui-zk/pom.xml 2010-06-22 14:40:28 UTC (rev 141) +++ trunk/wikitty-ui-zk/pom.xml 2010-06-22 14:40:56 UTC (rev 142) @@ -53,12 +53,6 @@ </dependency> <dependency> - <groupId>org.zkoss.zk</groupId> - <artifactId>zkex</artifactId> - <version>3.6.3</version> - </dependency> - - <dependency> <groupId>jasperreports</groupId> <artifactId>jasperreports</artifactId> <version>3.5.3</version>

1 0

r141 - trunk/wikitty-ui-zk
by echatellier＠users.nuiton.org 22 Jun '10

22 Jun '10

Author: echatellier Date: 2010-06-22 16:40:28 +0200 (Tue, 22 Jun 2010) New Revision: 141 Url: http://nuiton.org/repositories/revision/wikitty/141 Log: version ${project.version} vs ${wikitty.version} Modified: trunk/wikitty-ui-zk/pom.xml Modified: trunk/wikitty-ui-zk/pom.xml =================================================================== --- trunk/wikitty-ui-zk/pom.xml 2010-06-22 13:35:50 UTC (rev 140) +++ trunk/wikitty-ui-zk/pom.xml 2010-06-22 14:40:28 UTC (rev 141) @@ -80,7 +80,7 @@ <dependency> <groupId>org.nuiton.wikitty</groupId> <artifactId>wikitty-jdbc-impl</artifactId> - <version>${wikitty.version}</version> + <version>${project.version}</version> </dependency> <dependency>

1 0

r140 - trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator
by echatellier＠users.nuiton.org 22 Jun '10

22 Jun '10

Author: echatellier Date: 2010-06-22 15:35:50 +0200 (Tue, 22 Jun 2010) New Revision: 140 Url: http://nuiton.org/repositories/revision/wikitty/140 Log: Add doc on interface too. Remove imports. Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityImplGenerator.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityInterfaceGenerator.java Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityImplGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityImplGenerator.java 2010-06-22 13:23:37 UTC (rev 139) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityImplGenerator.java 2010-06-22 13:35:50 UTC (rev 140) @@ -10,12 +10,9 @@ import java.util.List; import java.util.Set; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.GeneratorUtil; -import org.nuiton.eugene.models.object.ObjectModelAttribute; import org.nuiton.eugene.models.object.ObjectModelClass; /** 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-06-22 13:23:37 UTC (rev 139) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityInterfaceGenerator.java 2010-06-22 13:35:50 UTC (rev 140) @@ -62,6 +62,8 @@ lookForAttributeImports(clazz); generateImports(output, packageName); + generateClazzDocumentation(output, clazz); + String extendsString = "extends " + getType("org.nuiton.wikitty.BusinessEntity"); for (ObjectModelClass parent : clazz.getSuperclasses()) { if (EugengoUtils.isBusinessEntity(parent)) {

1 0

r139 - in trunk/wikitty-ui-zk: . src/main/java/org/nuiton/wikitty/ui src/main/webapp
by bbrossaud＠users.nuiton.org 22 Jun '10

22 Jun '10

Author: bbrossaud Date: 2010-06-22 15:23:37 +0200 (Tue, 22 Jun 2010) New Revision: 139 Url: http://nuiton.org/repositories/revision/wikitty/139 Log: can add extensions to an object Modified: trunk/wikitty-ui-zk/ trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/Controller.java trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyForm.java trunk/wikitty-ui-zk/src/main/webapp/index.zul Property changes on: trunk/wikitty-ui-zk ___________________________________________________________________ Added: svn:ignore + target Modified: trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/Controller.java =================================================================== --- trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/Controller.java 2010-06-21 09:40:52 UTC (rev 138) +++ trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/Controller.java 2010-06-22 13:23:37 UTC (rev 139) @@ -24,6 +24,7 @@ protected Model _model = new Model(); protected List<WikittyExtension> _extensions = new ArrayList<WikittyExtension>(); protected WikittyExtension _selectedExtension; + protected WikittyExtension _selectedNewExtension; protected Listbox formListBox; protected WikittyForm _wikittyForm = new WikittyForm(); protected Listbox wikittiesListBox; @@ -66,6 +67,10 @@ wikittiesListBox.setSelectedIndex(0); } + public void onClick$addNewExtension() { + _wikittyForm.addExtension(_selectedNewExtension); + } + /* * Renderers */ @@ -91,6 +96,10 @@ return _selectedExtension; } + public WikittyExtension getSelectedNewExtension() { + return _selectedNewExtension; + } + public WikittyForm getWikittyForm() { return _wikittyForm; } @@ -112,6 +121,10 @@ _wikittyModel.setWikitties(list); } + public void setSelectedNewExtension(WikittyExtension current) { + _selectedNewExtension = current; + } + public void setSelectedWikitty(Wikitty current) { _wikittyForm.setWikitty(current); } Modified: trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyForm.java =================================================================== --- trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyForm.java 2010-06-21 09:40:52 UTC (rev 138) +++ trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyForm.java 2010-06-22 13:23:37 UTC (rev 139) @@ -50,18 +50,21 @@ List<Component> components = new ArrayList<Component>(); FieldType fieldType = fieldExtension.getFieldType(); String wikittyExtensionName = fieldExtension.getWikittyExtension().getName(); - if (_wikitty != null) { - if (fieldType.isCollection()) { - List<Date> dates = _wikitty.getFieldAsList(wikittyExtensionName, fieldExtension.getName(), Date.class); - for (Date date : dates) { - components.add(new Datebox(date)); + if (_wikitty != null && _wikitty.hasExtension(wikittyExtensionName)) { + Date obj = _wikitty.getFieldAsDate(wikittyExtensionName, fieldExtension.getName()); + if (obj != null) { + if (fieldType.isCollection()) { + List<Date> dates = _wikitty.getFieldAsList(wikittyExtensionName, fieldExtension.getName(), Date.class); + for (Date date : dates) { + components.add(new Datebox(date)); + } + } else { + components.add(new Datebox(obj)); } - } else { - components.add(new Datebox(_wikitty.getFieldAsDate(wikittyExtensionName, fieldExtension.getName()))); + return components; } - } else { - components.add(new Datebox()); } + components.add(new Datebox()); return components; } @@ -69,18 +72,21 @@ List<Component> components = new ArrayList<Component>(); FieldType fieldType = fieldExtension.getFieldType(); String wikittyExtensionName = fieldExtension.getWikittyExtension().getName(); - if (_wikitty != null) { - if (fieldType.isCollection()) { - List<BigDecimal> decimals = _wikitty.getFieldAsList(wikittyExtensionName, fieldExtension.getName(), BigDecimal.class); - for (BigDecimal decimal : decimals) { - components.add(new Decimalbox(decimal)); + if (_wikitty != null && _wikitty.hasExtension(wikittyExtensionName)) { + BigDecimal obj = _wikitty.getFieldAsBigDecimal(wikittyExtensionName, fieldExtension.getName()); + if (obj != null) { + if (fieldType.isCollection()) { + List<BigDecimal> decimals = _wikitty.getFieldAsList(wikittyExtensionName, fieldExtension.getName(), BigDecimal.class); + for (BigDecimal decimal : decimals) { + components.add(new Decimalbox(decimal)); + } + } else { + components.add(new Decimalbox(obj)); } - } else { - components.add(new Decimalbox(_wikitty.getFieldAsBigDecimal(wikittyExtensionName, fieldExtension.getName()))); + return components; } - } else { - components.add(new Decimalbox()); } + components.add(new Decimalbox()); return components; } @@ -88,18 +94,21 @@ List<Component> components = new ArrayList<Component>(); FieldType fieldType = fieldExtension.getFieldType(); String wikittyExtensionName = fieldExtension.getWikittyExtension().getName(); - if (_wikitty != null) { - if (fieldType.isCollection()) { - List<String> strings = _wikitty.getFieldAsList(wikittyExtensionName, fieldExtension.getName(), String.class); - for (String str : strings) { - components.add(new Textbox(str)); + if (_wikitty != null && _wikitty.hasExtension(wikittyExtensionName)) { + String obj = _wikitty.getFieldAsString(wikittyExtensionName, fieldExtension.getName()); + if (obj != null) { + if (fieldType.isCollection()) { + List<String> strings = _wikitty.getFieldAsList(wikittyExtensionName, fieldExtension.getName(), String.class); + for (String str : strings) { + components.add(new Textbox(str)); + } + } else { + components.add(new Textbox(obj)); } - } else { - components.add(new Textbox(_wikitty.getFieldAsString(wikittyExtensionName, fieldExtension.getName()))); + return components; } - } else { - components.add(new Textbox()); } + components.add(new Textbox()); return components; } @@ -107,23 +116,25 @@ List<Component> components = new ArrayList<Component>(); FieldType fieldType = fieldExtension.getFieldType(); String wikittyExtensionName = fieldExtension.getWikittyExtension().getName(); - if (fieldExtension != null) { - if (fieldType.isCollection()) { - List<Boolean> bools = _wikitty.getFieldAsList(wikittyExtensionName, fieldExtension.getName(), Boolean.class); - for (Boolean bool : bools) { + if (_wikitty != null && _wikitty.hasExtension(wikittyExtensionName)) { + Boolean obj = _wikitty.getFieldAsBoolean(wikittyExtensionName, fieldExtension.getName()); + if (obj != null) { + if (fieldType.isCollection()) { + List<Boolean> bools = _wikitty.getFieldAsList(wikittyExtensionName, fieldExtension.getName(), Boolean.class); + for (Boolean bool : bools) { + Checkbox newCheckBox = new Checkbox(); + newCheckBox.setChecked(bool); + components.add(newCheckBox); + } + } else { Checkbox newCheckBox = new Checkbox(); - newCheckBox.setChecked(bool); + newCheckBox.setChecked(obj); components.add(newCheckBox); } - } else { - Boolean bool = _wikitty.getFieldAsBoolean(wikittyExtensionName, fieldExtension.getName()); - Checkbox newCheckBox = new Checkbox(); - newCheckBox.setChecked(bool); - components.add(newCheckBox); + return components; } - } else { - components.add(new Checkbox()); } + components.add(new Checkbox()); return components; } @@ -181,7 +192,8 @@ String extensionName = fieldExtension.getWikittyExtension().getName(); FieldType fieldType = fieldExtension.getFieldType(); String fieldName = fieldExtension.getName(); - Listcell cell = (Listcell) item.getFellowIfAny(fieldName); + String id = extensionName + "." + fieldName; + Listcell cell = (Listcell) item.getFellowIfAny(id); TYPE type = fieldType.getType(); List collection = null; if (type == TYPE.DATE) { @@ -213,7 +225,10 @@ FieldExtension fieldExtension = (FieldExtension) item.getValue(); FieldType fieldType = fieldExtension.getFieldType(); if (fieldType.isCollection()) { - Listcell cell = (Listcell) item.getFellowIfAny(fieldExtension.getName()); + String extensionName = fieldExtension.getWikittyExtension().getName(); + String fieldName = fieldExtension.getName(); + String id = extensionName + "." + fieldName; + Listcell cell = (Listcell) item.getFellowIfAny(id); if (cell != null) { List children = cell.getChildren(); if (children.size() > 1) { @@ -230,7 +245,10 @@ FieldExtension fieldExtension = (FieldExtension) item.getValue(); FieldType fieldType = fieldExtension.getFieldType(); if (fieldType.isCollection()) { - Listcell cell = (Listcell) item.getFellowIfAny(fieldExtension.getName()); + String extensionName = fieldExtension.getWikittyExtension().getName(); + String fieldName = fieldExtension.getName(); + String id = extensionName + "." + fieldName; + Listcell cell = (Listcell) item.getFellowIfAny(id); if (cell != null) { Component comp = cell.getFirstChild(); cell.appendChild((Component) comp.clone()); @@ -246,10 +264,35 @@ return true; } - public void addExtension() { + public void addExtension(WikittyExtension newExtension) { + if (newExtension != null) { + if (!_holdExtensions.contains(newExtension)) { + boolean bool = false; + String extensionName = newExtension.getName(); + for (WikittyExtension extension : _holdExtensions) { + if (extensionName.equals(extension.getName())) { + bool = true; + break; + } + } + if (!bool) { + _holdExtensions.add(newExtension); + createModelFieldExtensions(); + } + } + } + } + public void removeExtension(WikittyExtension removeExtension) { +// if (_wikitty != null && removeExtension != null) { +// String name = removeExtension.getName(); +// if (_wikitty.hasExtension(name) == true) { +// _wikitty. +// } +// } } + /* * Renderer */ @@ -275,7 +318,8 @@ Listcell cell1 = new Listcell("(" + fieldExtension.getWikittyExtension().getName() + ")"); Listcell cell2 = new Listcell(fieldExtension.getName()); Listcell cell3 = new Listcell(); - cell3.setId(fieldExtension.getName()); + String id = fieldExtension.getWikittyExtension().getName() + "." + fieldExtension.getName(); + cell3.setId(id); for (Component component : components) { cell3.appendChild(component); } Modified: trunk/wikitty-ui-zk/src/main/webapp/index.zul =================================================================== --- trunk/wikitty-ui-zk/src/main/webapp/index.zul 2010-06-21 09:40:52 UTC (rev 138) +++ trunk/wikitty-ui-zk/src/main/webapp/index.zul 2010-06-22 13:23:37 UTC (rev 139) @@ -2,15 +2,17 @@ <window id="win" title="To do list" width="800px" border="normal" apply="org.nuiton.wikitty.ui.Controller"> - <listbox id="extensionListBox" multiple="true" rows="10" model="@{win$composer.extensions, load-after='add.onClick, update.onClick'}" + <listbox id="extensionListBox" multiple="true" rows="8" model="@{win$composer.extensions, load-after='add.onClick, update.onClick'}" selectedItem="@{win$composer.selectedExtension}"> <listhead> - <listheader label="name" /> + <listheader label="Name" /> + <listheader label="Version" /> </listhead> <listitem self="@{each='extension'}"> - <listcell label="@{extension.name}"/> + <listcell label="@{extension.name}" /> + <listcell label="@{extension.version}" /> </listitem> </listbox> @@ -23,16 +25,22 @@ <listheader label="Content" /> </listhead> </listbox> - <button id="add" label="Add" width="36px" height="24px"/> <button id="update" label="Update" width="46px" height="24px"/> <button id="addNewInput" label="New input" width="56px" height="24px" /> <button id="deleteInput" label="Delete input" width="56px" height="24px" /> + + <listbox id="newExtension" rows="1" mold="select" model="@{win$composer.extensions}" selectedItem="@{win$composer.selectedNewExtension}"> + <listitem self="@{each='newExtension'}"> + <listcell label="@{newExtension.name}"/> + </listitem> + </listbox> + <button id="addNewExtension" label="Add extension" width="66px" height="24px"/> </groupbox> <groupbox> <caption label="wikitties" /> - <listbox id="wikittiesListBox" rows="10" model="@{win$composer.wikittyModel}" itemRenderer="@{win$composer.wikittyRenderer}" selectedItem="@{win$composer.selectedWikitty}"> + <listbox id="wikittiesListBox" rows="8" model="@{win$composer.wikittyModel}" itemRenderer="@{win$composer.wikittyRenderer}" selectedItem="@{win$composer.selectedWikitty}"> </listbox> <button id="delete" label="Delete" width="46px" height="24px"/> </groupbox>

1 0

r138 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search
by echatellier＠users.nuiton.org 21 Jun '10

21 Jun '10

Author: echatellier Date: 2010-06-21 11:40:52 +0200 (Mon, 21 Jun 2010) New Revision: 138 Url: http://nuiton.org/repositories/revision/wikitty/138 Log: Add doc for operator (ew, notew, sw...) Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Search.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Search.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Search.java 2010-06-21 09:21:32 UTC (rev 137) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Search.java 2010-06-21 09:40:52 UTC (rev 138) @@ -113,18 +113,39 @@ elm.setName(element); return elm; } - + + /** + * Contains. + * + * @param element + * @param values + * @return + */ public Search contains(String element, Collection<String> values) { restrictions.add(RestrictionHelper.contains(elt(element), new ArrayList<String>(values))); return this; } + /** + * Equals. + * + * @param element + * @param value + * @return {@code this} + */ public Search eq(String element, String value) { restrictions.add(RestrictionHelper.eq(elt(element), value)); return this; } - + + /** + * Equals each collection elements. + * + * @param element + * @param values + * @return {@code this} + */ public Search eq(String element, Collection<String> values) { for (String value : values) { restrictions.add(RestrictionHelper.eq(elt(element), value)); @@ -132,73 +153,171 @@ return this; } + /** + * Like. + * + * @param element + * @param value + * @param searchAs + * @return {@code this} + */ public Search like(String element, String value, Like.SearchAs searchAs) { restrictions.add(RestrictionHelper.like(elt(element), value, searchAs)); return this; } + /** + * Unlike. + * + * @param element + * @param value + * @param searchAs + * @return {@code this} + */ public Search unlike(String element, String value, Like.SearchAs searchAs) { restrictions.add(RestrictionHelper.unlike(elt(element), value, searchAs)); return this; } + /** + * Not equals. + * + * @param element + * @param value + * @return {@code this} + */ public Search neq(String element, String value) { restrictions.add(RestrictionHelper.neq(elt(element), value)); return this; } + /** + * Greater than. + * + * @param element + * @param value + * @return {@code this} + */ public Search gt(String element, String value) { restrictions.add(RestrictionHelper.great(elt(element), value)); return this; } - + + /** + * Greater or equals. + * + * @param element + * @param value + * @return {@code this} + */ public Search ge(String element, String value) { restrictions.add(RestrictionHelper.greatEq(elt(element), value)); return this; } - + + /** + * Less than. + * + * @param element + * @param value + * @return {@code this} + */ public Search lt(String element, String value) { restrictions.add(RestrictionHelper.less(elt(element), value)); return this; } - + + /** + * Less or equals. + * + * @param element + * @param value + * @return {@code this} + */ public Search le(String element, String value) { restrictions.add(RestrictionHelper.lessEq(elt(element), value)); return this; } - + + /** + * Between. + * + * @param element + * @param lowerValue + * @param upperValue + * @return {@code this} + */ public Search bw(String element, String lowerValue, String upperValue) { restrictions.add(RestrictionHelper.between(elt(element), lowerValue, upperValue)); return this; } - + + /** + * Starts with. + * + * @param element + * @param value + * @return {@code this} + */ public Search sw(String element, String value) { restrictions.add(RestrictionHelper.start(elt(element), value)); return this; } + /** + * Not starts with. + * + * @param element + * @param value + * @return {@code this} + */ public Search nsw(String element, String value) { restrictions.add(RestrictionHelper.not( RestrictionHelper.start(elt(element), value))); return this; } - + + /** + * Ends with. + * + * @param element + * @param value + * @return {@code this} + */ public Search ew(String element, String value) { restrictions.add(RestrictionHelper.end(elt(element), value)); return this; } + /** + * Not ends with. + * + * @param element + * @param value + * @return {@code this} + */ public Search notew(String element, String value) { restrictions.add(RestrictionHelper.not( RestrictionHelper.end(elt(element), value))); return this; } + /** + * Keyword. + * + * @param value + * @return {@code this} + */ public Search keyword(String value) { restrictions.add(RestrictionHelper.keyword(value)); return this; } + /** + * Not (sub query). + * + * @return sub query + */ public Search not() { Search not = Search.query(KIND.NOT); subSearchs.add(not); @@ -209,12 +328,22 @@ return search; } + /** + * Or (sub query). + * + * @return sub query + */ public Search or() { Search search = Search.query(KIND.OR); subSearchs.add(search); return search; } - + + /** + * And (sub query). + * + * @return sub query + */ public Search and() { Search search = Search.query(KIND.AND); subSearchs.add(search);

1 0

r137 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search
by echatellier＠users.nuiton.org 21 Jun '10

21 Jun '10

Author: echatellier Date: 2010-06-21 11:21:32 +0200 (Mon, 21 Jun 2010) New Revision: 137 Url: http://nuiton.org/repositories/revision/wikitty/137 Log: Remove generation tags in comment and import. Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/And.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Between.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/BinaryOperator.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Contains.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Element.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/EndsWith.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Equals.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Greater.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/GreaterOrEqual.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/In.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Keyword.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Less.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/LessOrEqual.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Not.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/NotEquals.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Or.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Restriction.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/RestrictionName.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/SearchOperand.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/StartsWith.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/SubSearch.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/And.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/And.java 2010-06-21 08:25:48 UTC (rev 136) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/And.java 2010-06-21 09:21:32 UTC (rev 137) @@ -1,16 +1,9 @@ package org.nuiton.wikitty.search; -// Start of user code for import - import java.io.Serializable; import java.util.List; -// End of user code for import - /** - *  - * - * * And operator is used to build conjunctive restriction for request on content. * It take at least 2 args. * @@ -21,9 +14,6 @@ * <li>RestrictionHelper.and( * my_JavaUtilList_Of_Restriction_Witch_Size_Is_Upper_Than2 )</li> * </ul> - * - * - *  */ public class And extends Restriction implements Serializable { @@ -45,6 +35,7 @@ * @param restrictions */ public And(List<Restriction> restrictions) { + this(); this.restrictions = restrictions; } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Between.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Between.java 2010-06-21 08:25:48 UTC (rev 136) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Between.java 2010-06-21 09:21:32 UTC (rev 137) @@ -3,16 +3,10 @@ import java.io.Serializable; /** - *  - * - * * Between operator is used to build restriction containing "min < element * < max" where element could be a Integer, a Float or a Date. * * For example, use: RestrictionHelper.between( myElement , "15.5" , "22.5" ) - * - * - *  */ public class Between extends Restriction implements Serializable { Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/BinaryOperator.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/BinaryOperator.java 2010-06-21 08:25:48 UTC (rev 136) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/BinaryOperator.java 2010-06-21 09:21:32 UTC (rev 137) @@ -3,14 +3,8 @@ import java.io.Serializable; /** - *  - * - * * This class is an abstract class that's used to factor each operator that * handle two parameters (=, !=, <, <=, >, >=, end, begin). - * - * - *  */ public class BinaryOperator extends Restriction implements Serializable { Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Contains.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Contains.java 2010-06-21 08:25:48 UTC (rev 136) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Contains.java 2010-06-21 09:21:32 UTC (rev 137) @@ -1,16 +1,9 @@ package org.nuiton.wikitty.search; -// Start of user code for import - import java.io.Serializable; import java.util.List; -// End of user code for import - /** - *  - * - * * Contains operator is used to build restriction containing "(element like * *value1 or element like value1*) and (element like *value2 or element like * value2*)" where element could be a String, a multimedia, a text or an xhtml @@ -23,9 +16,6 @@ * <li>RestrictionHelper.contains( myElement , * a_list_containing_at_least_one_string )</li> * </ul> - * - * - *  */ public class Contains extends Restriction implements Serializable { Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Element.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Element.java 2010-06-21 08:25:48 UTC (rev 136) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Element.java 2010-06-21 09:21:32 UTC (rev 137) @@ -19,7 +19,8 @@ import java.io.Serializable; /** - * Search on field + * Search on field. + * * @author ruchaud */ public class Element implements Serializable { Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/EndsWith.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/EndsWith.java 2010-06-21 08:25:48 UTC (rev 136) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/EndsWith.java 2010-06-21 09:21:32 UTC (rev 137) @@ -1,23 +1,13 @@ package org.nuiton.wikitty.search; -// Start of user code for import - import java.io.Serializable; -// End of user code for import - /** - *  - * - * * EndsWith operator is used to build restriction containing "element like * *value" where element could be a String, a multimedia, a text or an xhtml * * * For example, use: RestrictionHelper.end( myElement , "value" ) - * - * - *  */ public class EndsWith extends BinaryOperator implements Serializable { Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Equals.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Equals.java 2010-06-21 08:25:48 UTC (rev 136) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Equals.java 2010-06-21 09:21:32 UTC (rev 137) @@ -1,23 +1,13 @@ package org.nuiton.wikitty.search; -// Start of user code for import - import java.io.Serializable; -// End of user code for import - /** - *  - * - * * Equals operator is used to build restriction containing "element == value" * where element could be an Id, a String, a multimedia, a closed list, an * Integer, a Float or a Date. * * For example, use: RestrictionHelper.eq( myElement , "REF1234567890" ) - * - * - *  */ public class Equals extends BinaryOperator implements Serializable { Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Greater.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Greater.java 2010-06-21 08:25:48 UTC (rev 136) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Greater.java 2010-06-21 09:21:32 UTC (rev 137) @@ -1,23 +1,13 @@ package org.nuiton.wikitty.search; -// Start of user code for import - import java.io.Serializable; -// End of user code for import - /** - *  - * - * * Greater operator is used to build restriction containing "element > value" * where element could be a Integer, a Float or a Date. * * For example, use: RestrictionHelper.less( myElement , * RestrictionHelper.DATE_FORMAT.format(new Date()) ) - * - * - *  */ public class Greater extends BinaryOperator implements Serializable { Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/GreaterOrEqual.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/GreaterOrEqual.java 2010-06-21 08:25:48 UTC (rev 136) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/GreaterOrEqual.java 2010-06-21 09:21:32 UTC (rev 137) @@ -1,23 +1,13 @@ package org.nuiton.wikitty.search; -// Start of user code for import - import java.io.Serializable; -// End of user code for import - /** - *  - * - * * GreatOrEqual operator is used to build restriction containing "element >= * value" where element could be a Integer, a Float or a Date. * * For example, use: RestrictionHelper.greatEq( myElement , * RestrictionHelper.DATE_FORMAT.format(new Date()) ) - * - * - *  */ public class GreaterOrEqual extends BinaryOperator implements Serializable { Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/In.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/In.java 2010-06-21 08:25:48 UTC (rev 136) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/In.java 2010-06-21 09:21:32 UTC (rev 137) @@ -1,16 +1,9 @@ package org.nuiton.wikitty.search; -// Start of user code for import - import java.io.Serializable; import java.util.List; -// End of user code for import - /** - *  - * - * * Contains operator is used to build restriction containing "(element like * *value1 or element like value1*) and (element like *value2 or element like * value2*)" where element could be a String, a multimedia, a text or an xhtml @@ -23,9 +16,6 @@ * <li>RestrictionHelper.contains( myElement , * a_list_containing_at_least_one_string )</li> * </ul> - * - * - *  */ public class In extends Restriction implements Serializable { Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Keyword.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Keyword.java 2010-06-21 08:25:48 UTC (rev 136) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Keyword.java 2010-06-21 09:21:32 UTC (rev 137) @@ -17,7 +17,8 @@ package org.nuiton.wikitty.search; /** - * Search keyword in all wikitty + * Search keyword in all wikitty. + * * @author ruchaud */ public class Keyword extends Restriction { Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Less.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Less.java 2010-06-21 08:25:48 UTC (rev 136) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Less.java 2010-06-21 09:21:32 UTC (rev 137) @@ -1,23 +1,13 @@ package org.nuiton.wikitty.search; -// Start of user code for import - import java.io.Serializable; -// End of user code for import - /** - *  - * - * * Less operator is used to build restriction containing "element < value" * where element could be a Integer, a Float or a Date. * * For example, use: RestrictionHelper.less( myElement , * RestrictionHelper.DATE_FORMAT.format(new Date()) ) - * - * - *  */ public class Less extends BinaryOperator implements Serializable { @@ -34,8 +24,7 @@ /** * Equality test based attributes values * - * @param value - * Value to compare + * @param other Value to compare */ public boolean equals(Object other) { if (this == other) { Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/LessOrEqual.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/LessOrEqual.java 2010-06-21 08:25:48 UTC (rev 136) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/LessOrEqual.java 2010-06-21 09:21:32 UTC (rev 137) @@ -1,23 +1,13 @@ package org.nuiton.wikitty.search; -// Start of user code for import - import java.io.Serializable; -// End of user code for import - /** - *  - * - * * LessOrEqual operator is used to build restriction containing "element <= * value" where element could be a Integer, a Float or a Date. * * For example, use: RestrictionHelper.lessEq( myElement , * RestrictionHelper.DATE_FORMAT.format(new Date()) ) - * - * - *  */ public class LessOrEqual extends BinaryOperator implements Serializable { @@ -34,8 +24,7 @@ /** * Equality test based attributes values * - * @param value - * Value to compare + * @param other Value to compare */ public boolean equals(Object other) { if (this == other) { Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Not.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Not.java 2010-06-21 08:25:48 UTC (rev 136) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Not.java 2010-06-21 09:21:32 UTC (rev 137) @@ -3,17 +3,11 @@ import java.io.Serializable; /** - *  - * - * * Not operator is used to build negative restriction for request on content. * * * For example, use: RestrictionHelper.not( RestrictionHelper.eq( myElement , * "myValue" ) ) - * - * - *  */ public class Not extends Restriction implements Serializable { @@ -59,8 +53,7 @@ /** * Equality test based attributes values * - * @param value - * Value to compare + * @param other Value to compare */ public boolean equals(Object other) { if (this == other) { Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/NotEquals.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/NotEquals.java 2010-06-21 08:25:48 UTC (rev 136) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/NotEquals.java 2010-06-21 09:21:32 UTC (rev 137) @@ -1,23 +1,13 @@ package org.nuiton.wikitty.search; -// Start of user code for import - import java.io.Serializable; -// End of user code for import - /** - *  - * - * * NotEquals operator is used to build restriction containing "element != value" * where element could be an Id, a String, a multimedia, a closed list, an * Integer, a Float or a Date. * * For example, use: RestrictionHelper.neq( myElement , "REF1234567890" ) - * - * - *  */ public class NotEquals extends BinaryOperator implements Serializable { @@ -34,8 +24,7 @@ /** * Equality test based attributes values * - * @param value - * Value to compare + * @param other Value to compare */ public boolean equals(Object other) { if (this == other) { Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Or.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Or.java 2010-06-21 08:25:48 UTC (rev 136) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Or.java 2010-06-21 09:21:32 UTC (rev 137) @@ -1,16 +1,9 @@ package org.nuiton.wikitty.search; -// Start of user code for import - import java.io.Serializable; import java.util.List; -// End of user code for import - /** - *  - * - * * Or operator is used to build disjunctive restriction for request on content. * It take at least 2 args. * @@ -21,9 +14,6 @@ * <li>RestrictionHelper.or( * my_JavaUtilList_Of_Restriction_Witch_Size_Is_Upper_Than2 )</li> * </ul> - * - * - *  */ public class Or extends Restriction implements Serializable { @@ -69,8 +59,7 @@ /** * Equality test based attributes values * - * @param value - * Value to compare + * @param other Value to compare */ public boolean equals(Object other) { if (this == other) { Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Restriction.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Restriction.java 2010-06-21 08:25:48 UTC (rev 136) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Restriction.java 2010-06-21 09:21:32 UTC (rev 137) @@ -3,14 +3,8 @@ import java.io.Serializable; /** - *  - * - * * This element is a symbolic interface implemented by all operators used to * request contents (And, Or, Not, Equals, NotEquals, EndsWith, ...). - * - * - *  */ public class Restriction implements Serializable { @@ -32,6 +26,7 @@ * @param name */ public Restriction(RestrictionName name) { + this(); this.name = name; } @@ -56,8 +51,7 @@ /** * Equality test based attributes values * - * @param value - * Value to compare + * @param other Value to compare */ public boolean equals(Object other) { if (this == other) { Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/RestrictionName.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/RestrictionName.java 2010-06-21 08:25:48 UTC (rev 136) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/RestrictionName.java 2010-06-21 09:21:32 UTC (rev 137) @@ -1,6 +1,5 @@ package org.nuiton.wikitty.search; - /** * * This enum contains all kind of restriction used to request content. It's used Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/SearchOperand.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/SearchOperand.java 2010-06-21 08:25:48 UTC (rev 136) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/SearchOperand.java 2010-06-21 09:21:32 UTC (rev 137) @@ -1,17 +1,10 @@ package org.nuiton.wikitty.search; -// Start of user code for import - -// End of user code for import - /** - *  - * * Represents the possible operands for client search. The supported type of * each AttributeSearchDto depends of its type. - * - *  */ public enum SearchOperand { - EQUALS, NOT_EQUALS, LESS, LESS_OR_EQUALS, GREATER, GREATER_OR_EQUALS, BEGINS_WITH, ENDS_WITH, CONTAINS, NOT_CONTAINS, BETWEEN + EQUALS, NOT_EQUALS, LESS, LESS_OR_EQUALS, GREATER, GREATER_OR_EQUALS, + BEGINS_WITH, ENDS_WITH, CONTAINS, NOT_CONTAINS, BETWEEN } \ No newline at end of file Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/StartsWith.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/StartsWith.java 2010-06-21 08:25:48 UTC (rev 136) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/StartsWith.java 2010-06-21 09:21:32 UTC (rev 137) @@ -1,23 +1,13 @@ package org.nuiton.wikitty.search; -// Start of user code for import - import java.io.Serializable; -// End of user code for import - /** - *  - * - * * StartsWith operator is used to build restriction containing "element like * value*" where element could be a String, a multimedia, a text or an xhtml * * * For example, use: RestrictionHelper.start( myElement , "value" ) - * - * - *  */ public class StartsWith extends BinaryOperator implements Serializable { @@ -34,8 +24,7 @@ /** * Equality test based attributes values * - * @param value - * Value to compare + * @param other Value to compare */ public boolean equals(Object other) { if (this == other) { Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/SubSearch.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/SubSearch.java 2010-06-21 08:25:48 UTC (rev 136) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/SubSearch.java 2010-06-21 09:21:32 UTC (rev 137) @@ -2,8 +2,8 @@ public class SubSearch extends Search { - String foreignName; - Search parent; + protected String foreignName; + protected Search parent; public SubSearch(String foreignFieldName, Search search) { this.foreignName = foreignFieldName;

1 0