← Back to team overview

dhis2-devs team mailing list archive

  1. dhis2-devs team
  2. Mailing list archive
  3. Message #08567

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2081: Made a few singleton action classes prototypes

  Thread Previous • Date Previous • • Thread Next 
------------------------------------------------------------
revno: 2081
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2010-11-16 18:14:13 +0100
message:
  Made a few singleton action classes prototypes
modified:
  dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/META-INF/dhis/beans.xml
  dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/standard_comments.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-web/dhis-web-dataentry/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/META-INF/dhis/beans.xml	2010-11-11 21:55:05 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/META-INF/dhis/beans.xml	2010-11-16 17:14:13 +0000
@@ -6,24 +6,19 @@
 
 	<bean id="org.hisp.dhis.de.action.EmptyAction" class="org.hisp.dhis.de.action.EmptyAction" />
 
-	<bean id="org.hisp.dhis.de.comments.StandardCommentsManager"
-		class="org.hisp.dhis.de.comments.DefaultStandardCommentsManager" init-method="init">
-		<property name="standardCommentsFile">
-			<value>standard_comments.xml</value>
-		</property>
+	<bean id="org.hisp.dhis.de.comments.StandardCommentsManager" class="org.hisp.dhis.de.comments.DefaultStandardCommentsManager" init-method="init">
+		<property name="standardCommentsFile" value="standard_comments.xml" />
 	</bean>
 
 	<bean id="org.hisp.dhis.de.history.HistoryRetriever" class="org.hisp.dhis.de.history.DefaultHistoryRetriever">
-		<property name="minMaxDataElementService"
-			ref="org.hisp.dhis.minmax.MinMaxDataElementService" />
+		<property name="minMaxDataElementService" ref="org.hisp.dhis.minmax.MinMaxDataElementService" />
 		<property name="dataValueService" ref="org.hisp.dhis.datavalue.DataValueService" />
 		<property name="periodService" ref="org.hisp.dhis.period.PeriodService" />
 	</bean>
 
 	<bean id="org.hisp.dhis.de.state.SelectedStateManager" class="org.hisp.dhis.de.state.DefaultSelectedStateManager">
 		<property name="dataSetService" ref="org.hisp.dhis.dataset.DataSetService" />
-		<property name="selectionManager"
-			ref="org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager" />
+		<property name="selectionManager" ref="org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager" />
 		<property name="userStore" ref="org.hisp.dhis.user.UserStore" />
 		<property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
 		<property name="periodService" ref="org.hisp.dhis.period.PeriodService" />
@@ -31,12 +26,9 @@
 
 	<bean id="org.hisp.dhis.de.screen.DataEntryScreenManager" class="org.hisp.dhis.de.screen.DefaultDataEntryScreenManager">
 		<property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />		
-		<property name="categoryService"
-			ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
+		<property name="categoryService" ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
 		<property name="dataValueService" ref="org.hisp.dhis.datavalue.DataValueService" />
-		<property name="customValueService">
-			<ref bean="org.hisp.dhis.customvalue.CustomValueService" />
-		</property>
+		<property name="customValueService" ref="org.hisp.dhis.customvalue.CustomValueService" />
 	</bean>
 
 	<bean id="org.hisp.dhis.de.state.StatefulDataValueSaver" class="org.hisp.dhis.de.state.DefaultStatefulDataValueSaver">
@@ -44,169 +36,122 @@
 		<property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
 		<property name="dataValueService" ref="org.hisp.dhis.datavalue.DataValueService" />
 		<property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
-		<property name="categoryService"
-			ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
+		<property name="categoryService" ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
 	</bean>
 
 	<!-- Actions -->
 
-	<bean id="org.hisp.dhis.de.action.SelectAction" class="org.hisp.dhis.de.action.SelectAction"
-		scope="prototype">
+	<bean id="org.hisp.dhis.de.action.SelectAction" class="org.hisp.dhis.de.action.SelectAction" scope="prototype">
 		<property name="dataSetLockService" ref="org.hisp.dhis.datalock.DataSetLockService" />
 		<property name="selectedStateManager" ref="org.hisp.dhis.de.state.SelectedStateManager" />
 		<property name="dataSetService" ref="org.hisp.dhis.dataset.DataSetService" />
-		<property name="registrationService"
-			ref="org.hisp.dhis.dataset.CompleteDataSetRegistrationService" />
-		<property name="dataEntryScreenManager"
-			ref="org.hisp.dhis.de.screen.DataEntryScreenManager" />
-	</bean>
-
-	<bean id="org.hisp.dhis.de.action.NextPeriodsAction" class="org.hisp.dhis.de.action.NextPeriodsAction">
-		<property name="selectedStateManager" ref="org.hisp.dhis.de.state.SelectedStateManager" />
-	</bean>
-
-	<bean id="org.hisp.dhis.de.action.PreviousPeriodsAction" class="org.hisp.dhis.de.action.PreviousPeriodsAction">
-		<property name="selectedStateManager" ref="org.hisp.dhis.de.state.SelectedStateManager" />
-	</bean>
-
-	<bean id="org.hisp.dhis.de.action.FormAction"
-		class="org.hisp.dhis.de.action.FormAction" scope="prototype">
+		<property name="registrationService" ref="org.hisp.dhis.dataset.CompleteDataSetRegistrationService" />
+		<property name="dataEntryScreenManager"	ref="org.hisp.dhis.de.screen.DataEntryScreenManager" />
+	</bean>
+
+	<bean id="org.hisp.dhis.de.action.NextPeriodsAction" class="org.hisp.dhis.de.action.NextPeriodsAction" scope="prototype">
+		<property name="selectedStateManager" ref="org.hisp.dhis.de.state.SelectedStateManager" />
+	</bean>
+
+	<bean id="org.hisp.dhis.de.action.PreviousPeriodsAction" class="org.hisp.dhis.de.action.PreviousPeriodsAction" scope="prototype">
+		<property name="selectedStateManager" ref="org.hisp.dhis.de.state.SelectedStateManager" />
+	</bean>
+
+	<bean id="org.hisp.dhis.de.action.FormAction" class="org.hisp.dhis.de.action.FormAction" scope="prototype">
 		<property name="dataSetLockService" ref="org.hisp.dhis.datalock.DataSetLockService" />
 		<property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
 		<property name="dataValueService" ref="org.hisp.dhis.datavalue.DataValueService" />
-		<property name="dataEntryScreenManager"
-			ref="org.hisp.dhis.de.screen.DataEntryScreenManager" />
-		<property name="standardCommentsManager"
-			ref="org.hisp.dhis.de.comments.StandardCommentsManager" />
-		<property name="minMaxDataElementService"
-			ref="org.hisp.dhis.minmax.MinMaxDataElementService" />
+		<property name="dataEntryScreenManager"	ref="org.hisp.dhis.de.screen.DataEntryScreenManager" />
+		<property name="standardCommentsManager" ref="org.hisp.dhis.de.comments.StandardCommentsManager" />
+		<property name="minMaxDataElementService" ref="org.hisp.dhis.minmax.MinMaxDataElementService" />
 		<property name="selectedStateManager" ref="org.hisp.dhis.de.state.SelectedStateManager" />
 		<property name="systemSettingManager" ref="org.hisp.dhis.options.SystemSettingManager" />
-		<property name="categoryService"
-			ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
+		<property name="categoryService" ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
 		<property name="customValueService" ref="org.hisp.dhis.customvalue.CustomValueService" />
 	</bean>
 
-	<bean id="org.hisp.dhis.de.action.SectionFormAction"
-		class="org.hisp.dhis.de.action.SectionFormAction" scope="prototype">
-		<property name="dataValueService"
-			ref="org.hisp.dhis.datavalue.DataValueService"/>
-		<property name="dataElementService"
-			ref="org.hisp.dhis.dataelement.DataElementService"/>
-		<property name="standardCommentsManager"
-			ref="org.hisp.dhis.de.comments.StandardCommentsManager"/>
-		<property name="minMaxDataElementService"
-			ref="org.hisp.dhis.minmax.MinMaxDataElementService"/>
-		<property name="selectedStateManager"
-			ref="org.hisp.dhis.de.state.SelectedStateManager"/>
-		<property name="customValueService">
-			<ref bean="org.hisp.dhis.customvalue.CustomValueService"/>
-		</property>
-		<property name="systemSettingManager">
-			<ref bean="org.hisp.dhis.options.SystemSettingManager" />
-		</property> 
-		<property name="categoryService"
-			ref="org.hisp.dhis.dataelement.DataElementCategoryService"/>
-		<property name="dataEntryScreenManager"
-            ref="org.hisp.dhis.de.screen.DataEntryScreenManager" />
-	</bean>
-
-	<bean id="org.hisp.dhis.de.action.SaveValueAction" class="org.hisp.dhis.de.action.SaveValueAction"
-		scope="prototype">
-		<property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
-		<property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
-		<property name="dataValueService" ref="org.hisp.dhis.datavalue.DataValueService" />
-		<property name="selectedStateManager" ref="org.hisp.dhis.de.state.SelectedStateManager" />
-		<property name="categoryService" ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
-		<property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
-	</bean>
-
-	<bean id="org.hisp.dhis.de.action.SaveCommentAction" class="org.hisp.dhis.de.action.SaveCommentAction"
-		scope="prototype">
-		<property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
-		<property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
-		<property name="dataValueService" ref="org.hisp.dhis.datavalue.DataValueService" />
-		<property name="selectedStateManager" ref="org.hisp.dhis.de.state.SelectedStateManager" />
-		<property name="categoryService"
-			ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
-		<property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
-	</bean>
-
-	<bean id="org.hisp.dhis.de.action.SaveMinMaxLimitsAction" class="org.hisp.dhis.de.action.SaveMinMaxLimitsAction"
-		scope="prototype">
-		<property name="minMaxDataElementService"
-			ref="org.hisp.dhis.minmax.MinMaxDataElementService" />
-		<property name="organisationUnitService"
-			ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
-		<property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
-		<property name="categoryService"
-			ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
-	</bean>
-
-	<bean id="org.hisp.dhis.de.action.RemoveMinMaxLimitsAction" class="org.hisp.dhis.de.action.RemoveMinMaxLimitsAction"
-		scope="prototype">
-		<property name="minMaxDataElementService"
-			ref="org.hisp.dhis.minmax.MinMaxDataElementService" />
-		<property name="organisationUnitService"
-			ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
-		<property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
-		<property name="categoryService"
-			ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
-	</bean>
-
-	<bean id="org.hisp.dhis.de.action.CalculateCDEsAction" class="org.hisp.dhis.de.action.CalculateCDEsAction"
-		scope="prototype">
+	<bean id="org.hisp.dhis.de.action.SectionFormAction" class="org.hisp.dhis.de.action.SectionFormAction" scope="prototype">
+		<property name="dataValueService" ref="org.hisp.dhis.datavalue.DataValueService"/>
+		<property name="dataElementService"	ref="org.hisp.dhis.dataelement.DataElementService"/>
+		<property name="standardCommentsManager" ref="org.hisp.dhis.de.comments.StandardCommentsManager"/>
+		<property name="minMaxDataElementService" ref="org.hisp.dhis.minmax.MinMaxDataElementService"/>
+		<property name="selectedStateManager" ref="org.hisp.dhis.de.state.SelectedStateManager"/>
+		<property name="customValueService" ref="org.hisp.dhis.customvalue.CustomValueService"/>
+		<property name="systemSettingManager" ref="org.hisp.dhis.options.SystemSettingManager" />
+		<property name="categoryService" ref="org.hisp.dhis.dataelement.DataElementCategoryService"/>
+		<property name="dataEntryScreenManager" ref="org.hisp.dhis.de.screen.DataEntryScreenManager" />
+	</bean>
+
+	<bean id="org.hisp.dhis.de.action.SaveValueAction" class="org.hisp.dhis.de.action.SaveValueAction" scope="prototype">
+		<property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
+		<property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
+		<property name="dataValueService" ref="org.hisp.dhis.datavalue.DataValueService" />
+		<property name="selectedStateManager" ref="org.hisp.dhis.de.state.SelectedStateManager" />
+		<property name="categoryService" ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
+		<property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
+	</bean>
+
+	<bean id="org.hisp.dhis.de.action.SaveCommentAction" class="org.hisp.dhis.de.action.SaveCommentAction" scope="prototype">
+		<property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
+		<property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
+		<property name="dataValueService" ref="org.hisp.dhis.datavalue.DataValueService" />
+		<property name="selectedStateManager" ref="org.hisp.dhis.de.state.SelectedStateManager" />
+		<property name="categoryService" ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
+		<property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
+	</bean>
+
+	<bean id="org.hisp.dhis.de.action.SaveMinMaxLimitsAction" class="org.hisp.dhis.de.action.SaveMinMaxLimitsAction" scope="prototype">
+		<property name="minMaxDataElementService" ref="org.hisp.dhis.minmax.MinMaxDataElementService" />
+		<property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
+		<property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
+		<property name="categoryService" ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
+	</bean>
+
+	<bean id="org.hisp.dhis.de.action.RemoveMinMaxLimitsAction" class="org.hisp.dhis.de.action.RemoveMinMaxLimitsAction" scope="prototype">
+		<property name="minMaxDataElementService" ref="org.hisp.dhis.minmax.MinMaxDataElementService" />
+		<property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
+		<property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
+		<property name="categoryService" ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
+	</bean>
+
+	<bean id="org.hisp.dhis.de.action.CalculateCDEsAction" class="org.hisp.dhis.de.action.CalculateCDEsAction" scope="prototype">
 		<property name="expressionService" ref="org.hisp.dhis.expression.ExpressionService" />
 		<property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
 		<property name="selectedStateManager" ref="org.hisp.dhis.de.state.SelectedStateManager" />
-		<property name="statefulDataValueSaver"
-			ref="org.hisp.dhis.de.state.StatefulDataValueSaver" />
-		<property name="categoryService"
-			ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
+		<property name="statefulDataValueSaver"	ref="org.hisp.dhis.de.state.StatefulDataValueSaver" />
+		<property name="categoryService" ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
 	</bean>
 
-	<bean id="org.hisp.dhis.de.action.HistoryAction" class="org.hisp.dhis.de.action.HistoryAction"
-		scope="prototype">
+	<bean id="org.hisp.dhis.de.action.HistoryAction" class="org.hisp.dhis.de.action.HistoryAction" scope="prototype">
 		<property name="historyRetriever" ref="org.hisp.dhis.de.history.HistoryRetriever" />
 		<property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
 		<property name="selectedStateManager" ref="org.hisp.dhis.de.state.SelectedStateManager" />
-		<property name="categoryService"
-			ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
+		<property name="categoryService" ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
 		<property name="dataValueService" ref="org.hisp.dhis.datavalue.DataValueService" />
-		<property name="standardCommentsManager"
-			ref="org.hisp.dhis.de.comments.StandardCommentsManager" />
+		<property name="standardCommentsManager" ref="org.hisp.dhis.de.comments.StandardCommentsManager" />
 		<property name="dataValueAuditService" ref="org.hisp.dhis.datavalue.DataValueAuditService" />
 	</bean>
 
-	<bean id="org.hisp.dhis.de.action.MinMaxGeneratingAction" class="org.hisp.dhis.de.action.MinMaxGeneratingAction"
-		scope="prototype">
+	<bean id="org.hisp.dhis.de.action.MinMaxGeneratingAction" class="org.hisp.dhis.de.action.MinMaxGeneratingAction" scope="prototype">
 		<property name="minMaxDataElementService" ref="org.hisp.dhis.minmax.MinMaxDataElementService" />
 		<property name="selectedStateManager" ref="org.hisp.dhis.de.state.SelectedStateManager" />
 		<property name="minMaxValuesGenerationService" ref="org.hisp.dhis.minmax.validation.MinMaxValuesGenerationService" />
 		<property name="systemSettingManager" ref="org.hisp.dhis.options.SystemSettingManager" />
 	</bean>
 
-	<bean id="org.hisp.dhis.de.action.RegisterCompleteDataSetAction"
-		class="org.hisp.dhis.de.action.RegisterCompleteDataSetAction" scope="prototype">
-		<property name="registrationService"
-			ref="org.hisp.dhis.dataset.CompleteDataSetRegistrationService" />
-		<property name="selectedStateManager" ref="org.hisp.dhis.de.state.SelectedStateManager" />
-	</bean>
-
-	<bean id="org.hisp.dhis.de.action.UndoCompleteDataSetAction"
-		class="org.hisp.dhis.de.action.UndoCompleteDataSetAction" scope="prototype">
-		<property name="registrationService"
-			ref="org.hisp.dhis.dataset.CompleteDataSetRegistrationService" />
-		<property name="selectedStateManager" ref="org.hisp.dhis.de.state.SelectedStateManager" />
-	</bean>
-
-	<bean id="org.hisp.dhis.de.action.ValidationAction" class="org.hisp.dhis.de.action.ValidationAction">
-		<property name="validationRuleService">
-			<ref bean="org.hisp.dhis.validation.ValidationRuleService" />
-		</property>
-		<property name="expressionService">
-			<ref bean="org.hisp.dhis.expression.ExpressionService" />
-		</property>
+	<bean id="org.hisp.dhis.de.action.RegisterCompleteDataSetAction" class="org.hisp.dhis.de.action.RegisterCompleteDataSetAction" scope="prototype">
+		<property name="registrationService" ref="org.hisp.dhis.dataset.CompleteDataSetRegistrationService" />
+		<property name="selectedStateManager" ref="org.hisp.dhis.de.state.SelectedStateManager" />
+	</bean>
+
+	<bean id="org.hisp.dhis.de.action.UndoCompleteDataSetAction" class="org.hisp.dhis.de.action.UndoCompleteDataSetAction" scope="prototype">
+		<property name="registrationService" ref="org.hisp.dhis.dataset.CompleteDataSetRegistrationService" />
+		<property name="selectedStateManager" ref="org.hisp.dhis.de.state.SelectedStateManager" />
+	</bean>
+
+	<bean id="org.hisp.dhis.de.action.ValidationAction" class="org.hisp.dhis.de.action.ValidationAction" scope="prototype">
+		<property name="validationRuleService" ref="org.hisp.dhis.validation.ValidationRuleService" />
+		<property name="expressionService" ref="org.hisp.dhis.expression.ExpressionService" />
 		<property name="selectedStateManager" ref="org.hisp.dhis.de.state.SelectedStateManager" />
 		<property name="periodService" ref="org.hisp.dhis.period.PeriodService" />
 		<property name="stdDevOutlierAnalysisService" ref="org.hisp.dhis.dataanalysis.StdDevOutlierAnalysisService"/>
@@ -216,23 +161,17 @@
 		<property name="systemSettingManager" ref="org.hisp.dhis.options.SystemSettingManager"/>
 	</bean>
 	
-	<bean id="org.hisp.dhis.de.action.MarkForFollowupAction" class="org.hisp.dhis.de.action.MarkForFollowupAction">
-		<property name="dataValueService" 
-			ref="org.hisp.dhis.datavalue.DataValueService"/>
-		<property name="dataElementService" 
-			ref="org.hisp.dhis.dataelement.DataElementService"/>
+	<bean id="org.hisp.dhis.de.action.MarkForFollowupAction" class="org.hisp.dhis.de.action.MarkForFollowupAction" scope="prototype">
+		<property name="dataValueService" ref="org.hisp.dhis.datavalue.DataValueService"/>
+		<property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService"/>
 		<property name="periodService" ref="org.hisp.dhis.period.PeriodService"/>
-		<property name="organisationUnitService" 
-			ref="org.hisp.dhis.organisationunit.OrganisationUnitService"/>
-		<property name="categoryService" 
-			ref="org.hisp.dhis.dataelement.DataElementCategoryService"/>
+		<property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService"/>
+		<property name="categoryService" ref="org.hisp.dhis.dataelement.DataElementCategoryService"/>
 	</bean>
 	
-	<bean id="org.hisp.dhis.de.action.GetHistoryChartAction" class="org.hisp.dhis.de.action.GetHistoryChartAction">
-		<property name="dataElementService" 
-            ref="org.hisp.dhis.dataelement.DataElementService"/>
-		<property name="categoryService" 
-            ref="org.hisp.dhis.dataelement.DataElementCategoryService"/>
+	<bean id="org.hisp.dhis.de.action.GetHistoryChartAction" class="org.hisp.dhis.de.action.GetHistoryChartAction" scope="prototype">
+		<property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService"/>
+		<property name="categoryService" ref="org.hisp.dhis.dataelement.DataElementCategoryService"/>
         <property name="selectedStateManager" ref="org.hisp.dhis.de.state.SelectedStateManager" />
 		<property name="chartService" ref="org.hisp.dhis.chart.ChartService"/>        
 	</bean>

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/standard_comments.xml'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/standard_comments.xml	2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/standard_comments.xml	2010-11-16 17:14:13 +0000
@@ -1,6 +1,6 @@
 <list>
   <string>Holiday visitors</string>
-  <string>Interpolated dataset!</string>
+  <string>Interpolated dataset</string>
   <string>Missing</string>
   <string>Never in stock</string>
   <string>No activity for this month</string>
@@ -9,5 +9,4 @@
   <string>Seasonal workers</string>
   <string>Staff on leave</string>
   <string>Staff on sick leave</string>
-  <string>No TB patients this quarter</string>
 </list>
\ No newline at end of file
  Thread Previous • Date Previous • • Thread Next