dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #10639
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2915: Codestyle fix
------------------------------------------------------------
revno: 2915
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2011-02-25 00:14:56 +0100
message:
Codestyle fix
modified:
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/i18n/DefaultI18nService.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/i18n/DefaultI18nService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/i18n/DefaultI18nService.java 2010-09-24 11:12:49 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/i18n/DefaultI18nService.java 2011-02-24 23:14:56 +0000
@@ -93,16 +93,16 @@
internationalise( object, localeManager.getCurrentLocale() );
}
-
- public void localise(Object object, Locale locale)
- {
- if ( isCollection( object ) )
+
+ public void localise( Object object, Locale locale )
+ {
+ if ( isCollection( object ) )
{
internationaliseCollection( (Collection<?>) object, locale );
}
- internationalise( object, locale );
- }
+ internationalise( object, locale );
+ }
private void internationalise( Object object, Locale locale )
{
=== 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-02-24 06:35:20 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml 2011-02-24 23:14:56 +0000
@@ -364,27 +364,19 @@
<property name="services">
<map>
<entry>
- <key>
- <value>stddevoutlier</value>
- </key>
+ <key><value>stddevoutlier</value></key>
<ref bean="org.hisp.dhis.dataanalysis.StdDevOutlierAnalysisService" />
</entry>
<entry>
- <key>
- <value>minmaxoutlier</value>
- </key>
+ <key><value>minmaxoutlier</value></key>
<ref bean="org.hisp.dhis.dataanalysis.MinMaxOutlierAnalysisService" />
</entry>
<entry>
- <key>
- <value>gap</value>
- </key>
+ <key><value>gap</value></key>
<ref bean="org.hisp.dhis.dataanalysis.GapAnalysisService" />
</entry>
<entry>
- <key>
- <value>followup</value>
- </key>
+ <key><value>followup</value></key>
<ref bean="org.hisp.dhis.dataanalysis.FollowupAnalysisService" />
</entry>
</map>
@@ -462,13 +454,6 @@
<ref bean="I18nIndicatorGroupSet" />
<ref bean="I18nDataSet" />
<ref bean="I18nOrganisationUnit" />
- <!--ref bean="I18nReportExcelNormal" />
- <ref bean="I18nReportExcelCategory" />
- <ref bean="I18nReportExcelOganiztionGroupListing" />
- <ref bean="I18nReportExcelPeriodColumnListing" />
- <ref bean="I18nReportExcelItem" />
- <ref bean="I18nExcelItemGroup" />
- <ref bean="I18nExcelItem"/ -->
<ref bean="I18nSection" />
</list>
</property>
@@ -601,7 +586,6 @@
<entry key="required" value="false" />
<entry key="minlength" value="0" />
<entry key="maxlength" value="25" />
- <!--entry key="regex" value="/^[\w]?[\w\d]*$/" /-->
<entry key="regex" value="''" />
<entry key="message" value="translation_shortname_wellformed" />
</map>
@@ -786,7 +770,6 @@
<entry key="required" value="false" />
<entry key="minlength" value="0" />
<entry key="maxlength" value="25" />
- <!--entry key="regex" value="/^[\w]?[\w\d]*$/" /-->
<entry key="regex" value="''" />
<entry key="message" value="translation_shortname_wellformed" />
</map>
@@ -891,7 +874,6 @@
<entry key="required" value="false" />
<entry key="minlength" value="0" />
<entry key="maxlength" value="25" />
- <!--entry key="regex" value="/^[\w]?[\w\d]*$/" /-->
<entry key="regex" value="''" />
<entry key="message" value="translation_shortname_wellformed" />
</map>
@@ -924,174 +906,6 @@
</property>
</bean>
- <!--bean id="I18nReportExcelNormal" class="org.hisp.dhis.i18n.I18nObject">
- <property name="className" value="ReportExcelNormal" />
- <property name="propertyNames">
- <list>
- <value>name</value>
- </list>
- </property>
-
- <property name="rulePropertyNames">
- <map>
- <entry key="name">
- <map>
- <entry key="unique" value="true" />
- <entry key="required" value="true" />
- <entry key="minlength" value="2" />
- <entry key="maxlength" value="160" />
- <entry key="regex" value="''" />
- <entry key="message" value="" />
- </map>
- </entry>
- </map>
- </property>
- </bean>
-
- <bean id="I18nReportExcelCategory" class="org.hisp.dhis.i18n.I18nObject">
- <property name="className" value="ReportExcelCategory" />
- <property name="propertyNames">
- <list>
- <value>name</value>
- </list>
- </property>
-
- <property name="rulePropertyNames">
- <map>
- <entry key="name">
- <map>
- <entry key="unique" value="true" />
- <entry key="required" value="true" />
- <entry key="minlength" value="2" />
- <entry key="maxlength" value="160" />
- <entry key="regex" value="''" />
- <entry key="message" value="" />
- </map>
- </entry>
- </map>
- </property>
- </bean>
-
- <bean id="I18nReportExcelOganiztionGroupListing" class="org.hisp.dhis.i18n.I18nObject">
- <property name="className" value="ReportExcelOganiztionGroupListing" />
- <property name="propertyNames">
- <list>
- <value>name</value>
- </list>
- </property>
-
- <property name="rulePropertyNames">
- <map>
- <entry key="name">
- <map>
- <entry key="unique" value="true" />
- <entry key="required" value="true" />
- <entry key="minlength" value="2" />
- <entry key="maxlength" value="160" />
- <entry key="regex" value="''" />
- <entry key="message" value="" />
- </map>
- </entry>
- </map>
- </property>
- </bean>
-
- <bean id="I18nReportExcelPeriodColumnListing" class="org.hisp.dhis.i18n.I18nObject">
- <property name="className" value="ReportExcelPeriodColumnListing" />
- <property name="propertyNames">
- <list>
- <value>name</value>
- </list>
- </property>
-
- <property name="rulePropertyNames">
- <map>
- <entry key="name">
- <map>
- <entry key="unique" value="true" />
- <entry key="required" value="true" />
- <entry key="minlength" value="2" />
- <entry key="maxlength" value="160" />
- <entry key="regex" value="''" />
- <entry key="message" value="" />
- </map>
- </entry>
- </map>
- </property>
- </bean>
-
- <bean id="I18nReportExcelItem" class="org.hisp.dhis.i18n.I18nObject">
- <property name="className" value="ReportExcelItem" />
- <property name="propertyNames">
- <list>
- <value>name</value>
- </list>
- </property>
-
- <property name="rulePropertyNames">
- <map>
- <entry key="name">
- <map>
- <entry key="unique" value="true" />
- <entry key="required" value="true" />
- <entry key="minlength" value="2" />
- <entry key="maxlength" value="160" />
- <entry key="regex" value="''" />
- <entry key="message" value="" />
- </map>
- </entry>
- </map>
- </property>
- </bean>
-
- <bean id="I18nExcelItemGroup" class="org.hisp.dhis.i18n.I18nObject">
- <property name="className" value="ExcelItemGroup" />
- <property name="propertyNames">
- <list>
- <value>name</value>
- </list>
- </property>
-
- <property name="rulePropertyNames">
- <map>
- <entry key="name">
- <map>
- <entry key="unique" value="true" />
- <entry key="required" value="true" />
- <entry key="minlength" value="2" />
- <entry key="maxlength" value="160" />
- <entry key="regex" value="''" />
- <entry key="message" value="" />
- </map>
- </entry>
- </map>
- </property>
- </bean>
-
- <bean id="I18nExcelItem" class="org.hisp.dhis.i18n.I18nObject">
- <property name="className" value="ExcelItem" />
- <property name="propertyNames">
- <list>
- <value>name</value>
- </list>
- </property>
-
- <property name="rulePropertyNames">
- <map>
- <entry key="name">
- <map>
- <entry key="unique" value="true" />
- <entry key="required" value="true" />
- <entry key="minlength" value="2" />
- <entry key="maxlength" value="160" />
- <entry key="regex" value="''" />
- <entry key="message" value="" />
- </map>
- </entry>
- </map>
- </property>
- </bean-->
-
<bean id="I18nSection" class="org.hisp.dhis.i18n.I18nObject">
<property name="className" value="Section" />
<property name="propertyNames">
