Author: tchemit Date: 2011-11-29 13:08:00 +0100 (Tue, 29 Nov 2011) New Revision: 139 Url: http://forge.codelutin.com/repositories/revision/echobase/139 Log: fix model Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntitiesUtil.java trunk/echobase-entities/src/main/xmi/echobase.zargo Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntitiesUtil.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntitiesUtil.java 2011-11-29 11:53:35 UTC (rev 138) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntitiesUtil.java 2011-11-29 12:08:00 UTC (rev 139) @@ -55,14 +55,11 @@ result.add(EchoBaseEntityEnum.Result); result.add(EchoBaseEntityEnum.Operation); result.add(EchoBaseEntityEnum.OperationMetadataValue); - result.add(EchoBaseEntityEnum.OperationMeasurementMetadataValue); result.add(EchoBaseEntityEnum.Individual); result.add(EchoBaseEntityEnum.OperationGearMetadataValue); result.add(EchoBaseEntityEnum.Sample); + result.add(EchoBaseEntityEnum.SampleData); result.add(EchoBaseEntityEnum.SampleAge); - result.add(EchoBaseEntityEnum.SampleLength); - result.add(EchoBaseEntityEnum.SampleAggregation); - result.add(EchoBaseEntityEnum.AggregationLevel); return result.toArray(new EchoBaseEntityEnum[result.size()]); } @@ -92,6 +89,7 @@ result.add(EchoBaseEntityEnum.DepthStratum); result.add(EchoBaseEntityEnum.DepthStratumType); result.add(EchoBaseEntityEnum.Gear); + result.add(EchoBaseEntityEnum.GearCaracteristic); result.add(EchoBaseEntityEnum.GearMetadata); result.add(EchoBaseEntityEnum.GearMetadataValue); result.add(EchoBaseEntityEnum.GearType); @@ -104,6 +102,9 @@ result.add(EchoBaseEntityEnum.ReferenceDatum); result.add(EchoBaseEntityEnum.ReferenceDatumType); result.add(EchoBaseEntityEnum.ReferencingMethod); + result.add(EchoBaseEntityEnum.SampleTag); + result.add(EchoBaseEntityEnum.SampleDataType); + result.add(EchoBaseEntityEnum.SampleRatioType); result.add(EchoBaseEntityEnum.Species); result.add(EchoBaseEntityEnum.Station); result.add(EchoBaseEntityEnum.Vessel); Modified: trunk/echobase-entities/src/main/xmi/echobase.zargo =================================================================== (Binary files differ)