Changeset 4133

Timestamp:

Dec 22, 2009, 8:50:54 PM (11 years ago)

Author:

yura

Message:

• RfpProject? refactor.

Location:

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

Files:

• RfpAbstractBuilder.java (modified) (2 diffs)
• RfpBuilder.java (modified) (1 diff)
• RfpCore.java (modified) (4 diffs)
• RfpNature.java (modified) (1 diff)
• RfpProject.java (modified) (5 diffs)

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

@@ -18 +18 @@
 
 public abstract class RfpAbstractBuilder extends IncrementalProjectBuilder {
+    private RfpProject rfpProject;
+    
     protected RfpProject getRfpProject () {
-        return RfpCore.getRfpProject(getProject());
+        if (rfpProject == null)
+            rfpProject = RfpProject.get(getProject());
+        return rfpProject;
     }
 
@@ -28 +32 @@
             fullBuild(monitor);
         else {
-            RfpProject rfpProject = getRfpProject();
-            IResourceDelta delta = getDelta(rfpProject.getProject());
-            if (delta == null || delta.findMember(rfpProject.getFile(".classpath").getProjectRelativePath()) != null)
+            IResourceDelta delta = getDelta(getProject());
+            if (delta == null || delta.findMember(getProject().getFile(".classpath").getProjectRelativePath()) != null)
                 fullBuild(monitor);
             else

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

@@ -316 +316 @@
             return null;
         deleteMarkers(file);
-        if (RfpCore.getRfpProject(project).getModuleName(file) == null)
+        if (RfpProject.get(project).getModuleName(file) == null)
             return null;
         if (RfpProject.isRefFile(file)) {
-            Checker.getR5(new IdeCompilerEnvironment(RfpCore.getRfpProject(project), file,
+            Checker.getR5(new IdeCompilerEnvironment(RfpProject.get(project), file,
                     new StringReader(document)));
             return null;
         } else
-            return Checker.getModuleImplementation(new IdeCompilerEnvironment(RfpCore.getRfpProject(project), file,
+            return Checker.getModuleImplementation(new IdeCompilerEnvironment(RfpProject.get(project), file,
                     new StringReader(document)));
     }

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

@@ -1 +1 @@
 package org.refal.rfpdt.core;
 
-import java.util.WeakHashMap;
 
-import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Plugin;
@@ -13 +11 @@
 public class RfpCore extends Plugin {
     private static RfpCore plugin = null;
-
-    private static final WeakHashMap<IProject, RfpProject> rfpProjects = new WeakHashMap<IProject, RfpProject>();
 
     private static void log (IStatus status) {
@@ -30 +26 @@
 
     /**
-     * Logs a message to the plugin's error log
+     * Logs a message to the plugin's error log.
      * 
      * @param message
@@ -41 +37 @@
     }
 
-    public static void log (Throwable e) {
-        log(new Status(IStatus.ERROR, PLUGIN_ID, IStatus.OK, "Internal error", e));
-    }
-
-    /** May return <code>null</code> if argument is <code>null</code>. */
-    public static RfpProject getRfpProject (IProject project) {
-        if (project == null)
-            return null;
-        RfpProject rfpProject = RfpCore.rfpProjects.get(project);
-        if (rfpProject == null) {
-            rfpProject = new RfpProject(project);
-            RfpCore.rfpProjects.put(project, rfpProject);
-        }
-        return rfpProject;
+    /**
+     * Logs a exception to the plugin's error log.
+     * 
+     * @param exception
+     *            Exception to be logger
+     */
+    public static void log (Exception exception) {
+        log(new Status(IStatus.ERROR, PLUGIN_ID, IStatus.OK, "Internal error", exception));
     }
 

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

@@ -36 +36 @@
         project.setDescription(projectDesc, null);
         // setup the classpath
-        IJavaProject javaProject = RfpCore.getRfpProject(project).getJavaProject();
+        IJavaProject javaProject = RfpProject.get(project).getJavaProject();
         IClasspathEntry[] entriesOld = javaProject.getRawClasspath();
         IClasspathEntry[] entriesNew = new IClasspathEntry[entriesOld.length + 2];

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

@@ -2 +2 @@
 
 import java.io.ByteArrayInputStream;
+import java.util.WeakHashMap;
 
 import org.eclipse.core.resources.IFile;
@@ -22 +23 @@
 
 public class RfpProject {
+    private static final WeakHashMap<IProject, RfpProject> rfpProjects = new WeakHashMap<IProject, RfpProject>();
+
+    /** May return <code>null</code> if argument is <code>null</code>. */
+    public static RfpProject get (IProject project) {
+        if (project == null)
+            return null;
+        RfpProject rfpProject = RfpProject.rfpProjects.get(project);
+        if (rfpProject == null) {
+            rfpProject = new RfpProject(project);
+            RfpProject.rfpProjects.put(project, rfpProject);
+        }
+        return rfpProject;
+    }
+
+    public static boolean isRfFile (IResource resource) {
+        return resource instanceof IFile && resource.getFileExtension() != null
+                && resource.getFileExtension().equals("rf");
+    }
+
+    public static boolean isRfiFile (IResource resource) {
+        return resource instanceof IFile && resource.getFileExtension() != null
+                && resource.getFileExtension().equals("rfi");
+    }
+
+    public static boolean isRefFile (IResource resource) {
+        return resource instanceof IFile && resource.getFileExtension() != null
+                && resource.getFileExtension().equals("ref");
+    }
+
     private final IProject project;
     private final IJavaProject javaProject;
@@ -28 +58 @@
     private final IScopeContext[] scopes;
 
-    RfpProject (IProject project) {
+    private RfpProject (IProject project) {
         this.project = project;
         this.javaProject = JavaCore.create(project);
@@ -156 +186 @@
 
     public static String staticGetModuleName (IFile file) {
-        RfpProject rfpProject = RfpCore.getRfpProject(file.getProject());
+        RfpProject rfpProject = RfpProject.get(file.getProject());
         return rfpProject == null ? null : rfpProject.getModuleName(file);
     }
@@ -198 +228 @@
                 ICompilerPreferences.ADD_SOURCE, false, scopes);
     }
-
-    public static boolean isRfFile (IResource resource) {
-        return resource instanceof IFile && resource.getFileExtension() != null
-                && resource.getFileExtension().equals("rf");
-    }
-
-    public static boolean isRfiFile (IResource resource) {
-        return resource instanceof IFile && resource.getFileExtension() != null
-                && resource.getFileExtension().equals("rfi");
-    }
-
-    public static boolean isRefFile (IResource resource) {
-        return resource instanceof IFile && resource.getFileExtension() != null
-                && resource.getFileExtension().equals("ref");
-    }
 }