[Simexplorer-si-commits] r1234 - in trunk/simexplorer-is: simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model simexplorer-is-swing/src/j

Author: glandais Date: 2008-02-25 16:52:59 +0000 (Mon, 25 Feb 2008) New Revision: 1234 Added: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityTypeEnum.java Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityHelper.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/MetaData.java trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageService.java trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/Database.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/StorageServiceHelper.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DataEntityModel.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTableModel.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/DetailTabUpdater.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/EntityTreeNodeHelper.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/grid/ElementDataSource.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPageDetail.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/AppModule.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/ModelFactory.java Log: Entity type generalization Retrieve elements of any type through service Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityHelper.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityHelper.java 2008-02-25 15:28:24 UTC (rev 1233) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityHelper.java 2008-02-25 16:52:59 UTC (rev 1234) @@ -17,8 +17,6 @@ * ##% */ package fr.cemagref.simexplorer.is.entities; -import static org.codelutin.i18n.I18n._; -import static org.codelutin.i18n.I18n.n_; import java.util.ArrayList; import java.util.Arrays; @@ -40,84 +38,7 @@ */ public class EntityHelper { /** - * Une enum pour definir les differents types d'entities rencontres dans le projet. - * <p/> - * On ajoute ici une clef i18n pour pouvoir traduire plus tard ces types. - * <p/> - * Note: on n'utilise pas directement les traductions pour permettre le mécanisme - * de changement de langue (voir module swing et web). - * - * @author chemit - */ - public static enum Type { - Attachment(false,n_("simexplorer.common.attachment"), n_("simexplorer.common.attachments")), - Code(false,n_("simexplorer.common.code"), n_("simexplorer.common.codes")), - Component(true,n_("simexplorer.common.component"), n_("simexplorer.common.components")), - Constant(false,n_("simexplorer.common.constant"), n_("simexplorer.common.constants")), - ConstantValue(false,n_("simexplorer.common.constantvalue"), n_("simexplorer.common.constantvalues")), - ExplorationApplication(true,n_("simexplorer.common.explorationapplication"), n_("simexplorer.common.explorationapplications")), - ExplorationData(true,n_("simexplorer.common.explorationdata"), n_("simexplorer.common.explorationdatas")), - Library(true,n_("simexplorer.common.library"), n_("simexplorer.common.libraries")), - Repository(false,n_("simexplorer.common.repository"), n_("simexplorer.common.repositories")), - Result(false,n_("simexplorer.common.result"), n_("simexplorer.common.results")), - Structure(false,n_("simexplorer.common.structure"), n_("simexplorer.common.structures")); - - private String i18nKey; - private String i18nKeys; - private boolean le; - - public static String getLibelle(Object entity) { - if (entity == null) { - return ""; - } - return getLibelle(entity instanceof Class?(Class)entity:entity.getClass()); - } - - public static String getLibelle(Class entity) { - if (entity == null) { - return ""; - } - return getLibelle(entity.getSimpleName()); - } - - public String getLibelle() { - return _(i18nKey); - } - - public String getLibelles() { - return _(i18nKeys); - } - - public boolean isLe() { - return le; - } - - protected static String getLibelle(String type) { - if (type != null) { - try { - Type type1 = Type.valueOf(type); - return type1.getLibelle(); - } catch (IllegalArgumentException e) { - //TODO log it - System.err.println(e.getMessage()); - } - } - return ""; - } - - public static Type getType(Class<?> klass) { - return Type.valueOf(klass.getSimpleName()); - } - - private Type(boolean isLE,String i18nKey, String i18nKeys) { - this.le = isLE; - this.i18nKey = i18nKey; - this.i18nKeys = i18nKeys; - } - } - - /** - * Une énumération pour définir les actions possibles sur les entités du + * Une énumération pour définir les types des entités du * projet. * * @author chemit Added: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityTypeEnum.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityTypeEnum.java (rev 0) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityTypeEnum.java 2008-02-25 16:52:59 UTC (rev 1234) @@ -0,0 +1,170 @@ +package fr.cemagref.simexplorer.is.entities; + +import static org.codelutin.i18n.I18n._; +import static org.codelutin.i18n.I18n.n_; +import fr.cemagref.simexplorer.is.entities.attachment.Attachment; +import fr.cemagref.simexplorer.is.entities.data.Code; +import fr.cemagref.simexplorer.is.entities.data.Component; +import fr.cemagref.simexplorer.is.entities.data.Constant; +import fr.cemagref.simexplorer.is.entities.data.ConstantValue; +import fr.cemagref.simexplorer.is.entities.data.ExplorationApplication; +import fr.cemagref.simexplorer.is.entities.data.ExplorationData; +import fr.cemagref.simexplorer.is.entities.data.Library; +import fr.cemagref.simexplorer.is.entities.data.Repository; +import fr.cemagref.simexplorer.is.entities.data.Result; +import fr.cemagref.simexplorer.is.entities.data.Structure; + +/** + * Une enum pour definir les differents types d'entities rencontres dans le projet. <p/> On ajoute ici une clef i18n + * pour pouvoir traduire plus tard ces types. <p/> Note: on n'utilise pas directement les traductions pour permettre le + * mécanisme de changement de langue (voir module swing et web). + * + * @author chemit + */ +public enum EntityTypeEnum { + + /** The Attachment. */ + Attachment(false, n_("simexplorer.common.attachment"), n_("simexplorer.common.attachments"), Attachment.class), + + /** The Code. */ + Code(false, n_("simexplorer.common.code"), n_("simexplorer.common.codes"), Code.class), + + /** The Component. */ + Component(true, n_("simexplorer.common.component"), n_("simexplorer.common.components"), Component.class), + + /** The Constant. */ + Constant(false, n_("simexplorer.common.constant"), n_("simexplorer.common.constants"), Constant.class), + + /** The Constant value. */ + ConstantValue(false, n_("simexplorer.common.constantvalue"), n_("simexplorer.common.constantvalues"), ConstantValue.class), + + /** The Exploration application. */ + ExplorationApplication(true, n_("simexplorer.common.explorationapplication"), n_("simexplorer.common.explorationapplications"), ExplorationApplication.class), + + /** The Exploration data. */ + ExplorationData(true, n_("simexplorer.common.explorationdata"), n_("simexplorer.common.explorationdatas"), ExplorationData.class), + + /** The Library. */ + Library(true, n_("simexplorer.common.library"), n_("simexplorer.common.libraries"), Library.class), + + /** The Repository. */ + Repository(false, n_("simexplorer.common.repository"), n_("simexplorer.common.repositories"), Repository.class), + + /** The Result. */ + Result(false, n_("simexplorer.common.result"), n_("simexplorer.common.results"), Result.class), + + /** The Structure. */ + Structure(false, n_("simexplorer.common.structure"), n_("simexplorer.common.structures"), Structure.class); + + /** The le. */ + private boolean le; + + /** The i18n key. */ + private String i18nKey; + + /** The i18n keys. */ + private String i18nKeys; + + /** The implementation. */ + private Class<?> implementation; + + /** + * Gets the entity type. + * + * @param klass the klass + * + * @return the entity type + */ + public static EntityTypeEnum getEntityType(Class<?> klass) { + EntityTypeEnum[] values = values(); + for (int i = 0; i < values.length; i++) { + if (klass.equals(values[i].getImplementation())) { + return values[i]; + } + } + return null; + } + + /** + * Gets the libelle. + * + * @param entity the entity + * + * @return the libelle + */ + public static String getLibelle(Object entity) { + if (entity == null) { + return ""; + } + return getLibelle(entity instanceof Class ? (Class<?>) entity : entity.getClass()); + } + + /** + * Gets the libelle. + * + * @param entity the entity + * + * @return the libelle + */ + private static String getLibelle(Class<?> entity) { + if (entity == null) { + return ""; + } + EntityTypeEnum entityType = getEntityType(entity); + if (entityType == null) { + return ""; + } + return entityType.getLibelle(); + } + + /** + * Gets the libelle. + * + * @return the libelle + */ + public String getLibelle() { + return _(i18nKey); + } + + /** + * Gets the libelles. + * + * @return the libelles + */ + public String getLibelles() { + return _(i18nKeys); + } + + /** + * Checks if is le. + * + * @return true, if is le + */ + public boolean isLe() { + return le; + } + + /** + * Gets the implementation. + * + * @return the implementation + */ + public Class<?> getImplementation() { + return implementation; + } + + /** + * Instantiates a new entity type enum. + * + * @param isLE the is le + * @param i18nKey the i18n key + * @param i18nKeys the i18n keys + * @param implementation the implementation + */ + private EntityTypeEnum(boolean isLE, String i18nKey, String i18nKeys, Class<?> implementation) { + this.le = isLE; + this.i18nKey = i18nKey; + this.i18nKeys = i18nKeys; + this.implementation = implementation; + } +} \ No newline at end of file Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/MetaData.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/MetaData.java 2008-02-25 15:28:24 UTC (rev 1233) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/MetaData.java 2008-02-25 16:52:59 UTC (rev 1234) @@ -20,7 +20,7 @@ import java.util.Date; import fr.cemagref.simexplorer.is.entities.BaseEntity; -import fr.cemagref.simexplorer.is.entities.EntityHelper; +import fr.cemagref.simexplorer.is.entities.EntityTypeEnum; import fr.cemagref.simexplorer.is.entities.EntityVisitor; /** @@ -294,8 +294,8 @@ * * @return the element class label */ - public String getElementClassLabel() { - return EntityHelper.Type.getType(getElementClass()).getLibelle(); + public EntityTypeEnum getEntityType() { + return EntityTypeEnum.getEntityType(getElementClass()); } } Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java 2008-02-25 15:28:24 UTC (rev 1233) +++ trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java 2008-02-25 16:52:59 UTC (rev 1234) @@ -111,24 +111,24 @@ public int findFullTextCount(String token, String query,String queryColumn, boolean onlyLatest) throws SimExplorerException { // TODO Changer - return findApplicationsCount(token, onlyLatest); + return findElementsCount(token, "", onlyLatest); } public MetaData[] findFullText(String token, String query, String queryColumn, boolean onlyLatest, int indexStart, int count, String column, boolean ascending) throws SimExplorerException { // TODO Changer - return findApplications(token, onlyLatest, indexStart, count, column, ascending); + return findElements(token, "", onlyLatest, indexStart, count, column, ascending); } - public int findApplicationsCount(String token, boolean onlyLatest) throws SimExplorerException { + public int findElementsCount(String token, String type, boolean onlyLatest) throws SimExplorerException { return base.metadatas.size(); } /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.service.StorageService#findApplications(java.lang.String, boolean, int, int, int) */ - public MetaData[] findApplications(String token, boolean onlyLatest, int start, int count, String column, + public MetaData[] findElements(String token, String type, boolean onlyLatest, int start, int count, String column, boolean ascending) throws SimExplorerException { int last = start + count; Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageService.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageService.java 2008-02-25 15:28:24 UTC (rev 1233) +++ trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageService.java 2008-02-25 16:52:59 UTC (rev 1234) @@ -24,6 +24,7 @@ import com.healthmarketscience.rmiio.SerializableInputStream; +import fr.cemagref.simexplorer.is.entities.EntityTypeEnum; import fr.cemagref.simexplorer.is.entities.attachment.Attachment; import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; @@ -241,21 +242,23 @@ int count, String sortColumn, boolean ascending) throws SimExplorerException; /** - * Retrieve number of applications. + * Retrieve number of elements. * * @param token the token + * @param entityTypeEnum the entityTypeEnum as in {@link fr.cemagref.simexplorer.is.entities.EntityTypeEnum}, "" if all * @param onlyLatest the only latest * * @return the int * - * @throws SimExplorerException the sim explorer service exception + * @throws SimExplorerException the sim explorer exception */ - int findApplicationsCount(String token, boolean onlyLatest) throws SimExplorerException; + int findElementsCount(String token, String type, boolean onlyLatest) throws SimExplorerException; /** - * Get a list of applications. + * Get a list of elements. * * @param token the token + * @param entityTypeEnum the entityTypeEnum as in {@link fr.cemagref.simexplorer.is.entities.EntityTypeEnum}, "" if all * @param onlyLatest the only latest * @param start the start * @param count the count @@ -264,10 +267,10 @@ * * @return the meta data[] * - * @throws SimExplorerException the sim explorer service exception + * @throws SimExplorerException the sim explorer exception */ - MetaData[] findApplications(String token, boolean onlyLatest, int start, int count, String column, boolean ascending) - throws SimExplorerException; + MetaData[] findElements(String token, String type, boolean onlyLatest, int start, int count, String column, + boolean ascending) throws SimExplorerException; /** * Fully load an element. Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java 2008-02-25 15:28:24 UTC (rev 1233) +++ trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java 2008-02-25 16:52:59 UTC (rev 1234) @@ -209,18 +209,17 @@ /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.service.StorageService#findApplicationsCount(java.lang.String, boolean) */ - public int findApplicationsCount(String token, boolean onlyLatest) throws SimExplorerException { - return getStorageEngine().findElementsByTypeCount(token, ExplorationApplication.class.getCanonicalName(), - onlyLatest); + public int findElementsCount(String token, String type, boolean onlyLatest) throws SimExplorerException { + return getStorageEngine().findElementsByTypeCount(token, type, onlyLatest); } /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.service.StorageService#findApplications(java.lang.String, boolean, int, int, int) */ - public MetaData[] findApplications(String token, boolean onlyLatest, int start, int count, String column, + public MetaData[] findElements(String token, String type, boolean onlyLatest, int start, int count, String column, boolean ascending) throws SimExplorerException { - return getStorageEngine().findElementsByType(token, ExplorationApplication.class.getCanonicalName(), - onlyLatest, start, count, getSortColumn(column), getOrder(ascending)); + return getStorageEngine().findElementsByType(token, type, onlyLatest, start, count, getSortColumn(column), + getOrder(ascending)); } /* (non-Javadoc) Modified: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/Database.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/Database.java 2008-02-25 15:28:24 UTC (rev 1233) +++ trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/Database.java 2008-02-25 16:52:59 UTC (rev 1234) @@ -23,6 +23,7 @@ import java.util.List; import java.util.Map; +import fr.cemagref.simexplorer.is.entities.EntityTypeEnum; import fr.cemagref.simexplorer.is.entities.attachment.Attachment; import fr.cemagref.simexplorer.is.entities.data.Descriptor; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; @@ -202,13 +203,16 @@ * Prepare properties for query. * * @param onlyLatest Only wanted elements - * @param className the class name + * @param entityTypeName the entity type as in enum * * @return Properties for query */ - private Map<String, String> getPropertiesByType(String className, boolean onlyLatest) { + private Map<String, String> getPropertiesByType(String entityTypeName, boolean onlyLatest) { Map<String, String> properties = new HashMap<String, String>(); - properties.put(KEY_CLASSNAME, className); + + EntityTypeEnum entityType = EntityTypeEnum.valueOf(entityTypeName); + properties.put(KEY_CLASSNAME, entityType.getImplementation().getCanonicalName()); + if (onlyLatest) { properties.put(KEY_LATEST, "1"); } Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/StorageServiceHelper.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/StorageServiceHelper.java 2008-02-25 15:28:24 UTC (rev 1233) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/StorageServiceHelper.java 2008-02-25 16:52:59 UTC (rev 1234) @@ -19,6 +19,8 @@ package fr.cemagref.simexplorer.is.ui.swing; import com.healthmarketscience.rmiio.SerializableInputStream; + +import fr.cemagref.simexplorer.is.entities.EntityTypeEnum; import fr.cemagref.simexplorer.is.entities.attachment.Attachment; import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; @@ -82,7 +84,7 @@ int size; try { if (query == null || query.isEmpty()) { - size = service.findApplicationsCount(token, onlyLatest); + size = service.findElementsCount(token, EntityTypeEnum.ExplorationApplication.toString(), onlyLatest); } else { size = service.findFullTextCount(token, query, "", onlyLatest); } @@ -109,7 +111,7 @@ try { MetaData[] data; if (query == null || query.isEmpty()) { - data = service.findApplications(token, onlyLatest, (int) newFirstIndex, width, column.name(), ascending); + data = service.findElements(token, EntityTypeEnum.ExplorationApplication.toString(), onlyLatest, (int) newFirstIndex, width, column.name(), ascending); } else { data = service.findFullText(token, query, "", onlyLatest, (int) newFirstIndex, width, column.name(), ascending); } Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DataEntityModel.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DataEntityModel.java 2008-02-25 15:28:24 UTC (rev 1233) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DataEntityModel.java 2008-02-25 16:52:59 UTC (rev 1234) @@ -17,7 +17,7 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.model; -import fr.cemagref.simexplorer.is.entities.EntityHelper; +import fr.cemagref.simexplorer.is.entities.EntityTypeEnum; import fr.cemagref.simexplorer.is.entities.data.DataEntity; import fr.cemagref.simexplorer.is.entities.data.ExplorationData; import fr.cemagref.simexplorer.is.entities.data.LoggableElement; @@ -44,7 +44,7 @@ protected Version version; /** le type de l'entity encapsulée */ - protected transient EntityHelper.Type type; + protected transient EntityTypeEnum type; /** l'objet selectionne */ protected transient DataEntity data; @@ -62,7 +62,7 @@ } public boolean isResult() { - return type != null && type == EntityHelper.Type.Result; + return type != null && type == EntityTypeEnum.Result; } public String getUuid() { @@ -122,8 +122,8 @@ return null; } - // compute type of data - type = EntityHelper.Type.getType(le.getMetaData().getElementClass()); + // compute entityTypeEnum of data + type = le.getMetaData().getEntityType(); // compute real data selected if (type.isLe()) { @@ -146,7 +146,7 @@ EntityTreeNode parent = (EntityTreeNode) node.getParent(); LoggableElement selectedElement = parent.getLoggableElement(); synch(node.isRemote(), selectedElement); - setType(EntityHelper.Type.Result); + setType(EntityTypeEnum.Result); setData((DataEntity) node.get()); } else { synch(node.isRemote(), node.getLoggableElement()); @@ -167,8 +167,8 @@ synch(remote, null, null); } else { synch(remote, data.getUuid(), data.getVersion()); - EntityHelper.Type type = EntityHelper.Type.getType(data.getElementClass()); - setType(type); + EntityTypeEnum entityTypeEnum = data.getEntityType(); + setType(entityTypeEnum); } setMeta(data); } @@ -192,7 +192,7 @@ this.meta = meta; } - public void setType(EntityHelper.Type type) { + public void setType(EntityTypeEnum type) { this.type = type; } @@ -226,7 +226,7 @@ public String toString() { String s = super.toString(); return s.substring(s.lastIndexOf('.') + 1) + "<remote:" + remote + ", uuid:" + uuid + - ", version:" + version + ", result:" + isResult() + ", type:" + + ", version:" + version + ", result:" + isResult() + ", entityTypeEnum:" + type + ">"; } Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTableModel.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTableModel.java 2008-02-25 15:28:24 UTC (rev 1233) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTableModel.java 2008-02-25 16:52:59 UTC (rev 1234) @@ -18,7 +18,7 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.model; -import fr.cemagref.simexplorer.is.entities.EntityHelper; +import fr.cemagref.simexplorer.is.entities.EntityTypeEnum; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.storage.SortColumn; import static org.codelutin.i18n.I18n._; @@ -94,7 +94,7 @@ result = readMethod.invoke(current); if (columnIndex == 1) { // use I18n - result = EntityHelper.Type.getLibelle(result); + result = EntityTypeEnum.getLibelle(result); } } catch (IllegalAccessException e) { throw new RuntimeException(e); Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/DetailTabUpdater.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/DetailTabUpdater.java 2008-02-25 15:28:24 UTC (rev 1233) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/DetailTabUpdater.java 2008-02-25 16:52:59 UTC (rev 1234) @@ -18,6 +18,7 @@ package fr.cemagref.simexplorer.is.ui.swing.ui; import fr.cemagref.simexplorer.is.entities.EntityHelper; +import fr.cemagref.simexplorer.is.entities.EntityTypeEnum; import fr.cemagref.simexplorer.is.entities.attachment.Attachment; import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; @@ -308,7 +309,7 @@ ui.getDetailHeader().setText(detail.getName()); ui.getDetailDescriptorsHeader().setText(_("simexplorer.node.descriptors", element.getDescriptors().size())); - ui.getDetailType().setText(EntityHelper.Type.getLibelle(detail.getElementClass())); + ui.getDetailType().setText(EntityTypeEnum.getLibelle(detail.getElementClass())); String s = detail.getDescription(); String tooltip = s; @@ -335,7 +336,7 @@ ui.getScrollTable().setPreferredSize(new Dimension((int) dimOneRow.getWidth(), 2 + ((rows[0] + 1) * (4 + table.getFont().getSize())))); //ui.getScrollTable().setPreferredSize(new Dimension((int) table.getSize().getWidth(), 2 + (nbDescriptorRows * (4 + table.getFont().getSize())))); if (nbAttachmentRows > 0) { - ui.getDetailAttachmentsHeader().setText(EntityHelper.Type.Attachment.getLibelles() + " (" + nbAttachmentRows + ")"); + ui.getDetailAttachmentsHeader().setText(EntityTypeEnum.Attachment.getLibelles() + " (" + nbAttachmentRows + ")"); Rectangle rect = listAttachments.getUI().getCellBounds(listAttachments, 0, 0); ui.getScrollAttachments().setPreferredSize(new Dimension((int) rect.getWidth() - 4, (int) (3 + rows[1] * rect.getHeight()))); } Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/EntityTreeNodeHelper.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/EntityTreeNodeHelper.java 2008-02-25 15:28:24 UTC (rev 1233) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/EntityTreeNodeHelper.java 2008-02-25 16:52:59 UTC (rev 1234) @@ -18,13 +18,13 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.ui; -import static fr.cemagref.simexplorer.is.entities.EntityHelper.Type.Code; -import static fr.cemagref.simexplorer.is.entities.EntityHelper.Type.Component; -import static fr.cemagref.simexplorer.is.entities.EntityHelper.Type.Constant; -import static fr.cemagref.simexplorer.is.entities.EntityHelper.Type.ConstantValue; -import static fr.cemagref.simexplorer.is.entities.EntityHelper.Type.ExplorationData; -import static fr.cemagref.simexplorer.is.entities.EntityHelper.Type.Library; -import static fr.cemagref.simexplorer.is.entities.EntityHelper.Type.Structure; +import static fr.cemagref.simexplorer.is.entities.EntityTypeEnum.Code; +import static fr.cemagref.simexplorer.is.entities.EntityTypeEnum.Component; +import static fr.cemagref.simexplorer.is.entities.EntityTypeEnum.Constant; +import static fr.cemagref.simexplorer.is.entities.EntityTypeEnum.ConstantValue; +import static fr.cemagref.simexplorer.is.entities.EntityTypeEnum.ExplorationData; +import static fr.cemagref.simexplorer.is.entities.EntityTypeEnum.Library; +import static fr.cemagref.simexplorer.is.entities.EntityTypeEnum.Structure; import fr.cemagref.simexplorer.is.entities.EntityVisitable; import fr.cemagref.simexplorer.is.entities.SimpleEntityVisitor; import fr.cemagref.simexplorer.is.entities.data.Code; Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/grid/ElementDataSource.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/grid/ElementDataSource.java 2008-02-25 15:28:24 UTC (rev 1233) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/grid/ElementDataSource.java 2008-02-25 16:52:59 UTC (rev 1234) @@ -20,6 +20,7 @@ import org.apache.tapestry.beaneditor.PropertyModel; import org.apache.tapestry.grid.GridDataSource; +import fr.cemagref.simexplorer.is.entities.EntityTypeEnum; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; import fr.cemagref.simexplorer.is.security.entities.User; @@ -45,6 +46,9 @@ /** The Search query. */ SearchQuery, + /** The Search query. */ + RightsListing, + /** The Elements owned by. */ ElementsOwnedBy; } @@ -93,7 +97,8 @@ try { switch (elementListType) { case ApplicationList: - result = RemoteStorageService.getStorageService().findApplicationsCount(token, true); + result = RemoteStorageService.getStorageService().findElementsCount(token, + EntityTypeEnum.ExplorationApplication.toString(), true); break; case SearchQuery: result = RemoteStorageService.getStorageService().findFullTextCount(token, searchQuery, @@ -149,8 +154,9 @@ } switch (elementListType) { case ApplicationList: - entities = RemoteStorageService.getStorageService().findApplications(token, true, startIndex, - 1 + endIndex - startIndex, sortColumn, ascending); + entities = RemoteStorageService.getStorageService().findElements(token, + EntityTypeEnum.ExplorationApplication.toString(), true, startIndex, 1 + endIndex - startIndex, + sortColumn, ascending); break; case SearchQuery: entities = RemoteStorageService.getStorageService().findFullText(token, searchQuery, Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPageDetail.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPageDetail.java 2008-02-25 15:28:24 UTC (rev 1233) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPageDetail.java 2008-02-25 16:52:59 UTC (rev 1234) @@ -29,7 +29,7 @@ import org.apache.tapestry.ioc.annotations.Inject; import org.codelutin.tapestry.beans.TreeNode; -import fr.cemagref.simexplorer.is.entities.EntityHelper; +import fr.cemagref.simexplorer.is.entities.EntityTypeEnum; import fr.cemagref.simexplorer.is.entities.attachment.Attachment; import fr.cemagref.simexplorer.is.entities.data.Descriptor; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; @@ -283,8 +283,7 @@ nodes.add(simpleNode(getMessages().get("simexplorer.ui.web.metadata.uuid"), m.getUuid())); nodes.add(simpleNode(getMessages().get("simexplorer.ui.web.metadata.version"), m.getVersion().toString())); nodes.add(simpleNode(getMessages().get("simexplorer.ui.web.metadata.name"), m.getName())); - nodes.add(simpleNode(getMessages().get("simexplorer.ui.web.metadata.type"), EntityHelper.Type.getType( - m.getElementClass()).getLibelle())); + nodes.add(simpleNode(getMessages().get("simexplorer.ui.web.metadata.type"), m.getEntityType().getLibelle())); nodes.add(simpleNode(getMessages().get("simexplorer.ui.web.metadata.description"), m.getDescription())); nodes.add(simpleNode(getMessages().get("simexplorer.ui.web.metadata.creationDate"), DATE_FORMAT.format(m Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/AppModule.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/AppModule.java 2008-02-25 15:28:24 UTC (rev 1233) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/AppModule.java 2008-02-25 16:52:59 UTC (rev 1234) @@ -32,7 +32,7 @@ import org.apache.tapestry.services.Response; import org.slf4j.Logger; -import fr.cemagref.simexplorer.is.entities.EntityHelper; +import fr.cemagref.simexplorer.is.entities.EntityTypeEnum; import fr.cemagref.simexplorer.is.entities.metadata.Version; /** @@ -74,7 +74,7 @@ */ public static void contributeDefaultDataTypeAnalyzer(MappedConfiguration<Class<?>, String> configuration) { configuration.add(Version.class, "text"); - configuration.add(Class.class, "text"); + configuration.add(EntityTypeEnum.class, "text"); } /** @@ -93,17 +93,17 @@ return Version.valueOf(input); } }; - Coercion<Class, String> coercionClassString = new Coercion<Class, String>() { - public String coerce(Class input) { + Coercion<EntityTypeEnum, String> coercionEntityTypeEnumString = new Coercion<EntityTypeEnum, String>() { + public String coerce(EntityTypeEnum input) { if (input == null) { return ""; } - return EntityHelper.Type.getType(input).getLibelle(); + return input.getLibelle(); } }; configuration.add(new CoercionTuple<Version, String>(Version.class, String.class, coercionVersionString)); configuration.add(new CoercionTuple<String, Version>(String.class, Version.class, coercionStringVersion)); - configuration.add(new CoercionTuple<Class, String>(Class.class, String.class, coercionClassString)); + configuration.add(new CoercionTuple<EntityTypeEnum, String>(EntityTypeEnum.class, String.class, coercionEntityTypeEnumString)); } /** Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/ModelFactory.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/ModelFactory.java 2008-02-25 15:28:24 UTC (rev 1233) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/ModelFactory.java 2008-02-25 16:52:59 UTC (rev 1234) @@ -58,7 +58,7 @@ wantedProperties.add("name"); wantedProperties.add("description"); wantedProperties.add("creationDate"); - wantedProperties.add("elementClassLabel"); + wantedProperties.add("entityType"); List<String> properties = model.getPropertyNames(); for (String property : properties) { if (!sortable) {