Projects >> hudson >>a29302fcf0ef7d9bd2228c8bfeecb0cbe24bbdb7

Chunk
Conflicting content 
                if(!Hudson.getInstance().hasPermission(Hudson.ADMINISTER))
                    return FormValidation.ok();

<<<<<<< HEAD
                if(value.exists() && !value.isDirectory())
=======
                if(value.getPath().equals(""))
                    return FormValidation.ok();

                if(!value.isDirectory())
>>>>>>> 362763ae98f76097777093785191267200a3ab1d
                    return FormValidation.error(Messages.Ant_NotADirectory(value));

                if(!value.exists())
Solution content 
                if(!Hudson.getInstance().hasPermission(Hudson.ADMINISTER))
                    return FormValidation.ok();

                if(value.getPath().equals(""))
                    return FormValidation.ok();

                if(!value.isDirectory())
                    return FormValidation.error(Messages.Ant_NotADirectory(value));
File
Ant.java
Developer's decision
Version 2
Kind of conflict
If statement
Chunk
Conflicting content 
                    return FormValidation.ok();

                if(value.getPath().equals(""))
<<<<<<< HEAD
                    return FormValidation.error(Messages.Maven_MavenHomeRequired());
                if(value.exists() && !value.isDirectory())
=======
                    return FormValidation.ok();

                if(!value.isDirectory())
>>>>>>> 362763ae98f76097777093785191267200a3ab1d
                    return FormValidation.error(Messages.Maven_NotADirectory(value));

                if(!value.exists())
Solution content 
                    return FormValidation.ok();

                if(value.getPath().equals(""))
                    return FormValidation.ok();

                if(!value.isDirectory())
                    return FormValidation.error(Messages.Maven_NotADirectory(value));
File
Maven.java
Developer's decision
Version 2
Kind of conflict
If statement
Method invocation
Return statement
Chunk
Conflicting content 
import java.net.URLEncoder;
import java.io.PrintStream;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
<<<<<<< HEAD
import java.io.PrintWriter;
import java.io.Serializable;
=======
import java.io.Serializable;
import java.io.PrintWriter;
>>>>>>> 362763ae98f76097777093785191267200a3ab1d
import java.net.URL;
import java.net.HttpURLConnection;
Solution content 
import java.io.PrintStream;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.io.Serializable;
import java.io.PrintWriter;
import java.net.URL;
import java.net.HttpURLConnection;
import java.net.URLEncoder;
File
JDKInstaller.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
        return con;
        os.close();
    }
<<<<<<< HEAD

    private URL locateStage2(TaskListener log, String page) throws MalformedURLException {
        Pattern HREF = Pattern.compile(" that confuses dom4j/jtidy

=======

    private URL locateStage2(TaskListener log, String page) throws MalformedURLException {
        Pattern HREF = Pattern.compile(" that confuses dom4j/jtidy

>>>>>>> 362763ae98f76097777093785191267200a3ab1d
        log.getLogger().println("Choosing the download bundle");
        List urls = new ArrayList();
Solution content 
        os.close();
        return con;
    }

    private URL locateStage2(TaskListener log, String page) throws MalformedURLException {
        Pattern HREF = Pattern.compile(" that confuses dom4j/jtidy

        log.getLogger().println("Choosing the download bundle");
        List urls = new ArrayList();
File
JDKInstaller.java
Developer's decision
Version 1
Kind of conflict
Comment
Method invocation
Method signature
Variable