Author: glandais Date: 2008-02-15 13:15:27 +0000 (Fri, 15 Feb 2008) New Revision: 988 Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementHistory.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementMetadata.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/main/webapp/ElementMetadata.tml trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/WEB-INF/app.properties trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/WEB-INF/app_fr.properties Log: Display hierarchy on metadata page Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementHistory.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementHistory.java 2008-02-15 13:15:05 UTC (rev 987) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementHistory.java 2008-02-15 13:15:27 UTC (rev 988) @@ -19,7 +19,6 @@ import java.util.ArrayList; import java.util.Arrays; -import java.util.Comparator; import java.util.List; import org.apache.tapestry.annotations.Persist; @@ -47,8 +46,7 @@ public void setup(String uuid, String version) { super.setup(uuid, version); try { - versions = RemoteStorageService.getStorageService().getVersions( - getToken(), uuid); + versions = RemoteStorageService.getStorageService().getVersions(getToken(), uuid); } catch (Exception e) { throw new SimExplorerWebException(e); } @@ -99,8 +97,7 @@ Arrays.sort(versions); TreeNode rootNode = new TreeNode(); rootNode.setType(TreeNode.TYPE_FOLDER); - rootNode.setColumns(generateStringArray(getMessages().get( - "simexplorer.ui.web.history"))); + rootNode.setColumns(generateStringArray(getMessages().get("simexplorer.ui.web.history"))); rootNode.setObject(new Version("")); rootNode.setChildren(new ArrayList<TreeNode>()); for (Version version : versions) { @@ -126,8 +123,7 @@ TreeNode parentNode = null; for (TreeNode treeNode : nodes) { if (getVersion(treeNode).getVersion(pos) != null - && getVersion(treeNode).getVersion(pos).equals( - version.getVersion(pos))) { + && getVersion(treeNode).getVersion(pos).equals(version.getVersion(pos))) { parentNode = treeNode; } } @@ -185,12 +181,10 @@ */ private TreeNode generateLeaf(Version version) throws SimExplorerServiceException { TreeNode node = new TreeNode(); - MetaData mde = RemoteStorageService.getStorageService().getMetadata( - getToken(), getMetadata().getUuid(), version.toString()); - // FIXME date tostring - node.setColumns(generateStringArray(mde.getVersion().toString(), mde - .getDescription(), mde.getCreationDate().toString(), mde, - false, "metadata", "export", "delete", "details")); + MetaData mde = RemoteStorageService.getStorageService().getMetadata(getToken(), getMetadata().getUuid(), + version.toString()); + node.setColumns(generateStringArray(mde.getVersion().toString(), mde.getDescription(), DATE_FORMAT.format(mde + .getCreationDate()), mde, false, "metadata", "export", "delete", "details")); node.setObject(mde.getVersion()); node.setType(TreeNode.TYPE_DOCUMENT); return node; Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementMetadata.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementMetadata.java 2008-02-15 13:15:05 UTC (rev 987) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementMetadata.java 2008-02-15 13:15:27 UTC (rev 988) @@ -17,11 +17,41 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.web.pages; +import java.util.ArrayList; +import java.util.List; + +import org.apache.tapestry.ComponentResources; +import org.apache.tapestry.annotations.Retain; +import org.apache.tapestry.beaneditor.BeanModel; +import org.apache.tapestry.ioc.annotations.Inject; +import org.apache.tapestry.services.BeanModelSource; + +import de.hsofttec.t5components.annotations.SetterGetter; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; +import fr.cemagref.simexplorer.is.service.SimExplorerServiceException; +import fr.cemagref.simexplorer.is.ui.web.services.RemoteStorageService; + /** * The Class ElementMetadata. */ public class ElementMetadata extends ElementPageDetail { + /** The model. */ + @Retain + private BeanModel model; + + /** The bean model source. */ + @Inject + private BeanModelSource beanModelSource; + + /** The resources. */ + @Inject + private ComponentResources resources; + + /** The _element. */ + @SetterGetter + private MetaData _element; + /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.ui.web.pages.security.ProtectedPage#getWindowTitle() */ @@ -30,4 +60,90 @@ return getMessages().get("simexplorer.ui.web.title.elementmetadata"); } + /** + * Page loaded. + */ + void pageLoaded() { + model = beanModelSource.create(MetaData.class, false, resources); + List<String> wantedProperties = new ArrayList<String>(); + wantedProperties.add("type"); + wantedProperties.add("uuid"); + wantedProperties.add("name"); + wantedProperties.add("description"); + wantedProperties.add("version"); + wantedProperties.add("creationDate"); + List<String> properties = model.getPropertyNames(); + for (String property : properties) { + System.out.println(property); + model.get(property).sortable(false); + if (!wantedProperties.contains(property)) { + model = model.remove(property); + } + } + } + + /** + * Gets the model. + * + * @return the model + */ + public BeanModel getModel() { + return model; + } + + /** + * Gets the elements used. + * + * @return the elements used + * + * @throws SimExplorerServiceException the sim explorer service exception + */ + public MetaData[] getElementsUsed() throws SimExplorerServiceException { + return RemoteStorageService.getStorageService().getMetadatasUsed(getToken(), getMetadata().getUuid(), + getMetadata().getVersion().toString()); + } + + /** + * Gets the elements using. + * + * @return the elements using + * + * @throws SimExplorerServiceException the sim explorer service exception + */ + public MetaData[] getElementsUsing() throws SimExplorerServiceException { + return RemoteStorageService.getStorageService().getMetadatasUsing(getToken(), getMetadata().getUuid(), + getMetadata().getVersion().toString()); + } + + /** + * Gets the detail element context. + * + * @return the detail element context + */ + public String getDetailElementContext() { + return _element.getUuid() + "," + _element.getVersion(); + } + + /** + * On action from detail element used. + * + * @param context the context + * + * @return the object + */ + public Object onActionFromDetailElementUsed(String context) { + return onDetails(context); + } + + /** + * On action from detail element using. + * + * @param context the context + * + * @return the object + */ + public Object onActionFromDetailElementUsing(String context) { + return onDetails(context); + } + } 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-15 13:15:05 UTC (rev 987) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPageDetail.java 2008-02-15 13:15:27 UTC (rev 988) @@ -17,6 +17,7 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.web.pages; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -36,6 +37,9 @@ */ public abstract class ElementPageDetail extends ElementPage { + /** 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; @@ -67,10 +71,8 @@ /** * Prepare page. * - * @param page - * the page - * @param context - * the context + * @param page the page + * @param context the context * * @return the object */ @@ -85,8 +87,7 @@ /** * On export. * - * @param context - * the context + * @param context the context * * @return the object */ @@ -97,8 +98,7 @@ /** * On history. * - * @param context - * the context + * @param context the context * * @return the object */ @@ -109,8 +109,7 @@ /** * On delete. * - * @param context - * the context + * @param context the context * * @return the object */ @@ -121,8 +120,7 @@ /** * On rights. * - * @param context - * the context + * @param context the context * * @return the object */ @@ -133,8 +131,7 @@ /** * On details. * - * @param context - * the context + * @param context the context * * @return the object */ @@ -145,8 +142,7 @@ /** * On metadata. * - * @param context - * the context + * @param context the context * * @return the object */ @@ -157,17 +153,13 @@ /** * Generate string. * - * @param actionCaption - * the action caption - * @param action - * the action - * @param context - * the context + * @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) { + protected String generateString(String actionCaption, String action, String context) { Link link = resources.createActionLink(action, false, context); StringBuffer sb = new StringBuffer(""); sb.append("<a href=\""); @@ -181,17 +173,13 @@ /** * Generate string. * - * @param actionCaption - * the action caption - * @param action - * the action - * @param element - * the element + * @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) { + protected String generateString(String actionCaption, String action, MetaData element) { String context = element.getUuid() + "," + element.getVersion(); return generateString(actionCaption, action, context); } @@ -199,30 +187,25 @@ /** * Generate actions. * - * @param element - * the element - * @param security - * the security - * @param actions - * the actions + * @param element the element + * @param security the security + * @param actions the actions * * @return the string */ - private String generateActions(MetaData element, boolean security, - String... actions) { + private String generateActions(MetaData element, boolean security, String... actions) { StringBuilder sb = new StringBuilder(""); String res; for (String anAction : actions) { sb.append("<br>"); - sb.append(generateString(getMessages().get( - "simexplorer.ui.web." + anAction + ".action"), anAction, - element)); + sb + .append(generateString(getMessages().get("simexplorer.ui.web." + anAction + ".action"), anAction, + element)); } if (security) { sb.append("<br>"); - sb.append(generateString(getMessages().get( - "simexplorer.ui.web.rights.action"), "rights", element)); + sb.append(generateString(getMessages().get("simexplorer.ui.web.rights.action"), "rights", element)); } res = sb.substring(4); @@ -232,23 +215,17 @@ /** * Generate string array. * - * @param s1 - * the s1 - * @param s2 - * the s2 - * @param s3 - * the s3 - * @param element - * the element - * @param security - * the security - * @param actions - * the actions + * @param s1 the s1 + * @param s2 the s2 + * @param s3 the s3 + * @param element the element + * @param security the security + * @param actions the actions * * @return the string[] */ - protected String[] generateStringArray(String s1, String s2, String s3, - MetaData element, boolean security, String... actions) { + protected String[] generateStringArray(String s1, String s2, String s3, MetaData element, boolean security, + String... actions) { List<String> result = new ArrayList<String>(); result.add(s1); result.add(s2); @@ -265,8 +242,7 @@ /** * Generate string array. * - * @param s - * the s + * @param s the s * * @return the string[] */ @@ -294,31 +270,25 @@ public List<TreeNode> getMetadataNodes() { List<TreeNode> nodes = new ArrayList<TreeNode>(); MetaData m = getMetadata(); - 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"), m.getType())); - nodes - .add(simpleNode(getMessages().get( - "simexplorer.ui.web.metadata.description"), m - .getDescription())); - // FIXME date tostring - nodes.add(simpleNode(getMessages().get( - "simexplorer.ui.web.metadata.creationDate"), m - .getCreationDate().toString())); - nodes.add(simpleNode(getMessages().get( - "simexplorer.ui.web.metadata.hash"), m.getHash())); - nodes.add(simpleNode(getMessages().get( - "simexplorer.ui.web.metadata.parentversion.uuid"), m - .getParentVersionUuid())); - nodes.add(simpleNode(getMessages().get( - "simexplorer.ui.web.metadata.parentversion.version"), m - .getParentVersionVersion())); + 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"), m.getType())); + 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 + .getCreationDate()))); + + nodes.add(simpleNode(getMessages().get("simexplorer.ui.web.metadata.hash"), m.getHash())); + + if (m.getParentVersionUuid() != null && m.getParentVersionVersion() != null) { + String parentContext = m.getParentVersionUuid() + "," + m.getParentVersionVersion(); + + nodes.add(simpleNode(getMessages().get("simexplorer.ui.web.metadata.parentversion"), generateString(m + .getParentVersionUuid() + + " - " + m.getParentVersionVersion(), "details", parentContext))); + } + nodes.add(descriptorsNode(m.getDescriptors())); nodes.add(attachmentsNode(m.getAttachments())); return nodes; @@ -327,29 +297,24 @@ /** * Attachments node. * - * @param attachments - * the attachments + * @param attachments the attachments * * @return the tree node */ private TreeNode attachmentsNode(List<Attachment> attachments) { TreeNode aNode = new TreeNode(); aNode.setType(TreeNode.TYPE_FOLDER); - aNode.setColumns(generateStringArray(getMessages().get( - "simexplorer.ui.web.metadata.attachments"))); + aNode.setColumns(generateStringArray(getMessages().get("simexplorer.ui.web.metadata.attachments"))); List<TreeNode> attachmentNodes = new ArrayList<TreeNode>(); for (Attachment attachment : attachments) { StringBuffer description = new StringBuffer(); if (attachment.getContentType() != null) { - description - .append(attachment.getContentType().getDescription()) - .append(" - "); + description.append(attachment.getContentType().getDescription()).append(" - "); } if (attachment.getContentType() != null) { description.append("MD5 : ").append(attachment.getDataHash()); } - attachmentNodes.add(simpleNode(attachment.getFileName(), - description.toString())); + attachmentNodes.add(simpleNode(attachment.getFileName(), description.toString())); } aNode.setChildren(attachmentNodes); return aNode; @@ -358,20 +323,17 @@ /** * Descriptors node. * - * @param descriptors - * the descriptors + * @param descriptors the descriptors * * @return the tree node */ private TreeNode descriptorsNode(Map<String, String> descriptors) { TreeNode aNode = new TreeNode(); aNode.setType(TreeNode.TYPE_FOLDER); - aNode.setColumns(generateStringArray(getMessages().get( - "simexplorer.ui.web.metadata.descriptors"))); + aNode.setColumns(generateStringArray(getMessages().get("simexplorer.ui.web.metadata.descriptors"))); List<TreeNode> descriptorNodes = new ArrayList<TreeNode>(); for (Map.Entry<String, String> descriptor : descriptors.entrySet()) { - descriptorNodes.add(simpleNode(descriptor.getKey(), descriptor - .getValue())); + descriptorNodes.add(simpleNode(descriptor.getKey(), descriptor.getValue())); } aNode.setChildren(descriptorNodes); return aNode; @@ -380,10 +342,8 @@ /** * Simple node. * - * @param s1 - * the s1 - * @param s2 - * the s2 + * @param s1 the s1 + * @param s2 the s2 * * @return the tree node */ 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-15 13:15:05 UTC (rev 987) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/AppModule.java 2008-02-15 13:15:27 UTC (rev 988) @@ -18,11 +18,15 @@ package fr.cemagref.simexplorer.is.ui.web.services; import java.io.IOException; +import java.math.BigDecimal; +import org.apache.tapestry.ioc.Configuration; import org.apache.tapestry.ioc.MappedConfiguration; import org.apache.tapestry.ioc.OrderedConfiguration; import org.apache.tapestry.ioc.ServiceBinder; import org.apache.tapestry.ioc.annotations.InjectService; +import org.apache.tapestry.ioc.services.Coercion; +import org.apache.tapestry.ioc.services.CoercionTuple; import org.apache.tapestry.services.Request; import org.apache.tapestry.services.RequestFilter; import org.apache.tapestry.services.RequestHandler; @@ -30,6 +34,8 @@ import org.apache.tapestry.services.ValueEncoderFactory; import org.slf4j.Logger; +import fr.cemagref.simexplorer.is.entities.metadata.Version; + /** * The Class AppModule. */ @@ -38,8 +44,7 @@ /** * Bind. * - * @param binder - * the binder + * @param binder the binder */ public static void bind(ServiceBinder binder) { /* @@ -56,11 +61,9 @@ /** * Contribute application defaults. * - * @param configuration - * the configuration + * @param configuration the configuration */ - public static void contributeApplicationDefaults( - MappedConfiguration<String, String> configuration) { + public static void contributeApplicationDefaults(MappedConfiguration<String, String> configuration) { configuration.add("tapestry.supported-locales", "en,fr"); configuration.add("tapestry.scriptaculous.path", "fr/cemagref/simexplorer/is/ui/web/scriptaculous"); } @@ -68,12 +71,10 @@ /** * Contribute value encoder source. * - * @param configuration - * the configuration + * @param configuration the configuration */ @SuppressWarnings("unchecked") - public static void contributeValueEncoderSource( - MappedConfiguration<Class, ValueEncoderFactory> configuration) { + public static void contributeValueEncoderSource(MappedConfiguration<Class, ValueEncoderFactory> configuration) { /* configuration.add(User.class, new GenericValueEncoderFactory<User>( new UserValueEncoder())); @@ -83,33 +84,47 @@ } /** - * This is a service definition, the service will be named "TimingFilter". - * The interface, RequestFilter, is used within the RequestHandler service - * pipeline, which is built from the RequestHandler service configuration. - * Tapestry IoC is responsible for passing in an appropriate Log instance. - * Requests for static resources are handled at a higher level, so this - * filter will only be invoked for Tapestry related requests. + * Contribute type coercer. * + * @param configuration the configuration + */ + public static void contributeTypeCoercer(Configuration<CoercionTuple> configuration) { + Coercion<Version, String> coercionVersionString = new Coercion<Version, String>() { + public String coerce(Version input) { + return input.toString(); + } + }; + Coercion<String, Version> coercionStringVersion = new Coercion<String, Version>() { + public Version coerce(String input) { + return Version.valueOf(input); + } + }; + configuration.add(new CoercionTuple<Version, String>(Version.class, String.class, coercionVersionString)); + configuration.add(new CoercionTuple<String, Version>(String.class, Version.class, coercionStringVersion)); + } + + /** + * This is a service definition, the service will be named "TimingFilter". The interface, RequestFilter, is used + * within the RequestHandler service pipeline, which is built from the RequestHandler service configuration. + * Tapestry IoC is responsible for passing in an appropriate Log instance. Requests for static resources are handled + * at a higher level, so this filter will only be invoked for Tapestry related requests. + * * <p> - * Service builder methods are useful when the implementation is inline as - * an inner class (as here) or require some other kind of special - * initialization. In most cases, use the static bind() method instead. + * Service builder methods are useful when the implementation is inline as an inner class (as here) or require some + * other kind of special initialization. In most cases, use the static bind() method instead. * * <p> - * If this method was named "build", then the service id would be taken from - * the service interface and would be "RequestFilter". Since Tapestry - * already defines a service named "RequestFilter" we use an explicit - * service id that we can reference inside the contribution method. + * If this method was named "build", then the service id would be taken from the service interface and would be + * "RequestFilter". Since Tapestry already defines a service named "RequestFilter" we use an explicit service id + * that we can reference inside the contribution method. * - * @param log - * the log + * @param log the log * * @return the request filter */ public RequestFilter buildTimingFilter(final Logger log) { return new RequestFilter() { - public boolean service(Request request, Response response, - RequestHandler handler) throws IOException { + public boolean service(Request request, Response response, RequestHandler handler) throws IOException { long startTime = System.currentTimeMillis(); try { @@ -130,17 +145,13 @@ } /** - * This is a contribution to the RequestHandler service configuration. This - * is how we extend Tapestry using the timing filter. A common use for this - * kind of filter is transaction management or security. + * This is a contribution to the RequestHandler service configuration. This is how we extend Tapestry using the + * timing filter. A common use for this kind of filter is transaction management or security. * - * @param configuration - * the configuration - * @param filter - * the filter + * @param configuration the configuration + * @param filter the filter */ - public void contributeRequestHandler( - OrderedConfiguration<RequestFilter> configuration, + public void contributeRequestHandler(OrderedConfiguration<RequestFilter> configuration, @InjectService("TimingFilter") RequestFilter filter) { // Each contribution to an ordered configuration has a name, When @@ -149,6 +160,6 @@ // contributed filter // within the pipeline. - //configuration.add("Timing", filter); + // configuration.add("Timing", filter); } } Modified: trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/ElementMetadata.tml =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/ElementMetadata.tml 2008-02-15 13:15:05 UTC (rev 987) +++ trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/ElementMetadata.tml 2008-02-15 13:15:27 UTC (rev 988) @@ -1,10 +1,38 @@ <t:layout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd" title="${windowtitle}"> + <p> + <h2>${message:simexplorer.ui.web.metadata.properties}</h2> + </p> + <table t:type="cl/TreeGrid" source="metadataNodes" columnHeaders="metadataHeaders"> </table> + <p> + <h2>${message:simexplorer.ui.web.metadata.usedby}</h2> + </p> + + + <table t:type="Grid" source="elementsUsed" row="element" model="model"> + <t:parameter name="uuidCell"> + <t:actionlink t:id="detailElementUsed" + context="${detailElementContext}">${message:simexplorer.ui.web.elementlist.details}</t:actionlink> + </t:parameter> + </table> + + <p> + <h2>${message:simexplorer.ui.web.metadata.using}</h2> + </p> + + + <table t:type="Grid" source="elementsUsing" row="element" model="model"> + <t:parameter name="uuidCell"> + <t:actionlink t:id="detailElementUsing" + context="${detailElementContext}">${message:simexplorer.ui.web.elementlist.details}</t:actionlink> + </t:parameter> + </table> + <p><t:back label="${message:simexplorer.ui.web.back}" /></p> </t:layout> Modified: trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/WEB-INF/app.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/WEB-INF/app.properties 2008-02-15 13:15:05 UTC (rev 987) +++ trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/WEB-INF/app.properties 2008-02-15 13:15:27 UTC (rev 988) @@ -109,6 +109,9 @@ simexplorer.ui.web.elementlist.details=Details +simexplorer.ui.web.metadata.properties=Properties +simexplorer.ui.web.metadata.usedby=This element is used by +simexplorer.ui.web.metadata.using=This element is using simexplorer.ui.web.metadata.action=Metadata simexplorer.ui.web.metadata.uuid=UUID simexplorer.ui.web.metadata.version=Version @@ -117,10 +120,7 @@ simexplorer.ui.web.metadata.description=Description simexplorer.ui.web.metadata.creationDate=Creation date simexplorer.ui.web.metadata.hash=Hash -simexplorer.ui.web.metadata.parentdata.uuid=Data parent : UUID -simexplorer.ui.web.metadata.parentdata.version=Data parent : Version -simexplorer.ui.web.metadata.parentversion.uuid=Version parent : UUID -simexplorer.ui.web.metadata.parentversion.version=Version parent : Version +simexplorer.ui.web.metadata.parentversion=Parent version simexplorer.ui.web.metadata.attachments=Attachments simexplorer.ui.web.metadata.descriptors=Descriptors Modified: trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/WEB-INF/app_fr.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/WEB-INF/app_fr.properties 2008-02-15 13:15:05 UTC (rev 987) +++ trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/WEB-INF/app_fr.properties 2008-02-15 13:15:27 UTC (rev 988) @@ -109,6 +109,9 @@ simexplorer.ui.web.elementlist.details=Details +simexplorer.ui.web.metadata.properties=Properties +simexplorer.ui.web.metadata.usedby=This element is used by +simexplorer.ui.web.metadata.using=This element is using simexplorer.ui.web.metadata.action=Metadonnées simexplorer.ui.web.metadata.uuid=UUID simexplorer.ui.web.metadata.version=Version @@ -117,10 +120,7 @@ simexplorer.ui.web.metadata.description=Description simexplorer.ui.web.metadata.creationDate=Date de création simexplorer.ui.web.metadata.hash=Hash -simexplorer.ui.web.metadata.parentdata.uuid=Parent de données : UUID -simexplorer.ui.web.metadata.parentdata.version=Parent de données : Version -simexplorer.ui.web.metadata.parentversion.uuid=Parent de version : UUID -simexplorer.ui.web.metadata.parentversion.version=Parent de version : Version +simexplorer.ui.web.metadata.parentversion=Parent de version simexplorer.ui.web.metadata.attachments=Fichiers simexplorer.ui.web.metadata.descriptors=Descripteurs