Changeset 3778

Timestamp:

May 24, 2008, 1:34:12 PM (13 years ago)

Author:

yura

Message:

• Creating needed folders in output folder.

Location:

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

Files:

• RfpBuilder.java (modified) (4 diffs)
• RfpPreBuilder.java (modified) (3 diffs)
• RfpProject.java (modified) (7 diffs)

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

@@ -1 +1 @@
 package org.refal.rfpdt.core;
 
-import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -57 +56 @@
     }
 
-    private void createClassFile (String className, byte[] bytes) {
-        try {
-            IFile classFile = getRfpProject().getClassFile(className);
-            if (classFile.exists())
-                classFile.delete(true, false, null);
-            InputStream inputStream = new ByteArrayInputStream(bytes);
-            classFile.create(inputStream, true, null);
-            classFile.setDerived(true);
-            inputStream.close();
-        } catch (Exception e) {
-            RfpCore.log(e);
-        }
-    }
-
     private void deleteClassFiles (IFile file) {
         RfpProject rfpProject = getRfpProject();
@@ -76 +61 @@
         if (moduleName == null)
             return;
-        IFile classFile = rfpProject.getClassFile(moduleName);
-        try {
-            for (int i = 0; true; i++) {
-                if (classFile.exists())
-                    classFile.delete(true, false, null);
-                else
-                    break;
-                classFile = rfpProject.getClassFile(moduleName + "$" + i);
-            }
-        } catch (CoreException e) {
-            RfpCore.log(e);
-        }
+        rfpProject.deleteClassFiles(moduleName);
     }
 
@@ -354 +328 @@
                     .toExpr(rfpProject.getCompilerOptionAddLineNumber()), Native.toExpr(rfpProject
                     .getCompilerOptionAddSource()), ast, res);
-            // rfpc.CompileASToJBC(ast, res);
             deleteClassFiles(file);
             for (Comparable<?> p : res.getExpr()) {
                 Expr e = (Expr) p;
-                createClassFile((String) e.at(0), (byte[]) ((Reference) e.at(1)).object);
+                getRfpProject().writeClassFile((String) e.at(0), (byte[]) ((Reference) e.at(1)).object);
             }
         } catch (RefalException e) {

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

@@ -1 +1 @@
 package org.refal.rfpdt.core;
 
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
@@ -39 +37 @@
     }
 
-    private void createClassFile (String className, byte[] bytes) {
-        try {
-            IFile classFile = getRfpProject().getClassFile(className);
-            if (classFile.exists())
-                classFile.delete(true, false, null);
-            InputStream inputStream = new ByteArrayInputStream(bytes);
-            classFile.create(inputStream, true, null);
-            classFile.setDerived(true);
-            inputStream.close();
-        } catch (Exception e) {
-            RfpCore.log(e);
-        }
-    }
-
-    private void deleteClassFiles (String moduleName) {
-        RfpProject rfpProject = getRfpProject();
-        IFile classFile = rfpProject.getClassFile(moduleName);
-        try {
-            for (int i = 0; true; i++) {
-                if (classFile.exists())
-                    classFile.delete(true, false, null);
-                else
-                    break;
-                classFile = rfpProject.getClassFile(moduleName + "$" + i);
-            }
-        } catch (CoreException e) {
-            RfpCore.log(e);
-        }
-    }
-
     private static class IdeCompilerEnvironment implements CompilerEnvironment {
         private final RfpProject project;
@@ -156 +124 @@
 
     private void checkAndCompileModuleImplem (String moduleName) {
-        deleteClassFiles(moduleName);
+        getRfpProject().deleteClassFiles(moduleName);
         IdeCompilerEnvironment env = new IdeCompilerEnvironment(getRfpProject(), moduleName);
         AstImplem astImplem = Checker.getModuleImplementation(env);
         byte[] jbc = RefalInterfaceComplier.compile(astImplem);
-        createClassFile(moduleName, jbc);
+        getRfpProject().writeClassFile(moduleName, jbc);
     }
 

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

@@ -1 +1 @@
 package org.refal.rfpdt.core;
 
+import java.io.ByteArrayInputStream;
+
 import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceStatus;
 import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.jdt.core.IClasspathEntry;
 import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jdt.core.JavaModelException;
 
 public class RfpProject {
@@ -27 +34 @@
         return javaProject;
     }
-    
+
     public IFile getFile (String fileName) {
         return project.getFile(fileName);
@@ -36 +43 @@
     }
 
-    public IFile getClassFile (String moduleName) {
+    public void writeClassFile (String className, byte[] bytes) {
+        try {
+            IFile classFile = getClassFile(className);
+            if (classFile == null)
+                return;
+            if (classFile.exists()) {
+                if (!classFile.isDerived())
+                    classFile.setDerived(true);
+                classFile.setContents(new ByteArrayInputStream(bytes), IResource.FORCE, null);
+            } else {
+                try {
+                    classFile.create(new ByteArrayInputStream(bytes), IResource.FORCE | IResource.DERIVED, null);
+                } catch (CoreException e) {
+                    if (e.getStatus().getCode() == IResourceStatus.RESOURCE_NOT_FOUND) {
+                        String[] paths = className.split("\\.");
+                        IPath path = javaProject.getOutputLocation();
+                        for (int i = 0; i < paths.length - 1; i++) {
+                            path = path.append(paths[i]);
+                            IFolder folder = workspaceRoot.getFolder(path);
+                            if (!folder.exists())
+                                folder.create(IResource.FORCE | IResource.DERIVED, false, null);
+                        }
+                        classFile.create(new ByteArrayInputStream(bytes), IResource.FORCE | IResource.DERIVED, null);
+                    } else
+                        throw e;
+                }
+            }
+        } catch (CoreException e) {
+            RfpCore.log(e);
+        }
+    }
+
+    public void deleteClassFiles (String moduleName) {
+        try {
+            IFile classFile = getClassFile(moduleName);
+            for (int i = 0; true; i++) {
+                if (classFile == null)
+                    return;
+                if (classFile.exists())
+                    classFile.delete(true, false, null);
+                else
+                    break;
+                classFile = getClassFile(moduleName + "$" + i);
+            }
+        } catch (CoreException e) {
+            RfpCore.log(e);
+        }
+    }
+
+    /** May return <code>null</code>! */
+    private IFile getClassFile (String moduleName) {
         try {
             return workspaceRoot.getFile(javaProject.getOutputLocation()
                     .append(moduleName.replace('.', '/') + ".class"));
-        } catch (Exception e) {
+        } catch (JavaModelException e) {
             RfpCore.log(e);
         }
@@ -46 +103 @@
     }
 
+    /** May return <code>null</code>! */
     public IFile getSource (String moduleName, String ext) {
         try {
@@ -55 +113 @@
                         return file;
                 }
-        } catch (Exception e) {
+        } catch (JavaModelException e) {
             RfpCore.log(e);
         }
@@ -65 +123 @@
         return rfpProject == null ? null : rfpProject.getModuleName(file);
     }
-    
+
     /** May return <code>null</code>! */
     public String getModuleName (IFile file) {
@@ -76 +134 @@
                         return filePath.removeFirstSegments(entryPath.segmentCount()).toString().replace('/', '.');
                 }
-        } catch (Exception e) {
+        } catch (JavaModelException e) {
             RfpCore.log(e);
         }
         return null;
     }
-    
+
     private boolean addLineNumber = true;
     private boolean addVariableNames = true;
     private boolean addSource = true;
-    
+
     public boolean getCompilerOptionAddLineNumber () {
         return addLineNumber;