Attachment #107321 for bug #197135

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 197135
Collapse All | Expand All

Lines 183-189 Link Here

(-)a/cnd.discovery/src/org/netbeans/modules/cnd/discovery/projectimport/ImportProject.java (-1 / +2 lines)
183	}	183	}
184	Boolean b = (Boolean) wizard.getProperty(WizardConstants.PROPERTY_FULL_REMOTE);	184	Boolean b = (Boolean) wizard.getProperty(WizardConstants.PROPERTY_FULL_REMOTE);
185	fullRemote = (b == null) ? false : b.booleanValue();	185	fullRemote = (b == null) ? false : b.booleanValue();
186	pathMode = fullRemote ? MakeProjectOptions.PathMode.ABS : MakeProjectOptions.getPathMode();	186	pathMode = MakeProjectOptions.getPathMode();
		187
187	if (Boolean.TRUE.equals(wizard.getProperty(WizardConstants.PROPERTY_SIMPLE_MODE))) { // NOI18N	188	if (Boolean.TRUE.equals(wizard.getProperty(WizardConstants.PROPERTY_SIMPLE_MODE))) { // NOI18N
188	simpleSetup(wizard);	189	simpleSetup(wizard);
189	} else {	190	} else {




        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;
//            }
//        }
        return MakeProjectOptions.getPathMode();
    }


Return to bug 197135

Lines 117-133 Link Here

(-)a/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/api/ProjectSupport.java (-10 / +6 lines)
117	ap.invokeCustomAction(projectDescriptor, conf, customProjectActionHandler);	117	ap.invokeCustomAction(projectDescriptor, conf, customProjectActionHandler);
118	}	118	}
119		119
120	public static MakeProjectOptions.PathMode getPathMode(RemoteProject.Mode remoteMode) {
121	return (remoteMode == RemoteProject.Mode.REMOTE_SOURCES) ? MakeProjectOptions.PathMode.ABS : MakeProjectOptions.getPathMode();
122	}
123
124	public static MakeProjectOptions.PathMode getPathMode(Project project) {	120	public static MakeProjectOptions.PathMode getPathMode(Project project) {
125	if (project instanceof MakeProject) {	121	// if (project instanceof MakeProject) {
126	RemoteProject remoteProject = project.getLookup().lookup(RemoteProject.class);	122	// RemoteProject remoteProject = project.getLookup().lookup(RemoteProject.class);
127	if (remoteProject != null && remoteProject.getRemoteMode() == RemoteProject.Mode.REMOTE_SOURCES) {	123	// if (remoteProject != null && remoteProject.getRemoteMode() == RemoteProject.Mode.REMOTE_SOURCES) {
128	return MakeProjectOptions.PathMode.ABS;	124	// return MakeProjectOptions.PathMode.ABS;
129	}	125	// }
130	}	126	// }
131	return MakeProjectOptions.getPathMode();	127	return MakeProjectOptions.getPathMode();
132	}	128	}
133		129