[Simexplorer-si-commits] r1314 - in trunk/simexplorer-is: simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/attachment simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata simexplorer-is-entities/src/resources/i18n simexplorer-is-web/src/java/fr/

Author: glandais Date: 2008-03-10 13:12:04 +0000 (Mon, 10 Mar 2008) New Revision: 1314 Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/Composite.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/Entity.java 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/EntityTypeEnum.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityVisitable.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityVisitor.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/Leaf.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/attachment/Attachment.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Attachments.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Codes.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Components.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/ConstantValues.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Constants.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Descriptors.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/ExplorationDatas.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Libraries.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/SimpleComposite.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Structures.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Code.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Component.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Constant.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/ConstantValue.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Descriptor.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/ExplorationApplication.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/ExplorationData.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Library.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/LoggableElement.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Repository.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Result.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Structure.java 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/Version.java trunk/simexplorer-is/simexplorer-is-entities/src/resources/i18n/simexplorer-is-entities-en_GB.properties trunk/simexplorer-is/simexplorer-is-entities/src/resources/i18n/simexplorer-is-entities-fr_FR.properties trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDetail.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDownload.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/pages/security/ProtectedPage.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/WebEntityVisitor.java Log: UI web visitor Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/Composite.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/Composite.java 2008-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/Composite.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -44,7 +44,7 @@ */ protected void visitLeave(EntityVisitor visitor) { visitor.exitComposite(this); - // do nothing + // do nothing } /* (non-Javadoc) Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/Entity.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/Entity.java 2008-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/Entity.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -21,12 +21,8 @@ import java.util.List; /** - * The minimal Entity contract. - * <p/> - * This is a <code>marker</code> interface, nothing special to describe for this - * contract. - * <p/> - * An Entity is serializable and visitable. + * The minimal Entity contract. <p/> This is a <code>marker</code> interface, nothing special to describe for this + * contract. <p/> An Entity is serializable and visitable. */ public interface Entity extends Serializable, EntityVisitable { @@ -36,5 +32,12 @@ * @return the children */ public List<Entity> getChildren(); - + + /** + * Gets the row for UI. + * + * @return the row + */ + public abstract List<String> getRow(); + } 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-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityHelper.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -17,7 +17,6 @@ * ##% */ package fr.cemagref.simexplorer.is.entities; - import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -33,29 +32,38 @@ /** * Une classe utilitaires pour les Entities du projet. - * + * * @author chemit */ public class EntityHelper { + + public static enum ActionAvailabilty { + SWING, WEB, BOTH; + } + /** - * Une énumération pour définir les types des entités du - * projet. - * + * Une énumération pour définir les types des entités du projet. + * * @author chemit */ public static enum Action { - DOWNLOAD(ExplorationApplication.class, Result.class, Library.class), - EXPORT(ExplorationApplication.class, Result.class, Library.class), - IMPORT(ExplorationApplication.class, Library.class), - DELETE(ExplorationApplication.class, ExplorationData.class); + DOWNLOAD("", ActionAvailabilty.SWING, ExplorationApplication.class, Result.class, Library.class), + EXPORT("export", ActionAvailabilty.BOTH, ExplorationApplication.class, Result.class, Library.class), + IMPORT("", ActionAvailabilty.SWING, ExplorationApplication.class, Library.class), + DELETE("delete", ActionAvailabilty.BOTH, ExplorationApplication.class, ExplorationData.class), + HISTORY("history", ActionAvailabilty.WEB, LoggableElement.class), + RIGHTS("rights", ActionAvailabilty.WEB, ExplorationApplication.class, ExplorationData.class), + DETAILS("details", ActionAvailabilty.WEB), + METADATA("metadata", ActionAvailabilty.WEB, ExplorationApplication.class, ExplorationData.class); private List<Class<?>> classes; private List<String> types; + private String actionName; + private ActionAvailabilty availabilty; public boolean accept(DefaultMutableTreeNode node) { - return node != null && node.getUserObject() != null && - accept(node.getUserObject().getClass()); + return node != null && node.getUserObject() != null && accept(node.getUserObject().getClass()); } public boolean accept(LoggableElement sNode) { @@ -65,8 +73,18 @@ public boolean accept(MetaData metaData) { return metaData != null && accept(metaData.getElementClass()); } - - private Action(Class<?>... classes) { + + public String getActionName() { + return actionName; + } + + public ActionAvailabilty getAvailabilty() { + return availabilty; + } + + private Action(String actionName, ActionAvailabilty actionAvailabilty, Class<?>... classes) { + this.actionName = actionName; + this.availabilty = actionAvailabilty; this.classes = Arrays.asList(classes); this.types = new ArrayList<String>(classes.length); for (Class<?> aClass : classes) { Modified: 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 2008-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityTypeEnum.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -1,12 +1,13 @@ package fr.cemagref.simexplorer.is.entities; +import static org.codelutin.i18n.I18n._; import static org.codelutin.i18n.I18n.n_; -import static org.codelutin.i18n.I18n._; 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.Descriptor; import fr.cemagref.simexplorer.is.entities.data.ExplorationApplication; import fr.cemagref.simexplorer.is.entities.data.ExplorationData; import fr.cemagref.simexplorer.is.entities.data.Library; @@ -38,6 +39,9 @@ /** The Constant value. */ ConstantValue(false, n_("simexplorer.common.constantvalue"), n_("simexplorer.common.constantvalues"), ConstantValue.class), + /** The Constant value. */ + Descriptor(false, n_("simexplorer.common.descriptor"), n_("simexplorer.common.descriptors"), Descriptor.class), + /** The Exploration application. */ ExplorationApplication(true, n_("simexplorer.common.explorationapplication"), n_("simexplorer.common.explorationapplications"), ExplorationApplication.class), @@ -84,7 +88,7 @@ } return null; } - + /** * Gets the libelle. * Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityVisitable.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityVisitable.java 2008-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityVisitable.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -18,14 +18,13 @@ package fr.cemagref.simexplorer.is.entities; /** - * Le contrat a respecter par un entity pour être visiter par un - * {@link EntityVisitor} visiteur. - * + * Le contrat a respecter par un entity pour être visiter par un {@link EntityVisitor} visiteur. + * * @author chemit * @see EntityVisitor */ public interface EntityVisitable { - + /** * Méthode à implanter dans chaque visitable pour indiquer ce que le visiteur doit visiter. * Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityVisitor.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityVisitor.java 2008-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityVisitor.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -17,7 +17,6 @@ * ##% */ package fr.cemagref.simexplorer.is.entities; - /** * Le contrat à respecter pour un visiteur à visiter des {@link EntityVisitable}.. * @@ -34,7 +33,7 @@ * */ void visit(EntityVisitable v); - + /** * Visit. * @@ -64,5 +63,5 @@ * @param v the v */ void exitComposite(Composite v); - + } Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/Leaf.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/Leaf.java 2008-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/Leaf.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -21,8 +21,7 @@ import java.util.List; /** - * The Class Leaf. - * This class represents a leaf of the tree + * The Class Leaf. This class represents a leaf of the tree */ public abstract class Leaf implements Entity { @@ -30,8 +29,17 @@ * @see fr.cemagref.simexplorer.is.entities.pattern.Entity#getChildren() */ @Override - public final List<Entity> getChildren() { + public final List<Entity> getChildren() { return new ArrayList<Entity>(); } + public void accept(EntityVisitor visitor) { + visitor.visitLeaf(this); + } + + @Override + public String toString() { + return EntityTypeEnum.getLibelle(this); + } + } Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/attachment/Attachment.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/attachment/Attachment.java 2008-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/attachment/Attachment.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -17,9 +17,13 @@ * ##% */ package fr.cemagref.simexplorer.is.entities.attachment; +import static org.codelutin.i18n.I18n._; + +import java.util.ArrayList; +import java.util.List; + import org.apache.commons.lang.StringUtils; -import fr.cemagref.simexplorer.is.entities.EntityVisitor; import fr.cemagref.simexplorer.is.entities.Leaf; /** @@ -172,13 +176,20 @@ StringBuffer sb = new StringBuffer(); sb.append(getFileName()); if (getContentType() != null) { - sb.append(" - ").append(getContentType().getDescription()); + sb.append(" - ").append(_(getContentType().getDescription())); } return sb.toString(); } - public void accept(EntityVisitor visitor) { - visitor.visitLeaf(this); + @Override + public List<String> getRow() { + List<String> row = new ArrayList<String>(); + row.add(""); + row.add(getFileName()); + if (getContentType() != null) { + row.add(_(getContentType().getDescription())); + } + return row; } } Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Attachments.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Attachments.java 2008-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Attachments.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -17,8 +17,28 @@ * ##% */ package fr.cemagref.simexplorer.is.entities.composite; +import static org.codelutin.i18n.I18n._; + +import java.util.List; + import fr.cemagref.simexplorer.is.entities.attachment.Attachment; public final class Attachments extends SimpleComposite<Attachment> { + private static final long serialVersionUID = 6100507219070076248L; + + // @Override + // protected boolean visitEnter(EntityVisitor visitor) { + // // do not visit attachments + // return false; + // } + + @Override + public List<String> getRow() { + List<String> row = super.getRow(); + row.add(_("simexplorer.common.attachment.filename")); + row.add(_("simexplorer.common.attachment.datatype")); + return row; + } + } Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Codes.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Codes.java 2008-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Codes.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -17,8 +17,22 @@ * ##% */ package fr.cemagref.simexplorer.is.entities.composite; +import static org.codelutin.i18n.I18n._; + +import java.util.List; + import fr.cemagref.simexplorer.is.entities.data.Code; public final class Codes extends SimpleComposite<Code> { + private static final long serialVersionUID = -8845424774771585654L; + + @Override + public List<String> getRow() { + List<String> row = super.getRow(); + row.add(_("simexplorer.common.code.language")); + row.add(_("simexplorer.common.code.code")); + return row; + } + } Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Components.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Components.java 2008-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Components.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -21,4 +21,6 @@ public final class Components extends SimpleComposite<Component> { + private static final long serialVersionUID = 5467707236188600666L; + } Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/ConstantValues.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/ConstantValues.java 2008-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/ConstantValues.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -17,8 +17,21 @@ * ##% */ package fr.cemagref.simexplorer.is.entities.composite; +import static org.codelutin.i18n.I18n._; + +import java.util.List; + import fr.cemagref.simexplorer.is.entities.data.ConstantValue; public final class ConstantValues extends SimpleComposite<ConstantValue> { + private static final long serialVersionUID = -1567351689671452380L; + + @Override + public List<String> getRow() { + List<String> row = super.getRow(); + row.add(_("simexplorer.common.constantvalue.constant")); + row.add(_("simexplorer.common.constantvalue.value")); + return row; + } } Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Constants.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Constants.java 2008-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Constants.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -17,8 +17,22 @@ * ##% */ package fr.cemagref.simexplorer.is.entities.composite; +import static org.codelutin.i18n.I18n._; + +import java.util.List; + import fr.cemagref.simexplorer.is.entities.data.Constant; public final class Constants extends SimpleComposite<Constant> { + private static final long serialVersionUID = 2754488720122128335L; + + @Override + public List<String> getRow() { + List<String> row = super.getRow(); + row.add(_("simexplorer.common.constant.name")); + row.add(_("simexplorer.common.constant.type")); + return row; + } + } Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Descriptors.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Descriptors.java 2008-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Descriptors.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -17,8 +17,28 @@ * ##% */ package fr.cemagref.simexplorer.is.entities.composite; +import static org.codelutin.i18n.I18n._; + +import java.util.List; + import fr.cemagref.simexplorer.is.entities.data.Descriptor; public final class Descriptors extends SimpleComposite<Descriptor> { - + + // @Override + // protected boolean visitEnter(EntityVisitor visitor) { + // // do not visit descriptors + // return false; + // } + + private static final long serialVersionUID = -5742926033876669501L; + + @Override + public List<String> getRow() { + List<String> row = super.getRow(); + row.add(_("simexplorer.common.descriptor.name")); + row.add(_("simexplorer.common.descriptor.value")); + return row; + } + } Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/ExplorationDatas.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/ExplorationDatas.java 2008-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/ExplorationDatas.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -21,4 +21,6 @@ public final class ExplorationDatas extends SimpleComposite<ExplorationData> { + private static final long serialVersionUID = 616723755643872808L; + } Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Libraries.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Libraries.java 2008-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Libraries.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -21,4 +21,6 @@ public final class Libraries extends SimpleComposite<Library> { + private static final long serialVersionUID = 3325488033333012292L; + } Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/SimpleComposite.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/SimpleComposite.java 2008-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/SimpleComposite.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -92,7 +92,7 @@ return false; return true; } - + public Class<E> getChildrenClass() { Class<E> eClass = null; @@ -102,7 +102,7 @@ eClass = (Class<E>) paramType.getActualTypeArguments()[0]; return eClass; } - + return null; } @@ -119,6 +119,13 @@ return super.toString(); } + @Override + public List<String> getRow() { + List<String> row = new ArrayList<String>(); + row.add(toString()); + return row; + } + /** * Delegate List methods */ Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Structures.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Structures.java 2008-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Structures.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -21,4 +21,6 @@ public final class Structures extends SimpleComposite<Structure> { + private static final long serialVersionUID = 6543027162443829281L; + } Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Code.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Code.java 2008-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Code.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -18,8 +18,9 @@ package fr.cemagref.simexplorer.is.entities.data; import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; -import fr.cemagref.simexplorer.is.entities.EntityVisitor; import fr.cemagref.simexplorer.is.entities.Leaf; /** @@ -77,13 +78,9 @@ */ @Override public String toString() { - return getCode() + " : " + getLanguage(); + return getLanguage() + " : " + getCode(); } - public void accept(EntityVisitor visitor) { - visitor.visitLeaf(this); - } - @Override public int hashCode() { final int prime = 31; @@ -115,4 +112,12 @@ return true; } + @Override + public List<String> getRow() { + List<String> row = new ArrayList<String>(); + row.add(""); + row.add(getLanguage()); + row.add(getCode()); + return row; + } } Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Component.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Component.java 2008-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Component.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -17,7 +17,6 @@ * ##% */ package fr.cemagref.simexplorer.is.entities.data; -import java.util.ArrayList; import java.util.List; import fr.cemagref.simexplorer.is.entities.Entity; @@ -123,7 +122,7 @@ */ @Override public List<Entity> getChildren() { - List<Entity> directChildren = new ArrayList<Entity>(); + List<Entity> directChildren = super.getChildren(); directChildren.add(constants); directChildren.add(structures); directChildren.add(codes); Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Constant.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Constant.java 2008-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Constant.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -18,8 +18,9 @@ package fr.cemagref.simexplorer.is.entities.data; import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; -import fr.cemagref.simexplorer.is.entities.EntityVisitor; import fr.cemagref.simexplorer.is.entities.Leaf; /** The Class Constant. */ @@ -36,7 +37,7 @@ /** * Gets the name. - * + * * @return the name */ public String getName() { @@ -45,7 +46,7 @@ /** * Sets the name. - * + * * @param name the new name */ public void setName(String name) { @@ -54,7 +55,7 @@ /** * Gets the type. - * + * * @return the type */ public Class<?> getType() { @@ -63,7 +64,7 @@ /** * Sets the type. - * + * * @param type the new type */ public void setType(Class<?> type) { @@ -78,10 +79,6 @@ return getName() + " : " + getType().getSimpleName(); } - public void accept(EntityVisitor visitor) { - visitor.visitLeaf(this); - } - @Override public int hashCode() { final int prime = 31; @@ -112,7 +109,14 @@ return false; return true; } - - - + + @Override + public List<String> getRow() { + List<String> row = new ArrayList<String>(); + row.add(""); + row.add(getName()); + row.add(getType().getSimpleName()); + return row; + } + } Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/ConstantValue.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/ConstantValue.java 2008-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/ConstantValue.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -18,8 +18,9 @@ package fr.cemagref.simexplorer.is.entities.data; import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; -import fr.cemagref.simexplorer.is.entities.EntityVisitor; import fr.cemagref.simexplorer.is.entities.Leaf; /** @@ -72,8 +73,16 @@ this.constant = constant; } - public void accept(EntityVisitor visitor) { - visitor.visitLeaf(this); + @Override + public String toString() { + StringBuffer sb = new StringBuffer(); + if (constant != null) { + sb.append(constant.toString()).append(" = "); + } + if (value != null) { + sb.append(value); + } + return sb.toString(); } @Override @@ -107,4 +116,12 @@ return true; } + @Override + public List<String> getRow() { + List<String> row = new ArrayList<String>(); + row.add(""); + row.add(constant.toString()); + row.add(value); + return row; + } } Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Descriptor.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Descriptor.java 2008-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Descriptor.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -17,7 +17,9 @@ * ##% */ package fr.cemagref.simexplorer.is.entities.data; -import fr.cemagref.simexplorer.is.entities.EntityVisitor; +import java.util.ArrayList; +import java.util.List; + import fr.cemagref.simexplorer.is.entities.Leaf; /** @@ -46,14 +48,6 @@ this.value = value; } - /* (non-Javadoc) - * @see fr.cemagref.simexplorer.is.entities.EntityVisitable#accept(fr.cemagref.simexplorer.is.entities.EntityVisitor) - */ - @Override - public void accept(EntityVisitor visitor) { - // nothing... yet! - } - /** * Gets the name. * @@ -91,6 +85,13 @@ } @Override + public String toString() { + StringBuffer sb = new StringBuffer(); + sb.append(name).append(" = ").append(value); + return sb.toString(); + } + + @Override public int compareTo(Descriptor o) { if (this.getName() == null || o == null || o.getName() == null) { return 0; @@ -129,4 +130,12 @@ return true; } + @Override + public List<String> getRow() { + List<String> row = new ArrayList<String>(); + row.add(""); + row.add(name); + row.add(value); + return row; + } } Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/ExplorationApplication.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/ExplorationApplication.java 2008-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/ExplorationApplication.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -18,13 +18,11 @@ package fr.cemagref.simexplorer.is.entities.data; import java.io.Serializable; -import java.util.ArrayList; import java.util.List; import fr.cemagref.simexplorer.is.entities.Entity; import fr.cemagref.simexplorer.is.entities.composite.Components; import fr.cemagref.simexplorer.is.entities.composite.ExplorationDatas; -import fr.cemagref.simexplorer.is.entities.composite.SimpleComposite; /** * The Class ExplorationApplication. @@ -81,7 +79,7 @@ */ @Override public List<Entity> getChildren() { - List<Entity> directChildren = new ArrayList<Entity>(); + List<Entity> directChildren = super.getChildren(); directChildren.add(explorations); directChildren.add(components); return directChildren; Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/ExplorationData.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/ExplorationData.java 2008-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/ExplorationData.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -18,7 +18,6 @@ package fr.cemagref.simexplorer.is.entities.data; import java.io.Serializable; -import java.util.ArrayList; import java.util.List; import fr.cemagref.simexplorer.is.entities.Entity; @@ -126,7 +125,7 @@ */ @Override public List<Entity> getChildren() { - List<Entity> children = new ArrayList<Entity>(); + List<Entity> children = super.getChildren(); children.add(result); children.add(constantValues); return children; Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Library.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Library.java 2008-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Library.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -17,11 +17,6 @@ * ##% */ package fr.cemagref.simexplorer.is.entities.data; -import java.util.ArrayList; -import java.util.List; - -import fr.cemagref.simexplorer.is.entities.Entity; - /** The Class Library. */ public class Library extends LoggableElement { @@ -55,11 +50,4 @@ return true; } - @Override - public List<Entity> getChildren() { - List<Entity> children = new ArrayList<Entity>(); - children.add(getAttachments()); - return children; - } - } Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/LoggableElement.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/LoggableElement.java 2008-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/LoggableElement.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -22,10 +22,10 @@ import fr.cemagref.simexplorer.is.entities.Composite; import fr.cemagref.simexplorer.is.entities.Entity; +import fr.cemagref.simexplorer.is.entities.EntityTypeEnum; import fr.cemagref.simexplorer.is.entities.attachment.Attachment; import fr.cemagref.simexplorer.is.entities.composite.Attachments; import fr.cemagref.simexplorer.is.entities.composite.Descriptors; -import fr.cemagref.simexplorer.is.entities.composite.SimpleComposite; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; /** @@ -59,6 +59,22 @@ return getName(); } + @Override + public List<String> getRow() { + List<String> row = new ArrayList<String>(); + row.add(EntityTypeEnum.getLibelle(this.getClass())); + return row; + } + + @Override + public List<Entity> getChildren() { + List<Entity> children = new ArrayList<Entity>(); + children.add(metadataIS); + children.add(attachments); + children.add(descriptors); + return children; + } + /** * Gets all children of LoggableElement type. * @@ -67,13 +83,15 @@ * */ private void getLEChildren(Entity entity, List<LoggableElement> list) { - if (entity instanceof LoggableElement) { - list.add((LoggableElement) entity); + if (entity != null) { + if (entity instanceof LoggableElement) { + list.add((LoggableElement) entity); + } + List<Entity> children = entity.getChildren(); + for (Entity child : children) { + getLEChildren(child, list); + } } - List<Entity> children = entity.getChildren(); - for (Entity child : children) { - getLEChildren(child, list); - } } /** Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Repository.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Repository.java 2008-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Repository.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -17,7 +17,9 @@ * ##% */ package fr.cemagref.simexplorer.is.entities.data; -import fr.cemagref.simexplorer.is.entities.EntityVisitor; +import java.util.ArrayList; +import java.util.List; + import fr.cemagref.simexplorer.is.entities.Leaf; /** @@ -56,8 +58,10 @@ } @Override - public void accept(EntityVisitor visitor) { - // nothing yet + public List<String> getRow() { + List<String> row = new ArrayList<String>(); + row.add(""); + row.add(toString()); + return row; } - } Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Result.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Result.java 2008-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Result.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -17,7 +17,9 @@ * ##% */ package fr.cemagref.simexplorer.is.entities.data; -import fr.cemagref.simexplorer.is.entities.EntityVisitor; +import java.util.ArrayList; +import java.util.List; + import fr.cemagref.simexplorer.is.entities.Leaf; /** The Class Result. */ @@ -27,15 +29,6 @@ private static final long serialVersionUID = 2111484866027162494L; @Override - public String toString() { - return "Result " + Math.abs(hashCode()); - } - - public void accept(EntityVisitor visitor) { - visitor.visitLeaf(this); - } - - @Override public int hashCode() { final int prime = 31; int result = super.hashCode(); @@ -61,4 +54,11 @@ // return false; return true; } + + @Override + public List<String> getRow() { + List<String> row = new ArrayList<String>(); + row.add(toString()); + return row; + } } Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Structure.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Structure.java 2008-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Structure.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -17,7 +17,9 @@ * ##% */ package fr.cemagref.simexplorer.is.entities.data; -import fr.cemagref.simexplorer.is.entities.EntityVisitor; +import java.util.ArrayList; +import java.util.List; + import fr.cemagref.simexplorer.is.entities.Leaf; /** @@ -28,10 +30,6 @@ /** The Constant serialVersionUID. */ private static final long serialVersionUID = 2594331198459134006L; - public void accept(EntityVisitor visitor) { - visitor.visitLeaf(this); - } - @Override public int hashCode() { final int prime = 31; @@ -58,4 +56,11 @@ // return false; return true; } + + @Override + public List<String> getRow() { + List<String> row = new ArrayList<String>(); + row.add(toString()); + return row; + } } 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-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/MetaData.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -17,10 +17,13 @@ * ##% */ package fr.cemagref.simexplorer.is.entities.metadata; +import static org.codelutin.i18n.I18n._; + +import java.util.ArrayList; import java.util.Date; +import java.util.List; import fr.cemagref.simexplorer.is.entities.EntityTypeEnum; -import fr.cemagref.simexplorer.is.entities.EntityVisitor; import fr.cemagref.simexplorer.is.entities.Leaf; /** @@ -263,14 +266,6 @@ this.description = description; } - /* (non-Javadoc) - * @see fr.cemagref.simexplorer.is.entities.EntityVisitable#accept(fr.cemagref.simexplorer.is.entities.EntityVisitor) - */ - @Override - public void accept(EntityVisitor visitor) { - // nothing yet - } - /** * Gets the element class. * @@ -297,9 +292,17 @@ public EntityTypeEnum getEntityType() { return EntityTypeEnum.getEntityType(getElementClass()); } - + public String getEntityTypeLibelle() { return getEntityType().getLibelle(); } - + + @Override + public List<String> getRow() { + List<String> row = new ArrayList<String>(); + row.add(_("simexplorer.common.metadata")); + row.add(getName()); + row.add(getVersion().toString()); + return row; + } } Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/Version.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/Version.java 2008-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/Version.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -41,8 +41,7 @@ /** * Static public factory of Version from his string representation. * - * @param version - * the string representation of the version + * @param version the string representation of the version * * @return a new instance of version */ @@ -53,8 +52,7 @@ /** * Default constructor. * - * @param version - * String version + * @param version String version */ public Version(String version) { // Initialize list @@ -71,8 +69,7 @@ /** * Retrieve sub version. * - * @param position - * Sub version wanted + * @param position Sub version wanted * * @return the sub version number */ @@ -84,14 +81,11 @@ } /** - * TODO, this is not immuable method :) modified internal state, also we - * TODO should not to this, but return a new instance of Version - * Set a sub version. + * TODO, this is not immuable method :) modified internal state, also we TODO should not to this, but return a new + * instance of Version Set a sub version. * - * @param position - * Sub version to modify - * @param subVersion - * New value + * @param position Sub version to modify + * @param subVersion New value */ public void setVersion(int position, Integer subVersion) { while (getVersion(position) == null) { @@ -101,22 +95,18 @@ } /** - * TODO as the method modified internal state, it should be at least protected - * Add a new sub version. + * TODO as the method modified internal state, it should be at least protected Add a new sub version. * - * @param subVersion - * Sub version value + * @param subVersion Sub version value */ public void addSubVersion(Integer subVersion) { pointedVersion.add(subVersion); } /** - * Clone current instance and Increment a sub version. <p/> Note : <b>The - * current instance is NOT modified</b> + * Clone current instance and Increment a sub version. <p/> Note : <b>The current instance is NOT modified</b> * - * @param position - * Sub version position + * @param position Sub version position * * @return the new instance of version object updated */ @@ -174,8 +164,7 @@ result = 1; compared = true; } else { - result = getVersion(position).compareTo( - v.getVersion(position)); + result = getVersion(position).compareTo(v.getVersion(position)); compared = (result != 0); } } @@ -205,9 +194,7 @@ */ @Override public boolean equals(Object o) { - return this == o - || (o instanceof Version && pointedVersion - .equals(((Version) o).pointedVersion)); + return this == o || (o instanceof Version && pointedVersion.equals(((Version) o).pointedVersion)); } /* @@ -222,13 +209,11 @@ } /** - * TODO suppress it if we want a immuable class - * Safe clone. + * TODO suppress it if we want a immuable class Safe clone. * * @return the version * - * @throws RuntimeException - * the runtime exception + * @throws RuntimeException the runtime exception */ public Version safeClone() throws RuntimeException { try { Modified: trunk/simexplorer-is/simexplorer-is-entities/src/resources/i18n/simexplorer-is-entities-en_GB.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/resources/i18n/simexplorer-is-entities-en_GB.properties 2008-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/resources/i18n/simexplorer-is-entities-en_GB.properties 2008-03-10 13:12:04 UTC (rev 1314) @@ -1,19 +1,32 @@ simexplorer.common.attachment=Attachment +simexplorer.common.attachment.datatype=Data type +simexplorer.common.attachment.filename=Filename simexplorer.common.attachments=Attachments simexplorer.common.code=Code +simexplorer.common.code.code=Code +simexplorer.common.code.language=Language simexplorer.common.codes=Codes simexplorer.common.component=Component simexplorer.common.components=Components simexplorer.common.constant=Constant +simexplorer.common.constant.name=Name +simexplorer.common.constant.type=Type simexplorer.common.constants=Constants simexplorer.common.constantvalue=Constant value +simexplorer.common.constantvalue.constant=Constant +simexplorer.common.constantvalue.value=Value simexplorer.common.constantvalues=Constant values +simexplorer.common.descriptor=Descriptor +simexplorer.common.descriptor.name=Name +simexplorer.common.descriptor.value=Value +simexplorer.common.descriptors=Descriptors simexplorer.common.explorationapplication=Exploration application simexplorer.common.explorationapplications=Exploration applications simexplorer.common.explorationdata=Exploration data simexplorer.common.explorationdatas=Exploration datas simexplorer.common.libraries=Libraries simexplorer.common.library=Library +simexplorer.common.metadata=Metadata simexplorer.common.repositories=Repositories simexplorer.common.repository=Repository simexplorer.common.result=Result Modified: trunk/simexplorer-is/simexplorer-is-entities/src/resources/i18n/simexplorer-is-entities-fr_FR.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/resources/i18n/simexplorer-is-entities-fr_FR.properties 2008-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/resources/i18n/simexplorer-is-entities-fr_FR.properties 2008-03-10 13:12:04 UTC (rev 1314) @@ -1,19 +1,32 @@ simexplorer.common.attachment=Fichier attach\u00E9 +simexplorer.common.attachment.datatype=Type +simexplorer.common.attachment.filename=Nom fichier simexplorer.common.attachments=Fichiers attach\u00E9s simexplorer.common.code=Code +simexplorer.common.code.code=Code +simexplorer.common.code.language=Langage simexplorer.common.codes=Codes simexplorer.common.component=Componsant simexplorer.common.components=Composants simexplorer.common.constant=Constante +simexplorer.common.constant.name=Nom +simexplorer.common.constant.type=Type simexplorer.common.constants=Constantes simexplorer.common.constantvalue=Valeur de constante +simexplorer.common.constantvalue.constant=Constante +simexplorer.common.constantvalue.value=Valeur simexplorer.common.constantvalues=Valeurs de constante +simexplorer.common.descriptor=Mot cl\u00E9 +simexplorer.common.descriptor.name=Nom +simexplorer.common.descriptor.value=Valeur +simexplorer.common.descriptors=Mots cl\u00E9s simexplorer.common.explorationapplication=Exploration d'application simexplorer.common.explorationapplications=Explorations d'application simexplorer.common.explorationdata=Donn\u00E9e d'exploration simexplorer.common.explorationdatas=Donn\u00E9es d'Explorations simexplorer.common.libraries=Librairies simexplorer.common.library=Librarie +simexplorer.common.metadata=M\u00E9tadonn\u00E9es simexplorer.common.repositories=Repositories simexplorer.common.repository=Repository simexplorer.common.result=R\u00E9sultat Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDetail.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDetail.java 2008-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDetail.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -20,6 +20,8 @@ import java.util.ArrayList; import java.util.List; +import org.apache.tapestry.ComponentResources; +import org.apache.tapestry.ioc.annotations.Inject; import org.codelutin.tapestry.beans.TreeNode; import fr.cemagref.simexplorer.is.ui.web.tools.WebEntityVisitor; @@ -58,7 +60,7 @@ */ public List<TreeNode> getNodes() { List<TreeNode> nodes = new ArrayList<TreeNode>(); - WebEntityVisitor webEntityVisitor = new WebEntityVisitor(); + WebEntityVisitor webEntityVisitor = new WebEntityVisitor(getResources(), getMessages()); nodes.add(webEntityVisitor.treeNodeVisit(getElement())); return nodes; } Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDownload.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDownload.java 2008-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDownload.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -22,7 +22,9 @@ import java.util.List; import java.util.StringTokenizer; +import org.apache.tapestry.ComponentResources; import org.apache.tapestry.StreamResponse; +import org.apache.tapestry.ioc.annotations.Inject; import org.codelutin.tapestry.beans.TreeNode; import fr.cemagref.simexplorer.is.entities.attachment.Attachment; @@ -138,7 +140,7 @@ */ public List<TreeNode> getNodes() { List<TreeNode> nodes = new ArrayList<TreeNode>(); - WebEntityVisitor webEntityVisitor = new WebEntityVisitor(); + WebEntityVisitor webEntityVisitor = new WebEntityVisitor(getResources(), getMessages()); nodes.add(webEntityVisitor.treeNodeVisit(getElement())); return nodes; } 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-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPageDetail.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -22,10 +22,8 @@ import java.util.List; import java.util.StringTokenizer; -import org.apache.tapestry.ComponentResources; import org.apache.tapestry.Link; import org.apache.tapestry.annotations.InjectPage; -import org.apache.tapestry.ioc.annotations.Inject; import org.codelutin.tapestry.beans.TreeNode; import fr.cemagref.simexplorer.is.entities.attachment.Attachment; @@ -41,10 +39,6 @@ /** The Constant DATE_FORMAT for formatting dates. */ public static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy.MM.dd HH:mm:ss.SSS"); - /** The resources. */ - @Inject - private ComponentResources resources; - /** The element export. */ @InjectPage private ElementDownload elementDownload; @@ -168,7 +162,7 @@ * @return the string */ protected String generateString(String actionCaption, String action, String context) { - Link link = resources.createActionLink(action, false, context); + Link link = getResources().createActionLink(action, false, context); StringBuffer sb = new StringBuffer(""); sb.append("<a href=\""); sb.append(link.toString()); Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/security/ProtectedPage.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/security/ProtectedPage.java 2008-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/security/ProtectedPage.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -17,10 +17,12 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.web.pages.security; +import org.apache.tapestry.ComponentResources; import org.apache.tapestry.annotations.ApplicationState; import org.apache.tapestry.annotations.Persist; import org.apache.tapestry.ioc.Messages; import org.apache.tapestry.ioc.annotations.Inject; +import org.codelutin.i18n.I18n; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; import fr.cemagref.simexplorer.is.exceptions.SimExplorerSecurityException; @@ -56,6 +58,10 @@ @Inject private Messages messages; + /** The resources. */ + @Inject + private ComponentResources resources; + /** * On activate. * @@ -171,5 +177,20 @@ public Messages getMessages() { return messages; } + + /** + * Gets the resources. + * + * @return the resources + */ + public ComponentResources getResources() { + return resources; + } + { + I18n.initISO88591("fr", "FR"); + } + + + } \ No newline at end of file Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/WebEntityVisitor.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/WebEntityVisitor.java 2008-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/WebEntityVisitor.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -18,14 +18,69 @@ package fr.cemagref.simexplorer.is.ui.web.tools; import java.util.ArrayList; +import java.util.List; +import org.apache.tapestry.ComponentResources; +import org.apache.tapestry.Link; +import org.apache.tapestry.ioc.Messages; import org.codelutin.tapestry.beans.TreeNode; +import fr.cemagref.simexplorer.is.entities.Composite; import fr.cemagref.simexplorer.is.entities.Entity; +import fr.cemagref.simexplorer.is.entities.EntityHelper; +import fr.cemagref.simexplorer.is.entities.EntityTypeEnum; import fr.cemagref.simexplorer.is.entities.EntityVisitorTreeNode; +import fr.cemagref.simexplorer.is.entities.EntityHelper.Action; +import fr.cemagref.simexplorer.is.entities.EntityHelper.ActionAvailabilty; +import fr.cemagref.simexplorer.is.entities.data.LoggableElement; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; public class WebEntityVisitor extends EntityVisitorTreeNode<TreeNode> { + private ComponentResources resources; + + private Messages messages; + + public WebEntityVisitor(ComponentResources resources, Messages messages) { + super(); + this.resources = resources; + this.messages = messages; + } + + /** + * Generate string. + * + * @param actionCaption the action caption + * @param action the action + * @param context the context + * + * @return the string + */ + protected String generateString(String actionCaption, String action, String context) { + Link link = resources.createActionLink(action, false, context); + StringBuffer sb = new StringBuffer(""); + sb.append("<a href=\""); + sb.append(link.toString()); + sb.append("\">"); + sb.append(actionCaption); + sb.append("</a>"); + return sb.toString(); + } + + /** + * Generate string. + * + * @param actionCaption the action caption + * @param action the action + * @param element the element + * + * @return the string + */ + protected String generateString(String actionCaption, String action, MetaData element) { + String context = element.getUuid() + "," + element.getVersion(); + return generateString(actionCaption, action, context); + } + protected TreeNode createNode(Entity v, boolean allowedChildren) { TreeNode treeNode = new TreeNode(); treeNode.setChildren(new ArrayList<TreeNode>()); @@ -36,7 +91,39 @@ treeNode.setType(TreeNode.TYPE_DOCUMENT); } - treeNode.setColumns(new String[] { v.toString() }); + List<String> row = v.getRow(); + String[] asArray = row.toArray(new String[4]); + + for (int i = 0; i < asArray.length; i++) { + if (asArray[i] == null) { + asArray[i] = ""; + } + if (v instanceof Composite) { + asArray[i] = "<b>" + asArray[i] + "</b>"; + } + } + + if (v instanceof LoggableElement) { + LoggableElement le = (LoggableElement) v; + StringBuffer sb = new StringBuffer(); + + Action[] actions = EntityHelper.Action.values(); + for (Action action : actions) { + if ((action.getAvailabilty() == ActionAvailabilty.WEB || action.getAvailabilty() == ActionAvailabilty.BOTH) + && action.accept(le)) { + sb.append("<br>"); + sb.append(generateString(messages.get("simexplorer.ui.web." + action.getActionName() + ".action"), + action.getActionName(), le.getMetaData())); + } + } + + if (sb.length() > 0) { + asArray[3] = sb.substring(4).toString(); + } + } + + treeNode.setColumns(asArray); + if (getCurrentParent() != null) { getCurrentParent().getChildren().add(treeNode); }