[X10-commits] SF.net SVN: x10:[19839] x10dt/trunk/x10dt.ui.launch.cpp/src/x10dt/ui/launch /cpp

[<rmf...@us...>]

Revision: 19839
          http://x10.svn.sourceforge.net/x10/?rev=19839&view=rev
Author:   rmfuhrer
Date:     2011-01-31 20:53:51 +0000 (Mon, 31 Jan 2011)

Log Message:
-----------
Moved nature IDs to x10dt.core, so that the CompilerOptionsFactory can use them to determine the right kind of X10 compiler options object to create.

Modified Paths:
--------------
    x10dt/trunk/x10dt.ui.launch.cpp/src/x10dt/ui/launch/cpp/CppLaunchCore.java
    x10dt/trunk/x10dt.ui.launch.cpp/src/x10dt/ui/launch/cpp/actions/CppBackEndProjectConverter.java

Modified: x10dt/trunk/x10dt.ui.launch.cpp/src/x10dt/ui/launch/cpp/CppLaunchCore.java
===================================================================
--- x10dt/trunk/x10dt.ui.launch.cpp/src/x10dt/ui/launch/cpp/CppLaunchCore.java	2011-01-31 20:53:04 UTC (rev 19838)
+++ x10dt/trunk/x10dt.ui.launch.cpp/src/x10dt/ui/launch/cpp/CppLaunchCore.java	2011-01-31 20:53:51 UTC (rev 19839)
@@ -43,7 +43,6 @@
 
 import x10dt.core.X10DTCorePlugin;
 import x10dt.core.preferences.generated.X10Constants;
-import x10dt.ui.launch.core.LaunchCore;
 import x10dt.ui.launch.core.utils.CoreResourceUtils;
 import x10dt.ui.launch.cpp.platform_conf.IX10PlatformConf;
 import x10dt.ui.launch.cpp.platform_conf.IX10PlatformConfWorkCopy;
@@ -305,7 +304,7 @@
     this.fProjectToPlatform = new HashMap<IProject, IX10PlatformConf>(projects.length);
     for (final IProject curProject : projects) {
       try {
-        if (curProject.isOpen() && curProject.hasNature(LaunchCore.X10_CPP_PRJ_NATURE_ID)) {
+        if (curProject.isOpen() && curProject.hasNature(X10DTCorePlugin.X10_CPP_PRJ_NATURE_ID)) {
           this.fProjectToPlatform.put(curProject, X10PlatformConfFactory.load(curProject));
         }
       } catch (CoreException except) {

Modified: x10dt/trunk/x10dt.ui.launch.cpp/src/x10dt/ui/launch/cpp/actions/CppBackEndProjectConverter.java
===================================================================
--- x10dt/trunk/x10dt.ui.launch.cpp/src/x10dt/ui/launch/cpp/actions/CppBackEndProjectConverter.java	2011-01-31 20:53:04 UTC (rev 19838)
+++ x10dt/trunk/x10dt.ui.launch.cpp/src/x10dt/ui/launch/cpp/actions/CppBackEndProjectConverter.java	2011-01-31 20:53:51 UTC (rev 19839)
@@ -22,7 +22,7 @@
 import org.eclipse.jdt.launching.JavaRuntime;
 import org.eclipse.jface.window.IShellProvider;
 
-import x10dt.ui.launch.core.LaunchCore;
+import x10dt.core.X10DTCorePlugin;
 import x10dt.ui.launch.core.actions.IBackEndX10ProjectConverter;
 import x10dt.ui.launch.core.dialogs.DialogsFactory;
 import x10dt.ui.launch.cpp.CppLaunchCore;
@@ -41,7 +41,7 @@
   // --- Interface methods implementation
   
   public String getProjectNatureId() {
-    return LaunchCore.X10_CPP_PRJ_NATURE_ID;
+    return X10DTCorePlugin.X10_CPP_PRJ_NATURE_ID;
   }
   
   public void postProjectSetup(final IShellProvider shellProvider, final IProject project) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.