only set derived if needed

JPMoresmau · Sep 26, 2013 · b792e3c · b792e3c
1 parent 7675659
commit b792e3c
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/...lipsefp.haskell.core/src/net/sf/eclipsefp/haskell/core/partitioned/alex/DeltaVisitor.java b/...lipsefp.haskell.core/src/net/sf/eclipsefp/haskell/core/partitioned/alex/DeltaVisitor.java
@@ -4,6 +4,7 @@
 import net.sf.eclipsefp.haskell.core.partitioned.runner.AlexRunner;
 import net.sf.eclipsefp.haskell.core.partitioned.runner.ProcessorError;
 import net.sf.eclipsefp.haskell.util.FileUtil;
+import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IResourceDelta;
 import org.eclipse.core.resources.IResourceDeltaVisitor;
@@ -35,7 +36,10 @@ public boolean visit( final IResourceDelta delta ) throws CoreException {
         // Set derived file as derived
         resource.getProject().refreshLocal( IResource.DEPTH_INFINITE, null );
         IPath derivedPath = resource.getProjectRelativePath().removeFileExtension().addFileExtension( FileUtil.EXTENSION_HS );
-        resource.getProject().getFile( derivedPath ).setDerived( true,new NullProgressMonitor() );
+        IFile f=resource.getProject().getFile( derivedPath );
+        if (f.isAccessible() && !f.isDerived()){
+          f.setDerived( true,new NullProgressMonitor() );
+        }
       }
     }
     return true;

diff --git a/...efp.haskell.core/src/net/sf/eclipsefp/haskell/core/partitioned/alex/FullBuildVisitor.java b/...efp.haskell.core/src/net/sf/eclipsefp/haskell/core/partitioned/alex/FullBuildVisitor.java
@@ -28,7 +28,7 @@ public boolean visit( final IResource resource ) throws CoreException {
       resource.getProject().refreshLocal( IResource.DEPTH_INFINITE, null );
       IPath derivedPath = resource.getProjectRelativePath().removeFileExtension().addFileExtension( FileUtil.EXTENSION_HS );
       IFile f=resource.getProject().getFile( derivedPath );
-      if (f.isAccessible()){
+      if (f.isAccessible() && !f.isDerived()){
         f.setDerived( true,new NullProgressMonitor() );
       }
     }

diff --git a/...ipsefp.haskell.core/src/net/sf/eclipsefp/haskell/core/partitioned/happy/DeltaVisitor.java b/...ipsefp.haskell.core/src/net/sf/eclipsefp/haskell/core/partitioned/happy/DeltaVisitor.java
@@ -4,6 +4,7 @@
 import net.sf.eclipsefp.haskell.core.partitioned.runner.HappyRunner;
 import net.sf.eclipsefp.haskell.core.partitioned.runner.ProcessorError;
 import net.sf.eclipsefp.haskell.util.FileUtil;
+import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IResourceDelta;
 import org.eclipse.core.resources.IResourceDeltaVisitor;
@@ -35,7 +36,10 @@ public boolean visit( final IResourceDelta delta ) throws CoreException {
         // Set derived file as derived
         resource.getProject().refreshLocal( IResource.DEPTH_INFINITE, null );
         IPath derivedPath = resource.getProjectRelativePath().removeFileExtension().addFileExtension( FileUtil.EXTENSION_HS );
-        resource.getProject().getFile( derivedPath ).setDerived( true,new NullProgressMonitor() );
+        IFile f=resource.getProject().getFile( derivedPath );
+        if (f.isAccessible() && !f.isDerived()){
+          f.setDerived( true,new NullProgressMonitor() );
+        }
       }
     }
     return true;

diff --git a/...fp.haskell.core/src/net/sf/eclipsefp/haskell/core/partitioned/happy/FullBuildVisitor.java b/...fp.haskell.core/src/net/sf/eclipsefp/haskell/core/partitioned/happy/FullBuildVisitor.java
@@ -28,7 +28,7 @@ public boolean visit( final IResource resource ) throws CoreException {
       resource.getProject().refreshLocal( IResource.DEPTH_INFINITE, null );
       IPath derivedPath = resource.getProjectRelativePath().removeFileExtension().addFileExtension( FileUtil.EXTENSION_HS );
       IFile f=resource.getProject().getFile( derivedPath );
-      if (f.isAccessible()){
+      if (f.isAccessible() && !f.isDerived()){
         f.setDerived( true,new NullProgressMonitor() );
       }
     }

diff --git a/...ipsefp.haskell.core/src/net/sf/eclipsefp/haskell/core/partitioned/uuagc/UuagcBuilder.java b/...ipsefp.haskell.core/src/net/sf/eclipsefp/haskell/core/partitioned/uuagc/UuagcBuilder.java
@@ -116,8 +116,7 @@ static void build(final IResource resource) throws CoreException{
     IPath derivedPath = resource.getProjectRelativePath()
         .removeFileExtension().addFileExtension( FileUtil.EXTENSION_HS );
     IFile f=resource.getProject().getFile( derivedPath );
-    // file may not be created if they were errors
-    if (f.isAccessible()){
+    if (f.isAccessible() && !f.isDerived()){
       f.setDerived( true,new NullProgressMonitor() );
     }
   }