Changeset 3516 for devel-tools

Timestamp:

Mar 14, 2008, 9:44:16 AM (13 years ago)

Author:

yura

Message:

• RfpCorePlugin? -> RfpCore?.
• All rfpdt.core global ID are moved into RfpCore?.

Location:

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

Files:

• META-INF/MANIFEST.MF (modified) (1 diff)
• src/org/refal/rfpdt/core/ICorePreferenceNames.java (deleted)
• src/org/refal/rfpdt/core/RfpBuilder.java (modified) (13 diffs)
• src/org/refal/rfpdt/core/RfpCore.java (moved) (moved from devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/core/RfpCorePlugin.java) (3 diffs)
• src/org/refal/rfpdt/core/RfpNature.java (modified) (5 diffs)
• src/org/refal/rfpdt/launching/RfpContainerInitializerAndResolver.java (modified) (2 diffs)

devel-tools/trunk/eclipse/org.refal.rfpdt.core/META-INF/MANIFEST.MF

@@ -4 +4 @@
 Bundle-SymbolicName: org.refal.rfpdt.core;singleton:=true
 Bundle-Version: 1.1.9
-Bundle-Activator: org.refal.rfpdt.core.RfpCorePlugin
+Bundle-Activator: org.refal.rfpdt.core.RfpCore
 Bundle-Vendor: Program Systems Institute of RAS
 Require-Bundle: org.eclipse.core.resources,

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

@@ -51 +51 @@
     private void makeClass (String className, byte[] bytes) {
         IProject project = getProject();
-        IJavaProject javaProject = RfpCorePlugin.getJavaProject(project);
+        IJavaProject javaProject = RfpCore.getJavaProject(project);
         try {
             IPath projectPath = project.getFullPath();
@@ -64 +64 @@
             classFile.setDerived(true);
         } catch (Exception e) {
-            RfpCorePlugin.log(e);
+            RfpCore.log(e);
         }
     }
@@ -142 +142 @@
                 return new InputStreamReader(file.getContents(), file.getCharset());
             } catch (Exception e) {
-                RfpCorePlugin.log(e);
+                RfpCore.log(e);
                 return null;
             }
@@ -154 +154 @@
                 return new InputStreamReader(file.getContents(), file.getCharset());
             } catch (Exception e) {
-                RfpCorePlugin.log(e);
+                RfpCore.log(e);
                 return null;
             }
@@ -163 +163 @@
                 for (IClasspathEntry entry : getClasspathEntries(project))
                     if (entry.getEntryKind() == IClasspathEntry.CPE_CONTAINER) {
-                        IClasspathContainer container = JavaCore.getClasspathContainer(entry.getPath(), RfpCorePlugin
+                        IClasspathContainer container = JavaCore.getClasspathContainer(entry.getPath(), RfpCore
                                 .getJavaProject(project));
                         for (IClasspathEntry entry2 : container.getClasspathEntries()) {
@@ -178 +178 @@
                     }
             } catch (Exception e) {
-                RfpCorePlugin.log(e);
+                RfpCore.log(e);
             }
             return null;
@@ -199 +199 @@
     }
 
-    public static final String BUILDER_ID = "org.refal.rfpdt.core.rfpbuilder";
-
-    private static final QualifiedName IMPORTED_MODULES_PROPKEY = new QualifiedName(RfpCorePlugin.PLUGIN_ID,
+    private static final QualifiedName IMPORTED_MODULES_PROPKEY = new QualifiedName(RfpCore.PLUGIN_ID,
             "imported_modules");
-
-    private static final String MARKER_TYPE = "org.refal.rfpdt.core.rfpProblemMarker";
 
     private static boolean isRfFile (IResource resource) {
@@ -218 +214 @@
     private static void addMarker (IFile file, String message, int lineNumber, int charStart, int charEnd, int severity) {
         try {
-            IMarker marker = file.createMarker(MARKER_TYPE);
+            IMarker marker = file.createMarker(RfpCore.MARKER_TYPE);
             if (message == null)
                 message = "Error";
@@ -255 +251 @@
     protected void clean (IProgressMonitor monitor) throws CoreException {
         IProject project = getProject();
-        project.deleteMarkers(MARKER_TYPE, false, IResource.DEPTH_INFINITE);
+        project.deleteMarkers(RfpCore.MARKER_TYPE, false, IResource.DEPTH_INFINITE);
 
         project.accept(new IResourceVisitor() {
@@ -407 +403 @@
             }
         } catch (CoreException e) {
-            RfpCorePlugin.log(e);
+            RfpCore.log(e);
         }
     }
@@ -413 +409 @@
     private static void deleteMarkers (IFile file) {
         try {
-            file.deleteMarkers(MARKER_TYPE, false, IResource.DEPTH_ZERO);
+            file.deleteMarkers(RfpCore.MARKER_TYPE, false, IResource.DEPTH_ZERO);
         } catch (CoreException e) {
-            RfpCorePlugin.log(e);
+            RfpCore.log(e);
         }
     }
@@ -431 +427 @@
             compileModules(modulesToRecompile, monitor);
         } catch (CoreException e) {
-            RfpCorePlugin.log(e);
+            RfpCore.log(e);
         }
     }
@@ -452 +448 @@
     private static IClasspathEntry[] getClasspathEntries (IProject project) {
         try {
-            return RfpCorePlugin.getJavaProject(project).getRawClasspath();
+            return RfpCore.getJavaProject(project).getRawClasspath();
         } catch (Exception e) {
-            RfpCorePlugin.log(e);
+            RfpCore.log(e);
             return new IClasspathEntry[0];
         }

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

@@ -17 +17 @@
  * The activator class controls the plug-in life cycle
  */
-public class RfpCorePlugin extends Plugin {
+public class RfpCore extends Plugin {
+
+    private static RfpCore plugin;
 
     public static final String PLUGIN_ID = "org.refal.rfpdt";
+    public static final String NATURE_ID = "org.refal.rfpdt.core.rfpnature";
+    public static final String BUILDER_ID = "org.refal.rfpdt.core.rfpbuilder";
+    public static final String MARKER_TYPE = "org.refal.rfpdt.core.rfpProblemMarker";
+    public static final String RFP_CONTAINER = "org.refal.rfpdt.launching.RFP_CONTAINER";
 
-    private static RfpCorePlugin plugin;
-
-    public RfpCorePlugin () {
+    public RfpCore () {
         plugin = this;
     }
@@ -51 +55 @@
      * @return the shared instance
      */
-    public static RfpCorePlugin getDefault () {
+    public static RfpCore getDefault () {
         return plugin;
     }
@@ -100 +104 @@
     public static IJavaProject getJavaProject (IProject project) {
         try {
-            if (project == null || !project.exists() || !project.hasNature(RfpNature.NATURE_ID))
+            if (project == null || !project.exists() || !project.hasNature(RfpCore.NATURE_ID))
                 return null;
         } catch (CoreException e) {

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

@@ -12 +12 @@
 import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jdt.launching.JavaRuntime;
-import org.refal.rfpdt.launching.RfpContainerInitializerAndResolver;
 
 public class RfpNature implements IProjectNature {
     private static final String EXCLUSION_FILTER_ID = "org.eclipse.jdt.core.builder.resourceCopyExclusionFilter";
     private static final String EXCLUSION_EXTENTIONS = "*.rf,*.rfi";
-
-    public static final String NATURE_ID = "org.refal.rfpdt.core.rfpnature";
 
     private IProject project;
@@ -26 +23 @@
         ICommand[] commands = desc.getBuildSpec();
         for (int i = 0; i < commands.length; i++)
-            if (commands[i].getBuilderName().equals(RfpBuilder.BUILDER_ID))
+            if (commands[i].getBuilderName().equals(RfpCore.BUILDER_ID))
                 return;
         ICommand[] newCommands = new ICommand[commands.length + 1];
         System.arraycopy(commands, 0, newCommands, 0, commands.length);
         ICommand command = desc.newCommand();
-        command.setBuilderName(RfpBuilder.BUILDER_ID);
+        command.setBuilderName(RfpCore.BUILDER_ID);
         newCommands[newCommands.length - 1] = command;
         desc.setBuildSpec(newCommands);
@@ -37 +34 @@
 
         { // setup the .classpath
-            IJavaProject javaProject = RfpCorePlugin.getJavaProject(project);
+            IJavaProject javaProject = RfpCore.getJavaProject(project);
             IClasspathEntry[] entriesOld = javaProject.getRawClasspath();
             IClasspathEntry[] entriesNew = new IClasspathEntry[entriesOld.length + 2];
@@ -49 +46 @@
                 }
             entriesNew[entriesOld.length + 0] = JavaCore.newContainerEntry(new Path(
-                    RfpContainerInitializerAndResolver.RFP_CONTAINER));
+                    RfpCore.RFP_CONTAINER));
             entriesNew[entriesOld.length + 1] = JavaCore.newContainerEntry(new Path(JavaRuntime.JRE_CONTAINER));
             javaProject.setRawClasspath(entriesNew, null);
@@ -67 +64 @@
         ICommand[] commands = description.getBuildSpec();
         for (int i = 0; i < commands.length; i++)
-            if (commands[i].getBuilderName().equals(RfpBuilder.BUILDER_ID)) {
+            if (commands[i].getBuilderName().equals(RfpCore.BUILDER_ID)) {
                 ICommand[] newCommands = new ICommand[commands.length - 1];
                 System.arraycopy(commands, 0, newCommands, 0, i);

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

@@ -20 +20 @@
 import org.eclipse.jdt.launching.JavaRuntime;
 import org.osgi.framework.Bundle;
-import org.refal.rfpdt.core.RfpCorePlugin;
+import org.refal.rfpdt.core.RfpCore;
 
 public class RfpContainerInitializerAndResolver extends ClasspathContainerInitializer implements
@@ -60 +60 @@
                     return new Path(file.substring(5, file.length() - 2));
             } catch (IOException e) {
-                RfpCorePlugin.log(e);
+                RfpCore.log(e);
             }
         return null;
     }
 
-    public static final String RFP_CONTAINER = "org.refal.rfpdt.launching.RFP_CONTAINER";
-
     @Override
     public void initialize (IPath containerPath, IJavaProject project) throws CoreException {
-        if (containerPath.segmentCount() > 0 && containerPath.segment(0).equals(RFP_CONTAINER)) {
+        if (containerPath.segmentCount() > 0 && containerPath.segment(0).equals(RfpCore.RFP_CONTAINER)) {
             JavaCore.setClasspathContainer(containerPath, new IJavaProject[] { project },
                     new IClasspathContainer[] { new RfpContainer(containerPath) }, null);
         } else
-            RfpCorePlugin.log("Invalid RfpContainer path", IStatus.ERROR);
+            RfpCore.log("Invalid RfpContainer path", IStatus.ERROR);
     }