Author: glandais Date: 2008-02-14 16:02:10 +0000 (Thu, 14 Feb 2008) New Revision: 975 Modified: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/entities/metadata/MetaData.java trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/factories/MetaDataFactory.java trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/MetaDataGenerator.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/test/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabaseThread.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPageDetail.java Log: Removed parent data Modified: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/entities/metadata/MetaData.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/entities/metadata/MetaData.java 2008-02-14 15:49:46 UTC (rev 974) +++ trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/entities/metadata/MetaData.java 2008-02-14 16:02:10 UTC (rev 975) @@ -61,12 +61,6 @@ /** The attachments. */ private List<Attachment> attachments; - /** The parent data uuid. */ - private String parentDataUuid; - // TODO Why String representation, instead of Version ? - /** The parent data version. */ - private String parentDataVersion; - /** The parent version uuid. */ private String parentVersionUuid; @@ -279,44 +273,6 @@ } /** - * Gets the parent data uuid. - * - * @return the parentDataUuid - */ - public String getParentDataUuid() { - return parentDataUuid; - } - - /** - * Sets the parent data uuid. - * - * @param parentDataUuid - * the parentDataUuid to set - */ - public void setParentDataUuid(String parentDataUuid) { - this.parentDataUuid = parentDataUuid; - } - - /** - * Gets the parent data version. - * - * @return the parentDataVersion - */ - public String getParentDataVersion() { - return parentDataVersion; - } - - /** - * Sets the parent data version. - * - * @param parentDataVersion - * the parentDataVersion to set - */ - public void setParentDataVersion(String parentDataVersion) { - this.parentDataVersion = parentDataVersion; - } - - /** * Gets the parent version uuid. * * @return the parentVersionUuid Modified: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/factories/MetaDataFactory.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/factories/MetaDataFactory.java 2008-02-14 15:49:46 UTC (rev 974) +++ trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/factories/MetaDataFactory.java 2008-02-14 16:02:10 UTC (rev 975) @@ -111,10 +111,6 @@ } entity.setHash(getXMLProperty(xmlElement, KEY_METADATA_HASH)); - entity.setParentDataUuid(getXMLProperty(xmlElement, - KEY_METADATA_PARENTDATA_UUID)); - entity.setParentDataVersion(getXMLProperty(xmlElement, - KEY_METADATA_PARENTDATA_VERSION)); entity.setParentVersionUuid(getXMLProperty(xmlElement, KEY_METADATA_PARENTVERSION_UUID)); entity.setParentVersionVersion(getXMLProperty(xmlElement, @@ -203,10 +199,6 @@ setXMLProperty(document, xmlElement, KEY_METADATA_HASH, element .getHash()); - setXMLProperty(document, xmlElement, KEY_METADATA_PARENTDATA_UUID, - element.getParentDataUuid()); - setXMLProperty(document, xmlElement, KEY_METADATA_PARENTDATA_VERSION, - element.getParentDataVersion()); setXMLProperty(document, xmlElement, KEY_METADATA_PARENTVERSION_UUID, element.getParentVersionUuid()); setXMLProperty(document, xmlElement, Modified: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/MetaDataGenerator.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/MetaDataGenerator.java 2008-02-14 15:49:46 UTC (rev 974) +++ trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/MetaDataGenerator.java 2008-02-14 16:02:10 UTC (rev 975) @@ -47,41 +47,13 @@ /** * Generate meta data entity. * - * @param uuid - * the uuid - * @param version - * the version - * @param parentVersion - * the parent version - * @param parentData - * the parent data + * @param uuid the uuid + * @param version the version + * @param parentVersion the parent version * * @return the meta data */ - public MetaData generateMetaDataEntity(String uuid, Version version, - MetaData parentVersion, MetaData parentData) { - MetaData me = generateMetaDataEntity(uuid, version, parentVersion); - if (parentData != null) { - me.setParentDataUuid(parentData.getUuid()); - me.setParentDataVersion(parentData.getVersion().toString()); - } - return me; - } - - /** - * Generate meta data entity. - * - * @param uuid - * the uuid - * @param version - * the version - * @param parentVersion - * the parent version - * - * @return the meta data - */ - public MetaData generateMetaDataEntity(String uuid, Version version, - MetaData parentVersion) { + public MetaData generateMetaDataEntity(String uuid, Version version, MetaData parentVersion) { MetaData me = generateMetaDataEntity(uuid, version); if (parentVersion != null) { @@ -97,10 +69,8 @@ /** * Generate meta data entity. * - * @param uuid - * the uuid - * @param version - * the version + * @param uuid the uuid + * @param version the version * * @return the meta data */ @@ -124,8 +94,6 @@ } me.setDescriptors(descriptors); me.setAttachments(new ArrayList<Attachment>()); - me.setParentDataUuid(null); - me.setParentDataVersion(null); me.setParentVersionUuid(null); me.setParentVersionVersion(null); @@ -138,8 +106,7 @@ * @return the meta data */ public MetaData generateMetaDataEntity() { - return generateMetaDataEntity(UUID.randomUUID().toString(), Version - .valueOf("1.0")); + return generateMetaDataEntity(UUID.randomUUID().toString(), Version.valueOf("1.0")); } /** @@ -165,15 +132,13 @@ /** * Generate versionned meta data entity. * - * @param nbMax - * the nb max + * @param nbMax the nb max * * @return the meta data[] */ public MetaData[] generateVersionnedMetaDataEntity(int nbMax) { - Version[] versions = VersionGenerator.getInstance().generateVersions( - nbMax); + Version[] versions = VersionGenerator.getInstance().generateVersions(nbMax); String uuid = UUID.randomUUID().toString(); int nb = versions.length; @@ -189,15 +154,13 @@ /** * Generate versionned meta data. * - * @param mandatory - * the mandatory + * @param mandatory the mandatory * * @return the meta data[] */ public MetaData[] generateVersionnedMetaData(Version mandatory) { - Version[] versions = VersionGenerator.getInstance().generateVersions( - mandatory); + Version[] versions = VersionGenerator.getInstance().generateVersions(mandatory); String uuid = UUID.randomUUID().toString(); int nb = versions.length; 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-14 15:49:46 UTC (rev 974) +++ trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabase.java 2008-02-14 16:02:10 UTC (rev 975) @@ -774,9 +774,6 @@ } element.setAttachments(finalAttachments); - element.setParentDataUuid(document.get(KEY_PARENTDATA_UUID)); - element.setParentDataVersion(document.get(KEY_PARENTDATA_VERSION)); - element.setParentVersionUuid(document.get(KEY_PARENTVERSION_UUID)); element .setParentVersionVersion(document @@ -863,10 +860,6 @@ i++; } - addSimpleField(document, KEY_PARENTDATA_UUID, element - .getParentDataUuid()); - addSimpleField(document, KEY_PARENTDATA_VERSION, element - .getParentDataVersion()); addSimpleField(document, KEY_PARENTVERSION_UUID, element .getParentVersionUuid()); addSimpleField(document, KEY_PARENTVERSION_VERSION, element Modified: trunk/simexplorer-is/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabaseThread.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabaseThread.java 2008-02-14 15:49:46 UTC (rev 974) +++ trunk/simexplorer-is/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabaseThread.java 2008-02-14 16:02:10 UTC (rev 975) @@ -120,7 +120,6 @@ for (int j = 0; j < ncycles; j++) { MetaData[] mes = mdg.generateVersionnedMetaDataEntity(); for (MetaData me : mes) { - me.setParentDataUuid(Integer.toString(idThreadLucene)); database.insertElement(me, new ArrayList<Reader>()); id = me.getUuid(); } 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-14 15:49:46 UTC (rev 974) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPageDetail.java 2008-02-14 16:02:10 UTC (rev 975) @@ -314,12 +314,6 @@ 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(