Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Neumann2016-01-14 06:10:24 -0500
committerHans Neumann2016-01-14 06:10:24 -0500
commitba196bc13bd01a1e8371a18bc9f2a13b88031351 (patch)
tree7e9d48d45684cab1ff4ef987076d8294c8a00597
parent6ed85a9663800c7c8f749ddf32f7caaead367d5a (diff)
downloadorg.eclipse.openk-platform.openk-repo-ba196bc13bd01a1e8371a18bc9f2a13b88031351.tar.gz
org.eclipse.openk-platform.openk-repo-ba196bc13bd01a1e8371a18bc9f2a13b88031351.tar.xz
org.eclipse.openk-platform.openk-repo-ba196bc13bd01a1e8371a18bc9f2a13b88031351.zip
rollback
Signed-off-by: Hans Neumann <hans.neumann@btc-ag.com>
-rwxr-xr-xopenk-platform/openk-eisman-portlet/src/main/java/org/eclipse/openk/eisman/service/ReductionAdviceCalculatorService.java2
-rwxr-xr-xopenk-platform/openk-eisman-portlet/src/main/resources/dozer-mapping.xml8
-rwxr-xr-xopenk-platform/openk-eisman-portlet/src/test/resources/test-dozer-mapping.xml8
3 files changed, 13 insertions, 5 deletions
diff --git a/openk-platform/openk-eisman-portlet/src/main/java/org/eclipse/openk/eisman/service/ReductionAdviceCalculatorService.java b/openk-platform/openk-eisman-portlet/src/main/java/org/eclipse/openk/eisman/service/ReductionAdviceCalculatorService.java
index af302893..1985929d 100755
--- a/openk-platform/openk-eisman-portlet/src/main/java/org/eclipse/openk/eisman/service/ReductionAdviceCalculatorService.java
+++ b/openk-platform/openk-eisman-portlet/src/main/java/org/eclipse/openk/eisman/service/ReductionAdviceCalculatorService.java
@@ -125,7 +125,7 @@ public class ReductionAdviceCalculatorService extends AbstractReductionAdviceCal
}
activityJpa.setReductionAdviceNotFulfilled(sumOfReduction.compareTo(valueToBeReduced) == -1);
- //activityJpaService.removeSynchronousMachineAndSubstationNotReduced(activityJpa);
+ activityJpaService.removeSynchronousMachineAndSubstationNotReduced(activityJpa);
logCalculationEnd(sumOfReduction);
diff --git a/openk-platform/openk-eisman-portlet/src/main/resources/dozer-mapping.xml b/openk-platform/openk-eisman-portlet/src/main/resources/dozer-mapping.xml
index 3ae2aa9a..c8b4a26e 100755
--- a/openk-platform/openk-eisman-portlet/src/main/resources/dozer-mapping.xml
+++ b/openk-platform/openk-eisman-portlet/src/main/resources/dozer-mapping.xml
@@ -245,11 +245,11 @@
<a>childrenActivityJpaList[0].userSettingsJpa.geographicalRegion</a>
<b>geographicalRegion</b>
</field>
- <field>
+ <field copy-by-reference="true">
<a>childrenActivityJpaList[0].subGeographicalRegionJpaList</a>
<b>subGeographicalRegionJpaList</b>
</field>
- <field>
+ <field copy-by-reference="true">
<a>childrenActivityJpaList[0].substationJpaList</a>
<b>substationJpaList</b>
</field>
@@ -322,6 +322,10 @@
<a>preselectionConfigurationJpa</a>
<b>preselectionConfigurationDto</b>
</field>
+ <field copy-by-reference="true">
+ <a>substationJpaList</a>
+ <b>substationJpaList</b>
+ </field>
</mapping>
<mapping>
<class-a>org.eclipse.openk.eisman.model.jpa.process.PreselectionConfigurationJpa</class-a>
diff --git a/openk-platform/openk-eisman-portlet/src/test/resources/test-dozer-mapping.xml b/openk-platform/openk-eisman-portlet/src/test/resources/test-dozer-mapping.xml
index 1cf7f77e..01400deb 100755
--- a/openk-platform/openk-eisman-portlet/src/test/resources/test-dozer-mapping.xml
+++ b/openk-platform/openk-eisman-portlet/src/test/resources/test-dozer-mapping.xml
@@ -245,11 +245,11 @@
<a>childrenActivityJpaList[0].userSettingsJpa.geographicalRegion</a>
<b>geographicalRegion</b>
</field>
- <field>
+ <field copy-by-reference="true">
<a>childrenActivityJpaList[0].subGeographicalRegionJpaList</a>
<b>subGeographicalRegionJpaList</b>
</field>
- <field>
+ <field copy-by-reference="true">
<a>childrenActivityJpaList[0].substationJpaList</a>
<b>substationJpaList</b>
</field>
@@ -322,6 +322,10 @@
<a>preselectionConfigurationJpa</a>
<b>preselectionConfigurationDto</b>
</field>
+ <field copy-by-reference="true">
+ <a>substationJpaList</a>
+ <b>substationJpaList</b>
+ </field>
</mapping>
<mapping>
<class-a>org.eclipse.openk.eisman.model.jpa.process.PreselectionConfigurationJpa</class-a>

Back to the top