← Back to team overview

dhis2-devs team mailing list archive

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

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 18319: Fixed typos in package names and classes

  Thread Previous • Date Previous • • Thread Next 
------------------------------------------------------------
revno: 18319
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2015-02-18 14:48:37 +0100
message:
  Fixed typos in package names and classes
renamed:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programtindicator/ => dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programindicator/
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programtindicator/GetProgramIndicatorDescripttionAction.java => dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programindicator/GetProgramIndicatorDescriptionAction.java
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programindicator/AddProgramIndicatorAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programindicator/GetProgramIndicatorAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programindicator/GetProgramIndicatorListAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programindicator/RemoveProgramIndicatorAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programindicator/UpdateProgramIndicatorAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programindicator/ValidateProgramIndicatorAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/META-INF/dhis/beans.xml
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/struts.xml
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/programIndicator.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programindicator/GetProgramIndicatorDescriptionAction.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

=== renamed directory 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programtindicator' => 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programindicator'
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programindicator/AddProgramIndicatorAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programtindicator/AddProgramIndicatorAction.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programindicator/AddProgramIndicatorAction.java	2015-02-18 13:48:37 +0000
@@ -1,4 +1,4 @@
-package org.hisp.dhis.trackedentity.action.programtindicator;
+package org.hisp.dhis.trackedentity.action.programindicator;
 
 /*
  * Copyright (c) 2004-2015, University of Oslo

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programindicator/GetProgramIndicatorAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programtindicator/GetProgramIndicatorAction.java	2015-02-16 11:46:32 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programindicator/GetProgramIndicatorAction.java	2015-02-18 13:48:37 +0000
@@ -1,4 +1,4 @@
-package org.hisp.dhis.trackedentity.action.programtindicator;
+package org.hisp.dhis.trackedentity.action.programindicator;
 
 /*
  * Copyright (c) 2004-2015, University of Oslo

=== renamed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programtindicator/GetProgramIndicatorDescripttionAction.java' => 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programindicator/GetProgramIndicatorDescriptionAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programtindicator/GetProgramIndicatorDescripttionAction.java	2015-02-18 13:41:55 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programindicator/GetProgramIndicatorDescriptionAction.java	2015-02-18 13:48:37 +0000
@@ -1,4 +1,4 @@
-package org.hisp.dhis.trackedentity.action.programtindicator;
+package org.hisp.dhis.trackedentity.action.programindicator;
 
 /*
  * Copyright (c) 2004-2015, University of Oslo
@@ -39,7 +39,7 @@
  * @version $ GetProgramIndicatorDescripttionAction.java May 30, 2013 11:09:04
  *          AM $
  */
-public class GetProgramIndicatorDescripttionAction
+public class GetProgramIndicatorDescriptionAction
     implements Action
 {
     // -------------------------------------------------------------------------

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programindicator/GetProgramIndicatorListAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programtindicator/GetProgramIndicatorListAction.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programindicator/GetProgramIndicatorListAction.java	2015-02-18 13:48:37 +0000
@@ -1,4 +1,4 @@
-package org.hisp.dhis.trackedentity.action.programtindicator;
+package org.hisp.dhis.trackedentity.action.programindicator;
 
 /*
  * Copyright (c) 2004-2015, University of Oslo

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programindicator/RemoveProgramIndicatorAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programtindicator/RemoveProgramIndicatorAction.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programindicator/RemoveProgramIndicatorAction.java	2015-02-18 13:48:37 +0000
@@ -1,4 +1,4 @@
-package org.hisp.dhis.trackedentity.action.programtindicator;
+package org.hisp.dhis.trackedentity.action.programindicator;
 
 /*
  * Copyright (c) 2004-2015, University of Oslo

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programindicator/UpdateProgramIndicatorAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programtindicator/UpdateProgramIndicatorAction.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programindicator/UpdateProgramIndicatorAction.java	2015-02-18 13:48:37 +0000
@@ -1,4 +1,4 @@
-package org.hisp.dhis.trackedentity.action.programtindicator;
+package org.hisp.dhis.trackedentity.action.programindicator;
 
 /*
  * Copyright (c) 2004-2015, University of Oslo

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programindicator/ValidateProgramIndicatorAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programtindicator/ValidateProgramIndicatorAction.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programindicator/ValidateProgramIndicatorAction.java	2015-02-18 13:48:37 +0000
@@ -1,4 +1,4 @@
-package org.hisp.dhis.trackedentity.action.programtindicator;
+package org.hisp.dhis.trackedentity.action.programindicator;
 
 /*
  * Copyright (c) 2004-2015, University of Oslo

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/META-INF/dhis/beans.xml	2014-12-23 18:03:44 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/META-INF/dhis/beans.xml	2015-02-18 13:48:37 +0000
@@ -985,62 +985,62 @@
 	<!-- Program Indicator -->
 
 	<bean
-		id="org.hisp.dhis.trackedentity.action.programtindicator.AddProgramIndicatorAction"
-		class="org.hisp.dhis.trackedentity.action.programtindicator.AddProgramIndicatorAction"
-		scope="prototype">
-		<property name="programService" ref="org.hisp.dhis.program.ProgramService" />
-		<property name="programIndicatorService">
-			<ref bean="org.hisp.dhis.program.ProgramIndicatorService" />
-		</property>
-	</bean>
-
-	<bean
-		id="org.hisp.dhis.trackedentity.action.programtindicator.RemoveProgramIndicatorAction"
-		class="org.hisp.dhis.trackedentity.action.programtindicator.RemoveProgramIndicatorAction"
-		scope="prototype">
-		<property name="programIndicatorService">
-			<ref bean="org.hisp.dhis.program.ProgramIndicatorService" />
-		</property>
-	</bean>
-
-	<bean
-		id="org.hisp.dhis.trackedentity.action.programtindicator.GetProgramIndicatorAction"
-		class="org.hisp.dhis.trackedentity.action.programtindicator.GetProgramIndicatorAction"
-		scope="prototype">
-		<property name="programIndicatorService"
-			ref="org.hisp.dhis.program.ProgramIndicatorService" />
-	</bean>
-
-	<bean
-		id="org.hisp.dhis.trackedentity.action.programtindicator.GetProgramIndicatorListAction"
-		class="org.hisp.dhis.trackedentity.action.programtindicator.GetProgramIndicatorListAction"
-		scope="prototype">
-		<property name="programIndicatorService"
-			ref="org.hisp.dhis.program.ProgramIndicatorService" />
-		<property name="programService" ref="org.hisp.dhis.program.ProgramService" />
-	</bean>
-
-	<bean
-		id="org.hisp.dhis.trackedentity.action.programtindicator.UpdateProgramIndicatorAction"
-		class="org.hisp.dhis.trackedentity.action.programtindicator.UpdateProgramIndicatorAction"
-		scope="prototype">
-		<property name="programIndicatorService">
-			<ref bean="org.hisp.dhis.program.ProgramIndicatorService" />
-		</property>
-	</bean>
-
-	<bean
-		id="org.hisp.dhis.trackedentity.action.programtindicator.ValidateProgramIndicatorAction"
-		class="org.hisp.dhis.trackedentity.action.programtindicator.ValidateProgramIndicatorAction"
-		scope="prototype">
-		<property name="programIndicatorService">
-			<ref bean="org.hisp.dhis.program.ProgramIndicatorService" />
-		</property>
-	</bean>
-
-	<bean
-		id="org.hisp.dhis.trackedentity.action.programtindicator.GetProgramIndicatorDescripttionAction"
-		class="org.hisp.dhis.trackedentity.action.programtindicator.GetProgramIndicatorDescripttionAction"
+		id="org.hisp.dhis.trackedentity.action.programindicator.AddProgramIndicatorAction"
+		class="org.hisp.dhis.trackedentity.action.programindicator.AddProgramIndicatorAction"
+		scope="prototype">
+		<property name="programService" ref="org.hisp.dhis.program.ProgramService" />
+		<property name="programIndicatorService">
+			<ref bean="org.hisp.dhis.program.ProgramIndicatorService" />
+		</property>
+	</bean>
+
+	<bean
+		id="org.hisp.dhis.trackedentity.action.programindicator.RemoveProgramIndicatorAction"
+		class="org.hisp.dhis.trackedentity.action.programindicator.RemoveProgramIndicatorAction"
+		scope="prototype">
+		<property name="programIndicatorService">
+			<ref bean="org.hisp.dhis.program.ProgramIndicatorService" />
+		</property>
+	</bean>
+
+	<bean
+		id="org.hisp.dhis.trackedentity.action.programindicator.GetProgramIndicatorAction"
+		class="org.hisp.dhis.trackedentity.action.programindicator.GetProgramIndicatorAction"
+		scope="prototype">
+		<property name="programIndicatorService"
+			ref="org.hisp.dhis.program.ProgramIndicatorService" />
+	</bean>
+
+	<bean
+		id="org.hisp.dhis.trackedentity.action.programindicator.GetProgramIndicatorListAction"
+		class="org.hisp.dhis.trackedentity.action.programindicator.GetProgramIndicatorListAction"
+		scope="prototype">
+		<property name="programIndicatorService"
+			ref="org.hisp.dhis.program.ProgramIndicatorService" />
+		<property name="programService" ref="org.hisp.dhis.program.ProgramService" />
+	</bean>
+
+	<bean
+		id="org.hisp.dhis.trackedentity.action.programindicator.UpdateProgramIndicatorAction"
+		class="org.hisp.dhis.trackedentity.action.programindicator.UpdateProgramIndicatorAction"
+		scope="prototype">
+		<property name="programIndicatorService">
+			<ref bean="org.hisp.dhis.program.ProgramIndicatorService" />
+		</property>
+	</bean>
+
+	<bean
+		id="org.hisp.dhis.trackedentity.action.programindicator.ValidateProgramIndicatorAction"
+		class="org.hisp.dhis.trackedentity.action.programindicator.ValidateProgramIndicatorAction"
+		scope="prototype">
+		<property name="programIndicatorService">
+			<ref bean="org.hisp.dhis.program.ProgramIndicatorService" />
+		</property>
+	</bean>
+
+	<bean
+		id="org.hisp.dhis.trackedentity.action.programindicator.GetProgramIndicatorDescriptionAction"
+		class="org.hisp.dhis.trackedentity.action.programindicator.GetProgramIndicatorDescriptionAction"
 		scope="prototype">
 		<property name="programIndicatorService">
 			<ref bean="org.hisp.dhis.program.ProgramIndicatorService" />

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/struts.xml	2015-02-16 11:46:32 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/struts.xml	2015-02-18 13:48:37 +0000
@@ -1006,7 +1006,7 @@
     <!-- Program Indicator -->
 
     <action name="programIndicator"
-      class="org.hisp.dhis.trackedentity.action.programtindicator.GetProgramIndicatorListAction">
+      class="org.hisp.dhis.trackedentity.action.programindicator.GetProgramIndicatorListAction">
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-maintenance-program/programIndicator.vm</param>
       <param name="menu">/dhis-web-maintenance-program/menu.vm</param>
@@ -1015,7 +1015,7 @@
     </action>
 
     <action name="getProgramIndicator"
-      class="org.hisp.dhis.trackedentity.action.programtindicator.GetProgramIndicatorAction">
+      class="org.hisp.dhis.trackedentity.action.programindicator.GetProgramIndicatorAction">
       <result name="success" type="velocity-json">
         /dhis-web-commons/ajax/jsonProgramIndicator.vm
       </result>
@@ -1031,14 +1031,14 @@
     </action>
 
     <action name="addProgramIndicator"
-      class="org.hisp.dhis.trackedentity.action.programtindicator.AddProgramIndicatorAction">
+      class="org.hisp.dhis.trackedentity.action.programindicator.AddProgramIndicatorAction">
       <result name="success" type="redirect">programIndicator.action?programId=${programId}
       </result>
       <param name="requiredAuthorities">F_ADD_PROGRAM_INDICATOR</param>
     </action>
 
     <action name="showUpdateProgramIndicator"
-      class="org.hisp.dhis.trackedentity.action.programtindicator.GetProgramIndicatorAction">
+      class="org.hisp.dhis.trackedentity.action.programindicator.GetProgramIndicatorAction">
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-maintenance-program/updateProgramIndicator.vm</param>
       <param name="javascripts">javascript/commons.js,javascript/programIndicator.js</param>
@@ -1046,14 +1046,14 @@
     </action>
 
     <action name="updateProgramIndicator"
-      class="org.hisp.dhis.trackedentity.action.programtindicator.UpdateProgramIndicatorAction">
+      class="org.hisp.dhis.trackedentity.action.programindicator.UpdateProgramIndicatorAction">
       <result name="success" type="redirect">programIndicator.action?programId=${programId}
       </result>
       <param name="requiredAuthorities">F_ADD_PROGRAM_INDICATOR</param>
     </action>
 
     <action name="removeProgramIndicator"
-      class="org.hisp.dhis.trackedentity.action.programtindicator.RemoveProgramIndicatorAction">
+      class="org.hisp.dhis.trackedentity.action.programindicator.RemoveProgramIndicatorAction">
       <result name="success" type="velocity-json">
         /dhis-web-commons/ajax/jsonResponseSuccess.vm
       </result>
@@ -1061,7 +1061,7 @@
     </action>
 
     <action name="validateProgramIndicator"
-      class="org.hisp.dhis.trackedentity.action.programtindicator.ValidateProgramIndicatorAction">
+      class="org.hisp.dhis.trackedentity.action.programindicator.ValidateProgramIndicatorAction">
       <result name="success" type="velocity-json">
         /dhis-web-commons/ajax/jsonResponseSuccess.vm
       </result>
@@ -1072,7 +1072,7 @@
     </action>
 
     <action name="getProgramIndicatorDescripttion"
-      class="org.hisp.dhis.trackedentity.action.programtindicator.GetProgramIndicatorDescripttionAction">
+      class="org.hisp.dhis.trackedentity.action.programindicator.GetProgramIndicatorDescriptionAction">
       <result name="success" type="velocity-json">
         /dhis-web-commons/ajax/jsonResponseSuccess.vm
       </result> <result name="error" type="velocity-json">

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/programIndicator.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/programIndicator.js	2015-02-16 17:57:07 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/programIndicator.js	2015-02-18 13:48:37 +0000
@@ -101,7 +101,7 @@
 	}
 	else
 	{
-	  $.postJSON('getProgramIndicatorDescripttion.action',
+	  $.postJSON('getProgramIndicatorDescription.action',
 		{
 		  expression: expression
 		}, function( json ) {
  Thread Previous • Date Previous • • Thread Next