# HG changeset patch
# User Vladimir Kvashin <vkvashin@netbeans.org>
# Date 1301293459 -14400
# Node ID 3b0ac6a7720b7013381410318415229a7347e170
# Parent  ca82aebf81613a582b47c8394613234c05d70f5b
partial fix for #197135 - Importing a remote project spoils the original one (makes all paths absolute)

diff -r ca82aebf8161 -r 3b0ac6a7720b cnd.discovery/src/org/netbeans/modules/cnd/discovery/projectimport/ImportProject.java
--- a/cnd.discovery/src/org/netbeans/modules/cnd/discovery/projectimport/ImportProject.java	Mon Mar 28 09:32:17 2011 +0400
+++ b/cnd.discovery/src/org/netbeans/modules/cnd/discovery/projectimport/ImportProject.java	Mon Mar 28 10:24:19 2011 +0400
@@ -183,7 +183,8 @@
         }
         Boolean b = (Boolean) wizard.getProperty(WizardConstants.PROPERTY_FULL_REMOTE);
         fullRemote = (b == null) ? false : b.booleanValue();
-        pathMode = fullRemote ? MakeProjectOptions.PathMode.ABS : MakeProjectOptions.getPathMode();
+        pathMode = MakeProjectOptions.getPathMode();
+        
         if (Boolean.TRUE.equals(wizard.getProperty(WizardConstants.PROPERTY_SIMPLE_MODE))) { // NOI18N
             simpleSetup(wizard);
         } else {
diff -r ca82aebf8161 -r 3b0ac6a7720b cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/api/ProjectSupport.java
--- a/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/api/ProjectSupport.java	Mon Mar 28 09:32:17 2011 +0400
+++ b/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/api/ProjectSupport.java	Mon Mar 28 10:24:19 2011 +0400
@@ -117,17 +117,13 @@
         ap.invokeCustomAction(projectDescriptor, conf, customProjectActionHandler);
     }
 
-    public static MakeProjectOptions.PathMode getPathMode(RemoteProject.Mode remoteMode) {
-        return (remoteMode == RemoteProject.Mode.REMOTE_SOURCES) ? MakeProjectOptions.PathMode.ABS : MakeProjectOptions.getPathMode();
-    }
-
     public static MakeProjectOptions.PathMode getPathMode(Project project) {
-        if (project instanceof MakeProject) {
-            RemoteProject remoteProject = project.getLookup().lookup(RemoteProject.class);
-            if (remoteProject != null && remoteProject.getRemoteMode() == RemoteProject.Mode.REMOTE_SOURCES) {
-                return MakeProjectOptions.PathMode.ABS;
-            }
-        }
+//        if (project instanceof MakeProject) {
+//            RemoteProject remoteProject = project.getLookup().lookup(RemoteProject.class);
+//            if (remoteProject != null && remoteProject.getRemoteMode() == RemoteProject.Mode.REMOTE_SOURCES) {
+//                return MakeProjectOptions.PathMode.ABS;
+//            }
+//        }
         return MakeProjectOptions.getPathMode();
     }