dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #11698
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 3408: Added missing IndicatorGroupSetDeletionHandler
------------------------------------------------------------
revno: 3408
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2011-04-15 15:56:05 +0200
message:
Added missing IndicatorGroupSetDeletionHandler
added:
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/indicator/IndicatorGroupSetDeletionHandler.java
modified:
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DataElementGroupSetDeletionHandler.java
dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DataElementGroupSetDeletionHandler.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DataElementGroupSetDeletionHandler.java 2010-09-25 21:09:08 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DataElementGroupSetDeletionHandler.java 2011-04-15 13:56:05 +0000
@@ -58,20 +58,6 @@
}
@Override
- public boolean allowDeleteDataElementGroup( DataElementGroup dataElementGroup )
- {
- for ( DataElementGroupSet groupSet : dataElementService.getAllDataElementGroupSets() )
- {
- if ( groupSet.getMembers().contains( dataElementGroup ) )
- {
- return false;
- }
- }
-
- return true;
- }
-
- @Override
public void deleteDataElementGroup( DataElementGroup dataElementGroup )
{
for ( DataElementGroupSet groupSet : dataElementService.getAllDataElementGroupSets() )
=== added file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/indicator/IndicatorGroupSetDeletionHandler.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/indicator/IndicatorGroupSetDeletionHandler.java 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/indicator/IndicatorGroupSetDeletionHandler.java 2011-04-15 13:56:05 +0000
@@ -0,0 +1,69 @@
+package org.hisp.dhis.indicator;
+
+/*
+ * Copyright (c) 2004-2010, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * * Neither the name of the HISP project nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import org.hisp.dhis.system.deletion.DeletionHandler;
+
+/**
+ * @author Lars Helge Overland
+ */
+public class IndicatorGroupSetDeletionHandler
+ extends DeletionHandler
+{
+ // -------------------------------------------------------------------------
+ // Dependencies
+ // -------------------------------------------------------------------------
+
+ private IndicatorService indicatorService;
+
+ public void setIndicatorService( IndicatorService indicatorService )
+ {
+ this.indicatorService = indicatorService;
+ }
+
+ // -------------------------------------------------------------------------
+ // DeletionHandler implementation
+ // -------------------------------------------------------------------------
+
+ public String getClassName()
+ {
+ return IndicatorGroupSet.class.getSimpleName();
+ }
+
+ @Override
+ public void deleteIndicatorGroup( IndicatorGroup indicatorGroup )
+ {
+ for ( IndicatorGroupSet groupSet : indicatorService.getAllIndicatorGroupSets() )
+ {
+ if ( groupSet.getMembers().remove( indicatorGroup ) )
+ {
+ indicatorService.updateIndicatorGroupSet( groupSet );
+ }
+ }
+ }
+}
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml 2011-04-10 13:48:29 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml 2011-04-15 13:56:05 +0000
@@ -1124,6 +1124,11 @@
<property name="indicatorService" ref="org.hisp.dhis.indicator.IndicatorService" />
</bean>
+ <bean id="org.hisp.dhis.indicator.IndicatorGroupSetDeletionHandler"
+ class="org.hisp.dhis.indicator.IndicatorGroupSetDeletionHandler">
+ <property name="indicatorService" ref="org.hisp.dhis.indicator.IndicatorService" />
+ </bean>
+
<bean id="org.hisp.dhis.minmax.MinMaxDataElementDeletionHandler"
class="org.hisp.dhis.minmax.MinMaxDataElementDeletionHandler">
<property name="minMaxDataElementService"
@@ -1219,6 +1224,7 @@
<ref local="org.hisp.dhis.expression.ExpressionDeletionHandler" />
<ref local="org.hisp.dhis.indicator.IndicatorDeletionHandler" />
<ref local="org.hisp.dhis.indicator.IndicatorGroupDeletionHandler" />
+ <ref local="org.hisp.dhis.indicator.IndicatorGroupSetDeletionHandler" />
<ref local="org.hisp.dhis.minmax.MinMaxDataElementDeletionHandler" />
<ref local="org.hisp.dhis.validation.ValidationRuleDeletionHandler" />
<ref local="org.hisp.dhis.validation.ValidationRuleGroupDeletionHandler" />