dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1929
committer: Lars <larshelg@larshelg-laptop>
branch nick: trunk
timestamp: Wed 2010-08-18 10:04:37 +0200
message:
  Removed deprecated property DataSet.lockedPeriods
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSet.java
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/DataSetDeletionHandler.java
  dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/DataSet.hbm.xml
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lock/CollectiveDataLockingAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/showSqlViewListForm.vm


--
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-api/src/main/java/org/hisp/dhis/dataset/DataSet.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSet.java	2010-06-23 12:06:35 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSet.java	2010-08-18 08:04:37 +0000
@@ -34,7 +34,6 @@
 import org.hisp.dhis.common.IdentifiableObject;
 import org.hisp.dhis.dataelement.DataElement;
 import org.hisp.dhis.dataelement.DataElementOperand;
-import org.hisp.dhis.period.Period;
 import org.hisp.dhis.period.PeriodType;
 import org.hisp.dhis.source.Source;
 
@@ -73,16 +72,7 @@
     * Property indicating whether the DataSet is locked for data entry.
     */
     private Boolean locked = false;
-    
-    /**
-     * All locked periods within the DataSet.
-     * 
-     * @deprecated Replaced by the DataSetLock object.
-     */
-    @Deprecated
-    private Set<Period> lockedPeriods = new HashSet<Period>();
-    
-    
+        
     private Set<Section> sections = new HashSet<Section>();
 
     /**
@@ -207,16 +197,6 @@
         this.sources = sources;
     }
 
-    public Set<Period> getLockedPeriods()
-    {
-        return lockedPeriods;
-    }
-
-    public void setLockedPeriods( Set<Period> lockedPeriods )
-    {
-        this.lockedPeriods = lockedPeriods;
-    }
-
     public Boolean getLocked()
     {
         return locked;

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/DataSetDeletionHandler.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/DataSetDeletionHandler.java	2010-04-21 14:32:54 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/DataSetDeletionHandler.java	2010-08-18 08:04:37 +0000
@@ -28,7 +28,6 @@
  */
 
 import org.hisp.dhis.dataelement.DataElement;
-import org.hisp.dhis.period.Period;
 import org.hisp.dhis.source.Source;
 import org.hisp.dhis.system.deletion.DeletionHandler;
 
@@ -83,16 +82,4 @@
             }
         }
     }
-
-    @Override
-    public void deletePeriod( Period period )
-    {
-        for ( DataSet dataSet : dataSetService.getAllDataSets() )
-        {
-            if ( dataSet.getLockedPeriods().remove( period ) )
-            {
-                dataSetService.updateDataSet( dataSet );
-            }
-        }
-    }
 }

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/DataSet.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/DataSet.hbm.xml	2010-06-23 12:06:35 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/DataSet.hbm.xml	2010-08-18 08:04:37 +0000
@@ -35,13 +35,7 @@
       <many-to-many column="sourceid" 
         class="org.hisp.dhis.source.Source"/>
     </set>
-	  
-    <set name="lockedPeriods" table="datasetlockedperiods">
-      <key column="datasetid"/>
-      <many-to-many column="periodid" 
-        class="org.hisp.dhis.period.Period"/>
-    </set>
-	  
+	  	  
 	<set name="sections" order-by="sortorder" inverse="true" cascade="all">
       <key column="datasetid"/>      
       <one-to-many class="org.hisp.dhis.dataset.Section"/>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lock/CollectiveDataLockingAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lock/CollectiveDataLockingAction.java	2010-08-06 06:54:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lock/CollectiveDataLockingAction.java	2010-08-18 08:04:37 +0000
@@ -136,14 +136,7 @@
     {
         this.dataSetIds = DataSetIds;
     }
-   /*
-    private Collection<Integer> organisationUnitIds = new ArrayList<Integer>();
-
-    public void setOrganisationUnitIds( Collection<Integer> organisationUnitIds )
-    {
-        this.organisationUnitIds = organisationUnitIds;
-    }
- */
+    
     private String selectionValue = new String();
 
     public void setSelectionValue( String selectionValue )

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/showSqlViewListForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/showSqlViewListForm.vm	2010-07-19 05:49:33 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/showSqlViewListForm.vm	2010-08-18 08:04:37 +0000
@@ -6,7 +6,7 @@
 			<table width="100%">
 				<tr>
 					<td>$i18n.getString( "filter_by_name" ): <form style="display:inline" action="none" onsubmit="return false"><div style="inline"><input type="text" onkeyup="filterValues( this.value )" style="width:300px"/></div></form></td>
-					<td align="right"><input type="button" value="$i18n.getString( 'add_new' )" onclick="window.location.href='showAddSqlViewForm.action'" style="width:100px"/><input type="button" value="$i18n.getString( "cancel" )" onclick="window.location='index.action'" style="width:100px"/></td>
+					<td align="right"><input type="button" value="$i18n.getString( 'add_new' )" onclick="window.location.href='showAddSqlViewForm.action'" style="width:100px"/></td>
 				</tr>
 			</table>
 			<table width="100%" class="listTable">