Projects >> grails-ide >>e6d3650078090e896030dbdb3bb728a65feee648

Chunk
Conflicting content
    public static final String PLUGIN_ID = "org.grails.ide.eclipse.test"; //$NON-NLS-1$
    private static boolean isJointGrailsTest;
    
<<<<<<< HEAD
=======
    public static String[] getURLDependencies() throws Exception {
        List allJars = new ArrayList();
        
//        allJars.add(getLocationForBundle("javax.servlet"));
 //       allJars.add("/home/kdvolder/commandline-dev/groovy-eclipse/base/org.codehaus.groovy18/lib/servlet-api-2.4.jar");
        allJars.add(getLocationForBundle("javax.el"));
        
        GrailsTest.waitForGrailsIntall();
        GrailsTest.ensureDefaultGrailsVersion(GrailsVersion.MOST_RECENT);
        // now add grails-*.jar from the grails install
        // Most recent version may be 1.3.7 or 2.0.0 depending on what is set in GrailsTestUtilActivator
        IGrailsInstall install = GrailsCoreActivator.getDefault().getInstallManager().getInstallFor(GrailsVersion.MOST_RECENT);
        
        if (install == null) {
            throw new AssertionFailedError("Could not find Grails version " + GrailsVersion.MOST_RECENT);
        }
        
        allJars.addAll(findJars(install.getHome() + "dist/", true));
        allJars.addAll(findJars(install.getHome() + "lib/", true));
        return allJars.toArray(new String[0]);
    }
    
    private static String getLocationForBundle(String bundleId) throws IOException {
        try {
            return FileLocator.getBundleFile(Platform.getBundle(bundleId)).getAbsolutePath();
        } catch (NullPointerException e) {
            throw new AssertionFailedError("Could not find bundle " + bundleId);
        }
    }
>>>>>>> d018f8de238307059e296db6d8dae06379868a09
    
    public static boolean isGrails200OrLater() {
        return GrailsVersion.MOST_RECENT.compareTo(GrailsVersion.V_2_0_)>=0;
Solution content
    public static final String PLUGIN_ID = "org.grails.ide.eclipse.test"; //$NON-NLS-1$
    private static boolean isJointGrailsTest;
       
    public static boolean isGrails200OrLater() {
        return GrailsVersion.MOST_RECENT.compareTo(GrailsVersion.V_2_0_)>=0;
File
GrailsTestsActivator.java
Developer's decision
Version 1
Kind of conflict
Method declaration