3.0.1 merge

3 files changed, 12 insertions, 3 deletions

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 31052722c5..56ff0f8d85 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
@@ -23,6 +23,8 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.OperationCanceledException;
 import org.eclipse.core.runtime.Path;
+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;
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/JsTranslation.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/JsTranslation.java
index 39acf07e91..8f07dd7692 100644
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/JsTranslation.java
+++ b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/JsTranslation.java
@@ -49,6 +49,7 @@ import org.eclipse.wst.jsdt.core.JavaScriptModelException; // import
 														// org.eclipse.wst.jsdt.core.LibrarySuperType;
 import org.eclipse.wst.jsdt.core.WorkingCopyOwner;
 import org.eclipse.wst.jsdt.internal.core.DocumentContextFragmentRoot;
+import org.eclipse.wst.jsdt.internal.core.Member;
 import org.eclipse.wst.jsdt.internal.core.SourceRefElement;
 import org.eclipse.wst.jsdt.web.core.internal.Logger;
 import org.eclipse.wst.jsdt.web.core.internal.project.JsWebNature;
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/JsTranslator.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/JsTranslator.java
index 5f09a09a70..44a296f12c 100644
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/JsTranslator.java
+++ b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/JsTranslator.java
@@ -73,6 +73,8 @@ public class JsTranslator extends Job implements IJsTranslator{
 	private static final boolean REMOVE_XML_COMMENT = true;
 	private static final String XML_COMMENT_START = "<!--"; //$NON-NLS-1$
 	private static final String XML_COMMENT_END = "-->"; //$NON-NLS-1$
+	private static final boolean REPLACE_INNER_BLOCK_SECTIONS_WITH_SPACE = false;
+	
 	
 	static {
 		String value = Platform.getDebugOption("org.eclipse.wst.jsdt.web.core/debug/jsjavamapping"); //$NON-NLS-1$
@@ -478,16 +480,20 @@ public class JsTranslator extends Job implements IJsTranslator{
 				int regionLength = regionText.length();
 				// /Position inScript = new Position(scriptOffset,
 				// regionLength);
-				Position inHtml = new Position(scriptStart, scriptTextEnd);
-				scriptLocationInHtml.add(inHtml);
+				
+				
 				spaces = Util.getPad(scriptStart - scriptOffset);
 				fScriptText.append(spaces); 	
 				// fJsToHTMLRanges.put(inScript, inHtml);
-				if(isBlockRegion) {
+				if(isBlockRegion && REPLACE_INNER_BLOCK_SECTIONS_WITH_SPACE) {
 					spaces = Util.getPad(regionLength);
 					fScriptText.append(spaces); 	
+				}else if(isBlockRegion){
+					fScriptText.append(regionText);
 				}else {
 					fScriptText.append(regionText);
+					Position inHtml = new Position(scriptStart, scriptTextEnd);
+					scriptLocationInHtml.add(inHtml);
 				}