resolved conflicts

darcs-hash:20080324180453-34f1c-74808da9a52c4e0e13b64bd99c5a4f8dfb951848.gz
ttencate · Mar 24, 2008 · 934afdc · 934afdc
1 parent 99881c6
commit 934afdc
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 16 deletions.
diff --git a/...ll.core.test/src/net/sf/eclipsefp/haskell/core/internal/project/CabalBuilder_PDETest.java b/...ll.core.test/src/net/sf/eclipsefp/haskell/core/internal/project/CabalBuilder_PDETest.java
@@ -1,8 +1,6 @@
-v v v v v v v
 // Copyright (c) 2008 by Leif Frenzel - see http://leiffrenzel.de
 // This code is made available under the terms of the Eclipse Public License,
 // version 1.0 (EPL). See http://www.eclipse.org/legal/epl-v10.html
-^ ^ ^ ^ ^ ^ ^
 package net.sf.eclipsefp.haskell.core.internal.project;
 
 import java.io.ByteArrayInputStream;
@@ -20,13 +18,9 @@ public class CabalBuilder_PDETest extends TestCaseWithProject {
 
   public void testNoCabalFileWarning() throws CoreException {
     assertTrue( project.exists() );
-v v v v v v v
     // a Cabal file was created by default
     assertTrue( project.getFile( PROJECT_NAME + ".cabal" ).exists() );
-    waitForAutoBuild();
-
     project.getFile( PROJECT_NAME + ".cabal" ).delete( true, null );
-^ ^ ^ ^ ^ ^ ^
     waitForAutoBuild();
 
     // no cabal file -> warning

diff --git a/...psefp.haskell.core/src/net/sf/eclipsefp/haskell/core/internal/project/DescriptorFile.java b/...psefp.haskell.core/src/net/sf/eclipsefp/haskell/core/internal/project/DescriptorFile.java
@@ -27,9 +27,6 @@ public class DescriptorFile implements IXMLNames {
 	private String fTargetName;
 	private final String fCompiler;
 
-v v v v v v v
-^ ^ ^ ^ ^ ^ ^
-
 	DescriptorFile(final String sourcePath, final String outputPath,
 			final String targetName,
 			final String compiler)

diff --git a/...lipsefp.haskell.core/src/net/sf/eclipsefp/haskell/core/project/HaskellProjectManager.java b/...lipsefp.haskell.core/src/net/sf/eclipsefp/haskell/core/project/HaskellProjectManager.java
@@ -76,11 +76,9 @@ public static void clear() {
     * resource. The passed IProject must have the {@link HaskellNature
     * Haskell project nature}.</p> */
   public static IHaskellProject get( final IProject project ) {
-v v v v v v v
     if( project == null || !project.isAccessible() ) {
       throw new IllegalArgumentException();
     }
-^ ^ ^ ^ ^ ^ ^
     try {
       Assert.isTrue( project.hasNature( HaskellNature.NATURE_ID ),
                        "Project " //$NON-NLS-1$

diff --git a/...ell/ui/internal/editors/haskell/codeassist/WorkbenchHaskellCompletionContext_PDETest.java b/...ell/ui/internal/editors/haskell/codeassist/WorkbenchHaskellCompletionContext_PDETest.java
@@ -127,11 +127,7 @@ private IDocument getDocumentFrom(final ITextEditor editor) {
 	private ITextEditor createEditorFor(final IFile file) throws PartInitException {
 		FileEditorInput input = new FileEditorInput(file);
 		IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-
-v v v v v v v
-		ITextEditor editor = (ITextEditor) activePage.openEditor(input, "net.sf.eclipsefp.haskell.ui.internal.editors.haskell.HaskellEditor");
-^ ^ ^ ^ ^ ^ ^
-		return editor;
+		return (ITextEditor) activePage.openEditor(input, "net.sf.eclipsefp.haskell.ui.internal.editors.haskell.HaskellEditor");
 	}
 
 }