Projects >> cascading >>2d089577430be87b28c38cb81ec1e06a34435fe6

Chunk
Conflicting content
  private String makeStepName( Map steps, int numJobs, String sinkPath )
    {
    // todo make the long form optional via a property
<<<<<<< HEAD
    if( sinkPath.length() > 75 )
      sinkPath = sinkPath.substring( sinkPath.length() - 75 );
=======
    if( sinkPath.length() > 110 )
      sinkPath = String.format( "...%110s", sinkPath );
>>>>>>> d061f1b6e9300ebc4468ab9c68dc76dc10205a24

    return String.format( "(%d/%d) %s", steps.size() + 1, numJobs, sinkPath );
    }
Solution content
  private String makeStepName( Map steps, int numJobs, String sinkPath )
    {
    // todo make the long form optional via a property
    if( sinkPath.length() > 110 )
      sinkPath = String.format( "...%110s", sinkPath );

    return String.format( "(%d/%d) %s", steps.size() + 1, numJobs, sinkPath );
    }
File
StepGraph.java
Developer's decision
Version 2
Kind of conflict
If statement