Author: echatellier Date: 2012-01-18 12:34:45 +0100 (Wed, 18 Jan 2012) New Revision: 161 Url: http://chorem.org/repositories/revision/vradi/161 Log: Migrate to wikitty 3.4 Modified: trunk/pom.xml trunk/vradi-entities/src/main/java/org/chorem/vradi/entities/FieldTypeEnum.java trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/offer/models/OfferListTableModel.java trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/search/SearchHandler.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-17 16:15:19 UTC (rev 160) +++ trunk/pom.xml 2012-01-18 11:34:45 UTC (rev 161) @@ -121,7 +121,7 @@ <nuitonUtilsVersion>2.4.4</nuitonUtilsVersion> <nuitonWebVersion>1.3</nuitonWebVersion> <nuitonI18nVersion>2.4</nuitonI18nVersion> - <wikittyVersion>3.3.1-SNAPSHOT</wikittyVersion> + <wikittyVersion>3.4-SNAPSHOT</wikittyVersion> <slf4jVersion>1.6.1</slf4jVersion> <h2Version>1.2.134</h2Version> <jrstVersion>1.5</jrstVersion> @@ -410,7 +410,7 @@ <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-core</artifactId> - <version>3.3.0</version> + <version>3.5.0</version> </dependency> <!-- Vradi Web --> Modified: trunk/vradi-entities/src/main/java/org/chorem/vradi/entities/FieldTypeEnum.java =================================================================== --- trunk/vradi-entities/src/main/java/org/chorem/vradi/entities/FieldTypeEnum.java 2012-01-17 16:15:19 UTC (rev 160) +++ trunk/vradi-entities/src/main/java/org/chorem/vradi/entities/FieldTypeEnum.java 2012-01-18 11:34:45 UTC (rev 161) @@ -23,20 +23,21 @@ */ package org.chorem.vradi.entities; +import static org.nuiton.i18n.I18n.n_; + import org.nuiton.wikitty.entities.FieldType; +import org.nuiton.wikitty.entities.WikittyTypes; -import static org.nuiton.i18n.I18n.n_; - /** @author letellier */ public enum FieldTypeEnum { - STRING(FieldType.TYPE.STRING, n_("vradi.fieldTypeEnum.string"), 0, 1), - TEXT(FieldType.TYPE.STRING, n_("vradi.fieldTypeEnum.text"), 0, 1), - DATE(FieldType.TYPE.DATE, n_("vradi.fieldTypeEnum.date"), 1, 1), - DATE_TIME(FieldType.TYPE.DATE, n_("vradi.fieldTypeEnum.dateTime"), 1, 1), - EMAIL(FieldType.TYPE.STRING, n_("vradi.fieldTypeEnum.email"), 0, 1), - URL(FieldType.TYPE.STRING, n_("vradi.fieldTypeEnum.url"), 0, 1), - NUMERIC(FieldType.TYPE.NUMERIC, n_("vradi.fieldTypeEnum.numeric"), 1, 1), - CURRENCY(FieldType.TYPE.STRING, n_("vradi.fieldTypeEnum.currency"), 0, 1); + STRING(WikittyTypes.STRING, n_("vradi.fieldTypeEnum.string"), 0, 1), + TEXT(WikittyTypes.STRING, n_("vradi.fieldTypeEnum.text"), 0, 1), + DATE(WikittyTypes.DATE, n_("vradi.fieldTypeEnum.date"), 1, 1), + DATE_TIME(WikittyTypes.DATE, n_("vradi.fieldTypeEnum.dateTime"), 1, 1), + EMAIL(WikittyTypes.STRING, n_("vradi.fieldTypeEnum.email"), 0, 1), + URL(WikittyTypes.STRING, n_("vradi.fieldTypeEnum.url"), 0, 1), + NUMERIC(WikittyTypes.NUMERIC, n_("vradi.fieldTypeEnum.numeric"), 1, 1), + CURRENCY(WikittyTypes.STRING, n_("vradi.fieldTypeEnum.currency"), 0, 1); public static final String CURRENCY_TAG_VALUE = "currency"; @@ -46,7 +47,7 @@ protected FieldType type; - FieldTypeEnum(FieldType.TYPE type, String tagValue, int min, int max) { + FieldTypeEnum(WikittyTypes type, String tagValue, int min, int max) { this.tagValue = tagValue; this.type = new FieldType(type, min, max); this.type.addTagValue(TAG_VALUE, tagValue); @@ -79,13 +80,13 @@ FieldTypeEnum e; if (FieldTypeEnum.DATE_TIME.isType(type)) { e = FieldTypeEnum.DATE_TIME; - } else if (FieldTypeEnum.DATE.isType(type) || FieldType.TYPE.DATE.equals(type.getType())) { + } else if (FieldTypeEnum.DATE.isType(type) || WikittyTypes.DATE.equals(type.getType())) { e = FieldTypeEnum.DATE; } else if (FieldTypeEnum.EMAIL.isType(type)) { e = FieldTypeEnum.EMAIL; } else if (FieldTypeEnum.CURRENCY.isType(type)) { e = FieldTypeEnum.CURRENCY; - } else if (FieldTypeEnum.NUMERIC.isType(type) || FieldType.TYPE.NUMERIC.equals(type.getType())) { + } else if (FieldTypeEnum.NUMERIC.isType(type) || WikittyTypes.NUMERIC.equals(type.getType())) { e = FieldTypeEnum.NUMERIC; } else if (FieldTypeEnum.TEXT.isType(type)) { e = FieldTypeEnum.TEXT; Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/offer/models/OfferListTableModel.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/offer/models/OfferListTableModel.java 2012-01-17 16:15:19 UTC (rev 160) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/offer/models/OfferListTableModel.java 2012-01-18 11:34:45 UTC (rev 161) @@ -44,6 +44,7 @@ import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.entities.FieldType; import org.nuiton.wikitty.entities.WikittyExtension; +import org.nuiton.wikitty.entities.WikittyTypes; import javax.swing.JTable; import javax.swing.table.AbstractTableModel; @@ -296,13 +297,13 @@ FieldType fieldType = extension.getFieldType(fieldName); Class<?> columnClass; - if (fieldType.getType() == FieldType.TYPE.BOOLEAN) { + if (fieldType.getType() == WikittyTypes.BOOLEAN) { columnClass = Boolean.class; - } else if (fieldType.getType() == FieldType.TYPE.DATE) { + } else if (fieldType.getType() == WikittyTypes.DATE) { columnClass = Date.class; - } else if (fieldType.getType() == FieldType.TYPE.NUMERIC) { + } else if (fieldType.getType() == WikittyTypes.NUMERIC) { columnClass = Double.class; } else if (fieldName.equals(Infogene.FIELD_INFOGENE_STATUS)) { Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/search/SearchHandler.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/search/SearchHandler.java 2012-01-17 16:15:19 UTC (rev 160) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/search/SearchHandler.java 2012-01-18 11:34:45 UTC (rev 161) @@ -55,6 +55,7 @@ import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.entities.FieldType; import org.nuiton.wikitty.entities.WikittyExtension; +import org.nuiton.wikitty.entities.WikittyTypes; import javax.swing.DefaultComboBoxModel; import javax.swing.DefaultListCellRenderer; @@ -389,7 +390,7 @@ if (formType != null) { for (String name : formType.getFieldNames()) { FieldType type = formType.getFieldType(name); - if (type.getType() == FieldType.TYPE.DATE) { + if (type.getType() == WikittyTypes.DATE) { result.add(formType.getName() + "." + name); } }