February 2008 - Simexplorer-si-commits - mailman.cloud.codelutin.com

r725 - in trunk: simexplorer-is/src/site/fr/rst simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/credentials simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service
by glandais＠users.labs.libre-entreprise.org Feb. 7, 2008

Feb. 7, 2008

Author: glandais Date: 2008-02-07 15:50:47 +0000 (Thu, 07 Feb 2008) New Revision: 725 Modified: trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/credentials/CredentialManagerImpl.java trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoSecurity.java trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoSecurityImpl.java trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceMassInsert.java trunk/simexplorer-is/src/site/fr/rst/todo.rst Log: Cr?\195?\169ation permission lors de la sauvegarde uniquement si n?\195?\169cessaire Modified: trunk/simexplorer-is/src/site/fr/rst/todo.rst =================================================================== --- trunk/simexplorer-is/src/site/fr/rst/todo.rst 2008-02-07 14:51:28 UTC (rev 724) +++ trunk/simexplorer-is/src/site/fr/rst/todo.rst 2008-02-07 15:50:47 UTC (rev 725) @@ -15,7 +15,6 @@ Consultation ------------ - - Détails metadata - Interface utilisateur : CSS, mise en page Client lourd Modified: trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/credentials/CredentialManagerImpl.java =================================================================== --- trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/credentials/CredentialManagerImpl.java 2008-02-07 14:51:28 UTC (rev 724) +++ trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/credentials/CredentialManagerImpl.java 2008-02-07 15:50:47 UTC (rev 725) @@ -110,14 +110,29 @@ * @see fr.cemagref.simexplorer.is.security.credentials.CredentialManager#saveElement(java.lang.String, java.lang.String) */ public Permission saveElement(String token, String businessId) { - Permission p = new Permission(); - p.setActor(dao.getLoggedUser(token)); - p.setBusinessId(businessId); + Permission p = getPermission(token, businessId); + boolean createPermission = false; + if (p == null) { + createPermission = true; + } + if (p != null) { + User user = dao.getLoggedUser(token); + if (!user.getId().equals(p.getActor().getId())) { + createPermission = true; + } + } + if (createPermission) { + p = new Permission(); + p.setActor(dao.getLoggedUser(token)); + p.setBusinessId(businessId); + dao.savePermission(p); + } p.setCanAdmin(true); p.setCanRead(true); p.setCanWrite(true); p.setOwner(true); - dao.savePermission(p); + dao.updatePermission(p); + return p; } Modified: trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoSecurity.java =================================================================== --- trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoSecurity.java 2008-02-07 14:51:28 UTC (rev 724) +++ trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoSecurity.java 2008-02-07 15:50:47 UTC (rev 725) @@ -234,6 +234,14 @@ public void savePermission(Permission p); /** + * Update permission. + * + * @param p + * the p + */ + public void updatePermission(Permission p); + + /** * Sets the permissions. * * @param uuid Modified: trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoSecurityImpl.java =================================================================== --- trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoSecurityImpl.java 2008-02-07 14:51:28 UTC (rev 724) +++ trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoSecurityImpl.java 2008-02-07 15:50:47 UTC (rev 725) @@ -306,4 +306,9 @@ } } + @Override + public void updatePermission(Permission p) { + em.merge(p); + } + } Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java =================================================================== --- trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java 2008-02-07 14:51:28 UTC (rev 724) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java 2008-02-07 15:50:47 UTC (rev 725) @@ -57,6 +57,7 @@ public abstract class StorageServiceCommon implements StorageService, XmlConstants { + /** The xml attachment. */ private Attachment xmlAttachment = null; /** @@ -80,6 +81,11 @@ getStorageEngine().close(); } + /** + * Gets the xML attachment. + * + * @return the xML attachment + */ private Attachment getXMLAttachment() { if (xmlAttachment == null) { xmlAttachment = new Attachment(); Modified: trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceMassInsert.java =================================================================== --- trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceMassInsert.java 2008-02-07 14:51:28 UTC (rev 724) +++ trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceMassInsert.java 2008-02-07 15:50:47 UTC (rev 725) @@ -77,29 +77,6 @@ storageService = (StorageService) context.lookup("StorageService"); } - /* - public void testExportXML() throws Exception { - ExplorationApplication ea = elementGenerator.generateRandomEA(); - InputStream xmlStream = BaseEntityFactory.getFactory( - ExplorationApplication.class).saveElement(ea); - - FileOutputStream os = new FileOutputStream( - "/var/local/simexplorer/test.xml"); - - // Buffer copy stream to stream - BufferedInputStream bin = new BufferedInputStream(xmlStream); - BufferedOutputStream bout = new BufferedOutputStream(os); - - while (true) { - int datum = bin.read(); - if (datum == -1) - break; - bout.write(datum); - } - bout.flush(); - } - */ - /** * Test mass insert. *

1 0

r724 - trunk/simexplorer-is/src/site/fr/rst
by tchemit＠users.labs.libre-entreprise.org Feb. 7, 2008

Feb. 7, 2008

Author: tchemit Date: 2008-02-07 14:51:28 +0000 (Thu, 07 Feb 2008) New Revision: 724 Modified: trunk/simexplorer-is/src/site/fr/rst/todo.rst Log: todo Modified: trunk/simexplorer-is/src/site/fr/rst/todo.rst =================================================================== --- trunk/simexplorer-is/src/site/fr/rst/todo.rst 2008-02-07 14:47:15 UTC (rev 723) +++ trunk/simexplorer-is/src/site/fr/rst/todo.rst 2008-02-07 14:51:28 UTC (rev 724) @@ -23,4 +23,5 @@ - Synchronisation d'un élément avec le serveur - Communication avec le serveur via SSL - \ No newline at end of file + - export, import + - configuration \ No newline at end of file

1 0

r723 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing
by tchemit＠users.labs.libre-entreprise.org Feb. 7, 2008

Feb. 7, 2008

Author: tchemit Date: 2008-02-07 14:47:15 +0000 (Thu, 07 Feb 2008) New Revision: 723 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelper.java Log: descriptors +meilleur calcul taille TODO faire de meme pour la table Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelper.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelper.java 2008-02-07 14:46:25 UTC (rev 722) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelper.java 2008-02-07 14:47:15 UTC (rev 723) @@ -47,6 +47,7 @@ import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreeNode; import java.awt.Dimension; +import java.awt.Rectangle; import java.text.SimpleDateFormat; import java.util.List; import java.util.regex.Matcher; @@ -306,6 +307,7 @@ MetaData detail = model.getDetail(); ui.getDetailVersions().setSelectedIndex(index); ui.getDetailHeader().setText(_("simexplorer.node.detail", selectedNode.getMetaData().getName(), model.getSelectedVersion())); + ui.getDetailDescriptorsHeader().setText(_("simexplorer.node.descriptors", detail.getDescriptors().size())); ui.getDetailType().setText(detail.getType()); ui.getDetailDescription().setText(detail.getDescription()); ui.getDetailCreationDate().setText(DATE_FORMAT.format(detail.getCreationDate())); @@ -313,8 +315,8 @@ JTable table = ui.getDetailTable(); ((JDetailTableModel) table.getModel()).setData(detail); int nbRows = table.getRowCount() + 1; - if (nbRows > 20) { - nbRows = 20; + if (nbRows > 11) { + nbRows = 11; } ui.getScrollTable().setPreferredSize(new Dimension((int) table.getSize().getWidth(), 2 + (nbRows * (4 + table.getFont().getSize())))); List<Attachment> attachments = detail.getAttachments(); @@ -339,7 +341,9 @@ } Dimension dimHead = ui.getDetailHeaderAttachmentsPanel().getPreferredSize(); listAttachments.setVisible(true); - ui.getScrollAttachments().setPreferredSize(new Dimension((int) dimHead.getWidth(), (int) (dimHead.getHeight() + 4 + (nbRows * (4 + listAttachments.getFont().getSize()))))); + Rectangle rect = listAttachments.getUI().getCellBounds(listAttachments, 0, 0); + double h = rect.getHeight(); + ui.getScrollAttachments().setPreferredSize(new Dimension((int) dimHead.getWidth(), (int) (dimHead.getHeight() +3+ nbRows * h))); } table.invalidate();

1 0

r722 - trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab
by tchemit＠users.labs.libre-entreprise.org Feb. 7, 2008

Feb. 7, 2008

Author: tchemit Date: 2008-02-07 14:46:25 +0000 (Thu, 07 Feb 2008) New Revision: 722 Modified: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx Log: suppression label (g?\195?\169r?\195?\169 dans java) Modified: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx =================================================================== --- trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx 2008-02-07 14:46:06 UTC (rev 721) +++ trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx 2008-02-07 14:46:25 UTC (rev 722) @@ -71,7 +71,7 @@ <row> <cell fill='both' columns="2"> <JPanel background='{Color.WHITE}' border='{javax.swing.border.LineBorder.createBlackLineBorder()}'> - <JLabel id='detailDescriptorsHeader' text='{_("simexplorer.node.descriptors")}'/> + <JLabel id='detailDescriptorsHeader'/> </JPanel> </cell> </row>

1 0

r721 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service
by tchemit＠users.labs.libre-entreprise.org Feb. 7, 2008

Feb. 7, 2008

Author: tchemit Date: 2008-02-07 14:46:06 +0000 (Thu, 07 Feb 2008) New Revision: 721 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockDatabase.java Log: g?\195?\169n?\195?\169ration de versions sur les LE internes d'un EApplication Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockDatabase.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockDatabase.java 2008-02-07 14:45:15 UTC (rev 720) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockDatabase.java 2008-02-07 14:46:06 UTC (rev 721) @@ -31,6 +31,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; +import java.util.Set; import java.util.SortedMap; import java.util.TreeMap; @@ -67,6 +68,8 @@ VersionGenerator versionGenerator; + ElementGenerator elementGenerator; + public MockDatabase() { try { init(); @@ -83,7 +86,7 @@ public void init() throws Exception { - ElementGenerator elementGenerator = new ElementGenerator(); + elementGenerator = new ElementGenerator(); r = new Random(); @@ -116,7 +119,7 @@ } } - protected void registerEA(String uuid, ExplorationApplication... eas) { + protected void registerEA(String uuid, ExplorationApplication... eas) throws Exception { this.eas.put(uuid, eas); registerLoggableElement(uuid, eas); for (Component component : eas[0].getComponents()) { @@ -130,7 +133,26 @@ } } - protected void registerLoggableElement(String uuid, LoggableElement... loggableElements) { + protected void registerLoggableElement(String uuid, LoggableElement... loggableElements) throws Exception { + if (loggableElements.length == 1) { + // generate versions for the unique LE given + LoggableElement loggableElement = loggableElements[0]; + loggableElement.getMetaData().setLatest(false); + Set<? extends LoggableElement> sons = elementGenerator.generateArray(loggableElement.getClass()); + int nbSons = 1 + sons.size(); + Version[] versions = versionGenerator.generateVersions(nbSons + 1); + loggableElement.getMetaData().setVersion(versions[0].toString()); + List<LoggableElement> listSons = new ArrayList<LoggableElement>(nbSons); + listSons.add(loggableElement); + int j = 0; + for (LoggableElement sonEA : sons) { + sonEA.setParentData(loggableElement); + sonEA.getMetaData().setUuid(uuid); + sonEA.getMetaData().setVersion(versions[++j].toString()); + listSons.add(sonEA); + } + loggableElements = listSons.toArray(new LoggableElement[listSons.size()]); + } this.loggableElements.put(uuid, loggableElements); List<MetaData> datas = new ArrayList<MetaData>(); for (LoggableElement data : loggableElements) {

1 0

r720 - trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service
by tchemit＠users.labs.libre-entreprise.org Feb. 7, 2008

Feb. 7, 2008

Author: tchemit Date: 2008-02-07 14:45:15 +0000 (Thu, 07 Feb 2008) New Revision: 720 Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/ElementGenerator.java Log: inline variables generations de plus d'un attachment Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/ElementGenerator.java =================================================================== --- trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/ElementGenerator.java 2008-02-07 14:39:57 UTC (rev 719) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/ElementGenerator.java 2008-02-07 14:45:15 UTC (rev 720) @@ -174,15 +174,15 @@ metaData.setType(element.getClass().getSimpleName()); StringBuffer sb = new StringBuffer(""); - int c = 3 + r.nextInt(5); - for (int i = 0; i < c; i++) { + + for (int i = 0,max = 3 + r.nextInt(5); i < max; i++) { sb.append(randomstrings[r.nextInt(cs)]).append(" "); } metaData.setDescription(sb.toString()); Version v = new Version("0"); - c = 2 + r.nextInt(2); - for (int i = 0; i < c; i++) { + + for (int i = 0,max = 2 + r.nextInt(2); i < max; i++) { v.setVersion(i, r.nextInt(5)); } metaData.setVersion(v.toString()); @@ -191,12 +191,19 @@ metaData.setLatest(true); Map<String, String> descriptors = new HashMap<String, String>(); - int i = 5 + r.nextInt(10); - for (int j = 0; j < i; j++) { - descriptors.put(Integer.toString(j), shortString()); + for (int i = 0,max = 1+ r.nextInt(12); i < max; i++) { + descriptors.put(Integer.toString(i), shortString()); } metaData.setDescriptors(descriptors); + + if (element instanceof Library || element instanceof ExplorationData) { + // generate attachments + for (int i=0,max = r.nextInt(15);i<max;i++) { + metaData.getAttachments().add(generateAttachment()); + } + } + element.setMetaData(metaData); } @@ -211,7 +218,7 @@ * @throws Exception * the exception */ - private <T extends DataEntity> Set<T> generateArray(Class<T> clazz) + public <T extends DataEntity> Set<T> generateArray(Class<T> clazz) throws Exception { Set<T> elements = new HashSet<T>(); int i = 3 + r.nextInt(2); @@ -310,7 +317,7 @@ * the exception */ private void processLibrary(Library library) throws Exception { - library.getMetaData().getAttachments().add(generateAttachment()); + //library.getMetaData().getAttachments().add(generateAttachment()); } /** @@ -348,8 +355,7 @@ throws Exception { Result result = new Result(); explorationData.setResult(result); - explorationData.getMetaData().getAttachments() - .add(generateAttachment()); + //explorationData.getMetaData().getAttachments().add(generateAttachment()); Set<ConstantValue> constantValues = generateArray(ConstantValue.class); for (ConstantValue constantValue : constantValues) {

1 0

r719 - trunk/simexplorer-is-swing/src/resources/i18n
by tchemit＠users.labs.libre-entreprise.org Feb. 7, 2008

Feb. 7, 2008

Author: tchemit Date: 2008-02-07 14:39:57 +0000 (Thu, 07 Feb 2008) New Revision: 719 Modified: trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties Log: ajout title pour descriptors Modified: trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties =================================================================== --- trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-02-07 14:37:55 UTC (rev 718) +++ trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-02-07 14:39:57 UTC (rev 719) @@ -148,6 +148,7 @@ simexplorer.node.components=Components simexplorer.node.constants=Constants simexplorer.node.constantvalues=Constants +simexplorer.node.descriptors=Descriptor(s) ({0}) simexplorer.node.detail=Detail of ''{0}'' [{1}] simexplorer.node.explorations=Exlorations simexplorer.node.libraries=Librairies Modified: trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties =================================================================== --- trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-02-07 14:37:55 UTC (rev 718) +++ trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-02-07 14:39:57 UTC (rev 719) @@ -143,15 +143,16 @@ simexplorer.main.menu=Menu principal simexplorer.main.ui.title=SimExplorer SI v 0.0.1 simexplorer.message.reset.user.configuration= -simexplorer.node.attachments=Fichier(s) attaché(s) ({0}) +simexplorer.node.attachments=Fichier(s) attach\u00E9(s) ({0}) simexplorer.node.codes=Codes simexplorer.node.components=Composants simexplorer.node.constants=Constantes simexplorer.node.constantvalues=Constantes +simexplorer.node.descriptors=Descripteur(s) ({0}) simexplorer.node.detail=D\u00E9tail de ''{0}'' [{1}] simexplorer.node.explorations=Exlorations simexplorer.node.libraries=Librairies -simexplorer.node.noattachments=Pas de fichier attaché +simexplorer.node.noattachments=Pas de fichier attach\u00E9 simexplorer.node.nodetail=Pas de d\u00E9tail simexplorer.node.structures=Structures simexplorer.option.description.config=remplace la valeur d'une propri\u00E9t\u00E9 de clef **key** de la configuration par la valeur **value**.

1 0

r718 - trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab
by tchemit＠users.labs.libre-entreprise.org Feb. 7, 2008

Feb. 7, 2008

Author: tchemit Date: 2008-02-07 14:37:55 +0000 (Thu, 07 Feb 2008) New Revision: 718 Modified: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx Log: ajout title pour descriptors Modified: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx =================================================================== --- trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx 2008-02-07 14:34:32 UTC (rev 717) +++ trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx 2008-02-07 14:37:55 UTC (rev 718) @@ -69,6 +69,13 @@ </cell> </row> <row> + <cell fill='both' columns="2"> + <JPanel background='{Color.WHITE}' border='{javax.swing.border.LineBorder.createBlackLineBorder()}'> + <JLabel id='detailDescriptorsHeader' text='{_("simexplorer.node.descriptors")}'/> + </JPanel> + </cell> + </row> + <row> <cell columns='2' fill='horizontal'> <JScrollPane id='scrollTable'> <JTable id="detailTable" model='{new fr.cemagref.simexplorer.is.ui.swing.model.JDetailTableModel()}' @@ -78,7 +85,7 @@ </row> <row> <cell columns='2' fill='horizontal'> - <JScrollPane id='scrollAttachments'columnHeaderView='{detailHeaderAttachmentsPanel}'> + <JScrollPane id='scrollAttachments' columnHeaderView='{detailHeaderAttachmentsPanel}'> <JList id="detailAttachments" model='{new DefaultListModel()}'/> </JScrollPane> </cell>

1 0

r717 - in trunk/simexplorer-is-web/src: java/fr/cemagref/simexplorer/is/ui/web/pages main/webapp
by glandais＠users.labs.libre-entreprise.org Feb. 7, 2008

Feb. 7, 2008

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>

1 0

r716 - in trunk: simexplorer-is/src/site/fr/rst simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/util simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages simexplorer-is-web/src/main/webapp simexplorer-is-web/src/main/webapp/WEB-INF
by glandais＠users.labs.libre-entreprise.org Feb. 7, 2008

Feb. 7, 2008

Author: glandais Date: 2008-02-07 14:28:29 +0000 (Thu, 07 Feb 2008) New Revision: 716 Added: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementMetadata.java trunk/simexplorer-is-web/src/main/webapp/ElementMetadata.tml Modified: trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/util/KeyValue.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDetail.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementHistory.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPageDetail.java trunk/simexplorer-is-web/src/main/webapp/WEB-INF/app.properties trunk/simexplorer-is-web/src/main/webapp/WEB-INF/app_fr.properties trunk/simexplorer-is/src/site/fr/rst/todo.rst Log: Affichage des metadata Modified: trunk/simexplorer-is/src/site/fr/rst/todo.rst =================================================================== --- trunk/simexplorer-is/src/site/fr/rst/todo.rst 2008-02-07 13:24:16 UTC (rev 715) +++ trunk/simexplorer-is/src/site/fr/rst/todo.rst 2008-02-07 14:28:29 UTC (rev 716) @@ -15,14 +15,9 @@ Consultation ------------ + - Détails metadata - Interface utilisateur : CSS, mise en page -Administration --------------- - - - Gestion des utilisateurs : édition de certaines propriétés en fonction des droits (un admin - ne peut pas mettre un utilisateur superadmin, etc) - Client lourd ============ Modified: trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/util/KeyValue.java =================================================================== --- trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/util/KeyValue.java 2008-02-07 13:24:16 UTC (rev 715) +++ trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/util/KeyValue.java 2008-02-07 14:28:29 UTC (rev 716) @@ -29,6 +29,27 @@ private String value; /** + * Instantiates a new key value. + */ + public KeyValue() { + super(); + } + + /** + * Instantiates a new key value. + * + * @param key + * the key + * @param value + * the value + */ + public KeyValue(String key, String value) { + super(); + this.key = key; + this.value = value; + } + + /** * Gets the key. * * @return the key Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDetail.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDetail.java 2008-02-07 13:24:16 UTC (rev 715) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDetail.java 2008-02-07 14:28:29 UTC (rev 716) @@ -125,7 +125,7 @@ "simexplorer.ui.web.applicationexploration"), getMetadata().getName(), getElement().getMetaData() .getVersion().toString(), getElement() - .getMetaData(), true, "export", "history", + .getMetaData(), true, "metadata", "export", "history", "delete")); List<TreeNode> children = new ArrayList<TreeNode>(); @@ -182,7 +182,7 @@ "simexplorer.ui.web.explorationdata"), explorationData .getMetaData().getName(), explorationData.getMetaData() .getVersion().toString(), explorationData.getMetaData(), true, - "history", "delete")); + "metadata", "history", "delete")); List<TreeNode> children = new ArrayList<TreeNode>(); @@ -288,7 +288,7 @@ componentNode.setColumns(generateStringArray(getMessages().get( "simexplorer.ui.web.component"), component.getMetaData() .getName(), component.getMetaData().getVersion().toString(), - component.getMetaData(), true, "history", "delete")); + component.getMetaData(), true, "metadata", "history", "delete")); List<TreeNode> children = new ArrayList<TreeNode>(); @@ -364,7 +364,7 @@ node.setColumns(generateStringArray(getMessages().get( "simexplorer.ui.web.library"), library.getMetaData().getName(), library.getMetaData().getVersion().toString(), library - .getMetaData(), true, "export")); + .getMetaData(), true, "metadata", "export")); return node; } Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementHistory.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementHistory.java 2008-02-07 13:24:16 UTC (rev 715) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementHistory.java 2008-02-07 14:28:29 UTC (rev 716) @@ -202,7 +202,7 @@ // FIXME date tostring node.setColumns(generateStringArray(mde.getVersion().toString(), mde .getDescription(), mde.getCreationDate().toString(), mde, - false, "export", "delete", "details")); + false, "metadata", "export", "delete", "details")); node.setObject(mde.getVersion()); node.setType(TreeNode.TYPE_DOCUMENT); return node; Added: 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 (rev 0) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementMetadata.java 2008-02-07 14:28:29 UTC (rev 716) @@ -0,0 +1,172 @@ +/* +* ##% Copyright (C) 2008 Code Lutin, Gabriel Landais +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* ##% */ +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. + */ +public class ElementMetadata extends ElementPageDetail { + + /* (non-Javadoc) + * @see fr.cemagref.simexplorer.is.ui.web.pages.security.ProtectedPage#getWindowTitle() + */ + @Override + public String getWindowTitle() { + 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 13:24:16 UTC (rev 715) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPageDetail.java 2008-02-07 14:28:29 UTC (rev 716) @@ -57,23 +57,41 @@ @InjectPage private ElementDetail elementDetail; + /** The element metadata. */ + @InjectPage + private ElementMetadata elementMetadata; + /** - * On export. + * Prepare page. * + * @param page + * the page * @param context * the context * * @return the object */ - public Object onExport(String context) { + private Object preparePage(ElementPage page, String context) { StringTokenizer st = new StringTokenizer(context, ","); String uuid = st.nextToken(); String version = st.nextToken(); - elementExport.setup(uuid, version); - return elementExport; + page.setup(uuid, version); + return page; } /** + * On export. + * + * @param context + * the context + * + * @return the object + */ + public Object onExport(String context) { + return preparePage(elementExport, context); + } + + /** * On history. * * @param context @@ -82,11 +100,7 @@ * @return the object */ public Object onHistory(String context) { - StringTokenizer st = new StringTokenizer(context, ","); - String uuid = st.nextToken(); - String version = st.nextToken(); - elementHistory.setup(uuid, version); - return elementHistory; + return preparePage(elementHistory, context); } /** @@ -98,11 +112,7 @@ * @return the object */ public Object onDelete(String context) { - StringTokenizer st = new StringTokenizer(context, ","); - String uuid = st.nextToken(); - String version = st.nextToken(); - elementDelete.setup(uuid, version); - return elementDelete; + return preparePage(elementDelete, context); } /** @@ -114,11 +124,7 @@ * @return the object */ public Object onRights(String context) { - StringTokenizer st = new StringTokenizer(context, ","); - String uuid = st.nextToken(); - String version = st.nextToken(); - elementRights.setup(uuid, version); - return elementRights; + return preparePage(elementRights, context); } /** @@ -130,14 +136,22 @@ * @return the object */ public Object onDetails(String context) { - StringTokenizer st = new StringTokenizer(context, ","); - String uuid = st.nextToken(); - String version = st.nextToken(); - elementDetail.setup(uuid, version); - return elementDetail; + return preparePage(elementDetail, context); } /** + * On metadata. + * + * @param context + * the context + * + * @return the object + */ + public Object onMetadata(String context) { + return preparePage(elementMetadata, context); + } + + /** * Generate string. * * @param actionCaption Added: trunk/simexplorer-is-web/src/main/webapp/ElementMetadata.tml =================================================================== --- trunk/simexplorer-is-web/src/main/webapp/ElementMetadata.tml (rev 0) +++ trunk/simexplorer-is-web/src/main/webapp/ElementMetadata.tml 2008-02-07 14:28:29 UTC (rev 716) @@ -0,0 +1,9 @@ +<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> + + <p><t:back label="${message:simexplorer.ui.web.back}" /></p> + +</t:layout> Modified: trunk/simexplorer-is-web/src/main/webapp/WEB-INF/app.properties =================================================================== --- trunk/simexplorer-is-web/src/main/webapp/WEB-INF/app.properties 2008-02-07 13:24:16 UTC (rev 715) +++ trunk/simexplorer-is-web/src/main/webapp/WEB-INF/app.properties 2008-02-07 14:28:29 UTC (rev 716) @@ -30,6 +30,7 @@ simexplorer.ui.web.title.elementexport=Element export simexplorer.ui.web.title.elementhistory=Element history simexplorer.ui.web.title.elementimport=Element import +simexplorer.ui.web.title.elementmetadata=Element metadata simexplorer.ui.web.title.elementrights=Element rights simexplorer.ui.web.title.groupedit=Group edit simexplorer.ui.web.title.grouplist=Group list @@ -108,6 +109,21 @@ simexplorer.ui.web.elementlist.details=Details +simexplorer.ui.web.metadata.action=Metadata +simexplorer.ui.web.metadata.uuid=UUID +simexplorer.ui.web.metadata.version=Version +simexplorer.ui.web.metadata.name=Name +simexplorer.ui.web.metadata.type=Type +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.attachments=Attachments +simexplorer.ui.web.metadata.descriptors=Descriptors + simexplorer.ui.web.rights.properties=Properties simexplorer.ui.web.rights.owner=Owner simexplorer.ui.web.rights.read=Read Modified: trunk/simexplorer-is-web/src/main/webapp/WEB-INF/app_fr.properties =================================================================== --- trunk/simexplorer-is-web/src/main/webapp/WEB-INF/app_fr.properties 2008-02-07 13:24:16 UTC (rev 715) +++ trunk/simexplorer-is-web/src/main/webapp/WEB-INF/app_fr.properties 2008-02-07 14:28:29 UTC (rev 716) @@ -30,6 +30,7 @@ simexplorer.ui.web.title.elementexport=Export d'un élément simexplorer.ui.web.title.elementhistory=Historique d'un élément simexplorer.ui.web.title.elementimport=Import d'un élément +simexplorer.ui.web.title.elementmetadata=Metadonnées d'un élément simexplorer.ui.web.title.elementrights=Droits sur un élément simexplorer.ui.web.title.groupedit=Edition d'un groupe simexplorer.ui.web.title.grouplist=Liste des groupes @@ -108,6 +109,21 @@ simexplorer.ui.web.elementlist.details=Details +simexplorer.ui.web.metadata.action=Metadonnées +simexplorer.ui.web.metadata.uuid=UUID +simexplorer.ui.web.metadata.version=Version +simexplorer.ui.web.metadata.name=Nom +simexplorer.ui.web.metadata.type=Type +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.attachments=Fichiers +simexplorer.ui.web.metadata.descriptors=Descripteurs + simexplorer.ui.web.rights.properties=Propriétés simexplorer.ui.web.rights.owner=Propriétaires simexplorer.ui.web.rights.read=Lecture

1 0