For the record, this has been fixed by Tran. Lars
On Wed, Apr 7, 2010 at 11:34 PM, Bob Jolliffe <[email protected]> wrote: > The problem seems to have come about with the addition of the > MinMaxValuesGeneratingService which also wants to implement the > DataAnalysisService but doesn't have the same return type to the > analyse() method. So Tran made the return type of the interface > generic to accomodate both. I'm not sure if this was a good idea. > > Tran is there a good reason for MinMaxValuesGeneratingService to > implement DataAnalysisService? It looks wrong to me. And it makes Jo > not feel very well. > > Regards > Bob > > On 7 April 2010 21:58, <[email protected]> wrote: > > ------------------------------------------------------------ > > revno: 1749 > > committer: Jo Størset <[email protected]> > > branch nick: trunk > > timestamp: Wed 2010-04-07 22:55:29 +0200 > > message: > > Doing it this way should help (but don't like these untyped apis > requiring unsafe casting) > > modified: > > > > dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataanalysis/DataAnalysisService.java > > > > dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/dataanalysis/GetAnalysisAction.java > > > > > > -- > > 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/dataanalysis/DataAnalysisService.java' > > --- > dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataanalysis/DataAnalysisService.java > 2010-04-07 20:33:09 +0000 > > +++ > dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataanalysis/DataAnalysisService.java > 2010-04-07 20:55:29 +0000 > > @@ -30,7 +30,6 @@ > > import java.util.Collection; > > > > import org.hisp.dhis.dataelement.DataElement; > > -import org.hisp.dhis.datavalue.DeflatedDataValue; > > import org.hisp.dhis.organisationunit.OrganisationUnit; > > import org.hisp.dhis.period.Period; > > > > @@ -43,6 +42,6 @@ > > { > > String ID = DataAnalysisService.class.getName(); > > > > - Collection<DeflatedDataValue> analyse( OrganisationUnit > organisationUnit, Collection<DataElement> dataElements, > > + Collection<?> analyse( OrganisationUnit organisationUnit, > Collection<DataElement> dataElements, > > Collection<Period> periods, Double stdDevFactor ); > > } > > > > === modified file > 'dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/dataanalysis/GetAnalysisAction.java' > > --- > dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/dataanalysis/GetAnalysisAction.java > 2010-02-02 13:35:59 +0000 > > +++ > dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/dataanalysis/GetAnalysisAction.java > 2010-04-07 20:55:29 +0000 > > @@ -220,7 +220,7 @@ > > { > > log.info( "Data analysis type: " + key ); > > > > - dataValues = service.analyse( organisationUnit, > dataElements, periods, standardDeviation ); > > + dataValues = (Collection<DeflatedDataValue>) > service.analyse( organisationUnit, dataElements, periods, standardDeviation > ); > > } > > > > return SUCCESS; > > > > > > _______________________________________________ > > Mailing list: https://launchpad.net/~dhis2-devs > > Post to : [email protected] > > Unsubscribe : https://launchpad.net/~dhis2-devs > > More help : https://help.launchpad.net/ListHelp > > > > > > _______________________________________________ > Mailing list: https://launchpad.net/~dhis2-devs > Post to : [email protected] > Unsubscribe : https://launchpad.net/~dhis2-devs > More help : https://help.launchpad.net/ListHelp >
_______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : [email protected] Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
