[Uni-d-cvs] SF.net SVN: uni-d:[3878] trunk/Uni-d

[<max...@us...>]

Revision: 3878
          http://uni-d.svn.sourceforge.net/uni-d/?rev=3878&view=rev
Author:   max_brod
Date:     2009-09-26 08:19:14 +0000 (Sat, 26 Sep 2009)

Log Message:
-----------
The progress info pages shows some "initialization" message if it hasn't start yet to receive message from the main working window.

Modified Paths:
--------------
    trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/progressInfo/ProgressInfoPage.java
    trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/pages/progressInfo/ProgressInfoPage.html
    trunk/Uni-d/template/src/main/webapp/translations-common.txt

Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/progressInfo/ProgressInfoPage.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/progressInfo/ProgressInfoPage.java	2009-09-25 15:57:23 UTC (rev 3877)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/progressInfo/ProgressInfoPage.java	2009-09-26 08:19:14 UTC (rev 3878)
@@ -95,7 +95,7 @@
         {
             if ( ( session.getAttribute( actionStatusName ) ).equals( ACTION_STATUS_WORKING ) )
             {
-                setActionInfo( (String) session.getAttribute( actionInfoName ) );                
+                setActionInfo( (String) session.getAttribute( actionInfoName ) );
             }
             else if ( ( session.getAttribute( actionStatusName ) ).equals( ACTION_STATUS_DONE ) )
             {
@@ -104,4 +104,9 @@
 
         }
     }
+
+    public String getActionInfo2()
+    {
+        return ( getActionInfo() != null ) ? getActionInfo() : getMessages().getMessage( "Initialization" );
+    }
 }

Modified: trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/pages/progressInfo/ProgressInfoPage.html
===================================================================
--- trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/pages/progressInfo/ProgressInfoPage.html	2009-09-25 15:57:23 UTC (rev 3877)
+++ trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/pages/progressInfo/ProgressInfoPage.html	2009-09-26 08:19:14 UTC (rev 3878)
@@ -61,7 +61,7 @@
     <form jwcid="@Form" delegate="bean:validationDelegate" enctype="multipart/form-data">
         <span jwcid="ACTION_ID@TextField" value="prop:actionId" style="display:none"/>
         <span jwcid="ACTION_FINISHED@Checkbox" value="prop:actionFinished" style="display:none"/>
-        <span jwcid="@Insert" value="prop:actionInfo" raw="true"/>
+        <span jwcid="@Insert" value="prop:actionInfo2" raw="true"/>
         <span jwcid="BUTTON_SUBMIT@Submit" style="display:none" action="listener:restart"/>
     </form>
 </center>

Modified: trunk/Uni-d/template/src/main/webapp/translations-common.txt
===================================================================
--- trunk/Uni-d/template/src/main/webapp/translations-common.txt	2009-09-25 15:57:23 UTC (rev 3877)
+++ trunk/Uni-d/template/src/main/webapp/translations-common.txt	2009-09-26 08:19:14 UTC (rev 3878)
@@ -1099,5 +1099,10 @@
 .label.nl Scannen
 .label.ro Scaneaza
 .label.fr Scannez
+.key Initialization/ProgressInfoPage
+.label.en Initialization...
+.label.nl Initialisering...
+.label.ro Initializare...
+.label.fr initialisation...
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.