ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anto...@apache.org
Subject cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce P4Submit.java
Date Thu, 25 Sep 2003 20:47:17 GMT
antoine     2003/09/25 13:47:17

  Modified:    src/main/org/apache/tools/ant/taskdefs/optional/perforce
                        P4Submit.java
  Log:
  PR: 18154
  Make logging from p4 submit be done using the SimpleP4OutputHandler in order
  to make this logging more homogeneous
  
  Revision  Changes    Path
  1.17      +6 -3      ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Submit.java
  
  Index: P4Submit.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Submit.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- P4Submit.java	21 Sep 2003 20:20:03 -0000	1.16
  +++ P4Submit.java	25 Sep 2003 20:47:17 -0000	1.17
  @@ -98,7 +98,7 @@
        */
       public void execute() throws BuildException {
           if (change != null) {
  -            execP4Command("submit -c " + change, (P4HandlerAdapter) new P4SubmitAdapter());
  +            execP4Command("submit -c " + change, (P4HandlerAdapter) new P4SubmitAdapter(this));
           } else {
               //here we'd parse the output from change -o into submit -i
               //in order to support default change.
  @@ -109,13 +109,16 @@
       /**
        * internal class used to process the output of p4 submit
        */
  -    public class P4SubmitAdapter extends P4HandlerAdapter {
  +    public class P4SubmitAdapter extends SimpleP4OutputHandler {
  +        public P4SubmitAdapter(P4Base parent) {
  +            super(parent);
  +        }
           /**
            * process a line of stdout/stderr coming from Perforce
            * @param line line of stdout or stderr coming from Perforce
            */
           public void process(String line) {
  -            log(line, Project.MSG_VERBOSE);
  +            super.process(line);
               getProject().setProperty("p4.needsresolve", "0");
               // this type of output might happen
               // Change 18 renamed change 20 and submitted.
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Mime
View raw message