Browse Source

Experiment with an alternate pattern for writing tasks wrapped around native exes

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271263 13f79535-47bb-0310-9956-ffa450edef68
master
Peter Donald 23 years ago
parent
commit
15098b0f49
1 changed files with 2 additions and 17 deletions
  1. +2
    -17
      proposal/myrmidon/src/java/org/apache/antlib/build/Patch.java

+ 2
- 17
proposal/myrmidon/src/java/org/apache/antlib/build/Patch.java View File

@@ -44,8 +44,6 @@ public class Patch


/** /**
* Ignore whitespace differences. * Ignore whitespace differences.
*
* @param ignore The new Ignorewhitespace value
*/ */
public void setIgnorewhitespace( final boolean ignorewhitespace ) public void setIgnorewhitespace( final boolean ignorewhitespace )
{ {
@@ -54,8 +52,6 @@ public class Patch


/** /**
* The file to patch. * The file to patch.
*
* @param file The new Originalfile value
*/ */
public void setOriginalfile( final File originalFile ) public void setOriginalfile( final File originalFile )
{ {
@@ -64,8 +60,6 @@ public class Patch


/** /**
* The file containing the diff output. * The file containing the diff output.
*
* @param file The new Patchfile value
*/ */
public void setPatchfile( final File patchFile ) public void setPatchfile( final File patchFile )
{ {
@@ -74,8 +68,6 @@ public class Patch


/** /**
* Work silently unless an error occurs. * Work silently unless an error occurs.
*
* @param q The new Quiet value
*/ */
public void setQuiet( final boolean quiet ) public void setQuiet( final boolean quiet )
{ {
@@ -84,8 +76,6 @@ public class Patch


/** /**
* Assume patch was created with old and new files swapped. * Assume patch was created with old and new files swapped.
*
* @param r The new Reverse value
*/ */
public void setReverse( final boolean reverse ) public void setReverse( final boolean reverse )
{ {
@@ -112,10 +102,8 @@ public class Patch


final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final ExecManager execManager = (ExecManager)getService( ExecManager.class );
final Execute2 exe = new Execute2( execManager ); final Execute2 exe = new Execute2( execManager );
setupLogger( exe );


final Commandline cmd = buildCommand();
exe.setCommandline( cmd );
buildCommand( exe.getCommandline() );


try try
{ {
@@ -148,11 +136,9 @@ public class Patch
} }
} }


private Commandline buildCommand()
private void buildCommand( final Commandline cmd )
{ {
final Commandline cmd = new Commandline();
cmd.setExecutable( "patch" ); cmd.setExecutable( "patch" );

if( m_backups ) if( m_backups )
{ {
cmd.addArgument( "-b" ); cmd.addArgument( "-b" );
@@ -185,6 +171,5 @@ public class Patch
{ {
cmd.addArgument( m_originalFile ); cmd.addArgument( m_originalFile );
} }
return cmd;
} }
} }

Loading…
Cancel
Save