r194 - in trunk/src/main/java/org/nuiton/scmwebeditor: . actions - Scmwebeditor-commits

29 Jul 2011

Author: kcardineaud
Date: 2011-07-29 11:55:01 +0200 (Fri, 29 Jul 2011)
New Revision: 194

Url: http://nuiton.org/repositories/revision/scmwebeditor/194

Log:
Remove useless informations stock in session

Modified:
   trunk/src/main/java/org/nuiton/scmwebeditor/SvnSession.java
   trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java
   trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java

Modified: trunk/src/main/java/org/nuiton/scmwebeditor/SvnSession.java
===================================================================

--- trunk/src/main/java/org/nuiton/scmwebeditor/SvnSession.java	2011-07-29 09:16:22 UTC (rev 193)
+++ trunk/src/main/java/org/nuiton/scmwebeditor/SvnSession.java	2011-07-29 09:55:01 UTC (rev 194)
@@ -24,7 +24,6 @@
  */
 package org.nuiton.scmwebeditor;
 
-import org.apache.commons.io.FileUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.nuiton.util.FileUtil;
@@ -48,14 +47,6 @@
      */
     protected StringBuffer scmEditorUrl;
     /**
-     * Id du user for temp_dir name
-     */
-    protected String id;
-    /**
-     * file format
-     */
-    protected String format;
-    /**
      * svn path without fileName
      */
     protected String svnPath;
@@ -96,23 +87,16 @@
      */
     protected SVNClientManager manager;
 
-    //TODO-TC avoid constructor with so much parameter
-    //TODO-TC avoid constructor with exception throwing...
 
     public SvnSession(
             String svnPath,
             String fileName,
             String projectUrl,
-            String id,
-            String format,
             StringBuffer scmEditorUrl) {
         this.scmEditorUrl = scmEditorUrl;
-        this.id = id;
-        this.format = format;
         this.svnPath = svnPath;
         this.fileName = fileName;
         this.projectUrl = projectUrl;
-        log.info(login+" "+password);
         try {
             this.remoteUrl = SVNURL.parseURIEncoded(svnPath);
         } catch (SVNException e) {
@@ -215,22 +199,6 @@
         this.svnPath = svnPath;
     }
 
-    public String getFormat() {
-        return format;
-    }
-
-    public void setFormat(String format) {
-        this.format = format;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
     public StringBuffer getScmEditorUrl() {
         return scmEditorUrl;
     }

Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java
===================================================================
--- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java	2011-07-29 09:16:22 UTC (rev 193)
+++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java	2011-07-29 09:55:01 UTC (rev 194)
@@ -187,7 +187,7 @@
         
         try {
             String originalText = FileUtils.readFileToString(checkOutFile);
-            request.setAttribute(PARAMETER_FORMAT, svnSess.getFormat());
+            
             request.setAttribute("lastText", lastText);
             request.setAttribute(ATTRIBUTE_ORIG_TEXT, StringEscapeUtils.escapeHtml(originalText));
             request.setAttribute(ATTRIBUTE_INVALIDATE_MAX_TIME, (httpSession.getMaxInactiveInterval() / 60));
@@ -252,7 +252,7 @@
             svnSess.setPassword(null);
             // if authentication failed edition page is reload form user's relogin
             request.setAttribute("address", address);
-            request.setAttribute(PARAMETER_FORMAT, svnSess.getFormat());
+            
             request.setAttribute(ATTRIBUTE_ORIG_TEXT, StringEscapeUtils.escapeHtml(newText));
             request.setAttribute(ATTRIBUTE_INVALIDATE_MAX_TIME, (httpSession.getMaxInactiveInterval() / 60));
             request.setAttribute(ATTRIBUTE_LOGIN, (svnSess.getLogin() != null && !svnSess.getLogin().equalsIgnoreCase("") ? svnSess.getLogin() : null));

Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java
===================================================================
--- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java	2011-07-29 09:16:22 UTC (rev 193)
+++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java	2011-07-29 09:55:01 UTC (rev 194)
@@ -146,8 +146,6 @@
                     relativePath,
                     scmFileName,
                     projectUrl,
-                    httpSession.getId(),
-                    format,
                     request.getRequestURL());
         
              
@@ -314,7 +312,7 @@
         
       
             
-        request.setAttribute(PARAMETER_FORMAT, svnSess.getFormat());
+        request.setAttribute(PARAMETER_FORMAT, format);
         request.setAttribute(ATTRIBUTE_ORIG_TEXT, StringEscapeUtils.escapeHtml(originalText));
         request.setAttribute(ATTRIBUTE_INVALIDATE_MAX_TIME, (httpSession.getMaxInactiveInterval() / 60));
         request.setAttribute(ATTRIBUTE_LOGIN, (svnSess.getLogin() != null && !svnSess.getLogin().equalsIgnoreCase("") ? svnSess.getLogin() : null));

    

r194 - in trunk/src/main/java/org/nuiton/scmwebeditor: . actions

kcardineaud＠users.nuiton.org

tags

participants (1)