[275315] js folder appears in ejb client, ejb, web projects ver 5.0
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/project/JsWebNature.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/project/JsWebNature.java index 37fbed9..1478cb6 100644 --- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/project/JsWebNature.java +++ b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/project/JsWebNature.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2009 IBM Corporation and others. + * Copyright (c) 2007, 2008 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -23,14 +23,12 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.OperationCanceledException; import org.eclipse.core.runtime.Path; -import org.eclipse.wst.common.componentcore.ComponentCore; -import org.eclipse.wst.common.componentcore.ModuleCoreNature; -import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; import org.eclipse.wst.jsdt.core.IAccessRule; import org.eclipse.wst.jsdt.core.IIncludePathAttribute; import org.eclipse.wst.jsdt.core.IIncludePathEntry; import org.eclipse.wst.jsdt.core.JavaScriptCore; import org.eclipse.wst.jsdt.core.LibrarySuperType; + import org.eclipse.wst.jsdt.internal.core.JavaProject; //import org.eclipse.wst.jsdt.ui.PreferenceConstants; /** @@ -124,7 +122,6 @@ private IProgressMonitor monitor; public JsWebNature() { - super(); monitor = new NullProgressMonitor(); } @@ -156,11 +153,10 @@ fJavaProject = (JavaProject) JavaScriptCore.create(fCurrProject); fJavaProject.setProject(fCurrProject); try { + // , fOutputLocation if (!hasProjectClassPathFile()) { - // Create include path file fJavaProject.setRawIncludepath((IIncludePathEntry[]) classPathEntries.toArray(new IIncludePathEntry[] {}), fOutputLocation, monitor); }else{ - // Clear include path control file fJavaProject.setRawIncludepath((IIncludePathEntry[]) classPathEntries.toArray(new IIncludePathEntry[] {}), monitor); } } catch (Exception e) { @@ -176,18 +172,8 @@ if (hasAValidSourcePath()) { return; } - - IPath sourceRoot = null; - // default to the deployable root - if (ModuleCoreNature.isFlexibleProject(fCurrProject)) { - IVirtualComponent component = ComponentCore.createComponent(fCurrProject); - if (component != null && component.exists()) { - sourceRoot = component.getRootFolder().getWorkspaceRelativePath(); - } - } - if (sourceRoot == null) - sourceRoot = fCurrProject.getFullPath(); - classPathEntries.add(JavaScriptCore.newSourceEntry(sourceRoot)); + // IPath projectPath = fCurrProject.getFullPath(); + // classPathEntries.add(JavaScriptCore.newSourceEntry(projectPath)); } public void deconfigure() throws CoreException {