Author: glandais Date: 2008-02-07 14:34:32 +0000 (Thu, 07 Feb 2008) New Revision: 717 Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementMetadata.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPageDetail.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementRights.java trunk/simexplorer-is-web/src/main/webapp/ElementMetadata.tml trunk/simexplorer-is-web/src/main/webapp/ElementRights.tml Log: Affichage des metadata Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementMetadata.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementMetadata.java 2008-02-07 14:28:29 UTC (rev 716) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementMetadata.java 2008-02-07 14:34:32 UTC (rev 717) @@ -17,15 +17,6 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.web.pages; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -import org.codelutin.tapestry.beans.TreeNode; - -import fr.cemagref.simexplorer.is.attachment.Attachment; -import fr.cemagref.simexplorer.is.entities.metadata.MetaData; - /** * The Class ElementMetadata. */ @@ -39,134 +30,4 @@ return getMessages().get("simexplorer.ui.web.title.elementmetadata"); } - /** - * Headers of tree grid. - * - * @return Headers - */ - public List<String> getHeaders() { - List<String> result = new ArrayList<String>(); - result.add(getMessages().get("simexplorer.ui.web.name")); - result.add(getMessages().get("simexplorer.ui.web.value")); - return result; - } - - /** - * Gets the versions. - * - * @return the versions - */ - public List<TreeNode> getNodes() { - 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.parentdata.uuid"), m - .getParentDataUuid())); - nodes.add(simpleNode(getMessages().get( - "simexplorer.ui.web.metadata.parentdata.version"), m - .getParentDataVersion())); - 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(descriptorsNode(m.getDescriptors())); - nodes.add(attachmentsNode(m.getAttachments())); - return nodes; - } - - /** - * Attachments node. - * - * @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"))); - List<TreeNode> attachmentNodes = new ArrayList<TreeNode>(); - for (Attachment attachment : attachments) { - StringBuffer description = new StringBuffer(); - if (attachment.getContentType() != null) { - description - .append(attachment.getContentType().getDescription()) - .append(" - "); - } - if (attachment.getContentType() != null) { - description.append("MD5 : ").append(attachment.getDataHash()); - } - attachmentNodes.add(simpleNode(attachment.getFileName(), - description.toString())); - } - aNode.setChildren(attachmentNodes); - return aNode; - } - - /** - * Descriptors node. - * - * @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"))); - List<TreeNode> descriptorNodes = new ArrayList<TreeNode>(); - for (Map.Entry<String, String> descriptor : descriptors.entrySet()) { - descriptorNodes.add(simpleNode(descriptor.getKey(), descriptor - .getValue())); - } - aNode.setChildren(descriptorNodes); - return aNode; - } - - /** - * Simple node. - * - * @param s1 - * the s1 - * @param s2 - * the s2 - * - * @return the tree node - */ - private TreeNode simpleNode(String s1, String s2) { - TreeNode aNode = new TreeNode(); - aNode.setType(TreeNode.TYPE_DOCUMENT); - String rs2 = s2; - if (rs2 == null) { - rs2 = ""; - } - aNode.setColumns(generateStringArray(s1, rs2)); - return aNode; - } - } Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPageDetail.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPageDetail.java 2008-02-07 14:28:29 UTC (rev 716) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPageDetail.java 2008-02-07 14:34:32 UTC (rev 717) @@ -19,13 +19,16 @@ import java.util.ArrayList; import java.util.List; +import java.util.Map; 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.attachment.Attachment; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; /** @@ -271,4 +274,134 @@ return s; } + /** + * Headers of tree grid. + * + * @return Headers + */ + public List<String> getMetadataHeaders() { + List<String> result = new ArrayList<String>(); + result.add(getMessages().get("simexplorer.ui.web.name")); + result.add(getMessages().get("simexplorer.ui.web.value")); + return result; + } + + /** + * Gets the versions. + * + * @return the versions + */ + 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.parentdata.uuid"), m + .getParentDataUuid())); + nodes.add(simpleNode(getMessages().get( + "simexplorer.ui.web.metadata.parentdata.version"), m + .getParentDataVersion())); + 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(descriptorsNode(m.getDescriptors())); + nodes.add(attachmentsNode(m.getAttachments())); + return nodes; + } + + /** + * Attachments node. + * + * @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"))); + List<TreeNode> attachmentNodes = new ArrayList<TreeNode>(); + for (Attachment attachment : attachments) { + StringBuffer description = new StringBuffer(); + if (attachment.getContentType() != null) { + description + .append(attachment.getContentType().getDescription()) + .append(" - "); + } + if (attachment.getContentType() != null) { + description.append("MD5 : ").append(attachment.getDataHash()); + } + attachmentNodes.add(simpleNode(attachment.getFileName(), + description.toString())); + } + aNode.setChildren(attachmentNodes); + return aNode; + } + + /** + * Descriptors node. + * + * @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"))); + List<TreeNode> descriptorNodes = new ArrayList<TreeNode>(); + for (Map.Entry<String, String> descriptor : descriptors.entrySet()) { + descriptorNodes.add(simpleNode(descriptor.getKey(), descriptor + .getValue())); + } + aNode.setChildren(descriptorNodes); + return aNode; + } + + /** + * Simple node. + * + * @param s1 + * the s1 + * @param s2 + * the s2 + * + * @return the tree node + */ + private TreeNode simpleNode(String s1, String s2) { + TreeNode aNode = new TreeNode(); + aNode.setType(TreeNode.TYPE_DOCUMENT); + String rs2 = s2; + if (rs2 == null) { + rs2 = ""; + } + aNode.setColumns(generateStringArray(s1, rs2)); + return aNode; + } + } Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementRights.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementRights.java 2008-02-07 14:28:29 UTC (rev 716) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementRights.java 2008-02-07 14:34:32 UTC (rev 717) @@ -39,7 +39,7 @@ /** * The Class ElementRights. */ -public class ElementRights extends ElementPage { +public class ElementRights extends ElementPageDetail { /** The user encoder. */ @Persist Modified: trunk/simexplorer-is-web/src/main/webapp/ElementMetadata.tml =================================================================== --- trunk/simexplorer-is-web/src/main/webapp/ElementMetadata.tml 2008-02-07 14:28:29 UTC (rev 716) +++ trunk/simexplorer-is-web/src/main/webapp/ElementMetadata.tml 2008-02-07 14:34:32 UTC (rev 717) @@ -1,7 +1,8 @@ <t:layout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd" title="${windowtitle}"> - <table t:type="cl/TreeGrid" source="nodes" columnHeaders="headers"> + <table t:type="cl/TreeGrid" source="metadataNodes" + columnHeaders="metadataHeaders"> </table> <p><t:back label="${message:simexplorer.ui.web.back}" /></p> Modified: trunk/simexplorer-is-web/src/main/webapp/ElementRights.tml =================================================================== --- trunk/simexplorer-is-web/src/main/webapp/ElementRights.tml 2008-02-07 14:28:29 UTC (rev 716) +++ trunk/simexplorer-is-web/src/main/webapp/ElementRights.tml 2008-02-07 14:34:32 UTC (rev 717) @@ -6,45 +6,52 @@ <p> <h2>${message:simexplorer.ui.web.rights.properties}</h2> </p> - <p></p> + <table t:type="cl/TreeGrid" source="metadataNodes" + columnHeaders="metadataHeaders"> + </table> <hr /> <p> <h2>${message:simexplorer.ui.web.rights.owner}</h2> </p> <p><input t:type="Palette" model="users" selected="ownerUsers" - encoder="userEncoder" />${message:simexplorer.ui.web.rights.groups} :<input t:type="Palette" - model="groups" selected="ownerGroups" encoder="groupEncoder" /></p> + encoder="userEncoder" />${message:simexplorer.ui.web.rights.groups} + :<input t:type="Palette" model="groups" selected="ownerGroups" + encoder="groupEncoder" /></p> <hr /> <p> <h2>${message:simexplorer.ui.web.rights.read}</h2> </p> - <p>${message:simexplorer.ui.web.rights.users} :<input t:type="Palette" model="users" - selected="readUsers" encoder="userEncoder" />${message:simexplorer.ui.web.rights.groups} :<input - t:type="Palette" model="groups" selected="readGroups" + <p>${message:simexplorer.ui.web.rights.users} :<input + t:type="Palette" model="users" selected="readUsers" + encoder="userEncoder" />${message:simexplorer.ui.web.rights.groups} + :<input t:type="Palette" model="groups" selected="readGroups" encoder="groupEncoder" /></p> <hr /> <p> <h2>${message:simexplorer.ui.web.rights.write}</h2> </p> - <p>${message:simexplorer.ui.web.rights.users} :<input t:type="Palette" model="users" - selected="writeUsers" encoder="userEncoder" />${message:simexplorer.ui.web.rights.groups} :<input - t:type="Palette" model="groups" selected="writeGroups" + <p>${message:simexplorer.ui.web.rights.users} :<input + t:type="Palette" model="users" selected="writeUsers" + encoder="userEncoder" />${message:simexplorer.ui.web.rights.groups} + :<input t:type="Palette" model="groups" selected="writeGroups" encoder="groupEncoder" /></p> <hr /> <p> <h2>${message:simexplorer.ui.web.rights.admin}</h2> </p> - <p>${message:simexplorer.ui.web.rights.users} :<input t:type="Palette" model="users" - selected="adminUsers" encoder="userEncoder" />${message:simexplorer.ui.web.rights.groups} :<input - t:type="Palette" model="groups" selected="adminGroups" + <p>${message:simexplorer.ui.web.rights.users} :<input + t:type="Palette" model="users" selected="adminUsers" + encoder="userEncoder" />${message:simexplorer.ui.web.rights.groups} + :<input t:type="Palette" model="groups" selected="adminGroups" encoder="groupEncoder" /></p> <hr /> - <p><input t:type="Submit" t:value="${message:simexplorer.ui.web.submit}" /> <t:back + <p><input t:type="Submit" + t:value="${message:simexplorer.ui.web.submit}" /> <t:back label="${message:simexplorer.ui.web.back}" /></p> </t:form>