=== renamed file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/tallysheet/action/TallySheetGenerateAction.java' => 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/tallysheet/action/GenerateTallySheetAction.java'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/tallysheet/action/TallySheetGenerateAction.java	2009-08-21 16:44:05 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/tallysheet/action/GenerateTallySheetAction.java	2009-08-22 20:07:24 +0000
@@ -45,7 +45,7 @@
  * @author Haavard Tegelsrud, Oddmund Stroemme, Joergen Froeysadal, Ruben Wangberg
  * @version $Id$
  */
-public class TallySheetGenerateAction
+public class GenerateTallySheetAction
     implements Action
 {
     // -------------------------------------------------------------------------

=== renamed file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/tallysheet/action/TallySheetSelectAction.java' => 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/tallysheet/action/SelectTallySheetAction.java'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/tallysheet/action/TallySheetSelectAction.java	2009-08-21 16:44:05 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/tallysheet/action/SelectTallySheetAction.java	2009-08-22 20:07:24 +0000
@@ -42,7 +42,7 @@
  * @author Haavard Tegelsrud, Oddmund Stroemme, Joergen Froeysadal, Ruben Wangberg
  * @version $Id$
  */
-public class TallySheetSelectAction
+public class SelectTallySheetAction
     implements Action
 {
     // -------------------------------------------------------------------------

=== renamed file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/tallysheet/action/TallySheetEditAction.java' => 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/tallysheet/action/ViewTallySheetAction.java'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/tallysheet/action/TallySheetEditAction.java	2009-08-21 16:44:05 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/tallysheet/action/ViewTallySheetAction.java	2009-08-22 20:07:24 +0000
@@ -48,7 +48,7 @@
  * @author Haavard Tegelsrud, Oddmund Stroemme, Joergen Froeysadal, Ruben Wangberg
  * @version $Id$
  */
-public class TallySheetEditAction
+public class ViewTallySheetAction
     implements Action
 {
     // -------------------------------------------------------------------------

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/resources/META-INF/dhis/beans.xml	2009-08-21 16:44:05 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/resources/META-INF/dhis/beans.xml	2009-08-22 20:07:24 +0000
@@ -614,15 +614,15 @@
   
   <!-- Tallysheet -->
   
-  <bean id="org.hisp.dhis.reporting.tallysheet.action.TallySheetSelectAction"
-    class="org.hisp.dhis.reporting.tallysheet.action.TallySheetSelectAction"
+  <bean id="org.hisp.dhis.reporting.tallysheet.action.SelectTallySheetAction"
+    class="org.hisp.dhis.reporting.tallysheet.action.SelectTallySheetAction"
     scope="prototype">
     <property name="dataSetService" 
       ref="org.hisp.dhis.dataset.DataSetService" />
   </bean>
 
-  <bean id="org.hisp.dhis.reporting.tallysheet.action.TallySheetEditAction"
-    class="org.hisp.dhis.reporting.tallysheet.action.TallySheetEditAction"
+  <bean id="org.hisp.dhis.reporting.tallysheet.action.ViewTallySheetAction"
+    class="org.hisp.dhis.reporting.tallysheet.action.ViewTallySheetAction"
     scope="prototype">
     <property name="tallySheetService"
       ref="org.hisp.dhis.tallysheet.TallySheetService"/>
@@ -632,8 +632,8 @@
       ref="org.hisp.dhis.dataset.DataSetService"/>           
   </bean>
    
-  <bean id="org.hisp.dhis.reporting.tallysheet.action.TallySheetGenerateAction"
-    class="org.hisp.dhis.reporting.tallysheet.action.TallySheetGenerateAction"
+  <bean id="org.hisp.dhis.reporting.tallysheet.action.GenerateTallySheetAction"
+    class="org.hisp.dhis.reporting.tallysheet.action.GenerateTallySheetAction"
     scope="prototype">
     <property name="tallySheetPdfService"
       ref="org.hisp.dhis.tallysheet.TallySheetPdfService"/>

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.xml	2009-08-21 16:44:05 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.xml	2009-08-22 20:07:24 +0000
@@ -436,25 +436,25 @@
     
     <!-- Tally Sheet Forms Generator -->
 
-    <action name="tallySheetGenerator" class="org.hisp.dhis.reporting.tallysheet.action.TallySheetSelectAction">
-      <result name="success" type="velocity">/main.vm</result>
-      <param name="menuTreeHeight">420</param>
-      <param name="page">/dhis-web-reporting/tallySheetSelectForm.vm</param>
-      <param name="menu">/dhis-web-reporting/menu.vm</param>
-      <param name="javascripts">../dhis-web-commons/oust/oust.js,javascript/tallySheet.js</param>
-      <interceptor-ref name="organisationUnitTreeStack" />
-    </action>
-        
-    <action name="configureTallySheetGenerator" class="org.hisp.dhis.reporting.tallysheet.action.TallySheetEditAction">
-      <result name="success" type="velocity">/main.vm</result>
-      <param name="menuTreeHeight">420</param>
-      <param name="page">/dhis-web-reporting/tallySheetEditForm.vm</param>
-      <param name="menu">/dhis-web-reporting/menu.vm</param>
-      <param name="javascripts">../dhis-web-commons/oust/oust.js,javascript/tallySheet.js</param>
-      <interceptor-ref name="organisationUnitTreeStack" />
-    </action>
-        
-    <action name="generateTallySheetPDF" class="org.hisp.dhis.reporting.tallysheet.action.TallySheetGenerateAction">
+    <action name="tallySheetGenerator" class="org.hisp.dhis.reporting.tallysheet.action.SelectTallySheetAction">
+      <result name="success" type="velocity">/main.vm</result>
+      <param name="menuTreeHeight">420</param>
+      <param name="page">/dhis-web-reporting/selectTallySheetForm.vm</param>
+      <param name="menu">/dhis-web-reporting/menu.vm</param>
+      <param name="javascripts">../dhis-web-commons/oust/oust.js,javascript/tallySheet.js</param>
+      <interceptor-ref name="organisationUnitTreeStack" />
+    </action>
+        
+    <action name="configureTallySheetGenerator" class="org.hisp.dhis.reporting.tallysheet.action.ViewTallySheetAction">
+      <result name="success" type="velocity">/main.vm</result>
+      <param name="menuTreeHeight">420</param>
+      <param name="page">/dhis-web-reporting/viewTallySheetForm.vm</param>
+      <param name="menu">/dhis-web-reporting/menu.vm</param>
+      <param name="javascripts">../dhis-web-commons/oust/oust.js,javascript/tallySheet.js</param>
+      <interceptor-ref name="organisationUnitTreeStack" />
+    </action>
+        
+    <action name="generateTallySheetPDF" class="org.hisp.dhis.reporting.tallysheet.action.GenerateTallySheetAction">
       <result name="success" type="stream">
       <param name="contentType">application/pdf</param>
       <param name="inputName">inputStream</param>

=== renamed file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/tallySheetSelectForm.vm' => 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/selectTallySheetForm.vm'
=== renamed file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/tallySheetEditForm.vm' => 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewTallySheetForm.vm'
