dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #26805
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 13263: Light, centralized methods
------------------------------------------------------------
revno: 13263
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2013-12-16 18:13:31 +0100
message:
Light, centralized methods
modified:
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/DefaultIdentifiableObjectManager.java
dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateGenericStore.java
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryenrollment/action/SaveMobileProgramEnrollmentAction.java
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryregistration/action/SaveBeneficiaryAction.java
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/dataentry/action/SaveSectionFormAction.java
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/utils/FormUtils.java
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/utils/NamebasedUtils.java
dhis-2/dhis-web/dhis-web-light/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/common/DefaultIdentifiableObjectManager.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/DefaultIdentifiableObjectManager.java 2013-12-16 13:05:53 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/DefaultIdentifiableObjectManager.java 2013-12-16 17:13:31 +0000
@@ -73,6 +73,7 @@
for ( GenericIdentifiableObjectStore<IdentifiableObject> store : identifiableObjectStores )
{
+ System.out.println("id store '" + store + "' - '" + store.getClazz() + "' - '" + store.getClass());
if ( store != null && store.getClazz() != null )
{
identifiableObjectStoreMap.put( store.getClazz(), store );
=== modified file 'dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateGenericStore.java'
--- dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateGenericStore.java 2013-10-25 18:39:01 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateGenericStore.java 2013-12-16 17:13:31 +0000
@@ -97,7 +97,6 @@
/**
* Could be injected through container.
*/
- @Required
public void setClazz( Class<T> clazz )
{
this.clazz = clazz;
=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryenrollment/action/SaveMobileProgramEnrollmentAction.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryenrollment/action/SaveMobileProgramEnrollmentAction.java 2013-09-27 11:13:20 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryenrollment/action/SaveMobileProgramEnrollmentAction.java 2013-12-16 17:13:31 +0000
@@ -60,6 +60,7 @@
import org.hisp.dhis.program.ProgramStageInstance;
import org.hisp.dhis.program.ProgramStageInstanceService;
import org.hisp.dhis.system.util.DateUtils;
+import org.hisp.dhis.system.util.MathUtils;
import org.hisp.dhis.util.ContextUtils;
import org.joda.time.format.DateTimeFormatter;
import org.joda.time.format.ISODateTimeFormat;
@@ -341,7 +342,7 @@
{
this.validationMap.put( key, "is_mandatory" );
}
- else if ( patientIdentifierType.getType().equals( "number" ) && !FormUtils.isNumber( value ) )
+ else if ( patientIdentifierType.getType().equals( "number" ) && !MathUtils.isNumeric( value ) )
{
this.validationMap.put( key, "is_invalid_number" );
}
@@ -377,7 +378,7 @@
}
else if ( value.trim().length() > 0
&& patientAttribute.getValueType().equals( PatientAttribute.TYPE_INT )
- && !FormUtils.isInteger( value ) )
+ && !MathUtils.isInteger( value ) )
{
this.validationMap.put( key, "is_invalid_number" );
}
=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryregistration/action/SaveBeneficiaryAction.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryregistration/action/SaveBeneficiaryAction.java 2013-12-16 04:27:26 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryregistration/action/SaveBeneficiaryAction.java 2013-12-16 17:13:31 +0000
@@ -53,6 +53,7 @@
import org.hisp.dhis.patientattributevalue.PatientAttributeValue;
import org.hisp.dhis.program.Program;
import org.hisp.dhis.program.ProgramService;
+import org.hisp.dhis.system.util.MathUtils;
import org.hisp.dhis.util.ContextUtils;
import com.opensymphony.xwork2.Action;
@@ -397,7 +398,7 @@
{
this.validationMap.put( key, "is_mandatory" );
}
- else if ( patientIdentifierType.getType().equals( "number" ) && !FormUtils.isNumber( value ) )
+ else if ( patientIdentifierType.getType().equals( "number" ) && !MathUtils.isNumeric( value ) )
{
this.validationMap.put( key, "is_invalid_number" );
}
@@ -434,7 +435,7 @@
}
else if ( value.trim().length() > 0
&& patientAttribute.getValueType().equals( PatientAttribute.TYPE_INT )
- && !FormUtils.isInteger( value ) )
+ && !MathUtils.isInteger( value ) )
{
this.validationMap.put( key, "is_invalid_number" );
}
=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/dataentry/action/SaveSectionFormAction.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/dataentry/action/SaveSectionFormAction.java 2013-10-07 17:58:57 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/dataentry/action/SaveSectionFormAction.java 2013-12-16 17:13:31 +0000
@@ -59,6 +59,7 @@
import org.hisp.dhis.organisationunit.OrganisationUnitService;
import org.hisp.dhis.period.Period;
import org.hisp.dhis.period.PeriodService;
+import org.hisp.dhis.system.util.MathUtils;
import org.hisp.dhis.user.CurrentUserService;
import org.hisp.dhis.util.ContextUtils;
@@ -345,7 +346,7 @@
else if ( type.equals( DataElement.VALUE_TYPE_INT )
&& numberType.equals( DataElement.VALUE_TYPE_NUMBER ) )
{
- if ( !FormUtils.isNumber( value ) )
+ if ( !MathUtils.isNumeric( value ) )
{
correctType = false;
typeViolations.put( key, "\"" + value + "\"" + " " + i18n.getString( "is_invalid_number" ) );
@@ -354,7 +355,7 @@
else if ( type.equals( DataElement.VALUE_TYPE_INT )
&& numberType.equals( DataElement.VALUE_TYPE_INT ) )
{
- if ( !FormUtils.isInteger( value ) )
+ if ( !MathUtils.isInteger( value ) )
{
correctType = false;
typeViolations.put( key, "\"" + value + "\"" + " " + i18n.getString( "is_invalid_integer" ) );
=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/utils/FormUtils.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/utils/FormUtils.java 2013-10-07 17:58:57 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/utils/FormUtils.java 2013-12-16 17:13:31 +0000
@@ -299,36 +299,6 @@
// Static Utils
// -------------------------------------------------------------------------
- public static boolean isNumber( String value )
- {
- try
- {
- Double.parseDouble( value );
- }
- catch ( NumberFormatException e )
- {
- return false;
- }
-
- return true;
- }
-
- public static boolean isInteger( String value )
- {
- try
- {
- Integer.parseInt( value );
- }
- catch ( NumberFormatException e )
- {
- return false;
- }
-
- return true;
- }
-
- //TODO re-use ValidationUtils
-
public static boolean isPositiveInteger( String value )
{
return valueHigher( value, 0 );
=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/utils/NamebasedUtils.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/utils/NamebasedUtils.java 2013-12-16 15:15:54 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/utils/NamebasedUtils.java 2013-12-16 17:13:31 +0000
@@ -41,6 +41,7 @@
import org.hisp.dhis.program.ProgramStageDataElement;
import org.hisp.dhis.program.ProgramStageInstance;
import org.hisp.dhis.program.ProgramStageService;
+import org.hisp.dhis.system.util.MathUtils;
public class NamebasedUtils
{
@@ -104,14 +105,14 @@
}
else if ( type.equals( DataElement.VALUE_TYPE_INT ) && numberType.equals( DataElement.VALUE_TYPE_NUMBER ) )
{
- if ( !FormUtils.isNumber( value ) )
+ if ( !MathUtils.isNumeric( value ) )
{
return "is_invalid_number";
}
}
else if ( type.equals( DataElement.VALUE_TYPE_INT ) && numberType.equals( DataElement.VALUE_TYPE_INT ) )
{
- if ( !FormUtils.isInteger( value ) )
+ if ( !MathUtils.isInteger( value ) )
{
return "is_invalid_integer";
}
=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-light/src/main/resources/META-INF/dhis/beans.xml 2013-12-16 16:30:49 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/resources/META-INF/dhis/beans.xml 2013-12-16 17:13:31 +0000
@@ -3,7 +3,6 @@
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd";>
-
<bean id="org.hisp.dhis.light.action.NoAction" class="org.hisp.dhis.light.action.NoAction"
scope="prototype" />
@@ -472,7 +471,6 @@
<property name="userService" ref="org.hisp.dhis.user.UserService"/>
</bean>
-
<bean
id="org.hisp.dhis.light.singleevent.action.FindSingleEventOptionSetAction"
class="org.hisp.dhis.light.singleevent.action.FindSingleEventOptionSetAction"
