dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #27397
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 13643: more typo fixes
------------------------------------------------------------
revno: 13643
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2014-01-07 20:41:39 +0100
message:
more typo fixes
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/PeriodService.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/PeriodStore.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramExpressionService.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramIndicatorService.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStage.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageInstanceStore.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTableService.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/period/PeriodService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/PeriodService.java 2013-10-01 08:54:05 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/PeriodService.java 2014-01-07 19:41:39 +0000
@@ -153,8 +153,8 @@
/**
* Returns all Intersecting Periods between the startDate and endDate based on PeriodType
- * For example if the startDate is 2007-05-01 and endDate is 2007-08-01 and periodType is Quartely
- * then it retuns the periods for Q2,Q3
+ * For example if the startDate is 2007-05-01 and endDate is 2007-08-01 and periodType is Quarterly
+ * then it returns the periods for Q2,Q3
*
* @param periodType is the ultimate period type
* @param startDate is intercepting startDate
@@ -213,13 +213,13 @@
Collection<Period> getPeriodsByPeriodType( PeriodType periodType );
/**
- * Returns all intersecting Periods for the given Period which have assosiated DataValues for
+ * Returns all intersecting Periods for the given Period which have associated DataValues for
* the given collection of DataElements and Sources.
*
* @param period the Period.
* @param dataElements the collection of DataElements.
* @param sources the collection of Sources.
- * @return all intersecting Periods for the given Period which have assosiated DataValues for
+ * @return all intersecting Periods for the given Period which have associated DataValues for
* the given collection of DataElements and Sources.
*/
Collection<Period> getPeriods( Period period, Collection<DataElement> dataElements, Collection<OrganisationUnit> sources );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/PeriodStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/PeriodStore.java 2013-08-23 15:56:19 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/PeriodStore.java 2014-01-07 19:41:39 +0000
@@ -108,8 +108,8 @@
/**
* Returns all intersecting Periods between the startDate and endDate based on PeriodType
- * For example if the startDate is 2007-05-01 and endDate is 2007-08-01 and periodType is Quartely
- * then it retuns the periods for Q2,Q3
+ * For example if the startDate is 2007-05-01 and endDate is 2007-08-01 and periodType is Quarterly
+ * then it returns the periods for Q2,Q3
*
* @param periodType is the ultimate period type
* @param startDate is intercepting startDate
@@ -137,13 +137,13 @@
Collection<Period> getPeriodsByPeriodType( PeriodType periodType );
/**
- * Returns all intersecting Periods for the given Period which have assosiated DataValues for
+ * Returns all intersecting Periods for the given Period which have associated DataValues for
* the given collection of DataElements and Sources.
*
* @param period the Period.
* @param dataElements the collection of DataElements.
* @param sources the collection of Sources.
- * @return all intersecting Periods for the given Period which have assosiated DataValues for
+ * @return all intersecting Periods for the given Period which have associated DataValues for
* the given collection of DataElements and Sources.
*/
Collection<Period> getPeriods( Period period, Collection<DataElement> dataElements, Collection<OrganisationUnit> sources );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramExpressionService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramExpressionService.java 2013-11-04 03:13:27 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramExpressionService.java 2014-01-07 19:41:39 +0000
@@ -95,7 +95,7 @@
Collection<ProgramExpression> getAllProgramExpressions();
/**
- * Get value of program expession
+ * Get value of program expression
*
* @param programExpression {@link ProgramExpression}
* @param programStageInstance The {@link ProgramStageInstance} associate
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramIndicatorService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramIndicatorService.java 2013-11-04 03:13:27 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramIndicatorService.java 2014-01-07 19:41:39 +0000
@@ -112,7 +112,7 @@
Collection<ProgramIndicator> getProgramIndicators( Program program );
/**
- * Calculate an prorgam indicator value based on program instance and an
+ * Calculate an program indicator value based on program instance and an
* indicator defined for a patient
*
* @param programInstance ProgramInstance
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStage.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStage.java 2014-01-02 13:13:21 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStage.java 2014-01-07 19:41:39 +0000
@@ -99,7 +99,7 @@
/**
* Enabled this property to show a pop-up for confirming Complete a program
- * after to complete a progam-stage
+ * after to complete a program-stage
*/
private Boolean remindCompleted = false;
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageInstanceStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageInstanceStore.java 2013-11-28 07:29:37 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageInstanceStore.java 2014-01-07 19:41:39 +0000
@@ -249,7 +249,7 @@
/**
* Search {@link ProgramStageInstance} by criteria with result limited
*
- * @param programStage {@link ProgramStage} needs for seaching events
+ * @param programStage {@link ProgramStage} needs for searching events
* @param orgUnits List of {@link OrganisationUnit} ids
* @param columns The criteria for searching
* @param startDate Report date the instance should be on or after.
@@ -269,7 +269,7 @@
/**
* Search {@link ProgramStageInstance} by criteria
*
- * @param programStage {@link ProgramStage} needs for seaching events
+ * @param programStage {@link ProgramStage} needs for searching events
* @param orgUnits List of {@link OrganisationUnit} ids
* @param columns The criteria for searching
* @param startDate Report date the instance should be on or after.
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTableService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTableService.java 2013-08-23 15:56:19 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTableService.java 2014-01-07 19:41:39 +0000
@@ -102,7 +102,7 @@
/**
* Retrieves ReportTables with the given identifiers.
*
- * @param reportTables the identfiers of the ReportTables to retrieve.
+ * @param reportTables the identifiers of the ReportTables to retrieve.
* @return a Collection of ReportTables.
*/
Collection<ReportTable> getReportTables( Collection<Integer> reportTables );
