Attachment 53187 Details for Bug 122214

[?]
| New
| Browse
| Search
| Reports
| Help
| Log In

Please use the Apache issue tracking system for new NetBeans issues (https://issues.apache.org/jira/projects/NETBEANS0/issues) !!

Fix diff

issue122214.diff (text/plain), 2.12 KB, created by Tomasz Slota on 2007-11-19 10:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomasz Slota

Created: 2007-11-19 10:11 UTC

Size: 2.12 KB

patch

obsolete

>Index: src/org/netbeans/modules/web/core/syntax/SimplifiedJSPServlet.java
>===================================================================
>RCS file: /cvs/web/jspsyntax/src/org/netbeans/modules/web/core/syntax/SimplifiedJSPServlet.java,v
>retrieving revision 1.35
>diff -u -r1.35 SimplifiedJSPServlet.java
>--- src/org/netbeans/modules/web/core/syntax/SimplifiedJSPServlet.java	11 Nov 2007 11:24:09 -0000	1.35
>+++ src/org/netbeans/modules/web/core/syntax/SimplifiedJSPServlet.java	19 Nov 2007 10:04:29 -0000
>@@ -146,7 +146,11 @@
>         }
>     }
>     
>-    public void process() throws BadLocationException {
>+    public void process() throws BadLocationException{
>+        process(false);
>+    }
>+    
>+    public void process(final boolean processAsIncluded) throws BadLocationException {
>         processCalled = true;
>         
>         if (!isServletAPIOnClasspath()){
>@@ -197,9 +201,12 @@
>                 int newBlockStart = buff.length();
> 
>                 if (blockType == JavaCodeType.EXPRESSION) {
>-                    String exprPrefix = String.format("\t\tObject expr%1$d = ", expressionIndex++); //NOI18N
>-                    newBlockStart += exprPrefix.length();
>-                    buff.append(exprPrefix + blockBody + ";\n");
>+                    // ignore JSP expressions in included files
>+                    if (!processAsIncluded){
>+                        String exprPrefix = String.format("\t\tObject expr%1$d = ", expressionIndex++); //NOI18N
>+                        newBlockStart += exprPrefix.length();
>+                        buff.append(exprPrefix + blockBody + ";\n");
>+                    }
>                 } else {
>                     buff.append(blockBody + "\n");
>                 }
>@@ -262,7 +269,7 @@
> 
>                     if (editor != null) {
>                         SimplifiedJSPServlet simplifiedServlet = new SimplifiedJSPServlet(editor.openDocument());
>-                        simplifiedServlet.process();
>+                        simplifiedServlet.process(true);
> 
>                         declarations.append(simplifiedServlet.declarations);
>                         scriptlets.append(simplifiedServlet.scriptlets);

Actions: View

Attachments on bug 122214: 53162 | 53187