Changeset 540

Timestamp:

07/27/12 16:12:44 (12 years ago)

Author:

vmipsl

Message:

Correction des relations (insert & update)

File:

• ether_megapoli/trunk/service/implementation/com/ether/EtherServiceImpl.java (modified) (2 diffs)

ether_megapoli/trunk/service/implementation/com/ether/EtherServiceImpl.java

@@ -863 +863 @@
             // Insert dimensions
             final Set<Dimension> dimensionsInDB = new HashSet<Dimension>( _dimensionDAO.selectAll() );
-            final Set<Dimension> dimensionsToAdd = simulation.getDimension();
+            final Set<Dimension> dimensionsInSimulation = simulation.getDimension();
+            final Set<Dimension> dimensionsInDBAndSimulation = new HashSet<Dimension>( dimensionsInDB );
+            dimensionsInDBAndSimulation.retainAll( dimensionsInSimulation );
+            _dimensionDAO.updateAll( dimensionsInDBAndSimulation );
+            final Set<Dimension> dimensionsToAdd = new HashSet<Dimension>( dimensionsInSimulation );
             dimensionsToAdd.removeAll( dimensionsInDB );
             _dimensionDAO.insertAll( dimensionsToAdd );
+            dimensionsInDBAndSimulation.addAll( dimensionsToAdd );
+            simulation.setDimension( dimensionsInDBAndSimulation );
 
             // Insert Attributes
             final Set<Attribute> attributesInDB = new HashSet<Attribute>( _attributeDAO.selectAll() );
-            final Set<Attribute> attributesToAdd = simulation.getAttribute();
+            final Set<Attribute> attributesInSimulation = simulation.getAttribute();
+            final Set<Attribute> attributesInDBAndSimulation = new HashSet<Attribute>( attributesInDB );
+            attributesInDBAndSimulation.retainAll( attributesInSimulation );
+            _attributeDAO.updateAll( attributesInDBAndSimulation );
+            final Set<Attribute> attributesToAdd = new HashSet<Attribute>( attributesInSimulation );
             attributesToAdd.removeAll( attributesInDB );
             _attributeDAO.insertAll( attributesToAdd );
+            attributesInDBAndSimulation.addAll( attributesToAdd );
+            simulation.setAttribute( attributesInDBAndSimulation );
 
             // Insert variables
             final Set<Variable> variablesInDB = new HashSet<Variable>( _variableDAO.selectAll() );
-            final Set<Variable> variablesToAdd = simulation.getVariable();
+            final Set<Variable> variablesInSimulation = simulation.getVariable();
+            final Set<Variable> variablesInDBAndSimulation = new HashSet<Variable>( variablesInDB );
+            variablesInDBAndSimulation.retainAll( variablesInDBAndSimulation );
+            _variableDAO.updateAll( variablesInDBAndSimulation );
+            final Set<Variable> variablesToAdd = new HashSet<Variable>( variablesInSimulation );
             variablesToAdd.removeAll( variablesInDB );
-            _variableDAO.insertAllWithUpdate( variablesToAdd );
+            _variableDAO.insertAll( variablesToAdd );
+            variablesInDBAndSimulation.addAll( variablesToAdd );
+            simulation.setVariable( variablesInDBAndSimulation );
 
             // Insert header
@@ -884 +902 @@
             {
                 simulationInDB.setXmlnsHeader( simulation.getXmlnsHeader() );
-                simulationInDB.getDimension().addAll( dimensionsToAdd );
-                simulationInDB.getAttribute().addAll( attributesToAdd );
-                simulationInDB.getVariable().addAll( variablesToAdd );
+                simulationInDB.setDimension( simulation.getDimension() );
+                simulationInDB.setAttribute( simulation.getAttribute() );
+                simulationInDB.setVariable( simulation.getVariable() );
                 _simulationDAO.update( simulationInDB );
                 return simulationInDB.getId();