continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r365355 - in /maven/continuum/trunk/continuum-webapp/src/main: java/org/apache/maven/continuum/web/action/WorkingCopyAction.java webapp/workingCopy.jsp
Date Mon, 02 Jan 2006 15:07:50 GMT
Author: evenisse
Date: Mon Jan  2 07:07:46 2006
New Revision: 365355

URL: http://svn.apache.org/viewcvs?rev=365355&view=rev
Log:
Add missing file content

Modified:
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java
    maven/continuum/trunk/continuum-webapp/src/main/webapp/workingCopy.jsp

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java?rev=365355&r1=365354&r2=365355&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java
Mon Jan  2 07:07:46 2006
@@ -44,6 +44,8 @@
 
     private String userDirectory;
 
+    private String currentFile;
+
     private List files;
 
     private String output;
@@ -63,6 +65,15 @@
             String baseUrl = UrlHelper.buildUrl( "/workingCopy.action", ServletActionContext.getRequest(),
ServletActionContext.getResponse(), params );
 
             output = generator.generate( files, baseUrl, continuum.getWorkingDirectory( projectId
) );
+
+            if ( currentFile != null && currentFile != "" )
+            {
+                currentFileContent = continuum.getFileContent( projectId, userDirectory,
currentFile );
+            }
+            else
+            {
+                currentFileContent = "";
+            }
         }
         catch ( ContinuumException e )
         {
@@ -105,6 +116,11 @@
         this.userDirectory = userDirectory;
     }
 
+    public void setFile( String currentFile )
+    {
+        this.currentFile = currentFile;
+    }
+
     public List getFiles()
     {
         return files;
@@ -113,5 +129,10 @@
     public String getOutput()
     {
         return output;
+    }
+
+    public String getFileContent()
+    {
+        return currentFileContent;
     }
 }

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/workingCopy.jsp
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/webapp/workingCopy.jsp?rev=365355&r1=365354&r2=365355&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/workingCopy.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/workingCopy.jsp Mon Jan  2 07:07:46
2006
@@ -21,6 +21,19 @@
         </h3>
 
         <ww:property value="output"/>
+
+        <%
+            if ( request.getParameter( "file" ) != null )
+            {
+        %>
+        <br />
+        <form>
+          <textarea rows="50" cols="100"><ww:property value="fileContent"/></textarea>
+        </form>
+        <%
+            }
+        %>
+
       </div>
     </body>
   </ww:i18n>



Mime
View raw message