Changeset 3784

Timestamp:

May 25, 2008, 12:30:18 AM (12 years ago)

Author:

yura

Message:

• RfpAbstractBuilder? contains common part from RfpBuilder? and RfpPreBuilder?.

Location:

devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/core

Files:

• RfpAbstractBuilder.java (modified) (1 diff)
• RfpBuilder.java (modified) (7 diffs)

devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/core/RfpAbstractBuilder.java

@@ -53 +53 @@
     }
 
-    private void compileModules (final SortedSet<String> modulesToRecompile, IProgressMonitor monitor)
+    protected void compileModules (final SortedSet<String> modulesToRecompile, IProgressMonitor monitor)
             throws CoreException {
         IWorkspace workspace = ResourcesPlugin.getWorkspace();

devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/core/RfpBuilder.java

@@ -7 +7 @@
 import java.util.Arrays;
 import java.util.HashMap;
-import java.util.Map;
 import java.util.Set;
 import java.util.SortedMap;
@@ -23 +22 @@
 import org.eclipse.core.resources.IResourceDeltaVisitor;
 import org.eclipse.core.resources.IResourceVisitor;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
 import org.eclipse.core.runtime.QualifiedName;
 import org.eclipse.jdt.core.IClasspathContainer;
@@ -51 +45 @@
 import org.refal.rfpdt.compiler.SrcPosition;
 
-public class RfpBuilder extends IncrementalProjectBuilder {
-    private RfpProject getRfpProject () {
-        return RfpCore.getRfpProject(getProject());
-    }
-
+public class RfpBuilder extends RfpAbstractBuilder {
     private void deleteClassFiles (IFile file) {
         RfpProject rfpProject = getRfpProject();
@@ -265 +255 @@
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.core.internal.events.InternalBuilder#build(int, java.util.Map,
-     *      org.eclipse.core.runtime.IProgressMonitor)
-     */
-    @SuppressWarnings("unchecked")
+    private static void deleteMarkers (IFile file) {
+        try {
+            file.deleteMarkers(RfpCore.MARKER_ID, false, IResource.DEPTH_ZERO);
+        } catch (CoreException e) {
+            RfpCore.log(e);
+        }
+    }
+
     @Override
-    protected IProject[] build (int kind, Map args, IProgressMonitor monitor) throws CoreException {
-        if (kind == FULL_BUILD)
-            fullBuild(monitor);
-        else {
-            RfpProject rfpProject = getRfpProject();
-            IResourceDelta delta = getDelta(rfpProject.getProject());
-            if (delta == null || delta.findMember(rfpProject.getFile(".classpath").getProjectRelativePath()) != null)
-                fullBuild(monitor);
-            else
-                incrementalBuild(delta, monitor);
-        }
-        return null;
-    }
-
-    @SuppressWarnings("unchecked")
-    private void checkAndCompileModuleImplem (IResource resource) {
-        if (!RfpProject.isRfFile(resource))
+    protected void checkAndCompileModuleImplem (String moduleName) {
+        IFile file = getRfpProject().getSource(moduleName, "rf");        
+        if (!RfpProject.isRfFile(file))
             return;
-        IFile file = (IFile) resource;
         deleteMarkers(file);
         CompilerEnvironment environment = new IdeCompilerEnvironment(getRfpProject(), file);
@@ -324 +300 @@
     }
 
-    private boolean checkCancel (IProgressMonitor monitor) {
-        if (monitor.isCanceled())
-            // Discard build state if necessary
-            throw new OperationCanceledException();
-
-        // if (isInterrupted()) { // FIXME: should cancel current job
-        // and rescedule auto-builds.
-        // return true;
-        // }
-        return false;
+    private SortedSet<String> getNamesOfImportedModules (IFile file) {
+        SortedSet<String> moduleNameSet = new TreeSet<String>();
+        try {
+            String asString = file.getPersistentProperty(IMPORTED_MODULES_PROPKEY);
+            if (asString == null)
+                return moduleNameSet;
+            moduleNameSet.addAll(Arrays.asList(asString.split(",")));
+        } catch (CoreException e) {}
+        return moduleNameSet;
     }
 
@@ -363 +338 @@
     }
 
-    private void compileEachModule (SortedSet<String> modulesToRecompile, IProgressMonitor monitor) {
-        monitor.beginTask("Recompile modules", modulesToRecompile.size());
-        for (String moduleName : modulesToRecompile) {
-            if (checkCancel(monitor))
-                return;
-            monitor.subTask("Compiling the module " + moduleName);
-            checkAndCompileModuleImplem(getRfpProject().getSource(moduleName, "rf"));
-            // try {
-            // Thread.sleep(1000);
-            // } catch (InterruptedException e) {
-            // }
-            monitor.worked(1);
-        }
-        monitor.done();
-    }
-
-    private void compileModules (final SortedSet<String> modulesToRecompile, IProgressMonitor monitor)
-            throws CoreException {
-        // workspace.run(action, workspace.getRoot(), IWorkspace.AVOID_UPDATE, monitor);
-        IWorkspace workspace = ResourcesPlugin.getWorkspace();
-        workspace.run(new IWorkspaceRunnable() {
-            public void run (IProgressMonitor monitor) throws CoreException {
-                compileEachModule(modulesToRecompile, monitor);
-            }
-        }, workspace.getRoot(), 0, monitor);
-    }
-
-    private static void deleteMarkers (IFile file) {
-        try {
-            file.deleteMarkers(RfpCore.MARKER_ID, false, IResource.DEPTH_ZERO);
-        } catch (CoreException e) {
-            RfpCore.log(e);
-        }
-    }
-
-    private void fullBuild (final IProgressMonitor monitor) throws CoreException {
-        final SortedSet<String> modulesToRecompile = new TreeSet<String>();
-        final RfpProject rfpProject = getRfpProject();
-        try {
-            getProject().accept(new IResourceVisitor() {
-                public boolean visit (IResource resource) throws CoreException {
-                    if (RfpProject.isRfFile(resource)) {
-                        String moduleName = rfpProject.getModuleName((IFile) resource);
-                        if (moduleName != null)
-                            modulesToRecompile.add(moduleName);
-                    }
-                    return true;
-                }
-            });
-            compileModules(modulesToRecompile, monitor);
-        } catch (CoreException e) {
-            RfpCore.log(e);
-        }
-    }
-
-    private SortedSet<String> getNamesOfImportedModules (IFile file) {
-        SortedSet<String> moduleNameSet = new TreeSet<String>();
-        try {
-            String asString = file.getPersistentProperty(IMPORTED_MODULES_PROPKEY);
-            if (asString == null)
-                return moduleNameSet;
-            moduleNameSet.addAll(Arrays.asList(asString.split(",")));
-        } catch (CoreException e) {}
-        return moduleNameSet;
-    }
-
-    private void incrementalBuild (IResourceDelta delta, IProgressMonitor monitor) throws CoreException {
+    @Override
+    protected void incrementalBuild (IResourceDelta delta, IProgressMonitor monitor) throws CoreException {
         final SortedSet<String> modulesToRecompile = new TreeSet<String>();
         final SortedMap<String, SortedSet<String>> dependencies = collectDependencies();
@@ -457 +367 @@
                 }
             });
-        } catch (CoreException e) {}
+        } catch (CoreException e) {
+            RfpCore.log(e);
+        }
         compileModules(modulesToRecompile, monitor);
     }