Author: glandais Date: 2008-02-15 18:02:15 +0000 (Fri, 15 Feb 2008) New Revision: 1012 Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageService.java trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabase.java trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngine.java trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngineImpl.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementMetadata.java trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/ElementMetadata.tml trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/WEB-INF/app_fr.properties Log: Element hierarchy : bug fix on duplicating, changed "Used" by "UsedBy" Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageService.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageService.java 2008-02-15 17:58:44 UTC (rev 1011) +++ trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageService.java 2008-02-15 18:02:15 UTC (rev 1012) @@ -126,7 +126,7 @@ * * @throws SimExplorerException the sim explorer service exception */ - MetaData[] getMetadatasUsed(String token, String uuid, String version) throws SimExplorerException; + MetaData[] getMetadatasUsedBy(String token, String uuid, String version) throws SimExplorerException; /** * Gets the metadatas using the element. Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java 2008-02-15 17:58:44 UTC (rev 1011) +++ trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java 2008-02-15 18:02:15 UTC (rev 1012) @@ -95,11 +95,11 @@ } /* (non-Javadoc) - * @see fr.cemagref.simexplorer.is.service.StorageService#getMetadatasUsed(java.lang.String, java.lang.String, java.lang.String) + * @see fr.cemagref.simexplorer.is.service.StorageService#getMetadatasUsedBy(java.lang.String, java.lang.String, java.lang.String) */ @Override - public MetaData[] getMetadatasUsed(String token, String uuid, String version) throws SimExplorerException { - return getStorageEngine().getMetadatasUsed(token, uuid, new Version(version)); + public MetaData[] getMetadatasUsedBy(String token, String uuid, String version) throws SimExplorerException { + return getStorageEngine().getMetadatasUsedBy(token, uuid, new Version(version)); } /* (non-Javadoc) Modified: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabase.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabase.java 2008-02-15 17:58:44 UTC (rev 1011) +++ trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabase.java 2008-02-15 18:02:15 UTC (rev 1012) @@ -960,7 +960,7 @@ throw new SimExplorerTechnicalException(e); } - Set<MetaData> elementsUsedByFrom = getElementsUsedBy(fromElement); + Set<MetaData> elementsUsedByFrom = getElementsUsing(fromElement); for (MetaData elementUsed : elementsUsedByFrom) { saveElementHierarchy(toElement, elementUsed); Modified: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngine.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngine.java 2008-02-15 17:58:44 UTC (rev 1011) +++ trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngine.java 2008-02-15 18:02:15 UTC (rev 1012) @@ -163,7 +163,7 @@ * * @throws SimExplorerException the sim explorer storage exception */ - public abstract MetaData[] getMetadatasUsed(String token, String uuid, Version version) + public abstract MetaData[] getMetadatasUsedBy(String token, String uuid, Version version) throws SimExplorerException; /** Modified: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngineImpl.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngineImpl.java 2008-02-15 17:58:44 UTC (rev 1011) +++ trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngineImpl.java 2008-02-15 18:02:15 UTC (rev 1012) @@ -185,7 +185,7 @@ * @see fr.cemagref.simexplorer.is.storage.engine.StorageEngine#getMetadatasUsed(java.lang.String, java.lang.String, fr.cemagref.simexplorer.is.entities.metadata.Version) */ @Override - public MetaData[] getMetadatasUsed(String token, String uuid, Version version) throws SimExplorerException { + public MetaData[] getMetadatasUsedBy(String token, String uuid, Version version) throws SimExplorerException { MetaData mde = database.getElement(uuid, version); Set<MetaData> elements = database.getElementsUsedBy(mde); return elements.toArray(new MetaData[elements.size()]); Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java 2008-02-15 17:58:44 UTC (rev 1011) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java 2008-02-15 18:02:15 UTC (rev 1012) @@ -297,7 +297,7 @@ } @Override - public MetaData[] getMetadatasUsed(String token, String uuid, String version) throws SimExplorerException { + public MetaData[] getMetadatasUsedBy(String token, String uuid, String version) throws SimExplorerException { checkImplemented(); return null; } Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementMetadata.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementMetadata.java 2008-02-15 17:58:44 UTC (rev 1011) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementMetadata.java 2008-02-15 18:02:15 UTC (rev 1012) @@ -81,8 +81,8 @@ * * @throws SimExplorerException the sim explorer service exception */ - public MetaData[] getElementsUsed() throws SimExplorerException { - return RemoteStorageService.getStorageService().getMetadatasUsed(getToken(), getMetadata().getUuid(), + public MetaData[] getElementsUsedBy() throws SimExplorerException { + return RemoteStorageService.getStorageService().getMetadatasUsedBy(getToken(), getMetadata().getUuid(), getMetadata().getVersion().toString()); } Modified: trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/ElementMetadata.tml =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/ElementMetadata.tml 2008-02-15 17:58:44 UTC (rev 1011) +++ trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/ElementMetadata.tml 2008-02-15 18:02:15 UTC (rev 1012) @@ -10,11 +10,10 @@ </table> <p> - <h2>${message:simexplorer.ui.web.metadata.usedby}</h2> + <h2>${message:simexplorer.ui.web.metadata.using}</h2> </p> - - <table t:type="Grid" source="elementsUsed" row="element" model="model"> + <table t:type="Grid" source="elementsUsing" row="element" model="model"> <t:parameter name="uuidCell"> <t:actionlink t:id="detailElementUsed" context="${detailElementContext}">${message:simexplorer.ui.web.elementlist.details}</t:actionlink> @@ -22,11 +21,11 @@ </table> <p> - <h2>${message:simexplorer.ui.web.metadata.using}</h2> + <h2>${message:simexplorer.ui.web.metadata.usedby}</h2> </p> - <table t:type="Grid" source="elementsUsing" row="element" model="model"> + <table t:type="Grid" source="elementsUsedBy" row="element" model="model"> <t:parameter name="uuidCell"> <t:actionlink t:id="detailElementUsing" context="${detailElementContext}">${message:simexplorer.ui.web.elementlist.details}</t:actionlink> Modified: trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/WEB-INF/app_fr.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/WEB-INF/app_fr.properties 2008-02-15 17:58:44 UTC (rev 1011) +++ trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/WEB-INF/app_fr.properties 2008-02-15 18:02:15 UTC (rev 1012) @@ -109,9 +109,9 @@ simexplorer.ui.web.elementlist.details=Details -simexplorer.ui.web.metadata.properties=Properties -simexplorer.ui.web.metadata.usedby=This element is used by -simexplorer.ui.web.metadata.using=This element is using +simexplorer.ui.web.metadata.properties=Propriétés +simexplorer.ui.web.metadata.usedby=Cet élément est utilisé par +simexplorer.ui.web.metadata.using=Cet élément utilise simexplorer.ui.web.metadata.action=Metadonnées simexplorer.ui.web.metadata.uuid=UUID simexplorer.ui.web.metadata.version=Version