[Simexplorer-si-commits] r1201 - in trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web: grid pages services tools

Author: glandais Date: 2008-02-22 16:51:29 +0000 (Fri, 22 Feb 2008) New Revision: 1201 Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/grid/ElementDataSource.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDetail.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDownload.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPageDetail.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Install.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/AppModule.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/ModelFactory.java Log: Matching entities&services update Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/grid/ElementDataSource.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/grid/ElementDataSource.java 2008-02-22 16:50:24 UTC (rev 1200) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/grid/ElementDataSource.java 2008-02-22 16:51:29 UTC (rev 1201) @@ -73,11 +73,9 @@ int result; try { if (query.equals("")) { - result = RemoteStorageService.getStorageService() - .findApplicationsCount(token, true); + result = RemoteStorageService.getStorageService().findApplicationsCount(token, true); } else { - result = RemoteStorageService.getStorageService() - .findFullTextCount(token, query, false); + result = RemoteStorageService.getStorageService().findFullTextCount(token, query, false); } } catch (SimExplorerException e) { throw new RuntimeException(e); @@ -102,29 +100,21 @@ /* (non-Javadoc) * @see org.apache.tapestry.grid.GridDataSource#prepare(int, int, org.apache.tapestry.beaneditor.PropertyModel, boolean) */ - public void prepare(int startIndex, int endIndex, PropertyModel sortModel, - boolean ascending) { + public void prepare(int startIndex, int endIndex, PropertyModel sortModel, boolean ascending) { this.indexStart = startIndex; - int dateOrder = 0; - if (sortModel != null - && "creationDate".equals(sortModel.getPropertyName())) { - if (ascending) { - dateOrder = 1; - } else { - dateOrder = -1; - } - } - try { + String sortColumn = ""; + if (sortModel != null) { + sortColumn = sortModel.getPropertyName(); + } + if (query.equals("")) { - entities = RemoteStorageService.getStorageService() - .findApplications(token, true, startIndex, - 1 + endIndex - startIndex, dateOrder); + entities = RemoteStorageService.getStorageService().findApplications(token, true, startIndex, + 1 + endIndex - startIndex, sortColumn, ascending); } else { - entities = RemoteStorageService.getStorageService() - .findFullText(token, query, false, startIndex, - 1 + endIndex - startIndex, dateOrder); + entities = RemoteStorageService.getStorageService().findFullText(token, query, false, startIndex, + 1 + endIndex - startIndex, sortColumn, ascending); } } catch (SimExplorerException e) { throw new RuntimeException(e); Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDetail.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDetail.java 2008-02-22 16:50:24 UTC (rev 1200) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDetail.java 2008-02-22 16:51:29 UTC (rev 1201) @@ -19,7 +19,6 @@ import java.util.ArrayList; import java.util.List; -import java.util.Set; import org.codelutin.tapestry.beans.TreeNode; @@ -96,8 +95,7 @@ /** * Generate header. * - * @param caption - * the caption + * @param caption the caption * * @return the string */ @@ -120,29 +118,21 @@ node.setType(TreeNode.TYPE_FOLDER); - node - .setColumns(generateStringArray(getMessages().get( - "simexplorer.ui.web.applicationexploration"), - getMetadata().getName(), getElement().getMetaData() - .getVersion().toString(), getElement() - .getMetaData(), true, "metadata", "export", "history", - "delete")); + node.setColumns(generateStringArray(getMessages().get("simexplorer.ui.web.applicationexploration"), + getMetadata().getName(), getElement().getMetaData().getVersion().toString(), getElement() + .getMetaData(), true, "metadata", "export", "history", "delete")); List<TreeNode> children = new ArrayList<TreeNode>(); TreeNode node1 = new TreeNode(); node1.setType(TreeNode.TYPE_FOLDER); - node1.setColumns(generateStringArray(getMessages().get( - "simexplorer.ui.web.components"), "", "")); - node1 - .setChildren(generateComponents((ExplorationApplication) getElement())); + node1.setColumns(generateStringArray(getMessages().get("simexplorer.ui.web.components"), "", "")); + node1.setChildren(generateComponents((ExplorationApplication) getElement())); children.add(node1); TreeNode node2 = new TreeNode(); node2.setType(TreeNode.TYPE_FOLDER); - node2.setColumns(generateStringArray(getMessages().get( - "simexplorer.ui.web.explorations"), "", "")); - node2 - .setChildren(generateExplorations((ExplorationApplication) getElement())); + node2.setColumns(generateStringArray(getMessages().get("simexplorer.ui.web.explorations"), "", "")); + node2.setChildren(generateExplorations((ExplorationApplication) getElement())); children.add(node2); node.setChildren(children); @@ -152,13 +142,11 @@ /** * Generate explorations. * - * @param explorationApplication - * the exploration application + * @param explorationApplication the exploration application * * @return the list< tree node> */ - private List<TreeNode> generateExplorations( - ExplorationApplication explorationApplication) { + private List<TreeNode> generateExplorations(ExplorationApplication explorationApplication) { List<TreeNode> res = new ArrayList<TreeNode>(); for (ExplorationData data : explorationApplication.getExplorations()) { res.add(generateExplorationData(data)); @@ -169,8 +157,7 @@ /** * Generate exploration data. * - * @param explorationData - * the exploration data + * @param explorationData the exploration data * * @return the tree node */ @@ -178,11 +165,9 @@ TreeNode explorationDataNode = new TreeNode(); explorationDataNode.setType(TreeNode.TYPE_FOLDER); - explorationDataNode.setColumns(generateStringArray(getMessages().get( - "simexplorer.ui.web.explorationdata"), explorationData - .getMetaData().getName(), explorationData.getMetaData() - .getVersion().toString(), explorationData.getMetaData(), true, - "metadata", "history", "delete")); + explorationDataNode.setColumns(generateStringArray(getMessages().get("simexplorer.ui.web.explorationdata"), + explorationData.getMetaData().getName(), explorationData.getMetaData().getVersion().toString(), + explorationData.getMetaData(), true, "metadata", "history", "delete")); List<TreeNode> children = new ArrayList<TreeNode>(); @@ -190,10 +175,9 @@ TreeNode node1 = new TreeNode(); node1.setType(TreeNode.TYPE_FOLDER); - node1.setColumns(generateStringArray(getMessages().get( - "simexplorer.ui.web.values"), generateHeader(getMessages().get( - "simexplorer.ui.web.type")), generateHeader(getMessages().get( - "simexplorer.ui.web.value")))); + node1.setColumns(generateStringArray(getMessages().get("simexplorer.ui.web.values"), + generateHeader(getMessages().get("simexplorer.ui.web.type")), generateHeader(getMessages().get( + "simexplorer.ui.web.value")))); node1.setChildren(generateValues(explorationData)); children.add(node1); @@ -204,8 +188,7 @@ /** * Generate values. * - * @param explorationData - * the exploration data + * @param explorationData the exploration data * * @return the list< tree node> */ @@ -215,9 +198,8 @@ for (ConstantValue value : values) { TreeNode node = new TreeNode(); node.setType(TreeNode.TYPE_DOCUMENT); - node.setColumns(generateStringArray(value.getConstant().getName(), - value.getConstant().getType().getSimpleName(), value - .getValue())); + node.setColumns(generateStringArray(value.getConstant().getName(), value.getConstant().getType() + .getSimpleName(), value.getValue())); res.add(node); } @@ -227,8 +209,7 @@ /** * Generate result. * - * @param explorationData - * the exploration data + * @param explorationData the exploration data * * @return the tree node */ @@ -236,8 +217,7 @@ TreeNode res = new TreeNode(); res.setType(TreeNode.TYPE_DOCUMENT); - res.setColumns(generateStringArray(getMessages().get( - "simexplorer.ui.web.result"), "", "", explorationData + res.setColumns(generateStringArray(getMessages().get("simexplorer.ui.web.result"), "", "", explorationData .getMetaData(), false, "export")); return res; } @@ -245,13 +225,11 @@ /** * Generate components. * - * @param explorationApplication - * the exploration application + * @param explorationApplication the exploration application * * @return the list< tree node> */ - private List<TreeNode> generateComponents( - ExplorationApplication explorationApplication) { + private List<TreeNode> generateComponents(ExplorationApplication explorationApplication) { List<Component> components = explorationApplication.getComponents(); List<TreeNode> res = new ArrayList<TreeNode>(); @@ -276,8 +254,7 @@ /** * Generate component. * - * @param component - * the component + * @param component the component * * @return the tree node */ @@ -285,43 +262,37 @@ TreeNode componentNode = new TreeNode(); componentNode.setType(TreeNode.TYPE_FOLDER); - componentNode.setColumns(generateStringArray(getMessages().get( - "simexplorer.ui.web.component"), component.getMetaData() - .getName(), component.getMetaData().getVersion().toString(), - component.getMetaData(), true, "metadata", "history", "delete")); + componentNode.setColumns(generateStringArray(getMessages().get("simexplorer.ui.web.component"), component + .getMetaData().getName(), component.getMetaData().getVersion().toString(), component + .getMetaData(), true, "metadata", "history", "delete")); List<TreeNode> children = new ArrayList<TreeNode>(); TreeNode node; node = initNode(); - node.setColumns(generateStringArray(getMessages().get( - "simexplorer.ui.web.constant"), generateHeader(getMessages() - .get("simexplorer.ui.web.name")), generateHeader(getMessages() - .get("simexplorer.ui.web.type")))); + node.setColumns(generateStringArray(getMessages().get("simexplorer.ui.web.constant"), + generateHeader(getMessages().get("simexplorer.ui.web.name")), generateHeader(getMessages().get( + "simexplorer.ui.web.type")))); node.setChildren(generateConstants(component.getConstants())); children.add(node); node = initNode(); - node.setColumns(generateStringArray(getMessages().get( - "simexplorer.ui.web.structures"), "", "")); + node.setColumns(generateStringArray(getMessages().get("simexplorer.ui.web.structures"), "", "")); node.setChildren(generateStructures(component.getStructures())); children.add(node); node = initNode(); - node.setColumns(generateStringArray(getMessages().get( - "simexplorer.ui.web.codes"), generateHeader(getMessages().get( - "simexplorer.ui.web.language")), generateHeader(getMessages() - .get("simexplorer.ui.web.code")))); + node.setColumns(generateStringArray(getMessages().get("simexplorer.ui.web.codes"), generateHeader(getMessages() + .get("simexplorer.ui.web.language")), generateHeader(getMessages().get("simexplorer.ui.web.code")))); node.setChildren(generateCodes(component.getCodes())); children.add(node); node = initNode(); - node.setColumns(generateStringArray(getMessages().get( - "simexplorer.ui.web.libraries"), "", "")); + node.setColumns(generateStringArray(getMessages().get("simexplorer.ui.web.libraries"), "", "")); node.setChildren(generateLibraries(component)); children.add(node); @@ -333,8 +304,7 @@ /** * Generate libraries. * - * @param component - * the component + * @param component the component * * @return the list< tree node> */ @@ -353,26 +323,23 @@ /** * Generate library. * - * @param library - * the library + * @param library the library * * @return the tree node */ private TreeNode generateLibrary(Library library) { TreeNode node = new TreeNode(); node.setType(TreeNode.TYPE_DOCUMENT); - node.setColumns(generateStringArray(getMessages().get( - "simexplorer.ui.web.library"), library.getMetaData().getName(), - library.getMetaData().getVersion().toString(), library - .getMetaData(), true, "metadata", "export")); + node.setColumns(generateStringArray(getMessages().get("simexplorer.ui.web.library"), library.getMetaData() + .getName(), library.getMetaData().getVersion().toString(), library.getMetaData(), true, "metadata", + "export")); return node; } /** * Generate codes. * - * @param codes - * the codes + * @param codes the codes * * @return the list< tree node> */ @@ -381,8 +348,7 @@ for (Code code : codes) { TreeNode node = new TreeNode(); node.setType(TreeNode.TYPE_DOCUMENT); - node.setColumns(generateStringArray(getMessages().get( - "simexplorer.ui.web.code"), code.getLanguage(), code + node.setColumns(generateStringArray(getMessages().get("simexplorer.ui.web.code"), code.getLanguage(), code .getCode())); res.add(node); } @@ -392,8 +358,7 @@ /** * Generate structures. * - * @param structures - * the structures + * @param structures the structures * * @return the list< tree node> */ @@ -403,8 +368,7 @@ for (Structure structure : structures) { TreeNode node = new TreeNode(); node.setType(TreeNode.TYPE_DOCUMENT); - node.setColumns(generateStringArray(getMessages().get( - "simexplorer.ui.web.structure"), "", "")); + node.setColumns(generateStringArray(getMessages().get("simexplorer.ui.web.structure"), "", "")); res.add(node); } return res; @@ -413,8 +377,7 @@ /** * Generate constants. * - * @param constants - * the constants + * @param constants the constants * * @return the list< tree node> */ @@ -423,8 +386,7 @@ for (Constant constant : constants) { TreeNode node = new TreeNode(); node.setType(TreeNode.TYPE_DOCUMENT); - node.setColumns(generateStringArray(getMessages().get( - "simexplorer.ui.web.constant"), constant.getName(), + node.setColumns(generateStringArray(getMessages().get("simexplorer.ui.web.constant"), constant.getName(), constant.getType().getSimpleName())); res.add(node); } Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDownload.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDownload.java 2008-02-22 16:50:24 UTC (rev 1200) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDownload.java 2008-02-22 16:51:29 UTC (rev 1201) @@ -20,7 +20,6 @@ import java.io.InputStream; import java.util.ArrayList; import java.util.List; -import java.util.Set; import java.util.StringTokenizer; import org.apache.tapestry.StreamResponse; @@ -66,7 +65,7 @@ InputStream stream = RemoteStorageService.getStorageService().retrieveElementXML(getToken(), mde.getUuid(), mde.getVersion().toString()); - response = new XMLAttachment(stream, mde.getType() + "." + mde.getUuid() + ".v" + mde.getVersion()); + response = new XMLAttachment(stream, mde.getName() + "." + mde.getUuid() + ".v" + mde.getVersion()); return response; } @@ -84,7 +83,7 @@ InputStream stream = RemoteStorageService.getStorageService().retrieveElementFull(getToken(), mde.getUuid(), mde.getVersion().toString()); - response = new ZipAttachment(stream, mde.getType() + "." + mde.getUuid() + ".v" + mde.getVersion()); + response = new ZipAttachment(stream, mde.getName() + "." + mde.getUuid() + ".v" + mde.getVersion()); return response; } @@ -105,8 +104,8 @@ String version = st.nextToken(); String attachmentUniqueId = st.nextToken(); - MetaData metadata = RemoteStorageService.getStorageService().getMetadata(getToken(), uuid, version); - List<Attachment> attachments = metadata.getAttachments(); + LoggableElement loggableElement = RemoteStorageService.getStorageService().getLoggableElement(getToken(), uuid, version); + List<Attachment> attachments = loggableElement.getAttachments(); for (Attachment attachment : attachments) { if (attachment.getUniqueId().equals(attachmentUniqueId)) { InputStream stream = RemoteStorageService.getStorageService().retrieveElementData(getToken(), uuid, @@ -228,7 +227,7 @@ List<TreeNode> children = new ArrayList<TreeNode>(); - List<Attachment> attachments = explorationData.getMetaData().getAttachments(); + List<Attachment> attachments = explorationData.getAttachments(); for (Attachment attachment : attachments) { children.add(generateDownload(explorationData, attachment)); @@ -312,7 +311,7 @@ TreeNode node = new TreeNode(); node.setType(TreeNode.TYPE_FOLDER); - List<Attachment> attachments = library.getMetaData().getAttachments(); + List<Attachment> attachments = library.getAttachments(); List<TreeNode> children = new ArrayList<TreeNode>(); for (Attachment attachment : attachments) { children.add(generateDownload(library, attachment)); 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-22 16:50:24 UTC (rev 1200) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPageDetail.java 2008-02-22 16:51:29 UTC (rev 1201) @@ -29,7 +29,9 @@ import org.apache.tapestry.ioc.annotations.Inject; import org.codelutin.tapestry.beans.TreeNode; +import fr.cemagref.simexplorer.is.entities.EntityHelper; import fr.cemagref.simexplorer.is.entities.attachment.Attachment; +import fr.cemagref.simexplorer.is.entities.data.Descriptor; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; @@ -76,7 +78,7 @@ * @param context the context * * @return the object - * @throws SimExplorerException + * @throws SimExplorerException */ private Object preparePage(ElementPage page, String context) throws SimExplorerException { StringTokenizer st = new StringTokenizer(context, ","); @@ -92,7 +94,7 @@ * @param context the context * * @return the object - * @throws SimExplorerException + * @throws SimExplorerException */ public Object onExport(String context) throws SimExplorerException { return preparePage(elementDownload, context); @@ -104,7 +106,7 @@ * @param context the context * * @return the object - * @throws SimExplorerException + * @throws SimExplorerException */ public Object onHistory(String context) throws SimExplorerException { return preparePage(elementHistory, context); @@ -116,7 +118,7 @@ * @param context the context * * @return the object - * @throws SimExplorerException + * @throws SimExplorerException */ public Object onDelete(String context) throws SimExplorerException { return preparePage(elementDelete, context); @@ -128,7 +130,7 @@ * @param context the context * * @return the object - * @throws SimExplorerException + * @throws SimExplorerException */ public Object onRights(String context) throws SimExplorerException { return preparePage(elementRights, context); @@ -140,7 +142,7 @@ * @param context the context * * @return the object - * @throws SimExplorerException + * @throws SimExplorerException */ public Object onDetails(String context) throws SimExplorerException { return preparePage(elementDetail, context); @@ -152,7 +154,7 @@ * @param context the context * * @return the object - * @throws SimExplorerException + * @throws SimExplorerException */ public Object onMetadata(String context) throws SimExplorerException { return preparePage(elementMetadata, context); @@ -281,7 +283,8 @@ 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.type"), EntityHelper.Type.getType( + m.getElementClass()).getLibelle())); nodes.add(simpleNode(getMessages().get("simexplorer.ui.web.metadata.description"), m.getDescription())); nodes.add(simpleNode(getMessages().get("simexplorer.ui.web.metadata.creationDate"), DATE_FORMAT.format(m @@ -289,16 +292,16 @@ 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(); + if (m.getParentUuid() != null && m.getParentVersion() != null) { + String parentContext = m.getParentUuid() + "," + m.getParentVersion(); nodes.add(simpleNode(getMessages().get("simexplorer.ui.web.metadata.parentversion"), generateString(m - .getParentVersionUuid() - + " - " + m.getParentVersionVersion(), "details", parentContext))); + .getParentUuid() + + " - " + m.getParentVersion(), "details", parentContext))); } - - nodes.add(descriptorsNode(m.getDescriptors())); - nodes.add(attachmentsNode(m.getAttachments())); + + nodes.add(descriptorsNode(getElement().getDescriptors())); + nodes.add(attachmentsNode(getElement().getAttachments())); return nodes; } @@ -335,13 +338,13 @@ * * @return the tree node */ - private TreeNode descriptorsNode(Map<String, String> descriptors) { + private TreeNode descriptorsNode(List<Descriptor> 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())); + for (Descriptor descriptor : descriptors) { + descriptorNodes.add(simpleNode(descriptor.getName(), descriptor.getValue())); } aNode.setChildren(descriptorNodes); return aNode; Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Install.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Install.java 2008-02-22 16:50:24 UTC (rev 1200) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Install.java 2008-02-22 16:51:29 UTC (rev 1201) @@ -23,20 +23,16 @@ import java.util.List; import java.util.Map; import java.util.Random; -import java.util.Set; import org.apache.tapestry.annotations.InjectPage; import com.healthmarketscience.rmiio.SerializableInputStream; import fr.cemagref.simexplorer.is.entities.attachment.Attachment; -import fr.cemagref.simexplorer.is.entities.data.Component; import fr.cemagref.simexplorer.is.entities.data.ExplorationApplication; -import fr.cemagref.simexplorer.is.entities.data.ExplorationData; -import fr.cemagref.simexplorer.is.entities.data.Library; +import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.entities.metadata.Version; -import fr.cemagref.simexplorer.is.factories.BaseEntityFactory; -import fr.cemagref.simexplorer.is.factories.XmlConstants; +import fr.cemagref.simexplorer.is.factories.LoggableElementFactory; import fr.cemagref.simexplorer.is.storage.ElementGenerator; import fr.cemagref.simexplorer.is.storage.ElementGenerator.RandomStream; import fr.cemagref.simexplorer.is.ui.web.pages.security.SuperAdminPage; @@ -63,7 +59,7 @@ * On action from generate data. * * @return the object - * @throws Exception + * @throws Exception */ public Object onActionFromGenerateData() throws Exception { @@ -90,19 +86,11 @@ List<Attachment> attachmentsKeys = new ArrayList<Attachment>(); - attachmentsKeys.addAll(ea.getMetaData().getAttachments()); - List<Component> components = ea.getComponents(); - for (Component component : components) { - attachmentsKeys.addAll(component.getMetaData().getAttachments()); - List<Library> libraries = component.getLibraries(); - for (Library library : libraries) { - attachmentsKeys.addAll(library.getMetaData().getAttachments()); - } + attachmentsKeys.addAll(ea.getAttachments()); + List<LoggableElement> children = ea.getChildren(); + for (LoggableElement child : children) { + attachmentsKeys.addAll(child.getAttachments()); } - List<ExplorationData> explorations = ea.getExplorations(); - for (ExplorationData explorationData : explorations) { - attachmentsKeys.addAll(explorationData.getMetaData().getAttachments()); - } for (Attachment attachment : attachmentsKeys) { RandomStream randomStream = elementGenerator.generateTextStream(); @@ -111,8 +99,7 @@ attachments.put(attachment, remoteStream); } - InputStream xmlStream = BaseEntityFactory.getFactory(ExplorationApplication.class).saveElement( - XmlConstants.VALUE_METADATA_TYPE_EA, ea); + InputStream xmlStream = LoggableElementFactory.getStream(ea); SerializableInputStream xmlRemoteStream = new SerializableInputStream(xmlStream); RemoteStorageService.getStorageService().saveElement(getToken(), xmlRemoteStream, attachments); 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-22 16:50:24 UTC (rev 1200) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/AppModule.java 2008-02-22 16:51:29 UTC (rev 1201) @@ -32,6 +32,7 @@ import org.apache.tapestry.services.Response; import org.slf4j.Logger; +import fr.cemagref.simexplorer.is.entities.EntityHelper; import fr.cemagref.simexplorer.is.entities.metadata.Version; /** @@ -71,8 +72,9 @@ * * @param configuration the configuration */ - public static void contributeDefaultDataTypeAnalyzer(MappedConfiguration<Class, String> configuration) { + public static void contributeDefaultDataTypeAnalyzer(MappedConfiguration<Class<?>, String> configuration) { configuration.add(Version.class, "text"); + configuration.add(Class.class, "text"); } /** @@ -91,8 +93,17 @@ return Version.valueOf(input); } }; + Coercion<Class, String> coercionClassString = new Coercion<Class, String>() { + public String coerce(Class input) { + if (input == null) { + return ""; + } + return EntityHelper.Type.getType(input).getLibelle(); + } + }; configuration.add(new CoercionTuple<Version, String>(Version.class, String.class, coercionVersionString)); configuration.add(new CoercionTuple<String, Version>(String.class, Version.class, coercionStringVersion)); + configuration.add(new CoercionTuple<Class, String>(Class.class, String.class, coercionClassString)); } /** Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/ModelFactory.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/ModelFactory.java 2008-02-22 16:50:24 UTC (rev 1200) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/ModelFactory.java 2008-02-22 16:51:29 UTC (rev 1201) @@ -53,19 +53,14 @@ boolean dateSortable) { BeanModel model = beanModelSource.create(MetaData.class, false, resources); List<String> wantedProperties = new ArrayList<String>(); - wantedProperties.add("type"); wantedProperties.add("uuid"); + wantedProperties.add("version"); wantedProperties.add("name"); wantedProperties.add("description"); - wantedProperties.add("version"); wantedProperties.add("creationDate"); + wantedProperties.add("elementClass"); List<String> properties = model.getPropertyNames(); for (String property : properties) { - if (!dateSortable || !property.equals("creationDate")) { - model.get(property).sortable(false); - } else { - model.get(property).sortable(true); - } if (!wantedProperties.contains(property)) { model = model.remove(property); }