[Contineo-devel] contineo/contineo/WEB-INF/src/org/contineo/actions/documan/document ChangeDocAction.java,1.4,1.5 DocInfoAction.java,1.5,1.6 EditDocAction.java,1.5,1.6

[Sebastian S. <ste...@us...>]

Update of /cvsroot/contineo/contineo/contineo/WEB-INF/src/org/contineo/actions/documan/document
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30237/actions/documan/document

Modified Files:
	ChangeDocAction.java DocInfoAction.java EditDocAction.java 
Log Message:
- added class core.LocaleBean to store localisation information
- all dates are now shown in a localised way; also the user has now to enter
  the date in the localised format and not the German format


Index: DocInfoAction.java
===================================================================
RCS file: /cvsroot/contineo/contineo/contineo/WEB-INF/src/org/contineo/actions/documan/document/DocInfoAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DocInfoAction.java	25 Nov 2005 14:54:09 -0000	1.5
--- DocInfoAction.java	30 Nov 2005 16:38:56 -0000	1.6
***************
*** 64,71 ****
                      String date = "";
                      String sourcedate = "";
                      if (dte != null && !dte.equals(""))
!                         date = db.toLocaleString(dte);
                      if (sourceDate != null && !sourceDate.equals(""))
!                         sourcedate = db.toLocaleString(sourceDate);
                      boolean right = mdao.isWriteEnable(menu.getMenuParent(), username);
                      int iright = 0;
--- 64,80 ----
                      String date = "";
                      String sourcedate = "";
+                     
+                     // get current language
+                     String sessLanguage = (String) session.getAttribute("language");
+                     if (sessLanguage == null || sessLanguage.equalsIgnoreCase(""))
+                     {
+                     	sessLanguage = request.getParameter("language");
+                     	if (sessLanguage == null || sessLanguage.equalsIgnoreCase(""))
+                     		sessLanguage = "en";
+                     }                          
                      if (dte != null && !dte.equals(""))
!                         date = db.toLocaleString(dte, sessLanguage);
                      if (sourceDate != null && !sourceDate.equals(""))
!                         sourcedate = db.toLocaleString(sourceDate, sessLanguage);
                      boolean right = mdao.isWriteEnable(menu.getMenuParent(), username);
                      int iright = 0;

Index: EditDocAction.java
===================================================================
RCS file: /cvsroot/contineo/contineo/contineo/WEB-INF/src/org/contineo/actions/documan/document/EditDocAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** EditDocAction.java	25 Nov 2005 14:54:09 -0000	1.5
--- EditDocAction.java	30 Nov 2005 16:38:56 -0000	1.6
***************
*** 55,73 ****
              DateBean db = new DateBean();
              try {
!                 if (mdao.isReadEnable(Integer.parseInt(menuid), username)) {
                      Document doc = ddao.findByMenuId(Integer.parseInt(menuid));
                      String dte = doc.getDocDate();
                      String sourceDate = doc.getSourceDate();
                      String date = "";
!                     String sourcedate = "";
!                     String language = doc.getLanguage();             
                      if (dte != null && !dte.equals(""))
!                         date = db.toLocaleString(dte);
                      if (sourceDate != null && !sourceDate.equals(""))
!                         sourcedate = db.toLocaleString(sourceDate);
                      Menu menu = mdao.findByPrimaryKey(doc.getMenuId());                    
                      request.setAttribute("document", doc);
                      request.setAttribute("date", date);
!                     request.setAttribute("sourceDate", sourcedate);
                      request.setAttribute("menu", menu);
                      actionForward = mapping.findForward("editdoc");
--- 55,82 ----
              DateBean db = new DateBean();
              try {
!                 if (mdao.isWriteEnable(Integer.parseInt(menuid), username)) {
                      Document doc = ddao.findByMenuId(Integer.parseInt(menuid));
                      String dte = doc.getDocDate();
                      String sourceDate = doc.getSourceDate();
                      String date = "";
!                     String srcDate = "";
!                     
!                     // get current session language
!                     String language = (String) session.getAttribute("language");
!                     if (language == null || language.equalsIgnoreCase(""))
!                     {
!                     	language = request.getParameter("language");
!                     	if (language == null || language.equalsIgnoreCase(""))
!                     		language = "en";
!                     }             
                      if (dte != null && !dte.equals(""))
!                         date = db.toLocaleString(dte, language);
                      if (sourceDate != null && !sourceDate.equals(""))
!                         srcDate = db.toLocaleString(sourceDate, language);
! 
                      Menu menu = mdao.findByPrimaryKey(doc.getMenuId());                    
                      request.setAttribute("document", doc);
                      request.setAttribute("date", date);
!                     request.setAttribute("sourceDate", srcDate);
                      request.setAttribute("menu", menu);
                      actionForward = mapping.findForward("editdoc");

Index: ChangeDocAction.java
===================================================================
RCS file: /cvsroot/contineo/contineo/contineo/WEB-INF/src/org/contineo/actions/documan/document/ChangeDocAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ChangeDocAction.java	24 Sep 2005 10:06:07 -0000	1.4
--- ChangeDocAction.java	30 Nov 2005 16:38:56 -0000	1.5
***************
*** 75,79 ****
                  doc.setSourceAuthor(dform.getSourceAuthor());
                  String date = dform.getSourceDate();
!                 doc.setSourceDate(db.toCompactString(date));
                  doc.setSourceType(dform.getSourceType());
                  doc.setCoverage(dform.getCoverage());
--- 75,89 ----
                  doc.setSourceAuthor(dform.getSourceAuthor());
                  String date = dform.getSourceDate();
!                 
!                 // get current language
!                 String language = (String) session.getAttribute("language");
!                 if (language == null || language.equalsIgnoreCase(""))
!                 {
!                 	language = request.getParameter("language");
!                 	if (language == null || language.equalsIgnoreCase(""))
!                 		language = "en";
!                 }               
!                 doc.setSourceDate(db.toCompactString(date, language));
!               
                  doc.setSourceType(dform.getSourceType());
                  doc.setCoverage(dform.getCoverage());
***************
*** 83,92 ****
                  doc.setKeywords(keywords);
                  boolean stored = ddao.store(doc);
                  /* create history entry */
                  String username = (String)session.getAttribute("authuser");
-                 DateBean datebean = new DateBean();
                  History history = new History();
                  history.setDocId(doc.getDocId());
!                 history.setDate(datebean.toCompactString());
                  history.setUsername(username);
                  history.setEvent(History.CHANGED);
--- 93,102 ----
                  doc.setKeywords(keywords);
                  boolean stored = ddao.store(doc);
+                 
                  /* create history entry */
                  String username = (String)session.getAttribute("authuser");
                  History history = new History();
                  history.setDocId(doc.getDocId());
!                 history.setDate(db.toCompactString());
                  history.setUsername(username);
                  history.setEvent(History.CHANGED);