Attachment #162361 for bug #268342

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 268342
Collapse All | Expand All

Lines 1-6 Link Here

(-)a/collab.channel.chat.xml/manifest.mf (-1 / +1 lines)
1	Manifest-Version: 1.0	1	Manifest-Version: 1.0
2	OpenIDE-Module: org.netbeans.modules.collab.channel.chat.xml/1	2	OpenIDE-Module: org.netbeans.modules.collab.channel.chat.xml/1
3	OpenIDE-Module-Specification-Version: 1.3	3	OpenIDE-Module-Specification-Version: 1.4
4	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/collab/channel/chat/xml/Bundle.properties	4	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/collab/channel/chat/xml/Bundle.properties
5	OpenIDE-Module-Layer: org/netbeans/modules/collab/channel/chat/xml/layer.xml	5	OpenIDE-Module-Layer: org/netbeans/modules/collab/channel/chat/xml/layer.xml
6	AutoUpdate-Show-In-Client: false	6	AutoUpdate-Show-In-Client: false

Lines 63-69 Link Here

(-)a/collab.channel.chat.xml/nbproject/project.xml (-1 / +1 lines)
63	<code-name-base>org.netbeans.modules.xml.text</code-name-base>	63	<code-name-base>org.netbeans.modules.xml.text</code-name-base>
64	<run-dependency>	64	<run-dependency>
65	<release-version>2</release-version>	65	<release-version>2</release-version>
66	<specification-version>1.16</specification-version>	66	<specification-version>1.60</specification-version>
67	</run-dependency>	67	</run-dependency>
68	</dependency>	68	</dependency>
69	</module-dependencies>	69	</module-dependencies>

Lines 638-644 Link Here

(-)a/editor.completion/src/org/netbeans/modules/editor/completion/CompletionImpl.java (-1 / +4 lines)
638	public void run() {	638	public void run() {
639	List<TokenSequence<?>> seqs = TokenHierarchy.get(doc).embeddedTokenSequences(offset, true);	639	List<TokenSequence<?>> seqs = TokenHierarchy.get(doc).embeddedTokenSequences(offset, true);
640	TokenSequence<?> seq;	640	TokenSequence<?> seq;
641		641	if (seqs.size() == 1) {
		642	// get the mime path from the document/kit
		643	return;
		644	}
642	if (seqs.isEmpty()) {	645	if (seqs.isEmpty()) {
643	seq = TokenHierarchy.get(doc).tokenSequence();	646	seq = TokenHierarchy.get(doc).tokenSequence();
644	} else {	647	} else {

Lines 2-6 Link Here

(-)a/editor.kit/manifest.mf (-1 / +1 lines)
2	AutoUpdate-Show-In-Client: false	2	AutoUpdate-Show-In-Client: false
3	OpenIDE-Module: org.netbeans.modules.editor.kit	3	OpenIDE-Module: org.netbeans.modules.editor.kit
4	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/editor/kit/Bundle.properties	4	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/editor/kit/Bundle.properties
5	OpenIDE-Module-Specification-Version: 1.33	5	OpenIDE-Module-Specification-Version: 1.34
6		6

Lines 155-161 Link Here

(-)a/editor.kit/nbproject/project.xml (-1 / +1 lines)
155	<code-name-base>org.netbeans.modules.xml.text</code-name-base>	155	<code-name-base>org.netbeans.modules.xml.text</code-name-base>
156	<run-dependency>	156	<run-dependency>
157	<release-version>2</release-version>	157	<release-version>2</release-version>
158	<specification-version>1.16</specification-version>	158	<specification-version>1.60</specification-version>
159	</run-dependency>	159	</run-dependency>
160	</dependency>	160	</dependency>
161	<dependency>	161	<dependency>

Lines 176-181 Link Here

(-)a/editor.structure/nbproject/project.xml (+1 lines)
176	<friend-packages>	176	<friend-packages>
177	<friend>org.netbeans.modules.mobility.svgcore</friend>	177	<friend>org.netbeans.modules.mobility.svgcore</friend>
178	<friend>org.netbeans.modules.xml.text</friend>	178	<friend>org.netbeans.modules.xml.text</friend>
		179	<friend>org.netbeans.modules.xml.text.obsolete90</friend>
179	<package>org.netbeans.modules.editor.structure.api</package>	180	<package>org.netbeans.modules.editor.structure.api</package>
180	<package>org.netbeans.modules.editor.structure.formatting</package>	181	<package>org.netbeans.modules.editor.structure.formatting</package>
181	<package>org.netbeans.modules.editor.structure.spi</package>	182	<package>org.netbeans.modules.editor.structure.spi</package>

Lines 40-50 Link Here

(-)a/hibernate/nbproject/project.properties (-2 / +2 lines)
40		40
41	build.compiler.deprecation=false	41	build.compiler.deprecation=false
42	javac.compilerargs=-Xlint -Xlint:-serial	42	javac.compilerargs=-Xlint -Xlint:-serial
43	javac.source=1.7	43	javac.source=1.8
44		44
45	hibernate.test.dir=${nb_all}/contrib/hibernate/test	45	hibernate.test.dir=${nb_all}/contrib/hibernate/test
46		46
47	spec.version.base=1.34.0	47	spec.version.base=1.35.0
48		48
49	test.unit.cp.extra=\	49	test.unit.cp.extra=\
50	${nb_all}/libs.junit4/external/junit-4.12.jar:\	50	${nb_all}/libs.junit4/external/junit-4.12.jar:\




                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.editor.document</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>1.0</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.editor.lib</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>

                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.editor.document</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>1.0</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.hibernate4lib</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>

                        <release-version>1</release-version>
                        <specification-version>1.62</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.java.source.base</code-name-base>
                    <build-prerequisite/>

                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.lexer</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>2</release-version>
                        <specification-version>1.64</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.parsing.api</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>

                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.xml.lexer</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>1.30</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.xml.multiview</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>

                    <compile-dependency/>
                    <run-dependency>
                        <release-version>2</release-version>
                        <specification-version>1.60</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>

                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.util.ui</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>9.3</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.util</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>

                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.util.ui</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>9.3</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.windows</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>




import org.netbeans.modules.hibernate.editor.EditorContextFactory;
import org.netbeans.modules.hibernate.editor.DocumentContext;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.swing.text.BadLocationException;
import javax.swing.text.Document;
import org.netbeans.api.lexer.Token;
import org.netbeans.api.lexer.TokenSequence;
import org.netbeans.api.xml.lexer.XMLTokenId;
import org.netbeans.modules.xml.text.api.dom.SyntaxElement;
import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
import org.openide.util.Exceptions;
import org.netbeans.modules.xml.text.syntax.dom.EndTag;
import org.netbeans.modules.xml.text.syntax.dom.StartTag;
import org.netbeans.modules.xml.text.syntax.dom.Tag;
import org.w3c.dom.Node;
import org.w3c.dom.Text;


 * @author Rohan Ranade (Rohan.Ranade@Sun.COM)
 */
public class CompletionContext {
    private List<String> existingAttributes = Collections.emptyList();

    public static enum CompletionType {
        TAG,

        this.caretOffset = caretOffset;

        try {
            this.support = XMLSyntaxSupport.getSyntaxSupport(doc);
        } catch (ClassCastException cce) {
            LOGGER.log(Level.FINE, cce.getMessage());
            this.support = XMLSyntaxSupport.createSyntaxSupport(doc);
        }
        this.documentContext = EditorContextFactory.getDocumentContext(doc, caretOffset);
        this.lastTypedChar = support.lastTypedChar();
        try {
            initContext();
        } catch (BadLocationException ex) {
            // ignore
        }
    }
    
    private void initContext() throws BadLocationException {
        Token<XMLTokenId> token = documentContext.getCurrentToken();
        if(token == null)
            return;
        
        boolean tokenBoundary = (documentContext.getCurrentTokenOffset() == caretOffset) 
                || ((documentContext.getCurrentTokenOffset() + token.length()) == caretOffset);
        
        XMLTokenId id = token.id();
        SyntaxElement element = documentContext.getCurrentElement();
        String chars = token.text().toString().trim();
        int tOffset = documentContext.getCurrentTokenOffset();
        switch (id) {
            //user enters < character
            case TEXT:
                Token<XMLTokenId> previousTokenItem = support.getPreviousToken(tOffset);
                if (previousTokenItem == null) {
                    completionType = CompletionType.NONE;
                    break;
                }
                String text = previousTokenItem.text().toString().trim();
                if (chars != null && chars.equals("") &&
                        text.equals("/>")) { // NOI18N
                    completionType = CompletionType.NONE;
                    break;
                }
                if (chars != null && chars.equals("") &&
                        text.equals(">")) { // NOI18N
                    completionType = CompletionType.VALUE;
                    break;
                }
                if (chars != null && !chars.startsWith("<") &&
                        text.equals(">")) { // NOI18N

                    completionType = CompletionType.VALUE;
                    typedChars = "";
                    break;
                }
                if (chars != null && !chars.equals("<") &&
                        text.equals(">")) { // NOI18N
                    completionType = CompletionType.NONE;
                    break;
                }

                break;

            //start tag of an element
            case TAG:
                String tagName = element.getNode().getNodeName();
                if (support.isEndTag(element)) {
                    completionType = CompletionType.NONE;
                    break;
                }
                if (support.isEmptyTag(element)) {
                    if (token != null &&
                            chars.equals("/>")) {
                        completionType = CompletionType.NONE;
                        break;
                    }
                    EmptyTag tag = (EmptyTag) element;
                    if (element.getElementOffset() + 1 == this.caretOffset) {
                        completionType = CompletionType.TAG;
                        break;
                    }
                    if (caretOffset > element.getElementOffset() + 1 &&
                            caretOffset <= element.getElementOffset() + 1 +tagName.length()) {
                        completionType = CompletionType.TAG;
                        typedChars = tagName;
                        break;
                    }
                    completionType = CompletionType.ATTRIBUTE;
                    break;
                }

                if (support.isStartTag(element)) {
                    if (token != null &&
                            chars.equals(">")) {
                        completionType = CompletionType.NONE;
                        break;
                    }
                    if (token != null &&
                            chars.startsWith("</")) {
                        typedChars = "";
                        completionType = CompletionType.VALUE;
                        break;
                    }
                    if (element.getElementOffset() + 1 != this.caretOffset) {
                        typedChars = tagName;
                        typedChars = tag.getTagName();
                    }
                }
                
                if (element instanceof Text) {
                    if (token != null &&
                            chars.startsWith("</")) {
                        Token<XMLTokenId> previous = support.getPreviousToken(tOffset);
                        typedChars = previous.text().toString().trim();
                        completionType = CompletionType.VALUE;
                        break;
                    }

                break;

            //user enters an attribute name
            case ARGUMENT:
                completionType = CompletionType.ATTRIBUTE;
                typedChars = chars.substring(0, caretOffset - tOffset);
                break;

            //some random character
            case CHARACTER:
            //user enters = character, we should ignore all other operators
            case OPERATOR:
                completionType = CompletionType.NONE;
                break;
            //user enters either ' or "
            case VALUE:
                if(!tokenBoundary) {
                    completionType = CompletionType.ATTRIBUTE_VALUE;
                    typedChars = chars.substring(1, caretOffset - tOffset);
                } else {
                    completionType = CompletionType.NONE;
                }
                break;

            //user enters white-space character
            case WS:
                completionType = CompletionType.NONE;
                Token<XMLTokenId> prev = support.skip(tOffset, false, XMLTokenId.WS);
                if (prev == null) {
                    completionType = CompletionType.NONE;
                    break;
                }
                if(prev.id() == XMLTokenId.ARGUMENT) {
                    typedChars = prev.text().toString();
                    typedChars = prev.getImage();
                    completionType = CompletionType.ATTRIBUTE;
                } else if ((prev.id() == XMLTokenId.VALUE) ||
                        (prev.id() == XMLTokenId.TAG)) {
                    completionType = CompletionType.ATTRIBUTE;
                }
                break;

    
    public Node getTag() {
        SyntaxElement element = documentContext.getCurrentElement();
        return element.getType() == Node.ELEMENT_NODE ? element.getNode() : null;
    }
    
    public Token<XMLTokenId> getCurrentToken() {
        return documentContext.getCurrentToken();
    }
    
    public int getCurrentTokenOffset() {
        return documentContext.getCurrentTokenOffset();
    }
    
    private List<String> getExistingAttributesLocked(TokenSequence ts) {
        List<String> existingAttributes = new ArrayList<String>();
        while (ts.movePrevious()) {
            Token<XMLTokenId> item = ts.token();
            XMLTokenId tokenId = item.id();
            if (tokenId == XMLTokenId.TAG) {
                break;
            if(item.getTokenID().getNumericID() ==
                    XMLDefaultTokenContext.ARGUMENT_ID) {
                existingAttributes.add(item.getImage());
            }
            if (tokenId == XMLTokenId.ARGUMENT) {
                existingAttributes.add(item.text().toString());
            }
        }
        return existingAttributes;
    }

    public List<String> getExistingAttributes() {
        if (existingAttributes == null) {
            try {
                existingAttributes = (List<String>)support.runWithSequence(
                        documentContext.getCurrentTokenOffset(),
                        this::getExistingAttributesLocked
                );
            } catch (BadLocationException ex) {
                Exceptions.printStackTrace(ex);
            }
        }
        return existingAttributes;
    }

}




                }
            }

            setAnchorOffset(context.getCurrentTokenOffset() + 1);
            return results;
        }
    }

                }
            }

            setAnchorOffset(context.getCurrentTokenOffset() + 1);
            return results;
        }
    }

                }

                if (typedChars.contains(".") || typedChars.equals("")) { // Switch to normal completion
                    doNormalJavaCompletion(js, results, typedChars, context.getCurrentTokenOffset() + 1);
                } else { // Switch to smart class path completion
                    doSmartJavaCompletion(js, results, typedChars, context.getCurrentTokenOffset() + 1);
                }
            } catch (IOException ex) {
                Exceptions.printStackTrace(ex);

                Exceptions.printStackTrace(ex);
            }

            setAnchorOffset(context.getCurrentTokenOffset() + 1);

            return results;
        }

                }
            }

            setAnchorOffset(context.getCurrentTokenOffset() + 1);

            return results;
        }

                    results.add(item);
                }
            }
            setAnchorOffset(context.getCurrentTokenOffset() + 1);

            return results;
        }

                }
            }

            setAnchorOffset(context.getCurrentTokenOffset() + 1);
            return results;
        }
    }

                }
            }

            setAnchorOffset(context.getCurrentTokenOffset() + 1);
            return results;
        }
        




import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.swing.text.BadLocationException;
import org.hibernate.cfg.Environment;
import org.netbeans.api.lexer.Token;
import org.netbeans.api.lexer.TokenSequence;
import org.netbeans.api.xml.lexer.XMLTokenId;
import org.netbeans.modules.hibernate.cfg.HibernateCfgProperties;
import org.netbeans.modules.hibernate.cfg.HibernateCfgXmlConstants;
import org.netbeans.modules.xml.text.api.dom.SyntaxElement;
import org.netbeans.modules.xml.text.api.dom.TagElement;
import org.netbeans.modules.xml.text.syntax.dom.Tag;
import org.openide.util.NbBundle;
import org.w3c.dom.Node;

/**
 * This class figures out the completion items for various attributes

            return anchorOffset;
        
        String tagName = context.getTag().getNodeName();
        Token<XMLTokenId> attrib = ContextUtilities.getAttributeToken(context.getDocumentContext());
        String attribName = attrib != null ? attrib.text().toString(): null;

        Completor completor = locateCompletor(tagName, attribName);
        if (completor != null) {

        DocumentContext docContext = context.getDocumentContext();
        SyntaxElement curElem = docContext.getCurrentElement();
        SyntaxElement prevElem = docContext.getCurrentElement().getPrevious();
        TagElement propTag = null;

        // If current element is a start tag and its tag is <property>
        // or the current element is text and its prev is a start <property> tag,
        // then do the code completion
        if (curElem.getType() == Node.ELEMENT_NODE &&
            ((TagElement)curElem).isStart() && HibernateCfgXmlConstants.PROPERTY_TAG.equalsIgnoreCase(curElem.getNode().getNodeName())) {
            propTag = (TagElement) curElem;
        } else if (curElem.getType() == Node.TEXT_NODE && 
                (prevElem.getType() == Node.ELEMENT_NODE && ((TagElement)prevElem).isStart() &&
                HibernateCfgXmlConstants.PROPERTY_TAG.equalsIgnoreCase(prevElem.getNode().getNodeName()))) {
            propTag = (TagElement) prevElem;
        } else {
            return anchorOffset;
        }
        
        String propName = HibernateEditorUtil.getHbPropertyName(propTag.getNode());
        int caretOffset = context.getCaretOffset();
        String typedChars = context.getTypedPrefix();
        

                    valueItems.add(item);
                }
            }
            try {
                anchorOffset = context.getDocumentContext().
                        runWithSequence((TokenSequence s) -> {
                            if (!s.movePrevious()) {
                                return -1;
                            }
                            return s.offset();
                        });
            } catch (BadLocationException ex) {
                anchorOffset = -1;
            }
        }
        
        return anchorOffset;




import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.netbeans.api.lexer.Token;
import org.netbeans.api.xml.lexer.XMLTokenId;
import org.netbeans.modules.hibernate.mapping.HibernateMappingXmlConstants;
import org.netbeans.spi.editor.completion.CompletionResultSet;
import org.openide.util.NbBundle;

/**

            return anchorOffset;
        
        String tagName = context.getTag().getNodeName();
        Token<XMLTokenId> attrib = ContextUtilities.getAttributeToken(context.getDocumentContext());
        String attribName = attrib != null ? attrib.text().toString(): null;

        Completor completor = locateCompletor(tagName, attribName);
        if (completor != null) {




import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.netbeans.api.lexer.Token;
import org.netbeans.api.xml.lexer.XMLTokenId;
import org.netbeans.modules.hibernate.reveng.HibernateRevengXmlConstants;
import org.openide.util.NbBundle;


            return anchorOffset;
        
        String tagName = context.getTag().getNodeName();
        Token<XMLTokenId> attrib = ContextUtilities.getAttributeToken(context.getDocumentContext());
        String attribName = attrib != null ? attrib.text().toString(): null;

        Completor completor = locateCompletor(tagName, attribName);
        if (completor != null) {





package org.netbeans.modules.hibernate.editor;

import javax.swing.text.BadLocationException;
import javax.xml.XMLConstants;
import org.netbeans.api.lexer.Token;
import org.netbeans.api.lexer.TokenSequence;
import org.netbeans.api.xml.lexer.XMLTokenId;

import static org.netbeans.api.xml.lexer.XMLTokenId.*;
import org.netbeans.modules.xml.text.api.dom.SyntaxElement;
import org.netbeans.modules.xml.text.api.dom.TagElement;
import org.w3c.dom.Node;

/**
 *

    private ContextUtilities() {
    }
    
    public static boolean isValueToken(Token<XMLTokenId> currentToken) {
        if(currentToken != null) {
            if (currentToken.id() == VALUE) {
                return true;
            }
        }

        return false;
    }
    
    public static boolean isTagToken(Token<XMLTokenId> currentToken) {
        if(currentToken != null) {
            if (currentToken.id() == TAG) {
                return true;
            }
        }

        return false;
    }
    
    public static boolean isAttributeToken(Token<XMLTokenId> currentToken) {
        if(currentToken != null) {
            if (currentToken.id() == ARGUMENT) {
                return true;
            }
        }

        return false;
    }
    
    public static Token<XMLTokenId> getAttributeToken(DocumentContext context) {
        if(currentToken == null )
            return null;
        
        if(isValueToken(currentToken)) {
            TokenItem equalsToken = currentToken.getPrevious();
            if(equalsToken == null)
                return null;
            
            while(equalsToken != null && equalsToken.getTokenID().getNumericID() != XMLDefaultTokenContext.OPERATOR_ID) {
                equalsToken = equalsToken.getPrevious();
            }
            
            if(equalsToken == null) {
                return null;
            }
        
            TokenItem argumentToken = equalsToken.getPrevious();
            if(argumentToken == null)
                return null;
            
            while(argumentToken != null && argumentToken.getTokenID().getNumericID() != XMLDefaultTokenContext.ARGUMENT_ID) {
                argumentToken = argumentToken.getPrevious();
            }
        
            return argumentToken;
        }
        
        return null;
    }
  
    public static Tag getCurrentTagElement(DocumentContext context) {
        SyntaxElement element = context.getCurrentElement();
        if(element instanceof StartTag) {
            return (StartTag) element;
        } else if(element instanceof EmptyTag) {
            return (EmptyTag) element;
        }
        
        return null;
    }
    
    public static TokenItem getAttributeToken(DocumentContext context) {
        if(context.getCurrentToken() == null )
            return null;
        try {
            return context.<Token<XMLTokenId>>runWithSequence((TokenSequence ts) -> {
                if(!isValueToken(context.getCurrentToken())) {
                    return null;
                }
                Token<XMLTokenId> equalsToken = null;
                while (ts.movePrevious()) {
                    Token<XMLTokenId> t = ts.token();
                    if (t.id() == OPERATOR) {
                        equalsToken = t;
                        break;
                    }
                }
                if(equalsToken == null) {
                    return null;
                }
                Token<XMLTokenId> argumentToken = null;
                while (ts.movePrevious()) {
                    Token<XMLTokenId> t = ts.token();
                    if (t.id() == ARGUMENT) {
                        argumentToken = t;
                        break;
                    }
                }
                return argumentToken;
            });
        } catch (BadLocationException ex) {
            return argumentToken;
        }
        
        return null;
    }
    
    public static String getAttributeTokenImage(DocumentContext context) {
        Token<XMLTokenId> tok = getAttributeToken(context);
        if(tok != null) {
            return tok.text().toString();
        }
        
        return null;

        return nodeName.substring(0, colonIndex);
    }
    
    public static SyntaxElement getRoot(SyntaxElement se) {
        SyntaxElement root = null;
        while( se != null) {
            if(se.getType() == Node.ELEMENT_NODE &&
               ((TagElement)se).isStart()) {
                root = se;
            }
            se = se.getPrevious();
        }





package org.netbeans.modules.hibernate.editor;

import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map.Entry;
import java.util.Stack;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.swing.text.BadLocationException;
import javax.swing.text.Document;
import org.netbeans.api.lexer.Token;
import org.netbeans.api.xml.lexer.XMLTokenId;
import org.netbeans.modules.xml.text.api.dom.SyntaxElement;
import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
import org.netbeans.modules.xml.text.syntax.dom.EmptyTag;
import org.netbeans.modules.xml.text.syntax.dom.EndTag;
import org.netbeans.modules.xml.text.syntax.dom.StartTag;
import org.netbeans.modules.xml.text.syntax.dom.Tag;
import org.w3c.dom.Attr;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;

    private XMLSyntaxSupport syntaxSupport;
    private int caretOffset = -1;
    private SyntaxElement element;
    private Token<XMLTokenId> token;
    private int tokenOffset;
    private boolean valid = false;
    private SyntaxElement docRoot;
    private String defaultNamespace;
    private HashMap<String, String> declaredNamespaces =
            new HashMap<String, String>();

    DocumentContext(Document document) {
        this.document = document;
        try {
            this.syntaxSupport = XMLSyntaxSupport.getSyntaxSupport(document);
        } catch (ClassCastException cce) {
            LOGGER.log(Level.FINE, cce.getMessage());
            this.syntaxSupport = XMLSyntaxSupport.createSyntaxSupport(document);
        }
    }


    }

    private void initialize() {
        valid = true;
        declaredNamespaces.clear();
        if (syntaxSupport == null) {
            valid = false;
            return;
        }
        try {
            element = syntaxSupport.getElementChain(caretOffset);
            int[] off = new int[2];
            token = syntaxSupport.getTokenAtPosition(caretOffset, off);
            tokenOffset = off[0];
            this.docRoot = ContextUtilities.getRoot(element);
            populateNamespaces();
            valid = true;
        } catch (BadLocationException ex) {
            // No context support available in this case
            valid = false;

        return this.valid;
    }

    /*
    public int getCurrentTokenId() {
        if (isValid()) {
            return token.getTokenID().getNumericID();

            return -1;
        }
    }
    */

    public Token<XMLTokenId> getCurrentToken() {
        if (isValid()) {
            return token;
        } else {


    public String getCurrentTokenImage() {
        if (isValid()) {
            return token.text().toString();
        } else {
            return null;
        }
    }
    
    public int getCurrentTokenOffset() {
        return tokenOffset;
    }

    public SyntaxElement getCurrentElement() {
        return this.element;
    }
    
    public List<String> getPathFromRoot() {
        if (isValid()) {
            SyntaxElement elementRef = this.element;
            Stack<SyntaxElement> stack = new Stack<SyntaxElement>();

            while (elementRef != null) {
                if ((elementRef instanceof EndTag) ||
                        (elementRef instanceof EmptyTag && stack.isEmpty()) ||
                        (elementRef instanceof StartTag && stack.isEmpty())) {
                    stack.push(elementRef);
                    elementRef = elementRef.getPrevious();
                    continue;
                }
                if (elementRef instanceof StartTag) {
                    StartTag start = (StartTag) elementRef;
                    if (stack.peek() instanceof EndTag) {
                        EndTag end = (EndTag) stack.peek();
                        if (end.getTagName().equals(start.getTagName())) {
                            stack.pop();
                        }
                    } else {
                        SyntaxElement e = (SyntaxElement) stack.peek();
                        String tagAtTop = (e instanceof StartTag) ? ((StartTag) e).getTagName() : ((EmptyTag) e).getTagName();
                        stack.push(elementRef);
                    }
                }
                elementRef = elementRef.getPrevious();
            }

            return createPath(stack);
        }

        return Collections.emptyList();
    }

    private List<String> createPath(Stack<SyntaxElement> stack) {
        ArrayList<String> pathList = new ArrayList<String>();
        while (!stack.isEmpty()) {
            SyntaxElement top = stack.pop();
            String tagName = (top instanceof StartTag) ? ((StartTag) top).getTagName() : ((EmptyTag) top).getTagName();
            if (tagName != null) {
                pathList.add(tagName);
            }
        }

        return Collections.unmodifiableList(pathList);
    }

    public Document getDocument() {
        return this.document;
    }

        return declaredNamespaces.values();
    }

    public SyntaxElement getDocRoot() {
        return docRoot;
    }


    private void populateNamespaces() {
        // Find the a start or empty tag just before the current syntax element.
        SyntaxElement element = this.element;
        while (element != null && !syntaxSupport.isStartTag(element) && !syntaxSupport.isEmptyTag(element)) {
            element = element.getPrevious();
        }
        if (element == null) {

        // To find all namespace declarations active at the caret offset, we
        // need to look at xmlns attributes of the current element and its ancestors.
        Node node = (Node)element;
        while (node != null && element != null) {
            if (syntaxSupport.isStartTag(element) || syntaxSupport.isEmptyTag(element)) {
                NamedNodeMap attributes = node.getAttributes();
                for (int index = 0; index < attributes.getLength(); index++) {
                    Attr attr = (Attr) attributes.item(index);
                    String attrName = attr.getName();

                }
            }
            node = node.getParentNode();
            element = syntaxSupport.getSyntaxElement(node);
        }
    }
    

        hash = 61 * hash + (this.document != null ? this.document.hashCode() : 0);
        return hash;
    }
    
    public <T> T runWithSequence(XMLSyntaxSupport.SequenceCallable<T> callable) throws BadLocationException {
        return syntaxSupport.runWithSequence(caretOffset, callable);
    }
}




import org.netbeans.editor.BaseDocument;
import org.netbeans.lib.editor.hyperlink.spi.HyperlinkProvider;
import org.netbeans.modules.hibernate.cfg.HibernateCfgXmlConstants;
import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;

/**
 * Provides hyperlinking functionality for HibernateConfiguration files

    }
    
    public boolean isHyperlinkPoint(Document document, int offset) {
        if (XMLSyntaxSupport.getSyntaxSupport(document) == null) {
            return false;
        }

        BaseDocument doc = (BaseDocument) document;
        if (!(doc.getSyntaxSupport() instanceof XMLSyntaxSupport)) {
            return false;
        }





import org.netbeans.editor.BaseDocument;
import org.netbeans.lib.editor.hyperlink.spi.HyperlinkProvider;
import org.netbeans.modules.hibernate.mapping.HibernateMappingXmlConstants;
import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;

/**
 * Provides hyperlinking functionality for Hibernate mapping files

    }
    
    public boolean isHyperlinkPoint(Document document, int offset) {
        if (XMLSyntaxSupport.getSyntaxSupport(document) == null) {
            return false;
        }

        BaseDocument doc = (BaseDocument) document;
        if (!(doc.getSyntaxSupport() instanceof XMLSyntaxSupport)) {
            return false;
        }





package org.netbeans.modules.hibernate.hyperlink;

import javax.swing.text.Document;
import org.netbeans.api.lexer.Token;
import org.netbeans.api.xml.lexer.XMLTokenId;
import org.netbeans.modules.editor.NbEditorUtilities;
import org.netbeans.modules.hibernate.editor.ContextUtilities;
import org.netbeans.modules.hibernate.editor.DocumentContext;
import org.netbeans.modules.hibernate.editor.EditorContextFactory;
import org.netbeans.modules.xml.text.api.dom.SyntaxElement;
import org.netbeans.modules.xml.text.syntax.dom.Tag;
import org.openide.filesystems.FileObject;
import org.w3c.dom.Node;

/**
 *

    private String attribName;
    private String valueString;
    private int offset;
    private Token<XMLTokenId> token;
    private DocumentContext documentContext;

    public static enum Type {

                currentTag = documentContext.getCurrentElement();
                attribName = ContextUtilities.getAttributeTokenImage(documentContext);
                token = documentContext.getCurrentToken();
                valueString = token.text().toString();
                valueString = valueString.substring(1, valueString.length() - 1); // Strip quotes
            } else if (ContextUtilities.isAttributeToken(documentContext.getCurrentToken())) {
                type = Type.ATTRIB;
                currentTag = documentContext.getCurrentElement();
                token = documentContext.getCurrentToken();
                attribName = token.text().toString();
            }
        }
    }

        return attribName;
    }

    public SyntaxElement getCurrentTag() {
        if (currentTag.getType() == Node.ELEMENT_NODE) {
            return currentTag;
        } else {
            return null;
        }
    }

    public Document getDocument() {

    }

    public String getTagName() {
        return getCurrentTag() != null ? getCurrentTag().getNode().getNodeName(): null;
    }

    public String getValueString() {

        return type;
    }

    public Token<XMLTokenId> getToken() {
        return token;
    }
    
    public int getTokenOffset() {
        return documentContext.getCurrentTokenOffset();
    }

    public int getOffset() {
        return offset;

Lines 44-50 Link Here

(-)a/hibernate/src/org/netbeans/modules/hibernate/hyperlink/HyperlinkProcessor.java (-3 / +4 lines)
44		44
45	package org.netbeans.modules.hibernate.hyperlink;	45	package org.netbeans.modules.hibernate.hyperlink;
46		46
47	import org.netbeans.editor.TokenItem;	47	import org.netbeans.api.lexer.Token;
		48	import org.netbeans.api.xml.lexer.XMLTokenId;
48		49
49	/**	50	/**
50	*	51	*
Lines 54-60 Link Here
54	public abstract void process(HyperlinkEnv env);	55	public abstract void process(HyperlinkEnv env);
55		56
56	public int[] getSpan(HyperlinkEnv env) {	57	public int[] getSpan(HyperlinkEnv env) {
57	TokenItem item = env.getToken();	58	Token<XMLTokenId> item = env.getToken();
58	return new int[] { item.getOffset() + 1, item.getOffset() + item.getImage().length() - 1 };	59	return new int[] { env.getTokenOffset() + 1, env.getTokenOffset() + item.text().length() - 1 };
59	}	60	}
60	}	61	}

Lines 45-50 Link Here

(-)a/hibernate/src/org/netbeans/modules/hibernate/hyperlink/JavaClassHyperlinkProcessor.java (-1 / +4 lines)
45		45
46	import org.netbeans.modules.hibernate.editor.HibernateEditorUtil;	46	import org.netbeans.modules.hibernate.editor.HibernateEditorUtil;
47	import org.netbeans.modules.hibernate.mapping.HibernateMappingXmlConstants;	47	import org.netbeans.modules.hibernate.mapping.HibernateMappingXmlConstants;
		48	import org.w3c.dom.Node;
48		49
49	/**	50	/**
50	*	51	*
Lines 58-64 Link Here
58	@Override	59	@Override
59	public void process(HyperlinkEnv env) {	60	public void process(HyperlinkEnv env) {
60	String className = env.getValueString();	61	String className = env.getValueString();
61	String pack = env.getDocumentContext().getDocRoot().getAttribute(HibernateMappingXmlConstants.PACKAGE_ATTRIB);//NOI18N	62	Node n = env.getDocumentContext().getDocRoot().getNode().getAttributes().
		63	getNamedItem(HibernateMappingXmlConstants.PACKAGE_ATTRIB);//NOI18N
		64	String pack = n == null ? null : n.getNodeValue();
62	if(pack!=null && pack.length()>0){	65	if(pack!=null && pack.length()>0){
63	if(!className.contains(".")){	66	if(!className.contains(".")){
64	className = pack + "." +className;	67	className = pack + "." +className;

Lines 55-60 Link Here

(-)a/hibernate/src/org/netbeans/modules/hibernate/hyperlink/PropertyHyperlinkProcessor.java (-2 / +5 lines)
55	import org.netbeans.modules.hibernate.editor.HibernateEditorUtil;	55	import org.netbeans.modules.hibernate.editor.HibernateEditorUtil;
56	import org.netbeans.modules.hibernate.mapping.HibernateMappingXmlConstants;	56	import org.netbeans.modules.hibernate.mapping.HibernateMappingXmlConstants;
57	import org.openide.util.Exceptions;	57	import org.openide.util.Exceptions;
		58	import org.w3c.dom.Node;
58		59
59	/**	60	/**
60	*	61	*
Lines 68-78 Link Here
68	@Override	69	@Override
69	public void process(HyperlinkEnv env) {	70	public void process(HyperlinkEnv env) {
70	try {	71	try {
71	String className0 = HibernateEditorUtil.getClassName(env.getCurrentTag());	72	String className0 = HibernateEditorUtil.getClassName(env.getCurrentTag().getNode());
72	if (className0 == null) {	73	if (className0 == null) {
73	return;	74	return;
74	}	75	}
75	String pack = env.getDocumentContext().getDocRoot().getAttribute(HibernateMappingXmlConstants.PACKAGE_ATTRIB);//NOI18N	76	Node n = env.getDocumentContext().getDocRoot().getNode().getAttributes().
		77	getNamedItem(HibernateMappingXmlConstants.PACKAGE_ATTRIB);//NOI18N
		78	String pack = n == null ? null : n.getNodeValue();
76	if(pack!=null && pack.length()>0){	79	if(pack!=null && pack.length()>0){
77	if(!className0.contains(".")){	80	if(!className0.contains(".")){
78	className0 = pack + "." +className0;	81	className0 = pack + "." +className0;




import javax.lang.model.element.PackageElement;
import javax.lang.model.element.TypeElement;
import javax.swing.text.BadLocationException;
import javax.swing.text.Document;
import javax.swing.text.Position.Bias;
import org.netbeans.api.java.classpath.ClassPath;
import org.netbeans.api.java.source.CompilationController;

import org.netbeans.api.java.source.JavaSource.Phase;
import org.netbeans.api.java.source.Task;
import org.netbeans.api.java.source.TreePathHandle;
import org.netbeans.api.lexer.Token;
import org.netbeans.api.lexer.TokenSequence;
import org.netbeans.api.project.Project;
import org.netbeans.api.xml.lexer.XMLTokenId;
import org.netbeans.editor.BaseDocument;
import org.netbeans.editor.TokenID;
import org.netbeans.editor.TokenItem;
import org.netbeans.modules.hibernate.cfg.HibernateCfgXmlConstants;
import org.netbeans.modules.hibernate.editor.HibernateEditorUtil;
import org.netbeans.modules.hibernate.mapping.HibernateMappingXmlConstants;
import org.netbeans.modules.hibernate.service.api.HibernateEnvironment;
import org.netbeans.modules.refactoring.api.Problem;
import org.netbeans.modules.xml.text.api.dom.SyntaxElement;
import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
import org.netbeans.modules.xml.text.syntax.XMLSyntaxSupport;
import org.netbeans.modules.xml.text.syntax.dom.EmptyTag;
import org.netbeans.modules.xml.text.syntax.dom.StartTag;
import org.openide.ErrorManager;
import org.openide.cookies.EditorCookie;
import org.openide.filesystems.FileObject;

            // Get the document for this file
            DataObject dataObject = DataObject.find(mappingFile);
            EditorCookie result = dataObject.getCookie(EditorCookie.class);
            String mappingPackage = null;
            if (result == null) {
                throw new IllegalStateException("File " + mappingFile + " does not have an EditorCookie.");
            }

            CloneableEditorSupport editor = (CloneableEditorSupport) result;
            Document document = editor.openDocument();
            XMLSyntaxSupport syntaxSupport = XMLSyntaxSupport.getSyntaxSupport(document);
            if (syntaxSupport == null) {
                return foundPlaces;
            }
            return syntaxSupport.runWithSequence(0, 
                    (TokenSequence ts) -> {
                        int start = document.getStartPosition().getOffset();
                        return getOccurPlacesLocked(syntaxSupport, start,
                                editor, ts, searchingForName, searchingPackageName);
            });
        } catch (BadLocationException | IOException ex) {
            ErrorManager.getDefault().notify(org.openide.ErrorManager.INFORMATIONAL, ex);
        }
        return foundPlaces;
    }
    
    private static List<OccurrenceItem> getOccurPlacesLocked(
            XMLSyntaxSupport sup,
            int start,
            CloneableEditorSupport editor,
            TokenSequence seq, 
            String searchingForName, boolean searchingPackageName) throws BadLocationException {
        List<OccurrenceItem> foundPlaces = new ArrayList<OccurrenceItem>();
        String mappingPackage = null;
        seq.move(start);
        while (seq.moveNext()) {
            Token<XMLTokenId> item = seq.token();
            XMLTokenId tokenId = item.id();

            if (tokenId == XMLTokenId.TAG) {
            TokenItem item = syntaxSupport.getTokenChain(start, Math.min(start + 1, document.getLength()));
            if (item == null) {
                return null;
            }

                SyntaxElement element = sup.getElementChain(seq.offset() + 1);
                String[] attributeValues = null; // Multiple attributes can have class name as values
                boolean pkgValue = false; // To indicate the attributeValues are Java package, not full class name
                if (sup.isStartTag(element) || sup.isEmptyTag(element)) {

                    Node theNode = (Node) element;
                    String nodeName = theNode.getNodeName();
                    String itemImage = item.text().toString();
                    int itemOffset = seq.offset();
                    
                    if (nodeName.equalsIgnoreCase(HibernateMappingXmlConstants.MAPPING_TAG) &&
                            itemImage.contains(HibernateMappingXmlConstants.MAPPING_TAG)) {
                        if(searchingPackageName) {
                        String nodeName = theNode.getNodeName();
                        String itemImage = item.getImage();

                        if (nodeName.equalsIgnoreCase(HibernateMappingXmlConstants.MAPPING_TAG) &&
                                itemImage.contains(HibernateMappingXmlConstants.MAPPING_TAG)) {
                            if(searchingPackageName) {
                                // <class> element
                                attributeValues = new String[1];
                                attributeValues[0] = getAttributeValue(theNode, HibernateMappingXmlConstants.PACKAGE_ATTRIB);
                                pkgValue = true;
                            } else {
                                mappingPackage = getAttributeValue(theNode, HibernateMappingXmlConstants.PACKAGE_ATTRIB);
                            }
                        } // Search the element/attrubutes that take class names
                        else if (nodeName.equalsIgnoreCase(HibernateMappingXmlConstants.CLASS_TAG) &&
                                itemImage.contains(HibernateMappingXmlConstants.CLASS_TAG)) {
                            // <class> element
                            attributeValues = new String[1];
                            attributeValues[0] = getAttributeValue(theNode, HibernateMappingXmlConstants.PACKAGE_ATTRIB);
                            pkgValue = true;
                        } else {
                            mappingPackage = getAttributeValue(theNode, HibernateMappingXmlConstants.PACKAGE_ATTRIB);
                            attributeValues = new String[1];
                            attributeValues[0] = getAttributeValue(theNode, HibernateMappingXmlConstants.CLASS_ATTRIB);
                        } else if (nodeName.equalsIgnoreCase(HibernateMappingXmlConstants.COMPOSITE_ID_TAG) &&
                                itemImage.contains(HibernateMappingXmlConstants.COMPOSITE_ID_TAG)) {
                            // <composite-id> element
                            attributeValues = new String[1];
                            attributeValues[0] = getAttributeValue(theNode, HibernateMappingXmlConstants.CLASS_ATTRIB);
                        } else if (nodeName.equalsIgnoreCase(HibernateMappingXmlConstants.KEY_MANY_TO_ONE_TAG) &&
                                itemImage.contains(HibernateMappingXmlConstants.KEY_MANY_TO_ONE_TAG)) {
                            // <key-many-to-one> element
                            attributeValues = new String[1];
                            attributeValues[0] = getAttributeValue(theNode, HibernateMappingXmlConstants.CLASS_ATTRIB);
                        } else if (nodeName.equalsIgnoreCase(HibernateMappingXmlConstants.MANY_TO_ONE_TAG) &&
                                itemImage.contains(HibernateMappingXmlConstants.MANY_TO_ONE_TAG)) {
                            // <many-to-one> element
                            attributeValues = new String[1];
                            attributeValues[0] = getAttributeValue(theNode, HibernateMappingXmlConstants.CLASS_ATTRIB);
                        } else if (nodeName.equalsIgnoreCase(HibernateMappingXmlConstants.ONE_TO_ONE_TAG) &&
                                itemImage.contains(HibernateMappingXmlConstants.ONE_TO_ONE_TAG)) {
                            // <one-to-one> element
                            attributeValues = new String[1];
                            attributeValues[0] = getAttributeValue(theNode, HibernateMappingXmlConstants.CLASS_ATTRIB);
                        } else if (nodeName.equalsIgnoreCase(HibernateMappingXmlConstants.COMPONENT_TAG) &&
                                itemImage.contains(HibernateMappingXmlConstants.COMPONENT_TAG)) {
                            // <component> element
                            attributeValues = new String[1];
                            attributeValues[0] = getAttributeValue(theNode, HibernateMappingXmlConstants.CLASS_ATTRIB);
                        } else if (nodeName.equalsIgnoreCase(HibernateMappingXmlConstants.SUBCLASS_TAG) &&
                                itemImage.contains(HibernateMappingXmlConstants.SUBCLASS_TAG)) {
                            // <subclass> element
                            attributeValues = new String[2];
                            attributeValues[0] = getAttributeValue(theNode, HibernateMappingXmlConstants.NAME_ATTRIB);
                            attributeValues[1] = getAttributeValue(theNode, HibernateMappingXmlConstants.EXTENDS_ATTRIB);
                        } else if (nodeName.equalsIgnoreCase(HibernateMappingXmlConstants.JOINED_SUBCLASS_TAG) &&
                                itemImage.contains(HibernateMappingXmlConstants.JOINED_SUBCLASS_TAG)) {
                            // <joined-subclass> element
                            attributeValues = new String[3];
                            attributeValues[0] = getAttributeValue(theNode, HibernateMappingXmlConstants.NAME_ATTRIB);
                            attributeValues[1] = getAttributeValue(theNode, HibernateMappingXmlConstants.EXTENDS_ATTRIB);
                            attributeValues[2] = getAttributeValue(theNode, HibernateMappingXmlConstants.PERSISTER_ATTRIB);
                        } else if (nodeName.equalsIgnoreCase(HibernateMappingXmlConstants.UNION_SUBCLASS_TAG) &&
                                itemImage.contains(HibernateMappingXmlConstants.UNION_SUBCLASS_TAG)) {
                            // <union-subclass> element
                            attributeValues = new String[3];
                            attributeValues[0] = getAttributeValue(theNode, HibernateMappingXmlConstants.NAME_ATTRIB);
                            attributeValues[1] = getAttributeValue(theNode, HibernateMappingXmlConstants.EXTENDS_ATTRIB);
                            attributeValues[2] = getAttributeValue(theNode, HibernateMappingXmlConstants.PERSISTER_ATTRIB);
                        } else if (nodeName.equalsIgnoreCase(HibernateMappingXmlConstants.IMPORT_TAG) &&
                                itemImage.contains(HibernateMappingXmlConstants.IMPORT_TAG)) {
                            // <import> element
                            attributeValues = new String[1];
                            attributeValues[0] = getAttributeValue(theNode, HibernateMappingXmlConstants.CLASS_ATTRIB);
                        } else if (nodeName.equalsIgnoreCase(HibernateMappingXmlConstants.MANY_TO_MANY_TAG) &&
                                itemImage.contains(HibernateMappingXmlConstants.MANY_TO_MANY_TAG)) {
                            // <many-to-many> element
                            attributeValues = new String[1];
                            attributeValues[0] = getAttributeValue(theNode, HibernateMappingXmlConstants.CLASS_ATTRIB);
                        } else if(nodeName.equalsIgnoreCase("property") &&//NOI18N
                                itemImage.contains("property")) {//NOI18N
                            attributeValues = new String[1];
                            attributeValues[0] = getAttributeValue(theNode, HibernateMappingXmlConstants.TYPE_ATTRIB);
                        }
                    } // Search the element/attrubutes that take class names
                    else if (nodeName.equalsIgnoreCase(HibernateMappingXmlConstants.CLASS_TAG) &&
                            itemImage.contains(HibernateMappingXmlConstants.CLASS_TAG)) {
                        // <class> element
                        attributeValues = new String[1];
                        attributeValues[0] = getAttributeValue(theNode, HibernateMappingXmlConstants.NAME_ATTRIB);
                    } else if (nodeName.equalsIgnoreCase(HibernateMappingXmlConstants.ONE_TO_MANY_TAG) &&
                            itemImage.contains(HibernateMappingXmlConstants.ONE_TO_MANY_TAG)) {
                        // <one-to-many> element
                        attributeValues = new String[1];
                        attributeValues[0] = getAttributeValue(theNode, HibernateMappingXmlConstants.CLASS_ATTRIB);
                    } else if (nodeName.equalsIgnoreCase(HibernateMappingXmlConstants.COMPOSITE_ID_TAG) &&
                            itemImage.contains(HibernateMappingXmlConstants.COMPOSITE_ID_TAG)) {
                        // <composite-id> element
                        attributeValues = new String[1];
                        attributeValues[0] = getAttributeValue(theNode, HibernateMappingXmlConstants.CLASS_ATTRIB);
                    } else if (nodeName.equalsIgnoreCase(HibernateMappingXmlConstants.KEY_MANY_TO_ONE_TAG) &&
                            itemImage.contains(HibernateMappingXmlConstants.KEY_MANY_TO_ONE_TAG)) {
                        // <key-many-to-one> element
                        attributeValues = new String[1];
                        attributeValues[0] = getAttributeValue(theNode, HibernateMappingXmlConstants.CLASS_ATTRIB);
                    } else if (nodeName.equalsIgnoreCase(HibernateMappingXmlConstants.MANY_TO_ONE_TAG) &&
                            itemImage.contains(HibernateMappingXmlConstants.MANY_TO_ONE_TAG)) {
                        // <many-to-one> element
                        attributeValues = new String[1];
                        attributeValues[0] = getAttributeValue(theNode, HibernateMappingXmlConstants.CLASS_ATTRIB);
                    } else if (nodeName.equalsIgnoreCase(HibernateMappingXmlConstants.ONE_TO_ONE_TAG) &&
                            itemImage.contains(HibernateMappingXmlConstants.ONE_TO_ONE_TAG)) {
                        // <one-to-one> element
                        attributeValues = new String[1];
                        attributeValues[0] = getAttributeValue(theNode, HibernateMappingXmlConstants.CLASS_ATTRIB);
                    } else if (nodeName.equalsIgnoreCase(HibernateMappingXmlConstants.COMPONENT_TAG) &&
                            itemImage.contains(HibernateMappingXmlConstants.COMPONENT_TAG)) {
                        // <component> element
                        attributeValues = new String[1];
                        attributeValues[0] = getAttributeValue(theNode, HibernateMappingXmlConstants.CLASS_ATTRIB);
                    } else if (nodeName.equalsIgnoreCase(HibernateMappingXmlConstants.SUBCLASS_TAG) &&
                            itemImage.contains(HibernateMappingXmlConstants.SUBCLASS_TAG)) {
                        // <subclass> element
                        attributeValues = new String[2];
                        attributeValues[0] = getAttributeValue(theNode, HibernateMappingXmlConstants.NAME_ATTRIB);
                        attributeValues[1] = getAttributeValue(theNode, HibernateMappingXmlConstants.EXTENDS_ATTRIB);
                    } else if (nodeName.equalsIgnoreCase(HibernateMappingXmlConstants.JOINED_SUBCLASS_TAG) &&
                            itemImage.contains(HibernateMappingXmlConstants.JOINED_SUBCLASS_TAG)) {
                        // <joined-subclass> element
                        attributeValues = new String[3];
                        attributeValues[0] = getAttributeValue(theNode, HibernateMappingXmlConstants.NAME_ATTRIB);
                        attributeValues[1] = getAttributeValue(theNode, HibernateMappingXmlConstants.EXTENDS_ATTRIB);
                        attributeValues[2] = getAttributeValue(theNode, HibernateMappingXmlConstants.PERSISTER_ATTRIB);
                    } else if (nodeName.equalsIgnoreCase(HibernateMappingXmlConstants.UNION_SUBCLASS_TAG) &&
                            itemImage.contains(HibernateMappingXmlConstants.UNION_SUBCLASS_TAG)) {
                        // <union-subclass> element
                        attributeValues = new String[3];
                        attributeValues[0] = getAttributeValue(theNode, HibernateMappingXmlConstants.NAME_ATTRIB);
                        attributeValues[1] = getAttributeValue(theNode, HibernateMappingXmlConstants.EXTENDS_ATTRIB);
                        attributeValues[2] = getAttributeValue(theNode, HibernateMappingXmlConstants.PERSISTER_ATTRIB);
                    } else if (nodeName.equalsIgnoreCase(HibernateMappingXmlConstants.IMPORT_TAG) &&
                            itemImage.contains(HibernateMappingXmlConstants.IMPORT_TAG)) {
                        // <import> element
                        attributeValues = new String[1];
                        attributeValues[0] = getAttributeValue(theNode, HibernateMappingXmlConstants.CLASS_ATTRIB);
                    } else if (nodeName.equalsIgnoreCase(HibernateMappingXmlConstants.MANY_TO_MANY_TAG) &&
                            itemImage.contains(HibernateMappingXmlConstants.MANY_TO_MANY_TAG)) {
                        // <many-to-many> element
                        attributeValues = new String[1];
                        attributeValues[0] = getAttributeValue(theNode, HibernateMappingXmlConstants.CLASS_ATTRIB);
                    } else if(nodeName.equalsIgnoreCase("property") &&//NOI18N
                            itemImage.contains("property")) {//NOI18N
                        attributeValues = new String[1];
                        attributeValues[0] = getAttributeValue(theNode, HibernateMappingXmlConstants.TYPE_ATTRIB);
                    }
                    if (attributeValues != null) {
                        for (int i = 0; i < attributeValues.length; i++) {

                            String text = sup.getDocument().getText(itemOffset, element.getElementLength());

                            String value = attributeValues[i];
                            if (searchingPackageName && !pkgValue) {
                                value = getPackageName(value);
                            }

                            if (value != null && (value.equals(searchingForName) || (mappingPackage!=null && mappingPackage.length()>0 && value.indexOf('.')==-1 && (mappingPackage + "." + value).equals(searchingForName)))) {

                                // TODO: can not just do indexof. It does not work correctly if there are multiple
                                // attributes have the same class searchingForName. Though, it does not make sense to have such case.

                                if (text.indexOf(value) != -1) {
                                    int startOffset = itemOffset + text.indexOf(value);
                                    int endOffset = startOffset + value.length();

                                    PositionBounds loc = new PositionBounds(editor.createPositionRef(startOffset, Bias.Forward),
                                            editor.createPositionRef(endOffset, Bias.Forward));

                                    foundPlaces.add(new OccurrenceItem(loc, text, value));
                                    }
                                }
                            }
                        }
                    }
                }
                item = item.getNext();
            }
        } catch (IOException ex) {
            ErrorManager.getDefault().notify(org.openide.ErrorManager.INFORMATIONAL, ex);
        } catch (BadLocationException ex) {
            ErrorManager.getDefault().notify(org.openide.ErrorManager.INFORMATIONAL, ex);
        }

        return foundPlaces;
    }


            }

            CloneableEditorSupport editor = (CloneableEditorSupport) result;
            Document document = editor.openDocument();
            XMLSyntaxSupport syntaxSupport = XMLSyntaxSupport.getSyntaxSupport(document);
            if (syntaxSupport == null) {
                return foundPlaces;
            }
            foundPlaces = syntaxSupport.runWithSequence(0, 
                    (TokenSequence ts) -> {
                int start = document.getStartPosition().getOffset();
                return getJavaFieldOccurPlacesLocked(syntaxSupport, ts, start, editor, className, fieldName);
            });
        } catch (IOException  | BadLocationException ex) {
            ErrorManager.getDefault().notify(org.openide.ErrorManager.INFORMATIONAL, ex);
        }
        return foundPlaces;
    }

            int start = document.getStartPosition().getOffset();
            TokenItem item = syntaxSupport.getTokenChain(start, Math.min(start + 1, document.getLength()));
            if (item == null) {
                return null;
            }

    private static List<OccurrenceItem> getJavaFieldOccurPlacesLocked(
            XMLSyntaxSupport sup, TokenSequence seq, int start, 
            CloneableEditorSupport editor, String className, String fieldName) throws BadLocationException {
        List<OccurrenceItem> foundPlaces = new ArrayList<OccurrenceItem>();
        seq.move(start);
        String text = null;
        while (seq.moveNext()) {
            Token<XMLTokenId> item = seq.token();
            XMLTokenId tokenId = item.id();

            if (tokenId == XMLTokenId.TAG) {
                // Did we find the <class> element

                SyntaxElement element = sup.getElementChain(seq.offset() + 1);
                String nameAttribValue = null;
                if (sup.isStartTag(element) || sup.isEmptyTag(element)) {

                    Node theNode = (Node) element;
                    String nodeName = theNode.getNodeName();
                    String itemImage = item.text().toString();

                    if ((nodeName.equalsIgnoreCase(HibernateMappingXmlConstants.PROPERTY_TAG) &&
                            itemImage.contains(HibernateMappingXmlConstants.PROPERTY_TAG)) ||
                            (nodeName.equalsIgnoreCase(HibernateMappingXmlConstants.ID_TAG) &&
                            itemImage.contains(HibernateMappingXmlConstants.ID_TAG)) ||
                            (nodeName.equalsIgnoreCase(HibernateMappingXmlConstants.SET_TAG) &&
                            itemImage.contains(HibernateMappingXmlConstants.SET_TAG)) ||
                            (nodeName.equalsIgnoreCase(HibernateMappingXmlConstants.COMPOSITE_ID_TAG) &&
                            itemImage.contains(HibernateMappingXmlConstants.COMPOSITE_ID_TAG)) ||
                            (nodeName.equalsIgnoreCase(HibernateMappingXmlConstants.KEY_PROPERTY_TAG) &&
                            itemImage.contains(HibernateMappingXmlConstants.KEY_PROPERTY_TAG)) ||
                            (nodeName.equalsIgnoreCase(HibernateMappingXmlConstants.KEY_MANY_TO_ONE_TAG) &&
                            itemImage.contains(HibernateMappingXmlConstants.KEY_MANY_TO_ONE_TAG)) ||
                            (nodeName.equalsIgnoreCase(HibernateMappingXmlConstants.VERSION_TAG) &&
                            itemImage.contains(HibernateMappingXmlConstants.VERSION_TAG)) ||
                            (nodeName.equalsIgnoreCase(HibernateMappingXmlConstants.TIMESTAMP_TAG) &&
                            itemImage.contains(HibernateMappingXmlConstants.TIMESTAMP_TAG)) ||
                            (nodeName.equalsIgnoreCase(HibernateMappingXmlConstants.MANY_TO_ONE_TAG) &&
                            itemImage.contains(HibernateMappingXmlConstants.MANY_TO_ONE_TAG)) ||
                            (nodeName.equalsIgnoreCase(HibernateMappingXmlConstants.ONE_TO_ONE_TAG) &&
                            itemImage.contains(HibernateMappingXmlConstants.ONE_TO_ONE_TAG)) ||
                            (nodeName.equalsIgnoreCase(HibernateMappingXmlConstants.COMPONENT_TAG) &&
                            itemImage.contains(HibernateMappingXmlConstants.COMPONENT_TAG)) ||
                            (nodeName.equalsIgnoreCase(HibernateMappingXmlConstants.ANY_TAG) &&
                            itemImage.contains(HibernateMappingXmlConstants.ANY_TAG)) ||
                            (nodeName.equalsIgnoreCase(HibernateMappingXmlConstants.MAP_TAG) &&
                            itemImage.contains(HibernateMappingXmlConstants.MAP_TAG)) ||
                            (nodeName.equalsIgnoreCase(HibernateMappingXmlConstants.LIST_TAG) &&
                            itemImage.contains(HibernateMappingXmlConstants.LIST_TAG))) {

                        nameAttribValue = getAttributeValue(theNode, HibernateMappingXmlConstants.NAME_ATTRIB);

                        if (nameAttribValue != null && nameAttribValue.equals(fieldName)) {

                            // Check class name
                            if (HibernateEditorUtil.getClassName(theNode).equals(className)) {
                                text = sup.getDocument().getText(seq.offset(), element.getElementLength());

                                // find the offset for the field name
                                int index = text.indexOf(fieldName);
                                int startOffset = seq.offset() + index;
                                int endOffset = startOffset + fieldName.length();
                                PositionBounds loc = new PositionBounds(
                                        editor.createPositionRef(startOffset, Bias.Forward),
                                        editor.createPositionRef(endOffset, Bias.Forward));

                                foundPlaces.add(new OccurrenceItem(loc, text, fieldName));
                                }
                            }
                        }
                    }
                }
                item = item.getNext();
            }
        } catch (IOException ex) {
            ErrorManager.getDefault().notify(org.openide.ErrorManager.INFORMATIONAL, ex);
        } catch (BadLocationException ex) {
            ErrorManager.getDefault().notify(org.openide.ErrorManager.INFORMATIONAL, ex);
        }

        return foundPlaces;
    }
    


            CloneableEditorSupport editor = (CloneableEditorSupport) result;
            BaseDocument document = (BaseDocument) editor.openDocument();
            XMLSyntaxSupport syntaxSupport = XMLSyntaxSupport.getSyntaxSupport(document);
            if (syntaxSupport == null) {
                return foundPlaces;
            }
            return syntaxSupport.runWithSequence(0, 
                (TokenSequence ts) -> {
                    int start = document.getStartPosition().getOffset();
                    return getMappingResourceOccurPlacesLocked(syntaxSupport, ts, start, editor, resourceName, searchingPathOnly);
            });
        } catch (IOException | BadLocationException ex) {
            ErrorManager.getDefault().notify(org.openide.ErrorManager.INFORMATIONAL, ex);
        }
        return foundPlaces;
    }

    private static List<OccurrenceItem> getMappingResourceOccurPlacesLocked(
            XMLSyntaxSupport sup, TokenSequence seq, int start, CloneableEditorSupport editor, 
            String resourceName, boolean searchingPathOnly) throws BadLocationException {
        List<OccurrenceItem> foundPlaces = new ArrayList<OccurrenceItem>();
        seq.move(start);
        String text = null;
        while (seq.moveNext()) {
            Token<XMLTokenId> item = seq.token();
            XMLTokenId tokenId = item.id();

            if (tokenId == XMLTokenId.TAG) {
                // Did we find the <class> element
                TokenID tokenId = item.getTokenID();

                SyntaxElement element = sup.getElementChain(seq.offset() + 1);
                String mappingResourceAttribValue = null;
                if (sup.isStartTag(element) || sup.isEmptyTag(element)) {

                    Node theNode = (Node) element;
                    String nodeName = theNode.getNodeName();
                    String itemImage = item.text().toString();

                    if(nodeName.equalsIgnoreCase(HibernateCfgXmlConstants.MAPPING_TAG) && 
                            itemImage.contains(HibernateCfgXmlConstants.MAPPING_TAG)){ 
                        String itemImage = item.getImage();

                        mappingResourceAttribValue = getAttributeValue(theNode, HibernateCfgXmlConstants.RESOURCE_ATTRIB);
                        if(mappingResourceAttribValue != null) {
                            if(searchingPathOnly) {
                                int lastIndex = mappingResourceAttribValue.lastIndexOf('/');
                                if (lastIndex > -1) {
                                    mappingResourceAttribValue = mappingResourceAttribValue.substring(0, lastIndex);
                                } else {
                                    mappingResourceAttribValue = "";
                                }
                            }
                            if (mappingResourceAttribValue.equals(resourceName)) {
                                text = sup.getDocument().getText(seq.offset(), element.getElementLength());

                                // find the offset for the field name
                                int index = text.indexOf(resourceName);
                                int startOffset = seq.offset() + index;
                                int endOffset = startOffset + resourceName.length();
                                PositionBounds loc = new PositionBounds(editor.createPositionRef(startOffset, Bias.Forward),
                                        editor.createPositionRef(endOffset, Bias.Forward));
                                foundPlaces.add(new OccurrenceItem(loc, text, resourceName));
                                        mappingResourceAttribValue = "";
                                    }
                                }
                                if (mappingResourceAttribValue.equals(resourceName)) {
                                    text = document.getText(item.getOffset(), element.getElementLength());

                                    // find the offset for the field name
                                    int index = text.indexOf(resourceName);
                                    int startOffset = item.getOffset() + index;
                                    int endOffset = startOffset + resourceName.length();
                                    PositionBounds loc = new PositionBounds(editor.createPositionRef(startOffset, Bias.Forward),
                                            editor.createPositionRef(endOffset, Bias.Forward));
                                    foundPlaces.add(new OccurrenceItem(loc, text, resourceName));
                                }
                            }
                        }
                    }
                }
                item = item.getNext();
            }
        } catch (IOException ex) {
            ErrorManager.getDefault().notify(org.openide.ErrorManager.INFORMATIONAL, ex);
        } catch (BadLocationException ex) {
            ErrorManager.getDefault().notify(org.openide.ErrorManager.INFORMATIONAL, ex);
        }

        return foundPlaces;
    }


Lines 40-47 Link Here

(-)a/j2ee.persistence/nbproject/project.properties (-2 / +2 lines)
40	# Version 2 license, then the option applies only if the new code is	40	# Version 2 license, then the option applies only if the new code is
41	# made subject to such option by the copyright holder.	41	# made subject to such option by the copyright holder.
42		42
43	javac.source=1.7	43	javac.source=1.8
44	spec.version.base=1.52.0	44	spec.version.base=1.53.0
45		45
46	test.unit.run.cp.extra=${j2eeserver.dir}/modules/ext/jsr88javax.jar:${j2ee.persistence.dir}/modules/ext/eclipselink/eclipselink.jar:${j2ee.persistence.dir}/modules/ext/eclipselink/javax.persistence_2.1.0.v201304241213.jar:${masterfs.dir}/modules/org-netbeans-modules-masterfs.jar	46	test.unit.run.cp.extra=${j2eeserver.dir}/modules/ext/jsr88javax.jar:${j2ee.persistence.dir}/modules/ext/eclipselink/eclipselink.jar:${j2ee.persistence.dir}/modules/ext/eclipselink/javax.persistence_2.1.0.v201304241213.jar:${masterfs.dir}/modules/org-netbeans-modules-masterfs.jar
47		47

Lines 463-469 Link Here

(-)a/j2ee.persistence/nbproject/project.xml (-1 / +1 lines)
463	<compile-dependency/>	463	<compile-dependency/>
464	<run-dependency>	464	<run-dependency>
465	<release-version>2</release-version>	465	<release-version>2</release-version>
466	<specification-version>1.30</specification-version>	466	<specification-version>1.60</specification-version>
467	</run-dependency>	467	</run-dependency>
468	</dependency>	468	</dependency>
469	<dependency>	469	<dependency>




import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.swing.text.BadLocationException;
import javax.swing.text.Document;
import org.netbeans.api.lexer.Token;
import org.netbeans.api.lexer.TokenSequence;
import org.netbeans.api.xml.lexer.XMLTokenId;
import org.netbeans.modules.xml.text.api.dom.SyntaxElement;
import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
import org.netbeans.modules.xml.text.syntax.dom.EmptyTag;
import org.netbeans.modules.xml.text.syntax.dom.EndTag;
import org.netbeans.modules.xml.text.syntax.dom.StartTag;
import org.netbeans.modules.xml.text.syntax.dom.Tag;
import org.w3c.dom.Node;
import org.w3c.dom.Text;


 * Tracks context information for a code completion scenario
 */
public class CompletionContext {
    private List<String> existingAttributes;

    public static enum CompletionType {
        TAG,

        this.caretOffset = caretOffset;

        try {
            this.support = XMLSyntaxSupport.getSyntaxSupport(doc);
        } catch (ClassCastException cce) {
            LOGGER.log(Level.FINE, cce.getMessage());
            this.support = XMLSyntaxSupport.createSyntaxSupport(doc);
        }
        this.documentContext = EditorContextFactory.getDocumentContext(doc, caretOffset);
        this.lastTypedChar = support.lastTypedChar();
        try {
            initContext();
        } catch (BadLocationException ex) {
            throw new IllegalStateException(ex);
        }
    }
    
    private void initContext() throws BadLocationException {
        Token<XMLTokenId> token = documentContext.getCurrentToken();
        if(token == null)
            return;
        
        boolean tokenBoundary = (documentContext.getCurrentTokenOffset() == caretOffset) 
                || ((documentContext.getCurrentTokenOffset() + token.length()) == caretOffset);
        
        XMLTokenId id = token.id();
        SyntaxElement element = documentContext.getCurrentElement();
        int tOffset = documentContext.getCurrentTokenOffset();
        
        switch (id) {
            //
            case TEXT:
                String chars = token.text().toString().trim();
                Token<XMLTokenId> previousTokenItem = support.getPreviousToken(tOffset);
                if (previousTokenItem == null) {
                    completionType = CompletionType.NONE;
                    break;
                }
                String previousTokenText = previousTokenItem.text().toString().trim();
                if (chars != null && chars.equals("") &&
                        previousTokenText.equals("/>")) { // NOI18N
                    completionType = CompletionType.NONE;
                    break;
                }
                if (chars != null && chars.equals("") &&
                        previousTokenText.equals(">")) { // NOI18N
                    completionType = CompletionType.VALUE;
                    break;
                }
                if (chars != null && !chars.startsWith("<") &&
                        previousTokenText.equals(">")) { // NOI18N

                    completionType = CompletionType.VALUE;
                    typedChars = token.text().subSequence(0, caretOffset - tOffset).toString();
                    break;
                }
                if (chars != null && !chars.equals("<") &&
                        previousTokenText.equals(">")) { // NOI18N
                    completionType = CompletionType.NONE;
                    break;
                }

                break;

            //start tag of an element
            case TAG:
                if (support.isEndTag(element)) {
                    completionType = CompletionType.NONE;
                    break;
                }
                if (support.isEmptyTag(element)) {
                    if (token != null &&
                            token.text().toString().trim().equals("/>")) {
                        completionType = CompletionType.NONE;
                        break;
                    }
                    EmptyTag tag = (EmptyTag) element;
                    if (element.getElementOffset() + 1 == this.caretOffset) {
                        completionType = CompletionType.TAG;
                        break;
                    }
                    if (caretOffset > element.getElementOffset() + 1 &&
                            caretOffset <= element.getElementOffset() + 1 +element.getNode().getNodeName().length()) {
                        completionType = CompletionType.TAG;
                        typedChars = element.getNode().getNodeName();
                        break;
                    }
                    completionType = CompletionType.ATTRIBUTE;
                    break;
                }

                if (support.isStartTag(element)) {
                    if (token != null &&
                            token.text().toString().trim().equals(">")) {
                        completionType = CompletionType.NONE;
                        break;
                    }
                    if (token != null &&
                            token.text().toString().trim().startsWith("</")) {
                        typedChars = "";
                        completionType = CompletionType.VALUE;
                        break;
                    }
                    if (element.getElementOffset() + 1 != this.caretOffset) {
                        typedChars = element.getNode().getNodeName();
                        typedChars = tag.getTagName();
                    }
                }
                
                if (element instanceof Text) {
                    if (token != null &&
                            token.text().toString().trim().startsWith("</")) {
                        Token<XMLTokenId> prevToken = support.getPreviousToken(tOffset);
                        if (prevToken == null) {
                            completionType = CompletionType.NONE;
                            break;
                        }
                        typedChars = prevToken.text().toString().trim();
                        completionType = CompletionType.VALUE;
                        break;
                    }

                break;

            //user enters an attribute name
            case ARGUMENT:
                completionType = CompletionType.ATTRIBUTE;
                typedChars = token.text().toString().substring(0, caretOffset - tOffset);;
                break;

            //some random character
            case CHARACTER:
            //user enters = character, we should ignore all other operators
            case OPERATOR:
                completionType = CompletionType.NONE;
                break;
            //user enters either ' or "
            case VALUE:
                if(!tokenBoundary) {
                    completionType = CompletionType.ATTRIBUTE_VALUE;
                    typedChars = token.text().subSequence(1, caretOffset - tOffset).toString();
                } else {
                    completionType = CompletionType.NONE;
                }
                break;

            //user enters white-space character
            case WS:
                completionType = CompletionType.NONE;
                int[] offset = new int[1];
                Token<XMLTokenId> prev = support.runWithSequence(tOffset,
                    (TokenSequence ts) -> {
                        Token<XMLTokenId> t  = null;
                        boolean ok;
                        while ((ok = ts.movePrevious())) {
                            t = ts.token();
                            if (t.id() != XMLTokenId.WS) {
                                break;
                            }
                        }
                        if (ok) {
                            offset[0] = ts.offset();
                            return t;
                        } else {
                            return null;
                        }
                    }
                );
                if (prev == null) {
                    completionType = CompletionType.NONE;
                    break;
                }
                int prevOffset = offset[0];

                if(prev.id() == XMLTokenId.ARGUMENT) {
                    typedChars = prev.text().toString();
                    completionType = CompletionType.ATTRIBUTE;
                } else if ((prev.id() == XMLTokenId.VALUE) ||
                        (prev.id() == XMLTokenId.TAG)) {
                    completionType = CompletionType.ATTRIBUTE;
                }
                break;

    
    public Node getTag() {
        SyntaxElement element = documentContext.getCurrentElement();
        return element.getType() == Node.ELEMENT_NODE ? (Node) element : null;
    }
    
    public Token<XMLTokenId> getCurrentToken() {
        return documentContext.getCurrentToken();
    }
    
    public int getCurrentTokenOffset() {
        return documentContext.getCurrentTokenOffset();
    }
    
    private List<String> getExistingAttributesLocked(TokenSequence ts) {
        List<String> existingAttributes = new ArrayList<String>();
        while (ts.movePrevious()) {
            Token<XMLTokenId> item = ts.token();
            XMLTokenId tokenId = item.id();
            if (tokenId == XMLTokenId.TAG) {
                break;
            }
            if (tokenId == XMLTokenId.ARGUMENT) {
                existingAttributes.add(item.text().toString());
            }
        }
        return existingAttributes;
    }

    public List<String> getExistingAttributes() {
        if (existingAttributes == null) {
            try {
                existingAttributes = (List<String>)support.runWithSequence(
                        documentContext.getCurrentTokenOffset(),
                        this::getExistingAttributesLocked
                );
            } catch (BadLocationException ex) {
                break;
            if(item.getTokenID().getNumericID() ==
                    XMLDefaultTokenContext.ARGUMENT_ID) {
                existingAttributes.add(item.getImage());
            }
            item = item.getPrevious();
        }
        return existingAttributes;
    }





package org.netbeans.modules.j2ee.persistence.editor;

import javax.swing.text.BadLocationException;
import javax.xml.XMLConstants;
import org.netbeans.api.lexer.Token;
import org.netbeans.api.lexer.TokenSequence;
import org.netbeans.api.xml.lexer.XMLTokenId;
import static org.netbeans.api.xml.lexer.XMLTokenId.*;
import org.netbeans.modules.xml.text.api.dom.SyntaxElement;
import org.netbeans.modules.xml.text.api.dom.TagElement;
import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
import org.w3c.dom.Node;

/**
 *

    private ContextUtilities() {
    }
    
    public static boolean isValueToken(Token<XMLTokenId> currentToken) {
        if(currentToken != null) {
            if (currentToken.id() == VALUE) {
                return true;
            }
        }

        return false;
    }
    
    public static boolean isTagToken(Token<XMLTokenId> currentToken) {
        if(currentToken != null) {
            if (currentToken.id() == TAG) {
                return true;
            }
        }

        return false;
    }
    
    public static boolean isAttributeToken(Token<XMLTokenId> currentToken) {
        if(currentToken != null) {
            if (currentToken.id() == ARGUMENT) {
                return true;
            }
        }

        return false;
    }
    
    public static Token<XMLTokenId> getAttributeToken(DocumentContext context) {
        if(currentToken == null )
            return null;
        
        if(isValueToken(currentToken)) {
            TokenItem equalsToken = currentToken.getPrevious();
            if(equalsToken == null)
                return null;
            
            while(equalsToken != null && equalsToken.getTokenID().getNumericID() != XMLDefaultTokenContext.OPERATOR_ID) {
                equalsToken = equalsToken.getPrevious();
            }
            
            if(equalsToken == null) {
                return null;
            }
        
            TokenItem argumentToken = equalsToken.getPrevious();
            if(argumentToken == null)
                return null;
            
            while(argumentToken != null && argumentToken.getTokenID().getNumericID() != XMLDefaultTokenContext.ARGUMENT_ID) {
                argumentToken = argumentToken.getPrevious();
            }
        
            return argumentToken;
        }
        
        return null;
    }
  
    public static Tag getCurrentTagElement(DocumentContext context) {
        SyntaxElement element = context.getCurrentElement();
        if(element instanceof StartTag) {
            return (StartTag) element;
        } else if(element instanceof EmptyTag) {
            return (EmptyTag) element;
        }
        
        return null;
    }
    
    public static TokenItem getAttributeToken(DocumentContext context) {
        if(context.getCurrentToken() == null )
            return null;
        try {
            return context.<Token<XMLTokenId>>runWithSequence((TokenSequence ts) -> {
                if(!isValueToken(context.getCurrentToken())) {
                    return null;
                }
                Token<XMLTokenId> equalsToken = null;
                while (ts.movePrevious()) {
                    Token<XMLTokenId> t = ts.token();
                    if (t.id() == OPERATOR) {
                        equalsToken = t;
                        break;
                    }
                }
                if(equalsToken == null) {
                    return null;
                }
                Token<XMLTokenId> argumentToken = null;
                while (ts.movePrevious()) {
                    Token<XMLTokenId> t = ts.token();
                    if (t.id() == ARGUMENT) {
                        argumentToken = t;
                        break;
                    }
                }
                return argumentToken;
            });
        } catch (BadLocationException ex) {
            return argumentToken;
        }
        
        return null;
    }
    
    public static String getAttributeTokenImage(DocumentContext context) {
        Token<XMLTokenId> tok = getAttributeToken(context);
        if(tok != null) {
            return tok.text().toString();
        }
        
        return null;

        return nodeName.substring(0, colonIndex);
    }
    
    public static SyntaxElement getRoot(SyntaxElement se) {
        SyntaxElement root = null;
        while( se != null) {
            if(se.getType() == Node.ELEMENT_NODE &&
               ((TagElement)se).isStart()) {
                root = se;
            }
            se = se.getPrevious();
        }




import java.util.logging.Logger;
import javax.swing.text.BadLocationException;
import javax.swing.text.Document;
import org.netbeans.api.lexer.Token;
import org.netbeans.api.xml.lexer.XMLTokenId;
import org.netbeans.modules.xml.text.api.dom.SyntaxElement;
import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
import org.netbeans.modules.xml.text.syntax.dom.EmptyTag;
import org.netbeans.modules.xml.text.syntax.dom.EndTag;
import org.netbeans.modules.xml.text.syntax.dom.StartTag;
import org.netbeans.modules.xml.text.syntax.dom.Tag;
import org.w3c.dom.Attr;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;

    private XMLSyntaxSupport syntaxSupport;
    private int caretOffset = -1;
    private SyntaxElement element;
    private Token<XMLTokenId> token;
    private int tokenOffset;
    private boolean valid = false;
    private SyntaxElement docRoot;
    private String defaultNamespace;
    private HashMap<String, String> declaredNamespaces =
            new HashMap<String, String>();

    DocumentContext(Document document) {
        this.document = document;
        try {
            this.syntaxSupport = XMLSyntaxSupport.getSyntaxSupport(document);
        } catch (ClassCastException cce) {
            LOGGER.log(Level.FINE, cce.getMessage());
            this.syntaxSupport = XMLSyntaxSupport.createSyntaxSupport(document);
        }
    }


        declaredNamespaces.clear();
        try {
            element = syntaxSupport.getElementChain(caretOffset);
            int[] off = new int[2];
            token = syntaxSupport.getNextToken(caretOffset, off);
            tokenOffset = off[0];
            this.docRoot = ContextUtilities.getRoot(element);
            populateNamespaces();
        } catch (BadLocationException ex) {

        return this.valid;
    }

    public Token<XMLTokenId> getCurrentToken() {
        if (isValid()) {
            return token.getTokenID().getNumericID();
        } else {
            return -1;
        }
    }

    public TokenItem getCurrentToken() {
        if (isValid()) {
            return token;
        } else {
            return null;
        }
    }
    
    public int getCurrentTokenOffset() {
        return tokenOffset;
    }

    public String getCurrentTokenImage() {
        if (isValid()) {
            return token.text().toString();
        } else {
            return null;
        }

        return this.element;
    }
    
    public List<String> getPathFromRoot() {
        if (isValid()) {
            SyntaxElement elementRef = this.element;
            Stack<SyntaxElement> stack = new Stack<SyntaxElement>();

            while (elementRef != null) {
                if ((elementRef instanceof EndTag) ||
                        (elementRef instanceof EmptyTag && stack.isEmpty()) ||
                        (elementRef instanceof StartTag && stack.isEmpty())) {
                    stack.push(elementRef);
                    elementRef = elementRef.getPrevious();
                    continue;
                }
                if (elementRef instanceof StartTag) {
                    StartTag start = (StartTag) elementRef;
                    if (stack.peek() instanceof EndTag) {
                        EndTag end = (EndTag) stack.peek();
                        if (end.getTagName().equals(start.getTagName())) {
                            stack.pop();
                        }
                    } else {
                        SyntaxElement e = (SyntaxElement) stack.peek();
                        String tagAtTop = (e instanceof StartTag) ? ((StartTag) e).getTagName() : ((EmptyTag) e).getTagName();
                        stack.push(elementRef);
                    }
                }
                elementRef = elementRef.getPrevious();
            }

            return createPath(stack);
        }

        return Collections.emptyList();
    }

    private List<String> createPath(Stack<SyntaxElement> stack) {
        ArrayList<String> pathList = new ArrayList<String>();
        while (!stack.isEmpty()) {
            SyntaxElement top = stack.pop();
            String tagName = (top instanceof StartTag) ? ((StartTag) top).getTagName() : ((EmptyTag) top).getTagName();
            if (tagName != null) {
                pathList.add(tagName);
            }
        }

        return Collections.unmodifiableList(pathList);
    }

    public Document getDocument() {
        return this.document;
    }

        return declaredNamespaces.values();
    }

    public SyntaxElement getDocRoot() {
        return docRoot;
    }


    private void populateNamespaces() {
        // Find the a start or empty tag just before the current syntax element.
        SyntaxElement element = this.element;
        while (element != null && !syntaxSupport.isStartTag(element) && !syntaxSupport.isEmptyTag(element)) {
            element = element.getPrevious();
        }
        if (element == null) {

        // To find all namespace declarations active at the caret offset, we
        // need to look at xmlns attributes of the current element and its ancestors.
        Node node = (Node)element;
        while (node != null && element != null) {
            if (syntaxSupport.isStartTag(element) || syntaxSupport.isEmptyTag(element)) {
                NamedNodeMap attributes = node.getAttributes();
                for (int index = 0; index < attributes.getLength(); index++) {
                    Attr attr = (Attr) attributes.item(index);
                    String attrName = attr.getName();

                }
            }
            node = node.getParentNode();
            element = syntaxSupport.getSyntaxElement(node);
        }
    }
    

        hash = 61 * hash + (this.document != null ? this.document.hashCode() : 0);
        return hash;
    }

    public <T> T runWithSequence(XMLSyntaxSupport.SequenceCallable<T> callable) throws BadLocationException {
        return syntaxSupport.runWithSequence(caretOffset, callable);
    }
}

Lines 48-60 Link Here

(-)a/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/editor/completion/PUCompletionManager.java (-16 / +37 lines)
48	import java.util.HashMap;	48	import java.util.HashMap;
49	import java.util.List;	49	import java.util.List;
50	import java.util.Map;	50	import java.util.Map;
51	import org.netbeans.editor.TokenItem;	51	import javax.swing.text.BadLocationException;
		52	import org.netbeans.api.lexer.Token;
		53	import org.netbeans.api.lexer.TokenSequence;
		54	import org.netbeans.api.xml.lexer.XMLTokenId;
52	import org.netbeans.modules.j2ee.persistence.editor.*;	55	import org.netbeans.modules.j2ee.persistence.editor.*;
53	import org.netbeans.modules.j2ee.persistence.unit.PersistenceCfgProperties;	56	import org.netbeans.modules.j2ee.persistence.unit.PersistenceCfgProperties;
54	import org.netbeans.modules.xml.text.syntax.SyntaxElement;	57	import org.netbeans.modules.xml.text.api.dom.SyntaxElement;
55	import org.netbeans.modules.xml.text.syntax.dom.StartTag;	58	import org.netbeans.modules.xml.text.api.dom.TagElement;
56	import org.netbeans.modules.xml.text.syntax.dom.Tag;	59	import org.w3c.dom.Node;
57	import org.w3c.dom.Text;
58		60
59	/**	61	/**
60	* This class figures out the completion items for various attributes	62	* This class figures out the completion items for various attributes
Lines 109-116 Link Here
109	}	111	}
110		112
111	String tagName = context.getTag().getNodeName();	113	String tagName = context.getTag().getNodeName();
112	TokenItem attrib = ContextUtilities.getAttributeToken(context.getCurrentToken());	114	Token<XMLTokenId> attrib = ContextUtilities.getAttributeToken(context.getDocumentContext());
113	String attribName = attrib != null ? attrib.getImage() : null;	115	String attribName = attrib != null ? attrib.text().toString(): null;
114		116
115	PUCompletor completor = locateCompletor(tagName, attribName);	117	PUCompletor completor = locateCompletor(tagName, attribName);
116	if (completor != null) {	118	if (completor != null) {
Lines 128-136 Link Here
128	DocumentContext docContext = context.getDocumentContext();	130	DocumentContext docContext = context.getDocumentContext();
129	SyntaxElement curElem = docContext.getCurrentElement();	131	SyntaxElement curElem = docContext.getCurrentElement();
130	SyntaxElement prevElem = docContext.getCurrentElement().getPrevious();	132	SyntaxElement prevElem = docContext.getCurrentElement().getPrevious();
131	Tag propTag;	133	TagElement propTag;
132		134
133	String tagName = (curElem instanceof StartTag) ? ((StartTag) curElem).getTagName() : ((prevElem instanceof StartTag) ? ((StartTag) prevElem).getTagName() : null);	135	String tagName;
		136
		137	if (curElem.getType() == Node.ELEMENT_NODE && ((TagElement)curElem).isStart()) {
		138	tagName = curElem.getNode().getNodeName();
		139	} else if (prevElem.getType() == Node.ELEMENT_NODE && ((TagElement)prevElem).isStart()) {
		140	tagName = prevElem.getNode().getNodeName();
		141	} else {
		142	tagName = null;
		143	}
134	PUCompletor completor = locateCompletor(tagName, null);	144	PUCompletor completor = locateCompletor(tagName, null);
135	if (completor != null) {	145	if (completor != null) {
136	valueItems.addAll(completor.doCompletion(context));	146	valueItems.addAll(completor.doCompletion(context));
Lines 142-157 Link Here
142	// If current element is a start tag and its tag is <property>	152	// If current element is a start tag and its tag is <property>
143	// or the current element is text and its prev is a start <property> tag,	153	// or the current element is text and its prev is a start <property> tag,
144	// then do the code completion	154	// then do the code completion
145	if ((curElem instanceof StartTag) && ((StartTag) curElem).getTagName().equalsIgnoreCase(PersistenceCfgXmlConstants.PROPERTY_TAG)) {	155	if (curElem.getType() == Node.ELEMENT_NODE && ((TagElement)curElem).isStart() &&
146	propTag = (StartTag) curElem;	156	PersistenceCfgXmlConstants.PROPERTY_TAG.equalsIgnoreCase(curElem.getNode().getNodeName())) {
147	} else if ((curElem instanceof Text) && (prevElem instanceof StartTag) &&	157	propTag = (TagElement)curElem;
148	((StartTag) prevElem).getTagName().equalsIgnoreCase(PersistenceCfgXmlConstants.PROPERTY_TAG)) {	158	} else if (curElem.getType() == Node.TEXT_NODE && (prevElem.getType() == Node.ELEMENT_NODE && ((TagElement)prevElem).isStart()) &&
149	propTag = (StartTag) prevElem;	159	PersistenceCfgXmlConstants.PROPERTY_TAG.equalsIgnoreCase(prevElem.getNode().getNodeName())) {
		160	propTag = (TagElement)prevElem;
150	} else {	161	} else {
151	return anchorOffset;	162	return anchorOffset;
152	}	163	}
153		164
154	String propName = JPAEditorUtil.getPersistencePropertyName(propTag);	165	String propName = JPAEditorUtil.getPersistencePropertyName(propTag.getNode());
155	int caretOffset = context.getCaretOffset();	166	int caretOffset = context.getCaretOffset();
156	String typedChars = context.getTypedPrefix();	167	String typedChars = context.getTypedPrefix();
157		168
Lines 171-177 Link Here
171	}	182	}
172	}	183	}
173		184
174	anchorOffset = context.getCurrentToken().getPrevious().getOffset() + 1;	185	try {
		186	anchorOffset = context.getDocumentContext().
		187	runWithSequence((TokenSequence s) -> {
		188	if (!s.movePrevious()) {
		189	return -1;
		190	}
		191	return s.offset();
		192	});
		193	} catch (BadLocationException ex) {
		194	anchorOffset = -1;
		195	}
175	}	196	}
176	}	197	}
177	return anchorOffset;	198	return anchorOffset;




                    }
                }
            }
            setAnchorOffset(context.getCurrentTokenOffset() + 1);
            return results;
        }
    }

                    results.add(item);
            }

            setAnchorOffset(context.getCurrentTokenOffset() + 1);
            return results;
        }
    }

                    results.add(item);
                }
            }
            setAnchorOffset(context.getCurrentTokenOffset() + 1);
            return results;
        }
    }    

                }
            }

            setAnchorOffset(context.getCurrentTokenOffset() + 1);
            return results;
        }
    }

                    return Collections.emptyList();
                }
                FileObject fo = NbEditorUtilities.getFileObject(context.getDocument());
                doJavaCompletion(fo, js, results, typedChars, context.getCurrentTokenOffset());
            } catch (IOException ex) {
                Exceptions.printStackTrace(ex);
            }

                Exceptions.printStackTrace(ex);
            }

            setAnchorOffset(context.getCurrentTokenOffset() + 1);

            return results;
        }

                }
            }

            setAnchorOffset(context.getCurrentTokenOffset() + 1);
            return results;
        }
    }

                }
            }

            setAnchorOffset(context.getCurrentTokenOffset() + 1);
            return results;
        }
    }

                }
            }

            setAnchorOffset(context.getCurrentTokenOffset() + 1);
            return results;
        }


Lines 190-196 Link Here

(-)a/j2ee.websphere6/nbproject/project.xml (-1 / +1 lines)
190	<code-name-base>org.netbeans.modules.xml.text</code-name-base>	190	<code-name-base>org.netbeans.modules.xml.text</code-name-base>
191	<run-dependency>	191	<run-dependency>
192	<release-version>2</release-version>	192	<release-version>2</release-version>
193	<specification-version>1.16</specification-version>	193	<specification-version>1.60</specification-version>
194	</run-dependency>	194	</run-dependency>
195	</dependency>	195	</dependency>
196	<dependency>	196	<dependency>

Lines 277-283 Link Here

(-)a/javafx2.editor/nbproject/project.xml (-1 / +1 lines)
277	<compile-dependency/>	277	<compile-dependency/>
278	<run-dependency>	278	<run-dependency>
279	<release-version>2</release-version>	279	<release-version>2</release-version>
280	<specification-version>1.34</specification-version>	280	<specification-version>1.60</specification-version>
281	</run-dependency>	281	</run-dependency>
282	</dependency>	282	</dependency>
283	<dependency>	283	<dependency>

Lines 556-561 Link Here

(-)a/nbbuild/cluster.properties (+1 lines)
556	xml.schema.model,\	556	xml.schema.model,\
557	xml.tax,\	557	xml.tax,\
558	xml.text,\	558	xml.text,\
		559	xml.text.obsolete90,\
559	xml.tools,\	560	xml.tools,\
560	xml.wsdl.model,\	561	xml.wsdl.model,\
561	xml.xam,\	562	xml.xam,\

Lines 250-252 Link Here

(-)a/nbbuild/javadoctools/links.xml (+1 lines)
250	<link href="${javadoc.docs.org-netbeans-modules-docker-api}" offline="true" packagelistloc="${netbeans.javadoc.dir}/org-netbeans-modules-docker-api"/>	250	<link href="${javadoc.docs.org-netbeans-modules-docker-api}" offline="true" packagelistloc="${netbeans.javadoc.dir}/org-netbeans-modules-docker-api"/>
251	<link href="${javadoc.docs.org-netbeans-modules-csl-types}" offline="true" packagelistloc="${netbeans.javadoc.dir}/org-netbeans-modules-csl-types"/>	251	<link href="${javadoc.docs.org-netbeans-modules-csl-types}" offline="true" packagelistloc="${netbeans.javadoc.dir}/org-netbeans-modules-csl-types"/>
252	<link href="${javadoc.docs.org-netbeans-modules-csl-api}" offline="true" packagelistloc="${netbeans.javadoc.dir}/org-netbeans-modules-csl-api"/>	252	<link href="${javadoc.docs.org-netbeans-modules-csl-api}" offline="true" packagelistloc="${netbeans.javadoc.dir}/org-netbeans-modules-csl-api"/>
		253	<link href="${javadoc.docs.org-netbeans-modules-xml-text}" offline="true" packagelistloc="${netbeans.javadoc.dir}/org-netbeans-modules-xml-text"/>

Lines 248-250 Link Here

(-)a/nbbuild/javadoctools/properties.xml (+1 lines)
248	<property name="javadoc.docs.org-netbeans-modules-docker-api" value="${javadoc.web.root}/org-netbeans-modules-docker-api"/>	248	<property name="javadoc.docs.org-netbeans-modules-docker-api" value="${javadoc.web.root}/org-netbeans-modules-docker-api"/>
249	<property name="javadoc.docs.org-netbeans-modules-csl-types" value="${javadoc.web.root}/org-netbeans-modules-csl-types"/>	249	<property name="javadoc.docs.org-netbeans-modules-csl-types" value="${javadoc.web.root}/org-netbeans-modules-csl-types"/>
250	<property name="javadoc.docs.org-netbeans-modules-csl-api" value="${javadoc.web.root}/org-netbeans-modules-csl-api"/>	250	<property name="javadoc.docs.org-netbeans-modules-csl-api" value="${javadoc.web.root}/org-netbeans-modules-csl-api"/>
		251	<property name="javadoc.docs.org-netbeans-modules-xml-text" value="${javadoc.web.root}/org-netbeans-modules-xml-text"/>

Lines 248-250 Link Here

(-)a/nbbuild/javadoctools/replaces.xml (+1 lines)
248	<replacefilter token="@org-netbeans-modules-docker-api@" value="${javadoc.docs.org-netbeans-modules-docker-api}"/>	248	<replacefilter token="@org-netbeans-modules-docker-api@" value="${javadoc.docs.org-netbeans-modules-docker-api}"/>
249	<replacefilter token="@org-netbeans-modules-csl-types@" value="${javadoc.docs.org-netbeans-modules-csl-types}"/>	249	<replacefilter token="@org-netbeans-modules-csl-types@" value="${javadoc.docs.org-netbeans-modules-csl-types}"/>
250	<replacefilter token="@org-netbeans-modules-csl-api@" value="${javadoc.docs.org-netbeans-modules-csl-api}"/>	250	<replacefilter token="@org-netbeans-modules-csl-api@" value="${javadoc.docs.org-netbeans-modules-csl-api}"/>
		251	<replacefilter token="@org-netbeans-modules-xml-text@" value="${javadoc.docs.org-netbeans-modules-xml-text}"/>

Lines 40-49 Link Here

(-)a/spring.beans/nbproject/project.properties (-2 / +2 lines)
40	# Version 2 license, then the option applies only if the new code is	40	# Version 2 license, then the option applies only if the new code is
41	# made subject to such option by the copyright holder.	41	# made subject to such option by the copyright holder.
42		42
43	javac.source=1.7	43	javac.source=1.8
44	javac.compilerargs=-Xlint -Xlint:-serial	44	javac.compilerargs=-Xlint -Xlint:-serial
45		45
46	spec.version.base=1.40.0	46	spec.version.base=1.41.0
47		47
48	test.config.stableBTD.includes=*/Test.class	48	test.config.stableBTD.includes=*/Test.class
49	test.config.stableBTD.excludes=\	49	test.config.stableBTD.excludes=\




                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.editor.document</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>1.0</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.editor.indent</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>

                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.editor.document</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>1.0</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.editor.mimelookup</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>

                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.xml.lexer</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>1.30</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.xml.retriever</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>

                    <compile-dependency/>
                    <run-dependency>
                        <release-version>2</release-version>
                        <specification-version>1.60</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>

                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.util.ui</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>9.3</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.util</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>

                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.util.ui</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>9.3</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.windows</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>

                        <code-name-base>org.openide.text</code-name-base>
                    </test-dependency>
                    <test-dependency>
                        <code-name-base>org.netbeans.modules.lexer.nbbridge</code-name-base>
                    </test-dependency>
                    <test-dependency>
                        <code-name-base>org.openide.util.ui</code-name-base>
                        <compile-dependency/>
                        <test/>

                        <compile-dependency/>
                        <test/>
                    </test-dependency>
                    <test-dependency>
                        <code-name-base>org.netbeans.modules.editor.mimelookup</code-name-base>
                        <compile-dependency/>
                        <test/>
                    </test-dependency>
                </test-type>
            </test-dependencies>
            <friend-packages>




import java.util.List;
import javax.swing.text.BadLocationException;
import javax.swing.text.Document;
import org.netbeans.api.lexer.Token;
import org.netbeans.api.lexer.TokenSequence;
import org.netbeans.api.xml.lexer.XMLTokenId;
import org.netbeans.editor.BaseDocument;
import org.netbeans.editor.TokenContextPath;
import org.netbeans.editor.TokenID;
import org.netbeans.editor.TokenItem;
import org.netbeans.modules.editor.NbEditorUtilities;
import org.netbeans.modules.spring.beans.editor.DocumentContext;
import org.netbeans.modules.xml.text.api.dom.SyntaxElement;
import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
import org.netbeans.modules.xml.text.syntax.XMLKit;
import org.netbeans.modules.xml.text.syntax.XMLSyntaxSupport;
import org.netbeans.modules.xml.text.syntax.dom.EmptyTag;
import org.netbeans.modules.xml.text.syntax.dom.EndTag;
import org.netbeans.modules.xml.text.syntax.dom.StartTag;
import org.netbeans.modules.xml.text.syntax.dom.Tag;
import org.netbeans.spi.editor.completion.CompletionProvider;
import org.openide.filesystems.FileObject;
import org.openide.util.Exceptions;

 * @author Rohan Ranade (Rohan.Ranade@Sun.COM)
 */
public class CompletionContext {
    private List<String> existingAttributes;

    public static enum CompletionType {
        TAG,

        this.caretOffset = caretOffset;
        this.fileObject = NbEditorUtilities.getFileObject(doc);
        this.queryType = queryType;
        try {
            initContext((BaseDocument) doc);
        } catch (BadLocationException ex) {
            Exceptions.printStackTrace(ex);
        }
    }

    private void initContext(BaseDocument bDoc) throws BadLocationException {
        boolean copyResult = copyDocument(bDoc, internalDoc);
        if(!copyResult) {
            return;


        Object sdp = bDoc.getProperty(Document.StreamDescriptionProperty);
        internalDoc.putProperty(Document.StreamDescriptionProperty, sdp);
        this.support = (XMLSyntaxSupport)XMLSyntaxSupport.getSyntaxSupport(internalDoc);
        this.documentContext = DocumentContext.create(internalDoc, caretOffset);

        // get last inserted character from the actual document
        this.lastTypedChar = support.lastTypedChar();

        if(documentContext == null) {
            return;
        }

        Token<XMLTokenId> token = documentContext.getCurrentToken();
        if(token == null) {
            return;
        }

        int tOffset = documentContext.getCurrentTokenOffset();
        String tokenText = token.text().toString();
        XMLTokenId id = token.id();
        int tlen = token.length();
        
        // see issue #191651
        // ExtSyntaxSupport returns token on base of caretoffset and caretoffset+1 which
        //  returns ERROR token at line ending (just "/" means error). In that cases
        //  is fake WS token created with position between previous and current error
        //  token for purposes of CC. Possibly will be extended about more characters.
        if (token.id() == XMLTokenId.ERROR
                && token.text().toString().equals("/")) {
            tokenText = " ";
            id = XMLTokenId.WS;
            tlen = 1;
            tOffset = caretOffset;
        }
        boolean tokenBoundary = (tOffset == caretOffset)
                || ((tOffset + tlen) == caretOffset);

        boolean tokenBoundary = (token.getOffset() == caretOffset)
                || ((token.getOffset() + token.getImage().length()) == caretOffset);

        int id = token.getTokenID().getNumericID();
        SyntaxElement element = documentContext.getCurrentElement();
        switch (id) {
            //user enters < character
            case TEXT:
                String chars = tokenText.trim();
                Token<XMLTokenId> previousTokenItem = support.getPreviousToken(tOffset);
                if (previousTokenItem == null) {
                    completionType = CompletionType.NONE;
                    break;
                }
                String text = previousTokenItem.text().toString().trim();
                if (chars != null && chars.equals("") &&
                        text.equals("/>")) { // NOI18N
                    completionType = CompletionType.NONE;
                    break;
                }
                if (chars != null && chars.equals("") &&
                        text.trim().equals(">")) { // NOI18N
                    completionType = CompletionType.VALUE;
                    break;
                }
                if (chars != null && !chars.equals("<") &&
                        text.trim().equals(">")) { // NOI18N
                    completionType = CompletionType.NONE;
                    break;
                }

                break;

            //start tag of an element
            case TAG:
                if (support.isEndTag(element)) {
                    completionType = CompletionType.NONE;
                    break;
                }
                if (support.isEmptyTag(element)) {
                    if (tokenText.trim().equals("/>")) { // NOI18N
                        Token<XMLTokenId> prevToken = support.getPreviousToken(tOffset);
                        if(prevToken != null && prevToken.id() == XMLTokenId.WS
                                && caretOffset == tOffset) {
                                && caretOffset == token.getOffset()) {
                            completionType = CompletionType.ATTRIBUTE;
                        } else {
                            completionType = CompletionType.NONE;
                        }
                        break;
                    }
                    EmptyTag tag = (EmptyTag) element;
                    if (element.getElementOffset() + 1 == this.caretOffset) {
                        completionType = CompletionType.TAG;
                        break;
                    }
                    String tagName = element.getNode().getNodeName();
                    if (caretOffset > element.getElementOffset() + 1 &&
                            caretOffset <= element.getElementOffset() + 1 + tagName.length()) {
                        completionType = CompletionType.TAG;
                        typedChars = tagName;
                        break;
                    }
                    completionType = CompletionType.ATTRIBUTE;
                    break;
                }

                if (support.isStartTag(element)) {
                    if (tokenText.toString().trim().equals(">")) { // NOI18N
                        Token<XMLTokenId> prevToken = support.getPreviousToken(tOffset);
                        if(prevToken != null && prevToken.id() == XMLTokenId.WS
                                && caretOffset == tOffset) {
                                && caretOffset == token.getOffset()) {
                            completionType = CompletionType.ATTRIBUTE;
                        } else {
                            completionType = CompletionType.NONE;

                        break;
                    }
                    if (element.getElementOffset() + 1 != this.caretOffset) {
                        typedChars = element.getNode().getNodeName();
                        typedChars = tag.getTagName();
                    }
                }
                if (lastTypedChar == '>') {

                break;

            //user enters an attribute name
            case ARGUMENT:
                completionType = CompletionType.ATTRIBUTE;
                typedChars = tokenText.substring(0, caretOffset - tOffset);
                break;

            //some random character
            case CHARACTER:
            //user enters = character, we should ignore all other operators
            case OPERATOR:
                completionType = CompletionType.NONE;
                break;
            //user enters either ' or "
            case VALUE:
                if(!tokenBoundary) {
                    completionType = CompletionType.ATTRIBUTE_VALUE;
                    typedChars = tokenText.subSequence(1, caretOffset - tOffset).toString();
                } else {
                    completionType = CompletionType.NONE;
                }
                break;

            //user enters white-space character
            case WS:
                completionType = CompletionType.NONE;
                int[] offset = new int[1];
                Token<XMLTokenId> prev = support.runWithSequence(tOffset,
                    (TokenSequence ts) -> {
                        Token<XMLTokenId> t  = null;
                        boolean ok;
                        while ((ok = ts.movePrevious())) {
                            t = ts.token();
                            if (t.id() != XMLTokenId.WS) {
                                break;
                            }
                        }
                        if (ok) {
                            offset[0] = ts.offset();
                            return t;
                        } else {
                            return null;
                        }
                    }
                );
                if (prev == null) {
                    completionType = CompletionType.NONE;
                    break;
                }
                int prevOffset = offset[0];
                if(prev.id() == XMLTokenId.ARGUMENT
                        && prevOffset + prev.length() == caretOffset) {
                    typedChars = prev.text().toString();
                    completionType = CompletionType.ATTRIBUTE;
                } else if (((prev.id() == XMLTokenId.VALUE) ||
                        (prev.id() == XMLTokenId.TAG))
                        && !tokenBoundary) {
                    completionType = CompletionType.ATTRIBUTE;
                }

                    try {
                        String docText = src.getText(0, src.getLength());
                        dest.insertString(0, docText, null);
//                        dest.putProperty(Language.class, src.getProperty(Language.class));
                    } catch(BadLocationException ble) {
                        Exceptions.printStackTrace(ble);
                        retVal[0] = false;


    public Node getTag() {
        SyntaxElement element = documentContext.getCurrentElement();
        return element.getType() == Node.ELEMENT_NODE ? element.getNode() : null;
    }

    public Token<XMLTokenId> getCurrentToken() {
        return documentContext.getCurrentToken();
    }
    
    public int getCurrentTokenOffset() {
        return documentContext.getCurrentTokenOffset();
    }
    
    private List<String> getExistingAttributesLocked(TokenSequence ts) {
        List<String> existingAttributes = new ArrayList<String>();
        while (ts.movePrevious()) {
            Token<XMLTokenId> item = ts.token();
            XMLTokenId tokenId = item.id();
            if (tokenId == XMLTokenId.TAG) {
                break;
            }
            if (tokenId == XMLTokenId.ARGUMENT) {
                existingAttributes.add(item.text().toString());
            }
        }
        return existingAttributes;
    }

    public List<String> getExistingAttributes() {
        if (existingAttributes == null) {
            try {
                existingAttributes = (List<String>)support.runWithSequence(
                        documentContext.getCurrentTokenOffset(),
                        this::getExistingAttributesLocked
                );
            } catch (BadLocationException ex) {
                Exceptions.printStackTrace(ex);
                if (tokenId == XMLDefaultTokenContext.ARGUMENT_ID) {
                    existingAttributes.add(item.getImage());
                }
                item = item.getPrevious();
            }
        }

        return existingAttributes;
    }


    public Document getDocument() {
        return internalDoc;
    }

    private class WsToken implements TokenItem {

        private final int caretOffset;
        private final TokenItem currentToken;

        public WsToken(int caretOffset, TokenItem currentToken) {
            this.caretOffset = caretOffset;
            this.currentToken = currentToken;
        }

        @Override
        public TokenID getTokenID() {
            return XMLDefaultTokenContext.WS;
        }

        @Override
        public TokenContextPath getTokenContextPath() {
            return currentToken.getTokenContextPath();
        }

        @Override
        public int getOffset() {
            return caretOffset;
        }

        @Override
        public String getImage() {
            return " ";
        }

        @Override
        public TokenItem getNext() {
            return currentToken;
        }

        @Override
        public TokenItem getPrevious() {
            return currentToken.getPrevious();
        }
    }
}




import org.netbeans.modules.spring.beans.completion.completors.AttributeValueCompletorFactory;
import java.util.HashMap;
import java.util.Map;
import org.netbeans.api.lexer.Token;
import org.netbeans.api.xml.lexer.XMLTokenId;
import org.netbeans.modules.spring.beans.BeansAttributes;
import org.netbeans.modules.spring.beans.BeansElements;
import org.netbeans.modules.spring.beans.completion.completors.BeanDependsOnCompletor;

    
    private Completor getAttributeValueCompletor(CompletionContext context) {
        String tagName = extractVanilaTagName(context.getTag().getNodeName());
        Token<XMLTokenId> attrib = ContextUtilities.getAttributeToken(context.getDocumentContext());
        String attribName = attrib != null ? attrib.text().toString(): null;
        CompletorFactory completorFactory = locateCompletorFactory(tagName, attribName);
        if (completorFactory != null) {
            Completor completor = completorFactory.createCompletor(context.getCaretOffset());

Lines 55-63 Link Here

(-)a/spring.beans/src/org/netbeans/modules/spring/beans/completion/SpringXMLConfigCompletionProvider.java (-7 / +11 lines)
55	import org.netbeans.modules.spring.beans.completion.CompletionContext.CompletionType;	55	import org.netbeans.modules.spring.beans.completion.CompletionContext.CompletionType;
56	import org.netbeans.modules.spring.beans.editor.DocumentContext;	56	import org.netbeans.modules.spring.beans.editor.DocumentContext;
57	import org.netbeans.modules.spring.beans.index.SpringIndex;	57	import org.netbeans.modules.spring.beans.index.SpringIndex;
58	import org.netbeans.modules.xml.text.syntax.SyntaxElement;	58	import org.netbeans.modules.xml.text.api.dom.SyntaxElement;
59	import org.netbeans.modules.xml.text.syntax.XMLSyntaxSupport;	59	import org.netbeans.modules.xml.text.api.dom.TagElement;
60	import org.netbeans.modules.xml.text.syntax.dom.StartTag;	60	import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
61	import org.netbeans.spi.editor.completion.CompletionProvider;	61	import org.netbeans.spi.editor.completion.CompletionProvider;
62	import org.netbeans.spi.editor.completion.CompletionResultSet;	62	import org.netbeans.spi.editor.completion.CompletionResultSet;
63	import org.netbeans.spi.editor.completion.CompletionTask;	63	import org.netbeans.spi.editor.completion.CompletionTask;
Lines 66-71 Link Here
66	import org.openide.filesystems.FileObject;	66	import org.openide.filesystems.FileObject;
67	import org.openide.util.Exceptions;	67	import org.openide.util.Exceptions;
68	import org.w3c.dom.Attr;	68	import org.w3c.dom.Attr;
		69	import org.w3c.dom.NamedNodeMap;
		70	import org.w3c.dom.Node;
69		71
70	/**	72	/**
71	*	73	*
Lines 224-230 Link Here
224		226
225	void updateSchemaLocation(Document doc, final int offset, final String namespace, final String schemaLocation) {	227	void updateSchemaLocation(Document doc, final int offset, final String namespace, final String schemaLocation) {
226	BaseDocument baseDoc = (BaseDocument) doc;	228	BaseDocument baseDoc = (BaseDocument) doc;
227	final XMLSyntaxSupport syntaxSupport = (XMLSyntaxSupport) baseDoc.getSyntaxSupport();	229	final XMLSyntaxSupport syntaxSupport = XMLSyntaxSupport.getSyntaxSupport(doc);
228		230
229	baseDoc.runAtomic(new Runnable() {	231	baseDoc.runAtomic(new Runnable() {
230		232
Lines 232-242 Link Here
232	public void run() {	234	public void run() {
233	try {	235	try {
234	SyntaxElement element = syntaxSupport.getElementChain(offset);	236	SyntaxElement element = syntaxSupport.getElementChain(offset);
235	if (element instanceof StartTag) {	237	if (element.getType() == Node.ELEMENT_NODE &&
236	Attr attr = ((StartTag) element).getAttributeNode("xsi:schemaLocation"); //NOI18N	238	((TagElement)element).isStart()) {
		239	NamedNodeMap nnm = element.getNode().getAttributes();
		240	Attr attr = (Attr)nnm.getNamedItem("xsi:schemaLocation"); //NOI18N
237	if (attr != null) {	241	if (attr != null) {
238	String val = attr.getValue();	242	String val = attr.getValue();
239	if (val.indexOf(namespace) == -1) {	243	if (!val.contains(namespace)) {
240	attr.setValue(val + "\n " + namespace + " " + schemaLocation); //NOI18N	244	attr.setValue(val + "\n " + namespace + " " + schemaLocation); //NOI18N
241	}	245	}
242	}	246	}

Lines 67-73 Link Here

(-)a/spring.beans/src/org/netbeans/modules/spring/beans/completion/completors/AttributeValueCompletor.java (-1 / +1 lines)
67		67
68	@Override	68	@Override
69	protected int initAnchorOffset(CompletionContext context) {	69	protected int initAnchorOffset(CompletionContext context) {
70	return context.getCurrentToken().getOffset() + 1;	70	return context.getCurrentTokenOffset() + 1;
71	}	71	}
72		72
73	@Override	73	@Override

Lines 65-71 Link Here

(-)a/spring.beans/src/org/netbeans/modules/spring/beans/completion/completors/BeanDependsOnCompletor.java (-2 / +2 lines)
65		65
66	@Override	66	@Override
67	protected int initAnchorOffset(CompletionContext context) {	67	protected int initAnchorOffset(CompletionContext context) {
68	int index = context.getCurrentToken().getOffset() + 1;	68	int index = context.getCurrentTokenOffset() + 1;
69	String prefix = context.getTypedPrefix();	69	String prefix = context.getTypedPrefix();
70	if (StringUtils.hasText(prefix)) {	70	if (StringUtils.hasText(prefix)) {
71	int sepOffset = Math.max(Math.max(prefix.lastIndexOf(','), prefix.lastIndexOf(';')), prefix.lastIndexOf(' ')); // NOI18N	71	int sepOffset = Math.max(Math.max(prefix.lastIndexOf(','), prefix.lastIndexOf(';')), prefix.lastIndexOf(' ')); // NOI18N
Lines 97-103 Link Here
97	return Collections.emptySet();	97	return Collections.emptySet();
98	}	98	}
99		99
100	int startIdx = context.getCurrentToken().getOffset() + 1;	100	int startIdx = context.getCurrentTokenOffset() + 1;
101	int length = getAnchorOffset() - startIdx;	101	int length = getAnchorOffset() - startIdx;
102		102
103	if(length <= 0) {	103	if(length <= 0) {

Lines 84-90 Link Here

(-)a/spring.beans/src/org/netbeans/modules/spring/beans/completion/completors/BeanIdCompletor.java (-1 / +1 lines)
84		84
85	@Override	85	@Override
86	protected int initAnchorOffset(CompletionContext context) {	86	protected int initAnchorOffset(CompletionContext context) {
87	return context.getCurrentToken().getOffset() + 1;	87	return context.getCurrentTokenOffset() + 1;
88	}	88	}
89		89
90	@Override	90	@Override

Lines 77-83 Link Here

(-)a/spring.beans/src/org/netbeans/modules/spring/beans/completion/completors/BeansRefCompletor.java (-1 / +1 lines)
77		77
78	@Override	78	@Override
79	protected int initAnchorOffset(CompletionContext context) {	79	protected int initAnchorOffset(CompletionContext context) {
80	return context.getCurrentToken().getOffset() + 1;	80	return context.getCurrentTokenOffset() + 1;
81	}	81	}
82		82
83	@Override	83	@Override





    @Override
    protected int initAnchorOffset(CompletionContext context) {
        int idx = context.getCurrentTokenOffset() + 1;
        String typedChars = context.getTypedPrefix();
        if(typedChars.contains(".") || typedChars.equals("")) { 
            int dotIndex = typedChars.lastIndexOf(".");

        }

        if (typedChars.contains(".") || typedChars.equals("")) { // Switch to normal completion
            doNormalJavaCompletion(js, typedChars, context.getCurrentTokenOffset() + 1);
        } else { // Switch to smart class path completion
            doSmartJavaCompletion(js, typedChars, context.getCurrentTokenOffset() + 1, context.getQueryType());
        }
    }
    

Lines 74-80 Link Here

(-)a/spring.beans/src/org/netbeans/modules/spring/beans/completion/completors/JavaMethodCompletor.java (-1 / +1 lines)
74		74
75	@Override	75	@Override
76	protected int initAnchorOffset(CompletionContext context) {	76	protected int initAnchorOffset(CompletionContext context) {
77	return context.getCurrentToken().getOffset() + 1;	77	return context.getCurrentTokenOffset() + 1;
78	}	78	}
79		79
80	@Override	80	@Override

Lines 71-77 Link Here

(-)a/spring.beans/src/org/netbeans/modules/spring/beans/completion/completors/JavaPackageCompletor.java (-2 / +2 lines)
71		71
72	@Override	72	@Override
73	protected int initAnchorOffset(CompletionContext context) {	73	protected int initAnchorOffset(CompletionContext context) {
74	int idx = context.getCurrentToken().getOffset() + 1;	74	int idx = context.getCurrentTokenOffset() + 1;
75	String typedChars = context.getTypedPrefix();	75	String typedChars = context.getTypedPrefix();
76	if (typedChars.contains(".") \|\| typedChars.equals("")) {	76	if (typedChars.contains(".") \|\| typedChars.equals("")) {
77	int dotIndex = typedChars.lastIndexOf(".");	77	int dotIndex = typedChars.lastIndexOf(".");
Lines 89-95 Link Here
89	return;	89	return;
90	}	90	}
91		91
92	doPackageCompletion(js, typedChars, context.getCurrentToken().getOffset() + 1);	92	doPackageCompletion(js, typedChars, context.getCurrentTokenOffset() + 1);
93	}	93	}
94		94
95	private void doPackageCompletion(JavaSource js, final String typedPrefix, final int substitutionOffset) throws IOException {	95	private void doPackageCompletion(JavaSource js, final String typedPrefix, final int substitutionOffset) throws IOException {





import java.io.IOException;
import java.util.List;
import org.netbeans.api.lexer.Token;
import org.netbeans.api.xml.lexer.XMLTokenId;
import org.netbeans.modules.spring.beans.completion.CompletionContext;
import org.netbeans.modules.spring.beans.completion.Completor;
import org.netbeans.modules.spring.beans.completion.CompletorUtils;


    @Override
    protected int initAnchorOffset(CompletionContext context) {
        return context.getCurrentTokenOffset() + 1;
    }

    @Override
    protected void compute(CompletionContext context) throws IOException {
        Token<XMLTokenId> attribToken = ContextUtilities.getAttributeToken(context.getDocumentContext());
        if (attribToken == null) {
            return;
        }

        String attribName = attribToken.text().toString();
        if (!ContextUtilities.isPNamespaceName(context.getDocumentContext(), attribName)) {
            return;
        }




import org.netbeans.modules.spring.java.Property;
import org.netbeans.modules.spring.java.PropertyFinder;
import org.netbeans.modules.spring.java.PropertyType;
import org.w3c.dom.Node;

/**
 *


    @Override
    protected int initAnchorOffset(CompletionContext context) {
        int idx = context.getCurrentTokenOffset() + 1;
        String typedPrefix = context.getTypedPrefix();
        int offset = typedPrefix.lastIndexOf('.'); // NOI18N
        return idx + offset + 1;

        js.runUserActionTask(new Task<CompilationController>() {

            public void run(CompilationController cc) throws Exception {
                Node beanTag = SpringXMLConfigEditorUtils.getBean(context.getTag());
                if (beanTag == null) {
                    return;
                }

Lines 63-69 Link Here

(-)a/spring.beans/src/org/netbeans/modules/spring/beans/completion/completors/ResourceCompletor.java (-1 / +1 lines)
63		63
64	@Override	64	@Override
65	protected int initAnchorOffset(CompletionContext context) {	65	protected int initAnchorOffset(CompletionContext context) {
66	int idx = context.getCurrentToken().getOffset() + 1;	66	int idx = context.getCurrentTokenOffset() + 1;
67	String typedChars = context.getTypedPrefix();	67	String typedChars = context.getTypedPrefix();
68	int lastSlashIndex = typedChars.lastIndexOf("/"); // NOI18N	68	int lastSlashIndex = typedChars.lastIndexOf("/"); // NOI18N
69	return idx + lastSlashIndex + 1;	69	return idx + lastSlashIndex + 1;





package org.netbeans.modules.spring.beans.editor;

import javax.swing.text.BadLocationException;
import javax.xml.XMLConstants;
import org.netbeans.api.lexer.Token;
import org.netbeans.api.lexer.TokenSequence;
import org.netbeans.api.xml.lexer.XMLTokenId;
import org.netbeans.modules.xml.text.api.dom.SyntaxElement;
import org.netbeans.modules.xml.text.api.dom.TagElement;
import org.openide.util.Exceptions;
import org.w3c.dom.Node;

/**
 *

        return false;
    }
    
    public static boolean isValueToken(Token<XMLTokenId> currentToken) {
        if(currentToken != null) {
            if (currentToken.id() == XMLTokenId.VALUE) {
                return true;
            }
        }

        return false;
    }
    
    public static boolean isTagToken(Token<XMLTokenId> currentToken) {
        if(currentToken != null) {
            if (currentToken.id() == XMLTokenId.TAG) {
                return true;
            }
        }

        return false;
    }
    
    public static boolean isAttributeToken(Token<XMLTokenId> currentToken) {
        if(currentToken != null) {
            if (currentToken.id() == XMLTokenId.ARGUMENT) {
                return true;
            }
        }

        return false;
    }
    
    public static Token<XMLTokenId> getAttributeToken(DocumentContext context) {
        return context.getSyntaxSupport().getAttributeToken(context.getCurrentTokenOffset());
            TokenItem equalsToken = currentToken.getPrevious();
            while(equalsToken.getTokenID().getNumericID() != XMLDefaultTokenContext.OPERATOR_ID) {
                equalsToken = equalsToken.getPrevious();
            }
        
            TokenItem argumentToken = equalsToken.getPrevious();
            while(argumentToken.getTokenID().getNumericID() != XMLDefaultTokenContext.ARGUMENT_ID) {
                argumentToken = argumentToken.getPrevious();
            }
        
            return argumentToken;
        }
        
        return null;
    }
  
    public static Tag getCurrentTagElement(DocumentContext context) {
        SyntaxElement element = context.getCurrentElement();
        if(element instanceof StartTag) {
            return (StartTag) element;
        } else if(element instanceof EmptyTag) {
            return (EmptyTag) element;
        }
        
        return null;
    }
    
    public static TokenItem getAttributeToken(DocumentContext context) {
        if(isValueToken(context.getCurrentToken())) {
            TokenItem equalsToken = context.getCurrentToken().getPrevious();
            while(equalsToken.getTokenID().getNumericID() != XMLDefaultTokenContext.OPERATOR_ID) {
                equalsToken = equalsToken.getPrevious();
            }
        
            TokenItem argumentToken = equalsToken.getPrevious();
            while(argumentToken.getTokenID().getNumericID() != XMLDefaultTokenContext.ARGUMENT_ID) {
                argumentToken = argumentToken.getPrevious();
            }
        
            return argumentToken;
        }
        
        return null;
    }
    
    public static String getAttributeTokenImage(DocumentContext context) {
        Token<XMLTokenId> tok = getAttributeToken(context);
        if(tok != null) {
            return tok.text().toString();
        }
        
        return null;

        return nodeName.substring(0, colonIndex);
    }
    
    public static SyntaxElement getRoot(SyntaxElement se) {
        SyntaxElement root = null;
        while( se != null) {
            if(se.getType() == Node.ELEMENT_NODE &&
               ((TagElement)se).isStart()) {
                root = se;
            }
            se = se.getPrevious();
        }




import java.util.Map.Entry;
import javax.swing.text.BadLocationException;
import javax.swing.text.Document;
import org.netbeans.api.lexer.Token;
import org.netbeans.api.lexer.TokenSequence;
import org.netbeans.api.xml.lexer.XMLTokenId;
import org.netbeans.modules.xml.text.api.dom.SyntaxElement;
import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
import org.netbeans.modules.xml.text.syntax.dom.StartTag;
import org.netbeans.modules.xml.text.syntax.dom.Tag;
import org.w3c.dom.Attr;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;

    private XMLSyntaxSupport syntaxSupport;
    private int caretOffset = -1;
    private SyntaxElement element;
    private Token<XMLTokenId> token;
    private int tokenOffset;
    private HashMap<String, String> declaredNamespaces =
            new HashMap<String, String>();


    
    private DocumentContext(Document document, int caretOffset) throws BadLocationException {
        this.document = document;
        this.syntaxSupport = XMLSyntaxSupport.getSyntaxSupport(document);
        this.caretOffset = caretOffset;
        initialize();
    }

    private void initialize() throws BadLocationException {
        element = syntaxSupport.getElementChain(caretOffset);
        syntaxSupport.runWithSequence(caretOffset, 
            (TokenSequence ts) -> {
                token = syntaxSupport.getNextToken(caretOffset);
                tokenOffset = ts.offset();
                return null;
            }
        );
        populateNamespaces();
    }
    
    public XMLSyntaxSupport getSyntaxSupport() {
        return syntaxSupport;
    }
    
    public <T> T runWithTokenSequence(int offset, XMLSyntaxSupport.SequenceCallable<T> callable) throws BadLocationException {
        return syntaxSupport.runWithSequence(offset, callable);
    }

    public int getCurrentTokenOffset() {
        return tokenOffset;
    }
    
    public Token<XMLTokenId> getCurrentToken() {
        return token;
    }

    public String getCurrentTokenImage() {
        return token.text().toString();
    }

    public SyntaxElement getCurrentElement() {

    private void populateNamespaces() {
        // Find the a start or empty tag just before the current syntax element.
        SyntaxElement element = this.element;
        while (element != null && !(syntaxSupport.isStartTag(element)) && !(syntaxSupport.isEmptyTag(element))) {
            element = element.getPrevious();
        }
        if (element == null) {


        // To find all namespace declarations active at the caret offset, we
        // need to look at xmlns attributes of the current element and its ancestors.
        while (element != null) {
            Node node = element.getNode();
            if (syntaxSupport.isStartTag(element) || syntaxSupport.isEmptyTag(element)) {
                NamedNodeMap attributes = node.getAttributes();
                for (int index = 0; index < attributes.getLength(); index++) {
                    Attr attr = (Attr) attributes.item(index);
                    String attrName = attr.getName();

                    }
                }
            }
            element = element.getParentElement();
        }
    }
    
    public int getNodeOffset(Node n) {
        return syntaxSupport.getNodeOffset(n);
    }
    
    public boolean isTag(SyntaxElement e) {
        return syntaxSupport.isStartTag(e) || syntaxSupport.isEmptyTag(e) || syntaxSupport.isEndTag(e);
    }
}




import javax.swing.text.BadLocationException;
import javax.swing.text.Document;
import javax.swing.text.StyledDocument;
import org.netbeans.api.lexer.Token;
import org.netbeans.api.lexer.TokenSequence;
import org.netbeans.api.xml.lexer.XMLTokenId;
import org.netbeans.modules.spring.api.Action;
import org.netbeans.modules.spring.api.beans.model.Location;
import org.netbeans.modules.spring.api.beans.model.SpringBean;

import org.netbeans.modules.spring.beans.BeansAttributes;
import org.netbeans.modules.spring.beans.BeansElements;
import org.netbeans.modules.spring.beans.utils.StringUtils;
import org.netbeans.modules.xml.text.api.dom.SyntaxElement;
import org.netbeans.modules.xml.text.api.dom.TagElement;
import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
import org.netbeans.modules.xml.text.syntax.dom.StartTag;
import org.netbeans.modules.xml.text.syntax.dom.Tag;
import org.openide.cookies.EditorCookie;
import org.openide.cookies.LineCookie;
import org.openide.cookies.OpenCookie;

        return "set" + String.valueOf(buffer); // NOI18N
    }

    public static String getBeanFactoryMethod(Node tag) {
        Node bean = getBean(tag);
        if (bean != null) {
            NamedNodeMap attribs = bean.getAttributes();

        return null;
    }

    public static final Node getDocumentRoot(Document doc) {
        Node retTag = null;
        //  Temporary fix for IZ#155008 until Lexer migration
        XMLSyntaxSupport syntaxSupport = null;
        try {
            syntaxSupport = XMLSyntaxSupport.getSyntaxSupport(doc);
        } catch (ClassCastException cce) {
            LOGGER.log(Level.FINE, cce.getMessage());
            syntaxSupport = XMLSyntaxSupport.createSyntaxSupport(doc);
        }
        if (syntaxSupport == null) return retTag;
        try {
            Token<XMLTokenId> tok = syntaxSupport.getNextToken(1);
            if(tok != null) {
                int off = syntaxSupport.runWithSequence(0, (TokenSequence s) -> {
                    s.move(0);
                    while (s.moveNext()) {
                        Token<XMLTokenId> t = s.token();
                        if (ContextUtilities.isTagToken(t)) {
                            return s.offset() + t.length();
                        }
                    }
                    return -1;
                });
                if (off == -1) {
                    return null;
                }
                SyntaxElement element = syntaxSupport.getElementChain(off);
                if (element != null && element.getType() == Node.ELEMENT_NODE) {
                    TagElement te = (TagElement)element;
                    if (te.isStart() || te.isSelfClosing()) {
                        if(te.getNode().getParentNode() instanceof org.w3c.dom.Document) {
                            return te.getNode();
                        }
                    }
                }
            }

Lines 47-60 Link Here

(-)a/spring.beans/src/org/netbeans/modules/spring/beans/hyperlink/HyperlinkEnv.java (-16 / +16 lines)
47	import java.util.HashMap;	47	import java.util.HashMap;
48	import java.util.Map;	48	import java.util.Map;
49	import javax.swing.text.Document;	49	import javax.swing.text.Document;
		50	import org.netbeans.api.lexer.Token;
		51	import org.netbeans.api.xml.lexer.XMLTokenId;
50	import org.netbeans.editor.BaseDocument;	52	import org.netbeans.editor.BaseDocument;
51	import org.netbeans.editor.TokenItem;
52	import org.netbeans.modules.editor.NbEditorUtilities;	53	import org.netbeans.modules.editor.NbEditorUtilities;
53	import org.netbeans.modules.spring.beans.editor.ContextUtilities;	54	import org.netbeans.modules.spring.beans.editor.ContextUtilities;
54	import org.netbeans.modules.spring.beans.editor.DocumentContext;	55	import org.netbeans.modules.spring.beans.editor.DocumentContext;
55	import org.netbeans.modules.spring.beans.editor.SpringXMLConfigEditorUtils;	56	import org.netbeans.modules.spring.beans.editor.SpringXMLConfigEditorUtils;
56	import org.netbeans.modules.xml.text.syntax.SyntaxElement;	57	import org.netbeans.modules.xml.text.api.dom.SyntaxElement;
57	import org.netbeans.modules.xml.text.syntax.dom.Tag;
58	import org.openide.filesystems.FileObject;	58	import org.openide.filesystems.FileObject;
59	import org.w3c.dom.NamedNodeMap;	59	import org.w3c.dom.NamedNodeMap;
60	import org.w3c.dom.Node;	60	import org.w3c.dom.Node;
Lines 110-116 Link Here
110	}	110	}
111		111
112	private void initialize() {	112	private void initialize() {
113	Tag currentTag = null;	113	SyntaxElement currentTag = null;
114	DocumentContext documentContext = DocumentContext.create(baseDocument, offset);	114	DocumentContext documentContext = DocumentContext.create(baseDocument, offset);
115	if (documentContext == null) {	115	if (documentContext == null) {
116	return;	116	return;
Lines 118-160 Link Here
118		118
119	declaredNamespaces = documentContext.getDeclaredNamespacesMap();	119	declaredNamespaces = documentContext.getDeclaredNamespacesMap();
120		120
121	TokenItem token = documentContext.getCurrentToken();	121	Token<XMLTokenId> token = documentContext.getCurrentToken();
122	if (token == null) {	122	if (token == null) {
123	return;	123	return;
124	}	124	}
125		125
126	tokenStartOffset = token.getOffset();	126	tokenStartOffset = documentContext.getCurrentTokenOffset();
127	tokenEndOffset = tokenStartOffset + token.getImage().length();	127	tokenEndOffset = tokenStartOffset + token.length();
128	tokenImage = token.getImage();	128	tokenImage = token.text().toString();
129		129
130	if (ContextUtilities.isValueToken(token)	130	if (ContextUtilities.isValueToken(token)
131	\|\| ContextUtilities.isAttributeToken(documentContext.getCurrentToken())) {	131	\|\| ContextUtilities.isAttributeToken(documentContext.getCurrentToken())) {
132	SyntaxElement element = documentContext.getCurrentElement();	132	SyntaxElement element = documentContext.getCurrentElement();
133	if (element instanceof Tag) {	133	if (documentContext.isTag(element)) {
134	currentTag = (Tag) element;	134	currentTag = element;
135	} else {	135	} else {
136	return;	136	return;
137	}	137	}
138	Tag beanTag = (Tag) SpringXMLConfigEditorUtils.getBean(currentTag);	138	Node beanTag = SpringXMLConfigEditorUtils.getBean(currentTag.getNode());
139	if (beanTag != null) {	139	if (beanTag != null) {
140	beanTagOffset = beanTag.getElementOffset();	140	beanTagOffset = documentContext.getNodeOffset(beanTag);
141	beanAttribs = collectAttributes(beanTag);	141	beanAttribs = collectAttributes(beanTag);
142	}	142	}
143	tagName = currentTag.getNodeName();	143	tagName = currentTag.getNode().getNodeName();
144	}	144	}
145		145
146	if (ContextUtilities.isValueToken(token)) {	146	if (ContextUtilities.isValueToken(token)) {
147	type = Type.ATTRIB_VALUE;	147	type = Type.ATTRIB_VALUE;
148	attribName = ContextUtilities.getAttributeTokenImage(documentContext);	148	attribName = ContextUtilities.getAttributeTokenImage(documentContext);
149	valueString = token.getImage();	149	valueString = token.text().toString();
150	valueString = valueString.substring(1, valueString.length() - 1); // Strip quotes	150	valueString = valueString.substring(1, valueString.length() - 1); // Strip quotes
151	} else if (ContextUtilities.isAttributeToken(documentContext.getCurrentToken())) {	151	} else if (ContextUtilities.isAttributeToken(documentContext.getCurrentToken())) {
152	type = Type.ATTRIB;	152	type = Type.ATTRIB;
153	attribName = token.getImage();	153	attribName = token.text().toString();
154	}	154	}
155	}	155	}
156		156
157	private Map<String, String> collectAttributes(Tag currentTag) {	157	private Map<String, String> collectAttributes(Node currentTag) {
158	Map<String, String> attribsMap = new HashMap<String, String>();	158	Map<String, String> attribsMap = new HashMap<String, String>();
159	NamedNodeMap attribsNodeMap = currentTag.getAttributes();	159	NamedNodeMap attribsNodeMap = currentTag.getAttributes();
160	for(int i = 0; i < attribsNodeMap.getLength(); i++) {	160	for(int i = 0; i < attribsNodeMap.getLength(); i++) {




import org.netbeans.modules.spring.beans.utils.StringUtils;
import org.netbeans.modules.spring.java.Public;
import org.netbeans.modules.spring.java.Static;
import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;

/**
 * Provides hyperlinking functionality for Spring XML Configuration files

        if (!(document instanceof BaseDocument)) {
            return false;
        }
        if (XMLSyntaxSupport.getSyntaxSupport(document) == null) {
        BaseDocument doc = (BaseDocument) document;
        if (!(doc.getSyntaxSupport() instanceof XMLSyntaxSupport)) {
            return false;
        }


Lines 67-73 Link Here

(-)a/spring.beans/src/org/netbeans/modules/spring/beans/model/impl/ConfigFileSpringBeanSource.java (-5 / +9 lines)
67	import org.netbeans.modules.spring.beans.editor.SpringXMLConfigEditorUtils;	67	import org.netbeans.modules.spring.beans.editor.SpringXMLConfigEditorUtils;
68	import org.netbeans.modules.spring.beans.model.SpringBeanSource;	68	import org.netbeans.modules.spring.beans.model.SpringBeanSource;
69	import org.netbeans.modules.spring.beans.utils.StringUtils;	69	import org.netbeans.modules.spring.beans.utils.StringUtils;
70	import org.netbeans.modules.xml.text.syntax.dom.Tag;	70	import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
71	import org.openide.filesystems.FileObject;	71	import org.openide.filesystems.FileObject;
72	import org.openide.filesystems.FileUtil;	72	import org.openide.filesystems.FileUtil;
73	import org.w3c.dom.NamedNodeMap;	73	import org.w3c.dom.NamedNodeMap;
Lines 145-150 Link Here
145		145
146	private static final String REF_SUFFIX = "-ref"; // NOI18N	146	private static final String REF_SUFFIX = "-ref"; // NOI18N
147	private static final String NULL_PREFIX = "null_prefix";	147	private static final String NULL_PREFIX = "null_prefix";
		148
		149	private XMLSyntaxSupport support;
148		150
149	public DocumentParser(File file, Document document) {	151	public DocumentParser(File file, Document document) {
150	this.file = file;	152	this.file = file;
Lines 160-165 Link Here
160	if (rootNode == null) {	162	if (rootNode == null) {
161	return;	163	return;
162	}	164	}
		165	support = XMLSyntaxSupport.getSyntaxSupport(document);
163	NodeList childNodes = rootNode.getChildNodes();	166	NodeList childNodes = rootNode.getChildNodes();
164		167
165	// prefixesMap caches the prefixes for tag nemes	168	// prefixesMap caches the prefixes for tag nemes
Lines 198-205 Link Here
198	String parent = getTrimmedAttr(node, BeansAttributes.PARENT);	201	String parent = getTrimmedAttr(node, BeansAttributes.PARENT);
199	String factoryBean = getTrimmedAttr(node, BeansAttributes.FACTORY_BEAN);	202	String factoryBean = getTrimmedAttr(node, BeansAttributes.FACTORY_BEAN);
200	String factoryMethod = getTrimmedAttr(node, BeansAttributes.FACTORY_METHOD);	203	String factoryMethod = getTrimmedAttr(node, BeansAttributes.FACTORY_METHOD);
201	Tag tag = (Tag)node;	204	Location location = new ConfigFileLocation(FileUtil.toFileObject(file),
202	Location location = new ConfigFileLocation(FileUtil.toFileObject(file), tag.getElementOffset());	205	support.getNodeOffset(node));
203	Set<SpringBeanProperty> properties = parseBeanProperties(node, prefixesMap);	206	Set<SpringBeanProperty> properties = parseBeanProperties(node, prefixesMap);
204	ConfigFileSpringBean bean = new ConfigFileSpringBean(id, names, clazz, parent, factoryBean, factoryMethod, properties, location);	207	ConfigFileSpringBean bean = new ConfigFileSpringBean(id, names, clazz, parent, factoryBean, factoryMethod, properties, location);
205	if (id != null) {	208	if (id != null) {
Lines 227-236 Link Here
227	}	230	}
228		231
229	// P Namespace items	232	// P Namespace items
230	String tagName = ((Tag)node).getTagName();	233	String tagName = node.getNodeName();
231	String prefix = prefixesMap.get(tagName);	234	String prefix = prefixesMap.get(tagName);
232	if (prefix == null) {	235	if (prefix == null) {
233	prefix = SpringXMLConfigEditorUtils.getPNamespacePrefix(document, ((Tag)node).getElementOffset());	236	prefix = SpringXMLConfigEditorUtils.getPNamespacePrefix(document,
		237	support.getNodeOffset(node));
234	if (prefix == null) {	238	if (prefix == null) {
235	// this is caching the case when prefix declaration is missing	239	// this is caching the case when prefix declaration is missing
236	prefixesMap.put(tagName, NULL_PREFIX);	240	prefixesMap.put(tagName, NULL_PREFIX);




package org.netbeans.modules.spring.beans.refactoring;

import javax.swing.text.BadLocationException;
import org.netbeans.api.lexer.Token;
import org.netbeans.api.lexer.TokenSequence;
import org.netbeans.api.xml.lexer.XMLTokenId;
import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
import org.netbeans.modules.xml.text.syntax.XMLSyntaxSupport;

/**
 *


    public boolean find(String attrName) throws BadLocationException {
        foundOffset = -1;
        Token<XMLTokenId> item = syntaxSupport.getNextToken(start);
        if (item == null || item.id() != XMLTokenId.TAG) {
        if (item == null || item.getTokenID() != XMLDefaultTokenContext.TAG) {
            return false;
        }
        return syntaxSupport.runWithSequence(start, (TokenSequence s) -> {
            String currentAttrName = null;
            while (s.moveNext()) {
                Token<XMLTokenId> t = s.token();
                XMLTokenId id = t.id();
                if (id == XMLTokenId.ARGUMENT) {
                    currentAttrName = t.text().toString();
                    if (currentAttrName != null && currentAttrName.equals(attrName)) {
                        foundOffset = s.offset();
                        return true;
                    }
                } else if (id == XMLTokenId.TAG) {
                    break;
                }
           } 
           return false;
        });
            item = item.getNext();
        }
        return false;
    }

    public int getFoundOffset() {




package org.netbeans.modules.spring.beans.refactoring;

import javax.swing.text.BadLocationException;
import org.netbeans.api.lexer.Token;
import org.netbeans.api.lexer.TokenSequence;
import org.netbeans.api.xml.lexer.XMLTokenId;
import org.netbeans.editor.SyntaxSupport;
import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
import org.netbeans.editor.TokenItem;
import org.netbeans.editor.ext.ExtSyntaxSupport;
import org.netbeans.modules.xml.text.api.XMLDefaultTokenContext;

/**
 *

 */
public class AttributeValueFinder {

    private final XMLSyntaxSupport xmlSupport;
    private final int start;

    private int foundOffset = -1;
    private String foundValue;

    public AttributeValueFinder(SyntaxSupport syntaxSupport, int start) {
        this.syntaxSupport = syntaxSupport;
        this.start = start;
        this.xmlSupport = XMLSyntaxSupport.getSyntaxSupport(syntaxSupport.getDocument());
    }

    public AttributeValueFinder(XMLSyntaxSupport syntaxSupport, int start) {
        this.start = start;
        this.xmlSupport = syntaxSupport;
    }

    public boolean find(String attrName) throws BadLocationException {
        foundOffset = -1;
        foundValue = null;
        if (xmlSupport == null) {
        if (!(syntaxSupport instanceof ExtSyntaxSupport)) {
            return false;
        }
        Token<XMLTokenId> item = xmlSupport.getNextToken(start);
        if (item == null || item.id() != XMLTokenId.TAG) {
        if (item == null || item.getTokenID() != XMLDefaultTokenContext.TAG) {
            return false;
        }
        return xmlSupport.runWithSequence(start, (TokenSequence s) -> {
            String currentAttrName = null;
            while (s.moveNext()) {
                Token<XMLTokenId> t = s.token();
                XMLTokenId id = t.id();
                if (id == XMLTokenId.ARGUMENT) {
                    currentAttrName = t.text().toString();
                } else if (id == XMLTokenId.VALUE) {
                    if (currentAttrName != null && currentAttrName.equals(attrName)) {
                        foundOffset = s.offset();
                        foundValue = t.text().toString();
                        return true;
                    }
                } else if (id == XMLTokenId.TAG) {
                    break;
                }
            } else if (id == XMLDefaultTokenContext.TAG) {
                break;
            }
            return false;
        });
        return false;
    }

    public int getFoundOffset() {




import org.netbeans.modules.spring.beans.BeansElements;
import org.netbeans.modules.spring.beans.editor.SpringXMLConfigEditorUtils;
import org.netbeans.modules.spring.beans.utils.StringUtils;
import org.netbeans.modules.xml.text.api.dom.SyntaxElement;
import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
import org.netbeans.modules.xml.text.syntax.dom.StartTag;
import org.netbeans.modules.xml.text.syntax.dom.Tag;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;


        foundOffset = -1;
        value = null;
        SyntaxElement beanElement = syntaxSupport.getElementChain(start+1);
        if (!syntaxSupport.isStartTag(beanElement)) {
            return false;
        }
        
        Node beanTag = beanElement.getNode();
        if(!BeansElements.BEAN.equals(beanTag.getNodeName())) {
            return false;
        }

            if(BeansElements.PROPERTY.equals(n.getNodeName())) {
                String name = SpringXMLConfigEditorUtils.getAttribute(n, BeansAttributes.NAME);
                if(StringUtils.hasText(name) && propertyName.equals(name)) {
                    AttributeValueFinder delegate = new AttributeValueFinder(
                            syntaxSupport, 
                            syntaxSupport.getNodeOffset(n));
                    boolean retVal = delegate.find(BeansAttributes.NAME);
                    foundOffset = delegate.getFoundOffset();
                    value = delegate.getValue();




import javax.lang.model.element.TypeElement;
import javax.lang.model.type.TypeMirror;
import javax.swing.text.BadLocationException;
import javax.swing.text.Document;
import javax.swing.text.Position.Bias;
import org.netbeans.api.java.source.CompilationController;
import org.netbeans.api.java.source.ElementHandle;

import org.netbeans.modules.spring.java.Property;
import org.netbeans.modules.spring.java.PropertyFinder;
import org.netbeans.modules.spring.java.PropertyType;
import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
import org.openide.filesystems.FileObject;
import org.openide.text.PositionBounds;
import org.openide.text.PositionRef;

    public PropertyRefFinder(DocumentAccess docAccess, CompilationController cc, RenamedProperty renamedProperty) {
        this.docAccess = docAccess;
        BaseDocument document = (BaseDocument) docAccess.getDocument();
        syntaxSupport = XMLSyntaxSupport.getSyntaxSupport(document);
        this.cc = cc;
        this.renamedProperty = renamedProperty;
    }

        }

        // p-namespace
        Document document = syntaxSupport.getDocument();
        String prefix = SpringXMLConfigEditorUtils.getPNamespacePrefix(document, beanOffset);
        if (prefix == null) {
            return;

Lines 51-56 Link Here

(-)a/spring.beans/test/unit/src/org/netbeans/modules/spring/beans/TestUtils.java (+3 lines)
51	import java.io.FileOutputStream;	51	import java.io.FileOutputStream;
52	import java.io.IOException;	52	import java.io.IOException;
53	import java.io.InputStream;	53	import java.io.InputStream;
		54	import org.netbeans.api.lexer.Language;
		55	import org.netbeans.api.xml.lexer.XMLTokenId;
54	import org.netbeans.editor.BaseDocument;	56	import org.netbeans.editor.BaseDocument;
55	import org.netbeans.modules.spring.api.beans.SpringConstants;	57	import org.netbeans.modules.spring.api.beans.SpringConstants;
56	import org.openide.filesystems.FileUtil;	58	import org.openide.filesystems.FileUtil;
Lines 92-97 Link Here
92	public static BaseDocument createSpringXMLConfigDocument(String content) throws Exception {	94	public static BaseDocument createSpringXMLConfigDocument(String content) throws Exception {
93	Class<?> kitClass = CloneableEditorSupport.getEditorKit(SpringConstants.CONFIG_MIME_TYPE).getClass();	95	Class<?> kitClass = CloneableEditorSupport.getEditorKit(SpringConstants.CONFIG_MIME_TYPE).getClass();
94	BaseDocument doc = new BaseDocument(kitClass, false);	96	BaseDocument doc = new BaseDocument(kitClass, false);
		97	doc.putProperty(Language.class, XMLTokenId.language());
95	doc.insertString(0, content, null);	98	doc.insertString(0, content, null);
96	return doc;	99	return doc;
97	}	100	}

Lines 44-51 Link Here

(-)a/spring.beans/test/unit/src/org/netbeans/modules/spring/beans/completion/CompletionContextTest.java (-2 / +15 lines)
44		44
45	package org.netbeans.modules.spring.beans.completion;	45	package org.netbeans.modules.spring.beans.completion;
46		46
47	import junit.framework.TestCase;	47	import org.netbeans.api.editor.mimelookup.MimePath;
		48	import org.netbeans.api.editor.mimelookup.test.MockMimeLookup;
		49	import org.netbeans.api.xml.lexer.XMLTokenId;
48	import org.netbeans.editor.BaseDocument;	50	import org.netbeans.editor.BaseDocument;
		51	import org.netbeans.junit.NbTestCase;
49	import org.netbeans.modules.spring.beans.TestUtils;	52	import org.netbeans.modules.spring.beans.TestUtils;
50	import org.netbeans.modules.spring.beans.completion.CompletionContext.CompletionType;	53	import org.netbeans.modules.spring.beans.completion.CompletionContext.CompletionType;
51	import static org.netbeans.spi.editor.completion.CompletionProvider.COMPLETION_QUERY_TYPE;	54	import static org.netbeans.spi.editor.completion.CompletionProvider.COMPLETION_QUERY_TYPE;
Lines 54-60 Link Here
54	*	57	*
55	* @author Rohan Ranade (Rohan.Ranade@Sun.COM)	58	* @author Rohan Ranade (Rohan.Ranade@Sun.COM)
56	*/	59	*/
57	public class CompletionContextTest extends TestCase {	60	public class CompletionContextTest extends NbTestCase {
		61
		62	public CompletionContextTest(String name) {
		63	super(name);
		64	}
		65
		66	@Override
		67	protected void setUp() throws Exception {
		68	MockMimeLookup.setInstances(MimePath.parse("text/xml"), XMLTokenId.language());
		69	super.setUp();
		70	}
58		71
59	public void testAttributeValueCompletion() throws Exception {	72	public void testAttributeValueCompletion() throws Exception {
60	String config = TestUtils.createXMLConfigText("<bean id='petStore' " +	73	String config = TestUtils.createXMLConfigText("<bean id='petStore' " +

Lines 48-54 Link Here

(-)a/spring.beans/test/unit/src/org/netbeans/modules/spring/beans/refactoring/AttributeFinderTest.java (-2 / +2 lines)
48	import junit.framework.TestCase;	48	import junit.framework.TestCase;
49	import org.netbeans.editor.BaseDocument;	49	import org.netbeans.editor.BaseDocument;
50	import org.netbeans.modules.spring.beans.TestUtils;	50	import org.netbeans.modules.spring.beans.TestUtils;
51	import org.netbeans.modules.xml.text.syntax.XMLSyntaxSupport;	51	import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
52		52
53	/**	53	/**
54	*	54	*
Lines 63-69 Link Here
63	public void testFind() throws Exception {	63	public void testFind() throws Exception {
64	final String contents = TestUtils.createXMLConfigText("<bean id='foo' class='org.example.Foo'><ref></ref></bean>");	64	final String contents = TestUtils.createXMLConfigText("<bean id='foo' class='org.example.Foo'><ref></ref></bean>");
65	BaseDocument doc = TestUtils.createSpringXMLConfigDocument(contents);	65	BaseDocument doc = TestUtils.createSpringXMLConfigDocument(contents);
66	final XMLSyntaxSupport syntaxSupport = (XMLSyntaxSupport)doc.getSyntaxSupport();	66	final XMLSyntaxSupport syntaxSupport = XMLSyntaxSupport.getSyntaxSupport(doc);
67	doc.render(new Runnable() {	67	doc.render(new Runnable() {
68	public void run() {	68	public void run() {
69	int beanOffset = contents.indexOf("<bean ");	69	int beanOffset = contents.indexOf("<bean ");

Lines 48-54 Link Here

(-)a/spring.beans/test/unit/src/org/netbeans/modules/spring/beans/refactoring/AttributeValueFinderTest.java (-2 / +2 lines)
48	import junit.framework.TestCase;	48	import junit.framework.TestCase;
49	import org.netbeans.editor.BaseDocument;	49	import org.netbeans.editor.BaseDocument;
50	import org.netbeans.modules.spring.beans.TestUtils;	50	import org.netbeans.modules.spring.beans.TestUtils;
51	import org.netbeans.modules.xml.text.syntax.XMLSyntaxSupport;	51	import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
52		52
53	/**	53	/**
54	*	54	*
Lines 63-69 Link Here
63	public void testFind() throws Exception {	63	public void testFind() throws Exception {
64	final String contents = TestUtils.createXMLConfigText("<bean id='foo' class='org.example.Foo'><ref></ref></bean>");	64	final String contents = TestUtils.createXMLConfigText("<bean id='foo' class='org.example.Foo'><ref></ref></bean>");
65	BaseDocument doc = TestUtils.createSpringXMLConfigDocument(contents);	65	BaseDocument doc = TestUtils.createSpringXMLConfigDocument(contents);
66	final XMLSyntaxSupport syntaxSupport = (XMLSyntaxSupport)doc.getSyntaxSupport();	66	final XMLSyntaxSupport syntaxSupport = XMLSyntaxSupport.getSyntaxSupport(doc);
67	doc.render(new Runnable() {	67	doc.render(new Runnable() {
68	public void run() {	68	public void run() {
69	int beanOffset = contents.indexOf("<bean ");	69	int beanOffset = contents.indexOf("<bean ");

Lines 46-52 Link Here

(-)a/spring.beans/test/unit/src/org/netbeans/modules/spring/beans/refactoring/PropertyChildFinderTest.java (-2 / +2 lines)
46	import junit.framework.TestCase;	46	import junit.framework.TestCase;
47	import org.netbeans.editor.BaseDocument;	47	import org.netbeans.editor.BaseDocument;
48	import org.netbeans.modules.spring.beans.TestUtils;	48	import org.netbeans.modules.spring.beans.TestUtils;
49	import org.netbeans.modules.xml.text.syntax.XMLSyntaxSupport;	49	import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
50		50
51	/**	51	/**
52	*	52	*
Lines 61-67 Link Here
61	public void testFind() throws Exception {	61	public void testFind() throws Exception {
62	final String contents = TestUtils.createXMLConfigText("<bean id='foo' class='org.example.Foo'><property name='foobar' value='sample'/></bean>");	62	final String contents = TestUtils.createXMLConfigText("<bean id='foo' class='org.example.Foo'><property name='foobar' value='sample'/></bean>");
63	BaseDocument doc = TestUtils.createSpringXMLConfigDocument(contents);	63	BaseDocument doc = TestUtils.createSpringXMLConfigDocument(contents);
64	final XMLSyntaxSupport syntaxSupport = (XMLSyntaxSupport)doc.getSyntaxSupport();	64	final XMLSyntaxSupport syntaxSupport = XMLSyntaxSupport.getSyntaxSupport(doc);
65		65
66	doc.render(new Runnable() {	66	doc.render(new Runnable() {
67	public void run() {	67	public void run() {

Lines 40-46 Link Here

(-)a/web.beans/nbproject/project.properties (-1 / +1 lines)
40	# Version 2 license, then the option applies only if the new code is	40	# Version 2 license, then the option applies only if the new code is
41	# made subject to such option by the copyright holder	41	# made subject to such option by the copyright holder
42		42
43	javac.source=1.7	43	javac.source=1.8
44	requires.nb.javac=true	44	requires.nb.javac=true
45		45
46	test-unit-sys-prop.java.awt.headless=true	46	test-unit-sys-prop.java.awt.headless=true




                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.xml.lexer</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>1.30</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.xml.retriever</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>

                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.util.ui</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>9.3</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.util</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>

                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.util.ui</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>9.3</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.windows</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>

Lines 46-54 Link Here

(-)a/web.beans/src/org/netbeans/modules/web/beans/completion/BeansCompletionManager.java (-5 / +7 lines)
46	import java.util.HashMap;	46	import java.util.HashMap;
47	import java.util.List;	47	import java.util.List;
48	import java.util.Map;	48	import java.util.Map;
		49	import org.netbeans.api.lexer.Token;
		50	import org.netbeans.api.xml.lexer.XMLTokenId;
49	import org.netbeans.editor.TokenItem;	51	import org.netbeans.editor.TokenItem;
50	import org.netbeans.modules.xml.text.syntax.SyntaxElement;	52	import org.netbeans.modules.xml.text.api.dom.SyntaxElement;
51	import org.netbeans.modules.xml.text.syntax.dom.StartTag;	53	import org.w3c.dom.Node;
52		54
53	/**	55	/**
54	* This class figures out the completion items for various attributes	56	* This class figures out the completion items for various attributes
Lines 88-95 Link Here
88	}	90	}
89		91
90	String tagName = context.getTag().getNodeName();	92	String tagName = context.getTag().getNodeName();
91	TokenItem attrib = ContextUtilities.getAttributeToken(context.getCurrentToken());	93	Token<XMLTokenId> attrib = ContextUtilities.getAttributeToken(context.getDocumentContext());
92	String attribName = attrib != null ? attrib.getImage() : null;	94	String attribName = attrib != null ? attrib.text().toString(): null;
93		95
94	BeansCompletor completor = locateCompletor(tagName, attribName);	96	BeansCompletor completor = locateCompletor(tagName, attribName);
95	if (completor != null) {	97	if (completor != null) {
Lines 108-114 Link Here
108	SyntaxElement curElem = docContext.getCurrentElement();	110	SyntaxElement curElem = docContext.getCurrentElement();
109	SyntaxElement prevElem = docContext.getCurrentElement().getPrevious();	111	SyntaxElement prevElem = docContext.getCurrentElement().getPrevious();
110		112
111	String tagName = (curElem instanceof StartTag) ? ((StartTag) curElem).getTagName() : ((prevElem instanceof StartTag) ? ((StartTag) prevElem).getTagName() : null);	113	String tagName = curElem.getType() == Node.ELEMENT_NODE ? curElem.getNode().getNodeName() : null;
112	BeansCompletor completor = locateCompletor(tagName, null);	114	BeansCompletor completor = locateCompletor(tagName, null);
113	if (completor != null) {	115	if (completor != null) {
114	valueItems.addAll(completor.doCompletion(context));	116	valueItems.addAll(completor.doCompletion(context));

Lines 108-114 Link Here

(-)a/web.beans/src/org/netbeans/modules/web/beans/completion/BeansCompletor.java (-1 / +1 lines)
108	return Collections.emptyList();	108	return Collections.emptyList();
109	}	109	}
110	FileObject fo = NbEditorUtilities.getFileObject(context.getDocument());	110	FileObject fo = NbEditorUtilities.getFileObject(context.getDocument());
111	doJavaCompletion(fo, js, results, typedChars, context.getCurrentToken().getOffset());	111	doJavaCompletion(fo, js, results, typedChars, context.getCurrentTokenOffset());
112	} catch (IOException ex) {	112	} catch (IOException ex) {
113	Exceptions.printStackTrace(ex);	113	Exceptions.printStackTrace(ex);
114	}	114	}




import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.swing.text.BadLocationException;
import javax.swing.text.Document;
import org.netbeans.api.lexer.Token;
import org.netbeans.api.lexer.TokenSequence;
import org.netbeans.api.xml.lexer.XMLTokenId;
import org.netbeans.modules.xml.text.api.dom.SyntaxElement;
import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
import org.openide.util.Exceptions;
import org.netbeans.modules.xml.text.syntax.dom.EndTag;
import org.netbeans.modules.xml.text.syntax.dom.StartTag;
import org.netbeans.modules.xml.text.syntax.dom.Tag;
import org.w3c.dom.Node;
import org.w3c.dom.Text;


 * Tracks context information for a code completion scenario
 */
public class CompletionContext {
    private List<String> existingAttributes;

    public static enum CompletionType {
        TAG,

        this.caretOffset = caretOffset;

        try {
            this.support = XMLSyntaxSupport.getSyntaxSupport(doc);
        } catch (ClassCastException cce) {
            LOGGER.log(Level.FINE, cce.getMessage());
            this.support = XMLSyntaxSupport.createSyntaxSupport(doc);
        }
        this.documentContext = EditorContextFactory.getDocumentContext(doc, caretOffset);
        this.lastTypedChar = support.lastTypedChar();
        try {
            initContext();
        } catch (BadLocationException ex) {
            // ignore
        }
    }
    
    private void initContext() throws BadLocationException {
        Token<XMLTokenId> token = documentContext.getCurrentToken();
        if(token == null)
            return;
        
        boolean tokenBoundary = (documentContext.getCurrentTokenOffset() == caretOffset) 
                || ((documentContext.getCurrentTokenOffset() + token.length()) == caretOffset);
        
        XMLTokenId id = token.id();
        SyntaxElement element = documentContext.getCurrentElement();
        String chars = token.text().toString().trim();
        int tOffset = documentContext.getCurrentTokenOffset();

        switch (id) {
            //
            case TEXT:
                Token<XMLTokenId> previousTokenItem = support.getPreviousToken(tOffset);
                if (previousTokenItem == null) {
                    completionType = CompletionType.NONE;
                    break;
                }
                String text = previousTokenItem.text().toString().trim();
                if (chars != null && chars.equals("") &&
                        text.equals("/>")) { // NOI18N
                    completionType = CompletionType.NONE;
                    break;
                }
                if (chars != null && chars.equals("") &&
                        text.equals(">")) { // NOI18N
                    completionType = CompletionType.VALUE;
                    break;
                }
                if (chars != null && !chars.startsWith("<") &&
                        text.equals(">")) { // NOI18N

                    completionType = CompletionType.VALUE;
                    typedChars = chars.substring(0, caretOffset - tOffset);
                    break;
                }
                if (chars != null && !chars.equals("<") &&
                        text.equals(">")) { // NOI18N
                    completionType = CompletionType.NONE;
                    break;
                }

                break;

            //start tag of an element
            case TAG:
                String tagName = element.getNode().getNodeName();
                if (support.isEndTag(element)) {
                    completionType = CompletionType.NONE;
                    break;
                }
                if (support.isEmptyTag(element)) {
                    if (chars.trim().equals("/>")) {
                            token.getImage().trim().equals("/>")) {
                        completionType = CompletionType.NONE;
                        break;
                    }
                    EmptyTag tag = (EmptyTag) element;
                    if (element.getElementOffset() + 1 == this.caretOffset) {
                        completionType = CompletionType.TAG;
                        break;
                    }
                    if (caretOffset > element.getElementOffset() + 1 &&
                            caretOffset <= element.getElementOffset() + 1 + tagName.length()) {
                        completionType = CompletionType.TAG;
                        typedChars = tagName;
                        break;
                    }
                    completionType = CompletionType.ATTRIBUTE;
                    break;
                }

                if (support.isStartTag(element)) {
                    if (token != null &&
                            chars.equals(">")) {
                        completionType = CompletionType.NONE;
                        break;
                    }
                    if (token != null &&
                            chars.startsWith("</")) {
                        typedChars = "";
                        completionType = CompletionType.VALUE;
                        break;
                    }
                    if (element.getElementOffset() + 1 != this.caretOffset) {
                        typedChars = tagName;
                        typedChars = tag.getTagName();
                    }
                }
                
                if (element instanceof Text) {
                    if (token != null &&
                            chars.startsWith("</")) {
                        Token<XMLTokenId> previous = support.getPreviousToken(tOffset);
                        typedChars = previous.text().toString().trim();
                        completionType = CompletionType.VALUE;
                        break;
                    }

                break;

            //user enters an attribute name
            case ARGUMENT:
                completionType = CompletionType.ATTRIBUTE;
                typedChars = chars.substring(0, caretOffset - tOffset);
                break;

            //some random character
            case CHARACTER:
            //user enters = character, we should ignore all other operators
            case OPERATOR:
                completionType = CompletionType.NONE;
                break;
            //user enters either ' or "
            case VALUE:
                if(!tokenBoundary) {
                    completionType = CompletionType.ATTRIBUTE_VALUE;
                    typedChars = chars.substring(1, caretOffset - tOffset);
                } else {
                    completionType = CompletionType.NONE;
                }
                break;

            //user enters white-space character
            case WS:
                completionType = CompletionType.NONE;
                Token<XMLTokenId> prev = support.skip(tOffset, false, XMLTokenId.WS);
                if (prev == null) {
                    completionType = CompletionType.NONE;
                    break;
                }
                if(prev.id() == XMLTokenId.ARGUMENT) {
                    typedChars = prev.text().toString();
                    typedChars = prev.getImage();
                    completionType = CompletionType.ATTRIBUTE;
                } else if ((prev.id() == XMLTokenId.VALUE) ||
                        (prev.id() == XMLTokenId.TAG)) {
                    completionType = CompletionType.ATTRIBUTE;
                }
                break;

    
    public Node getTag() {
        SyntaxElement element = documentContext.getCurrentElement();
        return element.getType() == Node.ELEMENT_NODE ? element.getNode() : null;
    }
    
    public Token<XMLTokenId> getCurrentToken() {
        return documentContext.getCurrentToken();
    }
    
    public int getCurrentTokenOffset() {
        return documentContext.getCurrentTokenOffset();
    }
    
    private List<String> getExistingAttributesLocked(TokenSequence ts) {
        List<String> existingAttributes = new ArrayList<String>();
        while (ts.movePrevious()) {
            Token<XMLTokenId> item = ts.token();
            XMLTokenId tokenId = item.id();
            if (tokenId == XMLTokenId.TAG) {
                break;
            }
            if (tokenId == XMLTokenId.ARGUMENT) {
                existingAttributes.add(item.text().toString());
            }
        }
        return existingAttributes;
    }

    public List<String> getExistingAttributes() {
        if (existingAttributes == null) {
            try {
                existingAttributes = (List<String>)support.runWithSequence(
                        documentContext.getCurrentTokenOffset(),
                        this::getExistingAttributesLocked
                );
            } catch (BadLocationException ex) {
                Exceptions.printStackTrace(ex);
            if(item.getTokenID().getNumericID() ==
                    XMLDefaultTokenContext.ARGUMENT_ID) {
                existingAttributes.add(item.getImage());
            }
            item = item.getPrevious();
        }
        return existingAttributes;
    }





package org.netbeans.modules.web.beans.completion;

import javax.swing.text.BadLocationException;
import javax.xml.XMLConstants;
import org.netbeans.api.lexer.Token;
import org.netbeans.api.lexer.TokenSequence;
import org.netbeans.api.xml.lexer.XMLTokenId;
import static org.netbeans.api.xml.lexer.XMLTokenId.ARGUMENT;
import static org.netbeans.api.xml.lexer.XMLTokenId.OPERATOR;
import org.netbeans.editor.TokenItem;
import org.netbeans.modules.xml.text.api.dom.SyntaxElement;
import org.netbeans.modules.xml.text.api.dom.TagElement;
import org.w3c.dom.Node;
import org.netbeans.modules.xml.text.syntax.dom.StartTag;
import org.netbeans.modules.xml.text.syntax.dom.Tag;

/**
 *

    private ContextUtilities() {
    }
    
    public static boolean isValueToken(Token<XMLTokenId> currentToken) {
        if(currentToken != null) {
            if (currentToken.id() == XMLTokenId.VALUE) {
                return true;
            }
        }

        return false;
    }
    
    public static boolean isTagToken(Token<XMLTokenId> currentToken) {
        if(currentToken != null) {
            if (currentToken.id() == XMLTokenId.TAG) {
                return true;
            }
        }

        return false;
    }
    
    public static boolean isAttributeToken(Token<XMLTokenId> currentToken) {
        if(currentToken != null) {
            if (currentToken.id() == XMLTokenId.ARGUMENT) {
                return true;
            }
        }

        return false;
    }
    
    public static Token<XMLTokenId> getAttributeToken(DocumentContext context) {
        if(context.getCurrentToken() == null ) {
            return null;
        
        if(isValueToken(currentToken)) {
            TokenItem equalsToken = currentToken.getPrevious();
            if(equalsToken == null)
                return null;
            
            while(equalsToken != null && equalsToken.getTokenID().getNumericID() != XMLDefaultTokenContext.OPERATOR_ID) {
                equalsToken = equalsToken.getPrevious();
            }
            
            if(equalsToken == null) {
                return null;
            }
        
            TokenItem argumentToken = equalsToken.getPrevious();
            if(argumentToken == null)
                return null;
            
            while(argumentToken != null && argumentToken.getTokenID().getNumericID() != XMLDefaultTokenContext.ARGUMENT_ID) {
                argumentToken = argumentToken.getPrevious();
            }
        
            return argumentToken;
        }
        return context.getSyntaxSupport().getAttributeToken(context.getCurrentTokenOffset());
        return null;
    }

    public static Tag getCurrentTagElement(DocumentContext context) {
        SyntaxElement element = context.getCurrentElement();
        if(element instanceof StartTag) {
            return (StartTag) element;
        } else if(element instanceof EmptyTag) {
            return (EmptyTag) element;
        }
        
        return null;
    }
    
    public static TokenItem getAttributeToken(DocumentContext context) {
        if(context.getCurrentToken() == null )
            return null;
        
        if(isValueToken(context.getCurrentToken())) {
            TokenItem equalsToken = context.getCurrentToken().getPrevious();
            if(equalsToken == null)
                return null;
            
            //getTokenId() should not return null by JavaDoc. But in reality, it does reutrn null sometimes
            // see issue 67661
            if(equalsToken.getTokenID() == null) {
                return null;
            }
            while(equalsToken != null && equalsToken.getTokenID().getNumericID() != XMLDefaultTokenContext.OPERATOR_ID) {
                equalsToken = equalsToken.getPrevious();
            }
            
            if(equalsToken == null) {
                return null;
            }
        
            TokenItem argumentToken = equalsToken.getPrevious();
            if(argumentToken == null)
                return null;
            
            while(argumentToken != null && argumentToken.getTokenID().getNumericID() != XMLDefaultTokenContext.ARGUMENT_ID) {
                argumentToken = argumentToken.getPrevious();
            }
        
            return argumentToken;
        }
        
        return null;
    }
    
    public static String getAttributeTokenImage(DocumentContext context) {
        Token<XMLTokenId> tok = getAttributeToken(context);
        if(tok != null) {
            return tok.text().toString();
        }
        
        return null;

        return nodeName.substring(0, colonIndex);
    }
    
    public static SyntaxElement getRoot(SyntaxElement se) {
        SyntaxElement root = null;
        while( se != null) {
            if(se.getType() == Node.ELEMENT_NODE &&
               ((TagElement)se).isStart()) {
                root = se;
            }
            se = se.getPrevious();
        }




import java.util.logging.Logger;
import javax.swing.text.BadLocationException;
import javax.swing.text.Document;
import org.netbeans.api.lexer.Token;
import org.netbeans.api.xml.lexer.XMLTokenId;
import org.netbeans.editor.BaseDocument;
import org.netbeans.editor.TokenItem;
import org.netbeans.modules.xml.text.api.dom.SyntaxElement;
import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
import org.netbeans.modules.xml.text.syntax.dom.EmptyTag;
import org.netbeans.modules.xml.text.syntax.dom.EndTag;
import org.netbeans.modules.xml.text.syntax.dom.StartTag;
import org.netbeans.modules.xml.text.syntax.dom.Tag;
import org.w3c.dom.Attr;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;

    private XMLSyntaxSupport syntaxSupport;
    private int caretOffset = -1;
    private SyntaxElement element;
    private Token<XMLTokenId> token;
    private int tokenOffset;
    private boolean valid = false;
    private SyntaxElement docRoot;
    private String defaultNamespace;
    private HashMap<String, String> declaredNamespaces =
            new HashMap<String, String>();

    DocumentContext(Document document) {
        this.document = document;
        try {
            this.syntaxSupport = XMLSyntaxSupport.getSyntaxSupport(document);
        } catch (ClassCastException cce) {
            LOGGER.log(Level.FINE, cce.getMessage());
            this.syntaxSupport = XMLSyntaxSupport.createSyntaxSupport(document);
        }
    }


        declaredNamespaces.clear();
        try {
            element = syntaxSupport.getElementChain(caretOffset);
            int[] bounds = new int[1];
            token = syntaxSupport.getTokenAtPosition(caretOffset, bounds);
            tokenOffset = bounds[0];
            this.docRoot = ContextUtilities.getRoot(element);
            populateNamespaces();
        } catch (BadLocationException ex) {

        return this.valid;
    }

    public XMLTokenId getCurrentTokenId() {
        if (isValid()) {
            return token.id();
        } else {
            return null;
        }
    }

    public Token<XMLTokenId> getCurrentToken() {
        if (isValid()) {
            return token;
        } else {


    public String getCurrentTokenImage() {
        if (isValid()) {
            return token.text().toString();
        } else {
            return null;
        }

        return this.element;
    }
    
    public List<String> getPathFromRoot() {
        if (isValid()) {
            SyntaxElement elementRef = this.element;
            Stack<SyntaxElement> stack = new Stack<SyntaxElement>();

            while (elementRef != null) {
                if ((elementRef instanceof EndTag) ||
                        (elementRef instanceof EmptyTag && stack.isEmpty()) ||
                        (elementRef instanceof StartTag && stack.isEmpty())) {
                    stack.push(elementRef);
                    elementRef = elementRef.getPrevious();
                    continue;
                }
                if (elementRef instanceof StartTag) {
                    StartTag start = (StartTag) elementRef;
                    if (stack.peek() instanceof EndTag) {
                        EndTag end = (EndTag) stack.peek();
                        if (end.getTagName().equals(start.getTagName())) {
                            stack.pop();
                        }
                    } else {
                        SyntaxElement e = (SyntaxElement) stack.peek();
                        String tagAtTop = (e instanceof StartTag) ? ((StartTag) e).getTagName() : ((EmptyTag) e).getTagName();
                        stack.push(elementRef);
                    }
                }
                elementRef = elementRef.getPrevious();
            }

            return createPath(stack);
        }

        return Collections.emptyList();
    }

    private List<String> createPath(Stack<SyntaxElement> stack) {
        ArrayList<String> pathList = new ArrayList<String>();
        while (!stack.isEmpty()) {
            SyntaxElement top = stack.pop();
            String tagName = (top instanceof StartTag) ? ((StartTag) top).getTagName() : ((EmptyTag) top).getTagName();
            if (tagName != null) {
                pathList.add(tagName);
            }
        }

        return Collections.unmodifiableList(pathList);
    }

    public Document getDocument() {
        return this.document;
    }

        return declaredNamespaces.values();
    }

    public SyntaxElement getDocRoot() {
        return docRoot;
    }

    public int getCaretOffset() {
        return this.caretOffset;
    }
    
    public int getCurrentTokenOffset() {
        return tokenOffset;
    }

    private void populateNamespaces() {
        // Find the a start or empty tag just before the current syntax element.
        SyntaxElement element = this.element;
        while (element != null && !syntaxSupport.isStartTag(element) && !syntaxSupport.isEmptyTag(element)) {
            element = element.getPrevious();
        }
        if (element == null) {

        // To find all namespace declarations active at the caret offset, we
        // need to look at xmlns attributes of the current element and its ancestors.
        Node node = (Node)element;
        while (node != null && element != null) {
            if (syntaxSupport.isStartTag(element) || syntaxSupport.isEmptyTag(element)) {
                NamedNodeMap attributes = node.getAttributes();
                for (int index = 0; index < attributes.getLength(); index++) {
                    Attr attr = (Attr) attributes.item(index);
                    String attrName = attr.getName();

        hash = 61 * hash + (this.document != null ? this.document.hashCode() : 0);
        return hash;
    }
    
    public XMLSyntaxSupport getSyntaxSupport() {
        return syntaxSupport;
    }
}

Lines 52-58 Link Here

(-)a/web.core.syntax/src/org/netbeans/modules/web/core/xmlsyntax/JspXMLTokenContext.java (-1 lines)
52		52
53	import org.netbeans.modules.xml.text.api.XMLDefaultTokenContext;	53	import org.netbeans.modules.xml.text.api.XMLDefaultTokenContext;
54		54
55
56	/**	55	/**
57	* Token context for JSP pages with XML content.	56	* Token context for JSP pages with XML content.
58	*	57	*

Lines 55-60 Link Here

(-)a/xml.catalog/src/org/netbeans/modules/xml/catalog/CatalogEntityResolver.java (+2 lines)
55	import org.netbeans.api.xml.services.*;	55	import org.netbeans.api.xml.services.*;
56	import org.openide.util.Lookup;	56	import org.openide.util.Lookup;
57	import javax.xml.transform.URIResolver;	57	import javax.xml.transform.URIResolver;
		58	import org.openide.util.lookup.ServiceProvider;
58		59
59	/**	60	/**
60	* An entity resolver that can resolve all registrations	61	* An entity resolver that can resolve all registrations
Lines 68-73 Link Here
68	* @author Petr Kuzel	69	* @author Petr Kuzel
69	* @version 1.0	70	* @version 1.0
70	*/	71	*/
		72	@ServiceProvider(service = UserCatalog.class)
71	public class CatalogEntityResolver extends UserCatalog implements EntityResolver, URIResolver {	73	public class CatalogEntityResolver extends UserCatalog implements EntityResolver, URIResolver {
72		74
73	/** Creates new CatalogEntityResolver */	75	/** Creates new CatalogEntityResolver */

Lines 46-51 Link Here

(-)a/xml.catalog/src/org/netbeans/modules/xml/catalog/impl/SystemCatalogProvider.java (+2 lines)
46	import java.io.IOException;	46	import java.io.IOException;
47		47
48	import org.netbeans.modules.xml.catalog.spi.CatalogProvider;	48	import org.netbeans.modules.xml.catalog.spi.CatalogProvider;
		49	import org.openide.util.lookup.ServiceProvider;
49		50
50	/**	51	/**
51	* Provide class representing SystemCatalogReader class.	52	* Provide class representing SystemCatalogReader class.
Lines 53-58 Link Here
53	* @author Petr Kuzel	54	* @author Petr Kuzel
54	* @version	55	* @version
55	*/	56	*/
		57	@ServiceProvider(service = CatalogProvider.class)
56	public class SystemCatalogProvider implements CatalogProvider {	58	public class SystemCatalogProvider implements CatalogProvider {
57		59
58	public Class provideClass() throws IOException, ClassNotFoundException {	60	public Class provideClass() throws IOException, ClassNotFoundException {

Lines 46-51 Link Here

(-)a/xml.catalog/src/org/netbeans/modules/xml/catalog/impl/XCatalogProvider.java (+2 lines)
46	import java.io.IOException;	46	import java.io.IOException;
47		47
48	import org.netbeans.modules.xml.catalog.spi.CatalogProvider;	48	import org.netbeans.modules.xml.catalog.spi.CatalogProvider;
		49	import org.openide.util.lookup.ServiceProvider;
49		50
50	/**	51	/**
51	* Provide class representing XCatalog class.	52	* Provide class representing XCatalog class.
Lines 53-58 Link Here
53	* @author Petr Kuzel	54	* @author Petr Kuzel
54	* @version	55	* @version
55	*/	56	*/
		57	@ServiceProvider(service = CatalogProvider.class)
56	public class XCatalogProvider implements CatalogProvider {	58	public class XCatalogProvider implements CatalogProvider {
57		59
58	public Class provideClass() throws IOException, ClassNotFoundException {	60	public Class provideClass() throws IOException, ClassNotFoundException {

Lines 46-51 Link Here

(-)a/xml.catalog/src/org/netbeans/modules/xml/catalog/impl/sun/SunCatalogProvider.java (+2 lines)
46	import java.io.IOException;	46	import java.io.IOException;
47		47
48	import org.netbeans.modules.xml.catalog.spi.CatalogProvider;	48	import org.netbeans.modules.xml.catalog.spi.CatalogProvider;
		49	import org.openide.util.lookup.ServiceProvider;
49		50
50	/**	51	/**
51	* Provide class representing Catalog reader class.	52	* Provide class representing Catalog reader class.
Lines 53-58 Link Here
53	* @author Petr Kuzel	54	* @author Petr Kuzel
54	* @version	55	* @version
55	*/	56	*/
		57	@ServiceProvider(service = CatalogProvider.class)
56	public class SunCatalogProvider implements CatalogProvider {	58	public class SunCatalogProvider implements CatalogProvider {
57		59
58	public Class provideClass() throws IOException, ClassNotFoundException {	60	public Class provideClass() throws IOException, ClassNotFoundException {




        </folder>
    </folder>

    <!-- register services with Lookup -->  
    <folder name="Services">
        <folder name="Hidden">

            <file name="org-netbeans-modules-xml-catalog-CatalogEntityResolver.instance">
                <attr name="instanceOf" stringvalue="org.netbeans.api.xml.services.UserCatalog"/>
            </file>
            <folder name="CatalogProvider">
                <file name="org-netbeans-modules-xml-catalog-impl-sun-SunCatalogProvider.instance">
                    <attr name="instanceOf" stringvalue="org.netbeans.modules.xml.catalog.spi.CatalogProvider"/>
                    <attr name="position" intvalue="100"/>
                </file>
                <file name="org-netbeans-modules-xml-catalog-impl-SystemCatalogProvider.instance">
                    <attr name="instanceOf" stringvalue="org.netbeans.modules.xml.catalog.spi.CatalogProvider"/>
                    <attr name="position" intvalue="200"/>
                </file>
                <file name="org-netbeans-modules-xml-catalog-impl-XCatalogProvider.instance">
                    <attr name="instanceOf" stringvalue="org.netbeans.modules.xml.catalog.spi.CatalogProvider"/>
                    <attr name="position" intvalue="300"/>
                </file>
            </folder>

            <!-- Store mounted catalogs per project. -->
            <file name="org-netbeans-modules-xml-catalog-settings-CatalogSettings.settings" url="ProjectSettings.xml"/>
        </folder>
    </folder>

    <!-- register entities with system entity resolver -->
    <folder name="xml">
        <folder name="entities">




import java.util.logging.Level;
import org.netbeans.modules.xml.catalog.lib.IteratorIterator;

import org.openide.*;
import org.openide.util.io.NbMarshalledObject;

import org.netbeans.modules.xml.catalog.spi.*;

import org.openide.util.Lookup;
import org.openide.util.NbBundle;
import org.openide.util.lookup.Lookups;
import org.openide.util.lookup.ServiceProvider;


/** 

 *
 * @author  Petr Kuzel
 */
@ServiceProvider(service = CatalogSettings.class)
public final class CatalogSettings implements Externalizable {

    /** Serial Version UID */

Lines 45-50 Link Here

(-)a/xml.lexer/nbproject/project.xml (+9 lines)
45	<code-name-base>org.netbeans.modules.xml.lexer</code-name-base>	45	<code-name-base>org.netbeans.modules.xml.lexer</code-name-base>
46	<module-dependencies>	46	<module-dependencies>
47	<dependency>	47	<dependency>
		48	<code-name-base>org.netbeans.modules.editor.mimelookup</code-name-base>
		49	<build-prerequisite/>
		50	<compile-dependency/>
		51	<run-dependency>
		52	<release-version>1</release-version>
		53	<specification-version>1.41</specification-version>
		54	</run-dependency>
		55	</dependency>
		56	<dependency>
48	<code-name-base>org.netbeans.modules.lexer</code-name-base>	57	<code-name-base>org.netbeans.modules.lexer</code-name-base>
49	<build-prerequisite/>	58	<build-prerequisite/>
50	<compile-dependency/>	59	<compile-dependency/>

Lines 46-51 Link Here

(-)a/xml.lexer/src/org/netbeans/api/xml/lexer/XMLTokenId.java (+2 lines)
46	import java.util.EnumSet;	46	import java.util.EnumSet;
47	import java.util.HashMap;	47	import java.util.HashMap;
48	import java.util.Map;	48	import java.util.Map;
		49	import org.netbeans.api.editor.mimelookup.MimeRegistration;
49	import org.netbeans.api.lexer.InputAttributes;	50	import org.netbeans.api.lexer.InputAttributes;
50	import org.netbeans.api.lexer.Language;	51	import org.netbeans.api.lexer.Language;
51	import org.netbeans.api.lexer.LanguagePath;	52	import org.netbeans.api.lexer.LanguagePath;
Lines 144-149 Link Here
144	}	145	}
145	}.language();	146	}.language();
146		147
		148	@MimeRegistration(mimeType = "text/xml", service = Language.class)
147	public static Language<XMLTokenId> language() {	149	public static Language<XMLTokenId> language() {
148	return language;	150	return language;
149	}	151	}

Lines 361-370 Link Here

(-)a/xml.lexer/src/org/netbeans/lib/xml/lexer/XMLLexer.java (-1 / +4 lines)
361	// note: it would be more correct to raise an error here,	361	// note: it would be more correct to raise an error here,
362	// and return TAG PartType=Start, BUT some code already expects	362	// and return TAG PartType=Start, BUT some code already expects
363	// unfinished tags to be reported as TEXT.	363	// unfinished tags to be reported as TEXT.
364	state = INIT;	364	state = ISI_TEXT;
365	input.backup(1);	365	input.backup(1);
		366	break;
		367	/*
366	return tokenFactory.createToken(	368	return tokenFactory.createToken(
367	XMLTokenId.TEXT, input.readLength());	369	XMLTokenId.TEXT, input.readLength());
		370	*/
368	}	371	}
369	break;	372	break;
370		373

Lines 45-54 Link Here

(-)a/xml.lexer/src/org/netbeans/lib/xml/lexer/layer.xml (-4 lines)
45	<folder name="Editors">	45	<folder name="Editors">
46	<folder name="text">	46	<folder name="text">
47	<folder name="xml">	47	<folder name="xml">
48	<file name="language.instance">
49	<attr name="instanceCreate" methodvalue="org.netbeans.api.xml.lexer.XMLTokenId.language"/>
50	<attr name="instanceOf" stringvalue="org.netbeans.api.lexer.Language"/>
51	</file>
52	</folder>	48	</folder>
53	</folder>	49	</folder>
54	</folder>	50	</folder>

Lines 66-72 Link Here

(-)a/xml.lexer/test/unit/src/org/netbeans/api/xml/lexer/BrokenXMLTest.java (-1 / +1 lines)
66	*/	66	*/
67	public void testTokens() throws Exception {	67	public void testTokens() throws Exception {
68	XMLTokenId[] expectedIds = {XMLTokenId.PI_START, XMLTokenId.PI_TARGET, XMLTokenId.WS, XMLTokenId.PI_CONTENT,	68	XMLTokenId[] expectedIds = {XMLTokenId.PI_START, XMLTokenId.PI_TARGET, XMLTokenId.WS, XMLTokenId.PI_CONTENT,
69	XMLTokenId.PI_END, XMLTokenId.TEXT, XMLTokenId.TAG, XMLTokenId.TAG, XMLTokenId.TEXT, XMLTokenId.TEXT, XMLTokenId.TEXT,	69	XMLTokenId.PI_END, XMLTokenId.TEXT, XMLTokenId.TAG, XMLTokenId.TAG, XMLTokenId.TEXT, XMLTokenId.TEXT,
70	XMLTokenId.TAG, XMLTokenId.TAG, XMLTokenId.TEXT, XMLTokenId.TAG, XMLTokenId.ERROR,	70	XMLTokenId.TAG, XMLTokenId.TAG, XMLTokenId.TEXT, XMLTokenId.TAG, XMLTokenId.ERROR,
71	XMLTokenId.TAG, XMLTokenId.TAG, XMLTokenId.TEXT, XMLTokenId.TAG, XMLTokenId.TAG, XMLTokenId.TEXT };	71	XMLTokenId.TAG, XMLTokenId.TAG, XMLTokenId.TEXT, XMLTokenId.TAG, XMLTokenId.TAG, XMLTokenId.TEXT };
72	javax.swing.text.Document document = getDocument("resources/broken.xml");	72	javax.swing.text.Document document = getDocument("resources/broken.xml");

Lines 2-6 Link Here

(-)a/xml.schema.completion/manifest.mf (-1 / +1 lines)
2	OpenIDE-Module: org.netbeans.modules.xml.schema.completion	2	OpenIDE-Module: org.netbeans.modules.xml.schema.completion
3	OpenIDE-Module-Layer: org/netbeans/modules/xml/schema/completion/layer.xml	3	OpenIDE-Module-Layer: org/netbeans/modules/xml/schema/completion/layer.xml
4	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/xml/schema/completion/Bundle.properties	4	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/xml/schema/completion/Bundle.properties
5	OpenIDE-Module-Specification-Version: 1.31	5	OpenIDE-Module-Specification-Version: 1.32
6	AutoUpdate-Show-In-Client: false	6	AutoUpdate-Show-In-Client: false

Lines 30-36 Link Here

(-)a/xml.schema.completion/nbproject/project.properties (-1 / +1 lines)
30	# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun	30	# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
31	# Microsystems, Inc. All Rights Reserved.	31	# Microsystems, Inc. All Rights Reserved.
32		32
33	javac.source=1.6	33	javac.source=1.8
34	javadoc.arch=${basedir}/arch.xml	34	javadoc.arch=${basedir}/arch.xml
35	# XXX should be deleted in simpletests branch (see project.xml entry):	35	# XXX should be deleted in simpletests branch (see project.xml entry):
36	test.qa-functional.cp.extra=\	36	test.qa-functional.cp.extra=\

Lines 103-108 Link Here

(-)a/xml.schema.completion/nbproject/project.xml (-9 / +22 lines)
103	</run-dependency>	103	</run-dependency>
104	</dependency>	104	</dependency>
105	<dependency>	105	<dependency>
		106	<code-name-base>org.netbeans.modules.nbjunit</code-name-base>
		107	<build-prerequisite/>
		108	<compile-dependency/>
		109	<run-dependency>
		110	<release-version>1</release-version>
		111	<specification-version>1.88</specification-version>
		112	</run-dependency>
		113	</dependency>
		114	<dependency>
106	<code-name-base>org.netbeans.modules.projectapi</code-name-base>	115	<code-name-base>org.netbeans.modules.projectapi</code-name-base>
107	<build-prerequisite/>	116	<build-prerequisite/>
108	<compile-dependency/>	117	<compile-dependency/>
Lines 151-157 Link Here
151	<compile-dependency/>	160	<compile-dependency/>
152	<run-dependency>	161	<run-dependency>
153	<release-version>2</release-version>	162	<release-version>2</release-version>
154	<specification-version>1.16</specification-version>	163	<specification-version>1.60</specification-version>
155	</run-dependency>	164	</run-dependency>
156	</dependency>	165	</dependency>
157	<dependency>	166	<dependency>
Lines 195-208 Link Here
195	</run-dependency>	204	</run-dependency>
196	</dependency>	205	</dependency>
197	<dependency>	206	<dependency>
198	<code-name-base>org.openide.util.ui</code-name-base>
199	<build-prerequisite/>
200	<compile-dependency/>
201	<run-dependency>
202	<specification-version>9.3</specification-version>
203	</run-dependency>
204	</dependency>
205	<dependency>
206	<code-name-base>org.openide.util</code-name-base>	207	<code-name-base>org.openide.util</code-name-base>
207	<build-prerequisite/>	208	<build-prerequisite/>
208	<compile-dependency/>	209	<compile-dependency/>
Lines 218-223 Link Here
218	<specification-version>8.0</specification-version>	219	<specification-version>8.0</specification-version>
219	</run-dependency>	220	</run-dependency>
220	</dependency>	221	</dependency>
		222	<dependency>
		223	<code-name-base>org.openide.util.ui</code-name-base>
		224	<build-prerequisite/>
		225	<compile-dependency/>
		226	<run-dependency>
		227	<specification-version>9.3</specification-version>
		228	</run-dependency>
		229	</dependency>
221	</module-dependencies>	230	</module-dependencies>
222	<test-dependencies>	231	<test-dependencies>
223	<test-type>	232	<test-type>
Lines 253-258 Link Here
253	<code-name-base>org.netbeans.modules.xml.xdm</code-name-base>	262	<code-name-base>org.netbeans.modules.xml.xdm</code-name-base>
254	<recursive/>	263	<recursive/>
255	</test-dependency>	264	</test-dependency>
		265	<test-dependency>
		266	<code-name-base>org.netbeans.modules.xml.catalog</code-name-base>
		267	<recursive/>
		268	</test-dependency>
256	</test-type>	269	</test-type>
257	</test-dependencies>	270	</test-dependencies>
258	<public-packages>	271	<public-packages>




import java.util.logging.Level;
import java.util.logging.Logger;
import javax.swing.ImageIcon;
import javax.swing.text.AbstractDocument;
import javax.swing.text.Document;
import javax.swing.text.JTextComponent;
import org.netbeans.api.editor.completion.Completion;
import org.netbeans.api.lexer.Token;
import org.netbeans.api.lexer.TokenHierarchy;
import org.netbeans.api.lexer.TokenSequence;
import org.netbeans.api.xml.lexer.XMLTokenId;
import org.netbeans.editor.BaseDocument;
import org.netbeans.modules.xml.schema.completion.util.CompletionContextImpl;
import org.netbeans.modules.xml.schema.completion.util.CompletionUtil;
import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
import org.netbeans.spi.editor.completion.CompletionItem;
import org.netbeans.spi.editor.completion.CompletionResultSet;
import org.netbeans.spi.editor.completion.CompletionTask;

    protected void prepareQuery(JTextComponent component) {
        this.component = component;
    }

    @Override
    protected void query(CompletionResultSet resultSet, Document doc, int caretOffset) {
        XMLSyntaxSupport support = XMLSyntaxSupport.getSyntaxSupport(doc);
        if (support == null) {
            resultSet.finish();
            return;
        }

        CompletionResultItem endTagResultItem = CompletionUtil.getEndTagCompletionItem(
            component, (BaseDocument) doc);
        List<CompletionResultItem> completionItems = null;
        if (!CompletionUtil.noCompletion(component) &&
           (CompletionUtil.canProvideCompletion((BaseDocument) doc))) {
            
            resultSet.setWaitText(NbBundle.getMessage(CompletionQuery.class, "MSG_PreparingXmlSchemas")); // NOI18N

        List<CompletionResultItem> completionItems = null;
        
        //Step 1: create a context
        XMLSyntaxSupport support = XMLSyntaxSupport.getSyntaxSupport(doc);
        if (support == null) {
            return null;
        }
        context = new CompletionContextImpl(primaryFile, support, caretOffset);
        
        //Step 2: Accumulate all models and initialize the context




import org.netbeans.editor.BaseDocument;
import org.netbeans.editor.Utilities;
import org.netbeans.modules.xml.schema.completion.util.CompletionUtil;
import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
import org.netbeans.spi.editor.completion.CompletionProvider;
import org.netbeans.spi.editor.completion.CompletionTask;
import org.netbeans.spi.editor.completion.support.AsyncCompletionTask;

        }
        if(doc == null)
            return 0;
        XMLSyntaxSupport support = XMLSyntaxSupport.getSyntaxSupport(doc);
        if(support != null && CompletionUtil.noCompletion(component) || 
                !CompletionUtil.canProvideCompletion(doc)) {
            return 0;
        }
        




package org.netbeans.modules.xml.schema.completion.util;

import java.net.URI;
import java.net.URISyntaxException;
import java.util.*;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.swing.text.AbstractDocument;
import javax.swing.text.BadLocationException;
import javax.swing.text.Document;
import javax.xml.XMLConstants;
import javax.xml.namespace.QName;


import org.netbeans.api.lexer.TokenSequence;
import org.netbeans.api.xml.lexer.XMLTokenId;
import org.netbeans.editor.BaseDocument;
import org.netbeans.editor.TokenItem;
import org.netbeans.modules.xml.axi.AbstractAttribute;
import org.netbeans.modules.xml.axi.Element;
import org.openide.filesystems.FileObject;
import org.netbeans.modules.xml.text.syntax.dom.StartTag;
import org.netbeans.modules.xml.text.syntax.SyntaxElement;
import org.netbeans.modules.xml.text.syntax.XMLSyntaxSupport;
import org.netbeans.modules.xml.text.api.XMLDefaultTokenContext;
import org.netbeans.modules.xml.schema.completion.spi.CompletionContext;
import org.netbeans.modules.xml.schema.completion.spi.CompletionContext.CompletionType;
import org.netbeans.modules.xml.schema.completion.spi.CompletionModelProvider;

import org.netbeans.modules.xml.schema.completion.util.CompletionUtil.DocRootAttribute;
import org.netbeans.modules.xml.schema.model.Schema;
import org.netbeans.modules.xml.schema.model.SchemaModel;
import org.netbeans.modules.xml.text.api.dom.SyntaxElement;
import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
import org.netbeans.modules.xml.text.syntax.dom.Tag;
import org.openide.util.Exceptions;
import org.openide.util.Lookup;
import org.w3c.dom.Attr;


    private static final Logger _logger = Logger.getLogger(CompletionContextImpl.class.getName());

    private XMLSyntaxSupport support;
    private int completionAtOffset = -1;
    private FileObject primaryFile;
    private String typedChars;
    private Token<XMLTokenId> token;
    private int tokenOffset;
    private SyntaxElement element;
    private String attribute;
    private DocRoot docRoot;

    /**
     * Tags on the path from root to the context element (the one the CC tries to fill)
     */
    private List<SyntaxElement> elementsFromRoot;
    private Map<String, String>  schemaLocationMap = new HashMap<String, String>();
    private String schemaLocation;
    private String noNamespaceSchemaLocation;
    private String defaultNamespace;
    private Document document;
    private HashMap<String, CompletionModel> nsModelMap =
            new HashMap<String, CompletionModel>();
    private List<CompletionModel> noNSModels =

    public CompletionContextImpl(FileObject primaryFile, XMLSyntaxSupport support,
        int offset) {
        try {
            this.support = support;
            this.completionAtOffset = offset;
            this.primaryFile = primaryFile;
            this.document = support.getDocument();
            this.element = support.getElementChain(offset);
            int[] off = new int[2];
            this.token = support.getPreviousToken(offset, off);
            this.tokenOffset = off[0];
            this.docRoot = CompletionUtil.getDocRoot(document);
            this.lastTypedChar = support.lastTypedChar();
            populateNamespaces();            

            
    @Override
    public BaseDocument getBaseDocument() {
        return (BaseDocument)document;
    }
    
    @Override

     * from previously added tags. Tags should be added starting from the root down
     * to the context position.
     */
    private void addNamespacesFrom(SyntaxElement s) {
        Node e = s.getNode();
        NamedNodeMap attrs = e.getAttributes();
        String nodePrefix = getPrefix(e.getNodeName(), false);
        String version = null;
        String xsltAttrName = null;
        

     * 
     * @param stack path from the context element (index 0) to the root (index N-1).
     */
    private void addContextNamespaces(List<SyntaxElement> stack) {
        // must iterate from root down to the context element, to properly override
        // namespaces and replace default/noNamespace information.
        for (int i = stack.size() - 1; i >= 0; i--) {
            SyntaxElement t = stack.get(i);
            addNamespacesFrom(t);
        }
    }

        try {
            if (isTagAttributeRequired(tokenSequence)) {
                completionType = CompletionType.COMPLETION_TYPE_ATTRIBUTE;
                if (token.id() == XMLTokenId.WS) {
                    typedChars = null;
                } else {
                    String str = token.text().toString();
                    int e = str.length();
                    int l = Math.min(completionAtOffset - tokenOffset /* initial quote */, e);
                    typedChars = str.substring(0, l);
                }
                createPathFromRoot(element);
                return true;
            }
            
            XMLTokenId id = token.id();
            switch (id) {
                //user enters < character
                case TEXT:
                    String chars = token.text().toString().trim();
                    Token previous = support.getPreviousToken(tokenOffset);
                    String previousTokenText = previous == null ? 
                            "" : previous.text().toString().trim();
                    if(chars != null && chars.startsWith("&")) {
                        completionType = CompletionType.COMPLETION_TYPE_UNKNOWN;
                        break;

                    }
                    break;

                case BLOCK_COMMENT:
                    completionType = CompletionType.COMPLETION_TYPE_ELEMENT;
                    createPathFromRoot(element);
                    break;

                //start tag of an element
                case TAG:
                    if(support.isEndTag(element)) {
                        completionType = CompletionType.COMPLETION_TYPE_UNKNOWN;
                        break;
                    }
                    if (support.isEmptyTag(element)) {
                        /*
                        if (token != null &&
                            token.getImage().trim().equals("/>")) {

                            break;
                        }
                        */
                        String tagName = element.getNode().getNodeName();
                        if ((element.getElementOffset() + 1 == completionAtOffset) ||
                            (tokenOffset + token.length()== completionAtOffset)) {
                            completionType = CompletionType.COMPLETION_TYPE_ELEMENT;
                            createPathFromRoot(element.getPrevious());
                            break;
                        }
                        if (completionAtOffset > element.getElementOffset() + 1 &&
                            completionAtOffset <= (element.getElementOffset() + 1 +
                                                  tagName.length())) {
                            completionType = CompletionType.COMPLETION_TYPE_ELEMENT;
                            int index = completionAtOffset - element.getElementOffset() - 1;
                            typedChars = index < 0 ? tagName :
                                tagName.substring(0, index);
                            createPathFromRoot(element.getPrevious());
                            break;
                        }                        

//***???pathFromRoot = getPathFromRoot(element);
                        break;
                    }
                    if (element.getType() == Node.ELEMENT_NODE &&
                        support.isStartTag(element)) {
                        if(token != null &&
                           token.text().toString().trim().equals(">")) {
                            createPathFromRoot(element);
                            completionType = CompletionType.COMPLETION_TYPE_ELEMENT_VALUE;
                            break;

                        if(element.getElementOffset() + 1 == this.completionAtOffset) {
                            typedChars = null;
                        } else {
                            String tagName = element.getNode().getNodeName();
                            int index = completionAtOffset-element.getElementOffset()-1;
                            typedChars = index < 0 ? tagName :
                                tagName.substring(0, index);
                        }
                    }
                    completionType = CompletionType.COMPLETION_TYPE_ELEMENT;

                    break;

                //user enters an attribute name
                case ARGUMENT:
//***???completionType = CompletionType.COMPLETION_TYPE_ATTRIBUTE;
//***???typedChars = token.getImage();
//***???pathFromRoot = getPathFromRoot(element);
                    break;

                //some random character
                case CHARACTER:
                    completionType = CompletionType.COMPLETION_TYPE_UNKNOWN;
                    break;
                    
                //user enters = character, we should ignore all other operators
                case OPERATOR:
                    completionType = CompletionType.COMPLETION_TYPE_UNKNOWN;
                    break;
                    
                //user enters either ' or "
                case VALUE: {
                    //user enters start quote and no end quote exists
                    Token<XMLTokenId> next = support.getNextToken(tokenOffset + token.length());
                    if(next == null) {
                        if(lastTypedChar == '\'' || lastTypedChar == '\"') {
                            typedChars = null;
                        }   else  {
                            String tt = token.text().toString();
                            typedChars = tt.substring(1, tt.indexOf(">"));
                        }
                    }                    
                    
                    //user is inside start/end quotes
                    if(lastTypedChar != '\'' && lastTypedChar != '\"') {
                        String str = token.text().toString();
                        if( str != null && !str.equals("\"\"") && !str.equals("\'\'") &&
                            (str.startsWith("\"") || str.startsWith("\'")) &&
                            (str.endsWith("\"") || str.endsWith("\'")) ) {
                            int e = str.length() - 1;
                            int l = Math.min(completionAtOffset - tokenOffset /* initial quote */, e);
                            typedChars = str.substring(1, l);
                            if(completionAtOffset == tokenOffset + 1)
                                typedChars = "";
                        }
                    }

                }

                //user enters white-space character
                case WS: {
                        completionType = CompletionType.COMPLETION_TYPE_UNKNOWN;
                        boolean cont = support.runWithSequence(tokenOffset, (TokenSequence ts) -> {
                            if (!ts.movePrevious()) {
                                return false;
                            }
                            Token<XMLTokenId> prev = ts.token();
                            while(ts.movePrevious()) {
                                prev = ts.token();
                                if (prev.id() != XMLTokenId.WS) {
                                    break;
                                }
                            }
                            if( (prev.id() == XMLTokenId.VALUE) ||
                                    (prev.id() == XMLTokenId.TAG) ) {
                                //no attr completion for end tags
                                if (prev.text().toString().startsWith("</")) {
                                    return true;
                                } else {
                                    completionType = CompletionType.COMPLETION_TYPE_ATTRIBUTE;
                                    createPathFromRoot(element);
                                }
                                
                                //***???completionType = CompletionType.COMPLETION_TYPE_ATTRIBUTE;
                                //***???pathFromRoot = getPathFromRoot(element);
                            }
                            return false;
                        });
                    break;
                }

                default:
                    completionType = CompletionType.COMPLETION_TYPE_UNKNOWN;

     * @return attribute name, or <code>null</code> in unexpected situations
     */
    private String findAttributeName() {
        try {
            return support.runWithSequence(tokenOffset, (TokenSequence ts) -> {
                Token<XMLTokenId> item = ts.token();
                while (item != null) {
                    switch (item.id()) {
                        case VALUE:
                        case OPERATOR:
                        case WS:
                        case TEXT:
                            if (!ts.movePrevious()) {
                                return null;
                            }
                            item = ts.token();
                            break;
                        case ARGUMENT:
                            return item.text().toString();
                        default:
                            return null;
                    }
                }
                return null;
            });
        } catch (BadLocationException ex) {
            Exceptions.printStackTrace(ex);
            return null;
        }
        return null;
    }

    public List<DocRootAttribute> getDocRootAttributes() {

        //1st pass
        if(se == null)
            return;
        Stack<SyntaxElement> stack = new Stack<>();
        if(support.isEmptyTag(se))
            stack.push(se);
        
        while( se != null) {
            if (
                (stack.isEmpty() && support.isStartTag(se)) ||
                    support.isEndTag(se)) {
                stack.push(se);
                se = se.getPrevious();
                continue;
            }
            if (support.isStartTag(se)) {
                if (support.isEndTag(stack.peek())) {
                    SyntaxElement end = stack.peek();
                    if(end.getNode().getNodeName().equals(se.getNode().getNodeName())) {
                    if(end.getTagName().equals(start.getTagName())) {
                        stack.pop();
                    }
                } else {
                    stack.push(se);
                }
            }
            se = se.getPrevious();

     * While creating the path it always adds items to the start of the list so
     * that the returned path starts from root, all the way to the current tag.
     */
    private ArrayList<QName> createPath(Stack<SyntaxElement> stack) {
        ArrayList<QName> path = new ArrayList<QName>();
        ListIterator<SyntaxElement> tags = stack.listIterator();
        while(tags.hasNext()) {
            SyntaxElement tag = tags.next();
            //add to the start of the list
            path.add(0, createQName(tag));
            if(isRoot(tag, tags.hasNext() ? tags.next() : null)) {
                return path;
            }
            tags.previous();//since we moved twice.

     * However, there are exceptions to this and may not work well for cases when
     * you combine itmes from schemas with/without namespace.
     */
    private boolean isRoot(SyntaxElement elem, SyntaxElement previousTag) {
        //no previous => this has to be the root
        Node thisTag = elem.getNode();
        if(previousTag == null)
            return true;
        
        //if the tag declares a namespace and is diff from default, then it is root
        String prefix = CompletionUtil.getPrefixFromTag(thisTag.getNodeName());
        Attr namespaceAttr = null;
        NamedNodeMap attrs = thisTag.getAttributes();
        if(prefix==null) {
            namespaceAttr = (Attr)attrs.getNamedItem(XMLConstants.XMLNS_ATTRIBUTE);
        } else {
            namespaceAttr = (Attr)attrs.getNamedItem(XMLConstants.XMLNS_ATTRIBUTE+":"+prefix);
        }
        if(namespaceAttr != null) {
            String namespace = namespaceAttr.getValue();

            }
        }
        
        return !fromSameNamespace(thisTag, previousTag.getNode());
    }
    
    private String getAttributeValue(Node tag, String attrName) {
        NamedNodeMap attrs = tag.getAttributes();
        for(int i=0; i<attrs.getLength(); i++) {
            Node attr = attrs.item(i);

     * @param tag
     * @return 
     */
    private QName createQName(SyntaxElement tag) {
        String tagName = tag.getNode().getNodeName();
        String prefix = CompletionUtil.getPrefixFromTag(tagName);
        String lName = CompletionUtil.getLocalNameFromTag(tagName);     
        

            throw new IllegalStateException();
        }
        for (int i = index; i < elementsFromRoot.size(); i++) {
            SyntaxElement s = elementsFromRoot.get(i);
            NamedNodeMap atts = s.getNode().getAttributes();
            if (prefix == null) {
                Attr attrNode = (Attr)atts.getNamedItem(XMLConstants.XMLNS_ATTRIBUTE);
                if (attrNode != null) {
                    return new QName(attrNode.getValue(), lName);
                }
            } else {
                Attr attrNode = (Attr)atts.getNamedItem(XMLConstants.XMLNS_ATTRIBUTE+":"+prefix);
                if(attrNode != null) {
                    return new QName(attrNode.getValue(), lName, prefix); //NOI18N
                }

    /**
     * Determines if this and previous tags are from same namespaces.
     */
    private boolean fromSameNamespace(Node current, Node previous) {
        String prevPrefix = CompletionUtil.getPrefixFromTag(previous.getNodeName());
        String thisPrefix = CompletionUtil.getPrefixFromTag(current.getNodeName());
        String thisNS = (thisPrefix == null) ? declaredNamespaces.get(
            XMLConstants.XMLNS_ATTRIBUTE) :
            declaredNamespaces.get(XMLConstants.XMLNS_ATTRIBUTE+":"+thisPrefix);

    }
    
    public boolean canReplace(String text) {
        if(completionType == CompletionType.COMPLETION_TYPE_ELEMENT && 
                element.getType() == Node.ELEMENT_NODE) {
            String name = element.getNode().getNodeName();
            if(name != null && name.equals(typedChars) && text.equals(name))
                return false;
        }

        if(existingAttributes != null)
            return existingAttributes;
        existingAttributes = new ArrayList<String>();
        try {
            support.runWithSequence(tokenOffset, (TokenSequence ts) -> {
                if (ts.movePrevious()) {
                    return null;
                }
                Token<XMLTokenId> item;
                
                while(ts.movePrevious()) {
                    item = ts.token();
                    if(item.id() == XMLTokenId.TAG)
                        break;
                    if(item.id() == XMLTokenId.ARGUMENT) {
                        existingAttributes.add(item.text().toString());
                    }
                }
                return null;
            });
        } catch (BadLocationException ex) {
            Exceptions.printStackTrace(ex);
        }
        return existingAttributes;
    }




    public static final Pattern PATTERN_TEXT_TAG_EOLs = Pattern.compile("</?[\\s]+.*");
    
    private static final Logger _logger = Logger.getLogger(CompletionUtil.class.getName());

    public static boolean noCompletion(JTextComponent target) {
        if (target == null || target.getCaret() == null) {
            return false;
        }
        int offset = target.getCaret().getDot();
        if (offset < 0) {
            return false;
        }
        //no completion inside CDATA or comment section
        BaseDocument document = (BaseDocument) target.getDocument();
        ((AbstractDocument) document).readLock();
        try {
            TokenHierarchy th = TokenHierarchy.get(document);
            TokenSequence ts = th.tokenSequence();
            if (ts == null) {
                return false;
            }
            ts.move(offset);
            Token token = ts.token();
            if (token == null) {
                ts.moveNext();
                token = ts.token();
                if (token == null) {
                    return false;
                }
            }
            if (token.id() == XMLTokenId.CDATA_SECTION || token.id() == XMLTokenId.BLOCK_COMMENT || token.id() == XMLTokenId.PI_START || token.id() == XMLTokenId.PI_END || token.id() == XMLTokenId.PI_CONTENT || token.id() == XMLTokenId.PI_TARGET) {
                return true;
            }
        } finally {
            ((AbstractDocument) document).readUnlock();
        }
        return false;
    }
    
    /**
     * No instantiation.




import org.netbeans.api.lexer.Language;
import org.netbeans.api.xml.lexer.XMLTokenId;
import org.netbeans.editor.BaseDocument;
import org.netbeans.junit.NbTestCase;
import org.netbeans.modules.xml.schema.completion.util.CompletionContextImpl;
import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
import org.openide.filesystems.FileObject;

/**
 *
 * @author Samaresh
 */
public abstract class AbstractTestCase extends NbTestCase {
    
    protected String instanceResourcePath;
    protected FileObject instanceFileObject;


    @Override
    protected void setUp() throws Exception {
        
    }

    @Override

        this.instanceResourcePath = path;
        this.instanceFileObject = Util.getResourceAsFileObject(path);
        this.instanceDocument = Util.getResourceAsDocument(path);
        this.support = XMLSyntaxSupport.getSyntaxSupport(instanceDocument);
        if(content != null) {
            instanceDocument.remove(0, instanceDocument.getLength());
            instanceDocument.insertString(0, content.toString(), null);

Lines 79-85 Link Here

(-)a/xml.schema.completion/test/unit/src/org/netbeans/modules/xml/schema/completion/BasicCompletionTest.java (-1 / +2 lines)
79	suite.addTest(new BasicCompletionTest("testEndtagCompletion2"));	79	suite.addTest(new BasicCompletionTest("testEndtagCompletion2"));
80	suite.addTest(new BasicCompletionTest("testEndtagCompletion3"));	80	suite.addTest(new BasicCompletionTest("testEndtagCompletion3"));
81	suite.addTest(new BasicCompletionTest("testCompletionWithAmpersand"));	81	suite.addTest(new BasicCompletionTest("testCompletionWithAmpersand"));
82	suite.addTest(new BasicCompletionTest("testSchemaFromRuntimeCatalog"));	82	// disabled since it accesses Net:
		83	// suite.addTest(new BasicCompletionTest("testSchemaFromRuntimeCatalog"));
83	//suite.addTest(new BasicCompletionTest("testCompletionUsingSchemaFromCatalog"));	84	//suite.addTest(new BasicCompletionTest("testCompletionUsingSchemaFromCatalog"));
84	suite.addTest(new BasicCompletionTest("testWildcard1"));	85	suite.addTest(new BasicCompletionTest("testWildcard1"));
85	suite.addTest(new BasicCompletionTest("testWildcard2"));	86	suite.addTest(new BasicCompletionTest("testWildcard2"));

Line 0 Link Here

(-)a/xml.text.obsolete90/build.xml (+5 lines)
	1	<?xml version="1.0" encoding="UTF-8"?>
	2	<project basedir="." default="netbeans" name="xml.text.obsolete90">
	3	<description>Builds, tests, and runs the project org.netbeans.modules.xml.text.obsolete90</description>
	4	<import file="../nbbuild/templates/projectized.xml"/>
	5	</project>

Line 0 Link Here

(-)a/xml.text.obsolete90/manifest.mf (+6 lines)
	1	Manifest-Version: 1.0
	2	AutoUpdate-Show-In-Client: false
	3	OpenIDE-Module: org.netbeans.modules.xml.text.obsolete90
	4	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/xml/text/obsolete90/Bundle.properties
	5	OpenIDE-Module-Implementation-Version: 1
	6	OpenIDE-Module-Layer: org/netbeans/modules/xml/text/obsolete90/resources/mf-layer.xml

Line 0 Link Here

(-)a/xml.text.obsolete90/nbproject/project.properties (+4 lines)
	1	is.autoload=true
	2	javac.source=1.7
	3	javac.compilerargs=-Xlint -Xlint:-serial
	4	spec.version.base=1.0




<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://www.netbeans.org/ns/project/1">
    <type>org.netbeans.modules.apisupport.project</type>
    <configuration>
        <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
            <code-name-base>org.netbeans.modules.xml.text.obsolete90</code-name-base>
            <module-dependencies>
                <dependency>
                    <code-name-base>org.netbeans.modules.editor.deprecated.pre65formatting</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>0</release-version>
                        <specification-version>1.32</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.editor.document</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>1.10</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.editor.lib</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>3</release-version>
                        <specification-version>4.8</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.editor.mimelookup</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                        <specification-version>1.41</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.editor.structure</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.lexer</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>2</release-version>
                        <specification-version>1.64</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.xml.core</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>2</release-version>
                        <specification-version>1.44</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.xml.lexer</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>1.30</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.xml.text</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>2</release-version>
                        <implementation-version/>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.util</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>9.8</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.util.ui</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>9.7</specification-version>
                    </run-dependency>
                </dependency>
            </module-dependencies>
            <test-dependencies>
                <test-type>
                    <name>unit</name>
                    <test-dependency>
                        <code-name-base>org.netbeans.libs.junit4</code-name-base>
                        <compile-dependency/>
                    </test-dependency>
                    <test-dependency>
                        <code-name-base>org.netbeans.modules.editor</code-name-base>
                        <recursive/>
                        <compile-dependency/>
                        <test/>
                    </test-dependency>
                    <test-dependency>
                        <code-name-base>org.netbeans.modules.editor.mimelookup</code-name-base>
                        <compile-dependency/>
                    </test-dependency>
                    <test-dependency>
                        <code-name-base>org.netbeans.modules.editor.mimelookup.impl</code-name-base>
                        <recursive/>
                        <compile-dependency/>
                    </test-dependency>
                    <test-dependency>
                        <code-name-base>org.netbeans.modules.editor.settings.storage</code-name-base>
                        <recursive/>
                    </test-dependency>
                    <test-dependency>
                        <code-name-base>org.netbeans.modules.editor.structure</code-name-base>
                        <compile-dependency/>
                    </test-dependency>
                    <test-dependency>
                        <code-name-base>org.netbeans.modules.editor.util</code-name-base>
                        <compile-dependency/>
                    </test-dependency>
                    <test-dependency>
                        <code-name-base>org.netbeans.modules.nbjunit</code-name-base>
                        <recursive/>
                        <compile-dependency/>
                    </test-dependency>
                    <test-dependency>
                        <code-name-base>org.netbeans.modules.projectapi.nb</code-name-base>
                        <compile-dependency/>
                    </test-dependency>
                    <test-dependency>
                        <code-name-base>org.netbeans.modules.xml.lexer</code-name-base>
                        <compile-dependency/>
                    </test-dependency>
                    <test-dependency>
                        <code-name-base>org.netbeans.modules.xml.text</code-name-base>
                        <recursive/>
                        <compile-dependency/>
                        <test/>
                    </test-dependency>
                    <test-dependency>
                        <code-name-base>org.netbeans.modules.xml.xam</code-name-base>
                        <compile-dependency/>
                    </test-dependency>
                    <test-dependency>
                        <code-name-base>org.netbeans.modules.xml.xdm</code-name-base>
                        <compile-dependency/>
                    </test-dependency>
                    <test-dependency>
                        <code-name-base>org.openide.util.ui</code-name-base>
                        <compile-dependency/>
                    </test-dependency>
                    <test-dependency>
                        <code-name-base>org.openide.util.lookup</code-name-base>
                        <compile-dependency/>
                    </test-dependency>
                </test-type>
            </test-dependencies>
            <public-packages>
                <package>org.netbeans.modules.xml.text.api</package>
                <package>org.netbeans.modules.xml.text.indent</package>
                <package>org.netbeans.modules.xml.text.syntax</package>
                <package>org.netbeans.modules.xml.text.syntax.dom</package>
            </public-packages>
        </data>
    </configuration>
</project>




 */
package org.netbeans.modules.xml.text.api;

import org.netbeans.modules.xml.text.syntax.XMLTokenIDs;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import org.netbeans.editor.TokenContext;

 * @version 1.00
 * @contributor(s) XML Modifications Sandeep Singh Randhawa
 * @integrator Petr Kuzel
 * @deprecated This API uses an obsolete (Ext)Syntax API. Clients should use new Lexer API.
 */
@Deprecated
public class XMLDefaultTokenContext extends TokenContext implements XMLTokenIDs {

    

Lines 55-60 Link Here

(-)a/xml.text/src/org/netbeans/modules/xml/text/indent/XMLFormatter.java (+1 lines)
55	import org.netbeans.editor.ext.FormatWriter;	55	import org.netbeans.editor.ext.FormatWriter;
56	import org.netbeans.editor.BaseDocument;	56	import org.netbeans.editor.BaseDocument;
57	import org.netbeans.modules.editor.structure.formatting.TagBasedFormatter;	57	import org.netbeans.modules.editor.structure.formatting.TagBasedFormatter;
		58	import org.netbeans.modules.xml.text.indent.XMLFormatSupport;
58	import org.netbeans.modules.xml.text.syntax.XMLSyntaxSupport;	59	import org.netbeans.modules.xml.text.syntax.XMLSyntaxSupport;
59	import org.netbeans.modules.xml.text.syntax.XMLTokenIDs;	60	import org.netbeans.modules.xml.text.syntax.XMLTokenIDs;
60		61

Line 0 Link Here

(-)a/xml.text.obsolete90/src/org/netbeans/modules/xml/text/obsolete90/Bundle.properties (+5 lines)
	1	OpenIDE-Module-Long-Description=\
	2	The SyntaxElement API was desinged around the old and now long-deprecated parser. \
	3	This module provides backward compatibility for module implementors who did not migrate to the new lexer and new SyntaxElement API found in the XML Text Editor module.
	4	OpenIDE-Module-Name=XML Text Editor (obsolete)
	5	OpenIDE-Module-Short-Description=Obsolete and deprecated APIs from XML Text Editor module




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2016 Oracle and/or its affiliates. All rights reserved.
 *
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 * Other names may be trademarks of their respective owners.
 *
 * The contents of this file are subject to the terms of either the GNU
 * General Public License Version 2 only ("GPL") or the Common
 * Development and Distribution License("CDDL") (collectively, the
 * "License"). You may not use this file except in compliance with the
 * License. You can obtain a copy of the License at
 * http://www.netbeans.org/cddl-gplv2.html
 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
 * specific language governing permissions and limitations under the
 * License.  When distributing the software, include this License Header
 * Notice in each file and include the License file at
 * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Oracle in the GPL Version 2 section of the License file that
 * accompanied this code. If applicable, add the following below the
 * License Header, with the fields enclosed by brackets [] replaced by
 * your own identifying information:
 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * If you wish your version of this file to be governed by only the CDDL
 * or only the GPL Version 2, indicate your decision by adding
 * "[Contributor] elects to include this software in this distribution
 * under the [CDDL or GPL Version 2] license." If you do not indicate a
 * single choice of license, a recipient has the option to distribute
 * your version of this file under either the CDDL, the GPL Version 2 or
 * to extend the choice of license to its licensees as provided above.
 * However, if you add GPL Version 2 code and therefore, elected the GPL
 * Version 2 license, then the option applies only if the new code is
 * made subject to such option by the copyright holder.
 *
 * Contributor(s):
 *
 * Portions Copyrighted 2016 Sun Microsystems, Inc.
 */
package org.netbeans.modules.xml.text.obsolete90;

import java.util.Collections;
import java.util.List;
import org.netbeans.modules.xml.text.api.XMLDefaultTokenContext;
import org.netbeans.modules.xml.text.syntax.DTDTokenContext;

/**
 *
 * @author sdedic
 */
public class ComplexValueSettingsFactory {
    public static List getXMLTokenContext() {
        return Collections.singletonList(XMLDefaultTokenContext.context);
    }
    // XXX: use lexer
    public static List getDTDTokenContext() {
        return Collections.singletonList(DTDTokenContext.context);
    }
}




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2016 Oracle and/or its affiliates. All rights reserved.
 *
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 * Other names may be trademarks of their respective owners.
 *
 * The contents of this file are subject to the terms of either the GNU
 * General Public License Version 2 only ("GPL") or the Common
 * Development and Distribution License("CDDL") (collectively, the
 * "License"). You may not use this file except in compliance with the
 * License. You can obtain a copy of the License at
 * http://www.netbeans.org/cddl-gplv2.html
 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
 * specific language governing permissions and limitations under the
 * License.  When distributing the software, include this License Header
 * Notice in each file and include the License file at
 * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Oracle in the GPL Version 2 section of the License file that
 * accompanied this code. If applicable, add the following below the
 * License Header, with the fields enclosed by brackets [] replaced by
 * your own identifying information:
 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * If you wish your version of this file to be governed by only the CDDL
 * or only the GPL Version 2, indicate your decision by adding
 * "[Contributor] elects to include this software in this distribution
 * under the [CDDL or GPL Version 2] license." If you do not indicate a
 * single choice of license, a recipient has the option to distribute
 * your version of this file under either the CDDL, the GPL Version 2 or
 * to extend the choice of license to its licensees as provided above.
 * However, if you add GPL Version 2 code and therefore, elected the GPL
 * Version 2 license, then the option applies only if the new code is
 * made subject to such option by the copyright holder.
 *
 * Contributor(s):
 *
 * Portions Copyrighted 2016 Sun Microsystems, Inc.
 */
package org.netbeans.modules.xml.text.obsolete90;

import javax.swing.text.Document;
import javax.swing.text.EditorKit;
import org.netbeans.api.editor.mimelookup.MimeRegistration;
import org.netbeans.api.editor.mimelookup.MimeRegistrations;
import org.netbeans.editor.BaseDocument;
import org.netbeans.editor.SyntaxSupport;
import org.netbeans.modules.xml.text.syntax.DTDKit;
import org.netbeans.modules.xml.text.syntax.DTDSyntaxTokenMapper;
import org.netbeans.modules.xml.text.syntax.DTDTokenContext;
import org.netbeans.modules.xml.text.syntax.ENTKit;
import org.netbeans.modules.xml.text.syntax.XMLDefaultSyntax;
import org.netbeans.modules.xml.text.syntax.XMLKit;
import org.netbeans.modules.xml.text.syntax.XMLSyntaxSupport;
import org.netbeans.modules.xml.text.syntax.bridge.LegacySyntaxBridge;
import org.netbeans.modules.xml.text.syntax.javacc.DTDSyntaxTokenManager;
import org.netbeans.modules.xml.text.syntax.javacc.lib.JJEditorSyntax;

/**
 *
 * @author sdedic
 */
@MimeRegistrations({
    @MimeRegistration(service = LegacySyntaxBridge.class, mimeType = "text/xml"),
    @MimeRegistration(service = LegacySyntaxBridge.class, mimeType = "application/xml-dtd"),
    @MimeRegistration(service = LegacySyntaxBridge.class, mimeType = "text/xml-external-parsed-entity")
})
public class XMLSyntaxBridgeImpl implements LegacySyntaxBridge {

    @Override
    public org.netbeans.editor.Syntax createSyntax(EditorKit host, Document doc, String mimeType) {
        if (DTDKit.MIME_TYPE.equals(mimeType)) {
            return new JJEditorSyntax( 
                new DTDSyntaxTokenManager(null).new Bridge(),
                new DTDSyntaxTokenMapper(),
                DTDTokenContext.contextPath
            );

        } else if (XMLKit.MIME_TYPE.equals(mimeType)) {
            return new XMLDefaultSyntax();
        } else if (ENTKit.MIME_TYPE.equals(mimeType)) {
            return new XMLDefaultSyntax();
        } else {
            return null;
        }
    }

    @Override
    public SyntaxSupport createSyntaxSupport(EditorKit host, Document doc, String mimeType) {
        if (XMLKit.MIME_TYPE.equals(mimeType) || ENTKit.MIME_TYPE.equals(mimeType)) {
            return new XMLSyntaxSupport((BaseDocument)doc);
        } else {
            return null;
        }
    }
}

Lines 46-52 Link Here

(-)a/xml.text/src/org/netbeans/modules/xml/text/resources/DTDEditor-preferences.xml (-3 / +1 lines)
46	<!DOCTYPE editor-preferences PUBLIC "-//NetBeans//DTD Editor Preferences 1.0//EN" "http://www.netbeans.org/dtds/EditorPreferences-1_0.dtd">	46	<!DOCTYPE editor-preferences PUBLIC "-//NetBeans//DTD Editor Preferences 1.0//EN" "http://www.netbeans.org/dtds/EditorPreferences-1_0.dtd">
47		47
48	<editor-preferences>	48	<editor-preferences>
49	<entry name="token-context-list" value="org.netbeans.modules.xml.text.ComplexValueSettingsFactory.getDTDTokenContext" javaType="methodvalue" />	49	<entry name="token-context-list" value="org.netbeans.modules.xml.text.obsolete90.ComplexValueSettingsFactory.getDTDTokenContext" javaType="methodvalue" />
50	<entry name="indentEngine" value="org.netbeans.modules.xml.text.ComplexValueSettingsFactory.getDTDIndentEngine" javaType="methodvalue" />
51	<entry name="abbrev-reset-acceptor" value="org.netbeans.modules.xml.text.ComplexValueSettingsFactory.getDTDAbbrevResetAcceptor" javaType="methodvalue" />
52	</editor-preferences>	50	</editor-preferences>

Lines 46-54 Link Here

(-)a/xml.text/src/org/netbeans/modules/xml/text/resources/XMLEditor-preferences.xml (-5 / +1 lines)
46	<!DOCTYPE editor-preferences PUBLIC "-//NetBeans//DTD Editor Preferences 1.0//EN" "http://www.netbeans.org/dtds/EditorPreferences-1_0.dtd">	46	<!DOCTYPE editor-preferences PUBLIC "-//NetBeans//DTD Editor Preferences 1.0//EN" "http://www.netbeans.org/dtds/EditorPreferences-1_0.dtd">
47		47
48	<editor-preferences>	48	<editor-preferences>
49	<entry name="code-folding-enable" value="true" javaType="java.lang.Boolean" />	49	<entry name="token-context-list" value="org.netbeans.modules.xml.text.obsolete90.ComplexValueSettingsFactory.getXMLTokenContext" javaType="methodvalue" />
50	<entry name="token-context-list" value="org.netbeans.modules.xml.text.ComplexValueSettingsFactory.getXMLTokenContext" javaType="methodvalue" />
51	<entry name="indentEngine" value="org.netbeans.modules.xml.text.ComplexValueSettingsFactory.getXMLIndentEngine" javaType="methodvalue" />
52	<entry name="identifier-acceptor" value="org.netbeans.modules.xml.text.ComplexValueSettingsFactory.getXMLIdentifierAcceptor" javaType="methodvalue" />
53	<entry name="abbrev-reset-acceptor" value="org.netbeans.modules.xml.text.ComplexValueSettingsFactory.getXMLAbbrevResetAcceptor" javaType="methodvalue" />
54	</editor-preferences>	50	</editor-preferences>




-->
<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.0//EN" "http://www.netbeans.org/dtds/filesystem-1_0.dtd">
<filesystem>
    <folder name="Navigator">
        <folder name="Panels">
            <folder name="text">
                <folder name="xml">
                    <file name="org-netbeans-modules-xml-text-navigator-XMLNavigatorPanel.instance"/>
                </folder>
                <folder name="xsd+xml">
                    <file name="org-netbeans-modules-xml-text-navigator-XMLNavigatorPanel.instance"/>
                </folder>
                <folder name="xml-wsdl">
                    <file name="org-netbeans-modules-xml-text-navigator-XMLNavigatorPanel.instance"/>
                </folder>
                <folder name="x-ant+xml">
                    <file name="org-netbeans-modules-xml-text-navigator-XMLNavigatorPanel.instance"/>
                </folder>
                <folder name="x-dd-sjsas-servlet2.41">
                    <!-- sun-web.xml -->
                    <file name="org-netbeans-modules-xml-text-navigator-XMLNavigatorPanel.instance"/>
                </folder>
            </folder>
            <folder name="application">
                <folder name="xslt+xml">
                    <file name="org-netbeans-modules-xml-text-navigator-XMLNavigatorPanel.instance"/>
                </folder>
                <folder name="xhtml+xml">
                    <file name="org-netbeans-modules-xml-text-navigator-XMLNavigatorPanel.instance"/>
                </folder>
                <folder name="x-schema+xml">
                    <file name="org-netbeans-modules-xml-text-navigator-XMLNavigatorPanel.instance"/>
                </folder>
            </folder>
        </folder>
    </folder>
    
    <folder name="Services">
        <folder name="IndentEngine">
            <!--
            <file name="org-netbeans-modules-xml-text-settings-XMLIndentEngine.settings" url="XMLIndentEngine.xml">
                <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.xml.text.indent.Bundle"/>
            </file>
            -->
            <file name="org-netbeans-modules-xml-text-settings-DTDIndentEngine.settings" url="DTDIndentEngine.xml">
                <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.xml.text.indent.Bundle"/>
            </file>
        </folder> <!-- IndentEngine -->

        <!--
        <folder name="Hidden">
            <file name="org-netbeans-modules-xml-text-completion-ReloadActionPerformer.instance">
                <attr name="instanceOf" stringvalue="org.netbeans.modules.xml.core.actions.XMLUpdateDocumentAction$Performer"/>
            </file>
        </folder>
        -->
    </folder> <!-- Services -->

    <folder name="Editors">
        <folder name="text">
            <folder name="xml">
                <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.xml.text.resources.Bundle"/>
                
                <file name="org-netbeans-modules-xml-text-indent-XMLIndentTaskFactory.instance"/>
                
                <file name="AutoIndenter.instance">
                    <attr name="instanceOf" stringvalue="org.netbeans.spi.editor.typinghooks.TypedTextInterceptor$Factory"/>
                    <attr name="instanceCreate"
                          methodvalue="org.netbeans.modules.editor.indent.spi.support.AutomatedIndenting.createHotCharsIndenter"/>
                    <attr name="regex1" stringvalue="\s*\&lt;/\w+\>"/>
                </file>

                <folder name="CompletionProviders">
                    <file name="org-netbeans-modules-xml-text-completion-XMLCompletionProvider.instance"/>
                </folder>

                <folder name="BracesMatchers">
                    <file name="org-netbeans-modules-xml-text-bracematch-XMLBraceMatcherFactory.instance">
                        <attr name="position" intvalue="50"/>
                    </file>
                </folder>

                <folder name="FontsColors">
                    <folder name="NetBeans">
                        <folder name="Defaults">
                            <file name="org-netbeans-modules-xml-text-token-colorings.xml" url="XML-fontsColors.xml">
                                <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.xml.text.resources.Bundle"/>
                            </file>
                        </folder>
                    </folder>
                </folder>
                
                <folder name="DocumentModel">
                    <file name="org-netbeans-modules-xml-text-structure-XMLDocumentModelProvider.instance"/>
                </folder>
                
                <folder name="FoldManager">
                    <file name="org-netbeans-modules-xml-text-folding-XmlFoldManagerFactory.instance">
                	<attr name="position" intvalue="1100"/>
            	    </file>
                </folder>
                
                <folder name="Popup">
                    <file name="org-netbeans-modules-xml-actions-CollectXMLAction.shadow">
                        <attr name="originalFile" stringvalue="Actions/XML/org-netbeans-modules-xml-actions-CollectXMLAction.instance"/>
                        <attr name="position" intvalue="1600"/>
                    </file>
                    <file name="org-netbeans-modules-xml-actions-XMLViewActions.instance">
                        <attr name="position" intvalue="1400"/>
                    </file>
                    <!-- implicit separator provided by above action group -->
                    
                    <file name="format">
                        <attr name="position" intvalue="1200"/>
                    </file>
                    <file name="SeparatorAfterFormat.instance">
                        <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
                        <attr name="position" intvalue="1800"/>
                    </file>                   
                    
                    <!-- Cut, Copy, Paste actions block -->
                    <file name="ToolsSeparator.instance"><attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>    <attr name="position" intvalue="4100"/>
                    </file>
                    
                    <file name="org-openide-actions-ToolsAction.shadow">
                        <attr name="originalFile" stringvalue="Actions/System/org-openide-actions-ToolsAction.instance"/>
                        <attr name="position" intvalue="4200"/>
                    </file>
                </folder>
                
                <folder name="CodeTemplates">
                    <folder name="Defaults">
                        <file name="org-netbeans-modules-xml-text-xmlCodeTemplates.xml" url="XMLEditor-abbreviations.xml"/>
                    </folder>
                </folder>
                
                <folder name="Preferences">
                    <folder name="Defaults">
                        <file name="org-netbeans-modules-xml-text-xmlPreferences.xml" url="XMLEditor-preferences.xml"/>
                    </folder>
                </folder>
                
                <file name="EditorKit.instance">
                    <attr name="instanceClass" stringvalue="org.netbeans.modules.xml.text.syntax.XMLKit"/>
                    <attr name="instanceOf" stringvalue="javax.swing.text.EditorKit,org.netbeans.modules.xml.text.syntax.XMLKit"/>
                    <attr name="beaninfo" boolvalue="false"/>
                </file>
                
                <!-- <folder name="Toolbars">
                    <folder name="Default">
                        <attr name="stop-macro-recording/XMLSeparator1.instance" boolvalue="true"/>
                        <file name="XMLSeparator1.instance">
                            <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
                        </file>

                        <attr name="XMLSeparator1.instance/xml-comment" boolvalue="true"/>
                        <file name="xml-comment"/>
                        <attr name="xml-comment/xml-uncomment" boolvalue="true"/>
                        <file name="xml-uncomment"/>
                    </folder> <!__ Default __>
                </folder> -->
                <folder name="SideBar">
                    <file name="breadcrumbs.instance">
                        <attr name="location" stringvalue="South"/>
                        <attr name="position" intvalue="5237"/>
                        <attr name="scrollable" boolvalue="false"/>
                        <attr name="instanceCreate" methodvalue="org.netbeans.modules.editor.breadcrumbs.spi.BreadcrumbsController.createSideBarFactory" />
                    </file>
                </folder>
            </folder> <!-- xml -->

            <folder name="xml-external-parsed-entity">
                <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.xml.text.resources.Bundle"/>
                <!-- It reuses kit only -->
                <file name="EditorKit.instance">
                    <attr name="instanceClass" stringvalue="org.netbeans.modules.xml.text.syntax.ENTKit"/>
                    <attr name="instanceOf" stringvalue="javax.swing.text.EditorKit,org.netbeans.modules.xml.text.syntax.ENTKit"/>
                    <attr name="beaninfo" boolvalue="false"/>
                </file>
                
                <folder name="CompletionProviders">
                    <file name="org-netbeans-modules-xml-text-completion-XMLCompletionProvider.instance"/>
                </folder>
                
                <folder name="FontsColors">
                    <folder name="NetBeans">
                        <folder name="Defaults">
                            <file name="org-netbeans-modules-xml-text-token-colorings.xml" url="XML-fontsColors.xml">
                                <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.xml.text.resources.Bundle"/>
                            </file>
                        </folder>
                    </folder>
                </folder>                
                <folder name="DocumentModel">
                    <file name="org-netbeans-modules-xml-text-structure-XMLDocumentModelProvider.instance"/>
                </folder>
            </folder>
            <folder name="xml-external-parsed-entity">
                <folder name="DocumentModel">
                    <file name="org-netbeans-modules-xml-text-structure-XMLDocumentModelProvider.instance"/>
            	    </file>
                </folder>
                
                <folder name="Popup">
                    <file name="org-netbeans-modules-xml-actions-CollectXMLAction.shadow">
                        <attr name="originalFile" stringvalue="Actions/XML/org-netbeans-modules-xml-actions-CollectXMLAction.instance"/>
                        <attr name="position" intvalue="1600"/>
                    </file>
                    <file name="org-netbeans-modules-xml-actions-XMLViewActions.instance">
                        <attr name="position" intvalue="1400"/>
                    </file>
                    <!-- implicit separator provided by above action group -->
                    
                    <file name="format">
                        <attr name="position" intvalue="1200"/>
                    </file>
                    <file name="SeparatorAfterFormat.instance">
                        <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
                        <attr name="position" intvalue="1800"/>
                    </file>                   
                    
                    <!-- Cut, Copy, Paste actions block -->
                    <file name="ToolsSeparator.instance"><attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>    <attr name="position" intvalue="4100"/>
                    </file>
                    
                    <file name="org-openide-actions-ToolsAction.shadow">
                        <attr name="originalFile" stringvalue="Actions/System/org-openide-actions-ToolsAction.instance"/>
                        <attr name="position" intvalue="4200"/>
                    </file>
                </folder>
                
                <folder name="CodeTemplates">
                    <folder name="Defaults">
                        <file name="org-netbeans-modules-xml-text-xmlCodeTemplates.xml" url="XMLEditor-abbreviations.xml"/>
                    </folder>
                </folder>
                
                <!-- <file name="Settings.settings" url="XMLEditor-options.xml"/> -->
                
            </folder> <!-- xml-external-parsed-entity -->
        </folder> <!-- text -->

        <folder name="application">
            <folder name="xml-dtd">
                <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.xml.text.resources.Bundle"/>
                
                <folder name="FontsColors">
                    <folder name="NetBeans">
                        <folder name="Defaults">
                            <file name="org-netbeans-modules-xml-text-token-colorings.xml" url="DTD-fontsColors.xml">
                                <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.xml.text.resources.Bundle"/>
                            </file>
                        </folder>
                    </folder>
                </folder>
                
                <folder name="Popup">                    
                    <!-- implicit separator provided by below action group -->    
                    
                    
                    <file name="ToolsSeparator.instance"><attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>    <attr name="position" intvalue="4200"/>
                    </file>
                    
                    <file name="org-netbeans-modules-xml-actions-CollectDTDAction.shadow">
                        <attr name="originalFile" stringvalue="Actions/XML/org-netbeans-modules-xml-actions-CollectDTDAction.instance"/>
                        <attr name="position" intvalue="4100"/>
                    </file>
                    <file name="org-openide-actions-ToolsAction.shadow">
                        <attr name="originalFile" stringvalue="Actions/System/org-openide-actions-ToolsAction.instance"/>
                        <attr name="position" intvalue="4300"/>
                    </file>
                </folder>
                
                <folder name="CodeTemplates">
                    <folder name="Defaults">
                        <file name="org-netbeans-modules-xml-text-dtdCodeTemplates.xml" url="DTDEditor-abbreviations.xml"/>
                    </folder>
                </folder>
                
                <folder name="Preferences">
                    <folder name="Defaults">
                        <file name="org-netbeans-modules-xml-text-dtdPreferences.xml" url="DTDEditor-preferences.xml"/>
                    </folder>
                </folder>
                
                <file name="EditorKit.instance">
                    <attr name="instanceClass" stringvalue="org.netbeans.modules.xml.text.syntax.DTDKit"/>
                    <attr name="instanceOf" stringvalue="javax.swing.text.EditorKit,org.netbeans.modules.xml.text.syntax.DTDKit"/>
                    <attr name="beaninfo" boolvalue="false"/>
                </file>
            </folder> <!-- xml-dtd -->
        </folder> <!-- application -->
    </folder> <!-- Editors -->
    
    <folder name="OptionsDialog">
        <folder name="PreviewExamples">
            <folder name="application">
                <file name="xml-dtd" url="DTDExample"/>
            </folder>
            <folder name="text">
                <file name="xml" url="XMLExample"/>
            </folder>
        </folder>
    </folder> <!-- Editors -->
    
</filesystem>




package org.netbeans.modules.xml.text.syntax;

import java.lang.ref.WeakReference;
import java.util.*;

import org.w3c.dom.*;

import javax.swing.text.*;

import org.netbeans.editor.ext.*;
import org.netbeans.editor.*;
import org.openide.ErrorManager;


 *
 * @version 1.0
 */
public abstract class SyntaxElement implements org.netbeans.modules.xml.text.api.dom.SyntaxElement {
    
    // to do do not handle prolog as text!
    // support PIs

    void setPrevious(SyntaxElement se) {
        previous = new WeakReference(se);
    }

    /**
     * Get previous SyntaxElement. Weakly cache results.
     * @return previous SyntaxElement or <code>null</code> at document begining

        public String toString() {
            return "Error" + super.toString();                                  // NOI18N
        }

        @Override
        public int getType() {
            return NODE_ERROR;
        }

        @Override
        public Node getNode() {
            return null;
        }

        @Override
        public SyntaxElement getParentElement() {
            SyntaxElement x = this;
            while (x != null && x.getType() != Node.ELEMENT_NODE) {
                x = x.getPrevious();
            }
            return x;
        }
    }
    
}

Lines 73-79 Link Here

(-)a/xml.text/src/org/netbeans/modules/xml/text/syntax/XMLSyntaxSupport.java (-1 / +1 lines)
73	* @author Petr Kuzel - use before strategy, use tokens whenever possible	73	* @author Petr Kuzel - use before strategy, use tokens whenever possible
74	* @version 0.8	74	* @version 0.8
75	*/	75	*/
76	public class XMLSyntaxSupport extends ExtSyntaxSupport implements XMLTokenIDs {	76	public final class XMLSyntaxSupport extends ExtSyntaxSupport implements XMLTokenIDs {
77		77
78	private Reference reference = new SoftReference(null); // cached helper	78	private Reference reference = new SoftReference(null); // cached helper
79	private String systemId = null; // cached refernce to DTD	79	private String systemId = null; // cached refernce to DTD

Lines 43-50 Link Here

(-)a/xml.text/src/org/netbeans/modules/xml/text/syntax/XMLTokenContext.java (-2 lines)
43	*/	43	*/
44	package org.netbeans.modules.xml.text.syntax;	44	package org.netbeans.modules.xml.text.syntax;
45		45
46	import org.netbeans.editor.BaseTokenCategory;
47	import org.netbeans.editor.BaseTokenID;
48	import org.netbeans.editor.TokenContext;	46	import org.netbeans.editor.TokenContext;
49	import org.netbeans.editor.TokenContextPath;	47	import org.netbeans.editor.TokenContextPath;
50		48

Lines 44-49 Link Here

(-)a/xml.text/src/org/netbeans/modules/xml/text/syntax/dom/AttrImpl.java (+3 lines)
44		44
45	package org.netbeans.modules.xml.text.syntax.dom;	45	package org.netbeans.modules.xml.text.syntax.dom;
46		46
		47	import org.netbeans.modules.xml.text.syntax.XMLSyntaxSupport;
		48	import org.netbeans.modules.xml.text.syntax.XMLTokenIDs;
47	import java.util.*;	49	import java.util.*;
48	import javax.swing.text.BadLocationException;	50	import javax.swing.text.BadLocationException;
49		51
Lines 51-56 Link Here
51	import org.netbeans.modules.xml.text.syntax.*;	53	import org.netbeans.modules.xml.text.syntax.*;
52	import org.netbeans.modules.xml.spi.dom.*;	54	import org.netbeans.modules.xml.spi.dom.*;
53	import org.netbeans.editor.*;	55	import org.netbeans.editor.*;
		56	import org.netbeans.modules.xml.*;
54		57
55	/**	58	/**
56	* Holds attribute: name-value pairs. It is returned by <code>Tag</code>	59	* Holds attribute: name-value pairs. It is returned by <code>Tag</code>

Lines 44-49 Link Here

(-)a/xml.text/src/org/netbeans/modules/xml/text/syntax/dom/CDATASectionImpl.java (+1 lines)
44		44
45	package org.netbeans.modules.xml.text.syntax.dom;	45	package org.netbeans.modules.xml.text.syntax.dom;
46		46
		47	import org.netbeans.modules.xml.text.syntax.XMLSyntaxSupport;
47	import org.w3c.dom.*;	48	import org.w3c.dom.*;
48	import org.netbeans.modules.xml.text.syntax.*;	49	import org.netbeans.modules.xml.text.syntax.*;
49	import org.netbeans.modules.xml.spi.dom.*;	50	import org.netbeans.modules.xml.spi.dom.*;

Lines 44-49 Link Here

(-)a/xml.text/src/org/netbeans/modules/xml/text/syntax/dom/CommentImpl.java (+1 lines)
44		44
45	package org.netbeans.modules.xml.text.syntax.dom;	45	package org.netbeans.modules.xml.text.syntax.dom;
46		46
		47	import org.netbeans.modules.xml.text.syntax.XMLSyntaxSupport;
47	import org.w3c.dom.*;	48	import org.w3c.dom.*;
48	import org.netbeans.modules.xml.text.syntax.*;	49	import org.netbeans.modules.xml.text.syntax.*;
49	import org.netbeans.modules.xml.spi.dom.*;	50	import org.netbeans.modules.xml.spi.dom.*;

Lines 44-49 Link Here

(-)a/xml.text/src/org/netbeans/modules/xml/text/syntax/dom/DocumentImpl.java (+1 lines)
44		44
45	package org.netbeans.modules.xml.text.syntax.dom;	45	package org.netbeans.modules.xml.text.syntax.dom;
46		46
		47	import org.netbeans.modules.xml.text.syntax.SyntaxElement;
47	import org.w3c.dom.*;	48	import org.w3c.dom.*;
48	import org.netbeans.modules.xml.text.syntax.*;	49	import org.netbeans.modules.xml.text.syntax.*;
49	import org.netbeans.modules.xml.spi.dom.*;	50	import org.netbeans.modules.xml.spi.dom.*;

Lines 44-49 Link Here

(-)a/xml.text/src/org/netbeans/modules/xml/text/syntax/dom/DocumentTypeImpl.java (+2 lines)
44		44
45	package org.netbeans.modules.xml.text.syntax.dom;	45	package org.netbeans.modules.xml.text.syntax.dom;
46		46
		47	import org.netbeans.modules.xml.text.syntax.XMLSyntaxSupport;
		48	import org.netbeans.modules.xml.text.syntax.XMLTokenIDs;
47	import org.w3c.dom.*;	49	import org.w3c.dom.*;
48	import org.netbeans.modules.xml.text.syntax.*;	50	import org.netbeans.modules.xml.text.syntax.*;
49	import org.netbeans.modules.xml.spi.dom.*;	51	import org.netbeans.modules.xml.spi.dom.*;

Lines 44-49 Link Here

(-)a/xml.text/src/org/netbeans/modules/xml/text/syntax/dom/EmptyTag.java (+1 lines)
44		44
45	package org.netbeans.modules.xml.text.syntax.dom;	45	package org.netbeans.modules.xml.text.syntax.dom;
46		46
		47	import org.netbeans.modules.xml.text.syntax.XMLSyntaxSupport;
47	import java.util.*;	48	import java.util.*;
48		49
49	import org.w3c.dom.*;	50	import org.w3c.dom.*;

Lines 44-49 Link Here

(-)a/xml.text/src/org/netbeans/modules/xml/text/syntax/dom/EndTag.java (+2 lines)
44		44
45	package org.netbeans.modules.xml.text.syntax.dom;	45	package org.netbeans.modules.xml.text.syntax.dom;
46		46
		47	import org.netbeans.modules.xml.text.syntax.XMLSyntaxSupport;
		48	import org.netbeans.modules.xml.text.syntax.SyntaxElement;
47	import java.util.*;	49	import java.util.*;
48		50
49	import org.w3c.dom.*;	51	import org.w3c.dom.*;

Lines 44-49 Link Here

(-)a/xml.text/src/org/netbeans/modules/xml/text/syntax/dom/EntityReferenceImpl.java (+1 lines)
44		44
45	package org.netbeans.modules.xml.text.syntax.dom;	45	package org.netbeans.modules.xml.text.syntax.dom;
46		46
		47	import org.netbeans.modules.xml.text.syntax.XMLSyntaxSupport;
47	import org.w3c.dom.*;	48	import org.w3c.dom.*;
48	import org.netbeans.modules.xml.text.syntax.*;	49	import org.netbeans.modules.xml.text.syntax.*;
49	import org.netbeans.modules.xml.spi.dom.*;	50	import org.netbeans.modules.xml.spi.dom.*;

Lines 44-49 Link Here

(-)a/xml.text/src/org/netbeans/modules/xml/text/syntax/dom/StartTag.java (+2 lines)
44		44
45	package org.netbeans.modules.xml.text.syntax.dom;	45	package org.netbeans.modules.xml.text.syntax.dom;
46		46
		47	import org.netbeans.modules.xml.text.syntax.XMLSyntaxSupport;
		48	import org.netbeans.modules.xml.text.syntax.SyntaxElement;
47	import java.util.*;	49	import java.util.*;
48		50
49	import org.w3c.dom.*;	51	import org.w3c.dom.*;

Lines 44-49 Link Here

(-)a/xml.text/src/org/netbeans/modules/xml/text/syntax/dom/SyntaxNode.java (+16 lines)
44		44
45	package org.netbeans.modules.xml.text.syntax.dom;	45	package org.netbeans.modules.xml.text.syntax.dom;
46		46
		47	import org.netbeans.modules.xml.text.syntax.XMLSyntaxSupport;
		48	import org.netbeans.modules.xml.text.syntax.SyntaxElement;
47	import org.w3c.dom.*;	49	import org.w3c.dom.*;
48	import org.netbeans.modules.xml.text.syntax.*;	50	import org.netbeans.modules.xml.text.syntax.*;
49	import org.netbeans.modules.xml.spi.dom.*;	51	import org.netbeans.modules.xml.spi.dom.*;
Lines 72-77 Link Here
72	super( support, first, to);	74	super( support, first, to);
73	}	75	}
74		76
		77	@Override
		78	public int getType() {
		79	return getNodeType();
		80	}
		81
		82	@Override
		83	public Node getNode() {
		84	return this;
		85	}
75	/**	86	/**
76	* Default implementation returning first previous <code>SyntaxNode</code>	87	* Default implementation returning first previous <code>SyntaxNode</code>
77	* or <code>null</code>. It is <code>StartTag</code> aware.	88	* or <code>null</code>. It is <code>StartTag</code> aware.
Lines 341-345 Link Here
341	public void setIdAttributeNode(Attr a, boolean b) {	352	public void setIdAttributeNode(Attr a, boolean b) {
342	throw new UOException ();	353	throw new UOException ();
343	}	354	}
		355
		356	@Override
		357	public org.netbeans.modules.xml.text.api.dom.SyntaxElement getParentElement() {
		358	return (SyntaxElement)getParentNode();
		359	}
344		360
345	}	361	}

Lines 44-49 Link Here

(-)a/xml.text/src/org/netbeans/modules/xml/text/syntax/dom/Tag.java (+2 lines)
44		44
45	package org.netbeans.modules.xml.text.syntax.dom;	45	package org.netbeans.modules.xml.text.syntax.dom;
46		46
		47	import org.netbeans.modules.xml.text.syntax.XMLSyntaxSupport;
		48	import org.netbeans.modules.xml.text.syntax.XMLTokenIDs;
47	import java.util.*;	49	import java.util.*;
48	import javax.swing.text.BadLocationException;	50	import javax.swing.text.BadLocationException;
49		51

Lines 44-49 Link Here

(-)a/xml.text/src/org/netbeans/modules/xml/text/syntax/dom/TextImpl.java (+1 lines)
44		44
45	package org.netbeans.modules.xml.text.syntax.dom;	45	package org.netbeans.modules.xml.text.syntax.dom;
46		46
		47	import org.netbeans.modules.xml.text.syntax.XMLSyntaxSupport;
47	import org.w3c.dom.*;	48	import org.w3c.dom.*;
48	import org.netbeans.modules.xml.text.syntax.*;	49	import org.netbeans.modules.xml.text.syntax.*;
49	import org.netbeans.modules.xml.spi.dom.*;	50	import org.netbeans.modules.xml.spi.dom.*;




     * @return the same value of stripped substring of it.
     */
    public static String actualAttributeValue(String attributeValue) {
        return org.netbeans.modules.xml.text.api.XMLTextUtils.actualAttributeValue(attributeValue);
        int gtIndex = attributeValue.indexOf('>');
        int firstUnwantedIndex = -1;
        if (gtIndex != -1) {
            if (ltIndex != -1 && ltIndex < gtIndex) {
                firstUnwantedIndex = ltIndex;
            } else {
                firstUnwantedIndex = gtIndex;
            }
        } else {
            firstUnwantedIndex = ltIndex;
        }
        
        if (firstUnwantedIndex != -1) {
            char charAtIndex = attributeValue.charAt(firstUnwantedIndex);
            while (charAtIndex == ' ' || charAtIndex == '\t' || charAtIndex  == '\n' ||
            charAtIndex == '\r' || charAtIndex == '<' || charAtIndex == '>') {
                firstUnwantedIndex--;
                if (firstUnwantedIndex < 0) {
                    break;
                }
                charAtIndex = attributeValue.charAt(firstUnwantedIndex);
            }
            
            return attributeValue.substring(0, firstUnwantedIndex + 1);
        } else {
            return attributeValue;
        }
    }
    
    /**

     * @return a string that may contain '<', '>', '\'', '"', '&'.
     */
    public static String replaceEntityStringsWithChars(String value) {
        return org.netbeans.modules.xml.text.api.XMLTextUtils.replaceCharsWithEntityStrings(value);
        for (int entity = 0; entity < knownEntityStrings.length; entity++) {
            String curEntityString = knownEntityStrings[entity];
            int indexOfEntity = buf.toString().indexOf(curEntityString);
            while (indexOfEntity != -1) {
                buf.replace(indexOfEntity, indexOfEntity + curEntityString.length(),
                new String(new char[]{knownEntityChars[entity]}));
                indexOfEntity = buf.toString().indexOf(curEntityString);
            }
        }
        
        return buf.toString();
    }
    
    /**

     * @return a string that may contain &lt;", "&gt;", "&apos;", "&quot;" and "&amp;"
     */
    public static String replaceCharsWithEntityStrings(String value) {
        return org.netbeans.modules.xml.text.api.XMLTextUtils.replaceCharsWithEntityStrings(value);
    		return null;
    	}
        StringBuffer replBuf = new StringBuffer(value.length());
        for (int ind = 0; ind < value.length(); ind++) {
            boolean charReplaced = false;
            char curChar = value.charAt(ind);
            for (int entity = 0; entity < knownEntityChars.length; entity++) {
                if (curChar == knownEntityChars[entity]) {
                    replBuf.append(knownEntityStrings[entity]);
                    charReplaced = true;
                    break;
                }
            }
            
            if (!charReplaced) {
                replBuf.append(curChar);
            }
        }
        
        return replBuf.toString();
    }
    
}




<?xml version="1.0" encoding="UTF-8"?>

<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
         version="2.4">
    <session-config>
        <session-timeout>
            30
        </session-timeout>
    </session-config>
    <welcome-file-list>
        <welcome-file>
            index.jsp
        </welcome-file>
    </welcome-file-list>
</web-app>




<?xml version="1.0" encoding="UTF-8"?> <!-- -*- sgml-indent-step: 2 -*- -->
<!--
The contents of this file are subject to the terms of the Common Development
and Distribution License (the License). You may not use this file except in
compliance with the License.

You can obtain a copy of the License at http://www.netbeans.org/cddl.html
or http://www.netbeans.org/cddl.txt.

When distributing Covered Code, include this CDDL Header Notice in each file
and include the License file at http://www.netbeans.org/cddl.txt.
If applicable, add the following below the CDDL Header, with the fields
enclosed by brackets [] replaced by your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"

The Original Software is NetBeans. The Initial Developer of the Original
Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
Microsystems, Inc. All Rights Reserved.
-->
<project name="nbbuild" default="all" basedir=".">
    
    <import file="default.xml"/>
    
    <!-- To make people happy who want to do `ant clean all': -->
    <target name="all" depends="build,commit-validation" description="Build the IDE and run basic validation tests."/>
    
    <target name="all-nozip" depends="build-nozip,commit-validation" description="Build the IDE (no ZIP file, unpacked) and run basic validation tests."/>
    
    <target name="assure-ant">
        <condition property="ant.version.is.good">
            <!-- this is in 1.6.3 only -->
            <!-- actually needed for 'executable' attr on <javadoc>, at least -->
            <available classname="org.apache.tools.ant.types.mappers.FilterMapper"/>
        </condition>
        <fail unless="ant.version.is.good">
            You need to have ant 1.6.3 at least to build NetBeans.
        </fail>
    </target>
    
    <target name="bootstrap"
            description="Bootstrap NetBeans-specific Ant extensions."
            depends="-jdk-init,-assure-jdk-1.4,assure-ant">
        <echo message="Bootstrapping NetBeans-specific Ant extensions..."
        />
        <property name="ant.jar" value="${ant.home}/lib/ant.jar"/>
        <path id="bootstrap-cp">
            <pathelement location="${ant.jar}"/>
            <fileset dir="..">
                <!-- For JavaHelp indexing: -->
                <include name="nbbuild/external/jhall*.jar"/>
            </fileset>
        </path>
        <!-- Sanity check: -->
        <pathconvert pathsep=":" property="class.files.in.antsrc">
            <path>
                <fileset dir="antsrc">
                    <include name="**/*.class"/>
                </fileset>
            </path>
        </pathconvert>
        <fail>
            <condition>
                <not>
                    <equals arg1="${class.files.in.antsrc}" arg2=""/>
                </not>
            </condition>
            You have stray *.class files in ${basedir}/antsrc which you must remove.
            Probably you failed to clean your sources before updating them from CVS.
        </fail>
        <!-- OK, continue: -->
        <mkdir dir="build/antclasses"/>
        <javac srcdir="antsrc" destdir="build/antclasses" deprecation="true" debug="${build.compiler.debug}" source="1.4">
            <classpath refid="bootstrap-cp"/>
        </javac>
        <jar jarfile="nbantext.jar">
            <fileset dir="build/antclasses"/>
            <fileset dir="antsrc">
                <exclude name="**/*.java"/>
                <exclude name="**/package.html"/>
                <exclude name="package-list"/>
            </fileset>
        </jar>
    </target>
    
    <target name="init-module-list" depends="bootstrap">
        <!-- Define modules. -->
        <resolve name="modules" value="config.modules.${moduleconfig}"/>
        <resolve name="fixedmodules" value="config.fixedmodules.${moduleconfig}"/>
        <property name="allmodules" value="${fixedmodules},${modules}"/>
    </target>
    
    <target name="set-buildnumber" unless="buildnumber">
        <tstamp>
            <format property="buildnumber" pattern="yyMMdd"/>
        </tstamp>
        <tstamp>
            <format property="buildday" pattern="d MMM yyyy" locale="en" />
        </tstamp>
    </target>
    
    <target name="init" depends="init-module-list,set-buildnumber,init-tasks">
        <taskdef name="cleanall" classname="org.netbeans.nbbuild.CleanAll" classpath="nbantext.jar"/>
        <taskdef name="nbmerge" classname="org.netbeans.nbbuild.NbMerge" classpath="nbantext.jar"/>
        <taskdef name="for-each" classname="org.netbeans.nbbuild.ForEach" classpath="nbantext.jar"/>
        <taskdef name="getdependsclusters" classname="org.netbeans.nbbuild.GetDependsClusters" classpath="nbantext.jar"/>
        <taskdef name="repeat" classname="org.netbeans.nbbuild.Repeat" classpath="nbantext.jar"/>
        
        <!-- We need absolute path to ${netbeans.dest} -->
        <property name="netbeans.dest.abs" location="${netbeans.dest}"/>
        <!-- Overridable. Note: need not necessarily be a number at all): -->
        <property name="buildnum" value="dev-${buildnumber}"/>
        <property name="sanitystart.args" value="-J-Dnetbeans.close=true ${sanitystart.args.additional}"/>
        
        <!-- Set up automatic all-* targets: -->
        <taskdef name="insert-module-all-targets" classname="org.netbeans.nbbuild.InsertModuleAllTargets" classpath="nbantext.jar"/>
        <insert-module-all-targets/>
    </target>
    
    <target name="all-java/storagebuilder" depends="init">
        <antcall target="build-one-cluster-dependencies" inheritall="false">
            <param name="one.cluster.dependencies" value="nb.cluster.platform,nb.cluster.ide"/>
            <param name="one.cluster.name" value="this-cluster"/>
        </antcall>
        <echo message="Building java/storagebuilder library..."/>
        <ant dir="../java/storagebuilder" target="jar"/>
    </target>
    
    <target name="all-ide/branding" depends="init">
        <echo message="Building module ide/branding..."/>
        <getdependsclusters name="dependsClusters" list="${nb.clusters.list}"/>
        <antcall target="build-one-cluster-dependencies" inheritAll="false">
            <param name="one.cluster.dependencies" value="${dependsClusters}"/>
            <param name="one.cluster.name" value="this-cluster"/>
        </antcall>
        <ant dir="../ide/branding" target="netbeans"/>
    </target>
    
    <target name="all-installer" description="Dummy target for build system compatibility"/>
    
    <target name="all-tomcatint/tomcat5/bundled" depends="init">
        <getdependsclusters name="dependsClusters" list="${nb.clusters.list}"/>
        <antcall target="build-one-cluster-dependencies" inheritAll="false">
            <param name="one.cluster.dependencies" value="${dependsClusters}"/>
            <param name="one.cluster.name" value="this-cluster"/>
        </antcall>
        <!-- XXX this and xtest are clumsy: <antcall target="all-monitor"/> will not work since the subproject used by antcall does *not* have the synthetic targets! -->
        <ant dir="../monitor"/>
        <echo message="Building module tomcatint/tomcat5/bundled..."/>
        <ant dir="../tomcatint/tomcat5/bundled" target="netbeans"/>
    </target>
    
    <target name="all-translatedfiles" depends="init">
        <echo message="Building module translatedfiles..."/>
        <getdependsclusters name="dependsClusters" list="${nb.clusters.list}"/>
        <antcall target="build-one-cluster-dependencies" inheritAll="false">
            <param
                name="one.cluster.dependencies" 
                value="${dependsClusters}"/>
            <param name="one.cluster.name" value="this-cluster"/>
        </antcall>
        <ant dir="../translatedfiles" target="netbeans"/>
    </target>
    
    <target name="all-xtest" depends="init">
        <getdependsclusters name="dependsClusters" list="${clusters.list}"/>
        <antcall target="build-one-cluster-dependencies" inheritAll="false">
            <param name="one.cluster.dependencies" value="${dependsClusters}"/>
            <param name="one.cluster.name" value="this-cluster"/>
        </antcall>
        <ant dir="../xtest/nbjunit"/>
        <echo message="Building module xtest..."/>
        <ant dir="../xtest" antfile="build.xml" target="netbeans"/>
    </target>
    
    <!-- this is project is not a netbeans module project, so we do a no-op
       here.  The code in appsrvbridge gets built by XXX -->
    <target name="all-serverplugins/sun/appsrvbridge" depends="init">
        <echo message="Building module serverplugins/sun/appsrvbridge... NO-OP"/>
    </target>
    
    <!-- build NBMs for selected modules -->
    <target name="build-nbms" depends="init">
        <!-- It's good idea to call merge target before this one.
           NbMerge.java can set property "modules" to the list of realy
           built modules (excluding fixedmodules which must build everytime). -->
        <mkdir dir="nbms" />
        <property name="nbm.target.dir" location="nbms" />
        <for-each startdir=".." target="nbm" locations="${allmodules}"/>
    </target>
    <target name="nbm"/><!-- dummy target -->
  
    <property name="jnlp.signjar.keystore" location="build/default.keystore" />
    <available property="jnlp.signjar.keystore.exists" file="${jnlp.signjar.keystore}" />
    <target name="jnlp-generate-keystore" depends="init" unless="jnlp.signjar.keystore.exists" >
        <property name="jnlp.signjar.alias" value="jnlp" />
        <property name="jnlp.signjar.password" value="netbeans" />
        <property name="jnlp.signjar.vendor" value="CN=NetBeans, OU=NetBeans, O=netbeans.org, C=US" />
        
        <mkdir dir="${jnlp.signjar.keystore}/../" />
        <echo message="Going to create default keystore in ${jnlp.signjar.keystore}" />
        <genkey 
            alias="${jnlp.signjar.alias}"
            keystore="${jnlp.signjar.keystore}"
            storepass="${jnlp.signjar.password}"
            dname="${jnlp.signjar.vendor}"
        />
    </target>
    
    <target name="build-jnlp" depends="init,jnlp-generate-keystore">
        <fail message="Property jnlp.codebase must be set to final location of your JNLP files!" unless="jnlp.codebase" />
        <property name="jnlp.dest.dir" location="build/jnlp" />
        <mkdir dir="${jnlp.dest.dir}" />
        <for-each startdir=".." target="jnlp" locations="${config.modules.jnlp}"/>
    </target>
    
    <target name="set-config-to-javadoc" >
        <property name="moduleconfig" value="javadoc" />
    </target>
    
    <!-- build javadoc for selected modules -->
    <target name="build-javadoc" depends="set-config-to-javadoc,init" description="Builds Javadoc documentation for modules; on branches pass e.g. -Djavadoc.web.root=http://www.netbeans.org/download/release35/javadoc">
        <ant dir="." target="merge">
            <property name="modules" value="${modules}"/>
            <property name="fixedmodules" value="${fixedmodules}"/>
            <property name="merge.dependent.modules" value="true"/>
            <property name="stop.when.broken.module" value="false"/>
        </ant>
        
        <mkdir dir="build/ModulesExportedInterfaces" />
        <property name="export.interfaces" location="build/ModulesExportedInterfaces" />
        
        <mkdir dir="build/APIChanges" />
        <property name="export.apichanges" location="build/APIChanges" />
        
        <!-- build javadoc for supported APIs -->
        <for-each startdir=".." target="javadoc" locations="${fixedmodules}"/>
        <!-- build javadoc for unsupported APIs -->
        <for-each startdir=".." target="javadoc" locations="${modules}"/>
        
        <antcall inheritall="true" inheritrefs="true" target="javadoc-generate-xml" />
        <antcall inheritall="true" inheritrefs="true" target="javadoc-generate-html" />
        <antcall inheritall="true" inheritrefs="true" target="javadoc-check-broken-links" />
    </target>  
    
    <target name="javadoc-generate-xml" depends="set-config-to-javadoc,init" >
        <echo file="build/APIChanges/header.gen" >&lt;?xml version="1.0" encoding="UTF-8"?&gt;
            &lt;changes&gt;
        </echo>
        
        <echo file="build/APIChanges/footer.gen" >
            &lt;/changes&gt;
        </echo>
        
        <concat destfile="${netbeans.javadoc.dir}/apichanges.xml" >
            <fileset dir="build/APIChanges" includes="header.gen" />
            <fileset dir="build/APIChanges" includes="*" excludes="*.gen" />
            <fileset dir="build/APIChanges" includes="footer.gen" />
        </concat>
        
        
        <echo file="build/ModulesExportedInterfaces/header.gen" >&lt;?xml version="1.0" encoding="UTF-8"?&gt;
            &lt;apis&gt;
        </echo>
        
        <echo file="build/ModulesExportedInterfaces/footer.gen" >
            &lt;/apis&gt;
        </echo>
        
        <concat destfile="${netbeans.javadoc.dir}/modules.xml" >
            <fileset dir="build/ModulesExportedInterfaces" includes="header.gen" />
            <fileset dir="build/ModulesExportedInterfaces" includes="*" excludes="*.gen" />
            <fileset dir="build/ModulesExportedInterfaces" includes="footer.gen" />
        </concat>
        
        <taskdef 
            name="javadoc-index" 
            classpath="nbantext.jar" 
            classname="org.netbeans.nbbuild.JavadocIndex"
        />
        
        
        <javadoc-index target="${netbeans.javadoc.dir}/allclasses.xml" > 
            <packageslist dir="${netbeans.javadoc.dir}" >
                <include name="**/allclasses-noframe.html" />
            </packageslist>
        </javadoc-index>
    </target>
    
    
    <target name="javadoc-generate-html" depends="set-config-to-javadoc,init" >            
        <tstamp>
            <format property="modules-javadoc-date" pattern="d MMM yyyy" locale="en" />
        </tstamp>
        
        <style 
            in="${netbeans.javadoc.dir}/modules.xml" 
            out="${netbeans.javadoc.dir}/usecases.html" 
            style="javadoctools/export2usecases.xsl"
        >
            <param name="date" expression="${modules-javadoc-date}"/>
        </style>
        
        <style 
            in="${netbeans.javadoc.dir}/apichanges.xml" 
            out="${netbeans.javadoc.dir}/apichanges.html" 
            style="javadoctools/export2apichanges.xsl"
        >
            <param name="date" expression="${modules-javadoc-date}"/>
            <param name="changes-since-year" expression="${previous.release.year}"/>
            <param name="changes-since-day" expression="${previous.release.day}"/>
            <param name="changes-since-month" expression="${previous.release.month}"/>
            <param name="include-introduction" expression="true" />
        </style>
        
        <copy file="javadoctools/netbeans.css" tofile="${netbeans.javadoc.dir}/netbeans.css" />
        <condition property="javadoc.style.sheet.exists" >
            <available file="${netbeans.javadoc.dir}/org-openide-util/javadoc.css" />
        </condition>
        
        <fail unless="javadoc.style.sheet.exists" >
            The org-openide-util/javadoc.css has to exist as we are refering to
            it from to master module javadoc pages. If it does not anymore, update
            the javadoctools/export*.xsl templates.
        </fail>
        
        <style 
            in="${netbeans.javadoc.dir}/allclasses.xml" 
            out="${netbeans.javadoc.dir}/allclasses-frame.html" 
            style="javadoctools/export2allclasses.xsl"
        >
        </style>
        
        <style 
            in="${netbeans.javadoc.dir}/modules.xml" 
            out="${netbeans.javadoc.dir}/overview-frame.html" 
            style="javadoctools/export2allmodules.xsl"
        >
            <param name="date" expression="${modules-javadoc-date}"/>
        </style>
        
        <style 
            in="${netbeans.javadoc.dir}/modules.xml" 
            out="${netbeans.javadoc.dir}/layers.html" 
            style="javadoctools/export2layer.xsl"
        >
            <param name="date" expression="${modules-javadoc-date}"/>
        </style>
        
        <style 
            in="${netbeans.javadoc.dir}/modules.xml" 
            out="${netbeans.javadoc.dir}/overview-summary.html" 
            style="javadoctools/export2html.xsl"
        >
            <param name="date" expression="${modules-javadoc-date}"/>
        </style>
        
        
        <!-- at the end geneate the index.html so people know where to start -->      
        <echo file="${netbeans.javadoc.dir}/index.html" ><![CDATA[
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
<HTML><HEAD><TITLE>NetBeans API Index</TITLE>
</HEAD>
<FRAMESET cols="20%,80%" title="" onLoad="top.loadFrames()">
<FRAMESET rows="30%,70%" title="" onLoad="top.loadFrames()">
<FRAME src="overview-frame.html" name="packageListFrame" title="All Modules">
<FRAME src="allclasses-frame.html" name="packageFrame" title="All classes">
</FRAMESET>
<FRAME src="overview-summary.html" name="classFrame" title="Module, package, class and interface descriptions" scrolling="yes">
<NOFRAMES>
<H2>Frame Alert</H2>
<P>
This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client.
Link to<A HREF="overview-summary.html">Non-frame version.</A>
</NOFRAMES>
</FRAMESET>
</HTML>
        ]]></echo>
        
        <replace dir="${netbeans.javadoc.dir}">
            <include name="*.html"/>
            <replacefilter token="@JDK@" value="http://java.sun.com/j2se/1.4.2/docs/api"/>
            <replacefilter token="http://root/" value="." />
            <replacefilter token="$${javadoc.web.root}" value="." />
        </replace>
        
        <echo message="Javadoc index has been generated to ${netbeans.javadoc.dir}/index.html" />
    </target>
    
    
    <target name="javadoc-check-broken-links" depends="init" unless="javadoc.skip.brokenlinks.check" >
        <taskdef name="checklinks" classname="org.netbeans.nbbuild.CheckLinks">
            <classpath>
                <pathelement location="nbantext.jar"/>
            </classpath>
        </taskdef>
        <checklinks basedir="${netbeans.javadoc.dir}" checkexternal="${javadoc.check.external.links}" checkspaces="false" failonerror="true" >
            <include name="*/overview-summary.html"/>
            <include name="*/apichanges.html"/>
            <include name="*/architecture-summary.html"/>
            <include name="*/**/package-summary.html"/>
            <include name="*/**/doc-files/**/*.html"/>
            <include name="*.html" />
        </checklinks>
    </target>
    
    <target name="build-messaging" depends="init">
        <echo message="Starting a build for NetBeans (build ${buildnum}, config '${moduleconfig}') ..."/>
        <echo message="Selected modules: ${modules}"/>
        <echo message="OS: ${os.name} ${os.version}  Locale: ${user.language}_${user.region}"/>
        <echo message="Java: ${nbjdk.home}"/>
    </target>
    
    <!-- Use of nbmerge target has the effect of automatically depending on all-X for every module. -->
    <!-- It also runs deltree(dir=wherever) and copydir(src=../X/netbeans,dest=wherever) to create the IDE install. -->

    <target name="build-nozip" depends="clean-cluster-flags,build-clusters" description="Build the IDE but do not create a final ZIP file.">
        <loadproperties srcFile="${clusters.list.file}" />
        
        <loadproperties srcfile="${netbeans.dest.dir}/moduleCluster.properties" />
        
        <mkdir dir="${netbeans.dest.dir}/bin" />
        <copy file="../ide/launcher/unix/netbeans" todir="${netbeans.dest.dir}/bin" />
        <chmod file="${netbeans.dest.dir}/bin/netbeans" perm="ugo+rx"/>
        <copy file="../ide/launcher/windows/netbeans.exe" todir="${netbeans.dest.dir}/bin" />
        <copy file="../ide/launcher/windows/nb.exe" todir="${netbeans.dest.dir}/bin" />
        <copy file="../ide/launcher/os2/netbeans.cmd" todir="${netbeans.dest.dir}/bin" />
        <!-- if anybody knows better place for icons, let me know: jtulach@netbeans.org -->
        <copy file="../ide/launcher/os2/nbos2icons.zip" todir="${netbeans.dest.dir}/${nb.cluster.nb.dir}/" />
        
        <mkdir dir="${netbeans.dest.dir}/etc" />
        <copy file="../ide/launcher/netbeans.conf" todir="${netbeans.dest.dir}/etc" />
        
        <echo message="${netbeans.dest.dir}/${nb.cluster.platform.dir}/lib/nbexec" />
        <fixcrlf eol="lf" srcdir="${netbeans.dest.dir}" >
            <include name="etc/netbeans.conf" />
            <include name="bin/netbeans" />      
            <include name="${nb.cluster.platform.dir}/lib/nbexec" />      
        </fixcrlf>
        <fixcrlf eol="crlf" srcdir="${netbeans.dest.dir}" >
            <include name="bin/netbeans.cmd" />      
            <include name="${nb.cluster.platform.dir}/lib/nbexec.cmd" />      
        </fixcrlf>
        
        <echo file="${netbeans.dest.dir}/build_info">NetBeans dev build
            ------------------
            Number:   ${buildnumber}
            Date:     ${buildday}
            Branding:
            Branch:   trunk
            Tag:
        </echo>
    </target>
    
    <target name="build" depends="build-nozip"
            description="Create a complete build including a ZIP distribution (but do not try it).">
        <delete file="NetBeans-${buildnum}.zip"/>
        <delete file="NetBeans-${buildnum}-build-extra-data.zip"/>
        
        <property name="nb-extra-files" value="*.built,test/**,extra/**"/>
        
        <!-- package the zip file -->
        <zip destfile="NetBeans-${buildnum}.zip" update="true" duplicate="preserve">
            <zipfileset file="${netbeans.dest.dir}/bin/netbeans" filemode="755" prefix="${netbeans.dest}/bin"/>
            <zipfileset file="${netbeans.dest.dir}/${nb.cluster.platform.dir}/lib/nbexec" filemode="755" prefix="${netbeans.dest}/${nb.cluster.platform.dir}/lib"/>
            <zipfileset dir="${netbeans.dest.dir}/${nb.cluster.ide.dir}/ant/bin" filemode="755" prefix="${netbeans.dest}/${nb.cluster.ide.dir}/ant/bin">
                <exclude name="*.bat"/>
                <exclude name="*.cmd"/>
            </zipfileset>
            <zipfileset dir="${netbeans.dest.dir}" filemode="755" prefix="${netbeans.dest}">
                <include name="**/*.sh"/>
            </zipfileset>
            <zipfileset dir="${netbeans.dest.dir}" prefix="${netbeans.dest}" excludes="${nb-extra-files}">
                <!-- XXX exclude the temporary cluster for parts of openide -->
                <exclude name="tmp" />
                <exclude name="tmp/**/*" />
            </zipfileset>
        </zip>
        
        <!-- package the zip file with extra files not to be included in regular product package-->
        <!--
    <zip destfile="NetBeans-${buildnum}-build-extra-data.zip" update="true" duplicate="preserve">
        <zipfileset dir="${netbeans.dest.dir}" prefix="${netbeans.dest}" includes="${nb-extra-files}"/>
    </zip>
    -->

        <echo>Build created; see NetBeans-${buildnum}.zip (in nbbuild/).
            If you like, you may run the IDE straight from
            the ${netbeans.dest}/bin/ directory.
            (For example, type: ant tryme)
        </echo>
    </target>
    
    <target name="delete-and-merge" depends="merge-delete,merge" />   
    
    <target name="merge-delete" depends="init">
        <delete dir="${netbeans.dest}" />
    </target>
    
    <target name="merge" depends="build-messaging">
        <mkdir dir="${netbeans.dest.dir}"/>
        <nbmerge failonerror="${stop.when.broken.modules}" 
                 dest="${netbeans.dest}" 
                 topdir=".." 
                 fixedmodules="${fixedmodules}" 
                 modules="${modules}"
                 builtmodulesproperty="${built.modules.property}" 
                 targetprefix="all-" 
                 mergedependentmodules="${merge.dependent.modules}" >
        </nbmerge>
        <chmod perm="ugo+x">
            <fileset dir="${netbeans.dest.dir}">
                <include name="bin/netbeans"/>
                <include name="bin/**/*.pl"/>
                <include name="jakarta-tomcat-*/bin/*.sh"/>
            </fileset>
        </chmod>
    </target>
    
    <target name="build-platform" depends="init">
        <run-depend-build clusters-to-build="nb.cluster.platform,nb.cluster.harness"/>
    </target>
    
    <target name="build-cluster" depends="init">
        <run-depend-build clusters-to-build="${cluster-name}"/>
    </target>
    
    <macrodef name="resolve">
        <attribute name="name"/>
        <attribute name="value"/>
        <sequential>
            <property name="@{name}" value="${@{value}}"/>
        </sequential>
    </macrodef>
    
    <macrodef name="run-depend-build">
        <attribute name="clusters-to-build"/>
        <sequential>
            <echo>Repeat @{clusters-to-build}</echo>
            <repeat target="build-one-cluster" name="one.cluster.name" values="@{clusters-to-build}" /> 
        </sequential>
    </macrodef>
    
    <target name="build-clusters" depends="init">
        <run-depend-build clusters-to-build="${nb.clusters.list}"/> 
    </target>
    
    <target name="build-one-cluster-dependencies-check">
        <condition property="${one.cluster.name}-hasNoDependencies">
            <equals arg1="${one.cluster.dependencies}" arg2="" trim="true"/>
        </condition>
        <echo>Dependency prop :${one.cluster.name}-hasNoDependencies:</echo>
        <echo>Cluster dep :${one.cluster.dependencies}:</echo>
        <resolve name="test.prop" value="${one.cluster.name}-hasNoDependencies"/>
        <echo>Cluster dep prp:${test.prop}:</echo>
    </target>
    
    <target name="build-one-cluster-dependencies" 
            depends="build-one-cluster-dependencies-check"
            unless="${one.cluster.name}-hasNoDependencies">
        <run-depend-build clusters-to-build="${one.cluster.dependencies}"/> 
    </target>
    
    <target name="build-one-cluster-check">
        <condition property="${one.cluster.name}-is-built">
            <available file="${netbeans.dest.dir}/${one.cluster.name}.built"/>
        </condition>
        <resolve name="test1.prop" value="${one.cluster.name}-is-built"/>
        <echo>Cluster ${one.cluster.name} is :${test1.prop}:</echo>
    </target>
    
    <target name="build-one-cluster" unless="${one.cluster.name}-is-built" depends="build-one-cluster-check">
        <echo message="Building ${one.cluster.name} modules"/>
        <resolve name="one-cluster-modules" value="${one.cluster.name}"/>
        <resolve name="one-cluster-dependencies" value="${one.cluster.name}.depends"/>
        <echo>${one-cluster-modules}</echo>
        <echo>Dependencies: ${one-cluster-dependencies}</echo>
        <insert-module-all-targets/> <!-- we are in a subproject, so need to reinsert the targets... XXX <antcall> and thus <repeat> apparently reparses the Ant script from disk! -->
        <antcall target="build-one-cluster-dependencies" inheritAll="false">
            <param name="one.cluster.dependencies" value="${one-cluster-dependencies}"/>
            <param name="one.cluster.name" value="${one.cluster.name}"/>
        </antcall>
        <mkdir dir="${netbeans.dest.dir}"/>
        <nbmerge failonerror="${stop.when.broken.modules}" 
                 dest="${netbeans.dest.dir}" 
                 topdir="${nb_all}" 
                 fixedmodules="${one-cluster-modules}"
                 builtmodulesproperty="${built.modules.property}" 
                 targetprefix="all-" 
                 mergedependentmodules="false">
        </nbmerge>
        <touch file="${netbeans.dest.dir}/${one.cluster.name}.built"/>
    </target>
    
    <target name="zipclusters" depends="init">
        <mkdir dir="${netbeans.build.dir}/zips"/>
        <repeat target="zip-one-cluster" name="one.cluster.name" values="${clusters.list}" /> 
        
        <!-- package the misc files -->
        <zip destfile="${netbeans.build.dir}/zips/${clusters.prefix}-misc-${buildnum}.zip" update="true" duplicate="preserve">
            <zipfileset dir="${netbeans.dest.dir}" filemode="755">
                <include name="bin/netbeans"/>
            </zipfileset>
            <zipfileset dir="${netbeans.dest.dir}">
                <include name="bin/**"/>
                <include name="etc/**/"/>
            </zipfileset>
        </zip>
    </target>
    
    <target name="zip-one-cluster">
        <taskdef name="setclusterpatternset" classname="org.netbeans.nbbuild.SetClusterPatternSet" classpath="nbantext.jar"/>
        <taskdef name="setcluster" classname="org.netbeans.nbbuild.SetCluster" classpath="nbantext.jar"/>
        <loadproperties srcFile="${clusters.list.file}" />
        <loadproperties srcFile="cluster-description.properties" />
        <setcluster cluster="${one.cluster.name}" name="one.cluster.dir" />
        
        <setclusterpatternset cluster="${one.cluster.name}" name="${one.cluster.name}.files" trackingpath="${netbeans.dest.dir}" clusterdir="${one.cluster.dir}"/>
        
        <resolve name="zipcluster.file" value="${one.cluster.name}.pkg.filename"/>
        <zip destfile="${netbeans.build.dir}/zips/${clusters.prefix}-${zipcluster.file}-${buildnum}.zip" update="true" duplicate="preserve">
            <zipfileset dir="${netbeans.dest.dir}" filemode="755">
                <include name="${one.cluster.dir}/lib/nbexec"/>
            </zipfileset>
            <zipfileset dir="${netbeans.dest.dir}" filemode="755">
                <include name="${one.cluster.dir}/ant/bin/*"/>
                <exclude name="${one.cluster.dir}/ant/bin/*.bat"/>
                <exclude name="${one.cluster.dir}/ant/bin/*.cmd"/>
            </zipfileset>
            <zipfileset dir="${netbeans.dest.dir}">
                <patternset refID="${one.cluster.name}.files"/>
            </zipfileset>
        </zip>
    </target>
    
    <target name="create-rpms-proto">
        <mkdir dir="${netbeans.build.dir}/rpms"/>
        <repeat target="create-one-rpm-proto" name="one.cluster.name" values="${clusters.list}" /> 
    </target>
    
    <target name="create-one-rpm-proto">
        <taskdef name="setcluster" classname="org.netbeans.nbbuild.SetCluster" classpath="nbantext.jar"/>
        <loadproperties srcFile="cluster.properties" />
        <loadproperties srcFile="cluster-description.properties" />
        <setcluster cluster="${one.cluster.name}" name="one.cluster.dir" />
        <mkdir dir="${netbeans.build.dir}/rpms"/>
        
        <resolve name="pkg.name" value="${one.cluster.name}.pkg.name"/>
        <resolve name="pkg.version" value="${one.cluster.name}.pkg.version"/>
        <resolve name="pkg.desc" value="${one.cluster.name}.pkg.desc"/>
        <resolve name="pkg.vendor" value="${one.cluster.name}.pkg.vendor"/>
        <resolve name="pkg.email" value="${one.cluster.name}.pkg.email"/>
        <resolve name="pkg.rpm.name" value="${one.cluster.name}.pkg.rpm.name"/>
        <resolve name="pkg.rpm.requires" value="${one.cluster.name}.pkg.rpm.requires"/>
        <resolve name="pkg.rpm.group" value="${one.cluster.name}.pkg.rpm.group"/>
        <resolve name="pkg.rpm.url" value="${one.cluster.name}.pkg.rpm.url"/>
        <resolve name="pkg.rpm.copyright" value="${one.cluster.name}.pkg.rpm.copyright"/>
        <resolve name="pkg.rpm.map" value="${one.cluster.name}.pkg.rpm.map"/>
        <resolve name="pkg.rpm.prefix" value="${one.cluster.name}.pkg.rpm.prefix"/>
        
        <echo file="${netbeans.build.dir}/rpms/${pkg.rpm.name}.spec">
            %define global_product_version ${pkg.version}
            %define global_product_release 00
            %define _prefix ${pkg.rpm.prefix}
            Version: %{global_product_version}
            Release: %{global_product_release}
            Group: ${pkg.rpm.group}
            Copyright: ${pkg.rpm.copyright}
            Vendor: ${pkg.vendor}
            URL: ${pkg.rpm.url}
            Prefix: %_prefix
            AutoReqProv: no
            Name: ${pkg.rpm.name}
            Summary: ${pkg.name}
            %description 
            ${pkg.desc}
            
            %files
            
            %erpm_map ${pkg.rpm.map} nb_destdir
            
            %dir ${pkg.rpm.map}
            
        ${pkg.rpm.map}/${one.cluster.dir}</echo>
    </target>
    
    <target name="create-svr4s-proto">
        <mkdir dir="${netbeans.build.dir}/rpms"/>
        <repeat target="create-one-svr4-proto" name="one.cluster.name" values="${clusters.list}" /> 
    </target>
    
    <target name="create-one-svr4-proto">
        <taskdef name="setcluster" classname="org.netbeans.nbbuild.SetCluster" classpath="nbantext.jar"/>
        <loadproperties srcFile="cluster.properties" />
        <loadproperties srcFile="cluster-description.properties" />
        <setcluster cluster="${one.cluster.name}" name="one.cluster.dir" />
        <mkdir dir="${netbeans.build.dir}/svr4s"/>
        
        <resolve name="pkg.name" value="${one.cluster.name}.pkg.name"/>
        <resolve name="pkg.version" value="${one.cluster.name}.pkg.version"/>
        <resolve name="pkg.desc" value="${one.cluster.name}.pkg.desc"/>
        <resolve name="pkg.vendor" value="${one.cluster.name}.pkg.vendor"/>
        <resolve name="pkg.email" value="${one.cluster.name}.pkg.email"/>
        <resolve name="pkg.svr4.pkg" value="${one.cluster.name}.pkg.svr4.pkg"/>
        <resolve name="pkg.svr4.maxinst" value="${one.cluster.name}.pkg.svr4.maxinst"/>
        <resolve name="pkg.svr4.sunw_pkgvers" value="${one.cluster.name}.pkg.svr4.sunw_pkgvers"/>
        <resolve name="pkg.svr4.hotline" value="${one.cluster.name}.pkg.svr4.hotline"/>
        <resolve name="pkg.svr4.classes" value="${one.cluster.name}.pkg.svr4.classes"/>
        <resolve name="pkg.svr4.basedir" value="${one.cluster.name}.pkg.svr4.basedir"/>
        <resolve name="pkg.svr4.pkginst" value="${one.cluster.name}.pkg.svr4.pkginst"/>
        <resolve name="pkg.svr4.category" value="${one.cluster.name}.pkg.svr4.category"/>
        <echo file="${netbeans.build.dir}/svr4s/${pkg.svr4.pkg}.spec">
            PKG=${pkg.svr4.pkg}
            NAME=${pkg.name}
            ARCH=sparc
            VERSION=${pkg.version}
            MAXINST=${pkg.svr4.maxinst}
            CATEGORY=${pkg.svr4.category}
            SUNW_PKGVERS=${pkg.svr4.sunw_pkgvers}
            DESC=${pkg.desc}
            VENDOR=${pkg.vendor}
            HOTLINE=${pkg.svr4.hotline}
            EMAIL=${pkg.email}
            CLASSES=${pkg.svr4.classes}
            BASEDIR=${pkg.svr4.basedir}
        PKGINST=${pkg.svr4.pkginst}</echo>
    </target>
    
    <target name="sanity-check" depends="testuserdir-delete,sanity-start" description="Test whether the build can start up without problems."/>
    <target name="-testuserdir-delete-init" depends="init">
        <property name="test.user.dir.lock" location="${test.user.dir}/lock"/>
        <available property="app.running" file="${test.user.dir.lock}"/>
    </target>
    <target name="-testuserdir-delete-ok" depends="-testuserdir-delete-init" unless="app.running">
        <delete dir="${test.user.dir}"/>
    </target>
    <target name="-testuserdir-delete-fail" depends="-testuserdir-delete-init" if="app.running">
        <!-- #66799: best to warn about this condition... -->
        <fail>Will not delete ${test.user.dir} because ${test.user.dir.lock} still exists; kill any running process and delete lock file if necessary</fail>
    </target>
    <target name="testuserdir-delete" depends="-testuserdir-delete-ok,-testuserdir-delete-fail"/>
    <target name="sanity-start" depends="init,maybe-build-nozip,-jdk-init">
        <mkdir dir="${test.user.dir}"/>
        <echo>Starting the IDE as a sanity check...</echo>
        <echo>WARNING - the sanity-start target is deprecated. Use commit-validation instead.</echo>
        <!-- XXX better would be to scan start log for stacktraces and just show those; -->
        <!-- possibly after filtering for duplicates or something like this. -->
        <!-- Timeout is ten minutes; should be enough for valid start, while preventing -->
        <!-- a deadlock from hanging an automated build: -->
        <exec os="Windows NT Windows 95 Windows 98 Windows 2000 Windows 2003 Windows XP" executable="${netbeans.dest.abs}/bin/nb.exe" failonerror="yes" timeout="600000">
            <arg value="--jdkhome"/>
            <arg file="${nbjdk.home}"/>
            <arg value="--userdir"/>
            <arg file="${test.user.dir}"/>
            <arg line="${sanitystart.args}"/>
        </exec>
        <exec os="Linux SunOS Solaris Mac OS X" dir="." executable="sh" failonerror="yes" timeout="600000">
            <arg value="${netbeans.dest.abs}/bin/netbeans"/>
            <arg value="--jdkhome"/>
            <arg file="${nbjdk.home}"/>
            <arg value="--userdir"/>
            <arg file="${test.user.dir}"/>
            <arg line="${sanitystart.args}"/>
        </exec>
        <echo>Finished starting the IDE, pay attention to any reported errors.</echo>
    </target>
    
    <target name="check-for-build"  >
        <available property="have-build" file="${netbeans.dest.dir}/bin/netbeans"/>
    </target>
    <target name="maybe-build-nozip" depends="check-for-build" unless="have-build">
        <ant dir="${basedir}" target="build-nozip"/>
    </target>
    
    <target name="nozip-check" 
            depends="build-nozip,sanity-check">
        <echo>WARNING - the nozip-check target is deprecated. Use all-nozip instead.</echo>
    </target>
    
    <target name="tryme-setup-debug-args" if="debug.port" >
        <property name="debug.pause" value="n" />
        <property name="debug.server" value="y" />
        
        <property name="tryme.debug.args" value="-J-Xdebug -J-Xnoagent -J-Xrunjdwp:transport=dt_socket,suspend=${debug.pause},server=${debug.server},address=${debug.port}" />
    </target>
    
    <target name="tryme-debug" depends="-jdk-presetdef-nbjpdastart" description="Start IDE in debugger. May only be called from within IDE.">
        <nbjpdastart name="NetBeans" addressproperty="debug.port" transport="dt_socket">
            <classpath>
                <fileset dir="${netbeans.dest.dir}">
                    <include name="**/*.jar"/>
                </fileset>
            </classpath>
        </nbjpdastart>
        <property name="debug.server" value="n"/>
        <antcall target="tryme"/>
    </target>
    
    <target name="tryme-profile" depends="-jdk-presetdef-nbprofiledirect" description="Start IDE in debugger. May only be called from within IDE.">
        <property name="profiler.roots.path" value="profiler.roots.all" />
        <fileset id="profiler.roots.all" dir="${netbeans.dest.dir}">
            <include name="**/*.jar"/>
        </fileset>
        <nbprofiledirect 
            jvmargsprefix="-J" 
            jvmargsproperty="profiler.jvmargs" 
            mainclass="org.netbeans.Main"
        >
            <classpath>
                <fileset dir="${netbeans.dest.dir}">
                    <include name="**/*.jar"/>
                </fileset>
            </classpath>
            <rootspath>
                <fileset refid="${profiler.roots.path}" />
            </rootspath>
        </nbprofiledirect>
        
        <antcall target="tryme">
            <param name="tryme.args" value="${profiler.jvmargs}"/>
        </antcall>
    </target>
    
    <target name="tryme" depends="init,maybe-build-nozip,tryme-setup-debug-args,-jdk-init"
            description="Try running the IDE interactively (build it first if needed).
            It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in debug mode" 
    >
        <property name="tryme.debug.args" value="" />
        
        <exec os="Windows NT Windows 95 Windows 98 Windows 2000 Windows 2003 Windows XP" executable="${netbeans.dest.abs}/bin/nb.exe" failonerror="yes">
            <arg value="--jdkhome"/>
            <arg file="${nbjdk.home}"/>
            <arg value="--userdir"/>
            <arg file="${test.user.dir}"/>
            <arg line="${tryme.args}"/>
            <arg line="${tryme.debug.args}" />
        </exec>
        <exec os="Linux SunOS Solaris Mac OS X" dir="." executable="sh" failonerror="yes">
            <arg value="${netbeans.dest}/bin/netbeans"/>
            <arg value="--jdkhome"/>
            <arg file="${nbjdk.home}"/>
            <arg value="--userdir"/>
            <arg file="${test.user.dir}"/>
            <arg line="${tryme.args}"/>
            <arg line="${tryme.debug.args}" />
        </exec>
    </target>
    
    <target name="l10n-kit" depends="init">
        <taskdef name="l10n" classname="org.netbeans.nbbuild.L10nTask"
                 classpath="nbantext.jar"/>
        <delete dir="${l10n.dist.dir}"/>
        <mkdir dir="${l10n.dist.dir}"/>
        <delete dir="tmp"/>
        <mkdir dir="tmp"/>
        <property name="nbroot" location=".."/>
        <l10n topdirs="${nbroot}" modules="${fixedmodules},${modules}"
              localizablefile="l10n.list" generatedfile="l10n.list.translated"
              distdir="${l10n.dist.dir}" changedfile="l10n.list.changed"
              builddir="tmp" buildnumber="${buildnumber}"
              excludepattern="**/ja/,**/*_ja.*"/>
        <delete dir="tmp"/>
    </target>
    
    <target name="bootstrap-javadoc"
            depends="bootstrap"
            description="Generate Javadoc for Ant extensions.">
        <!-- XXX this ought to be deleted at some point. -->
        <!-- Can be done anyway by apisupport/ant, and published as regular module Javadoc -->
        <!-- by the regular daily Javadoc build process. -->
        <!-- Then all of this stuff can be deleted from the www part of CVS. -->
        <mkdir dir="www/nbantext-javadoc"/>
        <delete>
            <fileset dir="www/nbantext-javadoc">
                <include name="**/*.html"/>
            </fileset>
        </delete>
        <tstamp/>
        <javadoc sourcepath="antsrc"
                 destdir="www/nbantext-javadoc"
                 packagenames="org.netbeans.nbbuild.*"
                 windowtitle="NetBeans Ant Extensions"
                 doctitle="Extended Ant Tasks for Building NetBeans"
                 nodeprecatedlist="true"
                 notree="true"
                 noindex="true"
                 nohelp="true"
                 nonavbar="true"
                 author="false"
                 version="false"
                 bottom="Built on ${buildday}"
        >
            <classpath refid="bootstrap-cp"/>
            <link href="http://nagoya.apache.org/gump/javadoc/ant/build/javadocs" offline="true" packagelistloc="antsrc"/>
        </javadoc>
    </target>
    
    <target name="clean-external">
        <subant target="clean">
            <fileset dir="..">
                <include name="*/external/build.xml"/>
                <include name="contrib/*/external/build.xml"/>
            </fileset>
        </subant>
    </target>
    
    <target name="real-clean" depends="clean,clean-external"
            description="Clean everything possible.">
        <echo message="Cleaning old builds..."/>
        <delete>
            <fileset dir=".">
                <include name="NetBeans-*.log"/>
                <include name="NetBeans-*.zip"/>
            </fileset>
        </delete>
        <!-- This step must be last: -->
        <echo message="Cleaning NetBeans-specific Ant extensions..."/>
        <delete file="nbantext.jar" quiet="true"/>
        <delete dir="build/antclasses"/>
    </target>
    
    <target name="ant-clean">
        <delete file="nbantext.jar"/>
    </target>
    
    <target name="clean-cluster-flags" unless="do-not-rebuild-clusters">
        <mkdir dir="${netbeans.dest.dir}"/>
        <delete includeEmptyDirs="true">
            <fileset dir="${netbeans.dest.dir}">
                <include name="*.built"/>
            </fileset>
        </delete>
    </target>
    
    <target name="localclean" depends="clean-cluster-flags,init">
        <delete dir="${test.user.dir}"/>
        <delete dir="build"/>
        <delete file="moduledefs-tmp.properties"/>
        <delete dir="nbms" />
        <delete dir="${netbeans.dest.dir}"/>
    </target>
    
    <!-- more correct but takes too long: <target name="localtest" depends="bootstrap,all-xtest/nbjunit" > -->
    <target name="localtest" depends="bootstrap">
        <ant dir="test" target="cleanresults"/>
        <ant dir="test" target="runtests"/>
    </target>
    <target name="localtest-nb" depends="localtest">
        <nbbrowse file="test/results/index.html"/>
    </target>
    <target name="localtest-single-nb" depends="bootstrap">
        <property name="unit.test.base" location="test/unit/src"/>
        <pathconvert property="xtest.includes" pathsep=",">
            <path path="${includes}"/>
            <mapper type="glob" from="${unit.test.base}${file.separator}*.java" to="*.class"/>
        </pathconvert>
        <property name="xtest.attribs" value="empty"/>
        <ant dir="test" target="cleanresults"/>
        <ant dir="test" target="runtests"/>
        <nbbrowse file="test/results/index.html"/>
    </target>
    <target name="localtest-single-nb-debug" depends="bootstrap,-jdk-presetdef-nbjpdastart">
        <property name="unit.test.base" location="test/unit/src"/>
        <pathconvert property="xtest.includes" pathsep=",">
            <path path="${includes}"/>
            <mapper type="glob" from="${unit.test.base}${file.separator}*.java" to="*.class"/>
        </pathconvert>
        <property name="xtest.attribs" value="empty"/>
        <ant dir="test" target="cleanresults"/>
        <nbjpdastart transport="dt_socket" addressproperty="jpda.address" name="${test.class}">
            <classpath>
                <!--
            <path location="test/work/sys/tests/unit/classes"/>
            <path location="test/work/sys/tests/"/>
            <path location="test/unit/src/"/>
            -->
                <path location="nbantext.jar"/>
            </classpath>
        </nbjpdastart>
        <ant dir="test" target="runtests">
            <property name="xtest.debug.address" value="${jpda.address}" />
            <property name="xtest.debug.pause" value="false" />
        </ant>
        <nbbrowse file="test/results/index.html"/>
    </target>
    
    <target name="cleanall" depends="init">
        <cleanall topdir=".." 
                  modules="${allmodules}" 
                  targetname="clean"
                  resolvedependencies="${resolve.clean.dependencies}"
                  deptargetprefix="all-"
                  failonerror="${stop.when.clean.error}" />
    </target>
    
    <target name="clean" depends="init,cleanall,localclean"
            description="Clean out (almost) all build products.">
        <echo message="Run `ant real-clean' if desired."/>
    </target>
    
    <!-- This section contains properties and targets used to build -->
    <!-- Solaris packages.                                          -->

    <property name="solpkg-pkgproto" value="pkgproto"/>
    <property name="solpkg-pkgmk" value="pkgmk"/>
    <property name="solpkg-proto-file" value="prototype"/>
    <property name="solpkg-actual-dir" value="to-be-specified"/>
    <property name="solpkg-pkg-dir" value="to-be-specified"/>
    <property name="solpkg-pkg-dest-dir" value="to-be-specified"/>
    
    <!-- You can run this target to create the prototype file and create -->
    <!-- the package, or if you need to modify the prototype file before -->
    <!-- building the package, you can run the two subtargets            -->
    <!-- separately.                                                     -->
    <target name="solpkg-build" depends="solpkg-pkgproto,solpkg-pkgmk"
            description="Generate a prototype file and create a Solaris package."/>
    
    <!-- This creates the pkg prototype file for a given directory and -->
    <!-- its files.                                                    -->
    <target name="solpkg-pkgproto"
            description="Generate a prototype file.">
        <exec executable="rm" failonerror="yes">
            <arg value="-rf"/>
            <arg value="${solpkg-proto-file}"/>
        </exec>
        <exec executable="${solpkg-pkgproto}" output="${solpkg-proto-file}" 
              failonerror="yes">
            <arg value="${solpkg-actual-dir}=${solpkg-pkg-dir}"/>
        </exec>
    </target>
    
    <!-- This creates the Solaris pkg for a given prototype file, pkginfo -->
    <!-- file, and directory.                                             -->
    <target name="solpkg-pkgmk"
            description="Create a Solaris package.">
        <exec executable="${solpkg-pkgmk}" failonerror="yes">
            <arg value="-o"/>
            <arg value="-f"/>
            <arg value="${solpkg-proto-file}"/>
            <arg value="-r"/>
            <arg value="${solpkg-actual-dir}"/>
            <arg value="-d"/>
            <arg value="${solpkg-pkg-dest-dir}"/>
        </exec>
    </target>
    
    <!-- End of Solaris package section. -->

    
    <!-- Localized builds -->
    <target name="all-dutch" depends="set-dutch-locale,all"/>
    <target name="all-russian" depends="set-russian-locale,all"/>
    <target name="all-french" depends="set-french-locale,all"/>
    <target name="all-ja-zh" depends="set-ja-zh_CN-locales,all"/>
    
    <target name="set-ja-zh_CN-locales">
        <property name="locales" value="ja,zh_CN"/>
        <property name="locjar.locales" value="${locales}"/>
        <property name="locmakenbm.locales"   value="${locales}"/>
        <property name="locjhindexer.locales" value="${locales}"/>
        <property name="localized.build.locales" value="${locales}"/>
    </target>
    
    <target name="set-dutch-locale">
        <property name="locales" value="nl"/>
        <property name="locjar.locales" value="${locales}"/>
        <property name="locmakenbm.locales"   value="${locales}"/>
        <property name="locjhindexer.locales" value="${locales}"/>
        <property name="localized.build.locales" value="${locales}"/>
    </target>
    
    <target name="set-russian-locale">
        <property name="locales" value="ru"/>
        <property name="locjar.locales" value="${locales}"/>
        <property name="locmakenbm.locales"   value="${locales}"/>
        <property name="locjhindexer.locales" value="${locales}"/>
        <property name="localized.build.locales" value="${locales}"/>
    </target>
    
    <target name="set-french-locale">
        <property name="locales" value="fr"/>
        <property name="locjar.locales" value="${locales}"/>
        <property name="locmakenbm.locales"   value="${locales}"/>
        <property name="locjhindexer.locales" value="${locales}"/>
        <property name="localized.build.locales" value="${locales}"/>
    </target>
    
    <!-- end of localized builds -->


    <target name="print-selected-modules" depends="init" description="Prints list of modules to build in selected moduleconfig.">
        <echo message="modules=${allmodules}"/>
    </target>
    
    <target name="print-cvs-modules" depends="init" description="Prints list of cvs modules required to build in selected moduleconfig.">
        <taskdef name="printcvsmodules" classname="org.netbeans.nbbuild.PrintCvsModules" classpath="nbantext.jar"/>
        <printcvsmodules modules="${fixedmodules},${modules}" targetprefix="all-" />
    </target>
    
    <target name="check-commit-validation">
        <condition property="run.validation" >
            <and>
                <available file="../ide/test/build.xml" />
                <available file="../jemmy/build.xml" />
                <available file="../jellytools/build.xml" />
                <available file="../xtest/build.xml" />
                <or>
                    <not>
                        <isset property="nb.run.validation"/>
                    </not>
                    <istrue value="${nb.run.validation}"/>
                </or>
            </and>
        </condition>
    </target>
    
    <target 
        name="unit-validation" 
        description="Invokes all existing unit tests in all IDE modules.
        Useful when one wants to deeply verify that his changes
        work"
    >
        <ant dir="../xtest/instance" target="runtests" >
            <property name="xtest.config" value="unit-nb" />
        </ant>
    </target>
    
    <target 
        name="commit-validation" 
        depends="commit-verification,commitValidation,no-commit-validation" 
        description="Runs tests to validate IDE before commit."
    />
    
    <target name="all-commitValidation" description="dummy target for build error recognition facility"/>
    
    <target 
        name="commit-verification" 
        description="Compares result of a build with golden files verifying various aspects of the exported interfaces"
        depends="
        all-verification,
        check-files-layout,
        check-public-packages,
        check-friend-packages,
        check-shared-packages,
        check-modules,
        check-dependencies,
        check-implementation-dependencies,
        check-cluster-dependencies,
        check-cluster-implementation-dependencies,
        check-clusters-content"
    />
    
    <!-- JST: One day also add 
    check-external-libraries
  -->
  
    <target name="all-verification" >
        <echo message="Runs verification tests to check the IDE before commit" />
    </target>
    
    <!-- keep this target name at least for a while for backward compat -jglick -->
    <target name="commitValidation" depends="all-commitValidation,check-commit-validation" if="run.validation">
        <property name="xtest.home" location="../xtest"/>
        <ant dir="${xtest.home}/instance" target="cleanresults">
            <property name="xtest.config" value="commit-validation-nb"/>
        </ant>
        <ant dir="${xtest.home}/instance" target="cleantests">
            <property name="xtest.config" value="commit-validation-nb"/>
        </ant>
        <ant dir="${xtest.home}/instance" target="runtests">
            <property name="xtest.config" value="commit-validation-nb"/>
            <property name="xtest.fail.on.failure" value="true"/>
        </ant>
    </target>
    
    <target name="no-commit-validation" depends="check-commit-validation" unless="run.validation">
        <echo>
            *** WARNING ***
            You do not seem to have the modules needed to run the commit validation test suite. 
            You may not commit any changes into the CVS repository without running these tests.
            For more information: http://www.netbeans.org/community/guidelines/commit.html
        </echo>
    </target>
    
    <target name="sanity-build-from-source-pkg" depends="build-source">
        <available file="${netbeans.build.dir}/${cluster.name}-src-${buildnum}.zip"
                   property="pkg.available"/>
        <fail message="Source package ${netbeans.build.dir}/${cluster.name}-src-${buildnum}.zip not available" unless="pkg.available"/>
        <delete dir="testbuild"/>
        <mkdir dir="testbuild"/>
        <unzip dest="testbuild" src="${netbeans.build.dir}/${cluster.name}-src-${buildnum}.zip"/>
        <property name="one.cluster.name" value="${cluster.name}"/>
        <propertyset id="sanity-build">
            <propertyref name="one.cluster.name"/>
        </propertyset>
        <echoproperties destfile="testbuild/nbbuild/user.properties">
            <propertyset refid="sanity-build"/>
        </echoproperties>
        
        <!-- it should call build of the refered cluster and not just hardcoded platform -->
        <ant antfile="testbuild/nbbuild/build.xml" inheritall="false" target="build-one-cluster">
            <property file="testbuild/nbbuild/user.properties"/>
        </ant>
        <delete dir="testbuild"/>
    </target>
    
    <target name="build-source"
            depends="init,set-buildnumber"
            description="Packages sources needed to compile given by cluster.name (can be specified by -Dcluster.name=nb.cluster.platform"
            if="cluster.name"
    >
        <property name="buildnum" value="dev-${buildnumber}"/>
        <echo message="Packaging sources of ${cluster.name} modules"/>
        <resolve name="cluster-modules" value="${cluster.name}"/>
        <resolve name="harness-modules" value="nb.cluster.harness"/>
        <mkdir dir="${netbeans.build.dir}"/>
        <taskdef name="definefileset" classname="org.netbeans.nbbuild.PrintCvsModules" classpath="nbantext.jar"/>
        <definefileset modules="${cluster-modules}" targetprefix="all-" id="source-modules" dir=".." />
        <definefileset modules="${cluster-modules}" targetprefix="all-" id="external-modules" dir=".." mode="binaries" />
        <definefileset modules="${harness-modules}" targetprefix="all-" id="harness-source-modules" dir=".." />
        <definefileset modules="${harness-modules}" targetprefix="all-" id="harness-external-modules" dir=".." mode="binaries" />
        <zip zipfile="${netbeans.build.dir}/${cluster.name}-src-${buildnum}.zip" duplicate="preserve">
            <fileset refid="source-modules" />
            <fileset refid="external-modules" />
            <fileset refid="harness-source-modules" />
            <fileset refid="harness-external-modules" />
        </zip>
    </target>
    
    <target name="generate-golden-files-init" depends="init,bootstrap" >
        <property name="template.files.dir" location="build/golden" />
        <property name="golden.files.dir" location="../ide/golden" />
        <condition property="golden.files.eol" value="unix" >
            <or>
                <os family="unix" />
                <os family="mac" />
            </or>
        </condition>
        <property name="golden.files.eol" value="dos" />
        
        <mkdir dir="${template.files.dir}" />
        
        <!-- convert the golden files into platform default encoding -->
        <fixcrlf srcdir="${golden.files.dir}" destdir="${template.files.dir}" eol="${golden.files.eol}" >
            <include name="*txt" />
        </fixcrlf>
        
    </target>
    
    
    <target name="generate-golden-files" depends="generate-golden-files-init" >
        <property name="generated.files.dir" location="build/generated" />
        <mkdir dir="${generated.files.dir}" />
        
        <taskdef name="deps" classname="org.netbeans.nbbuild.ModuleDependencies" classpath="nbantext.jar"/>
        
        <deps>
            <input name="platform" >
                <jars dir="${netbeans.dest.dir}" >
                    <include name="${nb.cluster.platform.dir}/**/*.jar" />
                </jars>
            </input>
            <input name="ide" >
                <jars dir="${netbeans.dest.dir}" >
                    <include name="${nb.cluster.ide.dir}/**/*.jar" />
                </jars>
            </input>
            <input name="j2ee" >
                <jars dir="${netbeans.dest.dir}" >
                    <include name="${nb.cluster.j2ee.dir}/**/*.jar" />
                </jars>
            </input>
            <input name="nb" >
                <jars dir="${netbeans.dest.dir}" >
                    <include name="${nb.cluster.nb.dir}/**/*.jar" />
                </jars>
            </input>
            <input name="harness" >
                <jars dir="${netbeans.dest.dir}" >
                    <include name="${nb.cluster.harness.dir}/**/*.jar" />
                </jars>
            </input>
            
            <output type="group-dependencies" file="${generated.files.dir}/cluster-deps.txt" />
            <output type="group-implementation-dependencies" file="${generated.files.dir}/cluster-impl-deps.txt" />
            <output type="modules" file="${generated.files.dir}/modules.txt" />
            <output type="dependencies" file="${generated.files.dir}/deps.txt" />
            <output type="implementation-dependencies" file="${generated.files.dir}/impl-deps.txt" />
            <output type="public-packages" file="${generated.files.dir}/public-packages.txt" />
            <output type="shared-packages" file="${generated.files.dir}/shared-packages.txt" />
            <output type="friend-packages" file="${generated.files.dir}/friend-packages.txt" />
            <output type="external-libraries" file="${generated.files.dir}/external-libraries.txt" />
        </deps>
    </target>
    
    <target name="check-public-packages" depends="generate-golden-files" >
        <property name="check.public.packages.golden" location="${golden.files.dir}/public-packages.txt" />
        <property name="check.public.packages.template" location="${template.files.dir}/public-packages.txt" />
        <property name="check.public.packages.generated" location="${generated.files.dir}/public-packages.txt" />
        
        <condition property="check-public-packages-are-they-the-same" >
            <filesmatch file1="${check.public.packages.template}" file2="${check.public.packages.generated}" />
        </condition>
        
        
        <exec os="Linux SunOS Solaris " dir="." executable="diff" failonerror="no" timeout="60000" >
            <arg value="-U"/>
            <arg value="15"/>
            <arg value="${check.public.packages.template}" />
            <arg value="${check.public.packages.generated}" />
        </exec>
        
        <fail unless="check-public-packages-are-they-the-same" >!
            *** Public packages has changed! ***
            
            Differences were found while comparing file 
            ${check.public.packages.template}
            with 
            ${check.public.packages.generated}
            
            This means that the set of public packages changed since the previously known one.
            Some packages may have been added, some of them may have been removed 
            Either by changing manifest of a module or by adding or removing a class file
            from a module package.
            
            
            Changing the packages may or may not be ok. It means that an api of 
            whole product changes and as such it is subject to review. If you passed
            your review and want to change the list of public packages, then please
            update the golden file at 
            ${check.public.packages.golden}
            and run the test once again. 
            
            Read more about the Verification Framework:
            http://openide.netbeans.org/proposals/arch/clusters.html#verify
            
            Look at for information about reviews:
            http://openide.netbeans.org/tutorial/review-steps.html
            
            Check the page about APIs:
            http://openide.netbeans.org/tutorial/api-design.html#api
        </fail>
    </target>
    
    <target name="check-friend-packages" depends="generate-golden-files" >
        <property name="check.friend.packages.golden" location="${golden.files.dir}/friend-packages.txt" />
        <property name="check.friend.packages.template" location="${template.files.dir}/friend-packages.txt" />
        <property name="check.friend.packages.generated" location="${generated.files.dir}/friend-packages.txt" />
        
        <condition property="check-friend-packages-are-they-the-same" >
            <filesmatch file1="${check.friend.packages.template}" file2="${check.friend.packages.generated}" />
        </condition>
        
        
        <exec os="Linux SunOS Solaris " dir="." executable="diff" failonerror="no" timeout="60000" >
            <arg value="-U"/>
            <arg value="15"/>
            <arg value="${check.friend.packages.template}" />
            <arg value="${check.friend.packages.generated}" />
        </exec>
        
        <fail unless="check-friend-packages-are-they-the-same" >!
            *** Friend packages has changed! ***
            
            Differences were found while comparing file 
            ${check.friend.packages.template}
            with 
            ${check.friend.packages.generated}
            
            This means that the set of friend packages changed since the previously known one.
            Some packages may have been added, some of them may have been removed 
            Either by changing manifest of a module or by adding or removing a class file
            from a module package.
            
            
            Changing the packages may or may not be ok. It means that an api of 
            whole product changes and as such it is subject to review. If you passed
            your review and want to change the list of friend packages, then please
            update the golden file at 
            ${check.friend.packages.golden}
            and run the test once again. 
            
            Read more about the Verification Framework:
            http://openide.netbeans.org/proposals/arch/clusters.html#verify
            
            Look at for information about reviews:
            http://openide.netbeans.org/tutorial/review-steps.html
            
            Check the page about APIs:
            http://openide.netbeans.org/tutorial/api-design.html#api
        </fail>
    </target>
    
    <target name="check-shared-packages" depends="generate-golden-files,-jdk-init" unless="have-jdk-1.5" >
        <property name="check.shared.packages.golden" location="${golden.files.dir}/shared-packages.txt" />
        <property name="check.shared.packages.template" location="${template.files.dir}/shared-packages.txt" />
        <property name="check.shared.packages.generated" location="${generated.files.dir}/shared-packages.txt" />
        
        <condition property="check-shared-packages-are-they-the-same" >
            <filesmatch file1="${check.shared.packages.template}" file2="${check.shared.packages.generated}" />
        </condition>
        
        
        <exec os="Linux SunOS Solaris Mac OS X" dir="." executable="diff" failonerror="no" timeout="60000" >
            <arg value="-U"/>
            <arg value="15"/>
            <arg value="${check.shared.packages.template}" />
            <arg value="${check.shared.packages.generated}" />
        </exec>
        
        <fail unless="check-shared-packages-are-they-the-same" >!
            *** Shared packages has changed! ***
            
            Differences were found while comparing file 
            ${check.shared.packages.template}
            with 
            ${check.shared.packages.generated}
            
            This means that the set of shared packages changed since the previously known one.
            Some packages may have been added, some of them may have been removed 
            Either by changing manifest of a module or by adding or removing a class file
            from a module package.
            
            
            Removing shared packages is ok. Adding shared packages is silly, complicates
            and slows down module system and startup of the application. Do not do that!
            If you are removing a shared package please update 
            ${check.shared.packages.golden}
            and run the test once again. 
            
            Read more about the Verification Framework:
            http://openide.netbeans.org/proposals/arch/clusters.html#verify
            
            Look at for information about reviews:
            http://openide.netbeans.org/tutorial/review-steps.html
            
            Check the page about APIs:
            http://openide.netbeans.org/tutorial/api-design.html#api
        </fail>
    </target>
    
    <target name="check-external-libraries" depends="generate-golden-files" >
        <property name="check.external.libraries.golden" location="${golden.files.dir}/external-libraries.txt" />
        <property name="check.external.libraries.template" location="${template.files.dir}/external-libraries.txt" />
        <property name="check.external.libraries.generated" location="${generated.files.dir}/external-libraries.txt" />
        
        <condition property="check-external-libraries-are-they-the-same" >
            <filesmatch file1="${check.external.libraries.template}" file2="${check.external.libraries.generated}" />
        </condition>
        
        
        <exec os="Linux SunOS Solaris Mac OS X" dir="." executable="diff" failonerror="no" timeout="60000" >
            <arg value="-U"/>
            <arg value="15"/>
            <arg value="${check.external.libraries.template}" />
            <arg value="${check.external.libraries.generated}" />
        </exec>
        
        <fail unless="check-external-libraries-are-they-the-same" >!
            *** List of external libraries has changed! ***
            
            Differences were found while comparing file 
            ${check.external.libraries.template}
            with 
            ${check.external.libraries.generated}
            
            This means that the set of external libraries (JARs that are not NetBeans
            modules or does not have NetBeans-Own-Library: true in manifest) has 
            changed since the previously known one. Some libraries may have been added, 
            some of them may have been removed, they MD5 checksum or size has been changed.
            
            Changing the external libraries is ok, but requires legal approval everytime
            new version of a library is put into the product. If you have the approval
            want to change the list of external libraries, then please
            update the golden file at 
            ${check.external.libraries.golden}
            and run the test once again. 
            
            Read more about the Verification Framework:
            http://openide.netbeans.org/proposals/arch/clusters.html#verify
            
            Look at for information about reviews:
            http://openide.netbeans.org/tutorial/review-steps.html
            
            Check the page about APIs:
            http://openide.netbeans.org/tutorial/api-design.html#api
        </fail>
    </target>
    
    <target name="check-modules" depends="generate-golden-files" >
        <property name="check.modules.golden" location="${golden.files.dir}/modules.txt" />
        <property name="check.modules.template" location="${template.files.dir}/modules.txt" />
        <property name="check.modules.generated" location="${generated.files.dir}/modules.txt" />
        
        <condition property="check-modules-are-they-the-same" >
            <filesmatch file1="${check.modules.template}" file2="${check.modules.generated}" />
        </condition>
        
        
        <exec os="Linux SunOS Solaris Mac OS X" dir="." executable="diff" failonerror="no" timeout="60000" >
            <arg value="-U"/>
            <arg value="15"/>
            <arg value="${check.modules.template}" />
            <arg value="${check.modules.generated}" />
        </exec>
        
        <fail unless="check-modules-are-they-the-same" >!
            *** List of modules has changed! ***
            
            Differences were found while comparing file 
            ${check.modules.template}
            with 
            ${check.modules.generated}
            
            This means that the set of modules changed since the previously known one.
            Adding or removing a module significatly affects the set of APIs the
            product offers and as such is subject to review. If you passed
            your review and want to change the list of modules, then please
            update the golden file at 
            ${check.modules.golden}
            and run the test once again. 
            
            Read more about the Verification Framework:
            http://openide.netbeans.org/proposals/arch/clusters.html#verify
            
            Look at for information about reviews:
            http://openide.netbeans.org/tutorial/review-steps.html
            
            Check the page about APIs:
            http://openide.netbeans.org/tutorial/api-design.html#api
        </fail>
    </target>
    
    <target name="check-dependencies" depends="generate-golden-files" >
        <antcall target="check-dependencies-subroutine" >
            <param name="check.dependencies.golden" location="${golden.files.dir}/deps.txt" />
            <param name="check.dependencies.template" location="${template.files.dir}/deps.txt" />
            <param name="check.dependencies.generated" location="${generated.files.dir}/deps.txt" />
        </antcall>
    </target>
    
    <target name="check-implementation-dependencies" depends="generate-golden-files" >
        <antcall target="check-dependencies-subroutine" >
            <param name="check.dependencies.golden" location="${golden.files.dir}/impl-deps.txt" />
            <param name="check.dependencies.template" location="${template.files.dir}/impl-deps.txt" />
            <param name="check.dependencies.generated" location="${generated.files.dir}/impl-deps.txt" />
        </antcall>
    </target>
    
    <target name="check-cluster-dependencies" depends="generate-golden-files" >
        <antcall target="check-dependencies-subroutine" >
            <param name="check.dependencies.golden" location="${golden.files.dir}/cluster-deps.txt" />
            <param name="check.dependencies.template" location="${template.files.dir}/cluster-deps.txt" />
            <param name="check.dependencies.generated" location="${generated.files.dir}/cluster-deps.txt" />
        </antcall>
    </target>
    
    <target name="check-cluster-implementation-dependencies" depends="generate-golden-files" >
        <antcall target="check-dependencies-subroutine" >
            <param name="check.dependencies.golden" location="${golden.files.dir}/cluster-impl-deps.txt" />
            <param name="check.dependencies.template" location="${template.files.dir}/cluster-impl-deps.txt" />
            <param name="check.dependencies.generated" location="${generated.files.dir}/cluster-impl-deps.txt" />
        </antcall>
    </target>
    
    <target name="check-dependencies-subroutine" >
        <condition property="check-dependencies-are-they-the-same" >
            <filesmatch file1="${check.dependencies.template}" file2="${check.dependencies.generated}" />
        </condition>
        
        
        <exec os="Linux SunOS Solaris Mac OS X" dir="." executable="diff" failonerror="no" timeout="60000" >
            <arg value="-U"/>
            <arg value="15"/>
            <arg value="${check.dependencies.template}" />
            <arg value="${check.dependencies.generated}" />
        </exec>
        
        <fail unless="check-dependencies-are-they-the-same" >!
            *** List of dependencies has changed! ***
            
            Differences were found while comparing file 
            ${check.dependencies.template}
            with 
            ${check.dependencies.generated}
            
            This means that the set of dependencies changed since the previously known one.
            Adding a dependency can restrict the ways how a final product can be assembled
            and as such it forms an important aspect of API and is subject to review. 
            If you passed your review or you are sure you want to change the 
            list of dependencies, then please update the golden file at 
            ${check.dependencies.golden}
            and run the test once again. 
            
            Read more about the Verification Framework:
            http://openide.netbeans.org/proposals/arch/clusters.html#verify
            
            Look at for information about reviews:
            http://openide.netbeans.org/tutorial/review-steps.html
            
            Check the page about APIs and dependencies being important:
            http://openide.netbeans.org/tutorial/api-design.html#api
        </fail>
    </target>
    
    
    <target name="generate-files-layout" depends="generate-golden-files-init" >
        <property name="generated.files.dir" location="build/generated" />
        <mkdir dir="${generated.files.dir}" />
        
        <property name="check.files.layout.golden" location="${golden.files.dir}/files-layout.txt" />
        <property name="check.files.layout.template" location="${template.files.dir}/files-layout.txt" />
        <property name="check.files.layout.generated" location="${generated.files.dir}/files-layout.txt" />
        
        <property name="check-file-layout-root" location="${netbeans.dest.dir}" />
        <fileset id="check-file-layout" dir="${check-file-layout-root}" casesensitive="yes" >
            <include name="platform*/**" />
            <include name="ide*/**" />
            <include name="enterprise*/**" />
            <include name="nb*/**" />
            <include name="harness*/**" />
        </fileset>
        
        <pathconvert property="check-file-layout" refid="check-file-layout" dirsep="/" pathsep="," >
            <map from="${check-file-layout-root}${file.separator}" to="" />
        </pathconvert>
        <mkdir dir="build/generated" />
        <echo message="${check-file-layout}${line.separator}" file="${check.files.layout.generated}" />
        <replace file="${check.files.layout.generated}" token="," value="${line.separator}" />
        <replace file="${check.files.layout.generated}" token="\" value="/" />
        <condition property="check-files-are-they-the-same" >
            <filesmatch file1="${check.files.layout.template}" file2="${check.files.layout.generated}" />
        </condition>
        
        
    </target>
    
    
    <target name="check-files-layout" depends="generate-files-layout" >
        <exec os="Linux SunOS Solaris Mac OS X" dir="." executable="diff" failonerror="no" timeout="60000" >
            <arg value="-U"/>
            <arg value="15"/>
            <arg value="${check.files.layout.template}" />
            <arg value="${check.files.layout.generated}" />
        </exec>
        
        <fail unless="check-files-are-they-the-same" >!
            *** Layout of files has changed! ***
            
            Differences were found while comparing file ${check.files.layout.generated} with 
            ${check.files.layout.template}
            This means that the layout of files changed since the previously known one.
            Some files may have been added, some of them may have been removed or renamed. 
            
            Changing the layout may or may not be ok. If you are sure that you want to
            change the layout of files, then update the golden file at 
            ${check.files.layout.golden}
            and run the test once again. If you got this warning without intending
            to change the layout of files, think twice whether your commit is really
            correct and consider asking for a review first.
            
            Read more about the Verification Framework:
            http://openide.netbeans.org/proposals/arch/clusters.html#verify
            
            Look at for information about reviews:
            http://openide.netbeans.org/tutorial/review-steps.html
            
            Check the page about APIs and files layout being an API:
            http://openide.netbeans.org/tutorial/api-design.html#api
        </fail>
    </target>
    
    <target name="check-clusters-content" depends="bootstrap,init-tasks"> 
        <taskdef name="checkcontent" classname="org.netbeans.nbbuild.CheckClustersContent" classpath="nbantext.jar"/>
        <checkcontent clusters="${nb.clusters.list}" trackingPath="${netbeans.dest.dir}" kitDestDir="${netbeans.dest.dir}">
            <exclude name="extra/**"/>
            <exclude name="testtools/**"/>
            <exclude name="bin/**"/>
            <exclude name="README.html"/>
            <exclude name="CREDITS.html"/>
            <exclude name="LICENSE.txt"/>
            <exclude name="DISTRIBUTION.txt"/>
            <exclude name="THIRDPARTYLICENSE.txt"/>
            <exclude name="nb.cluster.*"/>
            <exclude name="etc/netbeans.conf"/>
            <exclude name="build_info"/>
            <exclude name="module_tracking.xml"/>
            <exclude name="moduleCluster.properties"/>
            <exclude name="netbeans.css"/>
        </checkcontent>
    </target>
    
    <target name="check-module-configs" depends="bootstrap" description="Sanity-check build.properties and cluster.properties.">
        <taskdef name="checkmoduleconfigs" classname="org.netbeans.nbbuild.CheckModuleConfigs" classpath="nbantext.jar"/>
        <checkmoduleconfigs nbroot=".."/>
    </target>
    
    <target name="display-l10n-list-matches" description="Show which files are actually matched by an l10n.list in some module.">
        <property name="nbroot" location=".."/>
        <input addproperty="module">Select a top-level module (e.g. "java") to display results for:</input>
        <property name="listfile" location="${nbroot}/${module}/l10n.list"/>
        <echo>${listfile}:1: Matches follow... (click on hyperlinks from IDE!)</echo>
        <echo>(warning: 'exclude' directives not honored here yet)</echo><!-- XXX use filtersets or something to fix -->
        <apply parallel="false" executable="sh">
            <arg value="-c"/>
            <arg value="echo $0:1"/>
            <fileset dir="${nbroot}" includesfile="${listfile}"/>
        </apply>
    </target>
    
    <target name="increment-spec-versions" depends="bootstrap,init-module-list" description="Increment all standard module specification versions. Pass -Dbranch=true if not on the trunk.">
        <property name="branch" value="false"/>
        <taskdef name="incrspecvers" classname="org.netbeans.nbbuild.IncrementSpecificationVersions" classpath="nbantext.jar"/>
        <incrspecvers nbroot=".." modules="${allmodules}" branch="${branch}"/>
    </target>
    
</project>




<?xml version="1.0" encoding="UTF-8"?>
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.

Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.


The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
Development and Distribution License("CDDL") (collectively, the
"License"). You may not use this file except in compliance with the
License. You can obtain a copy of the License at
http://www.netbeans.org/cddl-gplv2.html
or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License.  When distributing the software, include this License Header
Notice in each file and include the License file at
nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
particular file as subject to the "Classpath" exception as provided
by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"

Contributor(s):

The Original Software is NetBeans. The Initial Developer of the Original
Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
Microsystems, Inc. All Rights Reserved.

If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
under the [CDDL or GPL Version 2] license." If you do not indicate a
single choice of license, a recipient has the option to distribute
your version of this file under either the CDDL, the GPL Version 2 or
to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-->
<project name="nbbuild" default="all" basedir=".">
    
    <import file="default.xml"/>
    
    <!-- To make people happy who want to do `ant clean all': -->
    <target name="all" depends="build,commit-validation" description="Build the IDE and run basic validation tests."/>
    
    <target name="all-nozip" depends="build-nozip,commit-validation" description="Build the IDE (no ZIP file, unpacked) and run basic validation tests."/>
    
    <target name="assure-ant">
        <condition property="ant.version.is.good">
            <!-- this is in 1.6.3 only -->
            <!-- actually needed for 'executable' attr on <javadoc>, at least -->
            <available classname="org.apache.tools.ant.types.mappers.FilterMapper"/>
        </condition>
        <fail unless="ant.version.is.good">
            You need to have ant 1.6.3 at least to build NetBeans.
        </fail>
    </target>
    
    <target name="bootstrap"
            description="Bootstrap NetBeans-specific Ant extensions."
            depends="-jdk-init,-assure-jdk-1.4,assure-ant">
        <echo message="Bootstrapping NetBeans-specific Ant extensions..."
        />
        <property name="ant.jar" value="${ant.home}/lib/ant.jar"/>
        <path id="bootstrap-cp">
            <pathelement location="${ant.jar}"/>
            <fileset dir="..">
                <!-- For JavaHelp indexing: -->
                <include name="nbbuild/external/jhall*.jar"/>
            </fileset>
        </path>
        <!-- Sanity check: -->
        <pathconvert pathsep=":" property="class.files.in.antsrc">
            <path>
                <fileset dir="antsrc">
                    <include name="**/*.class"/>
                </fileset>
            </path>
        </pathconvert>
        <fail>
            <condition>
                <not>
                    <equals arg1="${class.files.in.antsrc}" arg2=""/>
                </not>
            </condition>
            You have stray *.class files in ${basedir}/antsrc which you must remove.
            Probably you failed to clean your sources before updating them from CVS.
        </fail>
        <!-- OK, continue: -->
        <mkdir dir="build/antclasses"/>
        <javac srcdir="antsrc" destdir="build/antclasses" deprecation="true" debug="${build.compiler.debug}" source="1.4">
            <classpath refid="bootstrap-cp"/>
        </javac>
        <jar jarfile="nbantext.jar">
            <fileset dir="build/antclasses"/>
            <fileset dir="antsrc">
                <exclude name="**/*.java"/>
                <exclude name="**/package.html"/>
                <exclude name="package-list"/>
            </fileset>
        </jar>
    </target>
    
    <target name="init-module-list" depends="bootstrap">
        <!-- Define modules. -->
        <resolve name="modules" value="config.modules.${moduleconfig}"/>
        <resolve name="fixedmodules" value="config.fixedmodules.${moduleconfig}"/>
        <property name="allmodules" value="${fixedmodules},${modules}"/>
    </target>
    
    <target name="set-buildnumber" unless="buildnumber">
        <tstamp>
            <format property="buildnumber" pattern="yyMMdd"/>
        </tstamp>
        <tstamp>
            <format property="buildday" pattern="d MMM yyyy" locale="en" />
        </tstamp>
    </target>
    
    <target name="init" depends="init-module-list,set-buildnumber,init-tasks">
        <taskdef name="cleanall" classname="org.netbeans.nbbuild.CleanAll" classpath="nbantext.jar"/>
        <taskdef name="nbmerge" classname="org.netbeans.nbbuild.NbMerge" classpath="nbantext.jar"/>
        <taskdef name="for-each" classname="org.netbeans.nbbuild.ForEach" classpath="nbantext.jar"/>
        <taskdef name="getdependsclusters" classname="org.netbeans.nbbuild.GetDependsClusters" classpath="nbantext.jar"/>
        <taskdef name="repeat" classname="org.netbeans.nbbuild.Repeat" classpath="nbantext.jar"/>
        
        <!-- We need absolute path to ${netbeans.dest} -->
        <property name="netbeans.dest.abs" location="${netbeans.dest}"/>
        <!-- Overridable. Note: need not necessarily be a number at all): -->
        <property name="buildnum" value="dev-${buildnumber}"/>
        <property name="sanitystart.args" value="-J-Dnetbeans.close=true ${sanitystart.args.additional}"/>
        
        <!-- Set up automatic all-* targets: -->
        <taskdef name="insert-module-all-targets" classname="org.netbeans.nbbuild.InsertModuleAllTargets" classpath="nbantext.jar"/>
        <insert-module-all-targets/>
    </target>
    
    <target name="all-java/storagebuilder" depends="init">
        <antcall target="build-one-cluster-dependencies" inheritall="false">
            <param name="one.cluster.dependencies" value="nb.cluster.platform,nb.cluster.ide"/>
            <param name="one.cluster.name" value="this-cluster"/>
        </antcall>
        <echo message="Building java/storagebuilder library..."/>
        <ant dir="../java/storagebuilder" target="jar"/>
    </target>
    
    <target name="all-ide/branding" depends="init">
        <echo message="Building module ide/branding..."/>
        <getdependsclusters name="dependsClusters" list="${nb.clusters.list}"/>
        <antcall target="build-one-cluster-dependencies" inheritAll="false">
            <param name="one.cluster.dependencies" value="${dependsClusters}"/>
            <param name="one.cluster.name" value="this-cluster"/>
        </antcall>
        <ant dir="../ide/branding" target="netbeans"/>
    </target>
    
    <target name="all-installer" description="Dummy target for build system compatibility"/>
    
    <target name="all-tomcatint/tomcat5/bundled" depends="init">
        <getdependsclusters name="dependsClusters" list="${nb.clusters.list}"/>
        <antcall target="build-one-cluster-dependencies" inheritAll="false">
            <param name="one.cluster.dependencies" value="${dependsClusters}"/>
            <param name="one.cluster.name" value="this-cluster"/>
        </antcall>
        <!-- XXX this and xtest are clumsy: <antcall target="all-monitor"/> will not work since the subproject used by antcall does *not* have the synthetic targets! -->
        <ant dir="../monitor"/>
        <echo message="Building module tomcatint/tomcat5/bundled..."/>
        <ant dir="../tomcatint/tomcat5/bundled" target="netbeans"/>
    </target>
    
    <target name="all-translatedfiles" depends="init">
        <echo message="Building module translatedfiles..."/>
        <getdependsclusters name="dependsClusters" list="${nb.clusters.list}"/>
        <antcall target="build-one-cluster-dependencies" inheritAll="false">
            <param
                name="one.cluster.dependencies" 
                value="${dependsClusters}"/>
            <param name="one.cluster.name" value="this-cluster"/>
        </antcall>
        <ant dir="../translatedfiles" target="netbeans"/>
    </target>
    
    <target name="all-xtest" depends="init">
        <getdependsclusters name="dependsClusters" list="${clusters.list}"/>
        <antcall target="build-one-cluster-dependencies" inheritAll="false">
            <param name="one.cluster.dependencies" value="${dependsClusters}"/>
            <param name="one.cluster.name" value="this-cluster"/>
        </antcall>
        <ant dir="../xtest/nbjunit"/>
        <echo message="Building module xtest..."/>
        <ant dir="../xtest" antfile="build.xml" target="netbeans"/>
    </target>
    
    <!-- this is project is not a netbeans module project, so we do a no-op
       here.  The code in appsrvbridge gets built by XXX -->
    <target name="all-serverplugins/sun/appsrvbridge" depends="init">
        <echo message="Building module serverplugins/sun/appsrvbridge... NO-OP"/>
    </target>
    
    <!-- build NBMs for selected modules -->
    <target name="build-nbms" depends="init">
        <!-- It's good idea to call merge target before this one.
           NbMerge.java can set property "modules" to the list of realy
           built modules (excluding fixedmodules which must build everytime). -->
        <mkdir dir="nbms" />
        <property name="nbm.target.dir" location="nbms" />
        <for-each startdir=".." target="nbm" locations="${allmodules}"/>
    </target>
    <target name="nbm"/><!-- dummy target -->
  
    <property name="jnlp.signjar.keystore" location="build/default.keystore" />
    <available property="jnlp.signjar.keystore.exists" file="${jnlp.signjar.keystore}" />
    <target name="jnlp-generate-keystore" depends="init" unless="jnlp.signjar.keystore.exists" >
        <property name="jnlp.signjar.alias" value="jnlp" />
        <property name="jnlp.signjar.password" value="netbeans" />
        <property name="jnlp.signjar.vendor" value="CN=NetBeans, OU=NetBeans, O=netbeans.org, C=US" />
        
        <mkdir dir="${jnlp.signjar.keystore}/../" />
        <echo message="Going to create default keystore in ${jnlp.signjar.keystore}" />
        <genkey 
            alias="${jnlp.signjar.alias}"
            keystore="${jnlp.signjar.keystore}"
            storepass="${jnlp.signjar.password}"
            dname="${jnlp.signjar.vendor}"
        />
    </target>
    
    <target name="build-jnlp" depends="init,jnlp-generate-keystore">
        <fail message="Property jnlp.codebase must be set to final location of your JNLP files!" unless="jnlp.codebase" />
        <property name="jnlp.dest.dir" location="build/jnlp" />
        <mkdir dir="${jnlp.dest.dir}" />
        <for-each startdir=".." target="jnlp" locations="${config.modules.jnlp}"/>
    </target>
    
    <target name="set-config-to-javadoc" >
        <property name="moduleconfig" value="javadoc" />
    </target>
    
    <!-- build javadoc for selected modules -->
    <target name="build-javadoc" depends="set-config-to-javadoc,init" description="Builds Javadoc documentation for modules; on branches pass e.g. -Djavadoc.web.root=http://www.netbeans.org/download/release35/javadoc">
        <ant dir="." target="merge">
            <property name="modules" value="${modules}"/>
            <property name="fixedmodules" value="${fixedmodules}"/>
            <property name="merge.dependent.modules" value="true"/>
            <property name="stop.when.broken.module" value="false"/>
        </ant>
        
        <mkdir dir="build/ModulesExportedInterfaces" />
        <property name="export.interfaces" location="build/ModulesExportedInterfaces" />
        
        <mkdir dir="build/APIChanges" />
        <property name="export.apichanges" location="build/APIChanges" />
        
        <!-- build javadoc for supported APIs -->
        <for-each startdir=".." target="javadoc" locations="${fixedmodules}"/>
        <!-- build javadoc for unsupported APIs -->
        <for-each startdir=".." target="javadoc" locations="${modules}"/>
        
        <antcall inheritall="true" inheritrefs="true" target="javadoc-generate-xml" />
        <antcall inheritall="true" inheritrefs="true" target="javadoc-generate-html" />
        <antcall inheritall="true" inheritrefs="true" target="javadoc-check-broken-links" />
    </target>  
    
    <target name="javadoc-generate-xml" depends="set-config-to-javadoc,init" >
        <echo file="build/APIChanges/header.gen" >&lt;?xml version="1.0" encoding="UTF-8"?&gt;
            &lt;changes&gt;
        </echo>
        
        <echo file="build/APIChanges/footer.gen" >
            &lt;/changes&gt;
        </echo>
        
        <concat destfile="${netbeans.javadoc.dir}/apichanges.xml" >
            <fileset dir="build/APIChanges" includes="header.gen" />
            <fileset dir="build/APIChanges" includes="*" excludes="*.gen" />
            <fileset dir="build/APIChanges" includes="footer.gen" />
        </concat>
        
        
        <echo file="build/ModulesExportedInterfaces/header.gen" >&lt;?xml version="1.0" encoding="UTF-8"?&gt;
            &lt;apis&gt;
        </echo>
        
        <echo file="build/ModulesExportedInterfaces/footer.gen" >
            &lt;/apis&gt;
        </echo>
        
        <concat destfile="${netbeans.javadoc.dir}/modules.xml" >
            <fileset dir="build/ModulesExportedInterfaces" includes="header.gen" />
            <fileset dir="build/ModulesExportedInterfaces" includes="*" excludes="*.gen" />
            <fileset dir="build/ModulesExportedInterfaces" includes="footer.gen" />
        </concat>
        
        <taskdef 
            name="javadoc-index" 
            classpath="nbantext.jar" 
            classname="org.netbeans.nbbuild.JavadocIndex"
        />
        
        
        <javadoc-index target="${netbeans.javadoc.dir}/allclasses.xml" > 
            <packageslist dir="${netbeans.javadoc.dir}" >
                <include name="**/allclasses-noframe.html" />
            </packageslist>
        </javadoc-index>
    </target>
    
    
    <target name="javadoc-generate-html" depends="set-config-to-javadoc,init" >            
        <tstamp>
            <format property="modules-javadoc-date" pattern="d MMM yyyy" locale="en" />
        </tstamp>
        
        <style 
            in="${netbeans.javadoc.dir}/modules.xml" 
            out="${netbeans.javadoc.dir}/usecases.html" 
            style="javadoctools/export2usecases.xsl"
        >
            <param name="date" expression="${modules-javadoc-date}"/>
        </style>
        
        <style 
            in="${netbeans.javadoc.dir}/apichanges.xml" 
            out="${netbeans.javadoc.dir}/apichanges.html" 
            style="javadoctools/export2apichanges.xsl"
        >
            <param name="date" expression="${modules-javadoc-date}"/>
            <param name="changes-since-year" expression="${previous.release.year}"/>
            <param name="changes-since-day" expression="${previous.release.day}"/>
            <param name="changes-since-month" expression="${previous.release.month}"/>
            <param name="include-introduction" expression="true" />
        </style>
        
        <copy file="javadoctools/netbeans.css" tofile="${netbeans.javadoc.dir}/netbeans.css" />
        <condition property="javadoc.style.sheet.exists" >
            <available file="${netbeans.javadoc.dir}/org-openide-util/javadoc.css" />
        </condition>
        
        <fail unless="javadoc.style.sheet.exists" >
            The org-openide-util/javadoc.css has to exist as we are refering to
            it from to master module javadoc pages. If it does not anymore, update
            the javadoctools/export*.xsl templates.
        </fail>
        
        <style 
            in="${netbeans.javadoc.dir}/allclasses.xml" 
            out="${netbeans.javadoc.dir}/allclasses-frame.html" 
            style="javadoctools/export2allclasses.xsl"
        >
        </style>
        
        <style 
            in="${netbeans.javadoc.dir}/modules.xml" 
            out="${netbeans.javadoc.dir}/overview-frame.html" 
            style="javadoctools/export2allmodules.xsl"
        >
            <param name="date" expression="${modules-javadoc-date}"/>
        </style>
        
        <style 
            in="${netbeans.javadoc.dir}/modules.xml" 
            out="${netbeans.javadoc.dir}/layers.html" 
            style="javadoctools/export2layer.xsl"
        >
            <param name="date" expression="${modules-javadoc-date}"/>
        </style>
        
        <style 
            in="${netbeans.javadoc.dir}/modules.xml" 
            out="${netbeans.javadoc.dir}/overview-summary.html" 
            style="javadoctools/export2html.xsl"
        >
            <param name="date" expression="${modules-javadoc-date}"/>
        </style>
        
        
        <!-- at the end geneate the index.html so people know where to start -->      
        <echo file="${netbeans.javadoc.dir}/index.html" ><![CDATA[
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
<HTML><HEAD><TITLE>NetBeans API Index</TITLE>
</HEAD>
<FRAMESET cols="20%,80%" title="" onLoad="top.loadFrames()">
<FRAMESET rows="30%,70%" title="" onLoad="top.loadFrames()">
<FRAME src="overview-frame.html" name="packageListFrame" title="All Modules">
<FRAME src="allclasses-frame.html" name="packageFrame" title="All classes">
</FRAMESET>
<FRAME src="overview-summary.html" name="classFrame" title="Module, package, class and interface descriptions" scrolling="yes">
<NOFRAMES>
<H2>Frame Alert</H2>
<P>
This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client.
Link to<A HREF="overview-summary.html">Non-frame version.</A>
</NOFRAMES>
</FRAMESET>
</HTML>
        ]]></echo>
        
        <replace dir="${netbeans.javadoc.dir}">
            <include name="*.html"/>
            <replacefilter token="@JDK@" value="http://java.sun.com/j2se/1.4.2/docs/api"/>
            <replacefilter token="http://root/" value="." />
            <replacefilter token="$${javadoc.web.root}" value="." />
        </replace>
        
        <echo message="Javadoc index has been generated to ${netbeans.javadoc.dir}/index.html" />
    </target>
    
    
    <target name="javadoc-check-broken-links" depends="init" unless="javadoc.skip.brokenlinks.check" >
        <taskdef name="checklinks" classname="org.netbeans.nbbuild.CheckLinks">
            <classpath>
                <pathelement location="nbantext.jar"/>
            </classpath>
        </taskdef>
        <checklinks basedir="${netbeans.javadoc.dir}" checkexternal="${javadoc.check.external.links}" checkspaces="false" failonerror="true" >
            <include name="*/overview-summary.html"/>
            <include name="*/apichanges.html"/>
            <include name="*/architecture-summary.html"/>
            <include name="*/**/package-summary.html"/>
            <include name="*/**/doc-files/**/*.html"/>
            <include name="*.html" />
        </checklinks>
    </target>
    
    <target name="build-messaging" depends="init">
        <echo message="Starting a build for NetBeans (build ${buildnum}, config '${moduleconfig}') ..."/>
        <echo message="Selected modules: ${modules}"/>
        <echo message="OS: ${os.name} ${os.version}  Locale: ${user.language}_${user.region}"/>
        <echo message="Java: ${nbjdk.home}"/>
    </target>
    
    <!-- Use of nbmerge target has the effect of automatically depending on all-X for every module. -->
    <!-- It also runs deltree(dir=wherever) and copydir(src=../X/netbeans,dest=wherever) to create the IDE install. -->

    <target name="build-nozip" depends="clean-cluster-flags,build-clusters" description="Build the IDE but do not create a final ZIP file.">
        <loadproperties srcFile="${clusters.list.file}" />
        
        <loadproperties srcfile="${netbeans.dest.dir}/moduleCluster.properties" />
        
        <mkdir dir="${netbeans.dest.dir}/bin" />
        <copy file="../ide/launcher/unix/netbeans" todir="${netbeans.dest.dir}/bin" />
        <chmod file="${netbeans.dest.dir}/bin/netbeans" perm="ugo+rx"/>
        <copy file="../ide/launcher/windows/netbeans.exe" todir="${netbeans.dest.dir}/bin" />
        <copy file="../ide/launcher/windows/nb.exe" todir="${netbeans.dest.dir}/bin" />
        <copy file="../ide/launcher/os2/netbeans.cmd" todir="${netbeans.dest.dir}/bin" />
        <!-- if anybody knows better place for icons, let me know: jtulach@netbeans.org -->
        <copy file="../ide/launcher/os2/nbos2icons.zip" todir="${netbeans.dest.dir}/${nb.cluster.nb.dir}/" />
        
        <mkdir dir="${netbeans.dest.dir}/etc" />
        <copy file="../ide/launcher/netbeans.conf" todir="${netbeans.dest.dir}/etc" />
        
        <echo message="${netbeans.dest.dir}/${nb.cluster.platform.dir}/lib/nbexec" />
        <fixcrlf eol="lf" srcdir="${netbeans.dest.dir}" >
            <include name="etc/netbeans.conf" />
            <include name="bin/netbeans" />      
            <include name="${nb.cluster.platform.dir}/lib/nbexec" />      
        </fixcrlf>
        <fixcrlf eol="crlf" srcdir="${netbeans.dest.dir}" >
            <include name="bin/netbeans.cmd" />      
            <include name="${nb.cluster.platform.dir}/lib/nbexec.cmd" />      
        </fixcrlf>
        
        <echo file="${netbeans.dest.dir}/build_info">NetBeans dev build
            ------------------
            Number:   ${buildnumber}
            Date:     ${buildday}
            Branding:
            Branch:   trunk
            Tag:
        </echo>
    </target>
    
    <target name="build" depends="build-nozip"
            description="Create a complete build including a ZIP distribution (but do not try it).">
        <delete file="NetBeans-${buildnum}.zip"/>
        <delete file="NetBeans-${buildnum}-build-extra-data.zip"/>
        
        <property name="nb-extra-files" value="*.built,test/**,extra/**"/>
        
        <!-- package the zip file -->
        <zip destfile="NetBeans-${buildnum}.zip" update="true" duplicate="preserve">
            <zipfileset file="${netbeans.dest.dir}/bin/netbeans" filemode="755" prefix="${netbeans.dest}/bin"/>
            <zipfileset file="${netbeans.dest.dir}/${nb.cluster.platform.dir}/lib/nbexec" filemode="755" prefix="${netbeans.dest}/${nb.cluster.platform.dir}/lib"/>
            <zipfileset dir="${netbeans.dest.dir}/${nb.cluster.ide.dir}/ant/bin" filemode="755" prefix="${netbeans.dest}/${nb.cluster.ide.dir}/ant/bin">
                <exclude name="*.bat"/>
                <exclude name="*.cmd"/>
            </zipfileset>
            <zipfileset dir="${netbeans.dest.dir}" filemode="755" prefix="${netbeans.dest}">
                <include name="**/*.sh"/>
            </zipfileset>
            <zipfileset dir="${netbeans.dest.dir}" prefix="${netbeans.dest}" excludes="${nb-extra-files}">
                <!-- XXX exclude the temporary cluster for parts of openide -->
                <exclude name="tmp" />
                <exclude name="tmp/**/*" />
            </zipfileset>
        </zip>
        
        <!-- package the zip file with extra files not to be included in regular product package-->
        <!--
    <zip destfile="NetBeans-${buildnum}-build-extra-data.zip" update="true" duplicate="preserve">
        <zipfileset dir="${netbeans.dest.dir}" prefix="${netbeans.dest}" includes="${nb-extra-files}"/>
    </zip>
    -->

        <echo>Build created; see NetBeans-${buildnum}.zip (in nbbuild/).
            If you like, you may run the IDE straight from
            the ${netbeans.dest}/bin/ directory.
            (For example, type: ant tryme)
        </echo>
    </target>
    
    <target name="delete-and-merge" depends="merge-delete,merge" />   
    
    <target name="merge-delete" depends="init">
        <delete dir="${netbeans.dest}" />
    </target>
    
    <target name="merge" depends="build-messaging">
        <mkdir dir="${netbeans.dest.dir}"/>
        <nbmerge failonerror="${stop.when.broken.modules}" 
                 dest="${netbeans.dest}" 
                 topdir=".." 
                 fixedmodules="${fixedmodules}" 
                 modules="${modules}"
                 builtmodulesproperty="${built.modules.property}" 
                 targetprefix="all-" 
                 mergedependentmodules="${merge.dependent.modules}" >
        </nbmerge>
        <chmod perm="ugo+x">
            <fileset dir="${netbeans.dest.dir}">
                <include name="bin/netbeans"/>
                <include name="bin/**/*.pl"/>
                <include name="jakarta-tomcat-*/bin/*.sh"/>
            </fileset>
        </chmod>
    </target>
    
    <target name="build-platform" depends="init">
        <run-depend-build clusters-to-build="nb.cluster.platform,nb.cluster.harness"/>
    </target>
    
    <target name="build-cluster" depends="init">
        <run-depend-build clusters-to-build="${cluster-name}"/>
    </target>
    
    <macrodef name="resolve">
        <attribute name="name"/>
        <attribute name="value"/>
        <sequential>
            <property name="@{name}" value="${@{value}}"/>
        </sequential>
    </macrodef>
    
    <macrodef name="run-depend-build">
        <attribute name="clusters-to-build"/>
        <sequential>
            <echo>Repeat @{clusters-to-build}</echo>
            <repeat target="build-one-cluster" name="one.cluster.name" values="@{clusters-to-build}" /> 
        </sequential>
    </macrodef>
    
    <target name="build-clusters" depends="init">
        <run-depend-build clusters-to-build="${nb.clusters.list}"/> 
    </target>
    
    <target name="build-one-cluster-dependencies-check">
        <condition property="${one.cluster.name}-hasNoDependencies">
            <equals arg1="${one.cluster.dependencies}" arg2="" trim="true"/>
        </condition>
        <echo>Dependency prop :${one.cluster.name}-hasNoDependencies:</echo>
        <echo>Cluster dep :${one.cluster.dependencies}:</echo>
        <resolve name="test.prop" value="${one.cluster.name}-hasNoDependencies"/>
        <echo>Cluster dep prp:${test.prop}:</echo>
    </target>
    
    <target name="build-one-cluster-dependencies" 
            depends="build-one-cluster-dependencies-check"
            unless="${one.cluster.name}-hasNoDependencies">
        <run-depend-build clusters-to-build="${one.cluster.dependencies}"/> 
    </target>
    
    <target name="build-one-cluster-check">
        <condition property="${one.cluster.name}-is-built">
            <available file="${netbeans.dest.dir}/${one.cluster.name}.built"/>
        </condition>
        <resolve name="test1.prop" value="${one.cluster.name}-is-built"/>
        <echo>Cluster ${one.cluster.name} is :${test1.prop}:</echo>
    </target>
    
    <target name="build-one-cluster" unless="${one.cluster.name}-is-built" depends="build-one-cluster-check">
        <echo message="Building ${one.cluster.name} modules"/>
        <resolve name="one-cluster-modules" value="${one.cluster.name}"/>
        <resolve name="one-cluster-dependencies" value="${one.cluster.name}.depends"/>
        <echo>${one-cluster-modules}</echo>
        <echo>Dependencies: ${one-cluster-dependencies}</echo>
        <insert-module-all-targets/> <!-- we are in a subproject, so need to reinsert the targets... XXX <antcall> and thus <repeat> apparently reparses the Ant script from disk! -->
        <antcall target="build-one-cluster-dependencies" inheritAll="false">
            <param name="one.cluster.dependencies" value="${one-cluster-dependencies}"/>
            <param name="one.cluster.name" value="${one.cluster.name}"/>
        </antcall>
        <mkdir dir="${netbeans.dest.dir}"/>
        <nbmerge failonerror="${stop.when.broken.modules}" 
                 dest="${netbeans.dest.dir}" 
                 topdir="${nb_all}" 
                 fixedmodules="${one-cluster-modules}"
                 builtmodulesproperty="${built.modules.property}" 
                 targetprefix="all-" 
                 mergedependentmodules="false">
        </nbmerge>
        <touch file="${netbeans.dest.dir}/${one.cluster.name}.built"/>
    </target>
    
    <target name="zipclusters" depends="init">
        <mkdir dir="${netbeans.build.dir}/zips"/>
        <repeat target="zip-one-cluster" name="one.cluster.name" values="${clusters.list}" /> 
        
        <!-- package the misc files -->
        <zip destfile="${netbeans.build.dir}/zips/${clusters.prefix}-misc-${buildnum}.zip" update="true" duplicate="preserve">
            <zipfileset dir="${netbeans.dest.dir}" filemode="755">
                <include name="bin/netbeans"/>
            </zipfileset>
            <zipfileset dir="${netbeans.dest.dir}">
                <include name="bin/**"/>
                <include name="etc/**/"/>
            </zipfileset>
        </zip>
    </target>
    
    <target name="zip-one-cluster">
        <taskdef name="setclusterpatternset" classname="org.netbeans.nbbuild.SetClusterPatternSet" classpath="nbantext.jar"/>
        <taskdef name="setcluster" classname="org.netbeans.nbbuild.SetCluster" classpath="nbantext.jar"/>
        <loadproperties srcFile="${clusters.list.file}" />
        <loadproperties srcFile="cluster-description.properties" />
        <setcluster cluster="${one.cluster.name}" name="one.cluster.dir" />
        
        <setclusterpatternset cluster="${one.cluster.name}" name="${one.cluster.name}.files" trackingpath="${netbeans.dest.dir}" clusterdir="${one.cluster.dir}"/>
        
        <resolve name="zipcluster.file" value="${one.cluster.name}.pkg.filename"/>
        <zip destfile="${netbeans.build.dir}/zips/${clusters.prefix}-${zipcluster.file}-${buildnum}.zip" update="true" duplicate="preserve">
            <zipfileset dir="${netbeans.dest.dir}" filemode="755">
                <include name="${one.cluster.dir}/lib/nbexec"/>
            </zipfileset>
            <zipfileset dir="${netbeans.dest.dir}" filemode="755">
                <include name="${one.cluster.dir}/ant/bin/*"/>
                <exclude name="${one.cluster.dir}/ant/bin/*.bat"/>
                <exclude name="${one.cluster.dir}/ant/bin/*.cmd"/>
            </zipfileset>
            <zipfileset dir="${netbeans.dest.dir}">
                <patternset refID="${one.cluster.name}.files"/>
            </zipfileset>
        </zip>
    </target>
    
    <target name="create-rpms-proto">
        <mkdir dir="${netbeans.build.dir}/rpms"/>
        <repeat target="create-one-rpm-proto" name="one.cluster.name" values="${clusters.list}" /> 
    </target>
    
    <target name="create-one-rpm-proto">
        <taskdef name="setcluster" classname="org.netbeans.nbbuild.SetCluster" classpath="nbantext.jar"/>
        <loadproperties srcFile="cluster.properties" />
        <loadproperties srcFile="cluster-description.properties" />
        <setcluster cluster="${one.cluster.name}" name="one.cluster.dir" />
        <mkdir dir="${netbeans.build.dir}/rpms"/>
        
        <resolve name="pkg.name" value="${one.cluster.name}.pkg.name"/>
        <resolve name="pkg.version" value="${one.cluster.name}.pkg.version"/>
        <resolve name="pkg.desc" value="${one.cluster.name}.pkg.desc"/>
        <resolve name="pkg.vendor" value="${one.cluster.name}.pkg.vendor"/>
        <resolve name="pkg.email" value="${one.cluster.name}.pkg.email"/>
        <resolve name="pkg.rpm.name" value="${one.cluster.name}.pkg.rpm.name"/>
        <resolve name="pkg.rpm.requires" value="${one.cluster.name}.pkg.rpm.requires"/>
        <resolve name="pkg.rpm.group" value="${one.cluster.name}.pkg.rpm.group"/>
        <resolve name="pkg.rpm.url" value="${one.cluster.name}.pkg.rpm.url"/>
        <resolve name="pkg.rpm.copyright" value="${one.cluster.name}.pkg.rpm.copyright"/>
        <resolve name="pkg.rpm.map" value="${one.cluster.name}.pkg.rpm.map"/>
        <resolve name="pkg.rpm.prefix" value="${one.cluster.name}.pkg.rpm.prefix"/>
        
        <echo file="${netbeans.build.dir}/rpms/${pkg.rpm.name}.spec">
            %define global_product_version ${pkg.version}
            %define global_product_release 00
            %define _prefix ${pkg.rpm.prefix}
            Version: %{global_product_version}
            Release: %{global_product_release}
            Group: ${pkg.rpm.group}
            Copyright: ${pkg.rpm.copyright}
            Vendor: ${pkg.vendor}
            URL: ${pkg.rpm.url}
            Prefix: %_prefix
            AutoReqProv: no
            Name: ${pkg.rpm.name}
            Summary: ${pkg.name}
            %description 
            ${pkg.desc}
            
            %files
            
            %erpm_map ${pkg.rpm.map} nb_destdir
            
            %dir ${pkg.rpm.map}
            
        ${pkg.rpm.map}/${one.cluster.dir}</echo>
    </target>
    
    <target name="create-svr4s-proto">
        <mkdir dir="${netbeans.build.dir}/rpms"/>
        <repeat target="create-one-svr4-proto" name="one.cluster.name" values="${clusters.list}" /> 
    </target>
    
    <target name="create-one-svr4-proto">
        <taskdef name="setcluster" classname="org.netbeans.nbbuild.SetCluster" classpath="nbantext.jar"/>
        <loadproperties srcFile="cluster.properties" />
        <loadproperties srcFile="cluster-description.properties" />
        <setcluster cluster="${one.cluster.name}" name="one.cluster.dir" />
        <mkdir dir="${netbeans.build.dir}/svr4s"/>
        
        <resolve name="pkg.name" value="${one.cluster.name}.pkg.name"/>
        <resolve name="pkg.version" value="${one.cluster.name}.pkg.version"/>
        <resolve name="pkg.desc" value="${one.cluster.name}.pkg.desc"/>
        <resolve name="pkg.vendor" value="${one.cluster.name}.pkg.vendor"/>
        <resolve name="pkg.email" value="${one.cluster.name}.pkg.email"/>
        <resolve name="pkg.svr4.pkg" value="${one.cluster.name}.pkg.svr4.pkg"/>
        <resolve name="pkg.svr4.maxinst" value="${one.cluster.name}.pkg.svr4.maxinst"/>
        <resolve name="pkg.svr4.sunw_pkgvers" value="${one.cluster.name}.pkg.svr4.sunw_pkgvers"/>
        <resolve name="pkg.svr4.hotline" value="${one.cluster.name}.pkg.svr4.hotline"/>
        <resolve name="pkg.svr4.classes" value="${one.cluster.name}.pkg.svr4.classes"/>
        <resolve name="pkg.svr4.basedir" value="${one.cluster.name}.pkg.svr4.basedir"/>
        <resolve name="pkg.svr4.pkginst" value="${one.cluster.name}.pkg.svr4.pkginst"/>
        <resolve name="pkg.svr4.category" value="${one.cluster.name}.pkg.svr4.category"/>
        <echo file="${netbeans.build.dir}/svr4s/${pkg.svr4.pkg}.spec">
            PKG=${pkg.svr4.pkg}
            NAME=${pkg.name}
            ARCH=sparc
            VERSION=${pkg.version}
            MAXINST=${pkg.svr4.maxinst}
            CATEGORY=${pkg.svr4.category}
            SUNW_PKGVERS=${pkg.svr4.sunw_pkgvers}
            DESC=${pkg.desc}
            VENDOR=${pkg.vendor}
            HOTLINE=${pkg.svr4.hotline}
            EMAIL=${pkg.email}
            CLASSES=${pkg.svr4.classes}
            BASEDIR=${pkg.svr4.basedir}
        PKGINST=${pkg.svr4.pkginst}</echo>
    </target>
    
    <target name="sanity-check" depends="testuserdir-delete,sanity-start" description="Test whether the build can start up without problems."/>
    <target name="-testuserdir-delete-init" depends="init">
        <property name="test.user.dir.lock" location="${test.user.dir}/lock"/>
        <available property="app.running" file="${test.user.dir.lock}"/>
    </target>
    <target name="-testuserdir-delete-ok" depends="-testuserdir-delete-init" unless="app.running">
        <delete dir="${test.user.dir}"/>
    </target>
    <target name="-testuserdir-delete-fail" depends="-testuserdir-delete-init" if="app.running">
        <!-- #66799: best to warn about this condition... -->
        <fail>Will not delete ${test.user.dir} because ${test.user.dir.lock} still exists; kill any running process and delete lock file if necessary</fail>
    </target>
    <target name="testuserdir-delete" depends="-testuserdir-delete-ok,-testuserdir-delete-fail"/>
    <target name="sanity-start" depends="init,maybe-build-nozip,-jdk-init">
        <mkdir dir="${test.user.dir}"/>
        <echo>Starting the IDE as a sanity check...</echo>
        <echo>WARNING - the sanity-start target is deprecated. Use commit-validation instead.</echo>
        <!-- XXX better would be to scan start log for stacktraces and just show those; -->
        <!-- possibly after filtering for duplicates or something like this. -->
        <!-- Timeout is ten minutes; should be enough for valid start, while preventing -->
        <!-- a deadlock from hanging an automated build: -->
        <exec os="Windows NT Windows 95 Windows 98 Windows 2000 Windows 2003 Windows XP" executable="${netbeans.dest.abs}/bin/nb.exe" failonerror="yes" timeout="600000">
            <arg value="--jdkhome"/>
            <arg file="${nbjdk.home}"/>
            <arg value="--userdir"/>
            <arg file="${test.user.dir}"/>
            <arg line="${sanitystart.args}"/>
        </exec>
        <exec os="Linux SunOS Solaris Mac OS X" dir="." executable="sh" failonerror="yes" timeout="600000">
            <arg value="${netbeans.dest.abs}/bin/netbeans"/>
            <arg value="--jdkhome"/>
            <arg file="${nbjdk.home}"/>
            <arg value="--userdir"/>
            <arg file="${test.user.dir}"/>
            <arg line="${sanitystart.args}"/>
        </exec>
        <echo>Finished starting the IDE, pay attention to any reported errors.</echo>
    </target>
    
    <target name="check-for-build"  >
        <available property="have-build" file="${netbeans.dest.dir}/bin/netbeans"/>
    </target>
    <target name="maybe-build-nozip" depends="check-for-build" unless="have-build">
        <ant dir="${basedir}" target="build-nozip"/>
    </target>
    
    <target name="nozip-check" 
            depends="build-nozip,sanity-check">
        <echo>WARNING - the nozip-check target is deprecated. Use all-nozip instead.</echo>
    </target>
    
    <target name="tryme-setup-debug-args" if="debug.port" >
        <property name="debug.pause" value="n" />
        <property name="debug.server" value="y" />
        
        <property name="tryme.debug.args" value="-J-Xdebug -J-Xnoagent -J-Xrunjdwp:transport=dt_socket,suspend=${debug.pause},server=${debug.server},address=${debug.port}" />
    </target>
    
    <target name="tryme-debug" depends="-jdk-presetdef-nbjpdastart" description="Start IDE in debugger. May only be called from within IDE.">
        <nbjpdastart name="NetBeans" addressproperty="debug.port" transport="dt_socket">
            <classpath>
                <fileset dir="${netbeans.dest.dir}">
                    <include name="**/*.jar"/>
                </fileset>
            </classpath>
        </nbjpdastart>
        <property name="debug.server" value="n"/>
        <antcall target="tryme"/>
    </target>
    
    <target name="tryme-profile" depends="-jdk-presetdef-nbprofiledirect" description="Start IDE in debugger. May only be called from within IDE.">
        <property name="profiler.roots.path" value="profiler.roots.all" />
        <fileset id="profiler.roots.all" dir="${netbeans.dest.dir}">
            <include name="**/*.jar"/>
        </fileset>
        <nbprofiledirect 
            jvmargsprefix="-J" 
            jvmargsproperty="profiler.jvmargs" 
            mainclass="org.netbeans.Main"
        >
            <classpath>
                <fileset dir="${netbeans.dest.dir}">
                    <include name="**/*.jar"/>
                </fileset>
            </classpath>
            <rootspath>
                <fileset refid="${profiler.roots.path}" />
            </rootspath>
        </nbprofiledirect>
        
        <antcall target="tryme">
            <param name="tryme.args" value="${profiler.jvmargs}"/>
        </antcall>
    </target>
    
    <target name="tryme" depends="init,maybe-build-nozip,tryme-setup-debug-args,-jdk-init"
            description="Try running the IDE interactively (build it first if needed).
            It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in debug mode" 
    >
        <property name="tryme.debug.args" value="" />
        
        <exec os="Windows NT Windows 95 Windows 98 Windows 2000 Windows 2003 Windows XP" executable="${netbeans.dest.abs}/bin/nb.exe" failonerror="yes">
            <arg value="--jdkhome"/>
            <arg file="${nbjdk.home}"/>
            <arg value="--userdir"/>
            <arg file="${test.user.dir}"/>
            <arg line="${tryme.args}"/>
            <arg line="${tryme.debug.args}" />
        </exec>
        <exec os="Linux SunOS Solaris Mac OS X" dir="." executable="sh" failonerror="yes">
            <arg value="${netbeans.dest}/bin/netbeans"/>
            <arg value="--jdkhome"/>
            <arg file="${nbjdk.home}"/>
            <arg value="--userdir"/>
            <arg file="${test.user.dir}"/>
            <arg line="${tryme.args}"/>
            <arg line="${tryme.debug.args}" />
        </exec>
    </target>
    
    <target name="l10n-kit" depends="init">
        <taskdef name="l10n" classname="org.netbeans.nbbuild.L10nTask"
                 classpath="nbantext.jar"/>
        <delete dir="${l10n.dist.dir}"/>
        <mkdir dir="${l10n.dist.dir}"/>
        <delete dir="tmp"/>
        <mkdir dir="tmp"/>
        <property name="nbroot" location=".."/>
        <l10n topdirs="${nbroot}" modules="${fixedmodules},${modules}"
              localizablefile="l10n.list" generatedfile="l10n.list.translated"
              distdir="${l10n.dist.dir}" changedfile="l10n.list.changed"
              builddir="tmp" buildnumber="${buildnumber}"
              excludepattern="**/ja/,**/*_ja.*"/>
        <delete dir="tmp"/>
    </target>
    
    <target name="bootstrap-javadoc"
            depends="bootstrap"
            description="Generate Javadoc for Ant extensions.">
        <!-- XXX this ought to be deleted at some point. -->
        <!-- Can be done anyway by apisupport/ant, and published as regular module Javadoc -->
        <!-- by the regular daily Javadoc build process. -->
        <!-- Then all of this stuff can be deleted from the www part of CVS. -->
        <mkdir dir="www/nbantext-javadoc"/>
        <delete>
            <fileset dir="www/nbantext-javadoc">
                <include name="**/*.html"/>
            </fileset>
        </delete>
        <tstamp/>
        <javadoc sourcepath="antsrc"
                 destdir="www/nbantext-javadoc"
                 packagenames="org.netbeans.nbbuild.*"
                 windowtitle="NetBeans Ant Extensions"
                 doctitle="Extended Ant Tasks for Building NetBeans"
                 nodeprecatedlist="true"
                 notree="true"
                 noindex="true"
                 nohelp="true"
                 nonavbar="true"
                 author="false"
                 version="false"
                 bottom="Built on ${buildday}"
        >
            <classpath refid="bootstrap-cp"/>
            <link href="http://nagoya.apache.org/gump/javadoc/ant/build/javadocs" offline="true" packagelistloc="antsrc"/>
        </javadoc>
    </target>
    
    <target name="clean-external">
        <subant target="clean">
            <fileset dir="..">
                <include name="*/external/build.xml"/>
                <include name="contrib/*/external/build.xml"/>
            </fileset>
        </subant>
    </target>
    
    <target name="real-clean" depends="clean,clean-external"
            description="Clean everything possible.">
        <echo message="Cleaning old builds..."/>
        <delete>
            <fileset dir=".">
                <include name="NetBeans-*.log"/>
                <include name="NetBeans-*.zip"/>
            </fileset>
        </delete>
        <!-- This step must be last: -->
        <echo message="Cleaning NetBeans-specific Ant extensions..."/>
        <delete file="nbantext.jar" quiet="true"/>
        <delete dir="build/antclasses"/>
    </target>
    
    <target name="ant-clean">
        <delete file="nbantext.jar"/>
    </target>
    
    <target name="clean-cluster-flags" unless="do-not-rebuild-clusters">
        <mkdir dir="${netbeans.dest.dir}"/>
        <delete includeEmptyDirs="true">
            <fileset dir="${netbeans.dest.dir}">
                <include name="*.built"/>
            </fileset>
        </delete>
    </target>
    
    <target name="localclean" depends="clean-cluster-flags,init">
        <delete dir="${test.user.dir}"/>
        <delete dir="build"/>
        <delete file="moduledefs-tmp.properties"/>
        <delete dir="nbms" />
        <delete dir="${netbeans.dest.dir}"/>
    </target>
    
    <!-- more correct but takes too long: <target name="localtest" depends="bootstrap,all-xtest/nbjunit" > -->
    <target name="localtest" depends="bootstrap">
        <ant dir="test" target="cleanresults"/>
        <ant dir="test" target="runtests"/>
    </target>
    <target name="localtest-nb" depends="localtest">
        <nbbrowse file="test/results/index.html"/>
    </target>
    <target name="localtest-single-nb" depends="bootstrap">
        <property name="unit.test.base" location="test/unit/src"/>
        <pathconvert property="xtest.includes" pathsep=",">
            <path path="${includes}"/>
            <mapper type="glob" from="${unit.test.base}${file.separator}*.java" to="*.class"/>
        </pathconvert>
        <property name="xtest.attribs" value="empty"/>
        <ant dir="test" target="cleanresults"/>
        <ant dir="test" target="runtests"/>
        <nbbrowse file="test/results/index.html"/>
    </target>
    <target name="localtest-single-nb-debug" depends="bootstrap,-jdk-presetdef-nbjpdastart">
        <property name="unit.test.base" location="test/unit/src"/>
        <pathconvert property="xtest.includes" pathsep=",">
            <path path="${includes}"/>
            <mapper type="glob" from="${unit.test.base}${file.separator}*.java" to="*.class"/>
        </pathconvert>
        <property name="xtest.attribs" value="empty"/>
        <ant dir="test" target="cleanresults"/>
        <nbjpdastart transport="dt_socket" addressproperty="jpda.address" name="${test.class}">
            <classpath>
                <!--
            <path location="test/work/sys/tests/unit/classes"/>
            <path location="test/work/sys/tests/"/>
            <path location="test/unit/src/"/>
            -->
                <path location="nbantext.jar"/>
            </classpath>
        </nbjpdastart>
        <ant dir="test" target="runtests">
            <property name="xtest.debug.address" value="${jpda.address}" />
            <property name="xtest.debug.pause" value="false" />
        </ant>
        <nbbrowse file="test/results/index.html"/>
    </target>
    
    <target name="cleanall" depends="init">
        <cleanall topdir=".." 
                  modules="${allmodules}" 
                  targetname="clean"
                  resolvedependencies="${resolve.clean.dependencies}"
                  deptargetprefix="all-"
                  failonerror="${stop.when.clean.error}" />
    </target>
    
    <target name="clean" depends="init,cleanall,localclean"
            description="Clean out (almost) all build products.">
        <echo message="Run `ant real-clean' if desired."/>
    </target>
    
    <!-- This section contains properties and targets used to build -->
    <!-- Solaris packages.                                          -->

    <property name="solpkg-pkgproto" value="pkgproto"/>
    <property name="solpkg-pkgmk" value="pkgmk"/>
    <property name="solpkg-proto-file" value="prototype"/>
    <property name="solpkg-actual-dir" value="to-be-specified"/>
    <property name="solpkg-pkg-dir" value="to-be-specified"/>
    <property name="solpkg-pkg-dest-dir" value="to-be-specified"/>
    
    <!-- You can run this target to create the prototype file and create -->
    <!-- the package, or if you need to modify the prototype file before -->
    <!-- building the package, you can run the two subtargets            -->
    <!-- separately.                                                     -->
    <target name="solpkg-build" depends="solpkg-pkgproto,solpkg-pkgmk"
            description="Generate a prototype file and create a Solaris package."/>
    
    <!-- This creates the pkg prototype file for a given directory and -->
    <!-- its files.                                                    -->
    <target name="solpkg-pkgproto"
            description="Generate a prototype file.">
        <exec executable="rm" failonerror="yes">
            <arg value="-rf"/>
            <arg value="${solpkg-proto-file}"/>
        </exec>
        <exec executable="${solpkg-pkgproto}" output="${solpkg-proto-file}" 
              failonerror="yes">
            <arg value="${solpkg-actual-dir}=${solpkg-pkg-dir}"/>
        </exec>
    </target>
    
    <!-- This creates the Solaris pkg for a given prototype file, pkginfo -->
    <!-- file, and directory.                                             -->
    <target name="solpkg-pkgmk"
            description="Create a Solaris package.">
        <exec executable="${solpkg-pkgmk}" failonerror="yes">
            <arg value="-o"/>
            <arg value="-f"/>
            <arg value="${solpkg-proto-file}"/>
            <arg value="-r"/>
            <arg value="${solpkg-actual-dir}"/>
            <arg value="-d"/>
            <arg value="${solpkg-pkg-dest-dir}"/>
        </exec>
    </target>
    
    <!-- End of Solaris package section. -->

    
    <!-- Localized builds -->
    <target name="all-dutch" depends="set-dutch-locale,all"/>
    <target name="all-russian" depends="set-russian-locale,all"/>
    <target name="all-french" depends="set-french-locale,all"/>
    <target name="all-ja-zh" depends="set-ja-zh_CN-locales,all"/>
    
    <target name="set-ja-zh_CN-locales">
        <property name="locales" value="ja,zh_CN"/>
        <property name="locjar.locales" value="${locales}"/>
        <property name="locmakenbm.locales"   value="${locales}"/>
        <property name="locjhindexer.locales" value="${locales}"/>
        <property name="localized.build.locales" value="${locales}"/>
    </target>
    
    <target name="set-dutch-locale">
        <property name="locales" value="nl"/>
        <property name="locjar.locales" value="${locales}"/>
        <property name="locmakenbm.locales"   value="${locales}"/>
        <property name="locjhindexer.locales" value="${locales}"/>
        <property name="localized.build.locales" value="${locales}"/>
    </target>
    
    <target name="set-russian-locale">
        <property name="locales" value="ru"/>
        <property name="locjar.locales" value="${locales}"/>
        <property name="locmakenbm.locales"   value="${locales}"/>
        <property name="locjhindexer.locales" value="${locales}"/>
        <property name="localized.build.locales" value="${locales}"/>
    </target>
    
    <target name="set-french-locale">
        <property name="locales" value="fr"/>
        <property name="locjar.locales" value="${locales}"/>
        <property name="locmakenbm.locales"   value="${locales}"/>
        <property name="locjhindexer.locales" value="${locales}"/>
        <property name="localized.build.locales" value="${locales}"/>
    </target>
    
    <!-- end of localized builds -->


    <target name="print-selected-modules" depends="init" description="Prints list of modules to build in selected moduleconfig.">
        <echo message="modules=${allmodules}"/>
    </target>
    
    <target name="print-cvs-modules" depends="init" description="Prints list of cvs modules required to build in selected moduleconfig.">
        <taskdef name="printcvsmodules" classname="org.netbeans.nbbuild.PrintCvsModules" classpath="nbantext.jar"/>
        <printcvsmodules modules="${fixedmodules},${modules}" targetprefix="all-" />
    </target>
    
    <target name="check-commit-validation">
        <condition property="run.validation" >
            <and>
                <available file="../ide/test/build.xml" />
                <available file="../jemmy/build.xml" />
                <available file="../jellytools/build.xml" />
                <available file="../xtest/build.xml" />
                <or>
                    <not>
                        <isset property="nb.run.validation"/>
                    </not>
                    <istrue value="${nb.run.validation}"/>
                </or>
            </and>
        </condition>
    </target>
    
    <target 
        name="unit-validation" 
        description="Invokes all existing unit tests in all IDE modules.
        Useful when one wants to deeply verify that his changes
        work"
    >
        <ant dir="../xtest/instance" target="runtests" >
            <property name="xtest.config" value="unit-nb" />
        </ant>
    </target>
    
    <target 
        name="commit-validation" 
        depends="commit-verification,commitValidation,no-commit-validation" 
        description="Runs tests to validate IDE before commit."
    />
    
    <target name="all-commitValidation" description="dummy target for build error recognition facility"/>
    
    <target 
        name="commit-verification" 
        description="Compares result of a build with golden files verifying various aspects of the exported interfaces"
        depends="
        all-verification,
        check-files-layout,
        check-public-packages,
        check-friend-packages,
        check-shared-packages,
        check-modules,
        check-dependencies,
        check-implementation-dependencies,
        check-cluster-dependencies,
        check-cluster-implementation-dependencies,
        check-clusters-content"
    />
    
    <!-- JST: One day also add 
    check-external-libraries
  -->
  
    <target name="all-verification" >
        <echo message="Runs verification tests to check the IDE before commit" />
    </target>
    
    <!-- keep this target name at least for a while for backward compat -jglick -->
    <target name="commitValidation" depends="all-commitValidation,check-commit-validation" if="run.validation">
        <property name="xtest.home" location="../xtest"/>
        <ant dir="${xtest.home}/instance" target="cleanresults">
            <property name="xtest.config" value="commit-validation-nb"/>
        </ant>
        <ant dir="${xtest.home}/instance" target="cleantests">
            <property name="xtest.config" value="commit-validation-nb"/>
        </ant>
        <ant dir="${xtest.home}/instance" target="runtests">
            <property name="xtest.config" value="commit-validation-nb"/>
            <property name="xtest.fail.on.failure" value="true"/>
        </ant>
    </target>
    
    <target name="no-commit-validation" depends="check-commit-validation" unless="run.validation">
        <echo>
            *** WARNING ***
            You do not seem to have the modules needed to run the commit validation test suite. 
            You may not commit any changes into the CVS repository without running these tests.
            For more information: http://www.netbeans.org/community/guidelines/commit.html
        </echo>
    </target>
    
    <target name="sanity-build-from-source-pkg" depends="build-source">
        <available file="${netbeans.build.dir}/${cluster.name}-src-${buildnum}.zip"
                   property="pkg.available"/>
        <fail message="Source package ${netbeans.build.dir}/${cluster.name}-src-${buildnum}.zip not available" unless="pkg.available"/>
        <delete dir="testbuild"/>
        <mkdir dir="testbuild"/>
        <unzip dest="testbuild" src="${netbeans.build.dir}/${cluster.name}-src-${buildnum}.zip"/>
        <property name="one.cluster.name" value="${cluster.name}"/>
        <propertyset id="sanity-build">
            <propertyref name="one.cluster.name"/>
        </propertyset>
        <echoproperties destfile="testbuild/nbbuild/user.properties">
            <propertyset refid="sanity-build"/>
        </echoproperties>
        
        <!-- it should call build of the refered cluster and not just hardcoded platform -->
        <ant antfile="testbuild/nbbuild/build.xml" inheritall="false" target="build-one-cluster">
            <property file="testbuild/nbbuild/user.properties"/>
        </ant>
        <delete dir="testbuild"/>
    </target>
    
    <target name="build-source"
            depends="init,set-buildnumber"
            description="Packages sources needed to compile given by cluster.name (can be specified by -Dcluster.name=nb.cluster.platform"
            if="cluster.name"
    >
        <property name="buildnum" value="dev-${buildnumber}"/>
        <echo message="Packaging sources of ${cluster.name} modules"/>
        <resolve name="cluster-modules" value="${cluster.name}"/>
        <resolve name="harness-modules" value="nb.cluster.harness"/>
        <mkdir dir="${netbeans.build.dir}"/>
        <taskdef name="definefileset" classname="org.netbeans.nbbuild.PrintCvsModules" classpath="nbantext.jar"/>
        <definefileset modules="${cluster-modules}" targetprefix="all-" id="source-modules" dir=".." />
        <definefileset modules="${cluster-modules}" targetprefix="all-" id="external-modules" dir=".." mode="binaries" />
        <definefileset modules="${harness-modules}" targetprefix="all-" id="harness-source-modules" dir=".." />
        <definefileset modules="${harness-modules}" targetprefix="all-" id="harness-external-modules" dir=".." mode="binaries" />
        <zip zipfile="${netbeans.build.dir}/${cluster.name}-src-${buildnum}.zip" duplicate="preserve">
            <fileset refid="source-modules" />
            <fileset refid="external-modules" />
            <fileset refid="harness-source-modules" />
            <fileset refid="harness-external-modules" />
        </zip>
    </target>
    
    <target name="generate-golden-files-init" depends="init,bootstrap" >
        <property name="template.files.dir" location="build/golden" />
        <property name="golden.files.dir" location="../ide/golden" />
        <condition property="golden.files.eol" value="unix" >
            <or>
                <os family="unix" />
                <os family="mac" />
            </or>
        </condition>
        <property name="golden.files.eol" value="dos" />
        
        <mkdir dir="${template.files.dir}" />
        
        <!-- convert the golden files into platform default encoding -->
        <fixcrlf srcdir="${golden.files.dir}" destdir="${template.files.dir}" eol="${golden.files.eol}" >
            <include name="*txt" />
        </fixcrlf>
        
    </target>
    
    
    <target name="generate-golden-files" depends="generate-golden-files-init" >
        <property name="generated.files.dir" location="build/generated" />
        <mkdir dir="${generated.files.dir}" />
        
        <taskdef name="deps" classname="org.netbeans.nbbuild.ModuleDependencies" classpath="nbantext.jar"/>
        
        <deps>
            <input name="platform" >
                <jars dir="${netbeans.dest.dir}" >
                    <include name="${nb.cluster.platform.dir}/**/*.jar" />
                </jars>
            </input>
            <input name="ide" >
                <jars dir="${netbeans.dest.dir}" >
                    <include name="${nb.cluster.ide.dir}/**/*.jar" />
                </jars>
            </input>
            <input name="j2ee" >
                <jars dir="${netbeans.dest.dir}" >
                    <include name="${nb.cluster.j2ee.dir}/**/*.jar" />
                </jars>
            </input>
            <input name="nb" >
                <jars dir="${netbeans.dest.dir}" >
                    <include name="${nb.cluster.nb.dir}/**/*.jar" />
                </jars>
            </input>
            <input name="harness" >
                <jars dir="${netbeans.dest.dir}" >
                    <include name="${nb.cluster.harness.dir}/**/*.jar" />
                </jars>
            </input>
            
            <output type="group-dependencies" file="${generated.files.dir}/cluster-deps.txt" />
            <output type="group-implementation-dependencies" file="${generated.files.dir}/cluster-impl-deps.txt" />
            <output type="modules" file="${generated.files.dir}/modules.txt" />
            <output type="dependencies" file="${generated.files.dir}/deps.txt" />
            <output type="implementation-dependencies" file="${generated.files.dir}/impl-deps.txt" />
            <output type="public-packages" file="${generated.files.dir}/public-packages.txt" />
            <output type="shared-packages" file="${generated.files.dir}/shared-packages.txt" />
            <output type="friend-packages" file="${generated.files.dir}/friend-packages.txt" />
            <output type="external-libraries" file="${generated.files.dir}/external-libraries.txt" />
        </deps>
    </target>
    
    <target name="check-public-packages" depends="generate-golden-files" >
        <property name="check.public.packages.golden" location="${golden.files.dir}/public-packages.txt" />
        <property name="check.public.packages.template" location="${template.files.dir}/public-packages.txt" />
        <property name="check.public.packages.generated" location="${generated.files.dir}/public-packages.txt" />
        
        <condition property="check-public-packages-are-they-the-same" >
            <filesmatch file1="${check.public.packages.template}" file2="${check.public.packages.generated}" />
        </condition>
        
        
        <exec os="Linux SunOS Solaris " dir="." executable="diff" failonerror="no" timeout="60000" >
            <arg value="-U"/>
            <arg value="15"/>
            <arg value="${check.public.packages.template}" />
            <arg value="${check.public.packages.generated}" />
        </exec>
        
        <fail unless="check-public-packages-are-they-the-same" >!
            *** Public packages has changed! ***
            
            Differences were found while comparing file 
            ${check.public.packages.template}
            with 
            ${check.public.packages.generated}
            
            This means that the set of public packages changed since the previously known one.
            Some packages may have been added, some of them may have been removed 
            Either by changing manifest of a module or by adding or removing a class file
            from a module package.
            
            
            Changing the packages may or may not be ok. It means that an api of 
            whole product changes and as such it is subject to review. If you passed
            your review and want to change the list of public packages, then please
            update the golden file at 
            ${check.public.packages.golden}
            and run the test once again. 
            
            Read more about the Verification Framework:
            http://openide.netbeans.org/proposals/arch/clusters.html#verify
            
            Look at for information about reviews:
            http://openide.netbeans.org/tutorial/review-steps.html
            
            Check the page about APIs:
            http://openide.netbeans.org/tutorial/api-design.html#api
        </fail>
    </target>
    
    <target name="check-friend-packages" depends="generate-golden-files" >
        <property name="check.friend.packages.golden" location="${golden.files.dir}/friend-packages.txt" />
        <property name="check.friend.packages.template" location="${template.files.dir}/friend-packages.txt" />
        <property name="check.friend.packages.generated" location="${generated.files.dir}/friend-packages.txt" />
        
        <condition property="check-friend-packages-are-they-the-same" >
            <filesmatch file1="${check.friend.packages.template}" file2="${check.friend.packages.generated}" />
        </condition>
        
        
        <exec os="Linux SunOS Solaris " dir="." executable="diff" failonerror="no" timeout="60000" >
            <arg value="-U"/>
            <arg value="15"/>
            <arg value="${check.friend.packages.template}" />
            <arg value="${check.friend.packages.generated}" />
        </exec>
        
        <fail unless="check-friend-packages-are-they-the-same" >!
            *** Friend packages has changed! ***
            
            Differences were found while comparing file 
            ${check.friend.packages.template}
            with 
            ${check.friend.packages.generated}
            
            This means that the set of friend packages changed since the previously known one.
            Some packages may have been added, some of them may have been removed 
            Either by changing manifest of a module or by adding or removing a class file
            from a module package.
            
            
            Changing the packages may or may not be ok. It means that an api of 
            whole product changes and as such it is subject to review. If you passed
            your review and want to change the list of friend packages, then please
            update the golden file at 
            ${check.friend.packages.golden}
            and run the test once again. 
            
            Read more about the Verification Framework:
            http://openide.netbeans.org/proposals/arch/clusters.html#verify
            
            Look at for information about reviews:
            http://openide.netbeans.org/tutorial/review-steps.html
            
            Check the page about APIs:
            http://openide.netbeans.org/tutorial/api-design.html#api
        </fail>
    </target>
    
    <target name="check-shared-packages" depends="generate-golden-files,-jdk-init" unless="have-jdk-1.5" >
        <property name="check.shared.packages.golden" location="${golden.files.dir}/shared-packages.txt" />
        <property name="check.shared.packages.template" location="${template.files.dir}/shared-packages.txt" />
        <property name="check.shared.packages.generated" location="${generated.files.dir}/shared-packages.txt" />
        
        <condition property="check-shared-packages-are-they-the-same" >
            <filesmatch file1="${check.shared.packages.template}" file2="${check.shared.packages.generated}" />
        </condition>
        
        
        <exec os="Linux SunOS Solaris Mac OS X" dir="." executable="diff" failonerror="no" timeout="60000" >
            <arg value="-U"/>
            <arg value="15"/>
            <arg value="${check.shared.packages.template}" />
            <arg value="${check.shared.packages.generated}" />
        </exec>
        
        <fail unless="check-shared-packages-are-they-the-same" >!
            *** Shared packages has changed! ***
            
            Differences were found while comparing file 
            ${check.shared.packages.template}
            with 
            ${check.shared.packages.generated}
            
            This means that the set of shared packages changed since the previously known one.
            Some packages may have been added, some of them may have been removed 
            Either by changing manifest of a module or by adding or removing a class file
            from a module package.
            
            
            Removing shared packages is ok. Adding shared packages is silly, complicates
            and slows down module system and startup of the application. Do not do that!
            If you are removing a shared package please update 
            ${check.shared.packages.golden}
            and run the test once again. 
            
            Read more about the Verification Framework:
            http://openide.netbeans.org/proposals/arch/clusters.html#verify
            
            Look at for information about reviews:
            http://openide.netbeans.org/tutorial/review-steps.html
            
            Check the page about APIs:
            http://openide.netbeans.org/tutorial/api-design.html#api
        </fail>
    </target>
    
    <target name="check-external-libraries" depends="generate-golden-files" >
        <property name="check.external.libraries.golden" location="${golden.files.dir}/external-libraries.txt" />
        <property name="check.external.libraries.template" location="${template.files.dir}/external-libraries.txt" />
        <property name="check.external.libraries.generated" location="${generated.files.dir}/external-libraries.txt" />
        
        <condition property="check-external-libraries-are-they-the-same" >
            <filesmatch file1="${check.external.libraries.template}" file2="${check.external.libraries.generated}" />
        </condition>
        
        
        <exec os="Linux SunOS Solaris Mac OS X" dir="." executable="diff" failonerror="no" timeout="60000" >
            <arg value="-U"/>
            <arg value="15"/>
            <arg value="${check.external.libraries.template}" />
            <arg value="${check.external.libraries.generated}" />
        </exec>
        
        <fail unless="check-external-libraries-are-they-the-same" >!
            *** List of external libraries has changed! ***
            
            Differences were found while comparing file 
            ${check.external.libraries.template}
            with 
            ${check.external.libraries.generated}
            
            This means that the set of external libraries (JARs that are not NetBeans
            modules or does not have NetBeans-Own-Library: true in manifest) has 
            changed since the previously known one. Some libraries may have been added, 
            some of them may have been removed, they MD5 checksum or size has been changed.
            
            Changing the external libraries is ok, but requires legal approval everytime
            new version of a library is put into the product. If you have the approval
            want to change the list of external libraries, then please
            update the golden file at 
            ${check.external.libraries.golden}
            and run the test once again. 
            
            Read more about the Verification Framework:
            http://openide.netbeans.org/proposals/arch/clusters.html#verify
            
            Look at for information about reviews:
            http://openide.netbeans.org/tutorial/review-steps.html
            
            Check the page about APIs:
            http://openide.netbeans.org/tutorial/api-design.html#api
        </fail>
    </target>
    
    <target name="check-modules" depends="generate-golden-files" >
        <property name="check.modules.golden" location="${golden.files.dir}/modules.txt" />
        <property name="check.modules.template" location="${template.files.dir}/modules.txt" />
        <property name="check.modules.generated" location="${generated.files.dir}/modules.txt" />
        
        <condition property="check-modules-are-they-the-same" >
            <filesmatch file1="${check.modules.template}" file2="${check.modules.generated}" />
        </condition>
        
        
        <exec os="Linux SunOS Solaris Mac OS X" dir="." executable="diff" failonerror="no" timeout="60000" >
            <arg value="-U"/>
            <arg value="15"/>
            <arg value="${check.modules.template}" />
            <arg value="${check.modules.generated}" />
        </exec>
        
        <fail unless="check-modules-are-they-the-same" >!
            *** List of modules has changed! ***
            
            Differences were found while comparing file 
            ${check.modules.template}
            with 
            ${check.modules.generated}
            
            This means that the set of modules changed since the previously known one.
            Adding or removing a module significatly affects the set of APIs the
            product offers and as such is subject to review. If you passed
            your review and want to change the list of modules, then please
            update the golden file at 
            ${check.modules.golden}
            and run the test once again. 
            
            Read more about the Verification Framework:
            http://openide.netbeans.org/proposals/arch/clusters.html#verify
            
            Look at for information about reviews:
            http://openide.netbeans.org/tutorial/review-steps.html
            
            Check the page about APIs:
            http://openide.netbeans.org/tutorial/api-design.html#api
        </fail>
    </target>
    
    <target name="check-dependencies" depends="generate-golden-files" >
        <antcall target="check-dependencies-subroutine" >
            <param name="check.dependencies.golden" location="${golden.files.dir}/deps.txt" />
            <param name="check.dependencies.template" location="${template.files.dir}/deps.txt" />
            <param name="check.dependencies.generated" location="${generated.files.dir}/deps.txt" />
        </antcall>
    </target>
    
    <target name="check-implementation-dependencies" depends="generate-golden-files" >
        <antcall target="check-dependencies-subroutine" >
            <param name="check.dependencies.golden" location="${golden.files.dir}/impl-deps.txt" />
            <param name="check.dependencies.template" location="${template.files.dir}/impl-deps.txt" />
            <param name="check.dependencies.generated" location="${generated.files.dir}/impl-deps.txt" />
        </antcall>
    </target>
    
    <target name="check-cluster-dependencies" depends="generate-golden-files" >
        <antcall target="check-dependencies-subroutine" >
            <param name="check.dependencies.golden" location="${golden.files.dir}/cluster-deps.txt" />
            <param name="check.dependencies.template" location="${template.files.dir}/cluster-deps.txt" />
            <param name="check.dependencies.generated" location="${generated.files.dir}/cluster-deps.txt" />
        </antcall>
    </target>
    
    <target name="check-cluster-implementation-dependencies" depends="generate-golden-files" >
        <antcall target="check-dependencies-subroutine" >
            <param name="check.dependencies.golden" location="${golden.files.dir}/cluster-impl-deps.txt" />
            <param name="check.dependencies.template" location="${template.files.dir}/cluster-impl-deps.txt" />
            <param name="check.dependencies.generated" location="${generated.files.dir}/cluster-impl-deps.txt" />
        </antcall>
    </target>
    
    <target name="check-dependencies-subroutine" >
        <condition property="check-dependencies-are-they-the-same" >
            <filesmatch file1="${check.dependencies.template}" file2="${check.dependencies.generated}" />
        </condition>
        
        
        <exec os="Linux SunOS Solaris Mac OS X" dir="." executable="diff" failonerror="no" timeout="60000" >
            <arg value="-U"/>
            <arg value="15"/>
            <arg value="${check.dependencies.template}" />
            <arg value="${check.dependencies.generated}" />
        </exec>
        
        <fail unless="check-dependencies-are-they-the-same" >!
            *** List of dependencies has changed! ***
            
            Differences were found while comparing file 
            ${check.dependencies.template}
            with 
            ${check.dependencies.generated}
            
            This means that the set of dependencies changed since the previously known one.
            Adding a dependency can restrict the ways how a final product can be assembled
            and as such it forms an important aspect of API and is subject to review. 
            If you passed your review or you are sure you want to change the 
            list of dependencies, then please update the golden file at 
            ${check.dependencies.golden}
            and run the test once again. 
            
            Read more about the Verification Framework:
            http://openide.netbeans.org/proposals/arch/clusters.html#verify
            
            Look at for information about reviews:
            http://openide.netbeans.org/tutorial/review-steps.html
            
            Check the page about APIs and dependencies being important:
            http://openide.netbeans.org/tutorial/api-design.html#api
        </fail>
    </target>
    
    
    <target name="generate-files-layout" depends="generate-golden-files-init" >
        <property name="generated.files.dir" location="build/generated" />
        <mkdir dir="${generated.files.dir}" />
        
        <property name="check.files.layout.golden" location="${golden.files.dir}/files-layout.txt" />
        <property name="check.files.layout.template" location="${template.files.dir}/files-layout.txt" />
        <property name="check.files.layout.generated" location="${generated.files.dir}/files-layout.txt" />
        
        <property name="check-file-layout-root" location="${netbeans.dest.dir}" />
        <fileset id="check-file-layout" dir="${check-file-layout-root}" casesensitive="yes" >
            <include name="platform*/**" />
            <include name="ide*/**" />
            <include name="enterprise*/**" />
            <include name="nb*/**" />
            <include name="harness*/**" />
        </fileset>
        
        <pathconvert property="check-file-layout" refid="check-file-layout" dirsep="/" pathsep="," >
            <map from="${check-file-layout-root}${file.separator}" to="" />
        </pathconvert>
        <mkdir dir="build/generated" />
        <echo message="${check-file-layout}${line.separator}" file="${check.files.layout.generated}" />
        <replace file="${check.files.layout.generated}" token="," value="${line.separator}" />
        <replace file="${check.files.layout.generated}" token="\" value="/" />
        <condition property="check-files-are-they-the-same" >
            <filesmatch file1="${check.files.layout.template}" file2="${check.files.layout.generated}" />
        </condition>
        
        
    </target>
    
    
    <target name="check-files-layout" depends="generate-files-layout" >
        <exec os="Linux SunOS Solaris Mac OS X" dir="." executable="diff" failonerror="no" timeout="60000" >
            <arg value="-U"/>
            <arg value="15"/>
            <arg value="${check.files.layout.template}" />
            <arg value="${check.files.layout.generated}" />
        </exec>
        
        <fail unless="check-files-are-they-the-same" >!
            *** Layout of files has changed! ***
            
            Differences were found while comparing file ${check.files.layout.generated} with 
            ${check.files.layout.template}
            This means that the layout of files changed since the previously known one.
            Some files may have been added, some of them may have been removed or renamed. 
            
            Changing the layout may or may not be ok. If you are sure that you want to
            change the layout of files, then update the golden file at 
            ${check.files.layout.golden}
            and run the test once again. If you got this warning without intending
            to change the layout of files, think twice whether your commit is really
            correct and consider asking for a review first.
            
            Read more about the Verification Framework:
            http://openide.netbeans.org/proposals/arch/clusters.html#verify
            
            Look at for information about reviews:
            http://openide.netbeans.org/tutorial/review-steps.html
            
            Check the page about APIs and files layout being an API:
            http://openide.netbeans.org/tutorial/api-design.html#api
        </fail>
    </target>
    
    <target name="check-clusters-content" depends="bootstrap,init-tasks"> 
        <taskdef name="checkcontent" classname="org.netbeans.nbbuild.CheckClustersContent" classpath="nbantext.jar"/>
        <checkcontent clusters="${nb.clusters.list}" trackingPath="${netbeans.dest.dir}" kitDestDir="${netbeans.dest.dir}">
            <exclude name="extra/**"/>
            <exclude name="testtools/**"/>
            <exclude name="bin/**"/>
            <exclude name="README.html"/>
            <exclude name="CREDITS.html"/>
            <exclude name="LICENSE.txt"/>
            <exclude name="DISTRIBUTION.txt"/>
            <exclude name="THIRDPARTYLICENSE.txt"/>
            <exclude name="nb.cluster.*"/>
            <exclude name="etc/netbeans.conf"/>
            <exclude name="build_info"/>
            <exclude name="module_tracking.xml"/>
            <exclude name="moduleCluster.properties"/>
            <exclude name="netbeans.css"/>
        </checkcontent>
    </target>
    
    <target name="check-module-configs" depends="bootstrap" description="Sanity-check build.properties and cluster.properties.">
        <taskdef name="checkmoduleconfigs" classname="org.netbeans.nbbuild.CheckModuleConfigs" classpath="nbantext.jar"/>
        <checkmoduleconfigs nbroot=".."/>
    </target>
    
    <target name="display-l10n-list-matches" description="Show which files are actually matched by an l10n.list in some module.">
        <property name="nbroot" location=".."/>
        <input addproperty="module">Select a top-level module (e.g. "java") to display results for:</input>
        <property name="listfile" location="${nbroot}/${module}/l10n.list"/>
        <echo>${listfile}:1: Matches follow... (click on hyperlinks from IDE!)</echo>
        <echo>(warning: 'exclude' directives not honored here yet)</echo><!-- XXX use filtersets or something to fix -->
        <apply parallel="false" executable="sh">
            <arg value="-c"/>
            <arg value="echo $0:1"/>
            <fileset dir="${nbroot}" includesfile="${listfile}"/>
        </apply>
    </target>
    
    <target name="increment-spec-versions" depends="bootstrap,init-module-list" description="Increment all standard module specification versions. Pass -Dbranch=true if not on the trunk.">
        <property name="branch" value="false"/>
        <taskdef name="incrspecvers" classname="org.netbeans.nbbuild.IncrementSpecificationVersions" classpath="nbantext.jar"/>
        <incrspecvers nbroot=".." modules="${allmodules}" branch="${branch}"/>
    </target>
    
</project>




<?xml version="1.0" encoding="UTF-8"?>
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.

Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.


The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
Development and Distribution License("CDDL") (collectively, the
"License"). You may not use this file except in compliance with the
License. You can obtain a copy of the License at
http://www.netbeans.org/cddl-gplv2.html
or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License.  When distributing the software, include this License Header
Notice in each file and include the License file at
nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
particular file as subject to the "Classpath" exception as provided
by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"

Contributor(s):

The Original Software is NetBeans. The Initial Developer of the Original
Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
Microsystems, Inc. All Rights Reserved.

If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
under the [CDDL or GPL Version 2] license." If you do not indicate a
single choice of license, a recipient has the option to distribute
your version of this file under either the CDDL, the GPL Version 2 or
to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-->
  <project name="nbbuild" default="all" basedir=".">

<import file="default.xml"/>

  <!-- To make people happy who want to do `ant clean all': -->
<target name="all" depends="build,commit-validation" description="Build the IDE and run basic validation tests."/>

  <target name="all-nozip" depends="build-nozip,commit-validation" description="Build the IDE (no ZIP file, unpacked) and run basic validation tests."/>

  <target name="assure-ant">
<condition property="ant.version.is.good">
          <!-- this is in 1.6.3 only -->
          <!-- actually needed for 'executable' attr on <javadoc>, at least -->
          <available classname="org.apache.tools.ant.types.mappers.FilterMapper"/>
</condition>
  <fail unless="ant.version.is.good">
        You need to have ant 1.6.3 at least to build NetBeans.
                       </fail>
    </target>
  
  <target name="bootstrap"
          description="Bootstrap NetBeans-specific Ant extensions."
          depends="-jdk-init,-assure-jdk-1.4,assure-ant">
   <echo message="Bootstrapping NetBeans-specific Ant extensions..."
/>
    <property name="ant.jar" value="${ant.home}/lib/ant.jar"/>
    <path id="bootstrap-cp">
     <pathelement location="${ant.jar}"/>
 <fileset dir="..">
        <!-- For JavaHelp indexing: -->
        <include name="nbbuild/external/jhall*.jar"/>
             </fileset>
  </path>
    <!-- Sanity check: -->
    <pathconvert pathsep=":" property="class.files.in.antsrc">
        <path>
            <fileset dir="antsrc">
                <include name="**/*.class"/>
            </fileset>
        </path>
    </pathconvert>
    <fail>
        <condition>
            <not>
                <equals arg1="${class.files.in.antsrc}" arg2=""/>
            </not>
        </condition>
        You have stray *.class files in ${basedir}/antsrc which you must remove.
        Probably you failed to clean your sources before updating them from CVS.
    </fail>
    <!-- OK, continue: -->
    <mkdir dir="build/antclasses"/>
    <javac srcdir="antsrc" destdir="build/antclasses" deprecation="true" debug="${build.compiler.debug}" source="1.4">
      <classpath refid="bootstrap-cp"/>
    </javac>
    <jar jarfile="nbantext.jar">
      <fileset dir="build/antclasses"/>
      <fileset dir="antsrc">
        <exclude name="**/*.java"/>
        <exclude name="**/package.html"/>
        <exclude name="package-list"/>
      </fileset>
    </jar>
  </target>

  <target name="init-module-list" depends="bootstrap">
    <!-- Define modules. -->
    <resolve name="modules" value="config.modules.${moduleconfig}"/>
    <resolve name="fixedmodules" value="config.fixedmodules.${moduleconfig}"/>
    <property name="allmodules" value="${fixedmodules},${modules}"/>
  </target>

  <target name="set-buildnumber" unless="buildnumber">
    <tstamp>
    	<format property="buildnumber" pattern="yyMMdd"/>
    </tstamp>
    <tstamp>
    	<format property="buildday" pattern="d MMM yyyy" locale="en" />
    </tstamp>
  </target>

  <target name="init" depends="init-module-list,set-buildnumber,init-tasks">
    <taskdef name="cleanall" classname="org.netbeans.nbbuild.CleanAll" classpath="nbantext.jar"/>
    <taskdef name="nbmerge" classname="org.netbeans.nbbuild.NbMerge" classpath="nbantext.jar"/>
    <taskdef name="for-each" classname="org.netbeans.nbbuild.ForEach" classpath="nbantext.jar"/>
    <taskdef name="getdependsclusters" classname="org.netbeans.nbbuild.GetDependsClusters" classpath="nbantext.jar"/>
    <taskdef name="repeat" classname="org.netbeans.nbbuild.Repeat" classpath="nbantext.jar"/>

    <!-- We need absolute path to ${netbeans.dest} -->
    <property name="netbeans.dest.abs" location="${netbeans.dest}"/>
    <!-- Overridable. Note: need not necessarily be a number at all): -->
    <property name="buildnum" value="dev-${buildnumber}"/>
    <property name="sanitystart.args" value="-J-Dnetbeans.close=true ${sanitystart.args.additional}"/>

    <!-- Set up automatic all-* targets: -->
    <taskdef name="insert-module-all-targets" classname="org.netbeans.nbbuild.InsertModuleAllTargets" classpath="nbantext.jar"/>
    <insert-module-all-targets/>
  </target>
  
  <target name="all-java/storagebuilder" depends="init">
    <antcall target="build-one-cluster-dependencies" inheritall="false">
      <param name="one.cluster.dependencies" value="nb.cluster.platform,nb.cluster.ide"/>
      <param name="one.cluster.name" value="this-cluster"/>
    </antcall>
    <echo message="Building java/storagebuilder library..."/>
    <ant dir="../java/storagebuilder" target="jar"/>
  </target>

  <target name="all-ide/branding" depends="init">
    <echo message="Building module ide/branding..."/>
    <getdependsclusters name="dependsClusters" list="${nb.clusters.list}"/>
    <antcall target="build-one-cluster-dependencies" inheritAll="false">
      <param name="one.cluster.dependencies" value="${dependsClusters}"/>
      <param name="one.cluster.name" value="this-cluster"/>
    </antcall>
    <ant dir="../ide/branding" target="netbeans"/>
  </target>

  <target name="all-installer" description="Dummy target for build system compatibility"/>

  <target name="all-tomcatint/tomcat5/bundled" depends="init">
    <getdependsclusters name="dependsClusters" list="${nb.clusters.list}"/>
    <antcall target="build-one-cluster-dependencies" inheritAll="false">
      <param name="one.cluster.dependencies" value="${dependsClusters}"/>
      <param name="one.cluster.name" value="this-cluster"/>
    </antcall>
    <!-- XXX this and xtest are clumsy: <antcall target="all-monitor"/> will not work since the subproject used by antcall does *not* have the synthetic targets! -->
    <ant dir="../monitor"/>
    <echo message="Building module tomcatint/tomcat5/bundled..."/>
    <ant dir="../tomcatint/tomcat5/bundled" target="netbeans"/>
  </target>

  <target name="all-translatedfiles" depends="init">
    <echo message="Building module translatedfiles..."/>
    <getdependsclusters name="dependsClusters" list="${nb.clusters.list}"/>
              <antcall target="build-one-cluster-dependencies" inheritAll="false">
      <param
 name="one.cluster.dependencies" 
value="${dependsClusters}"/>
      <param name="one.cluster.name" value="this-cluster"/>
    </antcall>
    <ant dir="../translatedfiles" target="netbeans"/>
  </target>

  <target name="all-xtest" depends="init">
    <getdependsclusters name="dependsClusters" list="${clusters.list}"/>
    <antcall target="build-one-cluster-dependencies" inheritAll="false">
      <param name="one.cluster.dependencies" value="${dependsClusters}"/>
      <param name="one.cluster.name" value="this-cluster"/>
    </antcall>
    <ant dir="../xtest/nbjunit"/>
    <echo message="Building module xtest..."/>
    <ant dir="../xtest" antfile="build.xml" target="netbeans"/>
  </target>
  
  <!-- this is project is not a netbeans module project, so we do a no-op
       here.  The code in appsrvbridge gets built by XXX -->
  <target name="all-serverplugins/sun/appsrvbridge" depends="init">
    <echo message="Building module serverplugins/sun/appsrvbridge... NO-OP"/>
  </target>

  <!-- build NBMs for selected modules -->
  <target name="build-nbms" depends="init">
      <!-- It's good idea to call merge target before this one.
           NbMerge.java can set property "modules" to the list of realy
           built modules (excluding fixedmodules which must build everytime). -->
      <mkdir dir="nbms" />
      <property name="nbm.target.dir" location="nbms" />
      <for-each startdir=".." target="nbm" locations="${allmodules}"/>
  </target>
  <target name="nbm"/><!-- dummy target -->
  
  <property name="jnlp.signjar.keystore" location="build/default.keystore" />
  <available property="jnlp.signjar.keystore.exists" file="${jnlp.signjar.keystore}" />
  <target name="jnlp-generate-keystore" depends="init" unless="jnlp.signjar.keystore.exists" >
    <property name="jnlp.signjar.alias" value="jnlp" />
    <property name="jnlp.signjar.password" value="netbeans" />
    <property name="jnlp.signjar.vendor" value="CN=NetBeans, OU=NetBeans, O=netbeans.org, C=US" />
    
    <mkdir dir="${jnlp.signjar.keystore}/../" />
    <echo message="Going to create default keystore in ${jnlp.signjar.keystore}" />
    <genkey 
        alias="${jnlp.signjar.alias}"
        keystore="${jnlp.signjar.keystore}"
        storepass="${jnlp.signjar.password}"
        dname="${jnlp.signjar.vendor}"
    />
  </target>

  <target name="build-jnlp" depends="init,jnlp-generate-keystore">
      <fail message="Property jnlp.codebase must be set to final location of your JNLP files!" unless="jnlp.codebase" />
      <property name="jnlp.dest.dir" location="build/jnlp" />
      <mkdir dir="${jnlp.dest.dir}" />
      <for-each startdir=".." target="jnlp" locations="${config.modules.jnlp}"/>
  </target>
  
  <target name="set-config-to-javadoc" >
      <property name="moduleconfig" value="javadoc" />
  </target>

  <!-- build javadoc for selected modules -->
  <target name="build-javadoc" depends="set-config-to-javadoc,init" description="Builds Javadoc documentation for modules; on branches pass e.g. -Djavadoc.web.root=http://www.netbeans.org/download/release35/javadoc">
      <ant dir="." target="merge">
          <property name="modules" value="${modules}"/>
          <property name="fixedmodules" value="${fixedmodules}"/>
          <property name="merge.dependent.modules" value="true"/>
          <property name="stop.when.broken.module" value="false"/>
      </ant>
      
      <mkdir dir="build/ModulesExportedInterfaces" />
      <property name="export.interfaces" location="build/ModulesExportedInterfaces" />

      <mkdir dir="build/APIChanges" />
      <property name="export.apichanges" location="build/APIChanges" />
            
      <!-- build javadoc for supported APIs -->
      <for-each startdir=".." target="javadoc" locations="${fixedmodules}"/>
      <!-- build javadoc for unsupported APIs -->
      <for-each startdir=".." target="javadoc" locations="${modules}"/>
      
      <antcall inheritall="true" inheritrefs="true" target="javadoc-generate-xml" />
      <antcall inheritall="true" inheritrefs="true" target="javadoc-generate-html" />
      <antcall inheritall="true" inheritrefs="true" target="javadoc-check-broken-links" />
  </target>  
      
  <target name="javadoc-generate-xml" depends="set-config-to-javadoc,init" >
      <echo file="build/APIChanges/header.gen" >&lt;?xml version="1.0" encoding="UTF-8"?&gt;
&lt;changes&gt;
</echo>
      
      <echo file="build/APIChanges/footer.gen" >
        &lt;/changes&gt;
      </echo>
      
      <concat destfile="${netbeans.javadoc.dir}/apichanges.xml" >
          <fileset dir="build/APIChanges" includes="header.gen" />
          <fileset dir="build/APIChanges" includes="*" excludes="*.gen" />
          <fileset dir="build/APIChanges" includes="footer.gen" />
      </concat>

      
      <echo file="build/ModulesExportedInterfaces/header.gen" >&lt;?xml version="1.0" encoding="UTF-8"?&gt;
&lt;apis&gt;
</echo>
      
      <echo file="build/ModulesExportedInterfaces/footer.gen" >
        &lt;/apis&gt;
      </echo>
      
      <concat destfile="${netbeans.javadoc.dir}/modules.xml" >
          <fileset dir="build/ModulesExportedInterfaces" includes="header.gen" />
          <fileset dir="build/ModulesExportedInterfaces" includes="*" excludes="*.gen" />
          <fileset dir="build/ModulesExportedInterfaces" includes="footer.gen" />
      </concat>
      
    <taskdef 
        name="javadoc-index" 
        classpath="nbantext.jar" 
        classname="org.netbeans.nbbuild.JavadocIndex"
    />

        
    <javadoc-index target="${netbeans.javadoc.dir}/allclasses.xml" > 
        <packageslist dir="${netbeans.javadoc.dir}" >
            <include name="**/allclasses-noframe.html" />
        </packageslist>
    </javadoc-index>
  </target>
  
  
  <target name="javadoc-generate-html" depends="set-config-to-javadoc,init" >            
      <tstamp>
        <format property="modules-javadoc-date" pattern="d MMM yyyy" locale="en" />
      </tstamp>
      
      <style 
        in="${netbeans.javadoc.dir}/modules.xml" 
        out="${netbeans.javadoc.dir}/usecases.html" 
        style="javadoctools/export2usecases.xsl"
      >
        <param name="date" expression="${modules-javadoc-date}"/>
      </style>
      
      <style 
        in="${netbeans.javadoc.dir}/apichanges.xml" 
        out="${netbeans.javadoc.dir}/apichanges.html" 
        style="javadoctools/export2apichanges.xsl"
      >
        <param name="date" expression="${modules-javadoc-date}"/>
        <param name="changes-since-year" expression="${previous.release.year}"/>
        <param name="changes-since-day" expression="${previous.release.day}"/>
        <param name="changes-since-month" expression="${previous.release.month}"/>
        <param name="include-introduction" expression="true" />
      </style>
      
    <copy file="javadoctools/netbeans.css" tofile="${netbeans.javadoc.dir}/netbeans.css" />
    <condition property="javadoc.style.sheet.exists" >
        <available file="${netbeans.javadoc.dir}/org-openide-util/javadoc.css" />
    </condition>
    
    <fail unless="javadoc.style.sheet.exists" >
    The org-openide-util/javadoc.css has to exist as we are refering to
    it from to master module javadoc pages. If it does not anymore, update
    the javadoctools/export*.xsl templates.
    </fail>

      <style 
        in="${netbeans.javadoc.dir}/allclasses.xml" 
        out="${netbeans.javadoc.dir}/allclasses-frame.html" 
        style="javadoctools/export2allclasses.xsl"
      >
      </style>
      
      <style 
        in="${netbeans.javadoc.dir}/modules.xml" 
        out="${netbeans.javadoc.dir}/overview-frame.html" 
        style="javadoctools/export2allmodules.xsl"
      >
        <param name="date" expression="${modules-javadoc-date}"/>
      </style>
      
      <style 
        in="${netbeans.javadoc.dir}/modules.xml" 
        out="${netbeans.javadoc.dir}/layers.html" 
        style="javadoctools/export2layer.xsl"
      >
        <param name="date" expression="${modules-javadoc-date}"/>
      </style>
      
      <style 
        in="${netbeans.javadoc.dir}/modules.xml" 
        out="${netbeans.javadoc.dir}/overview-summary.html" 
        style="javadoctools/export2html.xsl"
      >
        <param name="date" expression="${modules-javadoc-date}"/>
      </style>
      
      
    <!-- at the end geneate the index.html so people know where to start -->      
    <echo file="${netbeans.javadoc.dir}/index.html" ><![CDATA[
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
<HTML><HEAD><TITLE>NetBeans API Index</TITLE>
</HEAD>
<FRAMESET cols="20%,80%" title="" onLoad="top.loadFrames()">
<FRAMESET rows="30%,70%" title="" onLoad="top.loadFrames()">
<FRAME src="overview-frame.html" name="packageListFrame" title="All Modules">
<FRAME src="allclasses-frame.html" name="packageFrame" title="All classes">
</FRAMESET>
<FRAME src="overview-summary.html" name="classFrame" title="Module, package, class and interface descriptions" scrolling="yes">
<NOFRAMES>
<H2>Frame Alert</H2>
<P>
This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client.
Link to<A HREF="overview-summary.html">Non-frame version.</A>
</NOFRAMES>
</FRAMESET>
</HTML>
]]></echo>

        <replace dir="${netbeans.javadoc.dir}">
            <include name="*.html"/>
            <replacefilter token="@JDK@" value="http://java.sun.com/j2se/1.4.2/docs/api"/>
            <replacefilter token="http://root/" value="." />
            <replacefilter token="$${javadoc.web.root}" value="." />
        </replace>
    
    <echo message="Javadoc index has been generated to ${netbeans.javadoc.dir}/index.html" />
  </target>
  
  
  <target name="javadoc-check-broken-links" depends="init" unless="javadoc.skip.brokenlinks.check" >
        <taskdef name="checklinks" classname="org.netbeans.nbbuild.CheckLinks">
            <classpath>
                <pathelement location="nbantext.jar"/>
            </classpath>
        </taskdef>
        <checklinks basedir="${netbeans.javadoc.dir}" checkexternal="${javadoc.check.external.links}" checkspaces="false" failonerror="true" >
            <include name="*/overview-summary.html"/>
            <include name="*/apichanges.html"/>
            <include name="*/architecture-summary.html"/>
            <include name="*/**/package-summary.html"/>
            <include name="*/**/doc-files/**/*.html"/>
            <include name="*.html" />
        </checklinks>
  </target>

  <target name="build-messaging" depends="init">
    <echo message="Starting a build for NetBeans (build ${buildnum}, config '${moduleconfig}') ..."/>
    <echo message="Selected modules: ${modules}"/>
    <echo message="OS: ${os.name} ${os.version}  Locale: ${user.language}_${user.region}"/>
    <echo message="Java: ${nbjdk.home}"/>
  </target>
  
  <!-- Use of nbmerge target has the effect of automatically depending on all-X for every module. -->
  <!-- It also runs deltree(dir=wherever) and copydir(src=../X/netbeans,dest=wherever) to create the IDE install. -->

  <target name="build-nozip" depends="clean-cluster-flags,build-clusters" description="Build the IDE but do not create a final ZIP file.">
    <loadproperties srcFile="${clusters.list.file}" />
     
    <loadproperties srcfile="${netbeans.dest.dir}/moduleCluster.properties" />
        
    <mkdir dir="${netbeans.dest.dir}/bin" />
    <copy file="../ide/launcher/unix/netbeans" todir="${netbeans.dest.dir}/bin" />
    <chmod file="${netbeans.dest.dir}/bin/netbeans" perm="ugo+rx"/>
    <copy file="../ide/launcher/windows/netbeans.exe" todir="${netbeans.dest.dir}/bin" />
    <copy file="../ide/launcher/windows/nb.exe" todir="${netbeans.dest.dir}/bin" />
    <copy file="../ide/launcher/os2/netbeans.cmd" todir="${netbeans.dest.dir}/bin" />
    <!-- if anybody knows better place for icons, let me know: jtulach@netbeans.org -->
    <copy file="../ide/launcher/os2/nbos2icons.zip" todir="${netbeans.dest.dir}/${nb.cluster.nb.dir}/" />

    <mkdir dir="${netbeans.dest.dir}/etc" />
    <copy file="../ide/launcher/netbeans.conf" todir="${netbeans.dest.dir}/etc" />

    <echo message="${netbeans.dest.dir}/${nb.cluster.platform.dir}/lib/nbexec" />
    <fixcrlf eol="lf" srcdir="${netbeans.dest.dir}" >
      <include name="etc/netbeans.conf" />
      <include name="bin/netbeans" />      
      <include name="${nb.cluster.platform.dir}/lib/nbexec" />      
    </fixcrlf>
    <fixcrlf eol="crlf" srcdir="${netbeans.dest.dir}" >
      <include name="bin/netbeans.cmd" />      
      <include name="${nb.cluster.platform.dir}/lib/nbexec.cmd" />      
    </fixcrlf>

    <echo file="${netbeans.dest.dir}/build_info">NetBeans dev build
------------------
Number:   ${buildnumber}
Date:     ${buildday}
Branding:
Branch:   trunk
Tag:
    </echo>
  </target>

  <target name="build" depends="build-nozip"
          description="Create a complete build including a ZIP distribution (but do not try it).">
    <delete file="NetBeans-${buildnum}.zip"/>
    <delete file="NetBeans-${buildnum}-build-extra-data.zip"/>

    <property name="nb-extra-files" value="*.built,test/**,extra/**"/>

    <!-- package the zip file -->
    <zip destfile="NetBeans-${buildnum}.zip" update="true" duplicate="preserve">
      <zipfileset file="${netbeans.dest.dir}/bin/netbeans" filemode="755" prefix="${netbeans.dest}/bin"/>
      <zipfileset file="${netbeans.dest.dir}/${nb.cluster.platform.dir}/lib/nbexec" filemode="755" prefix="${netbeans.dest}/${nb.cluster.platform.dir}/lib"/>
      <zipfileset dir="${netbeans.dest.dir}/${nb.cluster.ide.dir}/ant/bin" filemode="755" prefix="${netbeans.dest}/${nb.cluster.ide.dir}/ant/bin">
        <exclude name="*.bat"/>
        <exclude name="*.cmd"/>
      </zipfileset>
      <zipfileset dir="${netbeans.dest.dir}" filemode="755" prefix="${netbeans.dest}">
        <include name="**/*.sh"/>
      </zipfileset>
      <zipfileset dir="${netbeans.dest.dir}" prefix="${netbeans.dest}" excludes="${nb-extra-files}">
        <!-- XXX exclude the temporary cluster for parts of openide -->
        <exclude name="tmp" />
        <exclude name="tmp/**/*" />
      </zipfileset>
    </zip>
    
    <!-- package the zip file with extra files not to be included in regular product package-->
    <!--
    <zip destfile="NetBeans-${buildnum}-build-extra-data.zip" update="true" duplicate="preserve">
        <zipfileset dir="${netbeans.dest.dir}" prefix="${netbeans.dest}" includes="${nb-extra-files}"/>
    </zip>
    -->

    <echo>Build created; see NetBeans-${buildnum}.zip (in nbbuild/).
If you like, you may run the IDE straight from
the ${netbeans.dest}/bin/ directory.
(For example, type: ant tryme)
    </echo>
  </target>

  <target name="delete-and-merge" depends="merge-delete,merge" />   

  <target name="merge-delete" depends="init">
    <delete dir="${netbeans.dest}" />
  </target>
  
  <target name="merge" depends="build-messaging">
    <mkdir dir="${netbeans.dest.dir}"/>
    <nbmerge failonerror="${stop.when.broken.modules}" 
             dest="${netbeans.dest}" 
             topdir=".." 
             fixedmodules="${fixedmodules}" 
             modules="${modules}"
             builtmodulesproperty="${built.modules.property}" 
             targetprefix="all-" 
             mergedependentmodules="${merge.dependent.modules}" >
    </nbmerge>
    <chmod perm="ugo+x">
      <fileset dir="${netbeans.dest.dir}">
        <include name="bin/netbeans"/>
        <include name="bin/**/*.pl"/>
        <include name="jakarta-tomcat-*/bin/*.sh"/>
      </fileset>
    </chmod>
  </target>

  <target name="build-platform" depends="init">
    <run-depend-build clusters-to-build="nb.cluster.platform,nb.cluster.harness"/>
  </target>
  
  <target name="build-cluster" depends="init">
    <run-depend-build clusters-to-build="${cluster-name}"/>
  </target>

  <macrodef name="resolve">
    <attribute name="name"/>
    <attribute name="value"/>
    <sequential>
      <property name="@{name}" value="${@{value}}"/>
    </sequential>
  </macrodef>

  <macrodef name="run-depend-build">
    <attribute name="clusters-to-build"/>
    <sequential>
      <echo>Repeat @{clusters-to-build}</echo>
      <repeat target="build-one-cluster" name="one.cluster.name" values="@{clusters-to-build}" /> 
    </sequential>
  </macrodef>

  <target name="build-clusters" depends="init">
     <run-depend-build clusters-to-build="${nb.clusters.list}"/> 
  </target>

  <target name="build-one-cluster-dependencies-check">
    <condition property="${one.cluster.name}-hasNoDependencies">
      <equals arg1="${one.cluster.dependencies}" arg2="" trim="true"/>
    </condition>
    <echo>Dependency prop :${one.cluster.name}-hasNoDependencies:</echo>
    <echo>Cluster dep :${one.cluster.dependencies}:</echo>
    <resolve name="test.prop" value="${one.cluster.name}-hasNoDependencies"/>
    <echo>Cluster dep prp:${test.prop}:</echo>
  </target>

  <target name="build-one-cluster-dependencies" 
          depends="build-one-cluster-dependencies-check"
          unless="${one.cluster.name}-hasNoDependencies">
    <run-depend-build clusters-to-build="${one.cluster.dependencies}"/> 
  </target>

  <target name="build-one-cluster-check">
    <condition property="${one.cluster.name}-is-built">
      <available file="${netbeans.dest.dir}/${one.cluster.name}.built"/>
    </condition>
    <resolve name="test1.prop" value="${one.cluster.name}-is-built"/>
    <echo>Cluster ${one.cluster.name} is :${test1.prop}:</echo>
  </target>

  <target name="build-one-cluster" unless="${one.cluster.name}-is-built" depends="build-one-cluster-check">
    <echo message="Building ${one.cluster.name} modules"/>
    <resolve name="one-cluster-modules" value="${one.cluster.name}"/>
    <resolve name="one-cluster-dependencies" value="${one.cluster.name}.depends"/>
    <echo>${one-cluster-modules}</echo>
    <echo>Dependencies: ${one-cluster-dependencies}</echo>
    <insert-module-all-targets/> <!-- we are in a subproject, so need to reinsert the targets... XXX <antcall> and thus <repeat> apparently reparses the Ant script from disk! -->
    <antcall target="build-one-cluster-dependencies" inheritAll="false">
      <param name="one.cluster.dependencies" value="${one-cluster-dependencies}"/>
      <param name="one.cluster.name" value="${one.cluster.name}"/>
    </antcall>
    <mkdir dir="${netbeans.dest.dir}"/>
    <nbmerge failonerror="${stop.when.broken.modules}" 
             dest="${netbeans.dest.dir}" 
             topdir="${nb_all}" 
             fixedmodules="${one-cluster-modules}"
             builtmodulesproperty="${built.modules.property}" 
             targetprefix="all-" 
             mergedependentmodules="false">
    </nbmerge>
    <touch file="${netbeans.dest.dir}/${one.cluster.name}.built"/>
  </target>

  <target name="zipclusters" depends="init">
    <mkdir dir="${netbeans.build.dir}/zips"/>
    <repeat target="zip-one-cluster" name="one.cluster.name" values="${clusters.list}" /> 

    <!-- package the misc files -->
    <zip destfile="${netbeans.build.dir}/zips/${clusters.prefix}-misc-${buildnum}.zip" update="true" duplicate="preserve">
      <zipfileset dir="${netbeans.dest.dir}" filemode="755">
         <include name="bin/netbeans"/>
      </zipfileset>
      <zipfileset dir="${netbeans.dest.dir}">
        <include name="bin/**"/>
        <include name="etc/**/"/>
      </zipfileset>
    </zip>
  </target>

  <target name="zip-one-cluster">
    <taskdef name="setclusterpatternset" classname="org.netbeans.nbbuild.SetClusterPatternSet" classpath="nbantext.jar"/>
    <taskdef name="setcluster" classname="org.netbeans.nbbuild.SetCluster" classpath="nbantext.jar"/>
    <loadproperties srcFile="${clusters.list.file}" />
    <loadproperties srcFile="cluster-description.properties" />
    <setcluster cluster="${one.cluster.name}" name="one.cluster.dir" />
    
    <setclusterpatternset cluster="${one.cluster.name}" name="${one.cluster.name}.files" trackingpath="${netbeans.dest.dir}" clusterdir="${one.cluster.dir}"/>
    
    <resolve name="zipcluster.file" value="${one.cluster.name}.pkg.filename"/>
    <zip destfile="${netbeans.build.dir}/zips/${clusters.prefix}-${zipcluster.file}-${buildnum}.zip" update="true" duplicate="preserve">
      <zipfileset dir="${netbeans.dest.dir}" filemode="755">
        <include name="${one.cluster.dir}/lib/nbexec"/>
      </zipfileset>
      <zipfileset dir="${netbeans.dest.dir}" filemode="755">
        <include name="${one.cluster.dir}/ant/bin/*"/>
        <exclude name="${one.cluster.dir}/ant/bin/*.bat"/>
        <exclude name="${one.cluster.dir}/ant/bin/*.cmd"/>
      </zipfileset>
      <zipfileset dir="${netbeans.dest.dir}">
        <patternset refID="${one.cluster.name}.files"/>
      </zipfileset>
    </zip>
  </target>

  <target name="create-rpms-proto">
    <mkdir dir="${netbeans.build.dir}/rpms"/>
    <repeat target="create-one-rpm-proto" name="one.cluster.name" values="${clusters.list}" /> 
  </target>
    
  <target name="create-one-rpm-proto">
    <taskdef name="setcluster" classname="org.netbeans.nbbuild.SetCluster" classpath="nbantext.jar"/>
    <loadproperties srcFile="cluster.properties" />
    <loadproperties srcFile="cluster-description.properties" />
    <setcluster cluster="${one.cluster.name}" name="one.cluster.dir" />
    <mkdir dir="${netbeans.build.dir}/rpms"/>
    
    <resolve name="pkg.name" value="${one.cluster.name}.pkg.name"/>
    <resolve name="pkg.version" value="${one.cluster.name}.pkg.version"/>
    <resolve name="pkg.desc" value="${one.cluster.name}.pkg.desc"/>
    <resolve name="pkg.vendor" value="${one.cluster.name}.pkg.vendor"/>
    <resolve name="pkg.email" value="${one.cluster.name}.pkg.email"/>
    <resolve name="pkg.rpm.name" value="${one.cluster.name}.pkg.rpm.name"/>
    <resolve name="pkg.rpm.requires" value="${one.cluster.name}.pkg.rpm.requires"/>
    <resolve name="pkg.rpm.group" value="${one.cluster.name}.pkg.rpm.group"/>
    <resolve name="pkg.rpm.url" value="${one.cluster.name}.pkg.rpm.url"/>
    <resolve name="pkg.rpm.copyright" value="${one.cluster.name}.pkg.rpm.copyright"/>
    <resolve name="pkg.rpm.map" value="${one.cluster.name}.pkg.rpm.map"/>
    <resolve name="pkg.rpm.prefix" value="${one.cluster.name}.pkg.rpm.prefix"/>
    
    <echo file="${netbeans.build.dir}/rpms/${pkg.rpm.name}.spec">
%define global_product_version ${pkg.version}
%define global_product_release 00
%define _prefix ${pkg.rpm.prefix}
Version: %{global_product_version}
Release: %{global_product_release}
Group: ${pkg.rpm.group}
Copyright: ${pkg.rpm.copyright}
Vendor: ${pkg.vendor}
URL: ${pkg.rpm.url}
Prefix: %_prefix
AutoReqProv: no
Name: ${pkg.rpm.name}
Summary: ${pkg.name}
%description 
${pkg.desc}

%files

%erpm_map ${pkg.rpm.map} nb_destdir

%dir ${pkg.rpm.map}

${pkg.rpm.map}/${one.cluster.dir}</echo>
  </target>

  <target name="create-svr4s-proto">
    <mkdir dir="${netbeans.build.dir}/rpms"/>
    <repeat target="create-one-svr4-proto" name="one.cluster.name" values="${clusters.list}" /> 
  </target>

  <target name="create-one-svr4-proto">
    <taskdef name="setcluster" classname="org.netbeans.nbbuild.SetCluster" classpath="nbantext.jar"/>
    <loadproperties srcFile="cluster.properties" />
    <loadproperties srcFile="cluster-description.properties" />
    <setcluster cluster="${one.cluster.name}" name="one.cluster.dir" />
    <mkdir dir="${netbeans.build.dir}/svr4s"/>
    
    <resolve name="pkg.name" value="${one.cluster.name}.pkg.name"/>
    <resolve name="pkg.version" value="${one.cluster.name}.pkg.version"/>
    <resolve name="pkg.desc" value="${one.cluster.name}.pkg.desc"/>
    <resolve name="pkg.vendor" value="${one.cluster.name}.pkg.vendor"/>
    <resolve name="pkg.email" value="${one.cluster.name}.pkg.email"/>
    <resolve name="pkg.svr4.pkg" value="${one.cluster.name}.pkg.svr4.pkg"/>
    <resolve name="pkg.svr4.maxinst" value="${one.cluster.name}.pkg.svr4.maxinst"/>
    <resolve name="pkg.svr4.sunw_pkgvers" value="${one.cluster.name}.pkg.svr4.sunw_pkgvers"/>
    <resolve name="pkg.svr4.hotline" value="${one.cluster.name}.pkg.svr4.hotline"/>
    <resolve name="pkg.svr4.classes" value="${one.cluster.name}.pkg.svr4.classes"/>
    <resolve name="pkg.svr4.basedir" value="${one.cluster.name}.pkg.svr4.basedir"/>
    <resolve name="pkg.svr4.pkginst" value="${one.cluster.name}.pkg.svr4.pkginst"/>
    <resolve name="pkg.svr4.category" value="${one.cluster.name}.pkg.svr4.category"/>
<echo file="${netbeans.build.dir}/svr4s/${pkg.svr4.pkg}.spec">
PKG=${pkg.svr4.pkg}
NAME=${pkg.name}
ARCH=sparc
VERSION=${pkg.version}
MAXINST=${pkg.svr4.maxinst}
CATEGORY=${pkg.svr4.category}
SUNW_PKGVERS=${pkg.svr4.sunw_pkgvers}
DESC=${pkg.desc}
VENDOR=${pkg.vendor}
HOTLINE=${pkg.svr4.hotline}
EMAIL=${pkg.email}
CLASSES=${pkg.svr4.classes}
BASEDIR=${pkg.svr4.basedir}
PKGINST=${pkg.svr4.pkginst}</echo>
  </target>
    
  <target name="sanity-check" depends="testuserdir-delete,sanity-start" description="Test whether the build can start up without problems."/>
    <target name="-testuserdir-delete-init" depends="init">
      <property name="test.user.dir.lock" location="${test.user.dir}/lock"/>
      <available property="app.running" file="${test.user.dir.lock}"/>
    </target>
    <target name="-testuserdir-delete-ok" depends="-testuserdir-delete-init" unless="app.running">
      <delete dir="${test.user.dir}"/>
    </target>
    <target name="-testuserdir-delete-fail" depends="-testuserdir-delete-init" if="app.running">
      <!-- #66799: best to warn about this condition... -->
      <fail>Will not delete ${test.user.dir} because ${test.user.dir.lock} still exists; kill any running process and delete lock file if necessary</fail>
    </target>
  <target name="testuserdir-delete" depends="-testuserdir-delete-ok,-testuserdir-delete-fail"/>
  <target name="sanity-start" depends="init,maybe-build-nozip,-jdk-init">
    <mkdir dir="${test.user.dir}"/>
    <echo>Starting the IDE as a sanity check...</echo>
    <echo>WARNING - the sanity-start target is deprecated. Use commit-validation instead.</echo>
    <!-- XXX better would be to scan start log for stacktraces and just show those; -->
    <!-- possibly after filtering for duplicates or something like this. -->
    <!-- Timeout is ten minutes; should be enough for valid start, while preventing -->
    <!-- a deadlock from hanging an automated build: -->
    <exec os="Windows NT Windows 95 Windows 98 Windows 2000 Windows 2003 Windows XP" executable="${netbeans.dest.abs}/bin/nb.exe" failonerror="yes" timeout="600000">
      <arg value="--jdkhome"/>
      <arg file="${nbjdk.home}"/>
      <arg value="--userdir"/>
      <arg file="${test.user.dir}"/>
      <arg line="${sanitystart.args}"/>
    </exec>
    <exec os="Linux SunOS Solaris Mac OS X" dir="." executable="sh" failonerror="yes" timeout="600000">
      <arg value="${netbeans.dest.abs}/bin/netbeans"/>
      <arg value="--jdkhome"/>
      <arg file="${nbjdk.home}"/>
      <arg value="--userdir"/>
      <arg file="${test.user.dir}"/>
      <arg line="${sanitystart.args}"/>
    </exec>
    <echo>Finished starting the IDE, pay attention to any reported errors.</echo>
  </target>

  <target name="check-for-build"  >
    <available property="have-build" file="${netbeans.dest.dir}/bin/netbeans"/>
  </target>
  <target name="maybe-build-nozip" depends="check-for-build" unless="have-build">
    <ant dir="${basedir}" target="build-nozip"/>
  </target>

  <target name="nozip-check" 
          depends="build-nozip,sanity-check">
    <echo>WARNING - the nozip-check target is deprecated. Use all-nozip instead.</echo>
  </target>

  <target name="tryme-setup-debug-args" if="debug.port" >
    <property name="debug.pause" value="n" />
    <property name="debug.server" value="y" />
    
    <property name="tryme.debug.args" value="-J-Xdebug -J-Xnoagent -J-Xrunjdwp:transport=dt_socket,suspend=${debug.pause},server=${debug.server},address=${debug.port}" />
  </target>
          
  <target name="tryme-debug" depends="-jdk-presetdef-nbjpdastart" description="Start IDE in debugger. May only be called from within IDE.">
    <nbjpdastart name="NetBeans" addressproperty="debug.port" transport="dt_socket">
      <classpath>
        <fileset dir="${netbeans.dest.dir}">
          <include name="**/*.jar"/>
        </fileset>
      </classpath>
    </nbjpdastart>
    <property name="debug.server" value="n"/>
    <antcall target="tryme"/>
  </target>
    
  <target name="tryme-profile" depends="-jdk-presetdef-nbprofiledirect" description="Start IDE in debugger. May only be called from within IDE.">
    <property name="profiler.roots.path" value="profiler.roots.all" />
    <fileset id="profiler.roots.all" dir="${netbeans.dest.dir}">
        <include name="**/*.jar"/>
    </fileset>
    <nbprofiledirect 
        jvmargsprefix="-J" 
        jvmargsproperty="profiler.jvmargs" 
        mainclass="org.netbeans.Main"
    >
      <classpath>
        <fileset dir="${netbeans.dest.dir}">
          <include name="**/*.jar"/>
        </fileset>
      </classpath>
      <rootspath>
          <fileset refid="${profiler.roots.path}" />
      </rootspath>
    </nbprofiledirect>
    
    <antcall target="tryme">
        <param name="tryme.args" value="${profiler.jvmargs}"/>
    </antcall>
  </target>
  
  <target name="tryme" depends="init,maybe-build-nozip,tryme-setup-debug-args,-jdk-init"
          description="Try running the IDE interactively (build it first if needed).
It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in debug mode" 
   >
    <property name="tryme.debug.args" value="" />
  
    <exec os="Windows NT Windows 95 Windows 98 Windows 2000 Windows 2003 Windows XP" executable="${netbeans.dest.abs}/bin/nb.exe" failonerror="yes">
      <arg value="--jdkhome"/>
      <arg file="${nbjdk.home}"/>
      <arg value="--userdir"/>
      <arg file="${test.user.dir}"/>
      <arg line="${tryme.args}"/>
      <arg line="${tryme.debug.args}" />
    </exec>
    <exec os="Linux SunOS Solaris Mac OS X" dir="." executable="sh" failonerror="yes">
      <arg value="${netbeans.dest}/bin/netbeans"/>
      <arg value="--jdkhome"/>
      <arg file="${nbjdk.home}"/>
      <arg value="--userdir"/>
      <arg file="${test.user.dir}"/>
      <arg line="${tryme.args}"/>
      <arg line="${tryme.debug.args}" />
    </exec>
  </target>
  
  <target name="l10n-kit" depends="init">
    <taskdef name="l10n" classname="org.netbeans.nbbuild.L10nTask"
             classpath="nbantext.jar"/>
    <delete dir="${l10n.dist.dir}"/>
    <mkdir dir="${l10n.dist.dir}"/>
    <delete dir="tmp"/>
    <mkdir dir="tmp"/>
    <property name="nbroot" location=".."/>
    <l10n topdirs="${nbroot}" modules="${fixedmodules},${modules}"
          localizablefile="l10n.list" generatedfile="l10n.list.translated"
          distdir="${l10n.dist.dir}" changedfile="l10n.list.changed"
          builddir="tmp" buildnumber="${buildnumber}"
          excludepattern="**/ja/,**/*_ja.*"/>
    <delete dir="tmp"/>
  </target>

  <target name="bootstrap-javadoc"
          depends="bootstrap"
          description="Generate Javadoc for Ant extensions.">
    <!-- XXX this ought to be deleted at some point. -->
    <!-- Can be done anyway by apisupport/ant, and published as regular module Javadoc -->
    <!-- by the regular daily Javadoc build process. -->
    <!-- Then all of this stuff can be deleted from the www part of CVS. -->
    <mkdir dir="www/nbantext-javadoc"/>
    <delete>
        <fileset dir="www/nbantext-javadoc">
            <include name="**/*.html"/>
        </fileset>
    </delete>
    <tstamp/>
    <javadoc sourcepath="antsrc"
             destdir="www/nbantext-javadoc"
             packagenames="org.netbeans.nbbuild.*"
             windowtitle="NetBeans Ant Extensions"
             doctitle="Extended Ant Tasks for Building NetBeans"
             nodeprecatedlist="true"
             notree="true"
             noindex="true"
             nohelp="true"
             nonavbar="true"
             author="false"
             version="false"
             bottom="Built on ${buildday}"
    >
      <classpath refid="bootstrap-cp"/>
      <link href="http://nagoya.apache.org/gump/javadoc/ant/build/javadocs" offline="true" packagelistloc="antsrc"/>
    </javadoc>
  </target>

  <target name="clean-external">
    <subant target="clean">
      <fileset dir="..">
        <include name="*/external/build.xml"/>
        <include name="contrib/*/external/build.xml"/>
      </fileset>
    </subant>
  </target>

  <target name="real-clean" depends="clean,clean-external"
          description="Clean everything possible.">
    <echo message="Cleaning old builds..."/>
    <delete>
      <fileset dir=".">
        <include name="NetBeans-*.log"/>
        <include name="NetBeans-*.zip"/>
      </fileset>
    </delete>
    <!-- This step must be last: -->
    <echo message="Cleaning NetBeans-specific Ant extensions..."/>
    <delete file="nbantext.jar" quiet="true"/>
    <delete dir="build/antclasses"/>
  </target>
  
  <target name="ant-clean">
    <delete file="nbantext.jar"/>
  </target>

  <target name="clean-cluster-flags" unless="do-not-rebuild-clusters">
    <mkdir dir="${netbeans.dest.dir}"/>
    <delete includeEmptyDirs="true">
      <fileset dir="${netbeans.dest.dir}">
        <include name="*.built"/>
      </fileset>
    </delete>
  </target>

  <target name="localclean" depends="clean-cluster-flags,init">
    <delete dir="${test.user.dir}"/>
    <delete dir="build"/>
    <delete file="moduledefs-tmp.properties"/>
    <delete dir="nbms" />
    <delete dir="${netbeans.dest.dir}"/>
  </target>
  
  <!-- more correct but takes too long: <target name="localtest" depends="bootstrap,all-xtest/nbjunit" > -->
  <target name="localtest" depends="bootstrap">
    <ant dir="test" target="cleanresults"/>
    <ant dir="test" target="runtests"/>
  </target>
  <target name="localtest-nb" depends="localtest">
    <nbbrowse file="test/results/index.html"/>
  </target>
  <target name="localtest-single-nb" depends="bootstrap">
    <property name="unit.test.base" location="test/unit/src"/>
    <pathconvert property="xtest.includes" pathsep=",">
        <path path="${includes}"/>
        <mapper type="glob" from="${unit.test.base}${file.separator}*.java" to="*.class"/>
    </pathconvert>
    <property name="xtest.attribs" value="empty"/>
    <ant dir="test" target="cleanresults"/>
    <ant dir="test" target="runtests"/>
    <nbbrowse file="test/results/index.html"/>
  </target>
  <target name="localtest-single-nb-debug" depends="bootstrap,-jdk-presetdef-nbjpdastart">
    <property name="unit.test.base" location="test/unit/src"/>
    <pathconvert property="xtest.includes" pathsep=",">
        <path path="${includes}"/>
        <mapper type="glob" from="${unit.test.base}${file.separator}*.java" to="*.class"/>
    </pathconvert>
    <property name="xtest.attribs" value="empty"/>
    <ant dir="test" target="cleanresults"/>
    <nbjpdastart transport="dt_socket" addressproperty="jpda.address" name="${test.class}">
        <classpath>
            <!--
            <path location="test/work/sys/tests/unit/classes"/>
            <path location="test/work/sys/tests/"/>
            <path location="test/unit/src/"/>
            -->
            <path location="nbantext.jar"/>
        </classpath>
    </nbjpdastart>
    <ant dir="test" target="runtests">
        <property name="xtest.debug.address" value="${jpda.address}" />
        <property name="xtest.debug.pause" value="false" />
    </ant>
    <nbbrowse file="test/results/index.html"/>
  </target>

  <target name="cleanall" depends="init">
    <cleanall topdir=".." 
              modules="${allmodules}" 
              targetname="clean"
              resolvedependencies="${resolve.clean.dependencies}"
              deptargetprefix="all-"
              failonerror="${stop.when.clean.error}" />
  </target>

  <target name="clean" depends="init,cleanall,localclean"
          description="Clean out (almost) all build products.">
    <echo message="Run `ant real-clean' if desired."/>
  </target>

<!-- This section contains properties and targets used to build -->
<!-- Solaris packages.                                          -->

  <property name="solpkg-pkgproto" value="pkgproto"/>
  <property name="solpkg-pkgmk" value="pkgmk"/>
  <property name="solpkg-proto-file" value="prototype"/>
  <property name="solpkg-actual-dir" value="to-be-specified"/>
  <property name="solpkg-pkg-dir" value="to-be-specified"/>
  <property name="solpkg-pkg-dest-dir" value="to-be-specified"/>

  <!-- You can run this target to create the prototype file and create -->
  <!-- the package, or if you need to modify the prototype file before -->
  <!-- building the package, you can run the two subtargets            -->
  <!-- separately.                                                     -->
  <target name="solpkg-build" depends="solpkg-pkgproto,solpkg-pkgmk"
          description="Generate a prototype file and create a Solaris package."/>

  <!-- This creates the pkg prototype file for a given directory and -->
  <!-- its files.                                                    -->
  <target name="solpkg-pkgproto"
          description="Generate a prototype file.">
    <exec executable="rm" failonerror="yes">
      <arg value="-rf"/>
      <arg value="${solpkg-proto-file}"/>
    </exec>
    <exec executable="${solpkg-pkgproto}" output="${solpkg-proto-file}" 
          failonerror="yes">
      <arg value="${solpkg-actual-dir}=${solpkg-pkg-dir}"/>
    </exec>
  </target>

  <!-- This creates the Solaris pkg for a given prototype file, pkginfo -->
  <!-- file, and directory.                                             -->
  <target name="solpkg-pkgmk"
          description="Create a Solaris package.">
    <exec executable="${solpkg-pkgmk}" failonerror="yes">
      <arg value="-o"/>
      <arg value="-f"/>
      <arg value="${solpkg-proto-file}"/>
      <arg value="-r"/>
      <arg value="${solpkg-actual-dir}"/>
      <arg value="-d"/>
      <arg value="${solpkg-pkg-dest-dir}"/>
    </exec>
  </target>

<!-- End of Solaris package section. -->


<!-- Localized builds -->
  <target name="all-dutch" depends="set-dutch-locale,all"/>
  <target name="all-russian" depends="set-russian-locale,all"/>
  <target name="all-french" depends="set-french-locale,all"/>
  <target name="all-ja-zh" depends="set-ja-zh_CN-locales,all"/>
  
  <target name="set-ja-zh_CN-locales">
        <property name="locales" value="ja,zh_CN"/>
        <property name="locjar.locales" value="${locales}"/>
        <property name="locmakenbm.locales"   value="${locales}"/>
        <property name="locjhindexer.locales" value="${locales}"/>
        <property name="localized.build.locales" value="${locales}"/>
  </target>
  
  <target name="set-dutch-locale">
        <property name="locales" value="nl"/>
        <property name="locjar.locales" value="${locales}"/>
        <property name="locmakenbm.locales"   value="${locales}"/>
        <property name="locjhindexer.locales" value="${locales}"/>
        <property name="localized.build.locales" value="${locales}"/>
  </target>

  <target name="set-russian-locale">
        <property name="locales" value="ru"/>
        <property name="locjar.locales" value="${locales}"/>
        <property name="locmakenbm.locales"   value="${locales}"/>
        <property name="locjhindexer.locales" value="${locales}"/>
        <property name="localized.build.locales" value="${locales}"/>
  </target>

  <target name="set-french-locale">
        <property name="locales" value="fr"/>
        <property name="locjar.locales" value="${locales}"/>
        <property name="locmakenbm.locales"   value="${locales}"/>
        <property name="locjhindexer.locales" value="${locales}"/>
        <property name="localized.build.locales" value="${locales}"/>
  </target>
  
<!-- end of localized builds -->


  <target name="print-selected-modules" depends="init" description="Prints list of modules to build in selected moduleconfig.">
    <echo message="modules=${allmodules}"/>
  </target>

  <target name="print-cvs-modules" depends="init" description="Prints list of cvs modules required to build in selected moduleconfig.">
    <taskdef name="printcvsmodules" classname="org.netbeans.nbbuild.PrintCvsModules" classpath="nbantext.jar"/>
    <printcvsmodules modules="${fixedmodules},${modules}" targetprefix="all-" />
  </target>

  <target name="check-commit-validation">
    <condition property="run.validation" >
        <and>
          <available file="../ide/test/build.xml" />
          <available file="../jemmy/build.xml" />
          <available file="../jellytools/build.xml" />
          <available file="../xtest/build.xml" />
          <or>
            <not>
              <isset property="nb.run.validation"/>
            </not>
            <istrue value="${nb.run.validation}"/>
          </or>
        </and>
    </condition>
  </target>
  
  <target 
    name="unit-validation" 
    description="Invokes all existing unit tests in all IDE modules.
 Useful when one wants to deeply verify that his changes
 work"
  >
    <ant dir="../xtest/instance" target="runtests" >
      <property name="xtest.config" value="unit-nb" />
    </ant>
  </target>
  
  <target 
    name="commit-validation" 
    depends="commit-verification,commitValidation,no-commit-validation" 
    description="Runs tests to validate IDE before commit."
  />

  <target name="all-commitValidation" description="dummy target for build error recognition facility"/>
  
  <target 
    name="commit-verification" 
    description="Compares result of a build with golden files verifying various aspects of the exported interfaces"
    depends="
    all-verification,
    check-files-layout,
    check-public-packages,
    check-friend-packages,
    check-shared-packages,
    check-modules,
    check-dependencies,
    check-implementation-dependencies,
    check-cluster-dependencies,
    check-cluster-implementation-dependencies,
    check-clusters-content"
  />
  
  <!-- JST: One day also add 
    check-external-libraries
  -->
  
  <target name="all-verification" >
    <echo message="Runs verification tests to check the IDE before commit" />
  </target>

  <!-- keep this target name at least for a while for backward compat -jglick -->
  <target name="commitValidation" depends="all-commitValidation,check-commit-validation" if="run.validation">
    <property name="xtest.home" location="../xtest"/>
    <ant dir="${xtest.home}/instance" target="cleanresults">
        <property name="xtest.config" value="commit-validation-nb"/>
    </ant>
    <ant dir="${xtest.home}/instance" target="cleantests">
        <property name="xtest.config" value="commit-validation-nb"/>
    </ant>
    <ant dir="${xtest.home}/instance" target="runtests">
        <property name="xtest.config" value="commit-validation-nb"/>
        <property name="xtest.fail.on.failure" value="true"/>
    </ant>
  </target>

  <target name="no-commit-validation" depends="check-commit-validation" unless="run.validation">
    <echo>
        *** WARNING ***
        You do not seem to have the modules needed to run the commit validation test suite. 
        You may not commit any changes into the CVS repository without running these tests.
        For more information: http://www.netbeans.org/community/guidelines/commit.html
    </echo>
  </target>

  <target name="sanity-build-from-source-pkg" depends="build-source">
    <available file="${netbeans.build.dir}/${cluster.name}-src-${buildnum}.zip"
               property="pkg.available"/>
    <fail message="Source package ${netbeans.build.dir}/${cluster.name}-src-${buildnum}.zip not available" unless="pkg.available"/>
    <delete dir="testbuild"/>
    <mkdir dir="testbuild"/>
    <unzip dest="testbuild" src="${netbeans.build.dir}/${cluster.name}-src-${buildnum}.zip"/>
    <property name="one.cluster.name" value="${cluster.name}"/>
    <propertyset id="sanity-build">
      <propertyref name="one.cluster.name"/>
    </propertyset>
    <echoproperties destfile="testbuild/nbbuild/user.properties">
        <propertyset refid="sanity-build"/>
    </echoproperties>

    <!-- it should call build of the refered cluster and not just hardcoded platform -->
    <ant antfile="testbuild/nbbuild/build.xml" inheritall="false" target="build-one-cluster">
      <property file="testbuild/nbbuild/user.properties"/>
    </ant>
    <delete dir="testbuild"/>
  </target>

  <target name="build-source"
    depends="init,set-buildnumber"
    description="Packages sources needed to compile given by cluster.name (can be specified by -Dcluster.name=nb.cluster.platform"
    if="cluster.name"
  >
    <property name="buildnum" value="dev-${buildnumber}"/>
    <echo message="Packaging sources of ${cluster.name} modules"/>
    <resolve name="cluster-modules" value="${cluster.name}"/>
    <resolve name="harness-modules" value="nb.cluster.harness"/>
    <mkdir dir="${netbeans.build.dir}"/>
    <taskdef name="definefileset" classname="org.netbeans.nbbuild.PrintCvsModules" classpath="nbantext.jar"/>
    <definefileset modules="${cluster-modules}" targetprefix="all-" id="source-modules" dir=".." />
    <definefileset modules="${cluster-modules}" targetprefix="all-" id="external-modules" dir=".." mode="binaries" />
    <definefileset modules="${harness-modules}" targetprefix="all-" id="harness-source-modules" dir=".." />
    <definefileset modules="${harness-modules}" targetprefix="all-" id="harness-external-modules" dir=".." mode="binaries" />
    <zip zipfile="${netbeans.build.dir}/${cluster.name}-src-${buildnum}.zip" duplicate="preserve">
      <fileset refid="source-modules" />
      <fileset refid="external-modules" />
      <fileset refid="harness-source-modules" />
      <fileset refid="harness-external-modules" />
    </zip>
  </target>
  
  <target name="generate-golden-files-init" depends="init,bootstrap" >
    <property name="template.files.dir" location="build/golden" />
    <property name="golden.files.dir" location="../ide/golden" />
    <condition property="golden.files.eol" value="unix" >
        <or>
            <os family="unix" />
            <os family="mac" />
        </or>
    </condition>
    <property name="golden.files.eol" value="dos" />
    
    <mkdir dir="${template.files.dir}" />
    
    <!-- convert the golden files into platform default encoding -->
    <fixcrlf srcdir="${golden.files.dir}" destdir="${template.files.dir}" eol="${golden.files.eol}" >
        <include name="*txt" />
    </fixcrlf>
    
  </target>
  
  
  <target name="generate-golden-files" depends="generate-golden-files-init" >
    <property name="generated.files.dir" location="build/generated" />
    <mkdir dir="${generated.files.dir}" />
    
    <taskdef name="deps" classname="org.netbeans.nbbuild.ModuleDependencies" classpath="nbantext.jar"/>
    
    <deps>
      <input name="platform" >
        <jars dir="${netbeans.dest.dir}" >
          <include name="${nb.cluster.platform.dir}/**/*.jar" />
        </jars>
      </input>
      <input name="ide" >
        <jars dir="${netbeans.dest.dir}" >
          <include name="${nb.cluster.ide.dir}/**/*.jar" />
        </jars>
      </input>
      <input name="j2ee" >
        <jars dir="${netbeans.dest.dir}" >
          <include name="${nb.cluster.j2ee.dir}/**/*.jar" />
        </jars>
      </input>
      <input name="nb" >
        <jars dir="${netbeans.dest.dir}" >
          <include name="${nb.cluster.nb.dir}/**/*.jar" />
        </jars>
      </input>
      <input name="harness" >
        <jars dir="${netbeans.dest.dir}" >
          <include name="${nb.cluster.harness.dir}/**/*.jar" />
        </jars>
      </input>
      
      <output type="group-dependencies" file="${generated.files.dir}/cluster-deps.txt" />
      <output type="group-implementation-dependencies" file="${generated.files.dir}/cluster-impl-deps.txt" />
      <output type="modules" file="${generated.files.dir}/modules.txt" />
      <output type="dependencies" file="${generated.files.dir}/deps.txt" />
      <output type="implementation-dependencies" file="${generated.files.dir}/impl-deps.txt" />
      <output type="public-packages" file="${generated.files.dir}/public-packages.txt" />
      <output type="shared-packages" file="${generated.files.dir}/shared-packages.txt" />
      <output type="friend-packages" file="${generated.files.dir}/friend-packages.txt" />
      <output type="external-libraries" file="${generated.files.dir}/external-libraries.txt" />
    </deps>
  </target>
  
  <target name="check-public-packages" depends="generate-golden-files" >
    <property name="check.public.packages.golden" location="${golden.files.dir}/public-packages.txt" />
    <property name="check.public.packages.template" location="${template.files.dir}/public-packages.txt" />
    <property name="check.public.packages.generated" location="${generated.files.dir}/public-packages.txt" />
  
    <condition property="check-public-packages-are-they-the-same" >
        <filesmatch file1="${check.public.packages.template}" file2="${check.public.packages.generated}" />
    </condition>
    
    
    <exec os="Linux SunOS Solaris " dir="." executable="diff" failonerror="no" timeout="60000" >
      <arg value="-U"/>
      <arg value="15"/>
      <arg value="${check.public.packages.template}" />
      <arg value="${check.public.packages.generated}" />
    </exec>
    
    <fail unless="check-public-packages-are-they-the-same" >!
    *** Public packages has changed! ***
    
    Differences were found while comparing file 
    ${check.public.packages.template}
    with 
    ${check.public.packages.generated}
    
    This means that the set of public packages changed since the previously known one.
    Some packages may have been added, some of them may have been removed 
    Either by changing manifest of a module or by adding or removing a class file
    from a module package.
    
    
    Changing the packages may or may not be ok. It means that an api of 
    whole product changes and as such it is subject to review. If you passed
    your review and want to change the list of public packages, then please
    update the golden file at 
    ${check.public.packages.golden}
    and run the test once again. 
    
    Read more about the Verification Framework:
    http://openide.netbeans.org/proposals/arch/clusters.html#verify
    
    Look at for information about reviews:
    http://openide.netbeans.org/tutorial/review-steps.html
    
    Check the page about APIs:
    http://openide.netbeans.org/tutorial/api-design.html#api
    </fail>
  </target>
  
  <target name="check-friend-packages" depends="generate-golden-files" >
    <property name="check.friend.packages.golden" location="${golden.files.dir}/friend-packages.txt" />
    <property name="check.friend.packages.template" location="${template.files.dir}/friend-packages.txt" />
    <property name="check.friend.packages.generated" location="${generated.files.dir}/friend-packages.txt" />
  
    <condition property="check-friend-packages-are-they-the-same" >
        <filesmatch file1="${check.friend.packages.template}" file2="${check.friend.packages.generated}" />
    </condition>
    
    
    <exec os="Linux SunOS Solaris " dir="." executable="diff" failonerror="no" timeout="60000" >
      <arg value="-U"/>
      <arg value="15"/>
      <arg value="${check.friend.packages.template}" />
      <arg value="${check.friend.packages.generated}" />
    </exec>
    
    <fail unless="check-friend-packages-are-they-the-same" >!
    *** Friend packages has changed! ***
    
    Differences were found while comparing file 
    ${check.friend.packages.template}
    with 
    ${check.friend.packages.generated}
    
    This means that the set of friend packages changed since the previously known one.
    Some packages may have been added, some of them may have been removed 
    Either by changing manifest of a module or by adding or removing a class file
    from a module package.
    
    
    Changing the packages may or may not be ok. It means that an api of 
    whole product changes and as such it is subject to review. If you passed
    your review and want to change the list of friend packages, then please
    update the golden file at 
    ${check.friend.packages.golden}
    and run the test once again. 
    
    Read more about the Verification Framework:
    http://openide.netbeans.org/proposals/arch/clusters.html#verify
    
    Look at for information about reviews:
    http://openide.netbeans.org/tutorial/review-steps.html
    
    Check the page about APIs:
    http://openide.netbeans.org/tutorial/api-design.html#api
    </fail>
  </target>
  
  <target name="check-shared-packages" depends="generate-golden-files,-jdk-init" unless="have-jdk-1.5" >
    <property name="check.shared.packages.golden" location="${golden.files.dir}/shared-packages.txt" />
    <property name="check.shared.packages.template" location="${template.files.dir}/shared-packages.txt" />
    <property name="check.shared.packages.generated" location="${generated.files.dir}/shared-packages.txt" />
  
    <condition property="check-shared-packages-are-they-the-same" >
        <filesmatch file1="${check.shared.packages.template}" file2="${check.shared.packages.generated}" />
    </condition>
    
    
    <exec os="Linux SunOS Solaris Mac OS X" dir="." executable="diff" failonerror="no" timeout="60000" >
      <arg value="-U"/>
      <arg value="15"/>
      <arg value="${check.shared.packages.template}" />
      <arg value="${check.shared.packages.generated}" />
    </exec>
    
    <fail unless="check-shared-packages-are-they-the-same" >!
    *** Shared packages has changed! ***
    
    Differences were found while comparing file 
    ${check.shared.packages.template}
    with 
    ${check.shared.packages.generated}
    
    This means that the set of shared packages changed since the previously known one.
    Some packages may have been added, some of them may have been removed 
    Either by changing manifest of a module or by adding or removing a class file
    from a module package.
    
    
    Removing shared packages is ok. Adding shared packages is silly, complicates
    and slows down module system and startup of the application. Do not do that!
    If you are removing a shared package please update 
    ${check.shared.packages.golden}
    and run the test once again. 
    
    Read more about the Verification Framework:
    http://openide.netbeans.org/proposals/arch/clusters.html#verify
    
    Look at for information about reviews:
    http://openide.netbeans.org/tutorial/review-steps.html
    
    Check the page about APIs:
    http://openide.netbeans.org/tutorial/api-design.html#api
    </fail>
  </target>

  <target name="check-external-libraries" depends="generate-golden-files" >
    <property name="check.external.libraries.golden" location="${golden.files.dir}/external-libraries.txt" />
    <property name="check.external.libraries.template" location="${template.files.dir}/external-libraries.txt" />
    <property name="check.external.libraries.generated" location="${generated.files.dir}/external-libraries.txt" />
  
    <condition property="check-external-libraries-are-they-the-same" >
        <filesmatch file1="${check.external.libraries.template}" file2="${check.external.libraries.generated}" />
    </condition>
    
    
    <exec os="Linux SunOS Solaris Mac OS X" dir="." executable="diff" failonerror="no" timeout="60000" >
      <arg value="-U"/>
      <arg value="15"/>
      <arg value="${check.external.libraries.template}" />
      <arg value="${check.external.libraries.generated}" />
    </exec>
    
    <fail unless="check-external-libraries-are-they-the-same" >!
    *** List of external libraries has changed! ***
    
    Differences were found while comparing file 
    ${check.external.libraries.template}
    with 
    ${check.external.libraries.generated}
    
    This means that the set of external libraries (JARs that are not NetBeans
    modules or does not have NetBeans-Own-Library: true in manifest) has 
    changed since the previously known one. Some libraries may have been added, 
    some of them may have been removed, they MD5 checksum or size has been changed.
    
    Changing the external libraries is ok, but requires legal approval everytime
    new version of a library is put into the product. If you have the approval
    want to change the list of external libraries, then please
    update the golden file at 
    ${check.external.libraries.golden}
    and run the test once again. 
    
    Read more about the Verification Framework:
    http://openide.netbeans.org/proposals/arch/clusters.html#verify
    
    Look at for information about reviews:
    http://openide.netbeans.org/tutorial/review-steps.html
    
    Check the page about APIs:
    http://openide.netbeans.org/tutorial/api-design.html#api
    </fail>
  </target>
  
  <target name="check-modules" depends="generate-golden-files" >
    <property name="check.modules.golden" location="${golden.files.dir}/modules.txt" />
    <property name="check.modules.template" location="${template.files.dir}/modules.txt" />
    <property name="check.modules.generated" location="${generated.files.dir}/modules.txt" />
  
    <condition property="check-modules-are-they-the-same" >
        <filesmatch file1="${check.modules.template}" file2="${check.modules.generated}" />
    </condition>
    
    
    <exec os="Linux SunOS Solaris Mac OS X" dir="." executable="diff" failonerror="no" timeout="60000" >
      <arg value="-U"/>
      <arg value="15"/>
      <arg value="${check.modules.template}" />
      <arg value="${check.modules.generated}" />
    </exec>
    
    <fail unless="check-modules-are-they-the-same" >!
    *** List of modules has changed! ***
    
    Differences were found while comparing file 
    ${check.modules.template}
    with 
    ${check.modules.generated}
    
    This means that the set of modules changed since the previously known one.
    Adding or removing a module significatly affects the set of APIs the
    product offers and as such is subject to review. If you passed
    your review and want to change the list of modules, then please
    update the golden file at 
    ${check.modules.golden}
    and run the test once again. 
    
    Read more about the Verification Framework:
    http://openide.netbeans.org/proposals/arch/clusters.html#verify
    
    Look at for information about reviews:
    http://openide.netbeans.org/tutorial/review-steps.html
    
    Check the page about APIs:
    http://openide.netbeans.org/tutorial/api-design.html#api
    </fail>
  </target>

  <target name="check-dependencies" depends="generate-golden-files" >
    <antcall target="check-dependencies-subroutine" >
        <param name="check.dependencies.golden" location="${golden.files.dir}/deps.txt" />
        <param name="check.dependencies.template" location="${template.files.dir}/deps.txt" />
        <param name="check.dependencies.generated" location="${generated.files.dir}/deps.txt" />
    </antcall>
  </target>
  
  <target name="check-implementation-dependencies" depends="generate-golden-files" >
    <antcall target="check-dependencies-subroutine" >
        <param name="check.dependencies.golden" location="${golden.files.dir}/impl-deps.txt" />
        <param name="check.dependencies.template" location="${template.files.dir}/impl-deps.txt" />
        <param name="check.dependencies.generated" location="${generated.files.dir}/impl-deps.txt" />
    </antcall>
  </target>

  <target name="check-cluster-dependencies" depends="generate-golden-files" >
    <antcall target="check-dependencies-subroutine" >
        <param name="check.dependencies.golden" location="${golden.files.dir}/cluster-deps.txt" />
        <param name="check.dependencies.template" location="${template.files.dir}/cluster-deps.txt" />
        <param name="check.dependencies.generated" location="${generated.files.dir}/cluster-deps.txt" />
    </antcall>
  </target>
  
  <target name="check-cluster-implementation-dependencies" depends="generate-golden-files" >
    <antcall target="check-dependencies-subroutine" >
        <param name="check.dependencies.golden" location="${golden.files.dir}/cluster-impl-deps.txt" />
        <param name="check.dependencies.template" location="${template.files.dir}/cluster-impl-deps.txt" />
        <param name="check.dependencies.generated" location="${generated.files.dir}/cluster-impl-deps.txt" />
    </antcall>
  </target>
    
  <target name="check-dependencies-subroutine" >
    <condition property="check-dependencies-are-they-the-same" >
        <filesmatch file1="${check.dependencies.template}" file2="${check.dependencies.generated}" />
    </condition>
    
    
    <exec os="Linux SunOS Solaris Mac OS X" dir="." executable="diff" failonerror="no" timeout="60000" >
      <arg value="-U"/>
      <arg value="15"/>
      <arg value="${check.dependencies.template}" />
      <arg value="${check.dependencies.generated}" />
    </exec>
    
    <fail unless="check-dependencies-are-they-the-same" >!
    *** List of dependencies has changed! ***
    
    Differences were found while comparing file 
    ${check.dependencies.template}
    with 
    ${check.dependencies.generated}
    
    This means that the set of dependencies changed since the previously known one.
    Adding a dependency can restrict the ways how a final product can be assembled
    and as such it forms an important aspect of API and is subject to review. 
    If you passed your review or you are sure you want to change the 
    list of dependencies, then please update the golden file at 
    ${check.dependencies.golden}
    and run the test once again. 
    
    Read more about the Verification Framework:
    http://openide.netbeans.org/proposals/arch/clusters.html#verify
    
    Look at for information about reviews:
    http://openide.netbeans.org/tutorial/review-steps.html
    
    Check the page about APIs and dependencies being important:
    http://openide.netbeans.org/tutorial/api-design.html#api
    </fail>
  </target>
    
    
  <target name="generate-files-layout" depends="generate-golden-files-init" >
    <property name="generated.files.dir" location="build/generated" />
    <mkdir dir="${generated.files.dir}" />
    
    <property name="check.files.layout.golden" location="${golden.files.dir}/files-layout.txt" />
    <property name="check.files.layout.template" location="${template.files.dir}/files-layout.txt" />
    <property name="check.files.layout.generated" location="${generated.files.dir}/files-layout.txt" />
  
    <property name="check-file-layout-root" location="${netbeans.dest.dir}" />
    <fileset id="check-file-layout" dir="${check-file-layout-root}" casesensitive="yes" >
        <include name="platform*/**" />
        <include name="ide*/**" />
        <include name="enterprise*/**" />
        <include name="nb*/**" />
        <include name="harness*/**" />
    </fileset>
    
    <pathconvert property="check-file-layout" refid="check-file-layout" dirsep="/" pathsep="," >
        <map from="${check-file-layout-root}${file.separator}" to="" />
    </pathconvert>
    <mkdir dir="build/generated" />
    <echo message="${check-file-layout}${line.separator}" file="${check.files.layout.generated}" />
    <replace file="${check.files.layout.generated}" token="," value="${line.separator}" />
    <replace file="${check.files.layout.generated}" token="\" value="/" />
    <condition property="check-files-are-they-the-same" >
        <filesmatch file1="${check.files.layout.template}" file2="${check.files.layout.generated}" />
    </condition>
    
    
  </target>
  
  
  <target name="check-files-layout" depends="generate-files-layout" >
    <exec os="Linux SunOS Solaris Mac OS X" dir="." executable="diff" failonerror="no" timeout="60000" >
      <arg value="-U"/>
      <arg value="15"/>
      <arg value="${check.files.layout.template}" />
      <arg value="${check.files.layout.generated}" />
    </exec>
    
    <fail unless="check-files-are-they-the-same" >!
    *** Layout of files has changed! ***
    
    Differences were found while comparing file ${check.files.layout.generated} with 
    ${check.files.layout.template}
    This means that the layout of files changed since the previously known one.
    Some files may have been added, some of them may have been removed or renamed. 
    
    Changing the layout may or may not be ok. If you are sure that you want to
    change the layout of files, then update the golden file at 
    ${check.files.layout.golden}
    and run the test once again. If you got this warning without intending
    to change the layout of files, think twice whether your commit is really
    correct and consider asking for a review first.
    
    Read more about the Verification Framework:
    http://openide.netbeans.org/proposals/arch/clusters.html#verify
    
    Look at for information about reviews:
    http://openide.netbeans.org/tutorial/review-steps.html
    
    Check the page about APIs and files layout being an API:
    http://openide.netbeans.org/tutorial/api-design.html#api
    </fail>
  </target>

  <target name="check-clusters-content" depends="bootstrap,init-tasks"> 
    <taskdef name="checkcontent" classname="org.netbeans.nbbuild.CheckClustersContent" classpath="nbantext.jar"/>
    <checkcontent clusters="${nb.clusters.list}" trackingPath="${netbeans.dest.dir}" kitDestDir="${netbeans.dest.dir}">
      <exclude name="extra/**"/>
      <exclude name="testtools/**"/>
      <exclude name="bin/**"/>
      <exclude name="README.html"/>
      <exclude name="CREDITS.html"/>
      <exclude name="LICENSE.txt"/>
      <exclude name="DISTRIBUTION.txt"/>
      <exclude name="THIRDPARTYLICENSE.txt"/>
      <exclude name="nb.cluster.*"/>
      <exclude name="etc/netbeans.conf"/>
      <exclude name="build_info"/>
      <exclude name="module_tracking.xml"/>
      <exclude name="moduleCluster.properties"/>
      <exclude name="netbeans.css"/>
    </checkcontent>
  </target>
  
  <target name="check-module-configs" depends="bootstrap" description="Sanity-check build.properties and cluster.properties.">
    <taskdef name="checkmoduleconfigs" classname="org.netbeans.nbbuild.CheckModuleConfigs" classpath="nbantext.jar"/>
    <checkmoduleconfigs nbroot=".."/>
  </target>

  <target name="display-l10n-list-matches" description="Show which files are actually matched by an l10n.list in some module.">
    <property name="nbroot" location=".."/>
    <input addproperty="module">Select a top-level module (e.g. "java") to display results for:</input>
    <property name="listfile" location="${nbroot}/${module}/l10n.list"/>
    <echo>${listfile}:1: Matches follow... (click on hyperlinks from IDE!)</echo>
    <echo>(warning: 'exclude' directives not honored here yet)</echo><!-- XXX use filtersets or something to fix -->
    <apply parallel="false" executable="sh">
        <arg value="-c"/>
        <arg value="echo $0:1"/>
        <fileset dir="${nbroot}" includesfile="${listfile}"/>
    </apply>
  </target>
  
  <target name="increment-spec-versions" depends="bootstrap,init-module-list" description="Increment all standard module specification versions. Pass -Dbranch=true if not on the trunk.">
    <property name="branch" value="false"/>
    <taskdef name="incrspecvers" classname="org.netbeans.nbbuild.IncrementSpecificationVersions" classpath="nbantext.jar"/>
    <incrspecvers nbroot=".." modules="${allmodules}" branch="${branch}"/>
  </target>

</project>




<?xml version="1.0" encoding="UTF-8"?>

<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
	 xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
	 version="2.4">
             <session-config>
      <session-timeout>
30
        </session-timeout>
 </session-config>
 <welcome-file-list>
         	<welcome-file>
            index.jsp
  </welcome-file>
    </welcome-file-list>
            </web-app>

Lines 79-85 Link Here

(-)a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/XMLFormatterTest.java (-1 / +1 lines)
79	public static Test suite() {	79	public static Test suite() {
80	TestSuite suite = new TestSuite();	80	TestSuite suite = new TestSuite();
81	suite.addTest(new XMLFormatterTest("testReformatSample1"));	81	suite.addTest(new XMLFormatterTest("testReformatSample1"));
82	//suite.addTest(new XMLFormatterTest("testReformatSample2"));	82	suite.addTest(new XMLFormatterTest("testReformatSample2"));
83	return suite;	83	return suite;
84	}	84	}
85		85




 * 
 * Portions Copyrighted 2007 Sun Microsystems, Inc.
 */
package org.netbeans.modules.xml.text.syntax;

import java.io.BufferedReader;
import java.io.IOException;

import org.netbeans.api.lexer.Language;
import org.netbeans.api.xml.lexer.XMLTokenId;
import org.netbeans.editor.BaseDocument;
import org.netbeans.modules.xml.text.syntax.XMLSyntaxSupport;
import org.netbeans.modules.xml.xam.ModelSource;
import org.netbeans.modules.xml.xdm.XDMModel;
import org.netbeans.modules.xml.xdm.diff.DefaultElementIdentity;
import org.netbeans.modules.xml.xdm.diff.DiffFinder;
import org.netbeans.modules.xml.xdm.diff.Difference;
import org.openide.util.Exceptions;
import org.openide.util.Lookup;
import org.openide.util.lookup.Lookups;


    }
                 
    protected static BaseDocument getResourceAsDocument(String path) throws Exception {
        // AbstractTestCase was repackaged, tests typically contain path rooted at xml.text package.
        if (path.startsWith("syntax/")) {
            path = path.substring(7);
        }
        InputStream in = AbstractTestCase.class.getResourceAsStream(path);
        BaseDocument sd = new BaseDocument(true, "text/xml"); //NOI18N
        BufferedReader br = new BufferedReader(new InputStreamReader(in,"UTF-8"));

Lines 45-51 Link Here

(-)a/xml.text/test/unit/src/org/netbeans/modules/xml/text/syntax/XMLSyntaxSupportTest.java (-1 lines)
45	import junit.framework.Test;	45	import junit.framework.Test;
46	import junit.framework.TestSuite;	46	import junit.framework.TestSuite;
47	import org.netbeans.editor.TokenItem;	47	import org.netbeans.editor.TokenItem;
48	import org.netbeans.modules.xml.text.AbstractTestCase;
49		48
50	/**	49	/**
51	*	50	*




    <!-- ACTUAL CHANGES BEGIN HERE: -->

    <changes>
        <change id="deprecated-syntax-api">
            <summary>Syntax API deprecated</summary>
            <version major="2" minor="60"/>
            <date day="11" month="10" year="2016"/>
            <author login="sdedic"/>
            <compatibility binary="compatible" source="incompatible" semantic="compatible" addition="yes" deprecation="yes" deletion="yes"/>
            <description>
                <p>
                    The xml.text.syntax API uses the old and long deprecated lexer. The API is now moved to a new compatibility-only 
                    <code>xml.text.deprecated90</code> module and a new API in <code>org.netbeans.modules.xml.text.api.dom</code> package is offered.               
                </p>
                <p>
                    The following classes/packages have been moved to xml.text.obsolete90 module:
                </p>
                <ul>
                    <li>
                        <code>org.netbeans.modules.xml.text.syntax</code>
                        <ul>
                            <li>DTDSyntaxTokenMapper</li>
                            <li>DTDTokenContext</li>
                            <li>SyntaxElement</li>
                            <li>UnicodeClasses</li>
                            <li>XMLDefaultSyntax</li>
                            <li>XMLSyntaxSupport</li>
                            <li>XMLSyntaxTokenMapper</li>
                            <li>XMLTokenIDs</li>
                        </ul>
                    </li>
                    <li>
                        <code>org.netbeans.modules.xml.text.syntax.dom</code>
                        <ul>
                            <li>AttrImpl</li>
                            <li>CDataSectionImpl</li>
                            <li>CommentImpl</li>
                            <li>DocumentTypeImpl</li>
                            <li>EmptyTag</li>
                            <li>EndTag</li>
                            <li>EntityReferenceImpl</li>
                            <li>ProcessingInstructionImpl</li>
                            <li>StartTag</li>
                            <li>SyntaxNode</li>
                            <li>TextImpl</li>
                            <li>Util</li>
                        </ul>
                    </li>
                    <li>
                        <code>org.netbeans.modules.xml.text.indent</code>
                        <ul>
                            <li>XMLFormatter</li>
                        </ul>
                    </li>
                    <li>
                        <code>org.netbeans.modules.xml.text.api</code>
                        <ul>
                            <li>XMLDefaultTokenContext</li>
                        </ul>
                    </li>
                </ul>
            </description>
            <class name="XMLTextUtils" package="org.netbeans.modules.xml.text.api"/>
            <package name="org.netbeans.modules.xml.text.syntax"/>
            <package name="org.netbeans.modules.xml.text.api.dom"/>
            <issue number="268342"/>
        </change>
        <change id="old-editor-settings-deprecation">
            <summary>Removing old settings classes</summary>
            <version major="1" minor="16"/>

Lines 3-6 Link Here

(-)a/xml.text/manifest.mf (-1 / +2 lines)
3	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/xml/text/resources/Bundle.properties	3	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/xml/text/resources/Bundle.properties
4	OpenIDE-Module-Layer: org/netbeans/modules/xml/text/resources/mf-layer.xml	4	OpenIDE-Module-Layer: org/netbeans/modules/xml/text/resources/mf-layer.xml
5	AutoUpdate-Show-In-Client: false	5	AutoUpdate-Show-In-Client: false
6	OpenIDE-Module-Specification-Version: 1.54	6	OpenIDE-Module-Implementation-Version: 1
		7





<transformations version="1.0">
    <transformationgroup>
        <description>XML SyntaxElement API that depends on obsolete Lexer was deprecated and removed from main module.</description>
        <transformation>
            <trigger-dependency type="older">
                <module-dependency codenamebase="org.netbeans.modules.xml.text" major="2" spec="1.60"/>
            </trigger-dependency>
            <implies>
                <result>
                    <module-dependency codenamebase="org.netbeans.modules.xml.text.obsolete90" spec="1.0"/>
                </result>
                <result>
                    <module-dependency codenamebase="org.netbeans.modules.java.source.compat8" spec="9.0"/>
                </result>
            </implies>
        </transformation>

Lines 40-46 Link Here

(-)a/xml.text/nbproject/project.properties (-1 / +3 lines)
40	# Version 2 license, then the option applies only if the new code is	40	# Version 2 license, then the option applies only if the new code is
41	# made subject to such option by the copyright holder.	41	# made subject to such option by the copyright holder.
42		42
43	javac.source=1.7	43	javac.source=1.8
44		44
45	test.unit.cp.extra=${openide.dir}/core/openide.jar:${openide.loaders.dir}/core/openide-loaders.jar	45	test.unit.cp.extra=${openide.dir}/core/openide.jar:${openide.loaders.dir}/core/openide-loaders.jar
46	test.unit.run.cp.extra=${test.unit.cp.extra}	46	test.unit.run.cp.extra=${test.unit.cp.extra}
Lines 52-54 Link Here
52	test.config.stableBTD.excludes=\	52	test.config.stableBTD.excludes=\
53	org/netbeans/modules/xml/text/completion/CompletionJTest.class,\	53	org/netbeans/modules/xml/text/completion/CompletionJTest.class,\
54	org/netbeans/modules/xml/text/syntax/ColoringTest.class	54	org/netbeans/modules/xml/text/syntax/ColoringTest.class
		55	spec.version.base=1.60.0
		56

Lines 50-55 Link Here

(-)a/xml.text/nbproject/project.xml (-24 / +34 lines)
50	<code-name-base>org.netbeans.modules.xml.text</code-name-base>	50	<code-name-base>org.netbeans.modules.xml.text</code-name-base>
51	<module-dependencies>	51	<module-dependencies>
52	<dependency>	52	<dependency>
		53	<code-name-base>org.netbeans.api.annotations.common</code-name-base>
		54	<build-prerequisite/>
		55	<compile-dependency/>
		56	<run-dependency>
		57	<release-version>1</release-version>
		58	<specification-version>1.28</specification-version>
		59	</run-dependency>
		60	</dependency>
		61	<dependency>
53	<code-name-base>org.netbeans.api.progress</code-name-base>	62	<code-name-base>org.netbeans.api.progress</code-name-base>
54	<build-prerequisite/>	63	<build-prerequisite/>
55	<compile-dependency/>	64	<compile-dependency/>
Lines 131-136 Link Here
131	</run-dependency>	140	</run-dependency>
132	</dependency>	141	</dependency>
133	<dependency>	142	<dependency>
		143	<code-name-base>org.netbeans.modules.editor.document</code-name-base>
		144	<build-prerequisite/>
		145	<compile-dependency/>
		146	<run-dependency>
		147	<specification-version>1.0</specification-version>
		148	</run-dependency>
		149	</dependency>
		150	<dependency>
134	<code-name-base>org.netbeans.modules.editor.fold</code-name-base>	151	<code-name-base>org.netbeans.modules.editor.fold</code-name-base>
135	<build-prerequisite/>	152	<build-prerequisite/>
136	<compile-dependency/>	153	<compile-dependency/>
Lines 149-154 Link Here
149	</run-dependency>	166	</run-dependency>
150	</dependency>	167	</dependency>
151	<dependency>	168	<dependency>
		169	<code-name-base>org.netbeans.modules.editor.indent.support</code-name-base>
		170	<run-dependency>
		171	<specification-version>1.40</specification-version>
		172	</run-dependency>
		173	</dependency>
		174	<dependency>
152	<code-name-base>org.netbeans.modules.editor.lib</code-name-base>	175	<code-name-base>org.netbeans.modules.editor.lib</code-name-base>
153	<build-prerequisite/>	176	<build-prerequisite/>
154	<compile-dependency/>	177	<compile-dependency/>
Lines 167-180 Link Here
167	</run-dependency>	190	</run-dependency>
168	</dependency>	191	</dependency>
169	<dependency>	192	<dependency>
170	<code-name-base>org.netbeans.modules.editor.document</code-name-base>
171	<build-prerequisite/>
172	<compile-dependency/>
173	<run-dependency>
174	<specification-version>1.0</specification-version>
175	</run-dependency>
176	</dependency>
177	<dependency>
178	<code-name-base>org.netbeans.modules.editor.mimelookup</code-name-base>	193	<code-name-base>org.netbeans.modules.editor.mimelookup</code-name-base>
179	<build-prerequisite/>	194	<build-prerequisite/>
180	<compile-dependency/>	195	<compile-dependency/>
Lines 297-303 Link Here
297	<build-prerequisite/>	312	<build-prerequisite/>
298	<compile-dependency/>	313	<compile-dependency/>
299	<run-dependency>	314	<run-dependency>
300	<specification-version>7.61</specification-version>	315	<specification-version>7.61</specification-version>
301	</run-dependency>	316	</run-dependency>
302	</dependency>	317	</dependency>
303	<dependency>	318	<dependency>
Lines 325-338 Link Here
325	</run-dependency>	340	</run-dependency>
326	</dependency>	341	</dependency>
327	<dependency>	342	<dependency>
328	<code-name-base>org.openide.util.ui</code-name-base>
329	<build-prerequisite/>
330	<compile-dependency/>
331	<run-dependency>
332	<specification-version>9.3</specification-version>
333	</run-dependency>
334	</dependency>
335	<dependency>
336	<code-name-base>org.openide.util</code-name-base>	343	<code-name-base>org.openide.util</code-name-base>
337	<build-prerequisite/>	344	<build-prerequisite/>
338	<compile-dependency/>	345	<compile-dependency/>
Lines 349-354 Link Here
349	</run-dependency>	356	</run-dependency>
350	</dependency>	357	</dependency>
351	<dependency>	358	<dependency>
		359	<code-name-base>org.openide.util.ui</code-name-base>
		360	<build-prerequisite/>
		361	<compile-dependency/>
		362	<run-dependency>
		363	<specification-version>9.3</specification-version>
		364	</run-dependency>
		365	</dependency>
		366	<dependency>
352	<code-name-base>org.openide.windows</code-name-base>	367	<code-name-base>org.openide.windows</code-name-base>
353	<build-prerequisite/>	368	<build-prerequisite/>
354	<compile-dependency/>	369	<compile-dependency/>
Lines 356-367 Link Here
356	<specification-version>6.2</specification-version>	371	<specification-version>6.2</specification-version>
357	</run-dependency>	372	</run-dependency>
358	</dependency>	373	</dependency>
359	<dependency>
360	<code-name-base>org.netbeans.modules.editor.indent.support</code-name-base>
361	<run-dependency>
362	<specification-version>1.40</specification-version>
363	</run-dependency>
364	</dependency>
365	</module-dependencies>	374	</module-dependencies>
366	<test-dependencies>	375	<test-dependencies>
367	<test-type>	376	<test-type>
Lines 450-461 Link Here
450	<friend>org.netbeans.modules.xml.schema.abe</friend>	459	<friend>org.netbeans.modules.xml.schema.abe</friend>
451	<friend>org.netbeans.modules.xml.schema.completion</friend>	460	<friend>org.netbeans.modules.xml.schema.completion</friend>
452	<friend>org.netbeans.modules.xml.schema.ui.basic</friend>	461	<friend>org.netbeans.modules.xml.schema.ui.basic</friend>
		462	<friend>org.netbeans.modules.xml.text.obsolete90</friend>
453	<friend>org.netbeans.modules.xsl</friend>	463	<friend>org.netbeans.modules.xsl</friend>
454	<friend>org.netbeans.modules.xslt.core</friend>	464	<friend>org.netbeans.modules.xslt.core</friend>
455	<package>org.netbeans.modules.xml.text.api</package>	465	<package>org.netbeans.modules.xml.text.api</package>
		466	<package>org.netbeans.modules.xml.text.api.dom</package>
456	<package>org.netbeans.modules.xml.text.navigator.base</package>	467	<package>org.netbeans.modules.xml.text.navigator.base</package>
457	<package>org.netbeans.modules.xml.text.syntax</package>	468	<package>org.netbeans.modules.xml.text.syntax</package>
458	<package>org.netbeans.modules.xml.text.syntax.dom</package>
459	</friend-packages>	469	</friend-packages>
460	</data>	470	</data>
461	</configuration>	471	</configuration>





package org.netbeans.modules.xml.text;

import java.util.Collections;
import java.util.List;
import org.netbeans.editor.Acceptor;
import org.netbeans.editor.AcceptorFactory;
import org.netbeans.modules.xml.text.api.XMLDefaultTokenContext;
import org.netbeans.modules.xml.text.indent.DTDIndentEngine;
import org.netbeans.modules.xml.text.indent.XMLIndentEngine;
import org.netbeans.modules.xml.text.syntax.DTDTokenContext;
import org.openide.text.IndentEngine;

/**

    // XML settings factory methods
    // -----------------------------------------------------------------------
    
    // XXX: use lexer
    public static List getXMLTokenContext() {
        return Collections.singletonList(XMLDefaultTokenContext.context);
    }
    // XXX: use new editor.indent API
    public static IndentEngine getXMLIndentEngine() {
        return new XMLIndentEngine();

    // DTD settings factory methods
    // -----------------------------------------------------------------------
    
    // XXX: use lexer
    public static List getDTDTokenContext() {
        return Collections.singletonList(DTDTokenContext.context);
    }
    // XXX: use new editor.indent API
    public static IndentEngine getDTDIndentEngine() {
        return new DTDIndentEngine();




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2016 Oracle and/or its affiliates. All rights reserved.
 *
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 * Other names may be trademarks of their respective owners.
 *
 * The contents of this file are subject to the terms of either the GNU
 * General Public License Version 2 only ("GPL") or the Common
 * Development and Distribution License("CDDL") (collectively, the
 * "License"). You may not use this file except in compliance with the
 * License. You can obtain a copy of the License at
 * http://www.netbeans.org/cddl-gplv2.html
 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
 * specific language governing permissions and limitations under the
 * License.  When distributing the software, include this License Header
 * Notice in each file and include the License file at
 * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Oracle in the GPL Version 2 section of the License file that
 * accompanied this code. If applicable, add the following below the
 * License Header, with the fields enclosed by brackets [] replaced by
 * your own identifying information:
 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * If you wish your version of this file to be governed by only the CDDL
 * or only the GPL Version 2, indicate your decision by adding
 * "[Contributor] elects to include this software in this distribution
 * under the [CDDL or GPL Version 2] license." If you do not indicate a
 * single choice of license, a recipient has the option to distribute
 * your version of this file under either the CDDL, the GPL Version 2 or
 * to extend the choice of license to its licensees as provided above.
 * However, if you add GPL Version 2 code and therefore, elected the GPL
 * Version 2 license, then the option applies only if the new code is
 * made subject to such option by the copyright holder.
 *
 * Contributor(s):
 *
 * Portions Copyrighted 2016 Sun Microsystems, Inc.
 */
package org.netbeans.modules.xml.text.api;

import org.netbeans.api.editor.document.AtomicLockDocument;
import org.netbeans.api.editor.document.LineDocument;
import org.netbeans.api.editor.document.LineDocumentUtils;
import org.netbeans.api.lexer.Token;
import org.netbeans.api.lexer.TokenSequence;
import org.netbeans.api.xml.lexer.XMLTokenId;
import org.netbeans.modules.xml.text.indent.XMLLexerFormatter;

/**
 * Miscellaneous utilities for working with XML in text form.  This class
 * replaces the old Util class which contains references to old lexer and was
 * removed to the {@code xml.text.obsolete90} module.
 * 
 * @author sdedic
 * @since 1.60
 */
public final class XMLTextUtils {
    private XMLTextUtils() {}
    
    /**
     * MIME type for the text/xml documents.
     */
    public static final String XML_MIME = "text/xml";

    static String[] knownEntityStrings = {"&lt;", "&gt;", "&apos;", "&quot;", "&amp;"};

    static char[] knownEntityChars = {'<', '>', '\'', '"', '&'};

    /**
     * Handle fuzziness of attribute end detection. Advances the passed TokenSequence
     * to the token <b>after</b> attribute value end delimiter. The delimiter (quote, doublequote)
     * is passed as a parameter. The method returns the token after the attribute value if the delimiter is
     * found and positions the TokenSequence to the returned token. If there's no delimiter,
     * the method returns {@code null} and the TokenSequence position/state is not defined.
     * 
     * @return Token after attribute value or null.
     */
    public static Token<XMLTokenId> skipAttributeValue(TokenSequence ts, char delim) {
        boolean ok = true;
        for (; ok; ok = ts.moveNext()) {
            Token<XMLTokenId> next = ts.token();
            CharSequence cs = next.text();
            if (cs.charAt(cs.length() - 1) == delim) {
                ts.moveNext();
                return ts.token();
            }
        }
        return null;
    }
    
    /**
     * This method looks for '<' and '>' characters in attributes values and
     * returns whitespace-stripped substring which does not contain '<' or '>'.
     * This method should be used to calculate an attribute value which has
     * not currently been closed.
     * @param attributeValue an original attribute value
     * @return the same value of stripped substring of it.
     */
    public static String actualAttributeValue(String attributeValue) {
        int ltIndex = attributeValue.indexOf('<'); // NOI18N
        int gtIndex = attributeValue.indexOf('>'); // NOI18N
        int firstUnwantedIndex = -1;
        if (gtIndex != -1) {
            if (ltIndex != -1 && ltIndex < gtIndex) {
                firstUnwantedIndex = ltIndex;
            } else {
                firstUnwantedIndex = gtIndex;
            }
        } else {
            firstUnwantedIndex = ltIndex;
        }
        
        if (firstUnwantedIndex != -1) {
            char charAtIndex = attributeValue.charAt(firstUnwantedIndex);
            while (charAtIndex == ' ' || charAtIndex == '\t' || charAtIndex  == '\n' ||
            charAtIndex == '\r' || charAtIndex == '<' || charAtIndex == '>') {
                firstUnwantedIndex--;
                if (firstUnwantedIndex < 0) {
                    break;
                }
                charAtIndex = attributeValue.charAt(firstUnwantedIndex);
            }
            
            return attributeValue.substring(0, firstUnwantedIndex + 1);
        } else {
            return attributeValue;
        }
    }
    
    /**
     * Replaces "&lt;", "&gt;", "&apos;", "&quot;", "&amp;" with
     * '<', '>', '\'', '"', '&'.
     * @param a string that may contain &lt;", "&gt;", "&apos;", "&quot;" and "&amp;"
     * @return a string that may contain '<', '>', '\'', '"', '&'.
     */
    public static String replaceEntityStringsWithChars(String value) {
        StringBuffer buf = new StringBuffer(value);
        for (int entity = 0; entity < knownEntityStrings.length; entity++) {
            String curEntityString = knownEntityStrings[entity];
            int indexOfEntity = buf.toString().indexOf(curEntityString);
            while (indexOfEntity != -1) {
                buf.replace(indexOfEntity, indexOfEntity + curEntityString.length(),
                new String(new char[]{knownEntityChars[entity]}));
                indexOfEntity = buf.toString().indexOf(curEntityString);
            }
        }
        
        return buf.toString();
    }
    
    /**
     * Replaces '<', '>', '\'', '"', '&' with
     * "&lt;", "&gt;", "&apos;", "&quot;", "&amp;".
     * @param a string that may contain '<', '>', '\'', '"', '&'.
     * @return a string that may contain &lt;", "&gt;", "&apos;", "&quot;" and "&amp;"
     */
    public static String replaceCharsWithEntityStrings(String value) {
    	if (value == null) {
    		return null;
    	}
        StringBuffer replBuf = new StringBuffer(value.length());
        for (int ind = 0; ind < value.length(); ind++) {
            boolean charReplaced = false;
            char curChar = value.charAt(ind);
            for (int entity = 0; entity < knownEntityChars.length; entity++) {
                if (curChar == knownEntityChars[entity]) {
                    replBuf.append(knownEntityStrings[entity]);
                    charReplaced = true;
                    break;
                }
            }
            
            if (!charReplaced) {
                replBuf.append(curChar);
            }
        }
        
        return replBuf.toString();
    }


    /**
     * Convenience method to reformat portion of document using XML reformatter.
     * @param doc
     * @param startOffset
     * @param endOffset 
     * @throw IllegalArgumentException if the document implementation is not compatible
     */
    public static void reformat(final LineDocument doc, final int startOffset, final int endOffset) {
        final XMLLexerFormatter formatter = new XMLLexerFormatter(null);
        AtomicLockDocument ald = LineDocumentUtils.asRequired(doc, AtomicLockDocument.class);
        ald.runAtomic(new Runnable() {
            public void run() {
                formatter.doReformat(doc, startOffset, endOffset);
            }
        });
    }
    
}





/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2016 Oracle and/or its affiliates. All rights reserved.
 *
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 * Other names may be trademarks of their respective owners.
 *
 * The contents of this file are subject to the terms of either the GNU
 * General Public License Version 2 only ("GPL") or the Common
 * Development and Distribution License("CDDL") (collectively, the
 * "License"). You may not use this file except in compliance with the
 * License. You can obtain a copy of the License at
 * http://www.netbeans.org/cddl-gplv2.html
 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
 * specific language governing permissions and limitations under the
 * License.  When distributing the software, include this License Header
 * Notice in each file and include the License file at
 * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Oracle in the GPL Version 2 section of the License file that
 * accompanied this code. If applicable, add the following below the
 * License Header, with the fields enclosed by brackets [] replaced by
 * your own identifying information:
 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * If you wish your version of this file to be governed by only the CDDL
 * or only the GPL Version 2, indicate your decision by adding
 * "[Contributor] elects to include this software in this distribution
 * under the [CDDL or GPL Version 2] license." If you do not indicate a
 * single choice of license, a recipient has the option to distribute
 * your version of this file under either the CDDL, the GPL Version 2 or
 * to extend the choice of license to its licensees as provided above.
 * However, if you add GPL Version 2 code and therefore, elected the GPL
 * Version 2 license, then the option applies only if the new code is
 * made subject to such option by the copyright holder.
 *
 * Contributor(s):
 *
 * Portions Copyrighted 2016 Sun Microsystems, Inc.
 */
package org.netbeans.modules.xml.text.api.dom;

import javax.swing.text.Document;
import org.netbeans.api.annotations.common.CheckForNull;
import org.w3c.dom.Node;

/**
 * Abstract predecessor for all syntax elements - nodes, tags, attributes. 
 * SyntaxElement represents a piece of XML document, similar to W3C Node, exposes offset
 * into the underlying text. Since the syntax model
 * can represent an error, which is not a W3C Node. For regular pieces of
 * text, W3C Node can be obtained ({@link #getNode}. Nodes obtained from SyntaxElements can be converted back
 * using {@link XMLSyntaxSupport#getSyntaxElement}.
 * <p/>
 * Obtaining previous or next element may result in lexing through the doucment - a document read
 * lock is internally obtained. If the caller plans to traverse through the document, document read lock for the
 * whole operation should be obtained, i.e. using {@link Document#render}.
 * <p/>
 * Erroneous pieces of text are represented by SyntaxElement, which is NOT convertible to a Node. Error elements
 * have the {@link #getType} or {@link #NODE_ERROR}. 
 * </p>
 * <i>Note:</i> use {@link #getType} instead of {@code instanceof} operator to check for a particular
 * element type. <b>Do not downcast</b> the {@code SyntaxElement}, use {@link #getNode} to get the DOM Node
 * implementation. If the {@link #getType} returns {@link Node#ELEMENT_NODE}, it is safe to downcast 
 * {@code SyntaxElement} to a {@link TagElement} and use extended interface.
 * 
 * @author sdedic
 * @sice 1.60
 */
public interface SyntaxElement {
    /**
     * Special type of element which represent an Erroneous piece of text
     */
    public static final int NODE_ERROR = -1;
    
    /**
     * Returns the next element in textual order.
     * @return next element or {@code null}
     */
    @CheckForNull
    public SyntaxElement getNext();
    
    /**
     * Provides the previous lexical element, in textual order
     * @return previous element or {@code null}
     */
    @CheckForNull
    public SyntaxElement getPrevious();
    
    /**
     * @return length of the element, including children
     */
    public int getElementLength();
    
    /**
     * Provides element's offset in the underlying document. Note that unless
     * accessed under document read-lock, the offset may not point a the correct place
     * in the document.
     * @return offset of the element start
     */
    public int getElementOffset();
    
    /**
     * Returns type of the node. The return value is one of the W3C Node types, 
     * or {@link #NODE_ERROR}
     * @return type of element
     */
    public int getType();
    
    /**
     * Returns Node, if the instance can be represented in W3C DOM model.
     * @return represented Node or {@code null}.
     */
    @CheckForNull
    public <T extends Node> T getNode();
    
    /**
     * Returns the parent element.
     * @return parent element or {@code null}
     */
    @CheckForNull
    public SyntaxElement getParentElement();
    
}




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2016 Oracle and/or its affiliates. All rights reserved.
 *
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 * Other names may be trademarks of their respective owners.
 *
 * The contents of this file are subject to the terms of either the GNU
 * General Public License Version 2 only ("GPL") or the Common
 * Development and Distribution License("CDDL") (collectively, the
 * "License"). You may not use this file except in compliance with the
 * License. You can obtain a copy of the License at
 * http://www.netbeans.org/cddl-gplv2.html
 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
 * specific language governing permissions and limitations under the
 * License.  When distributing the software, include this License Header
 * Notice in each file and include the License file at
 * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Oracle in the GPL Version 2 section of the License file that
 * accompanied this code. If applicable, add the following below the
 * License Header, with the fields enclosed by brackets [] replaced by
 * your own identifying information:
 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * If you wish your version of this file to be governed by only the CDDL
 * or only the GPL Version 2, indicate your decision by adding
 * "[Contributor] elects to include this software in this distribution
 * under the [CDDL or GPL Version 2] license." If you do not indicate a
 * single choice of license, a recipient has the option to distribute
 * your version of this file under either the CDDL, the GPL Version 2 or
 * to extend the choice of license to its licensees as provided above.
 * However, if you add GPL Version 2 code and therefore, elected the GPL
 * Version 2 license, then the option applies only if the new code is
 * made subject to such option by the copyright holder.
 *
 * Contributor(s):
 *
 * Portions Copyrighted 2016 Sun Microsystems, Inc.
 */
package org.netbeans.modules.xml.text.api.dom;

import org.netbeans.api.annotations.common.CheckForNull;

/**
 * Interface implemented by start/end tags. Use it to check what kind
 * of tag the SyntaxElement is. SyntaxElement can be only casted if its
 * {@link SyntaxElement#getType) returns {@link Node#ELEMENT_NODE}.
 * <p/>
 * {@link #getStartTag} and {@link #getEndTag} can be used to navigate over to
 * the paired element (and then possibly next in the textual order). Note that start
 * tag returns itself as start tag, and end tag returns itself from its {@code getEndTag}.
 * A self-closing tag will return itself from both methods.
 * <p/>
 * In order to access element's name or attributes, please use DOM API (e.g.
 * {@code element.getNode().getNodeName()} to get tag name).
 * 
 * @author Svatopluk Dedic
 * @since 1.60
 */
public interface TagElement extends SyntaxElement {

    /**
     * @return true, if the element is a regular start element
     */
    public boolean isStart();
    
    /**
     * @return true, if the element is a regular closing element.
     */
    public boolean isEnd();

    /**
     * @return true, if self-closing element without any textual content
     */
    public boolean isSelfClosing();

    /**
     * Start element for this TagElement. Returns itself if {@link #isStart} or {@link #isSelfClosing()} is true.
     * May return {@code null} if the document is not well formed
     * @return corresponding start element.
     */
    @CheckForNull
    public TagElement getStartTag();

    /**
     * Element element for this TagElement. Returns itself if {@link #isEnd} or {@link #isSelfClosing()} is true.
     * May return {@code null} if the document is not well formed
     * @return corresponding start element.
     */
    @CheckForNull
    public TagElement getEndTag();
    
}

Lines 42-154 Link Here

(-)a/xml.text/src/org/netbeans/modules/xml/text/dom/XMLSyntaxSupport.java (-90 / +603 lines)
42	* made subject to such option by the copyright holder.	42	* made subject to such option by the copyright holder.
43	*/	43	*/
44		44
45	package org.netbeans.modules.xml.text.dom;	45	package org.netbeans.modules.xml.text.api.dom;
46		46
		47	import com.sun.istack.internal.NotNull;
		48	import java.lang.ref.Reference;
		49	import java.lang.ref.WeakReference;
		50	import java.util.ArrayDeque;
		51	import java.util.ArrayList;
		52	import java.util.Arrays;
		53	import java.util.Collections;
		54	import java.util.Deque;
		55	import java.util.EnumSet;
		56	import java.util.LinkedList;
		57	import java.util.List;
		58	import java.util.Map;
		59	import java.util.Stack;
47	import java.util.WeakHashMap;	60	import java.util.WeakHashMap;
		61	import java.util.concurrent.Callable;
		62	import java.util.function.BiPredicate;
48	import javax.swing.event.DocumentListener;	63	import javax.swing.event.DocumentListener;
49	import javax.swing.event.DocumentEvent;	64	import javax.swing.event.DocumentEvent;
50		65
51	import javax.swing.text.AbstractDocument;	66	import javax.swing.text.AbstractDocument;
52	import javax.swing.text.BadLocationException;	67	import javax.swing.text.BadLocationException;
		68	import javax.swing.text.Document;
53	import javax.swing.text.JTextComponent;	69	import javax.swing.text.JTextComponent;
		70	import org.netbeans.api.annotations.common.CheckForNull;
		71	import org.netbeans.api.annotations.common.NonNull;
		72	import org.netbeans.api.annotations.common.NullAllowed;
		73	import org.netbeans.api.annotations.common.NullUnknown;
		74	import org.netbeans.api.editor.document.LineDocument;
54	import org.netbeans.api.lexer.Token;	75	import org.netbeans.api.lexer.Token;
55	import org.netbeans.api.lexer.TokenHierarchy;	76	import org.netbeans.api.lexer.TokenHierarchy;
56	import org.netbeans.api.lexer.TokenSequence;	77	import org.netbeans.api.lexer.TokenSequence;
57	import org.netbeans.api.xml.lexer.XMLTokenId;	78	import org.netbeans.api.xml.lexer.XMLTokenId;
		79	import static org.netbeans.api.xml.lexer.XMLTokenId.ARGUMENT;
		80	import static org.netbeans.api.xml.lexer.XMLTokenId.OPERATOR;
58	import org.netbeans.editor.BaseDocument;	81	import org.netbeans.editor.BaseDocument;
59	import org.openide.util.WeakListeners;	82	import org.netbeans.modules.xml.text.dom.BaseSyntaxElement;
		83	import org.netbeans.modules.xml.text.dom.CDATASection;
		84	import org.netbeans.modules.xml.text.dom.Comment;
		85	import org.netbeans.modules.xml.text.dom.DocumentType;
		86	import org.netbeans.modules.xml.text.dom.EmptyTag;
		87	import org.netbeans.modules.xml.text.dom.EndTag;
		88	import org.netbeans.modules.xml.text.dom.ProcessingInstruction;
		89	import org.netbeans.modules.xml.text.dom.StartTag;
		90	import org.netbeans.modules.xml.text.dom.TextImpl;
		91	import org.w3c.dom.NamedNodeMap;
		92	import org.w3c.dom.Node;
60		93
61	/**	94	/**
62	* Creates higher level syntax elements (DOM nodes) above token chain.	95	* Creates higher level syntax elements (DOM nodes) above token chain from XML lexer.
63	*	96	* The support class provides API to access lexical tokens around a particular location
		97	* and build a navigable DOM-like structure for the text over the lexer output so the
		98	* clients may read attributes, values and traverse the document. The structure may
		99	* be built incrementally on demand so if the client traverses or works with the entire
		100	* structure, the document should be read-locked; otherwise the element starts/ends may get
		101	* screwed by concurrent document mutations.
		102	* <p/>
		103	* The XMLSyntaxSupport creates DOM node implementations based on the lexer tokens. The entire
		104	* structure is coupled together but its entry points are only weakly referenced; once the caller
		105	* looses all references to SyntaxElements and XMLSyntaxSupport, the entire structure may
		106	* be collected.
		107	* <p/>
		108	* SyntaxElements are created on-demand and incrementally.
		109	* It's not guaranteed that {@link #getElementChain} returns the same instance
		110	* for the same offset if called multiple times. Also when document is traversed starting from
		111	* different SyntaxElements, the same offset/place in the document may be represented by
		112	* different SyntaxElement instances in both traversals. Use {@link SyntaxElement#getElementOffset} to
		113	* check if the underlying location is the same.
		114	* <p/>
		115	* In order to traverse through lexical {@link Token}s, the client may call {@link #runWithSequence(int, org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport.SequenceCallable)}
		116	* and get access to the {@link TokenSequence} of XML tokens. User code executes with document
		117	* read-locked and all calls from user code to {@link #getPreviousToken(int)}, {@link #getNextToken(int)} will use that
		118	* same sequence, so the sequence can be queried for current offset or repositioned.
		119	*
64	* @author Samaresh Panda	120	* @author Samaresh Panda
		121	* @author Svatopluk Dedic
		122	* @since 1.60
65	*/	123	*/
66	public class XMLSyntaxSupport {	124	public final class XMLSyntaxSupport {
67		125
68	/** Holds last character user have typed. */	126	/** Holds last character user have typed. */
69	private char lastInsertedChar = 'X'; // NOI18N
70	private final DocumentMonitor documentMonitor;	127	private final DocumentMonitor documentMonitor;
71	private BaseDocument document;	128	private final BaseDocument document;
72	private static WeakHashMap<BaseDocument, XMLSyntaxSupport> supportMap =	129	private final static Map<BaseDocument, Reference<XMLSyntaxSupport>> supportMap =
73	new WeakHashMap<BaseDocument, XMLSyntaxSupport>();	130	new WeakHashMap<>();
74		131
75	/** Creates new XMLSyntaxSupport */	132	/** Creates new XMLSyntaxSupport */
76	private XMLSyntaxSupport(BaseDocument doc) {	133	private XMLSyntaxSupport(BaseDocument doc) {
77	this.document = doc;	134	this.document = doc;
78	documentMonitor = new DocumentMonitor();	135	documentMonitor = createDocumentMonitor();
79	DocumentListener l = WeakListeners.document(documentMonitor, doc);	136	}
80	doc.addDocumentListener(l);	137
		138	private DocumentMonitor createDocumentMonitor() {
		139	synchronized (document) {
		140	Object o = document.getProperty(DocumentMonitor.class);
		141	if (o != null) {
		142	return (DocumentMonitor)o;
		143	}
		144	DocumentMonitor m = new DocumentMonitor();
		145	document.addDocumentListener(m);
		146	document.putProperty(DocumentMonitor.class, m);
		147	return m;
		148	}
		149	}
		150
		151	/**
		152	* Creates a new instance for the given document. The instance will not be
		153	* registered anywhere; the caller is responsible for bookkeeping. The method
		154	* can return null if the document implementation is not appropriate (does
		155	* not offer appropriate API/services). NB editor documents are guaranteed
		156	* to work with this support.
		157	*
		158	* @param d document
		159	* @return XML support instance, or {@code null} for incompatible documents.
		160	*/
		161	@CheckForNull
		162	public static XMLSyntaxSupport createSyntaxSupport(Document d) {
		163	if (d == null) {
		164	throw new NullPointerException("Document may not be null");
		165	}
		166	if (!(d instanceof BaseDocument)) {
		167	return null;
		168	}
		169	BaseDocument doc = (BaseDocument)d;
		170	return new XMLSyntaxSupport(doc);
81	}	171	}
82		172
83	public static XMLSyntaxSupport getSyntaxSupport(BaseDocument doc) {	173	/**
84	XMLSyntaxSupport support = supportMap.get(doc);	174	* Obtains XML Syntax support for the document. The instance may be shared
		175	* with different callers working with the same Document instance. May return
		176	* {@code null} for an incompatible Document; NB Editor documents are guaranteed
		177	* to work.
		178	*
		179	* @param d underlying document
		180	* @return syntax support
		181	*/
		182	@CheckForNull
		183	public static XMLSyntaxSupport getSyntaxSupport(Document d) {
		184	if (d == null) {
		185	throw new NullPointerException("Document may not be null");
		186	}
		187	if (!(d instanceof BaseDocument)) {
		188	return null;
		189	}
		190	BaseDocument doc = (BaseDocument)d;
		191	XMLSyntaxSupport support = null;
		192	Reference<XMLSyntaxSupport> refSupport = supportMap.get(doc);
		193	if (refSupport != null) {
		194	support = refSupport.get();
		195	}
85	if(support != null)	196	if(support != null)
86	return support;	197	return support;
87		198
88	support = new XMLSyntaxSupport(doc);	199	support = new XMLSyntaxSupport(doc);
89	supportMap.put(doc, support);	200	supportMap.put(doc, new WeakReference<>(support));
90	return support;	201	return support;
91	}	202	}
92		203
93	public BaseDocument getDocument() {	204	/**
		205	* @return underlying Document instance
		206	*/
		207	@NotNull
		208	public LineDocument getDocument() {
94	return document;	209	return document;
95	}	210	}
96		211
97	/**	212	/**
		213	* Run the given operation on a read-locked document.
		214	* @param <T> return type
		215	* @param userCode code to execute under the lock
		216	* @return result of user code.
		217	* @throws BadLocationException propagated from the user code
		218	* @throws IllegalStateException if a checked exception occurs in user code
		219	*/
		220	@NullUnknown
		221	public <T> T runLocked(Callable<T> userCode) throws BadLocationException {
		222	try {
		223	((AbstractDocument)document).readLock();
		224	return userCode.call();
		225	} catch (BadLocationException \| RuntimeException ex) {
		226	throw ex;
		227	} catch (Exception ex) {
		228	throw new IllegalStateException(ex);
		229	} finally {
		230	((AbstractDocument)document).readUnlock();
		231	}
		232	}
		233
		234	/**
		235	* Callback interface for user operation, which runs on lexical token sequence.
		236	* If the client needs to iterativaly traverse {@link TokenSequence} of tokens in the document,
		237	* calling {@link #getNextToken(int)} could be expensive and unreliable, as each call locks/unlocks the
		238	* document. Clients may use {@link #runWithSequence(org.netbeans.api.lexer.Token, org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport.SequenceCallable)}
		239	* to get access to the TokenSequence and work with it under document read lock.
		240	*
		241	* @param <T> result of the user code
		242	*/
		243	public interface SequenceCallable<T> {
		244	/**
		245	* Callback which receives the TokenSequence instance
		246	* @param sequence initialized TokenSequence
		247	* @return user-defined value
		248	* @throws BadLocationException should be thrown if navigation fails; propagated from the {@code runWithSequence}
		249	*/
		250	public T call(@NonNull TokenSequence sequence) throws BadLocationException;
		251	}
		252
		253	private ThreadLocal<TokenSequence> cachedSequence = new ThreadLocal<>();
		254
		255	private TokenSequence getSequence() {
		256	TokenSequence cached = cachedSequence.get();
		257	if (cached != null) {
		258	return cached;
		259	}
		260	TokenHierarchy th = TokenHierarchy.get(((AbstractDocument)document));
		261	TokenSequence ts = th.tokenSequence();
		262	return ts;
		263	}
		264
		265	/**
		266	* Executes user code on token sequence from the document.
		267	* Read-locks the document, obtains {@link TokenSequence} from the Lexer and executes {@code userCode}
		268	* passing the initialized sequence. The sequence is moved to the desired offset and the token that contains
		269	* or starts at that position. The client can move the sequence elsewhere.
		270	* <p/>
		271	* If the {@code userCode} calls this {@code SyntaxSupport} methods like {@link #getNextToken(int)}, they will use
		272	* the <b>same TokenSequence</b> as passed to {@code userCode}. This allows to combine navigation calls from {@link XMLSyntaxSupport}
		273	* with client's own sequence movements. The TokenSequence instance passed to {@code userCode} can be queried for
		274	* current token offset after navigation.
		275	*
		276	* @param <T>
277	* @param offset offset to position the sequence at
278	* @param userCode code to execute
279	* @return user-defined value
280	* @throws BadLocationException if the user code throws BadLocationException
281	* @throws IllegalStateException if the user code throws a checked exception
282	*/
283	@NullUnknown
284	public <T> T runWithSequence(int offset, SequenceCallable<T> userCode) throws BadLocationException {
285	T result;
286	TokenSequence old = null;
287	try {
288	((AbstractDocument)document).readLock();
289	old = cachedSequence.get();
290	cachedSequence.remove();
291	TokenSequence ts = getSequence();
292	if (ts == null) {
293	throw new BadLocationException("No sequence for position", offset); // NOI18N
294	}
295	cachedSequence.set(ts);
296	synchronized (ts) {
297	ts.move(offset);
298	ts.moveNext();
299	result = userCode.call(ts);
300	}
301	} finally {
302	cachedSequence.set(old);
303	((AbstractDocument)document).readUnlock();
304	}
305	return result;
306	}
307
308	/**
309	* Exeutes user code with {@link TokenSequence} positioned at a particular token.
310	* This convenience method works much like {@link #runWithSequence(int, org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport.SequenceCallable)},
311	* except that Token (its starting offset) is used to position the sequence instead of raw offset value.
312	*
313	* @param <T>
314	* @param startFrom token to start from
315	* @param userCode user code to execute
316	* @return user-defined value
317	* @throws BadLocationException if the user code throws BadLocationException
318	*/
319	public <T> T runWithSequence(Token<XMLTokenId> startFrom, SequenceCallable<T> userCode) throws BadLocationException {
320	T result;
321	TokenSequence old = null;
322	try {
323	((AbstractDocument)document).readLock();
324	old = cachedSequence.get();
325	cachedSequence.remove();
326	TokenHierarchy th = TokenHierarchy.get(((AbstractDocument)document));
327	TokenSequence ts = th.tokenSequence();
328	if (ts == null) {
329	throw new BadLocationException("No sequence for position", startFrom.offset(null)); // NOI18N
330	}
331	cachedSequence.set(ts);
332	synchronized (ts) {
333	ts.move(startFrom.offset(th));
334	ts.moveNext();
335	result = userCode.call(ts);
336	}
337	} finally {
338	cachedSequence.set(old);
339	((AbstractDocument)document).readUnlock();
340	}
341	return result;
342	}
343
344	/**
98	* Get token at given offet or previous one if at token boundary.	345	* Get token at given offet or previous one if at token boundary.
99	* It does not lock the document.	346	* It does not lock the document.
		347	* <p/>
		348	* Note: if the call is made within {@link #runWithSequence(int, org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport.SequenceCallable)} exection scope, the
		349	* search for previous token will use the same TokenSequence as passed to executed user callback.
		350	*
100	* @param offset valid position in document	351	* @param offset valid position in document
101	* @return TokenItem or <code>null</code> at the document beginning.	352	* @return TokenItem or <code>null</code> at the document beginning.
102	*/	353	*/
103	public Token getPreviousToken( int offset) throws BadLocationException {	354	public Token<XMLTokenId> getPreviousToken( int offset) throws BadLocationException {
104	if (offset == 0) return null;	355	if (offset == 0) return null;
105	if (offset < 0) throw new BadLocationException("Offset " +	356	if (offset < 0) throw new BadLocationException("Offset " +
106	offset + " cannot be less than 0.", offset); //NOI18N	357	offset + " cannot be less than 0.", offset); //NOI18N
107	((AbstractDocument)document).readLock();	358	((AbstractDocument)document).readLock();
108	try {	359	try {
109	TokenHierarchy th = TokenHierarchy.get(((AbstractDocument)document));	360	TokenSequence ts = getSequence();
110	TokenSequence ts = th.tokenSequence();	361	synchronized (ts) {
111	return getToken(ts, offset, false);	362	return getToken(ts, offset, false, null);
		363	}
112	} finally {	364	} finally {
113	((AbstractDocument)document).readUnlock();	365	((AbstractDocument)document).readUnlock();
114	}	366	}
115	}	367	}
116		368
117	/**	369	/**
118	* Get token at given offet or previous one if at token boundary.	370	* Get token at given offet or previous one if at token boundary.
119	* It does not lock the document.	371	*
		372	* It does not lock the document.
		373	* <p/>
		374	* Note: if the call is made within {@link #runWithSequence(int, org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport.SequenceCallable)} exection scope, the
		375	* search for previous token will use the same TokenSequence as passed to executed user callback.
		376	* <p/>
		377	* This variant returns start + end (after the token) offsets for the caller's convenience.
		378	*
120	* @param offset valid position in document	379	* @param offset valid position in document
		380	* @param tokenBounds output; will receive token start and end positions
121	* @return TokenItem or <code>null</code> at the document beginning.	381	* @return TokenItem or <code>null</code> at the document beginning.
122	*/	382	*/
123	public Token getNextToken( int offset) throws BadLocationException {	383	public Token<XMLTokenId> getPreviousToken(int offset, int[] tokenBounds) throws BadLocationException {
124	if (offset == 0) return null;	384	if (offset == 0) return null;
125	if (offset < 0) throw new BadLocationException("Offset " +	385	if (offset < 0) throw new BadLocationException("Offset " +
126	offset + " cannot be less than 0.", offset); //NOI18N	386	offset + " cannot be less than 0.", offset); //NOI18N
127	((AbstractDocument)document).readLock();	387	((AbstractDocument)document).readLock();
128	try {	388	try {
129	TokenHierarchy th = TokenHierarchy.get(((AbstractDocument)document));	389	TokenSequence ts = getSequence();
130	TokenSequence ts = th.tokenSequence();	390	synchronized (ts) {
131	return getToken(ts, offset, true);	391	return getToken(ts, offset, false, tokenBounds);
		392	}
132	} finally {	393	} finally {
133	((AbstractDocument)document).readUnlock();	394	((AbstractDocument)document).readUnlock();
134	}	395	}
135	}	396	}
136		397
137	private Token getToken(TokenSequence ts, int offset, boolean next) {	398	/**
138	ts.move(offset);	399	* Returns the token occupying the given position. The token either extends over this position, or
139	Token token = ts.token();	400	* it starts at that position (first token's char offset == offset).
140	//there are cases when this could be null	401	*
141	//in which case use the next one.	402	* @param offset offset in text for which the Token should be produced
142	if(token == null)	403	* @return XML token occupying the position
143	ts.moveNext();	404	* @throws BadLocationException
		405	*/
		406	public Token<XMLTokenId> getTokenAtPosition(int offset, int[] tokenBounds) throws BadLocationException {
		407	return getNextToken(offset + 1, tokenBounds);
		408	}
144		409
		410	/**
		411	* Retrieves the start of an attribute token. If the passed position does not correspond to
		412	* attribute value, operator or whitespace (between attribute name and value), {@code null}
		413	* is returned.
		414	* <p/>
		415	* Convenience method.
		416	*
		417	* @param offset starting offset
		418	* @return token corresponding to the attribute name ({@link XMLTokenId#ARGUMENT}).
		419	*/
		420	public Token<XMLTokenId> getAttributeToken(int offset) {
		421	try {
		422	return this.<Token<XMLTokenId>>runWithSequence(offset, (TokenSequence ts) -> {
		423	Token<XMLTokenId> currentToken = ts.token();
		424	if(currentToken.id() != XMLTokenId.VALUE) {
		425	return null;
		426	}
		427	Token<XMLTokenId> equalsToken = null;
		428	while (ts.movePrevious()) {
		429	Token<XMLTokenId> t = ts.token();
		430	if (t.id() == OPERATOR) {
		431	equalsToken = t;
		432	break;
		433	} else if (t.id() == XMLTokenId.ARGUMENT) {
		434	return t;
		435	} else if (t.id() != XMLTokenId.WS) {
		436	return null;
		437	}
		438	}
		439	if(equalsToken == null) {
		440	return null;
		441	}
		442	while (ts.movePrevious()) {
		443	Token<XMLTokenId> t = ts.token();
		444	if (t.id() == ARGUMENT) {
		445	return t;
		446	} else if (t.id() != XMLTokenId.WS) {
		447	return null;
		448	}
		449	}
		450	return null;
		451	});
		452	} catch (BadLocationException ex) {
		453	}
		454	return null;
		455	}
		456
		457
		458	/**
		459	* Get token at given offet or previous one if at token boundary.
		460	* It does not lock the document. Returns {@code null} for invalid offsets.
		461	*
		462	* @param offset valid position in document
		463	* @return Token instance
		464	*/
		465	public Token<XMLTokenId> getNextToken( int offset) throws BadLocationException {
		466	if (offset == 0) {
		467	offset = 1;
		468	}
		469	if (offset < 0) throw new BadLocationException("Offset " +
		470	offset + " cannot be less than 0.", offset); //NOI18N
		471	((AbstractDocument)document).readLock();
		472	try {
		473	TokenSequence ts = getSequence();
474	synchronized (ts) {
475	return getToken(ts, offset, true, null);
476	}
477	} finally {
478	((AbstractDocument)document).readUnlock();
479	}
480	}
481
482	/**
483	* Get token at given offet or previous one if at token boundary.
484	* It does not lock the document. Returns {@code null} for invalid offsets.
485	* <p/>
486	* This variant returns start + end (after the token) offsets for the caller's convenience.
487	*
488	* @param offset valid position in document
489	* @param tokenBounds output; will receive token start and end positions
490	* @return Token instance
491	*/
492	public Token getNextToken( int offset, int[] tokenBounds) throws BadLocationException {
493	if (offset == 0) return null;
494	if (offset < 0) throw new BadLocationException("Offset " +
495	offset + " cannot be less than 0.", offset); //NOI18N
496	((AbstractDocument)document).readLock();
497	try {
498	TokenSequence ts = getSequence();
499	synchronized (ts) {
500	return getToken(ts, offset, true, tokenBounds);
501	}
502	} finally {
503	((AbstractDocument)document).readUnlock();
504	}
505	}
506
507	private Token getToken(TokenSequence ts, int offset, boolean next, int[] startOffset) {
508	int diff = ts.move(offset);
509	boolean ok;
145	if(next) {	510	if(next) {
146	ts.moveNext();	511	ok = ts.moveNext();
		512	} else if (diff > 0) {
		513	ok = ts.moveNext();
147	} else {	514	} else {
148	ts.movePrevious();	515	ok = ts.movePrevious();
149	}	516	}
150	token = ts.token();	517	if (!ok) {
151	return token;	518	return null;
		519	}
		520	if (startOffset != null) {
		521	startOffset[0] = ts.offset();
		522	if (startOffset.length > 1) {
		523	startOffset[1] = ts.offset() + ts.token().length();
		524	}
		525	}
		526	return ts.token();
152	}	527	}
153		528
154		529
Lines 158-170 Link Here
158	* @param offset Offset in document where to search for SyntaxElement.	533	* @param offset Offset in document where to search for SyntaxElement.
159	* @return SyntaxElement Element surrounding or laying BEFORE the offset	534	* @return SyntaxElement Element surrounding or laying BEFORE the offset
160	* or <code>null</code> at document begining.	535	* or <code>null</code> at document begining.
		536	* @throws javax.swing.text.BadLocationException when offset is invalid or navigation fails
161	*/	537	*/
162	public SyntaxElement getElementChain(final int offset ) throws BadLocationException {	538	public SyntaxElement getElementChain(final int offset ) throws BadLocationException {
163		539
164	((AbstractDocument)document).readLock();	540	((AbstractDocument)document).readLock();
165	try {	541	try {
166	TokenHierarchy th = TokenHierarchy.get(((AbstractDocument)document));	542	TokenSequence<XMLTokenId> ts = getSequence();
167	TokenSequence<XMLTokenId> ts = th.tokenSequence();
168	Token<XMLTokenId> token = initialize(ts, offset);	543	Token<XMLTokenId> token = initialize(ts, offset);
169	if(token == null)	544	if(token == null)
170	return null;	545	return null;
Lines 198-210 Link Here
198	}	573	}
199		574
200	private Token<XMLTokenId> initialize(TokenSequence ts, int offset) {	575	private Token<XMLTokenId> initialize(TokenSequence ts, int offset) {
201	ts.move(offset);	576	int diff = ts.move(offset);
202	Token<XMLTokenId> token = ts.token();	577	Token<XMLTokenId> token = ts.token();
203	if(token == null) {	578	if (diff > 0) {
204	if(!ts.moveNext())	579	if (!ts.moveNext()) {
205	return null;	580	return null;
206	token = ts.token();	581	}
		582	} else if (!ts.movePrevious()) {
		583	return null;
207	}	584	}
		585	token = ts.token();
208	XMLTokenId id = token.id();	586	XMLTokenId id = token.id();
209	String image = token.text().toString();	587	String image = token.text().toString();
210	if ( id == XMLTokenId.WS \|\|	588	if ( id == XMLTokenId.WS \|\|
Lines 267-273 Link Here
267	}	645	}
268		646
269	case TEXT: {	647	case TEXT: {
270	return new Text(this, token, start, end);	648	return new TextImpl(this, token, start, end);
271	}	649	}
272		650
273	case TAG: {	651	case TAG: {
Lines 289-350 Link Here
289	}	667	}
290		668
291	case ERROR: {	669	case ERROR: {
292	return new SyntaxElement.Error(this, token, start, end );	670	return new BaseSyntaxElement.Error(this, token, start, end );
293	}	671	}
294	}	672	}
295		673
296	return null;	674	return null;
297	}	675	}
298		676
299	/**	677	/**
300	* No completion inside PI, CDATA, comment section.	678	* Returns last inserted character.
301	* True only inside PI or CDATA section, false otherwise.	679	* It's most likely one recently typed by user. Note that in order to start capturing
302	* @param target	680	* editor events, the XMLSupport must be activated for the document. When XMLSupport is first
		681	* created for a Document, it does not provide any lastTypedChar; the subsequent edits are
		682	* recorded.
303	*/	683	*/
304	public static boolean noCompletion(JTextComponent target) {
305	if(target == null \|\| target.getCaret() == null)
306	return false;
307	int offset = target.getCaret().getDot();
308	if(offset < 0)
309	return false;
310	//no completion inside CDATA or comment section
311	BaseDocument document = (BaseDocument)target.getDocument();
312	((AbstractDocument)document).readLock();
313	try {
314	TokenHierarchy th = TokenHierarchy.get(document);
315	TokenSequence ts = th.tokenSequence();
316	if(ts == null)
317	return false;
318	ts.move(offset);
319	Token token = ts.token();
320	if(token == null) {
321	ts.moveNext();
322	token = ts.token();
323	if(token == null)
324	return false;
325	}
326	if( token.id() == XMLTokenId.CDATA_SECTION \|\|
327	token.id() == XMLTokenId.BLOCK_COMMENT \|\|
328	token.id() == XMLTokenId.PI_START \|\|
329	token.id() == XMLTokenId.PI_END \|\|
330	token.id() == XMLTokenId.PI_CONTENT \|\|
331	token.id() == XMLTokenId.PI_TARGET ) {
332	return true;
333	}
334	} finally {
335	((AbstractDocument)document).readUnlock();
336	}
337
338	return false;
339	}
340
341	/** Returns last inserted character. It's most likely one recently typed by user. */
342	public final char lastTypedChar() {	684	public final char lastTypedChar() {
343	return lastInsertedChar;	685	return documentMonitor.lastInsertedChar;
344	}	686	}
345		687
346	/** Keep track of last typed character */	688	/** Keep track of last typed character */
347	private class DocumentMonitor implements DocumentListener {	689	private static class DocumentMonitor implements DocumentListener {
		690
		691	private char lastInsertedChar = 'X'; // NOI18N
348		692
349	public void changedUpdate(DocumentEvent e) {	693	public void changedUpdate(DocumentEvent e) {
350	}	694	}
Lines 362-366 Link Here
362	public void removeUpdate(DocumentEvent e) {	706	public void removeUpdate(DocumentEvent e) {
363	}	707	}
364	}	708	}
		709
		710	/**
		711	* Determines if the SyntaxElement is a start or end tag.
		712	*
		713	* @param n element to test
		714	* @return true, if the element is a start or end tag. False if Node does not represent a tag, or for an empty tag
		715	*/
		716	public boolean isNormalTag(SyntaxElement n) {
		717	return isStartTag(n) \|\| isEndTag(n);
		718	}
		719
		720	/**
		721	* Determines if the SyntaxElement is a start tag.
		722	* Returns {@code false} if Node does not represent a start tag, or is a self-closed (empty content) tag
		723	* @param n element to test
		724	* @return true, if the element is a start tag.
		725	*/
		726	public boolean isStartTag(SyntaxElement n) {
		727	return n instanceof StartTag;
		728	}
		729
		730	/**
		731	* Returns true iff the element is a self-closing tag.
		732	* Returns true if and only if the SyntaxElement represents a self-closing tag without content. False otherwise.
		733	* @param n element to check
		734	* @return true, if self-closing tag
		735	*/
		736	public boolean isEmptyTag(SyntaxElement n) {
		737	return n instanceof EmptyTag;
		738	}
		739
		740	/**
		741	* Determines if the SyntaxElement is an end tag.
		742	* Returns {@code false} if Node does not represent an end tag, or is a self-closed (empty content) tag
		743	* @param n element to test
		744	* @return true, if the element is a start tag.
		745	*/
		746	public boolean isEndTag(SyntaxElement n) {
		747	return n instanceof EndTag;
		748	}
		749
		750	/**
		751	* Returns text offset of the Node start in the underlying document.
		752	* Returns -1 if the offset could not be determined. Use this method to find out
		753	* offset of a DOM Node obtained from a {@link SyntaxElement} or {@link XMLSyntaxSupport}
		754	* @param n
		755	* @return offset or -1 if the offset could not be determined.
		756	*/
		757	public int getNodeOffset(Node n) {
		758	if (!(n instanceof SyntaxElement)) {
		759	if (n instanceof Document) {
		760	return 0;
		761	}
		762	return -1;
		763	}
		764	return ((SyntaxElement)n).getElementOffset();
		765	}
		766
		767	/**
		768	* Obtains a SyntaxElement for the W3C Node, if possible.
		769	* @param n the Node
		770	* @return corresponding SyntaxElement or {@code null}.
		771	*/
		772	public SyntaxElement getSyntaxElement(Node n) {
773	if (n instanceof SyntaxElement) {
774	return (SyntaxElement)n;
775	} else {
776	return null;
777	}
778	}
779
780	/**
781	* Convenience method to get attribute value as string. Returns {@code null}
782	* if the Node is not a start/empty element, or does not contain attribute of the specified name.
783	* For namespaced names, you must use the exact {@code prefix:localName}.
784	*
785	* @param n node
786	* @param name attribute name
787	* @return attribute (string) value or {@code null} if no such attribute exist for element n.
788	*/
789	public static String getAttributeValue(Node n, String name) {
790	NamedNodeMap a = n.getAttributes();
791	if (a == null) {
792	return null;
793	}
794	Node item = a.getNamedItem(name);
795	if (item == null) {
796	return null;
797	}
798	return item.getNodeValue();
799	}
800
801	/**
802	* Constructs a path from the root of the document to the given syntax element.
803	*
804	* @param element the element to start with
805	* @return top-down path of SyntaxElements from the document root towards the original SyntaxElement
806	*/
807	public List<SyntaxElement> getPathFromRoot(SyntaxElement element) {
808	Deque<SyntaxElement> stack = new ArrayDeque<>();
809	SyntaxElement elementRef = element;
810	while (elementRef != null) {
811	if (isEndTag(element) \|\|
812	(isEmptyTag(elementRef) && stack.isEmpty()) \|\|
813	(isStartTag(elementRef) && stack.isEmpty())) {
814	stack.push(elementRef);
815	elementRef = elementRef.getPrevious();
816	continue;
817	}
818	if (isStartTag(elementRef)) {
819	if (isEndTag(stack.peek())) {
820	SyntaxElement end = stack.peek();
821	if (end.getNode().getNodeName().equals(elementRef.getNode().getNodeName())) {
822	stack.pop();
823	}
824	} else {
825	SyntaxElement e = stack.peek();
826	stack.push(elementRef);
827	}
828	}
829	elementRef = elementRef.getPrevious();
830	}
831	// reverse:
832	List<SyntaxElement> res = new ArrayList<>(stack.size());
833	while ((elementRef = stack.poll()) != null) {
834	res.add(elementRef);
835	}
836	return res;
837	}
838
839	/**
840	* Skips forward or backward specified token types. Simplified variant of {@link #skip(int, boolean, java.util.function.BiPredicate)},
841	* only token types to skip can be specified. The first token of type other than those passed in {@code skipTokens} will be returned from the method.
842	*
843	* @param offset position to start at.
844	* @param forward true means froward, false backward
845	* @param skipTokens token types to skip
846	* @return first token whose type does not match the specified values
847	* @throws BadLocationException
848	*/
849	public Token<XMLTokenId> skip(int offset, boolean forward, XMLTokenId... skipTokens) throws BadLocationException {
850	EnumSet<XMLTokenId> en = EnumSet.copyOf(Arrays.asList(skipTokens));
851	return skip(offset, forward, (TokenSequence s, Token<XMLTokenId> t) -> en.contains(t.id()));
852	}
853
854	/**
855	* Skips tokens matched by the predicate from the given offset. Positions {@link TokenSequence} on the specified offset,
856	* then traverses either forward or backward, depending on a parameter until the predicate returns false.
857	* The token for which the predicate failed will be returned as the return value.
858	*
859	* @param offset offset to start traversal
860	* @param forward true for forward traversal, false for backward
861	* @param pred predicate to match tokens. Method skips tokens that satisfy the predicate (until the first which does not)
862	* @return
863	* @throws BadLocationException
864	*/
865	public Token<XMLTokenId> skip(int offset, boolean forward, BiPredicate<TokenSequence, Token<XMLTokenId>> pred) throws BadLocationException {
866	Token<XMLTokenId> tukac = runWithSequence(offset, (TokenSequence s) -> {
867	s.move(offset);
868	while ((forward && s.moveNext()) \|\| (!forward && s.movePrevious())) {
869	if (!pred.test(s, s.token())) {
870	return s.token();
871	}
872	}
873	return null;
874	});
875	return tukac;
876	}
877
365	}	878	}
366		879




made subject to such option by the copyright holder.

Contributor(s):

Portions Copyrighted 2016 Sun Microsystems, Inc.
-->
<html>
<body>
    <p>
        API for read-only access XML structure using DOM-like interface. Implemented over XML lexer,
        so the structure can be obtained even on malformed, unfinished or errneous documents.
        The caller may obtain a SyntaxElement corresponding to a given textual position in the XML document.
        The SyntaxElement can be used to both read contents (attributes, tag name, ...) of the document,
        or navigate to sibling, predecessor, parent or child Elements. SyntaxElement can be converted to 
        DOM Node; DOM Nodes obtained originally as a result of SyntaxElement conversion can be converted
        back to SyntaxElements so the caller can retrieve their position within the document.
    </p>
    <p>
        It is advisable to perform searches or navigation through the document under a document read (write)
        lock. Implementations in this package read-lock the document internally, but generally no lock is
        preserved across method calls.
    </p>
    <p>
        The design / structure of the API is intentionally almost the same as with the obsoleted api located in
        <code>org.netbeans.modules.xml.text.syntax.dom</code> package to make the existing code migration easier.
    </p>
</body>
</html>




import org.netbeans.modules.editor.structure.api.DocumentElementListener;
import org.netbeans.modules.editor.structure.api.DocumentModel;
import org.netbeans.modules.editor.structure.api.DocumentModelException;
import static org.netbeans.modules.xml.text.structure.XMLConstants.*;
import org.openide.cookies.OpenCookie;
import org.openide.loaders.DataObject;
import org.openide.util.Exceptions;

        DocumentElement el = mdl.getLeafElementForOffset(pos);
        OUT: while (el != null) {
            switch (el.getType()) {
                case XML_TAG:
                case XML_EMPTY_TAG:
                case XML_PI:
                case XML_CDATA:
                case XML_DOCTYPE:
                    break OUT;
                default:
                    el = el.getParentElement();

        @Override
        public String getHtmlDisplayName() {
            switch (docEl.getType()) {
                case XML_TAG:
                case XML_EMPTY_TAG:
                    return docEl.getName();
                case XML_PI:
                    return docEl.getName();
                case XML_CDATA:
                    return Bundle.LABEL_CDATA();
                case XML_DOCTYPE:
                    return Bundle.LABEL_DOCTYPE();
                default:
                    // unsupported nodes

            String resource;
            
            switch (docEl.getType()) {
                case XML_TAG:
                case XML_EMPTY_TAG:
                    resource = TAG_16; 
                    break;
                case XML_PI:
                    resource = PI_16;
                    break;
                case XML_CDATA:
                    resource = CDATA_16;
                    break;
                case XML_DOCTYPE:
                    resource = DOCTYPE_16;
                    break;
                default:

            List<BreadcrumbsElement> children = new ArrayList<>();
            for (DocumentElement ch : docEl.getChildren()) {
                switch (ch.getType()) {
                    case XML_TAG:
                    case XML_EMPTY_TAG:
                    case XML_PI:
                    case XML_CDATA:
                    case XML_DOCTYPE:
                        children.add(createElement(ch, this));
                        break;
                    default:




import org.netbeans.modules.xml.api.model.GrammarEnvironment;
import org.netbeans.modules.xml.api.model.GrammarQuery;
import org.netbeans.modules.xml.api.model.GrammarQueryManager;
import org.netbeans.modules.xml.text.api.dom.SyntaxElement;
import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
import org.netbeans.modules.xml.text.syntax.dom.SyntaxNode;
import org.openide.filesystems.FileChangeAdapter;
import org.openide.filesystems.FileChangeListener;
import org.openide.filesystems.FileEvent;

                
                while (en.hasMoreElements()) {
                    Node next = (Node) en.nextElement();
                    if (next instanceof SyntaxElement) {
                        SyntaxElement node = (SyntaxElement) next;
                        int start = node.getElementOffset();
                        int end = start + node.getElementLength();
                        if (end > max) max = end;

        SyntaxElement first = syntax.getElementChain(1);
        while (true) {
            if (first == null) break;
            Node node = first.getNode();
            if (node != null) {
                ctx.add(node);
                if (Node.ELEMENT_NODE == node.getNodeType()) {
                    break;
                }
            }




import org.netbeans.editor.BaseDocument;
import org.netbeans.modules.xml.api.model.GrammarQuery;
import org.netbeans.modules.xml.api.model.HintContext;
import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
import org.netbeans.modules.xml.text.completion.XMLCompletionQuery;
import org.netbeans.modules.xml.text.syntax.XMLSyntaxSupport;
import org.openide.nodes.FilterNode;
import org.openide.nodes.Node;
import org.openide.nodes.Sheet;

        if (syntaxSupport == null) {
            Document doc = pane.getDocument();
            if (doc instanceof BaseDocument) {
                syntaxSupport = XMLSyntaxSupport.getSyntaxSupport((BaseDocument)doc);
            }
            if (syntaxSupport == null) {
                return;

Lines 45-56 Link Here

(-)a/xml.text/src/org/netbeans/modules/xml/text/completion/SyntaxQueryHelper.java (-73 / +95 lines)
45	package org.netbeans.modules.xml.text.completion;	45	package org.netbeans.modules.xml.text.completion;
46		46
47	import javax.swing.text.BadLocationException;	47	import javax.swing.text.BadLocationException;
		48	import org.netbeans.api.lexer.Token;
		49	import org.netbeans.api.lexer.TokenSequence;
		50	import org.netbeans.api.xml.lexer.XMLTokenId;
48		51
49	import org.netbeans.editor.*;
50	import org.netbeans.modules.xml.api.model.HintContext;	52	import org.netbeans.modules.xml.api.model.HintContext;
51	import org.netbeans.modules.xml.text.syntax.*;	53	import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
52	import org.netbeans.modules.xml.text.syntax.dom.*;	54	import org.netbeans.modules.xml.text.api.dom.SyntaxElement;
53	import org.netbeans.modules.xml.text.api.XMLDefaultTokenContext;	55	import org.w3c.dom.Attr;
54	import org.w3c.dom.Element;	56	import org.w3c.dom.Element;
55	import org.w3c.dom.NamedNodeMap;	57	import org.w3c.dom.NamedNodeMap;
56	import org.w3c.dom.Node;	58	import org.w3c.dom.Node;
Lines 71-79 Link Here
71	public final static int COMPLETION_TYPE_ENTITY = 4;	73	public final static int COMPLETION_TYPE_ENTITY = 4;
72	public final static int COMPLETION_TYPE_NOTATION = 5;	74	public final static int COMPLETION_TYPE_NOTATION = 5;
73	public final static int COMPLETION_TYPE_DTD = 6;	75	public final static int COMPLETION_TYPE_DTD = 6;
		76
		77	private XMLSyntaxSupport support;
74		78
75	/** Currect oken or previous one if at token boundary */	79	/** Currect oken or previous one if at token boundary */
76	private TokenItem token = null;	80	private Token<XMLTokenId> token = null;
		81
		82	private int tokenOffset;
77		83
78	private String preText = "";	84	private String preText = "";
79		85
Lines 91-100 Link Here
91		97
92	/** Creates a new instance of SyntaxQueryHelper */	98	/** Creates a new instance of SyntaxQueryHelper */
93	public SyntaxQueryHelper(XMLSyntaxSupport sup, int offset) throws BadLocationException, IllegalStateException {	99	public SyntaxQueryHelper(XMLSyntaxSupport sup, int offset) throws BadLocationException, IllegalStateException {
		100	this.support = sup;
94	tunedOffset = offset;	101	tunedOffset = offset;
95	token = sup.getPreviousToken( tunedOffset);	102	sup.runWithSequence(tunedOffset, (TokenSequence seq) -> {
		103	token = sup.getPreviousToken(tunedOffset);
		104	tokenOffset = seq.offset();
		105	return null;
		106	});
		107
96	if( token != null ) { // inside document	108	if( token != null ) { // inside document
97	tokenBoundary = token.getOffset() + token.getImage().length() == tunedOffset;	109	tokenBoundary = tokenOffset + token.length() == tunedOffset;
98	} else {	110	} else {
99	//??? start of document no choice now, but should be prolog if not followed by it	111	//??? start of document no choice now, but should be prolog if not followed by it
100	throw new BadLocationException("No token found at current position", offset); // NOI18N	112	throw new BadLocationException("No token found at current position", offset); // NOI18N
Lines 102-118 Link Here
102		114
103	// find out last typed chars that can hint	115	// find out last typed chars that can hint
104		116
105	int itemOffset = token.getOffset();	117	int itemOffset = tokenOffset;
106	preText = "";	118	preText = "";
107	erase = 0;	119	erase = 0;
108	int eraseRight = 0;	120	int eraseRight = 0;
109	int id = token.getTokenID().getNumericID();	121	XMLTokenId id = token.id();
110		122
111	// determine last typed text, prefix text	123	// determine last typed text, prefix text
112		124
113	if ( tokenBoundary == false ) {	125	if ( tokenBoundary == false ) {
114		126
115	preText = token.getImage().substring( 0, tunedOffset - token.getOffset() );	127	preText = token.text().toString().substring( 0, tunedOffset - tokenOffset);
116	if ("".equals(preText)) throw new IllegalStateException("Cannot get token prefix at " + tunedOffset);	128	if ("".equals(preText)) throw new IllegalStateException("Cannot get token prefix at " + tunedOffset);
117		129
118	// manipulate tunedOffset to delete rest of an old name	130	// manipulate tunedOffset to delete rest of an old name
Lines 121-131 Link Here
121	if (sup.lastTypedChar() != '<' && sup.lastTypedChar() != '&') {	133	if (sup.lastTypedChar() != '<' && sup.lastTypedChar() != '&') {
122	switch (id) {	134	switch (id) {
123		135
124	case XMLDefaultTokenContext.TAG_ID:	136	case TAG:
125	case XMLDefaultTokenContext.CHARACTER_ID:	137	case CHARACTER:
126	case XMLDefaultTokenContext.ARGUMENT_ID:	138	case ARGUMENT:
127		139
128	int i = token.getImage().length();	140	int i = token.length();
129	int tail = i - (tunedOffset - itemOffset);	141	int tail = i - (tunedOffset - itemOffset);
130	tunedOffset += tail;	142	tunedOffset += tail;
131	eraseRight = tail;	143	eraseRight = tail;
Lines 134-145 Link Here
134	}	146	}
135	} else {	147	} else {
136	switch (id) {	148	switch (id) {
137	case XMLDefaultTokenContext.TEXT_ID:	149	case TEXT:
138	case XMLDefaultTokenContext.TAG_ID:	150	case TAG:
139	case XMLDefaultTokenContext.ARGUMENT_ID:	151	case ARGUMENT:
140	case XMLDefaultTokenContext.CHARACTER_ID:	152	case CHARACTER:
141	case XMLCompletionQuery.PI_CONTENT_ID:	153	case PI_CONTENT:
142	preText = token.getImage();	154	preText = token.text().toString();
143	break;	155	break;
144	}	156	}
145	}	157	}
Lines 147-164 Link Here
147	// adjust how much do you want to erase from the preText	159	// adjust how much do you want to erase from the preText
148		160
149	switch (id) {	161	switch (id) {
150	case XMLDefaultTokenContext.TAG_ID:	162	case TAG:
151	// do not erase start delimiters	163	// do not erase start delimiters
152	erase = preText.length() - 1 + eraseRight;	164	erase = preText.length() - 1 + eraseRight;
153	break;	165	break;
154	case XMLDefaultTokenContext.CHARACTER_ID:	166	case CHARACTER:
155	//entity references	167	//entity references
156	erase = preText.length() + -1 + eraseRight;	168	erase = preText.length() + -1 + eraseRight;
157	break;	169	break;
158	case XMLDefaultTokenContext.ARGUMENT_ID:	170	case ARGUMENT:
159	erase = preText.length() + eraseRight;	171	erase = preText.length() + eraseRight;
160	break;	172	break;
161	case XMLDefaultTokenContext.VALUE_ID:	173	case VALUE:
162	erase = preText.length();	174	erase = preText.length();
163	if (erase > 0 && (preText.charAt(0) == '\'' \|\| preText.charAt(0) == '"')) {	175	if (erase > 0 && (preText.charAt(0) == '\'' \|\| preText.charAt(0) == '"')) {
164	// Because of attribute values, preText is adjusted in initContext	176	// Because of attribute values, preText is adjusted in initContext
Lines 172-185 Link Here
172	if (element == null) throw new IllegalStateException("There exists a token therefore a syntax element must exist at " + offset + ", too.");	184	if (element == null) throw new IllegalStateException("There exists a token therefore a syntax element must exist at " + offset + ", too.");
173		185
174	// completion request originates from area covered by DOM,	186	// completion request originates from area covered by DOM,
175	if (element instanceof SyntaxNode && ((SyntaxNode)element).getNodeType() != Node.DOCUMENT_TYPE_NODE) {	187	if (element.getType() != SyntaxElement.NODE_ERROR && element.getType() != Node.DOCUMENT_TYPE_NODE) {
176	completionType = initContext();	188	completionType = support.runLocked(this::initContext);
177	} else {	189	} else {
178	// prolog, internal DTD no completition yet	190	// prolog, internal DTD no completition yet
179	completionType = COMPLETION_TYPE_DTD;	191	completionType = COMPLETION_TYPE_DTD;
180	}	192	}
181	}	193	}
182		194
		195	public int getTokenOffset() {
		196	return tokenOffset;
		197	}
		198
183	/**	199	/**
184	* Find out what to complete: attribute, value, element, entity or notation?	200	* Find out what to complete: attribute, value, element, entity or notation?
185	* <p>	201	* <p>
Lines 207-218 Link Here
207	* COMPLETION_TYPE_ENTITY = 4,	223	* COMPLETION_TYPE_ENTITY = 4,
208	* COMPLETION_TYPE_NOTATION = 5.	224	* COMPLETION_TYPE_NOTATION = 5.
209	*/	225	*/
210	private int initContext() {	226	private int initContext() throws BadLocationException {
211	int id = token.getTokenID().getNumericID();	227	XMLTokenId id = token.id();
212	SyntaxNode syntaxNode = (SyntaxNode)element;	228	final Node syntaxNode = element.getNode();
213
214	switch ( id) {	229	switch ( id) {
215	case XMLDefaultTokenContext.TEXT_ID:	230	case TEXT:
216	if ( preText.endsWith("<" ) \|\| preText.endsWith("</")) {	231	if ( preText.endsWith("<" ) \|\| preText.endsWith("</")) {
217	ctx.init(syntaxNode, "");	232	ctx.init(syntaxNode, "");
218	return COMPLETION_TYPE_ELEMENT;	233	return COMPLETION_TYPE_ELEMENT;
Lines 227-238 Link Here
227	}	242	}
228	// break;	243	// break;
229		244
230	case XMLDefaultTokenContext.TAG_ID:	245	case TAG:
231	if ( StartTag.class.equals(syntaxNode.getClass())	246	if (support.isNormalTag(element)) {
232	\|\| EmptyTag.class.equals(syntaxNode.getClass())) {
233	if (preText.equals("")) {	247	if (preText.equals("")) {
234	//??? should not occure	248	//??? should not occure
235	if (token.getImage().endsWith(">")) {	249	if (token.text().toString().endsWith(">")) {
236	ctx.init(syntaxNode, preText);	250	ctx.init(syntaxNode, preText);
237	return COMPLETION_TYPE_VALUE;	251	return COMPLETION_TYPE_VALUE;
238	} else {	252	} else {
Lines 253-277 Link Here
253	ctx.init(syntaxNode, preText.substring(1));	267	ctx.init(syntaxNode, preText.substring(1));
254	return COMPLETION_TYPE_ELEMENT;	268	return COMPLETION_TYPE_ELEMENT;
255	}	269	}
256	} else if(EndTag.class.equals(syntaxNode.getClass()) && preText.startsWith("</")){	270	} else if(support.isEndTag(element) && preText.startsWith("</")){
257	//endtag	271	//endtag
258	ctx.init(syntaxNode, preText.substring(2));	272	ctx.init(syntaxNode, preText.substring(2));
259	return COMPLETION_TYPE_ELEMENT;	273	return COMPLETION_TYPE_ELEMENT;
260	} else {	274	} else {
261	// pairing tag completion if not at boundary	275	// pairing tag completion if not at boundary
262	if ("".equals(preText) && token.getImage().endsWith(">")) {	276	if ("".equals(preText) && token.text().toString().endsWith(">")) {
263	ctx.init(syntaxNode, preText);	277	ctx.init(syntaxNode, preText);
264	return COMPLETION_TYPE_VALUE;	278	return COMPLETION_TYPE_VALUE;
265	}	279	}
266	}	280	}
267	break;	281	break;
268		282
269	case XMLDefaultTokenContext.VALUE_ID:	283	case VALUE:
270	if (preText.endsWith("&")) {	284	if (preText.endsWith("&")) {
271	ctx.init(syntaxNode, "");	285	ctx.init(syntaxNode, "");
272	return COMPLETION_TYPE_ENTITY;	286	return COMPLETION_TYPE_ENTITY;
273	} else if ("".equals(preText)) { //??? improve check to addres inner '"'	287	} else if ("".equals(preText)) { //??? improve check to addres inner '"'
274	String image = token.getImage();	288	String image = token.text().toString();
275	char ch = image.charAt(image.length()-1);	289	char ch = image.charAt(image.length()-1);
276		290
277	// findout if it is closing '	291	// findout if it is closing '
Lines 283-305 Link Here
283	return COMPLETION_TYPE_UNKNOWN;	297	return COMPLETION_TYPE_UNKNOWN;
284	}	298	}
285		299
286	boolean closing = false;	300	int res = support.<Integer>runWithSequence(tokenOffset, (TokenSequence seq) -> {
287	TokenItem prev = token.getPrevious();	301	Token<XMLTokenId> prev = support.getPreviousToken(tokenOffset);
		302	boolean closing = false;
288		303
289	while (prev != null) {	304	while (prev != null) {
290	int tid = prev.getTokenID().getNumericID();	305	XMLTokenId tid = prev.id();
291	if (tid == XMLDefaultTokenContext.VALUE_ID) {	306	if (tid == XMLTokenId.VALUE) {
292	closing = true;	307	closing = true;
293	break;	308	break;
294	} else if (tid == XMLDefaultTokenContext.CHARACTER_ID) {	309	} else if (tid == XMLTokenId.CHARACTER) {
295	prev = prev.getPrevious();	310	if (!seq.movePrevious()) {
		311	return COMPLETION_TYPE_UNKNOWN;
		312	}
		313	prev = seq.token();
		314	} else {
		315	break;
		316	}
		317	}
		318	if (closing == false) {
		319	ctx.init(syntaxNode, preText);
		320	return COMPLETION_TYPE_VALUE;
296	} else {	321	} else {
297	break;	322	return COMPLETION_TYPE_UNKNOWN;
298	}	323	}
299	}	324	});
300	if (closing == false) {	325	if (res != COMPLETION_TYPE_UNKNOWN) {
301	ctx.init(syntaxNode, preText);	326	return res;
302	return COMPLETION_TYPE_VALUE;
303	}	327	}
304	} else {	328	} else {
305	ctx.init(syntaxNode, preText);	329	ctx.init(syntaxNode, preText);
Lines 312-322 Link Here
312	int maxOffsetLessThanCurrent = -1;	336	int maxOffsetLessThanCurrent = -1;
313	Node curAttrNode = null;	337	Node curAttrNode = null;
314	for (int ind = 0; ind < attrs.getLength(); ind++) {	338	for (int ind = 0; ind < attrs.getLength(); ind++) {
315	AttrImpl attr = (AttrImpl)attrs.item(ind);	339	SyntaxElement attr = (SyntaxElement)attrs.item(ind);
316	int attrTokOffset = attr.getFirstToken().getOffset();	340	int attrTokOffset = attr.getElementOffset();
317	if (attrTokOffset > maxOffsetLessThanCurrent && attrTokOffset < token.getOffset()) {	341	if (attrTokOffset > maxOffsetLessThanCurrent && attrTokOffset < tokenOffset) {
318	maxOffsetLessThanCurrent = attrTokOffset;	342	maxOffsetLessThanCurrent = attrTokOffset;
319	curAttrNode = attr;	343	curAttrNode = (Node)attr;
320	}	344	}
321	}	345	}
322		346
Lines 333-351 Link Here
333	}	357	}
334	break;	358	break;
335		359
336	case XMLDefaultTokenContext.OPERATOR_ID:	360	case OPERATOR:
337	if ("".equals(preText)) {	361	if ("".equals(preText)) {
338	if ("=".equals(token.getImage())) {	362	if ("=".equals(token.text())) {
339	ctx.init(syntaxNode, "");	363	ctx.init(syntaxNode, "");
340	return COMPLETION_TYPE_VALUE;	364	return COMPLETION_TYPE_VALUE;
341	}	365	}
342	}	366	}
343	break;	367	break;
344		368
345	case XMLDefaultTokenContext.WS_ID:	369	case WS:
346	if ((StartTag.class.equals(syntaxNode.getClass())	370	if (support.isNormalTag(element)
347	\|\| EmptyTag.class.equals(syntaxNode.getClass()))	371	&& !token.text().toString().startsWith("/")) {
348	&& !token.getImage().startsWith("/")) {
349	ctx.init((Element)syntaxNode, ""); // GrammarQuery.v2 takes Element ctx	372	ctx.init((Element)syntaxNode, ""); // GrammarQuery.v2 takes Element ctx
350	return COMPLETION_TYPE_ATTRIBUTE;	373	return COMPLETION_TYPE_ATTRIBUTE;
351	} else {	374	} else {
Lines 354-368 Link Here
354	}	377	}
355	// break;	378	// break;
356		379
357	case XMLDefaultTokenContext.ARGUMENT_ID:	380	case ARGUMENT:
358	if (StartTag.class.equals(syntaxNode.getClass())	381	if (support.isStartTag(element)
359	\|\| EmptyTag.class.equals(syntaxNode.getClass())) {	382	\|\| support.isEmptyTag(element)) {
360	//try to find the current attribute	383	//try to find the current attribute
361	Tag tag = (Tag)syntaxNode;	384	NamedNodeMap nnm = syntaxNode.getAttributes();
362	NamedNodeMap nnm = tag.getAttributes();
363	for(int i = 0; i < nnm.getLength(); i++) {	385	for(int i = 0; i < nnm.getLength(); i++) {
364	AttrImpl attrNode = (AttrImpl)nnm.item(i);	386	Attr attrNode = (Attr)nnm.item(i);
365	if(attrNode.getFirstToken().getOffset() == token.getOffset()) {	387	if(support.getNodeOffset(attrNode) == tokenOffset) {
366	ctx.init(attrNode, preText);	388	ctx.init(attrNode, preText);
367	}	389	}
368	}	390	}
Lines 373-379 Link Here
373	}	395	}
374	break;	396	break;
375		397
376	case XMLDefaultTokenContext.CHARACTER_ID: // entity reference	398	case CHARACTER: // entity reference
377	if (preText.startsWith("&#")) {	399	if (preText.startsWith("&#")) {
378	// character ref, ignore	400	// character ref, ignore
379	return COMPLETION_TYPE_UNKNOWN;	401	return COMPLETION_TYPE_UNKNOWN;
Lines 384-390 Link Here
384	ctx.init(syntaxNode, preText.substring(1));	406	ctx.init(syntaxNode, preText.substring(1));
385	return COMPLETION_TYPE_ENTITY;	407	return COMPLETION_TYPE_ENTITY;
386	} else if ("".equals(preText)) {	408	} else if ("".equals(preText)) {
387	if (token.getImage().endsWith(";")) {	409	if (token.text().toString().endsWith(";")) {
388	ctx.init(syntaxNode, preText);	410	ctx.init(syntaxNode, preText);
389	return COMPLETION_TYPE_VALUE;	411	return COMPLETION_TYPE_VALUE;
390	}	412	}
Lines 408-414 Link Here
408	}	430	}
409		431
410	/** Current token or previous one if at token boundary. */	432	/** Current token or previous one if at token boundary. */
411	public TokenItem getToken() {	433	public Token<XMLTokenId> getToken() {
412	return token;	434	return token;
413	}	435	}
414		436




import javax.swing.text.Document;
import javax.swing.text.JTextComponent;
import org.netbeans.api.editor.completion.Completion;
import org.netbeans.api.lexer.Token;
import org.netbeans.api.lexer.TokenSequence;
import org.netbeans.api.xml.lexer.XMLTokenId;
import org.netbeans.editor.BaseDocument;
import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
import org.netbeans.editor.TokenItem;
import org.netbeans.modules.xml.text.api.XMLDefaultTokenContext;
import org.netbeans.modules.xml.text.syntax.XMLSyntaxSupport;
import org.netbeans.editor.Utilities;
import org.netbeans.editor.ext.ExtSyntaxSupport;
import org.netbeans.modules.xml.text.api.dom.SyntaxElement;
import org.netbeans.spi.editor.completion.CompletionItem;
import org.netbeans.spi.editor.completion.CompletionResultSet;
import org.netbeans.spi.editor.completion.support.AsyncCompletionQuery;
import org.netbeans.spi.editor.completion.support.AsyncCompletionTask;
import org.netbeans.spi.editor.completion.CompletionProvider;
import org.netbeans.spi.editor.completion.CompletionTask;
import org.openide.util.Exceptions;
import org.openide.util.NbBundle;

/**

    
    @Override
    public int getAutoQueryTypes(JTextComponent component, String typedText) {
        XMLSyntaxSupport support = XMLSyntaxSupport.getSyntaxSupport(component.getDocument());
        if( (support == null) || !(support instanceof XMLSyntaxSupport))
            return 0;
        
        int type = checkCompletion(support, component, typedText, false);
        if(type == ExtSyntaxSupport.COMPLETION_POPUP)
            return COMPLETION_QUERY_TYPE;
        
        return 0;
    }

    /** Schedule content update making completion visible. */
    public static final int COMPLETION_POPUP = 0;
    /** Cancel request without changing completion visibility. */
    public static final int COMPLETION_CANCEL = 1;
    /** Update content immediatelly if it's currently visible. */
    public static final int COMPLETION_REFRESH = 2;
    /** Schedule content update if it's currently visible. */
    public static final int COMPLETION_POST_REFRESH = 3;
    /** Hide completion. */
    public static final int COMPLETION_HIDE = 4;
    
    private int checkCompletion(XMLSyntaxSupport support, JTextComponent target, String typedText, boolean visible ) {
        
        if( !visible ) {
            int retVal = COMPLETION_CANCEL;
            switch( typedText.charAt( typedText.length()-1 ) ) {
                case '/':
                    int dotPos = target.getCaret().getDot();
                    BaseDocument doc = (BaseDocument)target.getDocument();
                    if (dotPos >= 2) { // last char before inserted slash
                        try {
                            String txtBeforeSpace = doc.getText(dotPos-2, 2);
                            if( txtBeforeSpace.equals("</") )  // NOI18N
                                retVal = COMPLETION_POPUP;
                        } catch (BadLocationException e) {
                            Exceptions.printStackTrace(e);
                        }
                    }
                    break;
                    
                case '<':
                case '&':
                case '"':
                case '\'':
                    retVal = COMPLETION_POPUP;
                    break;
                case '>':
                    dotPos = target.getCaret().getDot();
                    try {
                        SyntaxElement sel = support.getElementChain(dotPos);
                        if(support.isStartTag(sel)) {
                            retVal = COMPLETION_POPUP;
                        }
                    } catch (BadLocationException e) {
                        //ignore
                    }
                    break;
            }
            if(noCompletion(support, target))
                return COMPLETION_HIDE;            
            return retVal;
        } else { // the pane is already visible
            switch (typedText.charAt(0)) {
                case '>':
                case ';':
                    return COMPLETION_HIDE;
            }
            //requestedAutoCompletion = true;
            return COMPLETION_POST_REFRESH; //requery it
        }
    }
    
    /**
     * No completion inside PI, CDATA, comment section.
     * True only inside PI or CDATA section, false otherwise.
     * @param target
     */
    boolean noCompletion(XMLSyntaxSupport support, JTextComponent target) {
        if(target == null || target.getCaret() == null)
            return false;
        int offset = target.getCaret().getDot();
        if(offset < 0)
            return false;            
        //no completion inside CDATA or comment section
        try {
            return support.<Boolean>runWithSequence(offset, (TokenSequence ts) -> {
                Token<XMLTokenId> token = ts.token();
                if (token == null) {
                    ts.moveNext();
                    token = ts.token();
                    if (token == null) {
                        return false;
                    }
                }
                if (token.id() == XMLTokenId.CDATA_SECTION
                        || token.id() == XMLTokenId.BLOCK_COMMENT
                        || token.id() == XMLTokenId.PI_START
                        || token.id() == XMLTokenId.PI_END
                        || token.id() == XMLTokenId.PI_CONTENT
                        || token.id() == XMLTokenId.PI_TARGET) {
                    return true;
                }
                return false;
            });
        } catch (BadLocationException ex) {
            Exceptions.printStackTrace(ex);
        }
        return false;
    }
    
    @Override
    public CompletionTask createTask(int queryType, JTextComponent component) {


        @Override
        protected void query(CompletionResultSet resultSet, Document doc, int caretOffset) {
            XMLSyntaxSupport support = XMLSyntaxSupport.getSyntaxSupport(doc);
            XMLSyntaxSupport support = (syntaxSupport instanceof XMLSyntaxSupport ?
                (XMLSyntaxSupport) syntaxSupport : null);
            if (!ENABLED || support == null) {
                resultSet.finish();
                return;
            }
            
            resultSet.setWaitText(NbBundle.getMessage(XMLCompletionProvider.class, "MSG_loading_dtd"));
            List<CompletionItem> items = QUERY.query(component, caretOffset, XMLSyntaxSupport.getSyntaxSupport((BaseDocument)doc));
            if(items != null) resultSet.addAllItems(items);
            resultSet.finish();
        }

        //test whether we are just in text and eventually close the opened completion
        //this is handy after end tag autocompletion when user doesn't complete the
        //end tag and just types a text
        XMLSyntaxSupport sup = XMLSyntaxSupport.getSyntaxSupport(doc);
        try {
            Token<XMLTokenId> ti = sup.getNextToken(caretOffset <= 0 ? 1 : caretOffset - 1);
            if(ti != null && ti.id()== XMLTokenId.TEXT && !ti.text().toString().startsWith("<") && !ti.text().toString().startsWith("&")) {
                hideCompletion();
            }
        }catch(BadLocationException e) {




import javax.swing.text.BadLocationException;
import javax.swing.text.Document;
import org.netbeans.api.lexer.Token;
import org.netbeans.api.lexer.TokenHierarchy;
import org.netbeans.api.lexer.TokenId;
import org.netbeans.api.lexer.TokenSequence;
import org.netbeans.api.xml.lexer.XMLTokenId;

import org.netbeans.editor.*;
import org.openide.ErrorManager;

import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
import org.netbeans.modules.xml.api.model.*;
import org.netbeans.modules.xml.spi.dom.UOException;
import org.netbeans.modules.xml.text.api.dom.SyntaxElement;
import org.netbeans.modules.xml.text.bracematch.XMLBraceMatcher;
import org.netbeans.modules.xml.text.syntax.dom.SyntaxNode;
import org.netbeans.spi.editor.completion.CompletionItem;
import org.openide.util.Exceptions;
import org.openide.util.NbBundle;

/**

 * @version 1.01
 */

public class XMLCompletionQuery {
    
    // the name of a property indentifing cached query
    public static final String DOCUMENT_GRAMMAR_BINDING_PROP = "doc-bind-query";

     * @param support syntax-support that will be used during resolving of the query.
     * @return result of the query or null if there's no result.
     */
    public List<CompletionItem> query(JTextComponent component, int offset, XMLSyntaxSupport sup) {        
        BaseDocument doc = (BaseDocument)component.getDocument();
        if (doc == null) return null;
        XMLSyntaxSupport sup = (XMLSyntaxSupport)support.get(XMLSyntaxSupport.class);
        if( sup == null ) return null;// No SyntaxSupport for us, no hint for user        
        try {
            SyntaxQueryHelper helper = new SyntaxQueryHelper(sup, offset);
            

                ***************************************************************/
                
                if (list.isEmpty() && helper.getPreText().startsWith("</")) { // NOI18N
                    List stlist = findStartTag(helper.getSyntaxElement(), !helper.getPreText().endsWith("/") ? "/" : "");
                    if (stlist != null && !stlist.isEmpty()) {
                        ElementResultItem item = (ElementResultItem)stlist.get(0); //we always get just one item
                        if(!XMLBraceMatcher.hasEndTag(doc, offset, item.getItemText()) &&

//                            );                
            } else {
                // prolog, internal DTD no completition yet
                if (helper.getToken().id() == XMLTokenId.PI_CONTENT) {
                    if (helper.getPreText().endsWith("encoding=")) {                        // NOI18N
//                        List encodings = new ArrayList(2);
//                        encodings.add(new XMLResultItem(0, "\"UTF-8\""));          // NOI18N

            int delLen = 0;
            String suffix = null;
            if (helper.getToken() != null) {
                if (helper.getToken().id() == XMLTokenId.TEXT) {
                    String c = helper.getToken().text().toString();
                    String p = helper.getPreText();
                    // special case: do not remove text after newline to
                    // preserve formatting / indentation

                    if (tagName != null) {
                        suffix = "</" + tagName + ">";
                    }
                } else if (helper.getToken().id() == XMLTokenId.VALUE) {
                    String c = helper.getToken().text().toString();
                    delLen = c.length();
                    if (c.charAt(0) == '"' ||
                        c.charAt(0) == '\'') {

                    if (c.charAt(l) == '"' || c.charAt(l) == '\'') {
                        delLen--;
                    }
                } else if (helper.getToken().id() == XMLTokenId.TAG) {
                    String tagName = shouldCloseTag(helper, doc, sup);
                    if (tagName != null) {
                        suffix = "</" + tagName + ">";

        return result;
    }
    
    private String shouldCloseTagLocked(TokenSequence ts) {
        if (!ts.movePrevious()) {
            return null;
        }
        Token<XMLTokenId> previous = ts.token();
        if (previous.id() != XMLTokenId.TAG) {
            // preceded by something else than tag name, i.e. argument, operator...
            return null;
        }
        String tagName  = previous.text().toString();
        if (tagName.equals(">")) { // NOI18N
            // closing brace of a tag, iterate towards tag's begin, skip attributes and their values.
            boolean ok;
            
            while (ok = !ts.movePrevious()) {
                previous = ts.token();
                if (previous.id() == XMLTokenId.TAG) {
                    break;
                }
            }
            if (!ok) {
                return null;
            }
            // got tagname.
            tagName = previous.text().toString();
        }
        if (tagName.startsWith(END_TAG_PREFIX)) {
            // traversal through preceding tags, counting end-start pairs not implemented.

        } 
        // tag name does not include end sharp brace
        tagName = tagName.substring(1, tagName.length()).trim();
        if (isClosingEndTagFoundAfter(ts.offset(), ts, tagName)) {
        if (isClosingEndTagFoundAfter(ti.getOffset(), s, tagName)) {
            // I know, there may be multiple levels of the same tag name, and the innermost may
            // be missing...
            return null;

        return tagName;
    }
    
    private String shouldCloseTag(SyntaxQueryHelper helper, Document doc, XMLSyntaxSupport sup) {
        Token<XMLTokenId> ti = helper.getToken();
        try {
            return sup.runWithSequence(helper.getTokenOffset(), this::shouldCloseTagLocked);
        } catch (BadLocationException ex) {
            Exceptions.printStackTrace(ex);
        }
        return null;
    }
    
    public static final String
        TAG_FIRST_CHAR = "<", //NOI18N
        TAG_LAST_CHAR  = ">", //NOI18N

     * @param prefix that is prepended to created ElementResult e.g. '</'
     * @return list with one ElementResult or empty.
     */
    private static List<CompletionItem> findStartTag(SyntaxElement text, String prefix) {
        //if ( Util.THIS.isLoggable() ) /* then */ Util.THIS.debug("XMLCompletionQuery.findStartTag: text=" + text);
        
        SyntaxElement parentEl = text.getParentElement();
        if (parentEl == null) {
            return Collections.EMPTY_LIST;
        }
        Node parent = parentEl.getNode();
        if (parent == null) {
            return Collections.EMPTY_LIST;
        }
        
        String name = parent.getNodeName();
        //if ( Util.THIS.isLoggable() ) Util.THIS.debug("    name=" + name);
        if ( name == null ) {

        return list;
    }
    
    private static List<CompletionItem> findStartTag(SyntaxElement text) {
        return findStartTag(text, "");
    }
    




import javax.swing.JLabel;
import javax.swing.UIManager;
import org.netbeans.api.editor.completion.Completion;
import org.netbeans.api.lexer.Token;
import org.netbeans.api.lexer.TokenSequence;
import org.netbeans.api.queries.FileEncodingQuery;
import org.netbeans.api.xml.lexer.XMLTokenId;
import org.netbeans.modules.xml.api.model.GrammarResult;
import org.netbeans.modules.xml.api.model.DescriptionSource;
import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
import org.netbeans.modules.xml.text.syntax.XMLSyntaxSupport;
import org.netbeans.spi.editor.completion.CompletionDocumentation;
import org.netbeans.spi.editor.completion.CompletionItem;
import org.netbeans.spi.editor.completion.CompletionResultSet;

        }
        return true;
    }
    
    private boolean isRemovingAvailableLocked(TokenSequence ts, Document doc, int offset, String replaceToText) {
        ts.move(position);
        boolean isTextRemovingAllowable = true;
        
        while (ts.moveNext() && isTextRemovingAllowable) {
            Token<XMLTokenId> tokenItem = ts.token();
            String tokenItemImage = tokenItem.text().toString();
        TokenItem tokenItem = support.getTokenChain(offset, doc.getLength());
        boolean isTextRemovingAllowable = (tokenItem == null);
        if (! isTextRemovingAllowable) {
            String tokenItemImage = tokenItem.getImage();
            if ((tokenItemImage != null) && (tokenItemImage.length() > 0)) {
                // See also issue #228865. In this case, the token also may include a prefix
                // of the replacement value
                String replaceInclPrefix;
                int offs = Math.max(0, offset - ts.offset());
                replaceInclPrefix = tokenItemImage.substring(0, offs) + replaceToText;
                int diffPos = getFirstDiffPosition(tokenItemImage, replaceInclPrefix);
                diffPos = diffPos == 0 ? 1 : diffPos;

                        strText = replaceInclPrefix.length() >= diffPos ?
                            replaceInclPrefix.substring(0, diffPos) : replaceInclPrefix;

                    XMLTokenId id = tokenItem.id();
                    isTextRemovingAllowable = (id == XMLTokenId.TAG ?

                    isTextRemovingAllowable = (id == XMLDefaultTokenContext.TAG_ID ?
                        ! strImg.startsWith(strText) /* <= for tags */ :
                        strImg.startsWith(strText)   /* <= for attributes */);
                }

        return isTextRemovingAllowable;
    }

    //+++ fix for issues #166462, #173122
    //    (http://www.netbeans.org/issues/show_bug.cgi?id=166462)
    //    (http://www.netbeans.org/issues/show_bug.cgi?id=173122)
    private boolean isTextRemovingAllowable(JTextComponent component,
        BaseDocument doc, String replaceToText, int offset) throws BadLocationException {
        XMLSyntaxSupport support = XMLSyntaxSupport.getSyntaxSupport(component.getDocument());
        return support.runWithSequence(offset, (TokenSequence ts) -> isRemovingAvailableLocked(ts, doc, offset, replaceToText));
    }

    /**
     * Calculates the index of the first difference between two strings. 
     * If they are differenent starting the first character, then 0 is returned.

Lines 44-56 Link Here

(-)a/xml.text/src/org/netbeans/modules/xml/text/dom/Attr.java (-146 / +276 lines)
44		44
45	package org.netbeans.modules.xml.text.dom;	45	package org.netbeans.modules.xml.text.dom;
46		46
		47	import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
47	import java.util.*;	48	import java.util.*;
		49	import javax.swing.text.BadLocationException;
		50	import org.netbeans.api.editor.document.AtomicLockDocument;
		51	import org.netbeans.api.editor.document.LineDocument;
		52	import org.netbeans.api.editor.document.LineDocumentUtils;
48		53
49	import org.netbeans.api.lexer.Token;	54	import org.netbeans.api.lexer.Token;
		55	import org.netbeans.api.lexer.TokenSequence;
50	import org.netbeans.api.xml.lexer.XMLTokenId;	56	import org.netbeans.api.xml.lexer.XMLTokenId;
51	import org.netbeans.modules.xml.spi.dom.AbstractNode;	57	import org.netbeans.modules.xml.spi.dom.AbstractNode;
52	import org.netbeans.modules.xml.spi.dom.NodeListImpl;	58	import org.netbeans.modules.xml.spi.dom.NodeListImpl;
		59	import org.netbeans.modules.xml.text.api.dom.SyntaxElement;
		60	import org.netbeans.modules.xml.text.api.XMLTextUtils;
		61	import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport.SequenceCallable;
		62	import org.openide.util.Exceptions;
		63	import org.w3c.dom.DOMException;
53	import org.w3c.dom.Element;	64	import org.w3c.dom.Element;
		65	import org.w3c.dom.NamedNodeMap;
54	import org.w3c.dom.Node;	66	import org.w3c.dom.Node;
55	import org.w3c.dom.NodeList;	67	import org.w3c.dom.NodeList;
56	import org.w3c.dom.Text;	68	import org.w3c.dom.Text;
Lines 65-87 Link Here
65	* @author Petr Kuzel	77	* @author Petr Kuzel
66	* @author asgeir@dimonsoftware.com	78	* @author asgeir@dimonsoftware.com
67	*/	79	*/
68	public class Attr extends AbstractNode implements org.w3c.dom.Attr {	80	public class AttrImpl extends AbstractNode implements org.w3c.dom.Attr, SyntaxElement {
		81	private Token<XMLTokenId> first;
		82	private SyntaxElement parent;
		83	private XMLSyntaxSupport syntax; // that produced us
		84	private int index;
69		85
70	private Token<XMLTokenId> first;	86	AttrImpl(XMLSyntaxSupport syntax, Token<XMLTokenId> first, SyntaxElement parent, int index) {
71
72	private Element parent;
73
74	private XMLSyntaxSupport syntax; // that produced us
75
76	Attr(XMLSyntaxSupport syntax, Token<XMLTokenId> first, Element parent) {
77	this.parent = parent;	87	this.parent = parent;
78	this.first = first;	88	this.first = first;
79	this.syntax = syntax;	89	this.syntax = syntax;
		90	this.index = index;
80	}	91	}
81		92
82	public Token getFirstToken() {	93	public Token getFirstToken() {
83	return first;	94	return first;
84	}	95	}
		96
		97	@Override
		98	public SyntaxElement getParentElement() {
		99	return parent;
		100	}
85		101
86	/**	102	/**
87	* @return list of child nodes (Text or EntityReference), never <code>null</code>	103	* @return list of child nodes (Text or EntityReference), never <code>null</code>
Lines 97-102 Link Here
97		113
98	return new NodeListImpl(list);	114	return new NodeListImpl(list);
99	}	115	}
		116
		117	@Override
		118	public SyntaxElement getNext() {
		119	if (parent == null) {
		120	return null;
		121	}
		122	NamedNodeMap attrs = ((Element)parent.getNode()).getAttributes();
		123	if (index < attrs.getLength() - 1) {
		124	return (SyntaxElement)attrs.item(index + 1);
		125	} else {
		126	return parent.getNext();
		127	}
		128	}
		129
		130	@Override
		131	public SyntaxElement getPrevious() {
		132	if (parent == null) {
		133	return null;
		134	}
		135	NamedNodeMap attrs = ((Element)parent.getNode()).getAttributes();
		136	if (index > 0) {
		137	return (SyntaxElement)attrs.item(index - 1);
		138	} else {
		139	return parent.getPrevious();
		140	}
		141	}
		142
		143	@Override
		144	public int getElementLength() {
		145	return getLength();
		146	}
		147
		148	@Override
		149	public int getElementOffset() {
		150	return first.offset(null);
		151	}
		152
		153	@Override
		154	public int getType() {
		155	return Node.ATTRIBUTE_NODE;
		156	}
		157
		158	@Override
		159	public Node getNode() {
		160	return this;
		161	}
100		162
101	/**	163	/**
102	* Get next sibling for non syntax element text.	164	* Get next sibling for non syntax element text.
Lines 120-158 Link Here
120	}	182	}
121		183
122	public Node getNextSibling() {	184	public Node getNextSibling() {
123	return null; //according to DOM-1spec	185	if (parent == null) {
		186	return null;
		187	}
		188	NamedNodeMap attrs = ((Element)parent.getNode()).getAttributes();
		189	if (index < attrs.getLength() - 1) {
		190	return attrs.item(index + 1);
		191	} else {
		192	return null;
		193	}
124	}	194	}
125		195
126	public Node getPreviousSibling() {	196	public Node getPreviousSibling() {
127	return null; //according to DOM-1 spec	197	if (parent == null) {
		198	return null;
		199	}
		200	NamedNodeMap attrs = ((Element)parent.getNode()).getAttributes();
		201	if (index > 0) {
		202	return attrs.item(index - 1);
		203	} else {
		204	return null;
		205	}
		206	}
		207
		208	private Node getFirstChildLocked(TokenSequence ts) {
		209	while (ts.moveNext()) {
		210	Token<XMLTokenId> t = ts.token();
		211	if (t.id() == XMLTokenId.VALUE) {
		212	// fuzziness to relax minor tokenization changes
		213	CharSequence image = t.text();
		214	if (image.length() == 1) {
		215	char test = image.charAt(0);
		216	if (test == '"' \|\| test == '\'') {
		217	if (ts.moveNext()) {
		218	t = ts.token();
		219	} else {
		220	return null;
		221	}
		222	}
		223	}
		224
		225	if (t.id() == XMLTokenId.VALUE) {
		226	return new TextImpl(syntax, t, ts.offset(), ts.offset() + t.length(), this);
		227	} else {
		228	return null;
		229	}
		230	}
		231	}
		232	return null;
128	}	233	}
129		234
130	public Node getFirstChild() {	235	public Node getFirstChild() {
131	// TokenItem next = first;	236	try {
132	// for (; next != null; next = next.getNext()) {	237	return syntax.runWithSequence(first, this::getFirstChildLocked);
133	// if (next.getTokenID() == VALUE) {	238	} catch (BadLocationException ex) {
134	// // fuzziness to relax minor tokenization changes	239	Exceptions.printStackTrace(ex);
135	// String image = next.getImage();	240	return null;
136	// if (image.length() == 1) {	241	}
137	// char test = image.charAt(0);
138	// if (test == '"' \|\| test == '\'') {
139	// next = next.getNext();
140	// }
141	// }
142	// break; // we are after opening "'"
143	// }
144	// }
145	// if (next == null) return null;
146	// if (next.getTokenID() == VALUE) {
147	// return new TextImpl(syntax, next, this); //!!! strip out ending "'", return standalone "'" token
148	// } else {
149	// throw new RuntimeException("Not recognized yet: " + next.getTokenID());
150	// }
151	return null;
152	}	242	}
153		243
154	public Node getLastChild() {	244	public Node getLastChild() {
155	throw new RuntimeException("Not implemented yet");	245	return getFirstChild();
156	}	246	}
157		247
158	public String getNodeName() {	248	public String getNodeName() {
Lines 160-167 Link Here
160	}	250	}
161		251
162	public String getName() {	252	public String getName() {
163	//return first.getImage();	253	return first.text().toString();
164	return null;
165	}	254	}
166		255
167	public boolean getSpecified() {	256	public boolean getSpecified() {
Lines 169-250 Link Here
169	}	258	}
170		259
171	public void setValue(String value) {	260	public void setValue(String value) {
172	// // Initialize oldValueStartPos and oldValueLength parameters	261	class H implements SequenceCallable {
173	// int oldValueStartPos = -1;	262	int oldValueStartPos = -1;
174	// int oldValueLength = 0;	263	int oldValueLength = 0;
175	// boolean notClosed = false;	264	boolean notClosed = false;
176	// char firstChar = '"';	265	char firstChar = '"';
177	// char lastChar = '\0';	266	char lastChar = '\0';
178	// TokenItem next = first;	267
179	// for (; next != null; next = next.getNext()) {	268	@Override
180	// TokenID nextId = next.getTokenID();	269	public Object call(TokenSequence ts) throws BadLocationException {
181	//	270	Token<XMLTokenId> next = first;
182	// if (oldValueStartPos != -1 && nextId != VALUE && nextId != CHARACTER) {	271	while (ts.moveNext()) {
183	// break;	272	next = ts.token();
184	// }	273	XMLTokenId nextId = next.id();
185	//	274
186	// String nextImage = next.getImage();	275	if (oldValueStartPos != -1 && nextId != XMLTokenId.VALUE && nextId != XMLTokenId.CHARACTER) {
187	//	276	break;
188	// String actualImage = Util.actualAttributeValue(nextImage);	277	}
189	// if (!nextImage.equals(actualImage)) {	278
190	// notClosed = true;	279	String nextImage = next.text().toString();
191	// nextImage = actualImage;	280
192	// }	281	String actualImage = XMLTextUtils.actualAttributeValue(nextImage);
193	//	282	if (!nextImage.equals(actualImage)) {
194	// if (nextId == VALUE && oldValueStartPos == -1 && nextImage.length() > 0) {	283	notClosed = true;
195	// oldValueStartPos = next.getOffset();	284	nextImage = actualImage;
196	// if (nextImage.charAt(0) == '"' \|\| nextImage.charAt(0) == '\'') {	285	}
197	// firstChar = nextImage.charAt(0);	286
198	// oldValueStartPos++;	287	if (nextId == XMLTokenId.VALUE && oldValueStartPos == -1 && nextImage.length() > 0) {
199	// oldValueLength--;	288	oldValueStartPos = ts.offset();
200	// }	289	if (nextImage.charAt(0) == '"' \|\| nextImage.charAt(0) == '\'') {
201	// }	290	firstChar = nextImage.charAt(0);
202	//	291	oldValueStartPos++;
203	// if (oldValueStartPos != -1 && nextImage.length() > 0) {	292	oldValueLength--;
204	// oldValueLength += nextImage.length();	293	}
205	// lastChar = nextImage.charAt(nextImage.length()-1);	294	}
206	// }	295
207	//	296	if (oldValueStartPos != -1 && nextImage.length() > 0) {
208	// if (notClosed) {	297	oldValueLength += nextImage.length();
209	// break;	298	lastChar = nextImage.charAt(nextImage.length()-1);
210	// }	299	}
211	// }	300
212	//	301	if (notClosed) {
213	// if (lastChar == firstChar) {	302	break;
214	// oldValueLength--;	303	}
215	// }	304	}
216	//	305	if (lastChar == firstChar) {
217	// // Replace known entities	306	oldValueLength--;
218	// value = Util.replaceCharsWithEntityStrings(value);	307	}
219	//	308
220	// // Close the attribute if it was non-closed	309	return null;
221	// if (notClosed) {	310	}
222	// value += firstChar;	311	}
223	// }	312	H h = new H();
224	//	313	try {
225	// // Replace the text in the document	314	syntax.runWithSequence(first.offset(null), h);
226	// BaseDocument doc = (BaseDocument)syntax.getDocument();	315	} catch (BadLocationException ex) {
227	// doc.atomicLock();	316	throw new DOMException(DOMException.INVALID_STATE_ERR , ex.getMessage());
228	// try {	317	}
229	// doc.remove(oldValueStartPos, oldValueLength);	318
230	// doc.insertString(oldValueStartPos, value, null);	319	// Replace known entities
231	// doc.invalidateSyntaxMarks();	320	value = XMLTextUtils.replaceCharsWithEntityStrings(value);
232	// } catch( BadLocationException e ) {	321
233	// throw new DOMException(DOMException.INVALID_STATE_ERR , e.getMessage());	322	// Close the attribute if it was non-closed
234	// } finally {	323	if (h.notClosed) {
235	// doc.atomicUnlock();	324	value += h.firstChar;
236	// }	325	}
237	//	326
238	// // Update the status of this object	327	// Replace the text in the document
239	// try {	328	final LineDocument doc = syntax.getDocument();
240	// int endOffset = oldValueStartPos + oldValueLength;	329	AtomicLockDocument ald = LineDocumentUtils.asRequired(doc, AtomicLockDocument.class);
241	// if (endOffset > doc.getLength()) {	330	final BadLocationException[] ex = new BadLocationException[1];
242	// endOffset = doc.getLength();	331	final int fOldValStartPos = h.oldValueStartPos;
243	// }	332	final int fOldValLen = h.oldValueLength;
244	// first = syntax.getTokenChain(first.getOffset(), endOffset);	333	final String fValue = value;
245	// } catch (BadLocationException e) {	334	ald.runAtomic(() -> {;
246	// throw new DOMException(DOMException.INVALID_STATE_ERR , e.getMessage());	335	try {
247	// }	336	doc.remove(fOldValStartPos, fOldValLen);
		337	doc.insertString(fOldValStartPos, fValue, null);
		338	//doc.invalidateSyntaxMarks();
		339	} catch( BadLocationException e ) {
		340	ex[0] = e;
		341	}
		342	});
		343	if (ex[0] != null) {
		344	throw new DOMException(DOMException.INVALID_STATE_ERR , ex[0].getMessage());
		345	}
		346
		347	// Update the status of this object
		348	try {
		349	int endOffset = fOldValStartPos + fOldValLen;
		350	if (endOffset > doc.getLength()) {
		351	endOffset = doc.getLength();
		352	}
		353	syntax.runWithSequence(first.offset(null),
		354	(TokenSequence ts) -> {
		355	first = ts.token();
		356	return null;
		357	});
		358	} catch (BadLocationException e) {
		359	throw new DOMException(DOMException.INVALID_STATE_ERR , e.getMessage());
		360	}
248	}	361	}
249		362
250	public void setNodeValue(String value) {	363	public void setNodeValue(String value) {
Lines 259-300 Link Here
259	return getValue();	372	return getValue();
260	}	373	}
261		374
		375	private String getValueLocked(TokenSequence ts) {
		376	StringBuilder sb = new StringBuilder();
		377	boolean valStarted = false;
		378	V: while (ts.moveNext()) {
		379	Token<XMLTokenId> t = ts.token();
		380	switch (t.id()) {
		381	case CHARACTER:
		382	if (!valStarted) {
		383	return null;
		384	}
		385	// fall through
		386	case VALUE: {
		387	String image = t.text().toString();
		388	String actual = XMLTextUtils.actualAttributeValue(image);
		389	valStarted = true;
		390	if (!image.equals(actual)) {
		391	sb.append(actual);
		392	break;
		393	} else {
		394	sb.append(image);
		395	}
		396	break;
		397	}
		398	case WS:
		399	case OPERATOR:
		400	break;
		401	default:
		402	break V;
		403	}
		404	}
		405	// Remove " and ' around the attribute value
		406	if (sb.length() > 0) {
		407	char firstChar = sb.charAt(0);
		408	if (firstChar == '"' \|\| firstChar == '\'') {
		409	sb.deleteCharAt(0);
		410	if (sb.length() > 0 && sb.charAt(sb.length()-1) == firstChar) {
		411	sb.deleteCharAt(sb.length()-1);
		412	}
		413	}
		414	}
		415	return XMLTextUtils.replaceEntityStringsWithChars(sb.toString());
		416	}
		417
262	public String getValue() {	418	public String getValue() {
263	// // Find the first value token. Should be after "name="	419	try {
264	// TokenItem next = first;	420	return syntax.runWithSequence(first, this::getValueLocked);
265	// for (; next != null; next = next.getNext()) {	421	} catch (BadLocationException ex) {
266	// if (next.getTokenID() == VALUE) {	422	Exceptions.printStackTrace(ex);
267	// break;	423	return null;
268	// }	424	}
269	// }
270	//
271	// // Add values of all value and character entity
272	// StringBuffer buf = new StringBuffer();
273	// while (next != null && (next.getTokenID() == VALUE \|\| next.getTokenID() == CHARACTER)) {
274	// String image = next.getImage();
275	// String actual = Util.actualAttributeValue(image);
276	// if (!image.equals(actual)) {
277	// buf.append(actual);
278	// break;
279	// } else {
280	// buf.append(image);
281	// }
282	// next = next.getNext();
283	// }
284	//
285	// // Remove " and ' around the attribute value
286	// if (buf.length() > 0) {
287	// char firstChar = buf.charAt(0);
288	// if (firstChar == '"' \|\| firstChar == '\'') {
289	// buf.deleteCharAt(0);
290	// if (buf.length() > 0 && buf.charAt(buf.length()-1) == firstChar) {
291	// buf.deleteCharAt(buf.length()-1);
292	// }
293	// }
294	// }
295	//
296	// return Util.replaceEntityStringsWithChars(buf.toString());
297	return null;
298	}	425	}
299		426
300	public short getNodeType() {	427	public short getNodeType() {
Lines 307-313 Link Here
307		434
308	public Element getOwnerElement() {	435	public Element getOwnerElement() {
309	// ((Tag)parent).retokenizeObject();	436	// ((Tag)parent).retokenizeObject();
310	return parent;	437	if (parent == null) {
		438	return null;
		439	}
		440	return (Element)parent.getNode();
311	}	441	}
312		442
313	/**	443	/**




package org.netbeans.modules.xml.text.dom;


import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
import java.lang.ref.WeakReference;
import javax.swing.text.BadLocationException;
import org.netbeans.api.lexer.Token;
import org.netbeans.api.xml.lexer.XMLTokenId;
import org.netbeans.modules.xml.text.api.dom.SyntaxElement;
import org.w3c.dom.Node;


/**

 *
 * @version 1.0
 */
public abstract class BaseSyntaxElement implements org.netbeans.modules.xml.text.api.dom.SyntaxElement {
    
    protected XMLSyntaxSupport support;
    private WeakReference<Token> first; //a weak reference to the fist TokenItem of this SE
    private WeakReference<BaseSyntaxElement> previous;    // WR to the cached previous element
    private WeakReference<BaseSyntaxElement> next;        // WR to the cached next element
    
    // let it be visible by static inner classes extending us
    protected int offset;     // original position in document
    protected int length;     // original lenght in document
    
    /** Creates new SyntaxElement */
    BaseSyntaxElement(XMLSyntaxSupport support, Token<XMLTokenId> token, int start, int end)  {
        this.support = support;
        this.offset = start;
        this.length = end-start;

        return length;
    }
    
    void setNext(BaseSyntaxElement se) {
        next = new WeakReference(se);
    }
    
    void setPrevious(BaseSyntaxElement se) {
        previous = new WeakReference(se);
    }
    

     * @return previous SyntaxElement or <code>null</code> at document begining
     * or illegal location.
     */
    public BaseSyntaxElement getPrevious() {
        BaseSyntaxElement cached_previous = (previous == null) ? null : previous.get();
        if( cached_previous != null )
            return cached_previous;
        try {

                return null;
            }
            //data not inialized yet or GC'ed already - we need to parse again
            BaseSyntaxElement new_previous = (BaseSyntaxElement)support.getElementChain( getElementOffset() - 1 );
            if( new_previous != null ) {
                setPrevious(new_previous); //weakly cache the element
                new_previous.setNext(this);

     * @return next SyntaxElement or <code>null</code> at document end
     * or illegal location.
     */
    public BaseSyntaxElement getNext() {
        BaseSyntaxElement cached_next = next == null ? null : next.get();
        if( cached_next != null )
            return cached_next;
        try {
            //data not inialized yet or GC'ed already - we need to parse again
            BaseSyntaxElement new_next = (BaseSyntaxElement)support.getElementChain( offset+length + 1);
            if( new_next != null ) {
                setNext(new_next); //weakly cache the element
                new_next.setPrevious(this);

            return null;
        }
    }

    /**
     * Print element content for debug purposes.
     */

     * DOM Node equals. It's not compatible with Object's equals specs!
     */
    public boolean equals(Object obj) {
        if (obj instanceof BaseSyntaxElement) {
            if (((BaseSyntaxElement)obj).offset == offset) return true;
        }
        return false;
    }
        
    public String getName() {
        return null;
    }
    
    /**
     * It may stop some DOM traversing.  //!!!
     */
    public static class Error extends BaseSyntaxElement {
        public Error( XMLSyntaxSupport support, Token first, int start, int end ) {
            super( support, first, start, end);
        }

        public String toString() {
            return "Error" + super.toString();                                  // NOI18N
        }

        @Override
        public int getType() {
            return NODE_ERROR;
        }

        @Override
        public Node getNode() {
            return null;
        }

        @Override
        public SyntaxElement getParentElement() {
            BaseSyntaxElement x = this;
            while (x != null && x.getType() != Node.ELEMENT_NODE) {
                x = x.getPrevious();
            }
            return x;
        }
    }
    
}





package org.netbeans.modules.xml.text.dom;

import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
import org.netbeans.api.lexer.Token;
import org.netbeans.api.xml.lexer.XMLTokenId;
import org.w3c.dom.Node;

/**
 * CDATA section representation.
 */
public class CDATASection extends TextImpl implements org.w3c.dom.CDATASection {

    /**
     * Create content text node.
     */
    public CDATASection(XMLSyntaxSupport support, Token<XMLTokenId> from, int start, int end) {
        super( support, from, start, end);
    }

    @Override
    public String getNodeValue() {
        String text = first().text().toString();
        int start = 0;
        int end = text.length();
        if (text.startsWith("<![CDATA[")) {
            start = 9;
        }
        if (text.endsWith("]]>")) {
            end = text.length() - 3;
        }
        return text.substring(start, end);
    }

//    /**
//     * Create attribute text node.
//     */
//    CDATASection(XMLSyntaxSupport syntax, Token from, Attr parent) {
//        super( syntax, from, parent);
//    }

    @Override
    public short getNodeType() {
        return Node.CDATA_SECTION_NODE;
    }
    
}


Lines 44-49 Link Here

(-)a/xml.text/src/org/netbeans/modules/xml/text/dom/Comment.java (-1 / +2 lines)
44		44
45	package org.netbeans.modules.xml.text.dom;	45	package org.netbeans.modules.xml.text.dom;
46		46
		47	import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
47	import org.netbeans.api.lexer.Token;	48	import org.netbeans.api.lexer.Token;
48	import org.netbeans.api.xml.lexer.XMLTokenId;	49	import org.netbeans.api.xml.lexer.XMLTokenId;
49	import org.netbeans.modules.xml.spi.dom.ROException;	50	import org.netbeans.modules.xml.spi.dom.ROException;
Lines 57-63 Link Here
57	*/	58	*/
58	public class Comment extends SyntaxNode implements org.w3c.dom.Comment {	59	public class Comment extends SyntaxNode implements org.w3c.dom.Comment {
59		60
60	Comment(XMLSyntaxSupport support, Token<XMLTokenId> from, int start, int end) {	61	public Comment(XMLSyntaxSupport support, Token<XMLTokenId> from, int start, int end) {
61	super( support, from, start, end);	62	super( support, from, start, end);
62	}	63	}
63		64




package org.netbeans.modules.xml.text.dom;

import org.netbeans.modules.xml.spi.dom.*;
import org.w3c.dom.DOMException;

public class Document extends AbstractNode implements org.w3c.dom.Document {

    BaseSyntaxElement syntax;

    Document(BaseSyntaxElement element) {
        syntax = element;
    }


        }

    }

}


Lines 44-49 Link Here

(-)a/xml.text/src/org/netbeans/modules/xml/text/dom/DocumentType.java (-1 / +2 lines)
44		44
45	package org.netbeans.modules.xml.text.dom;	45	package org.netbeans.modules.xml.text.dom;
46		46
		47	import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
47	import org.netbeans.api.lexer.Token;	48	import org.netbeans.api.lexer.Token;
48	import org.netbeans.api.xml.lexer.XMLTokenId;	49	import org.netbeans.api.xml.lexer.XMLTokenId;
49	import org.netbeans.modules.xml.spi.dom.*;	50	import org.netbeans.modules.xml.spi.dom.*;
Lines 55-61 Link Here
55	*/	56	*/
56	public class DocumentType extends SyntaxNode implements org.w3c.dom.DocumentType {	57	public class DocumentType extends SyntaxNode implements org.w3c.dom.DocumentType {
57		58
58	DocumentType(XMLSyntaxSupport syntax, Token<XMLTokenId> first, int start, int end) {	59	public DocumentType(XMLSyntaxSupport syntax, Token<XMLTokenId> first, int start, int end) {
59	super (syntax, first, start, end);	60	super (syntax, first, start, end);
60	}	61	}
61		62




package org.netbeans.modules.xml.text.dom;


import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
import org.netbeans.api.lexer.Token;
import org.netbeans.api.xml.lexer.XMLTokenId;
import org.w3c.dom.*;


public class EmptyTag extends Tag {

    public EmptyTag(XMLSyntaxSupport support, Token<XMLTokenId> from, int start, int end) {
        super( support, from, start, end, from.text().toString().substring(1));
    }
    
    public boolean hasChildNodes() {
        return false;
    }

        return NodeListImpl.EMPTY;
    }
    
    public Tag getEndTag() {
        return this;
    }
    
    public Tag getStartTag() {
        return this;
    }

    @Override
    public boolean isStart() {
        return false;
    }

    @Override
    public boolean isEnd() {
        return false;
    }

    @Override
    public boolean isSelfClosing() {
        return true;
    }
    
    public String toString() {
        StringBuffer ret = new StringBuffer( "EmptyTag(\"" + name + "\" " );

Lines 44-49 Link Here

(-)a/xml.text/src/org/netbeans/modules/xml/text/dom/EndTag.java (-6 / +25 lines)
44		44
45	package org.netbeans.modules.xml.text.dom;	45	package org.netbeans.modules.xml.text.dom;
46		46
		47	import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
47	import java.util.*;	48	import java.util.*;
48		49
49	import org.netbeans.api.lexer.Token;	50	import org.netbeans.api.lexer.Token;
Lines 57-65 Link Here
57	*/	58	*/
58	public class EndTag extends Tag {	59	public class EndTag extends Tag {
59		60
60	EndTag(XMLSyntaxSupport support, Token<XMLTokenId> from, int start, int end) {	61	public EndTag(XMLSyntaxSupport support, Token<XMLTokenId> from, int start, int end) {
61	super( support, from, start, end);	62	super(support, from, start, end, from.text().toString().substring(2));
62	this.name = from.text().toString();	63	if (name.equals("")) { // NOI18N
		64	// self-closing tag ? -- TODO
		65	}
63	}	66	}
64		67
65	/**	68	/**
Lines 75-81 Link Here
75	}	78	}
76		79
77	public boolean hasChildNodes() {	80	public boolean hasChildNodes() {
78	SyntaxElement prev = getPrevious();	81	BaseSyntaxElement prev = getPrevious();
79	if (prev == null) return false;	82	if (prev == null) return false;
80	if (prev instanceof EndTag && ((EndTag)prev).getStartTag() == null) return false;	83	if (prev instanceof EndTag && ((EndTag)prev).getStartTag() == null) return false;
81	if (prev instanceof StartTag) return false;	84	if (prev instanceof StartTag) return false;
Lines 95-101 Link Here
95	return new NodeListImpl(list);	98	return new NodeListImpl(list);
96	}	99	}
97		100
98	protected Tag getStartTag() {	101	public Tag getStartTag() {
99		102
100	SyntaxNode prev = findPrevious();	103	SyntaxNode prev = findPrevious();
101		104
Lines 121-129 Link Here
121	return null;	124	return null;
122	}	125	}
123		126
124	protected Tag getEndTag() {	127	public Tag getEndTag() {
125	return this;	128	return this;
126	}	129	}
		130
		131	@Override
		132	public boolean isStart() {
		133	return false;
		134	}
		135
		136	@Override
		137	public boolean isEnd() {
		138	return true;
		139	}
		140
		141	@Override
		142	public boolean isSelfClosing() {
		143	return false;
		144	}
		145
127		146
128	public String toString() {	147	public String toString() {
129	return "EndTag(\"" + name + "\") " + first();	148	return "EndTag(\"" + name + "\") " + first();

Lines 44-49 Link Here

(-)a/xml.text/src/org/netbeans/modules/xml/text/dom/EntityReference.java (+1 lines)
44		44
45	package org.netbeans.modules.xml.text.dom;	45	package org.netbeans.modules.xml.text.dom;
46		46
		47	import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
47	import org.netbeans.api.lexer.Token;	48	import org.netbeans.api.lexer.Token;
48	import org.netbeans.api.xml.lexer.XMLTokenId;	49	import org.netbeans.api.xml.lexer.XMLTokenId;
49	import org.w3c.dom.Node;	50	import org.w3c.dom.Node;





package org.netbeans.modules.xml.text.dom;

import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
import org.netbeans.api.lexer.Token;

import org.netbeans.api.xml.lexer.XMLTokenId;

 *
 * @author  Petr Kuzel
 */
public final class ProcessingInstruction extends SyntaxNode implements org.w3c.dom.ProcessingInstruction {
    
    private String target;
    private String content;

    /** Creates a new instance of ProcessingInstructionImpl */
    public ProcessingInstruction(XMLSyntaxSupport syntax, Token<XMLTokenId> first,
            int start, int end, String target, String content) {
        super(syntax, first, start, end);
        this.target = target;

    public void setData(String data) throws DOMException {
        throw new ROException();
    }

    @Override
    public String getTarget() {
        return getNodeName();
    }

    @Override
    public String getData() {
        return getNodeValue();
    }
}





package org.netbeans.modules.xml.text.dom;

import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
import java.util.*;

import org.netbeans.api.lexer.Token;
import org.netbeans.api.xml.lexer.XMLTokenId;
import org.netbeans.modules.xml.spi.dom.NodeListImpl;
import org.netbeans.modules.xml.text.api.dom.TagElement;
import org.w3c.dom.*;

public class StartTag extends Tag {

    public StartTag(XMLSyntaxSupport support, Token<XMLTokenId> from, int start, int end) {
        super( support, from, start, end, from.text().toString().substring(1));
        this.name = from.text().toString();
    }

    public boolean hasChildNodes() {
        BaseSyntaxElement next = getNext();
        if (next == null) return false;
        // if not well-formed
        if (next instanceof StartTag && ((StartTag)next).getEndTag() == null) return false;

        return new NodeListImpl(list);
    }
    
    public Tag getStartTag() {
        return this;
    }
    
    public Tag getEndTag() {
        
        SyntaxNode next = findNext();
        

        return ret.toString() + " " + first() + ")";
    }
    
    public boolean isStart() {
        return true;
    }
    
    public boolean isEnd() {
        return false;
    }
    
    public boolean isSelfClosing() {
        return false;
    }
}






package org.netbeans.modules.xml.text.dom;

import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
import org.netbeans.modules.xml.spi.dom.*;
import org.netbeans.api.lexer.Token;
import org.netbeans.modules.xml.text.api.dom.SyntaxElement;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.Text;
import org.w3c.dom.TypeInfo;
import org.w3c.dom.UserDataHandler;


 * @version 1.0
 */

public abstract class SyntaxNode extends BaseSyntaxElement implements org.w3c.dom.Node {

    /** Creates new SyntaxNode */
    SyntaxNode(XMLSyntaxSupport support, Token first, int start, int end)  {
        super( support, first, start, end);
    }

    @Override
    public int getType() {
        return getNodeType();
    }

    @Override
    public Node getNode() {
        return this;
    }
    /**
     * Default implementation returning first previous <code>SyntaxNode</code>
     * or <code>null</code>. It is <code>StartTag</code> aware.

    /**
     * Find previous SyntaxNode instance or <code>null</code>.
     */
    static SyntaxNode findPrevious(BaseSyntaxElement el) {
        BaseSyntaxElement prev = el.getPrevious();
        while ((prev instanceof SyntaxNode) == false) {
            if (prev == null) return null;            
            prev = prev.getPrevious();

    /**
     * Find previous SyntaxNode instance or <code>null</code>.
     */
    static SyntaxNode findNext(BaseSyntaxElement el) {
        BaseSyntaxElement next = el.getNext();
        while ((next instanceof SyntaxNode) == false) {
            if (next == null) return null;            
            next = next.getNext();

        return findNext(this);
    }
    
    public SyntaxElement getParentElement() {
        Node n = getParentNode();
        return n instanceof SyntaxElement ? (SyntaxElement)n : null;
    }
    
    /**
     * First previous start tag at higher level is my parent.
     * Skip all end-tag start-tag pairs at the same level.

    public void setIdAttributeNode(org.w3c.dom.Attr a, boolean b) {
        throw new UOException ();
    }
    
}

Lines 44-53 Link Here

(-)a/xml.text/src/org/netbeans/modules/xml/text/dom/Tag.java (-48 / +88 lines)
44		44
45	package org.netbeans.modules.xml.text.dom;	45	package org.netbeans.modules.xml.text.dom;
46		46
47	import java.util.Collection;	47	import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
		48	import java.util.Map;
		49	import java.util.HashMap;
		50	import java.util.LinkedHashMap;
		51	import javax.swing.text.BadLocationException;
48	import org.netbeans.api.lexer.Token;	52	import org.netbeans.api.lexer.Token;
		53	import org.netbeans.api.lexer.TokenSequence;
		54	import org.netbeans.api.xml.lexer.XMLTokenId;
		55	import org.netbeans.modules.xml.spi.dom.NamedNodeMapImpl;
49	import org.netbeans.modules.xml.spi.dom.ROException;	56	import org.netbeans.modules.xml.spi.dom.ROException;
50	import org.netbeans.modules.xml.spi.dom.UOException;	57	import org.netbeans.modules.xml.spi.dom.UOException;
		58	import org.netbeans.modules.xml.text.api.dom.TagElement;
		59	import org.openide.util.Exceptions;
51	import org.w3c.dom.NamedNodeMap;	60	import org.w3c.dom.NamedNodeMap;
52	import org.w3c.dom.Node;	61	import org.w3c.dom.Node;
53	import org.w3c.dom.NodeList;	62	import org.w3c.dom.NodeList;
Lines 61-74 Link Here
61	* <code>equals</code>. The <code>equals</code> is used for syntax element	70	* <code>equals</code>. The <code>equals</code> is used for syntax element
62	* purposes.	71	* purposes.
63	*/	72	*/
64	public abstract class Tag extends SyntaxNode implements org.w3c.dom.Element {	73	public abstract class Tag extends SyntaxNode implements org.w3c.dom.Element, TagElement {
65		74
66	protected NamedNodeMap domAttributes;	75	protected NamedNodeMap domAttributes;
67		76
68	protected String name;	77	protected String name;
69		78
70	Tag(XMLSyntaxSupport support, Token from, int start, int end) {	79	Tag(XMLSyntaxSupport support, Token from, int start, int end, String name) {
71	super(support, from, start, end);	80	super(support, from, start, end);
		81	this.name = name;
72	}	82	}
73		83
74	public final short getNodeType() {	84	public final short getNodeType() {
Lines 83-136 Link Here
83	return name;	93	return name;
84	}	94	}
85		95
		96	private Map parseAttributes(TokenSequence ts) {
		97	HashMap map = new LinkedHashMap(3);
		98
		99	int index = 0;
		100	SCAN_LOOP:
		101	while (ts.moveNext()) {
		102	Token<XMLTokenId> next = ts.token();
		103	XMLTokenId id = next.id();
		104	String name;
		105	String value;
		106	if (id == XMLTokenId.ARGUMENT) {
		107	Token attributeStart = next;
		108	name = next.text().toString();
		109	while (next.id() != XMLTokenId.VALUE) {
		110	if (!ts.moveNext()) {
		111	break SCAN_LOOP;
		112	}
		113	next = ts.token();
		114	if (next.id() == XMLTokenId.ERROR) {
		115	break SCAN_LOOP;
		116	}
		117	}
		118
		119	// fuzziness to relax minor tokenization changes
		120	String image = next.text().toString();
		121	char test = image.charAt(0);
		122	if (image.length() == 1) {
		123	if (test == '"' \|\| test == '\'') {
		124	if (!ts.moveNext()) {
		125	break SCAN_LOOP;
		126	}
		127	next = ts.token();
		128	}
		129	}
		130
		131	value = next.text().toString();
		132
		133	Object key = NamedNodeMapImpl.createKey(name);
		134	map.put(key, new AttrImpl(support, attributeStart, this, index++));
		135
		136	next = skipAttributeValue(ts, test);
		137	if (next == null) {
		138	break SCAN_LOOP;
		139	}
		140	} else if (id == XMLTokenId.WS) {
		141	// just skip
		142	} else {
		143	break; // end of element markup
		144	}
		145	}
		146	return map;
		147	}
		148
		149	private static Token skipAttributeValue(TokenSequence ts, char delim) {
		150	do {
		151	Token t = ts.token();
		152	if (t.text().charAt(t.length() - 1) == delim) {
		153	return ts.moveNext() ? ts.token() : null;
		154	}
		155	} while (ts.moveNext());
		156	return null;
		157	}
		158
86	/**	159	/**
87	* Create properly bound attributes and cache results.	160	* Create properly bound attributes and cache results.
88	* Parse attributes from first token.	161	* Parse attributes from first token.
89	*/	162	*/
90	public synchronized NamedNodeMap getAttributes() {	163	public synchronized NamedNodeMap getAttributes() {
91		164	try {
92	// HashMap map = new LinkedHashMap(3);	165	return new NamedNodeMapImpl(
93	//	166	support.runWithSequence(offset, (TokenSequence ts) -> {
94	// SCAN_LOOP:	167	return parseAttributes(ts);
95	// for (TokenItem next = first().getNext(); next != null; next = next.getNext()) {	168	})
96	// TokenID id = next.getTokenID();	169	);
97	// String name;	170	} catch (BadLocationException ex) {
98	// String value;	171	Exceptions.printStackTrace(ex);
99	// if (id == ARGUMENT) {	172	return null;
100	// TokenItem attributeStart = next;	173	}
101	// name = next.getImage();
102	// while (next.getTokenID() != VALUE) {
103	// next = next.getNext();
104	// if (next == null \|\| next.getTokenID() == ERROR) break SCAN_LOOP;
105	// }
106	//
107	// // fuzziness to relax minor tokenization changes
108	// String image = next.getImage();
109	// char test = image.charAt(0);
110	// if (image.length() == 1) {
111	// if (test == '"' \|\| test == '\'') {
112	// next = next.getNext();
113	// }
114	// }
115	//
116	// if (next == null) break SCAN_LOOP;
117	// value = next.getImage();
118	//
119	// Object key = NamedNodeMapImpl.createKey(name);
120	// map.put(key, new AttrImpl(support, attributeStart, this));
121	//
122	// next = Util.skipAttributeValue(next, test);
123	// if (next == null) break SCAN_LOOP;
124	// } else if (id == WS) {
125	// // just skip
126	// } else {
127	// break; // end of element markup
128	// }
129	// }
130	//
131	// // domAttributes = new NamedNodeMapImpl(map);
132	// return new NamedNodeMapImpl(map);
133	return null;
134	}	174	}
135		175
136	public String getAttribute(String name) {	176	public String getAttribute(String name) {
Lines 276-284 Link Here
276	return list.item(list.getLength());	316	return list.item(list.getLength());
277	}	317	}
278		318
279	protected abstract Tag getStartTag();	319	public abstract Tag getStartTag();
280		320
281	protected abstract Tag getEndTag();	321	public abstract Tag getEndTag();
282		322
283	// unsupported DOM level 2 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~	323	// unsupported DOM level 2 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
284	public String getAttributeNS(String namespaceURI, String localName) {	324	public String getAttributeNS(String namespaceURI, String localName) {





package org.netbeans.modules.xml.text.dom;

import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
import org.netbeans.api.lexer.Token;
import org.w3c.dom.*;
import org.netbeans.modules.xml.spi.dom.*;
import org.netbeans.editor.*;

/**
 * DOM Text implementation. Note that it is automatically

 *
 * @author Petr Kuzel
 */
public class TextImpl extends SyntaxNode implements org.w3c.dom.Text {

    // if attribute text node then parent otherwise null
    private AttrImpl parent;
    
    /**
     * Create content text node.
     */
    public TextImpl(XMLSyntaxSupport support, Token from, int start, int end) {
        super( support, from, start, end);
    }
    
    /**
     * Create attribute text node.
     */
    public TextImpl(XMLSyntaxSupport syntax, Token from, int start, int end, AttrImpl parent) {
        super( syntax, from, start, end);
        if (parent == null) throw new IllegalArgumentException();
        this.parent = parent;

        return getData();
    }
        
    public TextImpl splitText(int offset) {
        throw new ROException();
    }
 




import org.netbeans.api.lexer.TokenHierarchy;
import org.netbeans.api.xml.lexer.XMLTokenId;
import org.netbeans.editor.Utilities;
import org.netbeans.modules.xml.text.api.XMLTextUtils;
import org.netbeans.modules.xml.text.folding.TokenElement.Token;
import org.netbeans.modules.xml.text.folding.TokenElement.TokenType;
import org.netbeans.modules.xml.text.syntax.XMLKit;

/**
 * This class is an implementation of @see org.netbeans.spi.editor.fold.FoldManager

    private Preferences prefs;

    public XmlFoldManager() {
        prefs = MimeLookup.getLookup(XMLTextUtils.XML_MIME).lookup(Preferences.class);
    }







import java.io.IOException;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
import java.util.Stack;
import java.util.logging.Logger;
import javax.swing.text.BadLocationException;
import org.netbeans.api.editor.document.LineDocument;
import org.netbeans.api.editor.document.LineDocumentUtils;
import org.netbeans.api.lexer.LanguagePath;
import org.netbeans.api.lexer.TokenHierarchy;
import org.netbeans.api.lexer.TokenSequence;

        });
    }

    public LineDocument doReformat(LineDocument doc, int startOffset, int endOffset) {
        spacesPerTab = IndentUtils.indentLevelSize(doc);
        try {
            List<TokenIndent> tags = getTags(doc, startOffset, endOffset);

        return doc;
    }

    private void changePrettyText(LineDocument doc, TokenIndent tag) throws BadLocationException {
        //i expected the call IndentUtils.createIndentString() to return
        //the correct string for the indent level, but it doesn't.
        //so this is just a workaround.

        noNewline = tag.isNoNewline();
        String newIndentText = IndentUtils.createIndentString(doc, spaces);
        //String newIndentText = formatter.getIndentString(doc, tag.getIndentLevel());
        int previousEndOffset = LineDocumentUtils.getPreviousNonWhitespace(doc, so) + 1;
        CharSequence temp = org.netbeans.lib.editor.util.swing.DocumentUtilities.getText(doc, previousEndOffset, so - previousEndOffset);
        if(noNewline || so == 0 || CharSequences.indexOf(temp, "\n") != -1){ // NOI18N
            int i = LineDocumentUtils.getLineFirstNonWhitespace(doc, so);
            int rowStart = LineDocumentUtils.getLineStart(doc, so);
            
            String currentIndent = doc.getText(rowStart, i - rowStart);
            if (!currentIndent.equals(newIndentText)) {

    /**
     * The processed document
     */
    private LineDocument basedoc;

    private void outsideAttributes() {
        firstAttributeIndent = -1;

        } else {
            try {
                // align with the actual tag:
                indentLevel = Utilities.getVisualColumn((BaseDocument)basedoc, 
                        LineDocumentUtils.getNextNonWhitespace(basedoc, 
                        LineDocumentUtils.getLineStart(basedoc, tokenSequence.offset())));
                if (!increase) {
                    indentLevel = Math.max(- spacesPerTab, indentLevel - spacesPerTab);
                }

            if (!indent) {
                if (!selfClosed && onlyTags) {
                    indent = true;
                    int start = LineDocumentUtils.getLineStart(basedoc, tokenSequence.offset());
                    // do not indent closing tags, if the start & end tag will end up on the same line:
                    if (myIndent != null) {
                        int openStart = myIndent.getStartOffset();

            } else {
                // align one space after the tagname:
                TokenIndent tagIndent = stack.peek();
                int current = Utilities.getVisualColumn((BaseDocument)basedoc, tokenSequence.offset());
                if (tagIndent == null) {
                    // fallback
                    firstAttributeIndent = current;

        if (lastNewline == -1 || preserveWhitespace || !intersectsWithRange) {
            // even if outside selection range, we do not update indent; text will not affect following tags
            // we have to set the 'newLine' flag, if the last text line only contains whitespaces. 
            int nonWhitePos = LineDocumentUtils.getNextNonWhitespace(basedoc, currentOffset + Math.max(0, lastNewline), currentOffset + image.length());
            contentPresent |= nonWhitePos > -1;
            wasNewline &= nonWhitePos == -1;
            onlyTags &= nonWhitePos == -1;

        while (lno < lineCount) {
            currentOffset += lno == 0 ? 0 : lineSizes[lno - 1] + 1; // add 1 for newline
            int lineEnd = currentOffset + lineSizes[lno];
            nonWhiteStart = LineDocumentUtils.getNextNonWhitespace(basedoc, currentOffset, lineEnd);
            // implies a check for nonWhitestart > -1
            if (nonWhiteStart >= startOffset && nonWhiteStart <= endOffset) {
                // emit a tag at this position

     * XML and the use of the xml:space attribute.  Together they are used to
     * calculate how much each token should be indented by.
     */
    private List<TokenIndent> getTags(LineDocument basedoc, int startOffset, int endOffset)
            throws BadLocationException, IOException {
        
        


        // this is that 1st PI or tag will increment the level to 0
        indentLevel = -spacesPerTab;
        List[] result = new List[1];
        Exception[] ble = new Exception[1];
        basedoc.render(() -> {
            try {
                result[0] = getTagsLocked(startOffset, endOffset);
            } catch (BadLocationException | IOException ex) {
                ble[0] = ex;
            }
        });
        if (ble[0] != null) {
            if (ble[0] instanceof BadLocationException) {
                throw (BadLocationException)ble[0];
            }
            if (ble[0] instanceof IOException) {
                throw (IOException)ble[0];
            } else {
                throw new IOException(ble[0]);
            }
        }
        return result[0];
    }
    
    private List<TokenIndent> getTagsLocked(int startOffset, int endOffset) throws BadLocationException, IOException {
        TokenHierarchy tokenHierarchy = TokenHierarchy.get(basedoc);
        tokenSequence = tokenHierarchy.tokenSequence();
        token = tokenSequence.token();
        // Add the text token, if any, before xml declaration to document node
        if (token != null && token.id() == XMLTokenId.TEXT) {
            if (tokenSequence.moveNext()) {
                token = tokenSequence.token();
            }
        }
        currentTokensSize = 0;


        // will be set to indent of 1st attribute of a tag. Will be reset to -1 by start tag
        firstAttributeIndent = -1;
        wasNewline = false;

        while (tokenSequence.moveNext()) {
            int indentLineStart = 1;
            token = tokenSequence.token();
            XMLTokenId tokenId = token.id();
            CharSequence image = token.text();
            if (tokenSequence.offset() > endOffset) {
                break;
                }
            }
            tokenInSelectionRange = tokenSequence.offset() >= startOffset || tokenSequence.offset() + token.length() > endOffset;
            switch (tokenId) {
                case TAG: { // Tag is encountered and the required level of indenting determined.
                            // The tokens are only assessed if they are in the selection
                            // range, which is the whole document if no text is selected.
                    int len = image.length();
                    firstAttributeIndent = -1;
                    if (image.charAt(len - 1) == '>') {// '/>' // NOI18N
                        if (len == 2) {
                            endTag(image, true);
                        } else {
                            // end tag name marker
                            tagClose(image);
                        }
                    } else {
                        if (startsWith(image, "</")) { // NOI18N
                            endTag(image, false);
                        } else {
                            startTag(image);
                        }
                        outsideAttributes();
                    }
                    break;
                }
                case PI_START: {
                    updateIndent(true, -1, preserveWhitespace);
                    //indentLevel += spacesPerTab;
                    if (tokenInSelectionRange && !preserveWhitespace) {
                        TokenElement tag = new TokenElement(TokenType.TOKEN_PI_START_TAG, 
                                tokenId.name(), 
                                tokenSequence.offset(), 
                                tokenSequence.offset() + token.length(), indentLevel);
                        TokenIndent ti = new TokenIndent(preserveWhitespace, tokenSequence.offset(), indentLevel);
                        ti.markNoNewline();
                        tags.add(ti);
                    }
                    break;
                }
                case PI_END: {
                    int l = updateIndent(false, -1, preserveWhitespace);
                    if (wasNewline && tokenInSelectionRange) {
                        // 1st item on a new line, will indent according to the opening tag
                        tags.add(new TokenIndent(false, tokenSequence.offset(), l));
                    }
                    break;
                }
                case WS: {
                        // we assume there is nothing except whitespace
                        int lastNewline = lastIndexOf(image, '\n');
                        if (lastNewline == -1) {
                            // nothing special here
                            break;
                        }
                        wasNewline = true;
                        break;
                }
                case PI_CONTENT:
                    indentLineStart = 0;
                    // fall through
                case TEXT: {
                    text(image, indentLineStart);
                    break;
                }

                /**
                 * Block comments are aligned as follows:
                 * - if there is some preceeding non-whitespace, do not format anything. E.g. comments after element. Skip entire comment from formatting
                 * - align 1st and last line at the appropriate indent level
                 * - compute "shift" from the last line & indent level
                 * - shift INTERIOR of the comment by the computed shift
                 * 
                 * This algorithm tries to preserve internal formatting of the comment
                 */
                case BLOCK_COMMENT: {
                    int currentOffset = tokenSequence.offset();

                    splitLines(image);

                    int lineStart = LineDocumentUtils.getLineStart(basedoc, currentOffset);

                    if (lineStart < currentOffset && 
                         LineDocumentUtils.getPreviousNonWhitespace(basedoc, currentOffset, lineStart) > -1) {
                        // we cannot indent comment start, will not touch even the rest of the comment.
                                break;
                            }
                            wasNewline = true;
                            break;
                    }
                    case PI_CONTENT:
                        indentLineStart = 0;
                        // fall through
                    case TEXT: {
                        text(image, indentLineStart);
                        break;
                    }

                    int lastLineStart = LineDocumentUtils.getLineStart(basedoc, currentOffset + token.length() - 1);
                    int lastIndent = IndentUtils.lineIndent(basedoc, lastLineStart);
                     * - if there is some preceeding non-whitespace, do not format anything. E.g. comments after element. Skip entire comment from formatting
                     * - align 1st and last line at the appropriate indent level
                     * - compute "shift" from the last line & indent level
                     * - shift INTERIOR of the comment by the computed shift
                     * 
                     * This algorithm tries to preserve internal formatting of the comment
                     */
                    case BLOCK_COMMENT: {
                        int currentOffset = tokenSequence.offset();

                    // align 1st and last row here:
                    int baseIndent = indentLevel + spacesPerTab;
                    // shift the rest of lines by this offset
                    int indentShift = baseIndent - lastIndent;

                    // how much to shift the interior of the comment

                    for (int lno = 0; lno < lineCount; lno++) {
                        // indent 1st comment line, as if it was text:
                        int lineEnd = LineDocumentUtils.getLineEnd(basedoc, currentOffset);

                        int desiredIndent;
                        if (lno == 0 || lno == lineCount -1) {
                            desiredIndent = baseIndent;
                        } else {
                            desiredIndent = IndentUtils.lineIndent(basedoc, currentOffset) + indentShift;
                        }
                        
                        int lastLineStart = Utilities.getRowStart(basedoc, currentOffset + token.length() - 1);
                        int lastIndent = IndentUtils.lineIndent(basedoc, lastLineStart);

                        if ((currentOffset >= startOffset || currentOffset + lineSizes[lno] > endOffset) && currentOffset < endOffset) {
                            tags.add(new TokenIndent(
                                false,
                                currentOffset, Math.max(0, desiredIndent)
                            ));
                        }
                        currentOffset += lineSizes[lno] + 1;
                    }
                    break;
                }

                        // how much to shift the interior of the comment
                        
                        for (int lno = 0; lno < lineCount; lno++) {
                            // indent 1st comment line, as if it was text:
                            int lineEnd = Utilities.getRowEnd(basedoc, currentOffset);
                            
                            int desiredIndent;
                            if (lno == 0 || lno == lineCount -1) {
                                desiredIndent = baseIndent;
                            } else {
                                desiredIndent = IndentUtils.lineIndent(basedoc, currentOffset) + indentShift;
                            }
                            
                            if ((currentOffset >= startOffset || currentOffset + lineSizes[lno] > endOffset) && currentOffset < endOffset) {
                                tags.add(new TokenIndent(
                                    false,
                                    currentOffset, Math.max(0, desiredIndent)
                                ));
                            }
                            currentOffset += lineSizes[lno] + 1;
                        }
                        break;
                    }
                        

                case CDATA_SECTION: {
                    // always form a non-empty content
                    contentPresent = true;
                    onlyTags = false;
                        wasNewline = false;
                    }
                    case CHARACTER:
                    case OPERATOR:
                    case PI_TARGET:
                    case DECLARATION:
                        break; //Do nothing for above case's
                    case ARGUMENT: //attribute of an element
                        attributeName();
                        break;
                    case VALUE:
                        attributeValue();
                        break;

                    case ERROR:
                    case EOL:
                    default:
                        throw new IOException("Invalid token found in document: "
                                + "Please use the text editor to resolve the issues...");
                }
                currentTokensSize += image.length();
                if (tokenId != XMLTokenId.WS && tokenId != XMLTokenId.TEXT && tokenId != XMLTokenId.PI_CONTENT) {
                    // clear indicator of the newline
                    wasNewline = false;
                }
                case CHARACTER:
                case OPERATOR:
                case PI_TARGET:
                case DECLARATION:
                    break; //Do nothing for above case's
                case ARGUMENT: //attribute of an element
                    attributeName();
                    break;
                case VALUE:
                    attributeValue();
                    break;

                case ERROR:
                case EOL:
                default:
                    throw new IOException("Invalid token found in document: "
                            + "Please use the text editor to resolve the issues...");
            }
            currentTokensSize += image.length();
            if (tokenId != XMLTokenId.WS && tokenId != XMLTokenId.TEXT && tokenId != XMLTokenId.PI_CONTENT) {
                // clear indicator of the newline
                wasNewline = false;
            }
        }
        return tags;
    }




import javax.swing.tree.DefaultTreeCellRenderer;
import javax.swing.tree.TreeCellRenderer;
import org.netbeans.modules.editor.structure.api.DocumentElement;
import static org.netbeans.modules.xml.text.structure.XMLConstants.*;
import org.openide.awt.HtmlRenderer;
import org.openide.util.ImageUtilities;
import org.openide.util.Utilities;

        
        boolean containsError = tna.getChildrenErrorCount() > 0;
        //normal icons
        if(de.getType().equals(XML_TAG)
        || de.getType().equals(XML_EMPTY_TAG)) {
            setIcon(TAG_ICON, containsError);
        } else if(de.getType().equals(XML_PI)) {
            setIcon(PI_ICON, containsError);
        } else if(de.getType().equals(XML_DOCTYPE)) {
            setIcon(DOCTYPE_ICON, containsError);
        } else if(de.getType().equals(XML_CDATA)) {
            setIcon(CDATA_ICON, containsError);
        }
        




import java.util.ArrayList;
import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Iterator;
import javax.swing.JTree;
import javax.swing.text.AttributeSet;
import javax.swing.text.BadLocationException;
import javax.swing.text.Document;
import javax.swing.tree.DefaultTreeModel;
import javax.swing.tree.TreeNode;
import javax.swing.tree.TreePath;
import org.netbeans.editor.BaseDocument;
import org.netbeans.modules.editor.structure.api.DocumentElement;
import org.netbeans.modules.editor.structure.api.DocumentElementEvent;
import org.netbeans.modules.editor.structure.api.DocumentElementListener;
import static org.netbeans.modules.xml.text.structure.XMLConstants.*;
import org.netbeans.modules.xml.text.structure.XMLDocumentModelProvider;
import org.openide.ErrorManager;

/**

    }
    
    public String getText(boolean html) {
        if(de.getType().equals(XML_TAG)
                || de.getType().equals(XML_EMPTY_TAG)) {
            //XML TAG text
            String attribsVisibleText = "";
            AttributeSet attribs = getDocumentElement().getAttributes();

            
            return text.toString();
            
        } else if(de.getType().equals(XML_PI)) {
            //PI text
            String documentText = getPIText();
            documentText = documentText.length() > TEXT_MAX_LEN ? documentText.substring(0,TEXT_MAX_LEN) + "..." : documentText;
            return documentText;
        } else if(de.getType().equals(XML_DOCTYPE)) {
            //limit the text length
            String documentText = getDoctypeText();
            String visibleText  = documentText.length() > TEXT_MAX_LEN ? documentText.substring(0,TEXT_MAX_LEN) + "..." : documentText;
            return visibleText;
        } else if(de.getType().equals(XML_CDATA)) {
            //limit the text length
            String documentText = getCDATAText();
            String visibleText  = documentText.length() > TEXT_MAX_LEN ? documentText.substring(0,TEXT_MAX_LEN) + "..." : documentText;

    }
    
    public String getToolTipText() {
        if(de.getType().equals(XML_TAG)
                || de.getType().equals(XML_EMPTY_TAG)) {
            return getAttribsText() + " " + getDocumentContent();
        } else if(de.getType().equals(XML_PI)) {
            return getPIText();
        } else if(de.getType().equals(XML_DOCTYPE)) {
            return getDoctypeText();
        } else if(de.getType().equals(XML_CDATA)) {
            return getCDATAText();
        }
        return "";

        DocumentElement ade = e.getChangedChild();
        
        if(debug) System.out.println(">>> +EVENT called on " + hashCode() + " - " + de + ": element " + ade + " is going to be added");
        if(ade.getType().equals(XML_CONTENT)) {
            //create a text node listener
            textElements.add(new TextElementWrapper(ade));
            //update text text content of the node
            childTextElementChanged();
        } else if(ade.getType().equals(XML_ERROR)) {
            //handle error element
            markNodeAsError(this);
        } else if(ade.getType().equals(XML_COMMENT)) {
            //do nothing for comments
        } else {
            TreeNode tn = new TreeNodeAdapter(ade, tm, tree, this);

            if(child.equals(de)) return index;
            
            //skip text and error tokens
            if(!child.getType().equals(XML_CONTENT)
                    && !child.getType().equals(XML_ERROR)
                    && !child.getType().equals(XML_COMMENT)) index++;
        }
        return -1;
    }

        
        if(debug) System.out.println(">>> -EVENT on " + hashCode() + " - " + de + ": element " + rde + " is going to be removed ");
        
        if(rde.getType().equals(XML_CONTENT)) {
            if(debug) System.out.println(">>> removing CONTENT element");
            //remove the text eleemnt listener
            Iterator i = textElements.iterator();

            textElements.removeAll(toRemove);
            //update text text content of the node
            childTextElementChanged();
        } else if(rde.getType().equals(XML_ERROR)) {
            unmarkNodeAsError(this);
        } else if(rde.getType().equals(XML_COMMENT)) {
            //do nothing for comments
        } else {
            if(debug) System.out.println(">>> removing tag element");

            boolean textElementAdded = false;
            while(i.hasNext()) {
                DocumentElement chde = (DocumentElement)i.next();
                if(chde.getType().equals(XML_CONTENT)) {
                    //create a text node listener
                    textElements.add(new TextElementWrapper(chde));
                    textElementAdded = true;
                } else if(chde.getType().equals(XML_ERROR)) {
                    markNodeAsError(this);
                } else if(chde.getType().equals(XML_COMMENT)) {
                    //do nothing for comments
                } else {
                    //add the adapter only when there isn't any

            //System.out.println("childTextElementChanged(): " + getDocumentElement() + " has these children:");
            while(children.hasNext()) {
                DocumentElement del = (DocumentElement)children.next();
                if(del.getType().equals(XML_CONTENT)) {
                    try {
                        //the endoffset if increased by +1 due to still not yet resolved issue with element boundaries
                        //should be removed once it is properly fixed. On the other hand the issue has no user impact now.

Lines 46-52 Link Here

(-)a/xml.text/src/org/netbeans/modules/xml/text/resources/DTDEditor-preferences.xml (-1 lines)
46	<!DOCTYPE editor-preferences PUBLIC "-//NetBeans//DTD Editor Preferences 1.0//EN" "http://www.netbeans.org/dtds/EditorPreferences-1_0.dtd">	46	<!DOCTYPE editor-preferences PUBLIC "-//NetBeans//DTD Editor Preferences 1.0//EN" "http://www.netbeans.org/dtds/EditorPreferences-1_0.dtd">
47		47
48	<editor-preferences>	48	<editor-preferences>
49	<entry name="token-context-list" value="org.netbeans.modules.xml.text.ComplexValueSettingsFactory.getDTDTokenContext" javaType="methodvalue" />
50	<entry name="indentEngine" value="org.netbeans.modules.xml.text.ComplexValueSettingsFactory.getDTDIndentEngine" javaType="methodvalue" />	49	<entry name="indentEngine" value="org.netbeans.modules.xml.text.ComplexValueSettingsFactory.getDTDIndentEngine" javaType="methodvalue" />
51	<entry name="abbrev-reset-acceptor" value="org.netbeans.modules.xml.text.ComplexValueSettingsFactory.getDTDAbbrevResetAcceptor" javaType="methodvalue" />	50	<entry name="abbrev-reset-acceptor" value="org.netbeans.modules.xml.text.ComplexValueSettingsFactory.getDTDAbbrevResetAcceptor" javaType="methodvalue" />
52	</editor-preferences>	51	</editor-preferences>

Lines 47-53 Link Here

(-)a/xml.text/src/org/netbeans/modules/xml/text/resources/XMLEditor-preferences.xml (-1 lines)
47		47
48	<editor-preferences>	48	<editor-preferences>
49	<entry name="code-folding-enable" value="true" javaType="java.lang.Boolean" />	49	<entry name="code-folding-enable" value="true" javaType="java.lang.Boolean" />
50	<entry name="token-context-list" value="org.netbeans.modules.xml.text.ComplexValueSettingsFactory.getXMLTokenContext" javaType="methodvalue" />
51	<entry name="indentEngine" value="org.netbeans.modules.xml.text.ComplexValueSettingsFactory.getXMLIndentEngine" javaType="methodvalue" />	50	<entry name="indentEngine" value="org.netbeans.modules.xml.text.ComplexValueSettingsFactory.getXMLIndentEngine" javaType="methodvalue" />
52	<entry name="identifier-acceptor" value="org.netbeans.modules.xml.text.ComplexValueSettingsFactory.getXMLIdentifierAcceptor" javaType="methodvalue" />	51	<entry name="identifier-acceptor" value="org.netbeans.modules.xml.text.ComplexValueSettingsFactory.getXMLIdentifierAcceptor" javaType="methodvalue" />
53	<entry name="abbrev-reset-acceptor" value="org.netbeans.modules.xml.text.ComplexValueSettingsFactory.getXMLAbbrevResetAcceptor" javaType="methodvalue" />	52	<entry name="abbrev-reset-acceptor" value="org.netbeans.modules.xml.text.ComplexValueSettingsFactory.getXMLAbbrevResetAcceptor" javaType="methodvalue" />




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2016 Oracle and/or its affiliates. All rights reserved.
 *
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 * Other names may be trademarks of their respective owners.
 *
 * The contents of this file are subject to the terms of either the GNU
 * General Public License Version 2 only ("GPL") or the Common
 * Development and Distribution License("CDDL") (collectively, the
 * "License"). You may not use this file except in compliance with the
 * License. You can obtain a copy of the License at
 * http://www.netbeans.org/cddl-gplv2.html
 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
 * specific language governing permissions and limitations under the
 * License.  When distributing the software, include this License Header
 * Notice in each file and include the License file at
 * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Oracle in the GPL Version 2 section of the License file that
 * accompanied this code. If applicable, add the following below the
 * License Header, with the fields enclosed by brackets [] replaced by
 * your own identifying information:
 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * If you wish your version of this file to be governed by only the CDDL
 * or only the GPL Version 2, indicate your decision by adding
 * "[Contributor] elects to include this software in this distribution
 * under the [CDDL or GPL Version 2] license." If you do not indicate a
 * single choice of license, a recipient has the option to distribute
 * your version of this file under either the CDDL, the GPL Version 2 or
 * to extend the choice of license to its licensees as provided above.
 * However, if you add GPL Version 2 code and therefore, elected the GPL
 * Version 2 license, then the option applies only if the new code is
 * made subject to such option by the copyright holder.
 *
 * Contributor(s):
 *
 * Portions Copyrighted 2016 Sun Microsystems, Inc.
 */
package org.netbeans.modules.xml.text.structure;

/**
 *
 * @author sdedic
 */
public class XMLConstants {
    public static final String XML_TAG = "tag";
    public static final String XML_EMPTY_TAG = "empty_tag";
    public static final String XML_CONTENT = "content";
    public static final String XML_PI = "pi";
    public static final String XML_CDATA = "cdata";
    public static final String XML_DOCTYPE = "doctype";
    public static final String XML_COMMENT = "comment";
    
    public static final String XML_ERROR = "error";
}




import java.util.TreeSet;
import javax.swing.text.AttributeSet;
import javax.swing.text.BadLocationException;
import org.netbeans.api.lexer.Token;
import org.netbeans.api.lexer.TokenSequence;
import org.netbeans.api.xml.lexer.XMLTokenId;
import org.netbeans.editor.BaseDocument;
import org.netbeans.editor.TokenItem;
import org.netbeans.modules.editor.structure.api.DocumentElement;
import org.netbeans.modules.editor.structure.api.DocumentModel;
import org.netbeans.modules.editor.structure.api.DocumentModel.DocumentChange;

import org.netbeans.modules.editor.structure.api.DocumentModelException;
import org.netbeans.modules.editor.structure.api.DocumentModelUtils;
import org.netbeans.modules.editor.structure.spi.DocumentModelProvider;
import org.netbeans.modules.xml.text.api.dom.SyntaxElement;
import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
import org.netbeans.modules.xml.text.syntax.XMLTokenIDs;
import org.netbeans.modules.xml.text.syntax.dom.AttrImpl;
import org.netbeans.modules.xml.text.syntax.dom.CDATASectionImpl;
import org.netbeans.modules.xml.text.syntax.dom.CommentImpl;
import org.netbeans.modules.xml.text.syntax.dom.DocumentTypeImpl;
import org.netbeans.modules.xml.text.syntax.dom.EmptyTag;
import org.netbeans.modules.xml.text.syntax.dom.EndTag;
import org.netbeans.modules.xml.text.syntax.dom.ProcessingInstructionImpl;
import org.netbeans.modules.xml.text.syntax.dom.StartTag;
import org.netbeans.modules.xml.text.syntax.dom.Tag;
import org.openide.ErrorManager;

import static org.netbeans.modules.xml.text.structure.XMLConstants.*;
import org.w3c.dom.Attr;
import org.w3c.dom.DocumentType;
import org.w3c.dom.Node;
import org.w3c.dom.ProcessingInstruction;

/**
 *

        if(debug) System.out.println("\n\n\n\n\n");
        if(debug) DocumentModelUtils.dumpElementStructure(model.getRootElement());
        
        XMLSyntaxSupport sup = XMLSyntaxSupport.getSyntaxSupport(model.getDocument());
        if (sup == null) {
            return;
        }
        ArrayList regenerate = new ArrayList(); //used to store elements to be regenerated
        
        for(int i = 0; i < changes.length; i++) {
            DocumentChange dch = changes[i];
            int changeOffset = dch.getChangeStart().getOffset();
            Exception[] thrown = new Exception[1];
            
            int changeOffset = dch.getChangeStart().getOffset();
            int changeLength = dch.getChangeLength();
            
            //find an element in which the change happened
            DocumentElement leaf = model.getLeafElementForOffset(changeOffset);
            DocumentElement toRegenerate = leaf;
            
            if(debug) System.out.println("");
            if(debug) System.out.println(dch);
            try {
                sup.runWithSequence(changeOffset,
                        (TokenSequence s) -> {
                            try {
                                updateModelLocked(sup, regenerate, dtm, model, dch, s);
                            } catch (DocumentModelException | DocumentModelTransactionCancelledException ex) {
                                thrown[0] = ex;
                            }
                            return null;
                        }
                );
                if (thrown[0] != null) {
                    if (thrown[0] instanceof DocumentModelException) {
                        throw (DocumentModelException)thrown[0];
                TokenItem ti = sup.getTokenChain(changeOffset, changeOffset + 1);
                while(ti != null && ti.getOffset() < (changeOffset + changeLength)) {
                    if(ti.getTokenID() == XMLTokenIDs.TEXT
                            || ti.getTokenID() == XMLTokenIDs.DECLARATION
                            || ti.getTokenID() == XMLTokenIDs.BLOCK_COMMENT
                            || ti.getTokenID() == XMLTokenIDs.PI_CONTENT
                            || ti.getTokenID() == XMLTokenIDs.CDATA_SECTION) {
                        textOnly = true;
                        break;
                    }
                    if (thrown[0] instanceof DocumentModelTransactionCancelledException) {
                        throw (DocumentModelTransactionCancelledException)thrown[0];
                            || ti.getTokenID() == XMLTokenIDs.VALUE) {
                        attribsOnly = true;
                        break;
                    }
                    ti = ti.getNext();
                }
            }catch(BadLocationException e) {
                ErrorManager.getDefault().notify(ErrorManager.WARNING, e);
            }
            
            if(textOnly &&
                    ( leaf.getType().equals(XML_CONTENT)
                    || leaf.getType().equals(XML_DOCTYPE)
                    || leaf.getType().equals(XML_PI)
                    || leaf.getType().equals(XML_COMMENT)
                    || leaf.getType().equals(XML_CDATA))){
                //just a text written into a text element simply fire document element change event and do not regenerate anything
                //add the element update request into transaction
                if(debug) System.out.println("ONLY CONTENT UPDATE!!!");
                dtm.updateDocumentElementText(leaf);
                
                //do not scan the context tag if the change is only insert or remove of one character into a text (typing text perf. optimalization)
                if(dch.getChangeLength() == 1) {
                    continue;
                }
            }
            
            if((attribsOnly || dch.getChangeType() == DocumentChange.REMOVE)
                    && (leaf.getType().equals(XML_TAG)
                    || leaf.getType().equals(XML_EMPTY_TAG))) {
                if(debug) System.out.println("POSSIBLE ATTRIBS UPDATE!!!");
                //we need to parse the tag element attributes and set them according to the new values
                try {
                    SyntaxElement sel = sup.getElementChain(leaf.getStartOffset() + 1);
                    if(sel instanceof Tag || sel instanceof EmptyTag) {
                        //test whether the attributes changed
                        Map newAttrs = createAttributesMap((Tag)sel);
                        AttributeSet existing = leaf.getAttributes();
                        boolean update = false;
                        if(existing.getAttributeCount() == newAttrs.size()) {
                            Iterator itr = newAttrs.keySet().iterator();
                            while (itr.hasNext()) {
                                String attrName = (String) itr.next();
                                String attrValue = (String)newAttrs.get(attrName);
                                if(attrName != null && attrValue != null
                                        && !existing.containsAttribute(attrName, attrValue)) {
                                    update = true;
                                    break;
                                }
                                
                            }
                        } else update = true;
                        
                        if(update) {
                            dtm.updateDocumentElementAttribs(leaf, newAttrs);
                        }
                    }
                }catch(BadLocationException ble) {
                    ErrorManager.getDefault().notify(ErrorManager.WARNING, ble);
                }
            }
            
            //if one or more elements are deleted get correct paret to regenerate
            if((leaf.getStartOffset() == leaf.getEndOffset())
                    || (changeOffset == leaf.getStartOffset())
                    || (changeOffset == leaf.getEndOffset()))
                toRegenerate = leaf.getParentElement();
            else {
                //user written a tag or something what is not a text
                //we need to get the element's parent. Simple leaf.getParent() is not enought
                //since when an element is deleted then a wrong parent can be choosen
                if(leaf.getType().equals(XML_CONTENT)) {
                    do {
                        toRegenerate = toRegenerate.getParentElement();
                    } while(toRegenerate != null && toRegenerate.getType().equals(XML_CONTENT));
                    
                    if(toRegenerate == null) {
                        //no suitable parent found - the element is either a root or doesn't have any xml_tag ancestor => use root
                        toRegenerate = model.getRootElement();
                    }
                }
            } catch (BadLocationException ex) {
            }
        }
            if(toRegenerate == null) toRegenerate = model.getRootElement(); //root element is empty
            
            //now regenerate all sub-elements inside parent of the affected element
            
            //check if the element is not a descendant a one of the elements
            //which are going to be regenerated
            Iterator itr = regenerate.iterator();
            boolean hasAncestor = false;
            while(itr.hasNext()) {
                DocumentElement de = (DocumentElement)itr.next();
                if(de.equals(toRegenerate) || model.isDescendantOf(de, toRegenerate)) {
                    hasAncestor = true;
                    break;
                }
            }
            
            if(!hasAncestor) {
                //check whether the element is not an ancestor of one or more element
                //which are going to be regenerated
                ArrayList toRemove = new ArrayList();
                Iterator i2 = regenerate.iterator();
                while(i2.hasNext()) {
                    DocumentElement de = (DocumentElement)i2.next();
                    if(model.isDescendantOf(toRegenerate, de)) toRemove.add(de);
                }
                
                //now really remove the elements
                regenerate.removeAll(toRemove);
                
                //add the element - it will be likely regenerated in next model update
                regenerate.add(toRegenerate);
                
                //debug>>>
                if(debug) System.out.println("===================================================================");
                if(debug) System.out.println("change happened in " + leaf);
                if(debug) System.out.println("we will regenerate its parent " + toRegenerate);
                //<<<debug
            }
        } //end of the changes loop
        
        //update the model
        Iterator elementsToUpdate = regenerate.iterator();
        while(elementsToUpdate.hasNext()) {

        }
        
        if(measure) System.out.println("[xmlmodel] generated in " + (System.currentTimeMillis() - a));
    }
    
    private void updateModelLocked(XMLSyntaxSupport sup, ArrayList regenerate, DocumentModel.DocumentModelModificationTransaction dtm,
            DocumentModel model, DocumentChange dch, TokenSequence seq)
            throws DocumentModelException, DocumentModelTransactionCancelledException, BadLocationException {
        int changeOffset = dch.getChangeStart().getOffset();
        int changeLength = dch.getChangeLength();

        //find an element in which the change happened
        DocumentElement leaf = model.getLeafElementForOffset(changeOffset);
        DocumentElement toRegenerate = leaf;

        if(debug) System.out.println("");
        if(debug) System.out.println(dch);
        try {
            if(debug) System.out.println("inserted text:'" + model.getDocument().getText(changeOffset, changeLength) + "'");
        }catch(BadLocationException e) {
            ;
        }
        if(debug) System.out.println("leaf = " + leaf);

        //parse the document context
        boolean textOnly = false;
        boolean attribsOnly = false;
        //scan the inserted text - if it contains only text set textOnly flag
        seq.move(changeOffset);
        W: while (seq.moveNext()) {
            Token<XMLTokenId>   ti = seq.token();
            XMLTokenId id = ti.id();
            switch (id) {
                case TEXT:
                case DECLARATION:
                case BLOCK_COMMENT:
                case PI_CONTENT:
                case CDATA_SECTION:
                    textOnly = true;
                    break W;

                case ARGUMENT:
                case OPERATOR:
                case VALUE:
                    attribsOnly = true;
                    break W;
            }
        }
        if(textOnly &&
                ( leaf.getType().equals(XML_CONTENT)
                || leaf.getType().equals(XML_DOCTYPE)
                || leaf.getType().equals(XML_PI)
                || leaf.getType().equals(XML_COMMENT)
                || leaf.getType().equals(XML_CDATA))){
            //just a text written into a text element simply fire document element change event and do not regenerate anything
            //add the element update request into transaction
            if(debug) System.out.println("ONLY CONTENT UPDATE!!!");
            dtm.updateDocumentElementText(leaf);

            //do not scan the context tag if the change is only insert or remove of one character into a text (typing text perf. optimalization)
            if(dch.getChangeLength() == 1) {
                return;
            }
        }

        if((attribsOnly || dch.getChangeType() == DocumentChange.REMOVE)
                && (leaf.getType().equals(XML_TAG)
                || leaf.getType().equals(XML_EMPTY_TAG))) {
            if(debug) System.out.println("POSSIBLE ATTRIBS UPDATE!!!");
            //we need to parse the tag element attributes and set them according to the new values
            try {
                SyntaxElement sel = sup.getElementChain(leaf.getStartOffset() + 1);
                if (sup.isStartTag(sel) || sup.isEmptyTag(sel)) {
                    //test whether the attributes changed
                    Map newAttrs = createAttributesMap(sel.getNode());
                    AttributeSet existing = leaf.getAttributes();
                    boolean update = false;
                    if(existing.getAttributeCount() == newAttrs.size()) {
                        Iterator itr = newAttrs.keySet().iterator();
                        while (itr.hasNext()) {
                            String attrName = (String) itr.next();
                            String attrValue = (String)newAttrs.get(attrName);
                            if(attrName != null && attrValue != null
                                    && !existing.containsAttribute(attrName, attrValue)) {
                                update = true;
                                break;
                            }

                        }
                    } else update = true;

                    if(update) {
                        dtm.updateDocumentElementAttribs(leaf, newAttrs);
                    }
                }
            }catch(BadLocationException ble) {
                ErrorManager.getDefault().notify(ErrorManager.WARNING, ble);
            }
        }

        //if one or more elements are deleted get correct paret to regenerate
        if((leaf.getStartOffset() == leaf.getEndOffset())
                || (changeOffset == leaf.getStartOffset())
                || (changeOffset == leaf.getEndOffset()))
            toRegenerate = leaf.getParentElement();
        else {
            //user written a tag or something what is not a text
            //we need to get the element's parent. Simple leaf.getParent() is not enought
            //since when an element is deleted then a wrong parent can be choosen
            if(leaf.getType().equals(XML_CONTENT)) {
                do {
                    toRegenerate = toRegenerate.getParentElement();
                } while(toRegenerate != null && toRegenerate.getType().equals(XML_CONTENT));

                if(toRegenerate == null) {
                    //no suitable parent found - the element is either a root or doesn't have any xml_tag ancestor => use root
                    toRegenerate = model.getRootElement();
                }
            }
        }

        if(toRegenerate == null) toRegenerate = model.getRootElement(); //root element is empty

        //now regenerate all sub-elements inside parent of the affected element

        //check if the element is not a descendant a one of the elements
        //which are going to be regenerated
        Iterator itr = regenerate.iterator();
        boolean hasAncestor = false;
        while(itr.hasNext()) {
            DocumentElement de = (DocumentElement)itr.next();
            if(de.equals(toRegenerate) || model.isDescendantOf(de, toRegenerate)) {
                hasAncestor = true;
                break;
            }
        }

        if(!hasAncestor) {
            //check whether the element is not an ancestor of one or more element
            //which are going to be regenerated
            ArrayList toRemove = new ArrayList();
            Iterator i2 = regenerate.iterator();
            while(i2.hasNext()) {
                DocumentElement de = (DocumentElement)i2.next();
                if(model.isDescendantOf(toRegenerate, de)) toRemove.add(de);
            }

            //now really remove the elements
            regenerate.removeAll(toRemove);

            //add the element - it will be likely regenerated in next model update
            regenerate.add(toRegenerate);

            //debug>>>
            if(debug) System.out.println("===================================================================");
            if(debug) System.out.println("change happened in " + leaf);
            if(debug) System.out.println("we will regenerate its parent " + toRegenerate);
            //<<<debug
        }
    }
    
    /** generates document elements within an area defined by startoffset and

        int endOffset = de.getEndOffset();
        
        BaseDocument doc = (BaseDocument)model.getDocument();
        XMLSyntaxSupport sup = XMLSyntaxSupport.createSyntaxSupport(doc);
        
        if(debug) System.out.println("[XMLDocumentModelProvider] regenerating " + de);
        
        Set addedElements = new TreeSet(DocumentModel.ELEMENTS_COMPARATOR);
        ArrayList skipped = new ArrayList();
        try {
            Stack<SyntaxElement> elementsStack = new Stack<>(); //we need this to determine tags nesting
            
            //the syntax element is created for token on offset - 1
            //so I need to add 1 to the startOffset

            
            //scan the document for syntax elements - from startOffset to endOffset
            while(sel != null && getSyntaxElementEndOffset(sel) <= endOffset) {
                if(sel.getType() == SyntaxElement.NODE_ERROR) {
                    //add error element into the structure
                    if(debug) System.out.println("Error found! => adding error element.");
                    String errorText = doc.getText(sel.getElementOffset(), sel.getElementLength());

                            from, to));
                }
                
                if(sup.isStartTag(sel)) {
                    //test if there is already an existing documet element in the model
                    String nn = sel.getNode().getNodeName();
                    DocumentElement tagDE = DocumentModelUtils.findElement(model, sel.getElementOffset(), nn, XML_TAG);
                    
                    //do not skip the 'de' element which is to be regenerated
                    if(tagDE != null && !tagDE.equals(de)) {
                        //test if the element has also correct end tag
                        SyntaxElement endTagCheck = sup.getElementChain(Math.min(doc.getLength(), tagDE.getEndOffset() + 1));
                        if(sup.isEndTag(endTagCheck) && endTagCheck.getNode().getNodeName().equals(nn)) {
                            //there is an element - skip it - analyze an element after the end of the
                            //existing element
                            if(debug) System.out.println("found existing element " + tagDE + " => skipping");

                    //add the tag syntax element into stack
                    elementsStack.push(sel);
                    
                } else if (sup.isEndTag(sel)) {
                    if(!elementsStack.isEmpty()) {
                        SyntaxElement latest = elementsStack.peek();
                        String nn = latest.getNode().getNodeName();
                        if((sel.getNode().getNodeName().equals(nn))) {
                            //we have encountered a pair end tag to open tag on the peek of the stack
                            Map attribs = createAttributesMap(latest.getNode());
                            addedElements.add(dtm.addDocumentElement(nn, XML_TAG, attribs,
                                    latest.getElementOffset(), getSyntaxElementEndOffset(sel)));
                            //remove the open tag syntax element from the stack
                            elementsStack.pop();

                            
                            //I need to save the pop-ed elements for the case that there isn't
                            //any matching start tag found
                            ArrayList<SyntaxElement> savedElements = new ArrayList<>();
                            //this semaphore is used behind the loop to detect whether a
                            //matching start has been found
                            boolean foundStartTag = false;

                                SyntaxElement s = (SyntaxElement)elementsStack.pop();
                                savedElements.add(s);
                                
                                int soff = s.getElementOffset();
                                String sn = s.getNode().getNodeName();
                                String en = s.getNode().getNodeName();
                                
                                if(sup.isStartTag(s) && sn.equals(en)) {
                                    //found a matching start tag
                                    //XXX I am not sure whether this algorith is correct
                                    Map attribs = createAttributesMap(s.getNode());
                                    addedElements.add(dtm.addDocumentElement(sn, XML_TAG, attribs,
                                            soff, getSyntaxElementEndOffset(sel)));
                                    
                                    foundStartTag = true;
                                    break; //break the while loop

                            }
                        }
                    }
                } else if(sup.isEmptyTag(sel)) {
                    Map attribs = createAttributesMap(sel.getNode());
                    addedElements.add(dtm.addDocumentElement(sel.getNode().getNodeName(), XML_EMPTY_TAG, attribs,
                            sel.getElementOffset(), getSyntaxElementEndOffset(sel)));
                } else if (sel instanceof CDATASectionImpl) {
                    //CDATA section
                    addedElements.add(dtm.addDocumentElement("cdata", XML_CDATA, Collections.EMPTY_MAP,
                            sel.getElementOffset(), getSyntaxElementEndOffset(sel)));
                } else if (sel instanceof ProcessingInstructionImpl) {
                    //PI section
                    String nodeName = ((ProcessingInstructionImpl)sel).getNodeName();
                    //if the nodename is not parsed, then the element is somehow broken => do not show it.
                    if(nodeName != null) {
                        addedElements.add(dtm.addDocumentElement(nodeName, XML_PI, Collections.EMPTY_MAP,
                                sel.getElementOffset(), getSyntaxElementEndOffset(sel)));
                    }
                } else if (sel instanceof DocumentTypeImpl) {
                    //document type <!DOCTYPE xxx [...]>
                    String nodeName = ((DocumentTypeImpl)sel).getName();
                    //if the nodename is not parsed, then the element is somehow broken => do not show it.
                    if(nodeName != null) {
                        addedElements.add(dtm.addDocumentElement(nodeName, XML_DOCTYPE, Collections.EMPTY_MAP,
                                sel.getElementOffset(), getSyntaxElementEndOffset(sel)));
                    }
                } else if (sel instanceof CommentImpl) {
                    //comment element <!-- xxx -->
                    //DO NOT CREATE ELEMENT FOR COMMENTS
                    addedElements.add(dtm.addDocumentElement("comment", XML_COMMENT, Collections.EMPTY_MAP,
                            sel.getElementOffset(), getSyntaxElementEndOffset(sel)));
                } else {
                    switch (sel.getType()) {
                        case Node.CDATA_SECTION_NODE:
                            addedElements.add(dtm.addDocumentElement("cdata", XML_CDATA, Collections.EMPTY_MAP,
                                    sel.getElementOffset(), getSyntaxElementEndOffset(sel)));
                            break;
                        case Node.PROCESSING_INSTRUCTION_NODE: {
                            //PI section
                            String nodeName = ((ProcessingInstruction)sel.getNode()).getNodeName();
                            //if the nodename is not parsed, then the element is somehow broken => do not show it.
                            if(nodeName != null) {
                                addedElements.add(dtm.addDocumentElement(nodeName, XML_PI, Collections.EMPTY_MAP,
                                        sel.getElementOffset(), getSyntaxElementEndOffset(sel)));
                            }
                            break;
                        }
                        case Node.DOCUMENT_TYPE_NODE: {
                            //document type <!DOCTYPE xxx [...]>
                            String nodeName = ((DocumentType)sel.getNode()).getName();
                            //if the nodename is not parsed, then the element is somehow broken => do not show it.
                            if(nodeName != null) {
                                addedElements.add(dtm.addDocumentElement(nodeName, XML_DOCTYPE, Collections.EMPTY_MAP,
                                        sel.getElementOffset(), getSyntaxElementEndOffset(sel)));
                            }
                            break;
                        }
                        case Node.COMMENT_NODE:
                            //comment element <!-- xxx -->
                            //DO NOT CREATE ELEMENT FOR COMMENTS
                            addedElements.add(dtm.addDocumentElement("comment", XML_COMMENT, Collections.EMPTY_MAP,
                                    sel.getElementOffset(), getSyntaxElementEndOffset(sel)));
                            break;
                        default:
                            //everything else is content
                            int from = sel.getElementOffset();
                            // because of changeset #1d6a31161c70, all elements report end at the last char, but that is not
                            // what is expected from the DocumentElement.
                            int to = getSyntaxElementEndOffset(sel) + 1;
                            if(from < to) {
                                //Do not allow empty elements to be added:
                                //Otherwise it causes problems in DocumentModel.ELEMENTS_COMPARATOR
                                //(idential elements are considered as unequal (the reason why this
                                //required is distinguishing elements after text deletion) and subsequently
                                //the empty elements are added and removed all over again after each model
                                //update which causes performance problems.
                                addedElements.add(dtm.addDocumentElement("...", XML_CONTENT, Collections.EMPTY_MAP, from, to));
                            }
                    }
                }
                //find next syntax element

        return sel.getElementOffset() + sel.getElementLength() -1;
    }
    
    private Map createAttributesMap(Node tag) {
        if(tag.getAttributes().getLength() == 0) {
            return Collections.EMPTY_MAP;
        } else {
            HashMap map = new LinkedHashMap(tag.getAttributes().getLength());
            for(int i = 0; i < tag.getAttributes().getLength(); i++) {
                Attr attr = (Attr)tag.getAttributes().item(i);
                map.put(attr.getName(), attr.getValue());
            }
            return map;
        }
    }
    
    public static final String XML_TAG = "tag";
    public static final String XML_EMPTY_TAG = "empty_tag";
    public static final String XML_CONTENT = "content";
    public static final String XML_PI = "pi";
    public static final String XML_CDATA = "cdata";
    public static final String XML_DOCTYPE = "doctype";
    public static final String XML_COMMENT = "comment";
    
    public static final String XML_ERROR = "error";
    
    
    private static final boolean debug = Boolean.getBoolean("org.netbeans.modules.xml.text.structure.debug");
    private static final boolean measure = Boolean.getBoolean("org.netbeans.modules.xml.text.structure.measure");




package org.netbeans.modules.xml.text.syntax;

import javax.swing.text.Document;
import org.netbeans.api.editor.mimelookup.MimeLookup;
import org.netbeans.api.editor.mimelookup.MimePath;
import org.netbeans.editor.Syntax;
import org.netbeans.modules.xml.text.syntax.bridge.LegacySyntaxBridge;
import org.netbeans.modules.xml.text.syntax.javacc.lib.*;
import org.netbeans.modules.xml.text.syntax.javacc.*;


     */
    public static final String MIME_TYPE = "application/xml-dtd"; // NOI18N
    
    /** Create new instance of syntax coloring parser */
    @Override
    public Syntax createSyntax(Document doc) {
        return new JJEditorSyntax( 
            new DTDSyntaxTokenManager(null).new Bridge(),
            new DTDSyntaxTokenMapper(),
            DTDTokenContext.contextPath
        );
    }

    @Override
    public String getContentType() {
        return MIME_TYPE;
    }

}





package org.netbeans.modules.xml.text.syntax;

import javax.swing.text.Document;
import org.netbeans.editor.BaseDocument;
import org.netbeans.editor.Syntax;
import org.netbeans.editor.SyntaxSupport;

/**
 *
 * @author samaresh

     */
    public static final String MIME_TYPE = "text/xml-external-parsed-entity"; // NOI18N
    
    /** Create new instance of syntax coloring parser */
    @Override
    public Syntax createSyntax(Document doc) {
        return new XMLDefaultSyntax();
    }

    @Override
    public String getContentType() {
        return MIME_TYPE;
    }

    /** Create syntax support */
    @Override
    public SyntaxSupport createSyntaxSupport(BaseDocument doc) {
        return new XMLSyntaxSupport(doc);
    }
    
}

Lines 47-55 Link Here

(-)a/xml.text/src/org/netbeans/modules/xml/text/syntax/UniKit.java (+26 lines)
47		47
48	import javax.swing.text.Document;	48	import javax.swing.text.Document;
49	import javax.swing.text.BadLocationException;	49	import javax.swing.text.BadLocationException;
		50	import org.netbeans.api.editor.mimelookup.MimeLookup;
		51	import org.netbeans.editor.BaseDocument;
		52	import org.netbeans.editor.Syntax;
		53	import org.netbeans.editor.SyntaxSupport;
50		54
51	import org.netbeans.modules.editor.NbEditorKit;	55	import org.netbeans.modules.editor.NbEditorKit;
52	import org.netbeans.modules.xml.api.EncodingUtil;	56	import org.netbeans.modules.xml.api.EncodingUtil;
		57	import org.netbeans.modules.xml.text.syntax.bridge.LegacySyntaxBridge;
53		58
54	/**	59	/**
55	* Editor kit implementation for xml content type.	60	* Editor kit implementation for xml content type.
Lines 112-115 Link Here
112	super.write(out, doc, pos, len);	117	super.write(out, doc, pos, len);
113	}	118	}
114		119
		120	@Override
		121	public Syntax createSyntax(Document doc) {
		122	Syntax syn = null;
		123	LegacySyntaxBridge bridge = MimeLookup.getLookup(getContentType()).lookup(LegacySyntaxBridge.class);
		124	if (bridge != null) {
		125	syn = bridge.createSyntax(this, doc, getContentType());
		126	}
		127	return syn != null ? syn : super.createSyntax(doc);
		128	}
		129
		130	/** Create syntax support */
		131	@Override
		132	public SyntaxSupport createSyntaxSupport(BaseDocument doc) {
		133	SyntaxSupport syn = null;
		134	LegacySyntaxBridge bridge = MimeLookup.getLookup(getContentType()).lookup(LegacySyntaxBridge.class);
		135	if (bridge != null) {
		136	syn = bridge.createSyntaxSupport(this, doc, getContentType());
		137	}
		138	return syn != null ? syn : super.createSyntaxSupport(doc);
		139	}
		140
115	}	141	}

Lines 54-59 Link Here

(-)a/xml.text/src/org/netbeans/modules/xml/text/syntax/XMLKit.java (-3 / +15 lines)
54	import javax.swing.text.JTextComponent;	54	import javax.swing.text.JTextComponent;
55	import javax.swing.text.BadLocationException;	55	import javax.swing.text.BadLocationException;
56	import javax.swing.*;	56	import javax.swing.*;
		57	import org.netbeans.api.editor.mimelookup.MimeLookup;
57	import org.netbeans.api.lexer.Language;	58	import org.netbeans.api.lexer.Language;
58	import org.netbeans.api.xml.lexer.XMLTokenId;	59	import org.netbeans.api.xml.lexer.XMLTokenId;
59	import org.openide.awt.StatusDisplayer;	60	import org.openide.awt.StatusDisplayer;
Lines 65-70 Link Here
65		66
66	import org.netbeans.modules.xml.text.XmlCommentHandler;	67	import org.netbeans.modules.xml.text.XmlCommentHandler;
67	import org.netbeans.modules.xml.text.completion.NodeSelector;	68	import org.netbeans.modules.xml.text.completion.NodeSelector;
		69	import static org.netbeans.modules.xml.text.syntax.DTDKit.MIME_TYPE;
		70	import org.netbeans.modules.xml.text.syntax.bridge.LegacySyntaxBridge;
68		71
69		72
70	/**	73	/**
Lines 106-112 Link Here
106	/** Create new instance of syntax coloring parser */	109	/** Create new instance of syntax coloring parser */
107	@Override	110	@Override
108	public Syntax createSyntax(Document doc) {	111	public Syntax createSyntax(Document doc) {
109	return new XMLDefaultSyntax();	112	Syntax syn = null;
		113	LegacySyntaxBridge bridge = MimeLookup.getLookup(MIME_TYPE).lookup(LegacySyntaxBridge.class);
		114	if (bridge != null) {
		115	syn = bridge.createSyntax(this, doc, MIME_TYPE);
		116	}
		117	return syn != null ? syn : super.createSyntax(doc);
110	}	118	}
111		119
112	@Override	120	@Override
Lines 120-130 Link Here
120	}	128	}
121	}	129	}
122		130
123
124	/** Create syntax support */	131	/** Create syntax support */
125	@Override	132	@Override
126	public SyntaxSupport createSyntaxSupport(BaseDocument doc) {	133	public SyntaxSupport createSyntaxSupport(BaseDocument doc) {
127	return new XMLSyntaxSupport(doc);	134	SyntaxSupport syn = null;
		135	LegacySyntaxBridge bridge = MimeLookup.getLookup(MIME_TYPE).lookup(LegacySyntaxBridge.class);
		136	if (bridge != null) {
		137	syn = bridge.createSyntaxSupport(this, doc, MIME_TYPE);
		138	}
		139	return syn != null ? syn : super.createSyntaxSupport(doc);
128	}	140	}
129		141
130	@Override	142	@Override




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2016 Oracle and/or its affiliates. All rights reserved.
 *
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 * Other names may be trademarks of their respective owners.
 *
 * The contents of this file are subject to the terms of either the GNU
 * General Public License Version 2 only ("GPL") or the Common
 * Development and Distribution License("CDDL") (collectively, the
 * "License"). You may not use this file except in compliance with the
 * License. You can obtain a copy of the License at
 * http://www.netbeans.org/cddl-gplv2.html
 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
 * specific language governing permissions and limitations under the
 * License.  When distributing the software, include this License Header
 * Notice in each file and include the License file at
 * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Oracle in the GPL Version 2 section of the License file that
 * accompanied this code. If applicable, add the following below the
 * License Header, with the fields enclosed by brackets [] replaced by
 * your own identifying information:
 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * If you wish your version of this file to be governed by only the CDDL
 * or only the GPL Version 2, indicate your decision by adding
 * "[Contributor] elects to include this software in this distribution
 * under the [CDDL or GPL Version 2] license." If you do not indicate a
 * single choice of license, a recipient has the option to distribute
 * your version of this file under either the CDDL, the GPL Version 2 or
 * to extend the choice of license to its licensees as provided above.
 * However, if you add GPL Version 2 code and therefore, elected the GPL
 * Version 2 license, then the option applies only if the new code is
 * made subject to such option by the copyright holder.
 *
 * Contributor(s):
 *
 * Portions Copyrighted 2016 Sun Microsystems, Inc.
 */
package org.netbeans.modules.xml.text.syntax.bridge;

import javax.swing.text.Document;
import javax.swing.text.EditorKit;
import org.netbeans.editor.Syntax;
import org.netbeans.editor.SyntaxSupport;

/**
 * Transitional interface, which keeps old Syntax-related classes in a 
 * obsolete/deprecated module. Not intended to be implemented by regular clients.
 * Implementations should be registered in MIME Lookup for the particular MIME type.
 * 
 * @author sdedic
 */
public interface LegacySyntaxBridge {
    public Syntax          createSyntax(EditorKit host, Document doc, String mimeType);
    public SyntaxSupport   createSyntaxSupport(EditorKit host, Document doc, String mimeType);
}




import org.netbeans.api.lexer.Language;
import org.netbeans.api.xml.lexer.XMLTokenId;
import org.netbeans.editor.BaseDocument;
import org.netbeans.junit.NbTestCase;
import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
import org.netbeans.modules.xml.xam.ModelSource;
import org.netbeans.modules.xml.xdm.XDMModel;
import org.netbeans.modules.xml.xdm.diff.DefaultElementIdentity;
import org.netbeans.modules.xml.xdm.diff.DiffFinder;
import org.netbeans.modules.xml.xdm.diff.Difference;
import org.openide.util.Exceptions;
import org.openide.util.Lookup;
import org.openide.util.lookup.Lookups;


 * Various tests include, sanity, regression, performance etc.
 * @author Samaresh (samaresh.panda@sun.com)
 */
public class AbstractTestCase extends NbTestCase {
    
    public AbstractTestCase(String testName) {
        super(testName);

        BaseDocument doc = getResourceAsDocument(path);
        //must set the language inside unit tests
        doc.putProperty(Language.class, XMLTokenId.language());
        return XMLSyntaxSupport.getSyntaxSupport(doc);
    }

    /**





package org.netbeans.modules.xml.text.dom;

import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
import junit.framework.Test;
import junit.framework.TestSuite;
import org.netbeans.api.lexer.Token;
import org.netbeans.editor.BaseDocument;
import org.netbeans.modules.xml.text.AbstractTestCase;
import org.netbeans.modules.xml.text.api.dom.SyntaxElement;

/**
 *





import org.netbeans.modules.xml.text.AbstractTestCase;
import junit.framework.*;
import org.netbeans.api.editor.document.LineDocument;
import org.netbeans.editor.BaseDocument;

/**

     * with a document that represents expected outcome.
     */
    public void testFormat() throws Exception {
        LineDocument inputDoc = getDocument("indent/input.xml");
        //format the inputDoc
        XMLLexerFormatter formatter = new XMLLexerFormatter(null);
        LineDocument formattedDoc = formatter.doReformat(inputDoc, 0, inputDoc.getLength());
        System.out.println(formattedDoc.getText(0, formattedDoc.getLength()));
        LineDocument outputDoc = getDocument("indent/output.xml");
        assertTrue (compare(formattedDoc, outputDoc));
    }

    public void testFormatSubsection() throws Exception {
        BaseDocument inputDoc = getDocument("indent/input_sub.xml");
        //format a subsection of the inputDoc
        XMLLexerFormatter formatter = new XMLLexerFormatter(null);
        LineDocument formattedDoc = formatter.doReformat(inputDoc, 72, 97);
        System.out.println(formattedDoc.getText(0, formattedDoc.getLength()));
        LineDocument outputDoc = getDocument("indent/output_sub.xml");
        assertTrue (compare(formattedDoc, outputDoc));
    }

    // #139160

        BaseDocument inputDoc = getDocument("indent/input2.xsd");
        //format the inputDoc
        XMLLexerFormatter formatter = new XMLLexerFormatter(null);
        LineDocument formattedDoc = formatter.doReformat(inputDoc, 0, inputDoc.getLength());
        System.out.println(formattedDoc.getText(0, formattedDoc.getLength()));
        LineDocument outputDoc = getDocument("indent/output2.xsd");
        assertTrue (compare(formattedDoc, outputDoc));
    }

    public void testFormatPerformance() throws Exception {

        BaseDocument inputDoc = getDocument("indent/input_sub1.xml");
        //format a subsection of the inputDoc
        XMLLexerFormatter formatter = new XMLLexerFormatter(null);
        LineDocument formattedDoc = formatter.doReformat(inputDoc, 46, 74);
        System.out.println(formattedDoc.getText(0, formattedDoc.getLength()));
        LineDocument outputDoc = getDocument("indent/output_sub1.xml");
        assertTrue (compare(formattedDoc, outputDoc));
    }

    public void testFormatSubsection2() throws Exception {
        BaseDocument inputDoc = getDocument("indent/input_sub2.xml");
        //format a subsection of the inputDoc
        XMLLexerFormatter formatter = new XMLLexerFormatter(null);
        LineDocument formattedDoc = formatter.doReformat(inputDoc, 63, 80);
        System.out.println(formattedDoc.getText(0, formattedDoc.getLength()));
        LineDocument outputDoc = getDocument("indent/output_sub2.xml");
        assertTrue (compare(formattedDoc, outputDoc));
    }

    // #170343

        BaseDocument inputDoc = getDocument("indent/input_preserve.xml");
        //format the inputDoc
        XMLLexerFormatter formatter = new XMLLexerFormatter(null);
        LineDocument formattedDoc = formatter.doReformat(inputDoc, 0, inputDoc.getLength());
        System.out.println(formattedDoc.getText(0, formattedDoc.getLength()));
        LineDocument outputDoc = getDocument("indent/output_preserve.xml");
        assertTrue (compare(formattedDoc, outputDoc));
    }

    // #170343

        BaseDocument inputDoc = getDocument("indent/input_withpreserve.xml");
        //format the inputDoc
        XMLLexerFormatter formatter = new XMLLexerFormatter(null);
        LineDocument formattedDoc = formatter.doReformat(inputDoc, 0, inputDoc.getLength());
        System.out.println(formattedDoc.getText(0, formattedDoc.getLength()));
        LineDocument outputDoc = getDocument("indent/output_withpreserve.xml");
        assertTrue (compare(formattedDoc, outputDoc));
    }

    // #170343

        //format the inputDoc
        XMLLexerFormatter formatter = new XMLLexerFormatter(null);
        System.out.println("SECTION:" + inputDoc.getText(91, 87));
        LineDocument formattedDoc = formatter.doReformat(inputDoc, 91, 91 + 87);
        System.out.println(formattedDoc.getText(0, formattedDoc.getLength()));
        LineDocument outputDoc = getDocument("indent/output_preserve.xml");
        assertTrue(compare(formattedDoc, outputDoc));
    }



        BaseDocument inputDoc = getDocument("indent/input_contentIndent.xml");
        //format the inputDoc
        XMLLexerFormatter formatter = new XMLLexerFormatter(null);
        LineDocument formattedDoc = formatter.doReformat(inputDoc, 0, inputDoc.getLength());
        System.out.println(formattedDoc.getText(0, formattedDoc.getLength()));
        LineDocument outputDoc = getDocument("indent/output_contentIndent.xml");
        assertTrue(compare(formattedDoc, outputDoc));
    }

    public void testFormat_AttrsIndent() throws Exception {
        BaseDocument inputDoc = getDocument("indent/input_attrsIndent.xml");
        //format the inputDoc
        XMLLexerFormatter formatter = new XMLLexerFormatter(null);
        LineDocument formattedDoc = formatter.doReformat(inputDoc, 0, inputDoc.getLength());
        System.out.println(formattedDoc.getText(0, formattedDoc.getLength()));
        LineDocument outputDoc = getDocument("indent/output_attrsIndent.xml");
        assertTrue (compare(formattedDoc, outputDoc));
    }

    public void testFormat_ProcessingIndent() throws Exception {
        BaseDocument inputDoc = getDocument("indent/input_processingXml.xml");
        //format the inputDoc
        XMLLexerFormatter formatter = new XMLLexerFormatter(null);
        LineDocument formattedDoc = formatter.doReformat(inputDoc, 0, inputDoc.getLength());
        System.out.println(formattedDoc.getText(0, formattedDoc.getLength()));
        LineDocument outputDoc = getDocument("indent/output_processingXml.xml");
        assertTrue (compare(formattedDoc, outputDoc));
    }
    
    

        BaseDocument inputDoc = getDocument("indent/input_nestedSame.xml");
        //format the inputDoc
        XMLLexerFormatter formatter = new XMLLexerFormatter(null);
        LineDocument formattedDoc = formatter.doReformat(inputDoc, 0, inputDoc.getLength());
        System.out.println(formattedDoc.getText(0, formattedDoc.getLength()));
        LineDocument outputDoc = getDocument("indent/output_nestedSame.xml");
        assertTrue (compare(formattedDoc, outputDoc));
    }
    
    public void testFormatWithCdataContent217342() throws Exception {
        BaseDocument inputDoc = getDocument("indent/input_cdataContent.xml");
        //format the inputDoc
        XMLLexerFormatter formatter = new XMLLexerFormatter(null);
        LineDocument formattedDoc = formatter.doReformat(inputDoc, 0, inputDoc.getLength());
        System.out.println(formattedDoc.getText(0, formattedDoc.getLength()));
        LineDocument outputDoc = getDocument("indent/output_cdataContent.xml");
        assertTrue (compare(formattedDoc, outputDoc));
    }

    public void testFormatBreaksMixedContent216986() throws Exception {
        BaseDocument inputDoc = getDocument("indent/input_breaksMixedContent.xml");
        //format the inputDoc
        XMLLexerFormatter formatter = new XMLLexerFormatter(null);
        LineDocument formattedDoc = formatter.doReformat(inputDoc, 0, inputDoc.getLength());
        System.out.println(formattedDoc.getText(0, formattedDoc.getLength()));
        LineDocument outputDoc = getDocument("indent/output_breaksMixedContent.xml");
        assertTrue (compare(formattedDoc, outputDoc));
    }
    
    public void testFormatNewlinesInTags217995() throws Exception {
        BaseDocument inputDoc = getDocument("indent/input_newlineInTags.xml");
        //format the inputDoc
        XMLLexerFormatter formatter = new XMLLexerFormatter(null);
        LineDocument formattedDoc = formatter.doReformat(inputDoc, 0, inputDoc.getLength());
        System.out.println(formattedDoc.getText(0, formattedDoc.getLength()));
        LineDocument outputDoc = getDocument("indent/output_newlineInTags.xml");
        assertTrue (compare(formattedDoc, outputDoc));
    }
    
    public void testFormatTagAtLineStartAfterContent238985() throws Exception {
        BaseDocument inputDoc = getDocument("indent/input_tagAtStatOfLine.xml");
        //format the inputDoc
        XMLLexerFormatter formatter = new XMLLexerFormatter(null);
        LineDocument formattedDoc = formatter.doReformat(inputDoc, 0, inputDoc.getLength());
        System.out.println(formattedDoc.getText(0, formattedDoc.getLength()));
        LineDocument outputDoc = getDocument("indent/output_tagAtStatOfLine.xml");
        assertTrue (compare(formattedDoc, outputDoc));
    }
}

Lines 44-51 Link Here

(-)a/xml.text/test/unit/src/org/netbeans/modules/xml/text/syntax/XMLSyntaxSupportTest.java (-4 / +8 lines)
44		44
45	import junit.framework.Test;	45	import junit.framework.Test;
46	import junit.framework.TestSuite;	46	import junit.framework.TestSuite;
		47	import org.netbeans.api.lexer.Token;
		48	import org.netbeans.api.xml.lexer.XMLTokenId;
47	import org.netbeans.editor.TokenItem;	49	import org.netbeans.editor.TokenItem;
48	import org.netbeans.modules.xml.text.AbstractTestCase;	50	import org.netbeans.modules.xml.text.AbstractTestCase;
		51	import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
		52	import org.netbeans.modules.xml.text.api.dom.SyntaxElement;
49		53
50	/**	54	/**
51	*	55	*
Lines 85-95 Link Here
85		89
86	public void testTokens() throws Exception {	90	public void testTokens() throws Exception {
87	XMLSyntaxSupport support = getSyntaxSupport("syntax/test.xml");	91	XMLSyntaxSupport support = getSyntaxSupport("syntax/test.xml");
88	TokenItem token = support.getPreviousToken(30);	92	Token<XMLTokenId> token = support.getPreviousToken(30);
89	System.out.println("Token: " + token.getTokenID().getName() + " Text: " + token.getImage());	93	System.out.println("Token: " + token.id().name() + " Text: " + token.text());
90	token = support.getPreviousToken(31);	94	token = support.getPreviousToken(31);
91	System.out.println("Token: " + token.getTokenID().getName() + " Text: " + token.getImage());	95	System.out.println("Token: " + token.id().name() + " Text: " + token.text());
92	token = support.getPreviousToken(32);	96	token = support.getPreviousToken(32);
93	System.out.println("Token: " + token.getTokenID().getName() + " Text: " + token.getImage());	97	System.out.println("Token: " + token.id().name() + " Text: " + token.text());
94	}	98	}
95	}	99	}

Lines 4-7 Link Here

(-)a/xml/manifest.mf (-1 / +1 lines)
4	OpenIDE-Module-Install: org/netbeans/modules/xml/CoreModuleInstall.class	4	OpenIDE-Module-Install: org/netbeans/modules/xml/CoreModuleInstall.class
5	OpenIDE-Module-Layer: org/netbeans/modules/xml/resources/mf-layer.xml	5	OpenIDE-Module-Layer: org/netbeans/modules/xml/resources/mf-layer.xml
6	AutoUpdate-Show-In-Client: false	6	AutoUpdate-Show-In-Client: false
7	OpenIDE-Module-Specification-Version: 1.32	7	OpenIDE-Module-Specification-Version: 1.33

Lines 170-176 Link Here

(-)a/xml/nbproject/project.xml (-1 / +1 lines)
170	<compile-dependency/>	170	<compile-dependency/>
171	<run-dependency>	171	<run-dependency>
172	<release-version>2</release-version>	172	<release-version>2</release-version>
173	<specification-version>1.16</specification-version>	173	<specification-version>1.60</specification-version>
174	</run-dependency>	174	</run-dependency>
175	</dependency>	175	</dependency>
176	<dependency>	176	<dependency>

Lines 4-7 Link Here

(-)a/xsl/manifest.mf (-1 / +1 lines)
4	OpenIDE-Module-Layer: org/netbeans/modules/xsl/resources/mf-layer.xml	4	OpenIDE-Module-Layer: org/netbeans/modules/xsl/resources/mf-layer.xml
5	OpenIDE-Module-Requires: org.openide.util.HttpServer$Impl	5	OpenIDE-Module-Requires: org.openide.util.HttpServer$Impl
6	AutoUpdate-Show-In-Client: false	6	AutoUpdate-Show-In-Client: false
7	OpenIDE-Module-Specification-Version: 1.44	7	OpenIDE-Module-Specification-Version: 1.45

Lines 142-148 Link Here

(-)a/xsl/nbproject/project.xml (-1 / +1 lines)
142	<compile-dependency/>	142	<compile-dependency/>
143	<run-dependency>	143	<run-dependency>
144	<release-version>2</release-version>	144	<release-version>2</release-version>
145	<specification-version>1.16</specification-version>	145	<specification-version>1.60</specification-version>
146	</run-dependency>	146	</run-dependency>
147	</dependency>	147	</dependency>
148	<dependency>	148	<dependency>

Return to bug 268342

Lines 162-167 Link Here

(-)a/hibernate/nbproject/project.xml (-18 / +35 lines)
162	</run-dependency>	162	</run-dependency>
163	</dependency>	163	</dependency>
164	<dependency>	164	<dependency>
		165	<code-name-base>org.netbeans.modules.editor.document</code-name-base>
		166	<build-prerequisite/>
		167	<compile-dependency/>
		168	<run-dependency>
		169	<specification-version>1.0</specification-version>
		170	</run-dependency>
		171	</dependency>
		172	<dependency>
165	<code-name-base>org.netbeans.modules.editor.lib</code-name-base>	173	<code-name-base>org.netbeans.modules.editor.lib</code-name-base>
166	<build-prerequisite/>	174	<build-prerequisite/>
167	<compile-dependency/>	175	<compile-dependency/>
Lines 180-193 Link Here
180	</run-dependency>	188	</run-dependency>
181	</dependency>	189	</dependency>
182	<dependency>	190	<dependency>
183	<code-name-base>org.netbeans.modules.editor.document</code-name-base>
184	<build-prerequisite/>
185	<compile-dependency/>
186	<run-dependency>
187	<specification-version>1.0</specification-version>
188	</run-dependency>
189	</dependency>
190	<dependency>
191	<code-name-base>org.netbeans.modules.hibernate4lib</code-name-base>	191	<code-name-base>org.netbeans.modules.hibernate4lib</code-name-base>
192	<build-prerequisite/>	192	<build-prerequisite/>
193	<compile-dependency/>	193	<compile-dependency/>
Lines 250-256 Link Here
250	<release-version>1</release-version>	250	<release-version>1</release-version>
251	<specification-version>1.62</specification-version>	251	<specification-version>1.62</specification-version>
252	</run-dependency>	252	</run-dependency>
253	</dependency>	253	</dependency>
254	<dependency>	254	<dependency>
255	<code-name-base>org.netbeans.modules.java.source.base</code-name-base>	255	<code-name-base>org.netbeans.modules.java.source.base</code-name-base>
256	<build-prerequisite/>	256	<build-prerequisite/>
Lines 269-274 Link Here
269	</run-dependency>	269	</run-dependency>
270	</dependency>	270	</dependency>
271	<dependency>	271	<dependency>
		272	<code-name-base>org.netbeans.modules.lexer</code-name-base>
		273	<build-prerequisite/>
		274	<compile-dependency/>
		275	<run-dependency>
		276	<release-version>2</release-version>
		277	<specification-version>1.64</specification-version>
		278	</run-dependency>
		279	</dependency>
		280	<dependency>
272	<code-name-base>org.netbeans.modules.parsing.api</code-name-base>	281	<code-name-base>org.netbeans.modules.parsing.api</code-name-base>
273	<build-prerequisite/>	282	<build-prerequisite/>
274	<compile-dependency/>	283	<compile-dependency/>
Lines 366-371 Link Here
366	</run-dependency>	375	</run-dependency>
367	</dependency>	376	</dependency>
368	<dependency>	377	<dependency>
		378	<code-name-base>org.netbeans.modules.xml.lexer</code-name-base>
		379	<build-prerequisite/>
		380	<compile-dependency/>
		381	<run-dependency>
		382	<specification-version>1.30</specification-version>
		383	</run-dependency>
		384	</dependency>
		385	<dependency>
369	<code-name-base>org.netbeans.modules.xml.multiview</code-name-base>	386	<code-name-base>org.netbeans.modules.xml.multiview</code-name-base>
370	<build-prerequisite/>	387	<build-prerequisite/>
371	<compile-dependency/>	388	<compile-dependency/>
Lines 380-386 Link Here
380	<compile-dependency/>	397	<compile-dependency/>
381	<run-dependency>	398	<run-dependency>
382	<release-version>2</release-version>	399	<release-version>2</release-version>
383	<specification-version>1.16</specification-version>	400	<specification-version>1.60</specification-version>
384	</run-dependency>	401	</run-dependency>
385	</dependency>	402	</dependency>
386	<dependency>	403	<dependency>
Lines 448-461 Link Here
448	</run-dependency>	465	</run-dependency>
449	</dependency>	466	</dependency>
450	<dependency>	467	<dependency>
451	<code-name-base>org.openide.util.ui</code-name-base>
452	<build-prerequisite/>
453	<compile-dependency/>
454	<run-dependency>
455	<specification-version>9.3</specification-version>
456	</run-dependency>
457	</dependency>
458	<dependency>
459	<code-name-base>org.openide.util</code-name-base>	468	<code-name-base>org.openide.util</code-name-base>
460	<build-prerequisite/>	469	<build-prerequisite/>
461	<compile-dependency/>	470	<compile-dependency/>
Lines 472-477 Link Here
472	</run-dependency>	481	</run-dependency>
473	</dependency>	482	</dependency>
474	<dependency>	483	<dependency>
		484	<code-name-base>org.openide.util.ui</code-name-base>
		485	<build-prerequisite/>
		486	<compile-dependency/>
		487	<run-dependency>
		488	<specification-version>9.3</specification-version>
		489	</run-dependency>
		490	</dependency>
		491	<dependency>
475	<code-name-base>org.openide.windows</code-name-base>	492	<code-name-base>org.openide.windows</code-name-base>
476	<build-prerequisite/>	493	<build-prerequisite/>
477	<compile-dependency/>	494	<compile-dependency/>

Lines 118-124 Link Here

(-)a/hibernate/src/org/netbeans/modules/hibernate/completion/Completor.java (-9 / +9 lines)
118	}	118	}
119	}	119	}
120		120
121	setAnchorOffset(context.getCurrentToken().getOffset() + 1);	121	setAnchorOffset(context.getCurrentTokenOffset() + 1);
122	return results;	122	return results;
123	}	123	}
124	}	124	}
Lines 156-162 Link Here
156	}	156	}
157	}	157	}
158		158
159	setAnchorOffset(context.getCurrentToken().getOffset() + 1);	159	setAnchorOffset(context.getCurrentTokenOffset() + 1);
160	return results;	160	return results;
161	}	161	}
162	}	162	}
Lines 184-192 Link Here
184	}	184	}
185		185
186	if (typedChars.contains(".") \|\| typedChars.equals("")) { // Switch to normal completion	186	if (typedChars.contains(".") \|\| typedChars.equals("")) { // Switch to normal completion
187	doNormalJavaCompletion(js, results, typedChars, context.getCurrentToken().getOffset() + 1);	187	doNormalJavaCompletion(js, results, typedChars, context.getCurrentTokenOffset() + 1);
188	} else { // Switch to smart class path completion	188	} else { // Switch to smart class path completion
189	doSmartJavaCompletion(js, results, typedChars, context.getCurrentToken().getOffset() + 1);	189	doSmartJavaCompletion(js, results, typedChars, context.getCurrentTokenOffset() + 1);
190	}	190	}
191	} catch (IOException ex) {	191	} catch (IOException ex) {
192	Exceptions.printStackTrace(ex);	192	Exceptions.printStackTrace(ex);
Lines 325-331 Link Here
325	Exceptions.printStackTrace(ex);	325	Exceptions.printStackTrace(ex);
326	}	326	}
327		327
328	setAnchorOffset(context.getCurrentToken().getOffset() + 1);	328	setAnchorOffset(context.getCurrentTokenOffset() + 1);
329		329
330	return results;	330	return results;
331	}	331	}
Lines 355-361 Link Here
355	}	355	}
356	}	356	}
357		357
358	setAnchorOffset(context.getCurrentToken().getOffset() + 1);	358	setAnchorOffset(context.getCurrentTokenOffset() + 1);
359		359
360	return results;	360	return results;
361	}	361	}
Lines 402-408 Link Here
402	results.add(item);	402	results.add(item);
403	}	403	}
404	}	404	}
405	setAnchorOffset(context.getCurrentToken().getOffset() + 1);	405	setAnchorOffset(context.getCurrentTokenOffset() + 1);
406		406
407	return results;	407	return results;
408	}	408	}
Lines 446-452 Link Here
446	}	446	}
447	}	447	}
448		448
449	setAnchorOffset(context.getCurrentToken().getOffset() + 1);	449	setAnchorOffset(context.getCurrentTokenOffset() + 1);
450	return results;	450	return results;
451	}	451	}
452	}	452	}
Lines 475-481 Link Here
475	}	475	}
476	}	476	}
477		477
478	setAnchorOffset(context.getCurrentToken().getOffset() + 1);	478	setAnchorOffset(context.getCurrentTokenOffset() + 1);
479	return results;	479	return results;
480	}	480	}
481		481

Lines 44-56 Link Here

(-)a/hibernate/src/org/netbeans/modules/hibernate/editor/ContextUtilities.java (-90 / +50 lines)
44		44
45	package org.netbeans.modules.hibernate.editor;	45	package org.netbeans.modules.hibernate.editor;
46		46
		47	import javax.swing.text.BadLocationException;
47	import javax.xml.XMLConstants;	48	import javax.xml.XMLConstants;
48	import org.netbeans.editor.TokenItem;	49	import org.netbeans.api.lexer.Token;
49	import org.netbeans.modules.xml.text.api.XMLDefaultTokenContext;	50	import org.netbeans.api.lexer.TokenSequence;
50	import org.netbeans.modules.xml.text.syntax.SyntaxElement;	51	import org.netbeans.api.xml.lexer.XMLTokenId;
51	import org.netbeans.modules.xml.text.syntax.dom.EmptyTag;	52
52	import org.netbeans.modules.xml.text.syntax.dom.StartTag;	53	import static org.netbeans.api.xml.lexer.XMLTokenId.*;
53	import org.netbeans.modules.xml.text.syntax.dom.Tag;	54	import org.netbeans.modules.xml.text.api.dom.SyntaxElement;
		55	import org.netbeans.modules.xml.text.api.dom.TagElement;
		56	import org.w3c.dom.Node;
54		57
55	/**	58	/**
56	*	59	*
Lines 61-69 Link Here
61	private ContextUtilities() {	64	private ContextUtilities() {
62	}	65	}
63		66
64	public static boolean isValueToken(TokenItem currentToken) {	67	public static boolean isValueToken(Token<XMLTokenId> currentToken) {
65	if(currentToken != null) {	68	if(currentToken != null) {
66	if (currentToken.getTokenID().getNumericID() == XMLDefaultTokenContext.VALUE_ID) {	69	if (currentToken.id() == VALUE) {
67	return true;	70	return true;
68	}	71	}
69	}	72	}
Lines 71-79 Link Here
71	return false;	74	return false;
72	}	75	}
73		76
74	public static boolean isTagToken(TokenItem currentToken) {	77	public static boolean isTagToken(Token<XMLTokenId> currentToken) {
75	if(currentToken != null) {	78	if(currentToken != null) {
76	if (currentToken.getTokenID().getNumericID() == XMLDefaultTokenContext.TAG_ID) {	79	if (currentToken.id() == TAG) {
77	return true;	80	return true;
78	}	81	}
79	}	82	}
Lines 81-89 Link Here
81	return false;	84	return false;
82	}	85	}
83		86
84	public static boolean isAttributeToken(TokenItem currentToken) {	87	public static boolean isAttributeToken(Token<XMLTokenId> currentToken) {
85	if(currentToken != null) {	88	if(currentToken != null) {
86	if (currentToken.getTokenID().getNumericID() == XMLDefaultTokenContext.ARGUMENT_ID) {	89	if (currentToken.id() == ARGUMENT) {
87	return true;	90	return true;
88	}	91	}
89	}	92	}
Lines 91-178 Link Here
91	return false;	94	return false;
92	}	95	}
93		96
94	public static TokenItem getAttributeToken(TokenItem currentToken) {	97	public static Token<XMLTokenId> getAttributeToken(DocumentContext context) {
95	if(currentToken == null )
96	return null;
97
98	if(isValueToken(currentToken)) {
99	TokenItem equalsToken = currentToken.getPrevious();
100	if(equalsToken == null)
101	return null;
102
103	while(equalsToken != null && equalsToken.getTokenID().getNumericID() != XMLDefaultTokenContext.OPERATOR_ID) {
104	equalsToken = equalsToken.getPrevious();
105	}
106
107	if(equalsToken == null) {
108	return null;
109	}
110
111	TokenItem argumentToken = equalsToken.getPrevious();
112	if(argumentToken == null)
113	return null;
114
115	while(argumentToken != null && argumentToken.getTokenID().getNumericID() != XMLDefaultTokenContext.ARGUMENT_ID) {
116	argumentToken = argumentToken.getPrevious();
117	}
118
119	return argumentToken;
120	}
121
122	return null;
123	}
124
125	public static Tag getCurrentTagElement(DocumentContext context) {
126	SyntaxElement element = context.getCurrentElement();
127	if(element instanceof StartTag) {
128	return (StartTag) element;
129	} else if(element instanceof EmptyTag) {
130	return (EmptyTag) element;
131	}
132
133	return null;
134	}
135
136	public static TokenItem getAttributeToken(DocumentContext context) {
137	if(context.getCurrentToken() == null )	98	if(context.getCurrentToken() == null )
138	return null;	99	return null;
139		100	try {
140	if(isValueToken(context.getCurrentToken())) {	101	return context.<Token<XMLTokenId>>runWithSequence((TokenSequence ts) -> {
141	TokenItem equalsToken = context.getCurrentToken().getPrevious();	102	if(!isValueToken(context.getCurrentToken())) {
142	if(equalsToken == null)	103	return null;
143	return null;	104	}
144		105	Token<XMLTokenId> equalsToken = null;
145	//getTokenId() should not return null by JavaDoc. But in reality, it does reutrn null sometimes	106	while (ts.movePrevious()) {
146	// see issue 67661	107	Token<XMLTokenId> t = ts.token();
147	if(equalsToken.getTokenID() == null) {	108	if (t.id() == OPERATOR) {
148	return null;	109	equalsToken = t;
149	}	110	break;
150	while(equalsToken != null && equalsToken.getTokenID().getNumericID() != XMLDefaultTokenContext.OPERATOR_ID) {	111	}
151	equalsToken = equalsToken.getPrevious();	112	}
152	}	113	if(equalsToken == null) {
153		114	return null;
154	if(equalsToken == null) {	115	}
155	return null;	116	Token<XMLTokenId> argumentToken = null;
156	}	117	while (ts.movePrevious()) {
157		118	Token<XMLTokenId> t = ts.token();
158	TokenItem argumentToken = equalsToken.getPrevious();	119	if (t.id() == ARGUMENT) {
159	if(argumentToken == null)	120	argumentToken = t;
160	return null;	121	break;
161		122	}
162	while(argumentToken != null && argumentToken.getTokenID().getNumericID() != XMLDefaultTokenContext.ARGUMENT_ID) {	123	}
163	argumentToken = argumentToken.getPrevious();	124	return argumentToken;
164	}	125	});
165		126	} catch (BadLocationException ex) {
166	return argumentToken;
167	}	127	}
168
169	return null;	128	return null;
170	}	129	}
171		130
172	public static String getAttributeTokenImage(DocumentContext context) {	131	public static String getAttributeTokenImage(DocumentContext context) {
173	TokenItem tok = getAttributeToken(context);	132	Token<XMLTokenId> tok = getAttributeToken(context);
174	if(tok != null) {	133	if(tok != null) {
175	return tok.getImage();	134	return tok.text().toString();
176	}	135	}
177		136
178	return null;	137	return null;
Lines 221-231 Link Here
221	return nodeName.substring(0, colonIndex);	180	return nodeName.substring(0, colonIndex);
222	}	181	}
223		182
224	public static StartTag getRoot(SyntaxElement se) {	183	public static SyntaxElement getRoot(SyntaxElement se) {
225	StartTag root = null;	184	SyntaxElement root = null;
226	while( se != null) {	185	while( se != null) {
227	if(se instanceof StartTag) {	186	if(se.getType() == Node.ELEMENT_NODE &&
228	root = (StartTag)se;	187	((TagElement)se).isStart()) {
		188	root = se;
229	}	189	}
230	se = se.getPrevious();	190	se = se.getPrevious();
231	}	191	}

Lines 44-56 Link Here

(-)a/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/editor/ContextUtilities.java (-90 / +50 lines)
44		44
45	package org.netbeans.modules.j2ee.persistence.editor;	45	package org.netbeans.modules.j2ee.persistence.editor;
46		46
		47	import javax.swing.text.BadLocationException;
47	import javax.xml.XMLConstants;	48	import javax.xml.XMLConstants;
48	import org.netbeans.editor.TokenItem;	49	import org.netbeans.api.lexer.Token;
49	import org.netbeans.modules.xml.text.api.XMLDefaultTokenContext;	50	import org.netbeans.api.lexer.TokenSequence;
50	import org.netbeans.modules.xml.text.syntax.SyntaxElement;	51	import org.netbeans.api.xml.lexer.XMLTokenId;
51	import org.netbeans.modules.xml.text.syntax.dom.EmptyTag;	52	import static org.netbeans.api.xml.lexer.XMLTokenId.*;
52	import org.netbeans.modules.xml.text.syntax.dom.StartTag;	53	import org.netbeans.modules.xml.text.api.dom.SyntaxElement;
53	import org.netbeans.modules.xml.text.syntax.dom.Tag;	54	import org.netbeans.modules.xml.text.api.dom.TagElement;
		55	import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
		56	import org.w3c.dom.Node;
54		57
55	/**	58	/**
56	*	59	*
Lines 61-69 Link Here
61	private ContextUtilities() {	64	private ContextUtilities() {
62	}	65	}
63		66
64	public static boolean isValueToken(TokenItem currentToken) {	67	public static boolean isValueToken(Token<XMLTokenId> currentToken) {
65	if(currentToken != null) {	68	if(currentToken != null) {
66	if (currentToken.getTokenID().getNumericID() == XMLDefaultTokenContext.VALUE_ID) {	69	if (currentToken.id() == VALUE) {
67	return true;	70	return true;
68	}	71	}
69	}	72	}
Lines 71-79 Link Here
71	return false;	74	return false;
72	}	75	}
73		76
74	public static boolean isTagToken(TokenItem currentToken) {	77	public static boolean isTagToken(Token<XMLTokenId> currentToken) {
75	if(currentToken != null) {	78	if(currentToken != null) {
76	if (currentToken.getTokenID().getNumericID() == XMLDefaultTokenContext.TAG_ID) {	79	if (currentToken.id() == TAG) {
77	return true;	80	return true;
78	}	81	}
79	}	82	}
Lines 81-89 Link Here
81	return false;	84	return false;
82	}	85	}
83		86
84	public static boolean isAttributeToken(TokenItem currentToken) {	87	public static boolean isAttributeToken(Token<XMLTokenId> currentToken) {
85	if(currentToken != null) {	88	if(currentToken != null) {
86	if (currentToken.getTokenID().getNumericID() == XMLDefaultTokenContext.ARGUMENT_ID) {	89	if (currentToken.id() == ARGUMENT) {
87	return true;	90	return true;
88	}	91	}
89	}	92	}
Lines 91-178 Link Here
91	return false;	94	return false;
92	}	95	}
93		96
94	public static TokenItem getAttributeToken(TokenItem currentToken) {	97	public static Token<XMLTokenId> getAttributeToken(DocumentContext context) {
95	if(currentToken == null )
96	return null;
97
98	if(isValueToken(currentToken)) {
99	TokenItem equalsToken = currentToken.getPrevious();
100	if(equalsToken == null)
101	return null;
102
103	while(equalsToken != null && equalsToken.getTokenID().getNumericID() != XMLDefaultTokenContext.OPERATOR_ID) {
104	equalsToken = equalsToken.getPrevious();
105	}
106
107	if(equalsToken == null) {
108	return null;
109	}
110
111	TokenItem argumentToken = equalsToken.getPrevious();
112	if(argumentToken == null)
113	return null;
114
115	while(argumentToken != null && argumentToken.getTokenID().getNumericID() != XMLDefaultTokenContext.ARGUMENT_ID) {
116	argumentToken = argumentToken.getPrevious();
117	}
118
119	return argumentToken;
120	}
121
122	return null;
123	}
124
125	public static Tag getCurrentTagElement(DocumentContext context) {
126	SyntaxElement element = context.getCurrentElement();
127	if(element instanceof StartTag) {
128	return (StartTag) element;
129	} else if(element instanceof EmptyTag) {
130	return (EmptyTag) element;
131	}
132
133	return null;
134	}
135
136	public static TokenItem getAttributeToken(DocumentContext context) {
137	if(context.getCurrentToken() == null )	98	if(context.getCurrentToken() == null )
138	return null;	99	return null;
139		100	try {
140	if(isValueToken(context.getCurrentToken())) {	101	return context.<Token<XMLTokenId>>runWithSequence((TokenSequence ts) -> {
141	TokenItem equalsToken = context.getCurrentToken().getPrevious();	102	if(!isValueToken(context.getCurrentToken())) {
142	if(equalsToken == null)	103	return null;
143	return null;	104	}
144		105	Token<XMLTokenId> equalsToken = null;
145	//getTokenId() should not return null by JavaDoc. But in reality, it does reutrn null sometimes	106	while (ts.movePrevious()) {
146	// see issue 67661	107	Token<XMLTokenId> t = ts.token();
147	if(equalsToken.getTokenID() == null) {	108	if (t.id() == OPERATOR) {
148	return null;	109	equalsToken = t;
149	}	110	break;
150	while(equalsToken != null && equalsToken.getTokenID().getNumericID() != XMLDefaultTokenContext.OPERATOR_ID) {	111	}
151	equalsToken = equalsToken.getPrevious();	112	}
152	}	113	if(equalsToken == null) {
153		114	return null;
154	if(equalsToken == null) {	115	}
155	return null;	116	Token<XMLTokenId> argumentToken = null;
156	}	117	while (ts.movePrevious()) {
157		118	Token<XMLTokenId> t = ts.token();
158	TokenItem argumentToken = equalsToken.getPrevious();	119	if (t.id() == ARGUMENT) {
159	if(argumentToken == null)	120	argumentToken = t;
160	return null;	121	break;
161		122	}
162	while(argumentToken != null && argumentToken.getTokenID().getNumericID() != XMLDefaultTokenContext.ARGUMENT_ID) {	123	}
163	argumentToken = argumentToken.getPrevious();	124	return argumentToken;
164	}	125	});
165		126	} catch (BadLocationException ex) {
166	return argumentToken;
167	}	127	}
168
169	return null;	128	return null;
170	}	129	}
171		130
172	public static String getAttributeTokenImage(DocumentContext context) {	131	public static String getAttributeTokenImage(DocumentContext context) {
173	TokenItem tok = getAttributeToken(context);	132	Token<XMLTokenId> tok = getAttributeToken(context);
174	if(tok != null) {	133	if(tok != null) {
175	return tok.getImage();	134	return tok.text().toString();
176	}	135	}
177		136
178	return null;	137	return null;
Lines 221-231 Link Here
221	return nodeName.substring(0, colonIndex);	180	return nodeName.substring(0, colonIndex);
222	}	181	}
223		182
224	public static StartTag getRoot(SyntaxElement se) {	183	public static SyntaxElement getRoot(SyntaxElement se) {
225	StartTag root = null;	184	SyntaxElement root = null;
226	while( se != null) {	185	while( se != null) {
227	if(se instanceof StartTag) {	186	if(se.getType() == Node.ELEMENT_NODE &&
228	root = (StartTag)se;	187	((TagElement)se).isStart()) {
		188	root = se;
229	}	189	}
230	se = se.getPrevious();	190	se = se.getPrevious();
231	}	191	}

Lines 55-68 Link Here

(-)a/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/editor/DocumentContext.java (-76 / +28 lines)
55	import java.util.logging.Logger;	55	import java.util.logging.Logger;
56	import javax.swing.text.BadLocationException;	56	import javax.swing.text.BadLocationException;
57	import javax.swing.text.Document;	57	import javax.swing.text.Document;
58	import org.netbeans.editor.BaseDocument;	58	import org.netbeans.api.lexer.Token;
59	import org.netbeans.editor.TokenItem;	59	import org.netbeans.api.xml.lexer.XMLTokenId;
60	import org.netbeans.modules.xml.text.syntax.SyntaxElement;	60	import org.netbeans.modules.xml.text.api.dom.SyntaxElement;
61	import org.netbeans.modules.xml.text.syntax.XMLSyntaxSupport;	61	import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
62	import org.netbeans.modules.xml.text.syntax.dom.EmptyTag;
63	import org.netbeans.modules.xml.text.syntax.dom.EndTag;
64	import org.netbeans.modules.xml.text.syntax.dom.StartTag;
65	import org.netbeans.modules.xml.text.syntax.dom.Tag;
66	import org.w3c.dom.Attr;	62	import org.w3c.dom.Attr;
67	import org.w3c.dom.NamedNodeMap;	63	import org.w3c.dom.NamedNodeMap;
68	import org.w3c.dom.Node;	64	import org.w3c.dom.Node;
Lines 79-87 Link Here
79	private XMLSyntaxSupport syntaxSupport;	75	private XMLSyntaxSupport syntaxSupport;
80	private int caretOffset = -1;	76	private int caretOffset = -1;
81	private SyntaxElement element;	77	private SyntaxElement element;
82	private TokenItem token;	78	private Token<XMLTokenId> token;
		79	private int tokenOffset;
83	private boolean valid = false;	80	private boolean valid = false;
84	private StartTag docRoot;	81	private SyntaxElement docRoot;
85	private String defaultNamespace;	82	private String defaultNamespace;
86	private HashMap<String, String> declaredNamespaces =	83	private HashMap<String, String> declaredNamespaces =
87	new HashMap<String, String>();	84	new HashMap<String, String>();
Lines 93-102 Link Here
93	DocumentContext(Document document) {	90	DocumentContext(Document document) {
94	this.document = document;	91	this.document = document;
95	try {	92	try {
96	this.syntaxSupport = (XMLSyntaxSupport) ((BaseDocument)document).getSyntaxSupport();	93	this.syntaxSupport = XMLSyntaxSupport.getSyntaxSupport(document);
97	} catch (ClassCastException cce) {	94	} catch (ClassCastException cce) {
98	LOGGER.log(Level.FINE, cce.getMessage());	95	LOGGER.log(Level.FINE, cce.getMessage());
99	this.syntaxSupport = new XMLSyntaxSupport(((BaseDocument)document));	96	this.syntaxSupport = XMLSyntaxSupport.createSyntaxSupport(document);
100	}	97	}
101	}	98	}
102		99
Lines 110-116 Link Here
110	declaredNamespaces.clear();	107	declaredNamespaces.clear();
111	try {	108	try {
112	element = syntaxSupport.getElementChain(caretOffset);	109	element = syntaxSupport.getElementChain(caretOffset);
113	token = syntaxSupport.getTokenChain(caretOffset, Math.min(document.getLength(), caretOffset+1));	110	int[] off = new int[2];
		111	token = syntaxSupport.getNextToken(caretOffset, off);
		112	tokenOffset = off[0];
114	this.docRoot = ContextUtilities.getRoot(element);	113	this.docRoot = ContextUtilities.getRoot(element);
115	populateNamespaces();	114	populateNamespaces();
116	} catch (BadLocationException ex) {	115	} catch (BadLocationException ex) {
Lines 123-147 Link Here
123	return this.valid;	122	return this.valid;
124	}	123	}
125		124
126	public int getCurrentTokenId() {	125	public Token<XMLTokenId> getCurrentToken() {
127	if (isValid()) {
128	return token.getTokenID().getNumericID();
129	} else {
130	return -1;
131	}
132	}
133
134	public TokenItem getCurrentToken() {
135	if (isValid()) {	126	if (isValid()) {
136	return token;	127	return token;
137	} else {	128	} else {
138	return null;	129	return null;
139	}	130	}
140	}	131	}
		132
		133	public int getCurrentTokenOffset() {
		134	return tokenOffset;
		135	}
141		136
142	public String getCurrentTokenImage() {	137	public String getCurrentTokenImage() {
143	if (isValid()) {	138	if (isValid()) {
144	return token.getImage();	139	return token.text().toString();
145	} else {	140	} else {
146	return null;	141	return null;
147	}	142	}
Lines 151-204 Link Here
151	return this.element;	146	return this.element;
152	}	147	}
153		148
154	public List<String> getPathFromRoot() {
155	if (isValid()) {
156	SyntaxElement elementRef = this.element;
157	Stack<SyntaxElement> stack = new Stack<SyntaxElement>();
158
159	while (elementRef != null) {
160	if ((elementRef instanceof EndTag) \|\|
161	(elementRef instanceof EmptyTag && stack.isEmpty()) \|\|
162	(elementRef instanceof StartTag && stack.isEmpty())) {
163	stack.push(elementRef);
164	elementRef = elementRef.getPrevious();
165	continue;
166	}
167	if (elementRef instanceof StartTag) {
168	StartTag start = (StartTag) elementRef;
169	if (stack.peek() instanceof EndTag) {
170	EndTag end = (EndTag) stack.peek();
171	if (end.getTagName().equals(start.getTagName())) {
172	stack.pop();
173	}
174	} else {
175	SyntaxElement e = (SyntaxElement) stack.peek();
176	String tagAtTop = (e instanceof StartTag) ? ((StartTag) e).getTagName() : ((EmptyTag) e).getTagName();
177	stack.push(elementRef);
178	}
179	}
180	elementRef = elementRef.getPrevious();
181	}
182
183	return createPath(stack);
184	}
185
186	return Collections.emptyList();
187	}
188
189	private List<String> createPath(Stack<SyntaxElement> stack) {
190	ArrayList<String> pathList = new ArrayList<String>();
191	while (!stack.isEmpty()) {
192	SyntaxElement top = stack.pop();
193	String tagName = (top instanceof StartTag) ? ((StartTag) top).getTagName() : ((EmptyTag) top).getTagName();
194	if (tagName != null) {
195	pathList.add(tagName);
196	}
197	}
198
199	return Collections.unmodifiableList(pathList);
200	}
201
202	public Document getDocument() {	149	public Document getDocument() {
203	return this.document;	150	return this.document;
204	}	151	}
Lines 225-231 Link Here
225	return declaredNamespaces.values();	172	return declaredNamespaces.values();
226	}	173	}
227		174
228	public StartTag getDocRoot() {	175	public SyntaxElement getDocRoot() {
229	return docRoot;	176	return docRoot;
230	}	177	}
231		178
Lines 236-242 Link Here
236	private void populateNamespaces() {	183	private void populateNamespaces() {
237	// Find the a start or empty tag just before the current syntax element.	184	// Find the a start or empty tag just before the current syntax element.
238	SyntaxElement element = this.element;	185	SyntaxElement element = this.element;
239	while (element != null && !(element instanceof StartTag) && !(element instanceof EmptyTag)) {	186	while (element != null && !syntaxSupport.isStartTag(element) && !syntaxSupport.isEmptyTag(element)) {
240	element = element.getPrevious();	187	element = element.getPrevious();
241	}	188	}
242	if (element == null) {	189	if (element == null) {
Lines 246-254 Link Here
246	// To find all namespace declarations active at the caret offset, we	193	// To find all namespace declarations active at the caret offset, we
247	// need to look at xmlns attributes of the current element and its ancestors.	194	// need to look at xmlns attributes of the current element and its ancestors.
248	Node node = (Node)element;	195	Node node = (Node)element;
249	while (node != null) {	196	while (node != null && element != null) {
250	if (node instanceof StartTag \|\| node instanceof EmptyTag) {	197	if (syntaxSupport.isStartTag(element) \|\| syntaxSupport.isEmptyTag(element)) {
251	NamedNodeMap attributes = ((Tag)node).getAttributes();	198	NamedNodeMap attributes = node.getAttributes();
252	for (int index = 0; index < attributes.getLength(); index++) {	199	for (int index = 0; index < attributes.getLength(); index++) {
253	Attr attr = (Attr) attributes.item(index);	200	Attr attr = (Attr) attributes.item(index);
254	String attrName = attr.getName();	201	String attrName = attr.getName();
Lines 271-276 Link Here
271	}	218	}
272	}	219	}
273	node = node.getParentNode();	220	node = node.getParentNode();
		221	element = syntaxSupport.getSyntaxElement(node);
274	}	222	}
275	}	223	}
276		224
Lines 303-306 Link Here
303	hash = 61 * hash + (this.document != null ? this.document.hashCode() : 0);	251	hash = 61 * hash + (this.document != null ? this.document.hashCode() : 0);
304	return hash;	252	return hash;
305	}	253	}
		254
		255	public <T> T runWithSequence(XMLSyntaxSupport.SequenceCallable<T> callable) throws BadLocationException {
		256	return syntaxSupport.runWithSequence(caretOffset, callable);
		257	}
306	}	258	}

Lines 145-150 Link Here

(-)a/spring.beans/nbproject/project.xml (-17 / +33 lines)
145	</run-dependency>	145	</run-dependency>
146	</dependency>	146	</dependency>
147	<dependency>	147	<dependency>
		148	<code-name-base>org.netbeans.modules.editor.document</code-name-base>
		149	<build-prerequisite/>
		150	<compile-dependency/>
		151	<run-dependency>
		152	<specification-version>1.0</specification-version>
		153	</run-dependency>
		154	</dependency>
		155	<dependency>
148	<code-name-base>org.netbeans.modules.editor.indent</code-name-base>	156	<code-name-base>org.netbeans.modules.editor.indent</code-name-base>
149	<build-prerequisite/>	157	<build-prerequisite/>
150	<compile-dependency/>	158	<compile-dependency/>
Lines 172-185 Link Here
172	</run-dependency>	180	</run-dependency>
173	</dependency>	181	</dependency>
174	<dependency>	182	<dependency>
175	<code-name-base>org.netbeans.modules.editor.document</code-name-base>
176	<build-prerequisite/>
177	<compile-dependency/>
178	<run-dependency>
179	<specification-version>1.0</specification-version>
180	</run-dependency>
181	</dependency>
182	<dependency>
183	<code-name-base>org.netbeans.modules.editor.mimelookup</code-name-base>	183	<code-name-base>org.netbeans.modules.editor.mimelookup</code-name-base>
184	<build-prerequisite/>	184	<build-prerequisite/>
185	<compile-dependency/>	185	<compile-dependency/>
Lines 372-377 Link Here
372	</run-dependency>	372	</run-dependency>
373	</dependency>	373	</dependency>
374	<dependency>	374	<dependency>
		375	<code-name-base>org.netbeans.modules.xml.lexer</code-name-base>
		376	<build-prerequisite/>
		377	<compile-dependency/>
		378	<run-dependency>
		379	<specification-version>1.30</specification-version>
		380	</run-dependency>
		381	</dependency>
		382	<dependency>
375	<code-name-base>org.netbeans.modules.xml.retriever</code-name-base>	383	<code-name-base>org.netbeans.modules.xml.retriever</code-name-base>
376	<build-prerequisite/>	384	<build-prerequisite/>
377	<compile-dependency/>	385	<compile-dependency/>
Lines 403-409 Link Here
403	<compile-dependency/>	411	<compile-dependency/>
404	<run-dependency>	412	<run-dependency>
405	<release-version>2</release-version>	413	<release-version>2</release-version>
406	<specification-version>1.16</specification-version>	414	<specification-version>1.60</specification-version>
407	</run-dependency>	415	</run-dependency>
408	</dependency>	416	</dependency>
409	<dependency>	417	<dependency>
Lines 480-493 Link Here
480	</run-dependency>	488	</run-dependency>
481	</dependency>	489	</dependency>
482	<dependency>	490	<dependency>
483	<code-name-base>org.openide.util.ui</code-name-base>
484	<build-prerequisite/>
485	<compile-dependency/>
486	<run-dependency>
487	<specification-version>9.3</specification-version>
488	</run-dependency>
489	</dependency>
490	<dependency>
491	<code-name-base>org.openide.util</code-name-base>	491	<code-name-base>org.openide.util</code-name-base>
492	<build-prerequisite/>	492	<build-prerequisite/>
493	<compile-dependency/>	493	<compile-dependency/>
Lines 504-509 Link Here
504	</run-dependency>	504	</run-dependency>
505	</dependency>	505	</dependency>
506	<dependency>	506	<dependency>
		507	<code-name-base>org.openide.util.ui</code-name-base>
		508	<build-prerequisite/>
		509	<compile-dependency/>
		510	<run-dependency>
		511	<specification-version>9.3</specification-version>
		512	</run-dependency>
		513	</dependency>
		514	<dependency>
507	<code-name-base>org.openide.windows</code-name-base>	515	<code-name-base>org.openide.windows</code-name-base>
508	<build-prerequisite/>	516	<build-prerequisite/>
509	<compile-dependency/>	517	<compile-dependency/>
Lines 582-587 Link Here
582	<code-name-base>org.openide.text</code-name-base>	590	<code-name-base>org.openide.text</code-name-base>
583	</test-dependency>	591	</test-dependency>
584	<test-dependency>	592	<test-dependency>
		593	<code-name-base>org.netbeans.modules.lexer.nbbridge</code-name-base>
		594	</test-dependency>
		595	<test-dependency>
585	<code-name-base>org.openide.util.ui</code-name-base>	596	<code-name-base>org.openide.util.ui</code-name-base>
586	<compile-dependency/>	597	<compile-dependency/>
587	<test/>	598	<test/>
Lines 591-596 Link Here
591	<compile-dependency/>	602	<compile-dependency/>
592	<test/>	603	<test/>
593	</test-dependency>	604	</test-dependency>
		605	<test-dependency>
		606	<code-name-base>org.netbeans.modules.editor.mimelookup</code-name-base>
		607	<compile-dependency/>
		608	<test/>
		609	</test-dependency>
594	</test-type>	610	</test-type>
595	</test-dependencies>	611	</test-dependencies>
596	<friend-packages>	612	<friend-packages>

Lines 63-69 Link Here

(-)a/spring.beans/src/org/netbeans/modules/spring/beans/completion/completors/PropertyCompletor.java (-3 / +3 lines)
63	import org.netbeans.modules.spring.java.Property;	63	import org.netbeans.modules.spring.java.Property;
64	import org.netbeans.modules.spring.java.PropertyFinder;	64	import org.netbeans.modules.spring.java.PropertyFinder;
65	import org.netbeans.modules.spring.java.PropertyType;	65	import org.netbeans.modules.spring.java.PropertyType;
66	import org.netbeans.modules.xml.text.syntax.dom.Tag;	66	import org.w3c.dom.Node;
67		67
68	/**	68	/**
69	*	69	*
Lines 77-83 Link Here
77		77
78	@Override	78	@Override
79	protected int initAnchorOffset(CompletionContext context) {	79	protected int initAnchorOffset(CompletionContext context) {
80	int idx = context.getCurrentToken().getOffset() + 1;	80	int idx = context.getCurrentTokenOffset() + 1;
81	String typedPrefix = context.getTypedPrefix();	81	String typedPrefix = context.getTypedPrefix();
82	int offset = typedPrefix.lastIndexOf('.'); // NOI18N	82	int offset = typedPrefix.lastIndexOf('.'); // NOI18N
83	return idx + offset + 1;	83	return idx + offset + 1;
Lines 97-103 Link Here
97	js.runUserActionTask(new Task<CompilationController>() {	97	js.runUserActionTask(new Task<CompilationController>() {
98		98
99	public void run(CompilationController cc) throws Exception {	99	public void run(CompilationController cc) throws Exception {
100	Tag beanTag = (Tag) SpringXMLConfigEditorUtils.getBean(context.getTag());	100	Node beanTag = SpringXMLConfigEditorUtils.getBean(context.getTag());
101	if (beanTag == null) {	101	if (beanTag == null) {
102	return;	102	return;
103	}	103	}

Lines 50-62 Link Here

(-)a/spring.beans/src/org/netbeans/modules/spring/beans/editor/DocumentContext.java (-21 / +42 lines)
50	import java.util.Map.Entry;	50	import java.util.Map.Entry;
51	import javax.swing.text.BadLocationException;	51	import javax.swing.text.BadLocationException;
52	import javax.swing.text.Document;	52	import javax.swing.text.Document;
53	import org.netbeans.editor.BaseDocument;	53	import org.netbeans.api.lexer.Token;
54	import org.netbeans.editor.TokenItem;	54	import org.netbeans.api.lexer.TokenSequence;
55	import org.netbeans.modules.xml.text.syntax.SyntaxElement;	55	import org.netbeans.api.xml.lexer.XMLTokenId;
56	import org.netbeans.modules.xml.text.syntax.XMLSyntaxSupport;	56	import org.netbeans.modules.xml.text.api.dom.SyntaxElement;
57	import org.netbeans.modules.xml.text.syntax.dom.EmptyTag;	57	import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
58	import org.netbeans.modules.xml.text.syntax.dom.StartTag;
59	import org.netbeans.modules.xml.text.syntax.dom.Tag;
60	import org.w3c.dom.Attr;	58	import org.w3c.dom.Attr;
61	import org.w3c.dom.NamedNodeMap;	59	import org.w3c.dom.NamedNodeMap;
62	import org.w3c.dom.Node;	60	import org.w3c.dom.Node;
Lines 72-78 Link Here
72	private XMLSyntaxSupport syntaxSupport;	70	private XMLSyntaxSupport syntaxSupport;
73	private int caretOffset = -1;	71	private int caretOffset = -1;
74	private SyntaxElement element;	72	private SyntaxElement element;
75	private TokenItem token;	73	private Token<XMLTokenId> token;
		74	private int tokenOffset;
76	private HashMap<String, String> declaredNamespaces =	75	private HashMap<String, String> declaredNamespaces =
77	new HashMap<String, String>();	76	new HashMap<String, String>();
78		77
Lines 86-112 Link Here
86		85
87	private DocumentContext(Document document, int caretOffset) throws BadLocationException {	86	private DocumentContext(Document document, int caretOffset) throws BadLocationException {
88	this.document = document;	87	this.document = document;
89	this.syntaxSupport = (XMLSyntaxSupport) ((BaseDocument) document).getSyntaxSupport();	88	this.syntaxSupport = XMLSyntaxSupport.getSyntaxSupport(document);
90	this.caretOffset = caretOffset;	89	this.caretOffset = caretOffset;
91	initialize();	90	initialize();
92	}	91	}
93		92
94	private void initialize() throws BadLocationException {	93	private void initialize() throws BadLocationException {
95	element = syntaxSupport.getElementChain(caretOffset);	94	element = syntaxSupport.getElementChain(caretOffset);
96	token = syntaxSupport.getTokenChain(caretOffset, Math.min(document.getLength(), caretOffset + 1));	95	syntaxSupport.runWithSequence(caretOffset,
		96	(TokenSequence ts) -> {
		97	token = syntaxSupport.getNextToken(caretOffset);
		98	tokenOffset = ts.offset();
		99	return null;
		100	}
		101	);
97	populateNamespaces();	102	populateNamespaces();
98	}	103	}
99		104
100	public int getCurrentTokenId() {	105	public XMLSyntaxSupport getSyntaxSupport() {
101	return token.getTokenID().getNumericID();	106	return syntaxSupport;
		107	}
		108
		109	public <T> T runWithTokenSequence(int offset, XMLSyntaxSupport.SequenceCallable<T> callable) throws BadLocationException {
		110	return syntaxSupport.runWithSequence(offset, callable);
102	}	111	}
103		112
104	public TokenItem getCurrentToken() {	113	public int getCurrentTokenOffset() {
		114	return tokenOffset;
		115	}
		116
		117	public Token<XMLTokenId> getCurrentToken() {
105	return token;	118	return token;
106	}	119	}
107		120
108	public String getCurrentTokenImage() {	121	public String getCurrentTokenImage() {
109	return token.getImage();	122	return token.text().toString();
110	}	123	}
111		124
112	public SyntaxElement getCurrentElement() {	125	public SyntaxElement getCurrentElement() {
Lines 142-148 Link Here
142	private void populateNamespaces() {	155	private void populateNamespaces() {
143	// Find the a start or empty tag just before the current syntax element.	156	// Find the a start or empty tag just before the current syntax element.
144	SyntaxElement element = this.element;	157	SyntaxElement element = this.element;
145	while (element != null && !(element instanceof StartTag) && !(element instanceof EmptyTag)) {	158	while (element != null && !(syntaxSupport.isStartTag(element)) && !(syntaxSupport.isEmptyTag(element))) {
146	element = element.getPrevious();	159	element = element.getPrevious();
147	}	160	}
148	if (element == null) {	161	if (element == null) {
Lines 151-160 Link Here
151		164
152	// To find all namespace declarations active at the caret offset, we	165	// To find all namespace declarations active at the caret offset, we
153	// need to look at xmlns attributes of the current element and its ancestors.	166	// need to look at xmlns attributes of the current element and its ancestors.
154	Node node = (Node)element;	167	while (element != null) {
155	while (node != null) {	168	Node node = element.getNode();
156	if (node instanceof StartTag \|\| node instanceof EmptyTag) {	169	if (syntaxSupport.isStartTag(element) \|\| syntaxSupport.isEmptyTag(element)) {
157	NamedNodeMap attributes = ((Tag)node).getAttributes();	170	NamedNodeMap attributes = node.getAttributes();
158	for (int index = 0; index < attributes.getLength(); index++) {	171	for (int index = 0; index < attributes.getLength(); index++) {
159	Attr attr = (Attr) attributes.item(index);	172	Attr attr = (Attr) attributes.item(index);
160	String attrName = attr.getName();	173	String attrName = attr.getName();
Lines 172-178 Link Here
172	}	185	}
173	}	186	}
174	}	187	}
175	node = node.getParentNode();	188	element = element.getParentElement();
176	}	189	}
177	}	190	}
		191
		192	public int getNodeOffset(Node n) {
		193	return syntaxSupport.getNodeOffset(n);
		194	}
		195
		196	public boolean isTag(SyntaxElement e) {
		197	return syntaxSupport.isStartTag(e) \|\| syntaxSupport.isEmptyTag(e) \|\| syntaxSupport.isEndTag(e);
		198	}
178	}	199	}

Lines 50-55 Link Here

(-)a/spring.beans/src/org/netbeans/modules/spring/beans/refactoring/PropertyRefFinder.java (-3 / +4 lines)
50	import javax.lang.model.element.TypeElement;	50	import javax.lang.model.element.TypeElement;
51	import javax.lang.model.type.TypeMirror;	51	import javax.lang.model.type.TypeMirror;
52	import javax.swing.text.BadLocationException;	52	import javax.swing.text.BadLocationException;
		53	import javax.swing.text.Document;
53	import javax.swing.text.Position.Bias;	54	import javax.swing.text.Position.Bias;
54	import org.netbeans.api.java.source.CompilationController;	55	import org.netbeans.api.java.source.CompilationController;
55	import org.netbeans.api.java.source.ElementHandle;	56	import org.netbeans.api.java.source.ElementHandle;
Lines 68-74 Link Here
68	import org.netbeans.modules.spring.java.Property;	69	import org.netbeans.modules.spring.java.Property;
69	import org.netbeans.modules.spring.java.PropertyFinder;	70	import org.netbeans.modules.spring.java.PropertyFinder;
70	import org.netbeans.modules.spring.java.PropertyType;	71	import org.netbeans.modules.spring.java.PropertyType;
71	import org.netbeans.modules.xml.text.syntax.XMLSyntaxSupport;	72	import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
72	import org.openide.filesystems.FileObject;	73	import org.openide.filesystems.FileObject;
73	import org.openide.text.PositionBounds;	74	import org.openide.text.PositionBounds;
74	import org.openide.text.PositionRef;	75	import org.openide.text.PositionRef;
Lines 88-94 Link Here
88	public PropertyRefFinder(DocumentAccess docAccess, CompilationController cc, RenamedProperty renamedProperty) {	89	public PropertyRefFinder(DocumentAccess docAccess, CompilationController cc, RenamedProperty renamedProperty) {
89	this.docAccess = docAccess;	90	this.docAccess = docAccess;
90	BaseDocument document = (BaseDocument) docAccess.getDocument();	91	BaseDocument document = (BaseDocument) docAccess.getDocument();
91	syntaxSupport = (XMLSyntaxSupport) document.getSyntaxSupport();	92	syntaxSupport = XMLSyntaxSupport.getSyntaxSupport(document);
92	this.cc = cc;	93	this.cc = cc;
93	this.renamedProperty = renamedProperty;	94	this.renamedProperty = renamedProperty;
94	}	95	}
Lines 203-209 Link Here
203	}	204	}
204		205
205	// p-namespace	206	// p-namespace
206	BaseDocument document = syntaxSupport.getDocument();	207	Document document = syntaxSupport.getDocument();
207	String prefix = SpringXMLConfigEditorUtils.getPNamespacePrefix(document, beanOffset);	208	String prefix = SpringXMLConfigEditorUtils.getPNamespacePrefix(document, beanOffset);
208	if (prefix == null) {	209	if (prefix == null) {
209	return;	210	return;

Lines 280-285 Link Here

(-)a/web.beans/nbproject/project.xml (-8 / +16 lines)
280	</run-dependency>	280	</run-dependency>
281	</dependency>	281	</dependency>
282	<dependency>	282	<dependency>
		283	<code-name-base>org.netbeans.modules.xml.lexer</code-name-base>
		284	<build-prerequisite/>
		285	<compile-dependency/>
		286	<run-dependency>
		287	<specification-version>1.30</specification-version>
		288	</run-dependency>
		289	</dependency>
		290	<dependency>
283	<code-name-base>org.netbeans.modules.xml.retriever</code-name-base>	291	<code-name-base>org.netbeans.modules.xml.retriever</code-name-base>
284	<build-prerequisite/>	292	<build-prerequisite/>
285	<compile-dependency/>	293	<compile-dependency/>
Lines 364-377 Link Here
364	</run-dependency>	372	</run-dependency>
365	</dependency>	373	</dependency>
366	<dependency>	374	<dependency>
367	<code-name-base>org.openide.util.ui</code-name-base>
368	<build-prerequisite/>
369	<compile-dependency/>
370	<run-dependency>
371	<specification-version>9.3</specification-version>
372	</run-dependency>
373	</dependency>
374	<dependency>
375	<code-name-base>org.openide.util</code-name-base>	375	<code-name-base>org.openide.util</code-name-base>
376	<build-prerequisite/>	376	<build-prerequisite/>
377	<compile-dependency/>	377	<compile-dependency/>
Lines 388-393 Link Here
388	</run-dependency>	388	</run-dependency>
389	</dependency>	389	</dependency>
390	<dependency>	390	<dependency>
		391	<code-name-base>org.openide.util.ui</code-name-base>
		392	<build-prerequisite/>
		393	<compile-dependency/>
		394	<run-dependency>
		395	<specification-version>9.3</specification-version>
		396	</run-dependency>
		397	</dependency>
		398	<dependency>
391	<code-name-base>org.openide.windows</code-name-base>	399	<code-name-base>org.openide.windows</code-name-base>
392	<build-prerequisite/>	400	<build-prerequisite/>
393	<compile-dependency/>	401	<compile-dependency/>

Lines 44-56 Link Here

(-)a/web.beans/src/org/netbeans/modules/web/beans/completion/ContextUtilities.java (-92 / +26 lines)
44		44
45	package org.netbeans.modules.web.beans.completion;	45	package org.netbeans.modules.web.beans.completion;
46		46
		47	import javax.swing.text.BadLocationException;
47	import javax.xml.XMLConstants;	48	import javax.xml.XMLConstants;
		49	import org.netbeans.api.lexer.Token;
		50	import org.netbeans.api.lexer.TokenSequence;
		51	import org.netbeans.api.xml.lexer.XMLTokenId;
		52	import static org.netbeans.api.xml.lexer.XMLTokenId.ARGUMENT;
		53	import static org.netbeans.api.xml.lexer.XMLTokenId.OPERATOR;
48	import org.netbeans.editor.TokenItem;	54	import org.netbeans.editor.TokenItem;
49	import org.netbeans.modules.xml.text.api.XMLDefaultTokenContext;	55	import org.netbeans.modules.xml.text.api.dom.SyntaxElement;
50	import org.netbeans.modules.xml.text.syntax.SyntaxElement;	56	import org.netbeans.modules.xml.text.api.dom.TagElement;
51	import org.netbeans.modules.xml.text.syntax.dom.EmptyTag;	57	import org.w3c.dom.Node;
52	import org.netbeans.modules.xml.text.syntax.dom.StartTag;
53	import org.netbeans.modules.xml.text.syntax.dom.Tag;
54		58
55	/**	59	/**
56	*	60	*
Lines 61-69 Link Here
61	private ContextUtilities() {	65	private ContextUtilities() {
62	}	66	}
63		67
64	public static boolean isValueToken(TokenItem currentToken) {	68	public static boolean isValueToken(Token<XMLTokenId> currentToken) {
65	if(currentToken != null) {	69	if(currentToken != null) {
66	if (currentToken.getTokenID().getNumericID() == XMLDefaultTokenContext.VALUE_ID) {	70	if (currentToken.id() == XMLTokenId.VALUE) {
67	return true;	71	return true;
68	}	72	}
69	}	73	}
Lines 71-79 Link Here
71	return false;	75	return false;
72	}	76	}
73		77
74	public static boolean isTagToken(TokenItem currentToken) {	78	public static boolean isTagToken(Token<XMLTokenId> currentToken) {
75	if(currentToken != null) {	79	if(currentToken != null) {
76	if (currentToken.getTokenID().getNumericID() == XMLDefaultTokenContext.TAG_ID) {	80	if (currentToken.id() == XMLTokenId.TAG) {
77	return true;	81	return true;
78	}	82	}
79	}	83	}
Lines 81-89 Link Here
81	return false;	85	return false;
82	}	86	}
83		87
84	public static boolean isAttributeToken(TokenItem currentToken) {	88	public static boolean isAttributeToken(Token<XMLTokenId> currentToken) {
85	if(currentToken != null) {	89	if(currentToken != null) {
86	if (currentToken.getTokenID().getNumericID() == XMLDefaultTokenContext.ARGUMENT_ID) {	90	if (currentToken.id() == XMLTokenId.ARGUMENT) {
87	return true;	91	return true;
88	}	92	}
89	}	93	}
Lines 91-178 Link Here
91	return false;	95	return false;
92	}	96	}
93		97
94	public static TokenItem getAttributeToken(TokenItem currentToken) {	98	public static Token<XMLTokenId> getAttributeToken(DocumentContext context) {
95	if(currentToken == null )	99	if(context.getCurrentToken() == null ) {
96	return null;	100	return null;
97
98	if(isValueToken(currentToken)) {
99	TokenItem equalsToken = currentToken.getPrevious();
100	if(equalsToken == null)
101	return null;
102
103	while(equalsToken != null && equalsToken.getTokenID().getNumericID() != XMLDefaultTokenContext.OPERATOR_ID) {
104	equalsToken = equalsToken.getPrevious();
105	}
106
107	if(equalsToken == null) {
108	return null;
109	}
110
111	TokenItem argumentToken = equalsToken.getPrevious();
112	if(argumentToken == null)
113	return null;
114
115	while(argumentToken != null && argumentToken.getTokenID().getNumericID() != XMLDefaultTokenContext.ARGUMENT_ID) {
116	argumentToken = argumentToken.getPrevious();
117	}
118
119	return argumentToken;
120	}	101	}
121		102	return context.getSyntaxSupport().getAttributeToken(context.getCurrentTokenOffset());
122	return null;
123	}	103	}
124		104
125	public static Tag getCurrentTagElement(DocumentContext context) {
126	SyntaxElement element = context.getCurrentElement();
127	if(element instanceof StartTag) {
128	return (StartTag) element;
129	} else if(element instanceof EmptyTag) {
130	return (EmptyTag) element;
131	}
132
133	return null;
134	}
135
136	public static TokenItem getAttributeToken(DocumentContext context) {
137	if(context.getCurrentToken() == null )
138	return null;
139
140	if(isValueToken(context.getCurrentToken())) {
141	TokenItem equalsToken = context.getCurrentToken().getPrevious();
142	if(equalsToken == null)
143	return null;
144
145	//getTokenId() should not return null by JavaDoc. But in reality, it does reutrn null sometimes
146	// see issue 67661
147	if(equalsToken.getTokenID() == null) {
148	return null;
149	}
150	while(equalsToken != null && equalsToken.getTokenID().getNumericID() != XMLDefaultTokenContext.OPERATOR_ID) {
151	equalsToken = equalsToken.getPrevious();
152	}
153
154	if(equalsToken == null) {
155	return null;
156	}
157
158	TokenItem argumentToken = equalsToken.getPrevious();
159	if(argumentToken == null)
160	return null;
161
162	while(argumentToken != null && argumentToken.getTokenID().getNumericID() != XMLDefaultTokenContext.ARGUMENT_ID) {
163	argumentToken = argumentToken.getPrevious();
164	}
165
166	return argumentToken;
167	}
168
169	return null;
170	}
171
172	public static String getAttributeTokenImage(DocumentContext context) {	105	public static String getAttributeTokenImage(DocumentContext context) {
173	TokenItem tok = getAttributeToken(context);	106	Token<XMLTokenId> tok = getAttributeToken(context);
174	if(tok != null) {	107	if(tok != null) {
175	return tok.getImage();	108	return tok.text().toString();
176	}	109	}
177		110
178	return null;	111	return null;
Lines 221-231 Link Here
221	return nodeName.substring(0, colonIndex);	154	return nodeName.substring(0, colonIndex);
222	}	155	}
223		156
224	public static StartTag getRoot(SyntaxElement se) {	157	public static SyntaxElement getRoot(SyntaxElement se) {
225	StartTag root = null;	158	SyntaxElement root = null;
226	while( se != null) {	159	while( se != null) {
227	if(se instanceof StartTag) {	160	if(se.getType() == Node.ELEMENT_NODE &&
228	root = (StartTag)se;	161	((TagElement)se).isStart()) {
		162	root = se;
229	}	163	}
230	se = se.getPrevious();	164	se = se.getPrevious();
231	}	165	}

Lines 49-55 Link Here

(-)a/xml.catalog/src/org/netbeans/modules/xml/catalog/settings/CatalogSettings.java (-1 / +2 lines)
49	import java.util.logging.Level;	49	import java.util.logging.Level;
50	import org.netbeans.modules.xml.catalog.lib.IteratorIterator;	50	import org.netbeans.modules.xml.catalog.lib.IteratorIterator;
51		51
52	import org.openide.*;
53	import org.openide.util.io.NbMarshalledObject;	52	import org.openide.util.io.NbMarshalledObject;
54		53
55	import org.netbeans.modules.xml.catalog.spi.*;	54	import org.netbeans.modules.xml.catalog.spi.*;
Lines 57-62 Link Here
57	import org.openide.util.Lookup;	56	import org.openide.util.Lookup;
58	import org.openide.util.NbBundle;	57	import org.openide.util.NbBundle;
59	import org.openide.util.lookup.Lookups;	58	import org.openide.util.lookup.Lookups;
		59	import org.openide.util.lookup.ServiceProvider;
60		60
61		61
62	/**	62	/**
Lines 92-97 Link Here
92	*	92	*
93	* @author Petr Kuzel	93	* @author Petr Kuzel
94	*/	94	*/
		95	@ServiceProvider(service = CatalogSettings.class)
95	public final class CatalogSettings implements Externalizable {	96	public final class CatalogSettings implements Externalizable {
96		97
97	/** Serial Version UID */	98	/** Serial Version UID */

Lines 57-69 Link Here

(-)a/xml.schema.completion/src/org/netbeans/modules/xml/schema/completion/CompletionQuery.java (-6 / +17 lines)
57	import java.util.logging.Level;	57	import java.util.logging.Level;
58	import java.util.logging.Logger;	58	import java.util.logging.Logger;
59	import javax.swing.ImageIcon;	59	import javax.swing.ImageIcon;
		60	import javax.swing.text.AbstractDocument;
60	import javax.swing.text.Document;	61	import javax.swing.text.Document;
61	import javax.swing.text.JTextComponent;	62	import javax.swing.text.JTextComponent;
62	import org.netbeans.api.editor.completion.Completion;	63	import org.netbeans.api.editor.completion.Completion;
		64	import org.netbeans.api.lexer.Token;
		65	import org.netbeans.api.lexer.TokenHierarchy;
		66	import org.netbeans.api.lexer.TokenSequence;
		67	import org.netbeans.api.xml.lexer.XMLTokenId;
63	import org.netbeans.editor.BaseDocument;	68	import org.netbeans.editor.BaseDocument;
64	import org.netbeans.modules.xml.schema.completion.util.CompletionContextImpl;	69	import org.netbeans.modules.xml.schema.completion.util.CompletionContextImpl;
65	import org.netbeans.modules.xml.schema.completion.util.CompletionUtil;	70	import org.netbeans.modules.xml.schema.completion.util.CompletionUtil;
66	import org.netbeans.modules.xml.text.syntax.XMLSyntaxSupport;	71	import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
67	import org.netbeans.spi.editor.completion.CompletionItem;	72	import org.netbeans.spi.editor.completion.CompletionItem;
68	import org.netbeans.spi.editor.completion.CompletionResultSet;	73	import org.netbeans.spi.editor.completion.CompletionResultSet;
69	import org.netbeans.spi.editor.completion.CompletionTask;	74	import org.netbeans.spi.editor.completion.CompletionTask;
Lines 120-135 Link Here
120	protected void prepareQuery(JTextComponent component) {	125	protected void prepareQuery(JTextComponent component) {
121	this.component = component;	126	this.component = component;
122	}	127	}
123		128
124	@Override	129	@Override
125	protected void query(CompletionResultSet resultSet, Document doc, int caretOffset) {	130	protected void query(CompletionResultSet resultSet, Document doc, int caretOffset) {
126	XMLSyntaxSupport support =	131	XMLSyntaxSupport support = XMLSyntaxSupport.getSyntaxSupport(doc);
127	(XMLSyntaxSupport) ((BaseDocument) doc).getSyntaxSupport();	132	if (support == null) {
		133	resultSet.finish();
		134	return;
		135	}
128		136
129	CompletionResultItem endTagResultItem = CompletionUtil.getEndTagCompletionItem(	137	CompletionResultItem endTagResultItem = CompletionUtil.getEndTagCompletionItem(
130	component, (BaseDocument) doc);	138	component, (BaseDocument) doc);
131	List<CompletionResultItem> completionItems = null;	139	List<CompletionResultItem> completionItems = null;
132	if (! support.noCompletion(component) &&	140	if (!CompletionUtil.noCompletion(component) &&
133	(CompletionUtil.canProvideCompletion((BaseDocument) doc))) {	141	(CompletionUtil.canProvideCompletion((BaseDocument) doc))) {
134		142
135	resultSet.setWaitText(NbBundle.getMessage(CompletionQuery.class, "MSG_PreparingXmlSchemas")); // NOI18N	143	resultSet.setWaitText(NbBundle.getMessage(CompletionQuery.class, "MSG_PreparingXmlSchemas")); // NOI18N
Lines 350-356 Link Here
350	List<CompletionResultItem> completionItems = null;	358	List<CompletionResultItem> completionItems = null;
351		359
352	//Step 1: create a context	360	//Step 1: create a context
353	XMLSyntaxSupport support = (XMLSyntaxSupport) ((BaseDocument)doc).getSyntaxSupport();	361	XMLSyntaxSupport support = XMLSyntaxSupport.getSyntaxSupport(doc);
		362	if (support == null) {
		363	return null;
		364	}
354	context = new CompletionContextImpl(primaryFile, support, caretOffset);	365	context = new CompletionContextImpl(primaryFile, support, caretOffset);
355		366
356	//Step 2: Accumulate all models and initialize the context	367	//Step 2: Accumulate all models and initialize the context

Lines 88-93 Link Here

(-)a/xml.schema.completion/src/org/netbeans/modules/xml/schema/completion/util/CompletionUtil.java (+35 lines)
88	public static final Pattern PATTERN_TEXT_TAG_EOLs = Pattern.compile("</?[\\s]+.*");	88	public static final Pattern PATTERN_TEXT_TAG_EOLs = Pattern.compile("</?[\\s]+.*");
89		89
90	private static final Logger _logger = Logger.getLogger(CompletionUtil.class.getName());	90	private static final Logger _logger = Logger.getLogger(CompletionUtil.class.getName());
		91
		92	public static boolean noCompletion(JTextComponent target) {
		93	if (target == null \|\| target.getCaret() == null) {
		94	return false;
		95	}
		96	int offset = target.getCaret().getDot();
		97	if (offset < 0) {
		98	return false;
		99	}
		100	//no completion inside CDATA or comment section
		101	BaseDocument document = (BaseDocument) target.getDocument();
		102	((AbstractDocument) document).readLock();
		103	try {
		104	TokenHierarchy th = TokenHierarchy.get(document);
		105	TokenSequence ts = th.tokenSequence();
		106	if (ts == null) {
		107	return false;
		108	}
		109	ts.move(offset);
		110	Token token = ts.token();
		111	if (token == null) {
		112	ts.moveNext();
		113	token = ts.token();
		114	if (token == null) {
		115	return false;
		116	}
		117	}
		118	if (token.id() == XMLTokenId.CDATA_SECTION \|\| token.id() == XMLTokenId.BLOCK_COMMENT \|\| token.id() == XMLTokenId.PI_START \|\| token.id() == XMLTokenId.PI_END \|\| token.id() == XMLTokenId.PI_CONTENT \|\| token.id() == XMLTokenId.PI_TARGET) {
		119	return true;
		120	}
		121	} finally {
		122	((AbstractDocument) document).readUnlock();
		123	}
		124	return false;
		125	}
91		126
92	/**	127	/**
93	* No instantiation.	128	* No instantiation.

Line 0 Link Here

(-)a/xml.text.obsolete90/nbproject/project.xml (+182 lines)
		1	<?xml version="1.0" encoding="UTF-8"?>
		2	<project xmlns="http://www.netbeans.org/ns/project/1">
		3	<type>org.netbeans.modules.apisupport.project</type>
		4	<configuration>
		5	<data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
		6	<code-name-base>org.netbeans.modules.xml.text.obsolete90</code-name-base>
		7	<module-dependencies>
		8	<dependency>
		9	<code-name-base>org.netbeans.modules.editor.deprecated.pre65formatting</code-name-base>
		10	<build-prerequisite/>
		11	<compile-dependency/>
		12	<run-dependency>
		13	<release-version>0</release-version>
		14	<specification-version>1.32</specification-version>
		15	</run-dependency>
		16	</dependency>
		17	<dependency>
		18	<code-name-base>org.netbeans.modules.editor.document</code-name-base>
		19	<build-prerequisite/>
		20	<compile-dependency/>
		21	<run-dependency>
		22	<specification-version>1.10</specification-version>
		23	</run-dependency>
		24	</dependency>
		25	<dependency>
		26	<code-name-base>org.netbeans.modules.editor.lib</code-name-base>
		27	<build-prerequisite/>
		28	<compile-dependency/>
		29	<run-dependency>
		30	<release-version>3</release-version>
		31	<specification-version>4.8</specification-version>
		32	</run-dependency>
		33	</dependency>
		34	<dependency>
		35	<code-name-base>org.netbeans.modules.editor.mimelookup</code-name-base>
		36	<build-prerequisite/>
		37	<compile-dependency/>
		38	<run-dependency>
		39	<release-version>1</release-version>
		40	<specification-version>1.41</specification-version>
		41	</run-dependency>
		42	</dependency>
		43	<dependency>
		44	<code-name-base>org.netbeans.modules.editor.structure</code-name-base>
		45	<build-prerequisite/>
		46	<compile-dependency/>
		47	<run-dependency>
		48	<release-version>1</release-version>
		49	</run-dependency>
		50	</dependency>
		51	<dependency>
		52	<code-name-base>org.netbeans.modules.lexer</code-name-base>
		53	<build-prerequisite/>
		54	<compile-dependency/>
		55	<run-dependency>
		56	<release-version>2</release-version>
		57	<specification-version>1.64</specification-version>
		58	</run-dependency>
		59	</dependency>
		60	<dependency>
		61	<code-name-base>org.netbeans.modules.xml.core</code-name-base>
		62	<build-prerequisite/>
		63	<compile-dependency/>
		64	<run-dependency>
65	<release-version>2</release-version>
66	<specification-version>1.44</specification-version>
67	</run-dependency>
68	</dependency>
69	<dependency>
70	<code-name-base>org.netbeans.modules.xml.lexer</code-name-base>
71	<build-prerequisite/>
72	<compile-dependency/>
73	<run-dependency>
74	<specification-version>1.30</specification-version>
75	</run-dependency>
76	</dependency>
77	<dependency>
78	<code-name-base>org.netbeans.modules.xml.text</code-name-base>
79	<build-prerequisite/>
80	<compile-dependency/>
81	<run-dependency>
82	<release-version>2</release-version>
83	<implementation-version/>
84	</run-dependency>
85	</dependency>
86	<dependency>
87	<code-name-base>org.openide.util</code-name-base>
88	<build-prerequisite/>
89	<compile-dependency/>
90	<run-dependency>
91	<specification-version>9.8</specification-version>
92	</run-dependency>
93	</dependency>
94	<dependency>
95	<code-name-base>org.openide.util.ui</code-name-base>
96	<build-prerequisite/>
97	<compile-dependency/>
98	<run-dependency>
99	<specification-version>9.7</specification-version>
100	</run-dependency>
101	</dependency>
102	</module-dependencies>
103	<test-dependencies>
104	<test-type>
105	<name>unit</name>
106	<test-dependency>
107	<code-name-base>org.netbeans.libs.junit4</code-name-base>
108	<compile-dependency/>
109	</test-dependency>
110	<test-dependency>
111	<code-name-base>org.netbeans.modules.editor</code-name-base>
112	<recursive/>
113	<compile-dependency/>
114	<test/>
115	</test-dependency>
116	<test-dependency>
117	<code-name-base>org.netbeans.modules.editor.mimelookup</code-name-base>
118	<compile-dependency/>
119	</test-dependency>
120	<test-dependency>
121	<code-name-base>org.netbeans.modules.editor.mimelookup.impl</code-name-base>
122	<recursive/>
123	<compile-dependency/>
124	</test-dependency>
125	<test-dependency>
126	<code-name-base>org.netbeans.modules.editor.settings.storage</code-name-base>
127	<recursive/>
128	</test-dependency>
129	<test-dependency>
130	<code-name-base>org.netbeans.modules.editor.structure</code-name-base>
131	<compile-dependency/>
132	</test-dependency>
133	<test-dependency>
134	<code-name-base>org.netbeans.modules.editor.util</code-name-base>
135	<compile-dependency/>
136	</test-dependency>
137	<test-dependency>
138	<code-name-base>org.netbeans.modules.nbjunit</code-name-base>
139	<recursive/>
140	<compile-dependency/>
141	</test-dependency>
142	<test-dependency>
143	<code-name-base>org.netbeans.modules.projectapi.nb</code-name-base>
144	<compile-dependency/>
145	</test-dependency>
146	<test-dependency>
147	<code-name-base>org.netbeans.modules.xml.lexer</code-name-base>
148	<compile-dependency/>
149	</test-dependency>
150	<test-dependency>
151	<code-name-base>org.netbeans.modules.xml.text</code-name-base>
152	<recursive/>
153	<compile-dependency/>
154	<test/>
155	</test-dependency>
156	<test-dependency>
157	<code-name-base>org.netbeans.modules.xml.xam</code-name-base>
158	<compile-dependency/>
159	</test-dependency>
160	<test-dependency>
161	<code-name-base>org.netbeans.modules.xml.xdm</code-name-base>
162	<compile-dependency/>
163	</test-dependency>
164	<test-dependency>
165	<code-name-base>org.openide.util.ui</code-name-base>
166	<compile-dependency/>
167	</test-dependency>
168	<test-dependency>
169	<code-name-base>org.openide.util.lookup</code-name-base>
170	<compile-dependency/>
171	</test-dependency>
172	</test-type>
173	</test-dependencies>
174	<public-packages>
175	<package>org.netbeans.modules.xml.text.api</package>
176	<package>org.netbeans.modules.xml.text.indent</package>
177	<package>org.netbeans.modules.xml.text.syntax</package>
178	<package>org.netbeans.modules.xml.text.syntax.dom</package>
179	</public-packages>
180	</data>
181	</configuration>
182	</project>

Line 0 Link Here

(-)a/xml.text.obsolete90/src/org/netbeans/modules/xml/text/obsolete90/ComplexValueSettingsFactory.java (+61 lines)
	1	/*
	2	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
	3	*
	4	* Copyright 2016 Oracle and/or its affiliates. All rights reserved.
	5	*
	6	* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
	7	* Other names may be trademarks of their respective owners.
	8	*
	9	* The contents of this file are subject to the terms of either the GNU
	10	* General Public License Version 2 only ("GPL") or the Common
	11	* Development and Distribution License("CDDL") (collectively, the
	12	* "License"). You may not use this file except in compliance with the
	13	* License. You can obtain a copy of the License at
	14	* http://www.netbeans.org/cddl-gplv2.html
	15	* or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
	16	* specific language governing permissions and limitations under the
	17	* License. When distributing the software, include this License Header
	18	* Notice in each file and include the License file at
	19	* nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
	20	* particular file as subject to the "Classpath" exception as provided
	21	* by Oracle in the GPL Version 2 section of the License file that
	22	* accompanied this code. If applicable, add the following below the
	23	* License Header, with the fields enclosed by brackets [] replaced by
	24	* your own identifying information:
	25	* "Portions Copyrighted [year] [name of copyright owner]"
	26	*
	27	* If you wish your version of this file to be governed by only the CDDL
	28	* or only the GPL Version 2, indicate your decision by adding
	29	* "[Contributor] elects to include this software in this distribution
	30	* under the [CDDL or GPL Version 2] license." If you do not indicate a
	31	* single choice of license, a recipient has the option to distribute
	32	* your version of this file under either the CDDL, the GPL Version 2 or
	33	* to extend the choice of license to its licensees as provided above.
	34	* However, if you add GPL Version 2 code and therefore, elected the GPL
	35	* Version 2 license, then the option applies only if the new code is
	36	* made subject to such option by the copyright holder.
	37	*
	38	* Contributor(s):
	39	*
	40	* Portions Copyrighted 2016 Sun Microsystems, Inc.
	41	*/
	42	package org.netbeans.modules.xml.text.obsolete90;
	43
	44	import java.util.Collections;
	45	import java.util.List;
	46	import org.netbeans.modules.xml.text.api.XMLDefaultTokenContext;
	47	import org.netbeans.modules.xml.text.syntax.DTDTokenContext;
	48
	49	/**
	50	*
	51	* @author sdedic
	52	*/
	53	public class ComplexValueSettingsFactory {
	54	public static List getXMLTokenContext() {
	55	return Collections.singletonList(XMLDefaultTokenContext.context);
	56	}
	57	// XXX: use lexer
	58	public static List getDTDTokenContext() {
	59	return Collections.singletonList(DTDTokenContext.context);
	60	}
	61	}

Lines 45-350 Link Here

(-)a/xml.text/src/org/netbeans/modules/xml/text/resources/mf-layer.xml (-279 / +5 lines)
45	-->	45	-->
46	<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.0//EN" "http://www.netbeans.org/dtds/filesystem-1_0.dtd">	46	<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.0//EN" "http://www.netbeans.org/dtds/filesystem-1_0.dtd">
47	<filesystem>	47	<filesystem>
48	<folder name="Navigator">
49	<folder name="Panels">
50	<folder name="text">
51	<folder name="xml">
52	<file name="org-netbeans-modules-xml-text-navigator-XMLNavigatorPanel.instance"/>
53	</folder>
54	<folder name="xsd+xml">
55	<file name="org-netbeans-modules-xml-text-navigator-XMLNavigatorPanel.instance"/>
56	</folder>
57	<folder name="xml-wsdl">
58	<file name="org-netbeans-modules-xml-text-navigator-XMLNavigatorPanel.instance"/>
59	</folder>
60	<folder name="x-ant+xml">
61	<file name="org-netbeans-modules-xml-text-navigator-XMLNavigatorPanel.instance"/>
62	</folder>
63	<folder name="x-dd-sjsas-servlet2.41">
64	<!-- sun-web.xml -->
65	<file name="org-netbeans-modules-xml-text-navigator-XMLNavigatorPanel.instance"/>
66	</folder>
67	</folder>
68	<folder name="application">
69	<folder name="xslt+xml">
70	<file name="org-netbeans-modules-xml-text-navigator-XMLNavigatorPanel.instance"/>
71	</folder>
72	<folder name="xhtml+xml">
73	<file name="org-netbeans-modules-xml-text-navigator-XMLNavigatorPanel.instance"/>
74	</folder>
75	<folder name="x-schema+xml">
76	<file name="org-netbeans-modules-xml-text-navigator-XMLNavigatorPanel.instance"/>
77	</folder>
78	</folder>
79	</folder>
80	</folder>
81
82	<folder name="Services">
83	<folder name="IndentEngine">
84	<!--
85	<file name="org-netbeans-modules-xml-text-settings-XMLIndentEngine.settings" url="XMLIndentEngine.xml">
86	<attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.xml.text.indent.Bundle"/>
87	</file>
88	-->
89	<file name="org-netbeans-modules-xml-text-settings-DTDIndentEngine.settings" url="DTDIndentEngine.xml">
90	<attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.xml.text.indent.Bundle"/>
91	</file>
92	</folder> <!-- IndentEngine -->
93
94	<!--
95	<folder name="Hidden">
96	<file name="org-netbeans-modules-xml-text-completion-ReloadActionPerformer.instance">
97	<attr name="instanceOf" stringvalue="org.netbeans.modules.xml.core.actions.XMLUpdateDocumentAction$Performer"/>
98	</file>
99	</folder>
100	-->
101	</folder> <!-- Services -->
102
103	<folder name="Editors">	48	<folder name="Editors">
104	<folder name="text">	49	<folder name="text">
105	<folder name="xml">	50	<folder name="xml">
106	<attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.xml.text.resources.Bundle"/>
107
108	<file name="org-netbeans-modules-xml-text-indent-XMLIndentTaskFactory.instance"/>
109
110	<file name="AutoIndenter.instance">
111	<attr name="instanceOf" stringvalue="org.netbeans.spi.editor.typinghooks.TypedTextInterceptor$Factory"/>
112	<attr name="instanceCreate"
113	methodvalue="org.netbeans.modules.editor.indent.spi.support.AutomatedIndenting.createHotCharsIndenter"/>
114	<attr name="regex1" stringvalue="\s*\</\w+\>"/>
115	</file>
116
117	<folder name="CompletionProviders">
118	<file name="org-netbeans-modules-xml-text-completion-XMLCompletionProvider.instance"/>
119	</folder>
120
121	<folder name="BracesMatchers">
122	<file name="org-netbeans-modules-xml-text-bracematch-XMLBraceMatcherFactory.instance">
123	<attr name="position" intvalue="50"/>
124	</file>
125	</folder>
126
127	<folder name="FontsColors">
128	<folder name="NetBeans">
129	<folder name="Defaults">
130	<file name="org-netbeans-modules-xml-text-token-colorings.xml" url="XML-fontsColors.xml">
131	<attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.xml.text.resources.Bundle"/>
132	</file>
133	</folder>
134	</folder>
135	</folder>
136
137	<folder name="DocumentModel">
138	<file name="org-netbeans-modules-xml-text-structure-XMLDocumentModelProvider.instance"/>
139	</folder>
140
141	<folder name="FoldManager">
142	<file name="org-netbeans-modules-xml-text-folding-XmlFoldManagerFactory.instance">
143	<attr name="position" intvalue="1100"/>
144	</file>
145	</folder>
146
147	<folder name="Popup">
148	<file name="org-netbeans-modules-xml-actions-CollectXMLAction.shadow">
149	<attr name="originalFile" stringvalue="Actions/XML/org-netbeans-modules-xml-actions-CollectXMLAction.instance"/>
150	<attr name="position" intvalue="1600"/>
151	</file>
152	<file name="org-netbeans-modules-xml-actions-XMLViewActions.instance">
153	<attr name="position" intvalue="1400"/>
154	</file>
155	<!-- implicit separator provided by above action group -->
156
157	<file name="format">
158	<attr name="position" intvalue="1200"/>
159	</file>
160	<file name="SeparatorAfterFormat.instance">
161	<attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
162	<attr name="position" intvalue="1800"/>
163	</file>
164
165	<!-- Cut, Copy, Paste actions block -->
166	<file name="ToolsSeparator.instance"><attr name="instanceClass" stringvalue="javax.swing.JSeparator"/> <attr name="position" intvalue="4100"/>
167	</file>
168
169	<file name="org-openide-actions-ToolsAction.shadow">
170	<attr name="originalFile" stringvalue="Actions/System/org-openide-actions-ToolsAction.instance"/>
171	<attr name="position" intvalue="4200"/>
172	</file>
173	</folder>
174
175	<folder name="CodeTemplates">
176	<folder name="Defaults">
177	<file name="org-netbeans-modules-xml-text-xmlCodeTemplates.xml" url="XMLEditor-abbreviations.xml"/>
178	</folder>
179	</folder>
180
181	<folder name="Preferences">	51	<folder name="Preferences">
182	<folder name="Defaults">	52	<folder name="Defaults">
183	<file name="org-netbeans-modules-xml-text-xmlPreferences.xml" url="XMLEditor-preferences.xml"/>	53	<file name="org-netbeans-modules-xml-text-xmlPreferences.xml" url="XMLEditor-preferences.xml"/>
184	</folder>	54	</folder>
185	</folder>	55	</folder>
186
187	<file name="EditorKit.instance">
188	<attr name="instanceClass" stringvalue="org.netbeans.modules.xml.text.syntax.XMLKit"/>
189	<attr name="instanceOf" stringvalue="javax.swing.text.EditorKit,org.netbeans.modules.xml.text.syntax.XMLKit"/>
190	<attr name="beaninfo" boolvalue="false"/>
191	</file>
192
193	<!-- <folder name="Toolbars">
194	<folder name="Default">
195	<attr name="stop-macro-recording/XMLSeparator1.instance" boolvalue="true"/>
196	<file name="XMLSeparator1.instance">
197	<attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
198	</file>
199
200	<attr name="XMLSeparator1.instance/xml-comment" boolvalue="true"/>
201	<file name="xml-comment"/>
202	<attr name="xml-comment/xml-uncomment" boolvalue="true"/>
203	<file name="xml-uncomment"/>
204	</folder> <!__ Default __>
205	</folder> -->
206	<folder name="SideBar">
207	<file name="breadcrumbs.instance">
208	<attr name="location" stringvalue="South"/>
209	<attr name="position" intvalue="5237"/>
210	<attr name="scrollable" boolvalue="false"/>
211	<attr name="instanceCreate" methodvalue="org.netbeans.modules.editor.breadcrumbs.spi.BreadcrumbsController.createSideBarFactory" />
212	</file>
213	</folder>
214	</folder> <!-- xml -->
215
216	<folder name="xml-external-parsed-entity">
217	<attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.xml.text.resources.Bundle"/>
218	<!-- It reuses kit only -->
219	<file name="EditorKit.instance">
220	<attr name="instanceClass" stringvalue="org.netbeans.modules.xml.text.syntax.ENTKit"/>
221	<attr name="instanceOf" stringvalue="javax.swing.text.EditorKit,org.netbeans.modules.xml.text.syntax.ENTKit"/>
222	<attr name="beaninfo" boolvalue="false"/>
223	</file>
224
225	<folder name="CompletionProviders">
226	<file name="org-netbeans-modules-xml-text-completion-XMLCompletionProvider.instance"/>
227	</folder>
228
229	<folder name="FontsColors">
230	<folder name="NetBeans">
231	<folder name="Defaults">
232	<file name="org-netbeans-modules-xml-text-token-colorings.xml" url="XML-fontsColors.xml">
233	<attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.xml.text.resources.Bundle"/>
234	</file>
235	</folder>
236	</folder>
237	</folder>
238	<folder name="DocumentModel">	56	<folder name="DocumentModel">
239	<file name="org-netbeans-modules-xml-text-structure-XMLDocumentModelProvider.instance"/>	57	<file name="org-netbeans-modules-xml-text-structure-XMLDocumentModelProvider.instance"/>
240	</folder>	58	</folder>
241		59	</folder>
242	<folder name="FoldManager">	60	<folder name="xml-external-parsed-entity">
243	<file name="org-netbeans-modules-xml-text-folding-XmlFoldManagerFactory.instance">	61	<folder name="DocumentModel">
244	<attr name="position" intvalue="1100"/>	62	<file name="org-netbeans-modules-xml-text-structure-XMLDocumentModelProvider.instance"/>
245	</file>
246	</folder>	63	</folder>
247
248	<folder name="Popup">
249	<file name="org-netbeans-modules-xml-actions-CollectXMLAction.shadow">
250	<attr name="originalFile" stringvalue="Actions/XML/org-netbeans-modules-xml-actions-CollectXMLAction.instance"/>
251	<attr name="position" intvalue="1600"/>
252	</file>
253	<file name="org-netbeans-modules-xml-actions-XMLViewActions.instance">
254	<attr name="position" intvalue="1400"/>
255	</file>
256	<!-- implicit separator provided by above action group -->
257
258	<file name="format">
259	<attr name="position" intvalue="1200"/>
260	</file>
261	<file name="SeparatorAfterFormat.instance">
262	<attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
263	<attr name="position" intvalue="1800"/>
264	</file>
265
266	<!-- Cut, Copy, Paste actions block -->
267	<file name="ToolsSeparator.instance"><attr name="instanceClass" stringvalue="javax.swing.JSeparator"/> <attr name="position" intvalue="4100"/>
268	</file>
269
270	<file name="org-openide-actions-ToolsAction.shadow">
271	<attr name="originalFile" stringvalue="Actions/System/org-openide-actions-ToolsAction.instance"/>
272	<attr name="position" intvalue="4200"/>
273	</file>
274	</folder>
275
276	<folder name="CodeTemplates">
277	<folder name="Defaults">
278	<file name="org-netbeans-modules-xml-text-xmlCodeTemplates.xml" url="XMLEditor-abbreviations.xml"/>
279	</folder>
280	</folder>
281
282	<!-- <file name="Settings.settings" url="XMLEditor-options.xml"/> -->
283
284	</folder> <!-- xml-external-parsed-entity -->	64	</folder> <!-- xml-external-parsed-entity -->
285	</folder> <!-- text -->	65	</folder> <!-- text -->
286
287	<folder name="application">	66	<folder name="application">
288	<folder name="xml-dtd">	67	<folder name="xml-dtd">
289	<attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.xml.text.resources.Bundle"/>
290
291	<folder name="FontsColors">
292	<folder name="NetBeans">
293	<folder name="Defaults">
294	<file name="org-netbeans-modules-xml-text-token-colorings.xml" url="DTD-fontsColors.xml">
295	<attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.xml.text.resources.Bundle"/>
296	</file>
297	</folder>
298	</folder>
299	</folder>
300
301	<folder name="Popup">
302	<!-- implicit separator provided by below action group -->
303
304
305	<file name="ToolsSeparator.instance"><attr name="instanceClass" stringvalue="javax.swing.JSeparator"/> <attr name="position" intvalue="4200"/>
306	</file>
307
308	<file name="org-netbeans-modules-xml-actions-CollectDTDAction.shadow">
309	<attr name="originalFile" stringvalue="Actions/XML/org-netbeans-modules-xml-actions-CollectDTDAction.instance"/>
310	<attr name="position" intvalue="4100"/>
311	</file>
312	<file name="org-openide-actions-ToolsAction.shadow">
313	<attr name="originalFile" stringvalue="Actions/System/org-openide-actions-ToolsAction.instance"/>
314	<attr name="position" intvalue="4300"/>
315	</file>
316	</folder>
317
318	<folder name="CodeTemplates">
319	<folder name="Defaults">
320	<file name="org-netbeans-modules-xml-text-dtdCodeTemplates.xml" url="DTDEditor-abbreviations.xml"/>
321	</folder>
322	</folder>
323
324	<folder name="Preferences">	68	<folder name="Preferences">
325	<folder name="Defaults">	69	<folder name="Defaults">
326	<file name="org-netbeans-modules-xml-text-dtdPreferences.xml" url="DTDEditor-preferences.xml"/>	70	<file name="org-netbeans-modules-xml-text-dtdPreferences.xml" url="DTDEditor-preferences.xml"/>
327	</folder>	71	</folder>
328	</folder>	72	</folder>
329
330	<file name="EditorKit.instance">
331	<attr name="instanceClass" stringvalue="org.netbeans.modules.xml.text.syntax.DTDKit"/>
332	<attr name="instanceOf" stringvalue="javax.swing.text.EditorKit,org.netbeans.modules.xml.text.syntax.DTDKit"/>
333	<attr name="beaninfo" boolvalue="false"/>
334	</file>
335	</folder> <!-- xml-dtd -->
336	</folder> <!-- application -->
337	</folder> <!-- Editors -->
338
339	<folder name="OptionsDialog">
340	<folder name="PreviewExamples">
341	<folder name="application">
342	<file name="xml-dtd" url="DTDExample"/>
343	</folder>
344	<folder name="text">
345	<file name="xml" url="XMLExample"/>
346	</folder>	73	</folder>
347	</folder>	74	</folder>
348	</folder>	75	</folder> <!-- Editors -->
349
350	</filesystem>	76	</filesystem>

Lines 81-114 Link Here

(-)a/xml.text/src/org/netbeans/modules/xml/text/syntax/dom/Util.java (-61 / +3 lines)
81	* @return the same value of stripped substring of it.	81	* @return the same value of stripped substring of it.
82	*/	82	*/
83	public static String actualAttributeValue(String attributeValue) {	83	public static String actualAttributeValue(String attributeValue) {
84	int ltIndex = attributeValue.indexOf('<');	84	return org.netbeans.modules.xml.text.api.XMLTextUtils.actualAttributeValue(attributeValue);
85	int gtIndex = attributeValue.indexOf('>');
86	int firstUnwantedIndex = -1;
87	if (gtIndex != -1) {
88	if (ltIndex != -1 && ltIndex < gtIndex) {
89	firstUnwantedIndex = ltIndex;
90	} else {
91	firstUnwantedIndex = gtIndex;
92	}
93	} else {
94	firstUnwantedIndex = ltIndex;
95	}
96
97	if (firstUnwantedIndex != -1) {
98	char charAtIndex = attributeValue.charAt(firstUnwantedIndex);
99	while (charAtIndex == ' ' \|\| charAtIndex == '\t' \|\| charAtIndex == '\n' \|\|
100	charAtIndex == '\r' \|\| charAtIndex == '<' \|\| charAtIndex == '>') {
101	firstUnwantedIndex--;
102	if (firstUnwantedIndex < 0) {
103	break;
104	}
105	charAtIndex = attributeValue.charAt(firstUnwantedIndex);
106	}
107
108	return attributeValue.substring(0, firstUnwantedIndex + 1);
109	} else {
110	return attributeValue;
111	}
112	}	85	}
113		86
114	/**	87	/**
Lines 118-135 Link Here
118	* @return a string that may contain '<', '>', '\'', '"', '&'.	91	* @return a string that may contain '<', '>', '\'', '"', '&'.
119	*/	92	*/
120	public static String replaceEntityStringsWithChars(String value) {	93	public static String replaceEntityStringsWithChars(String value) {
121	StringBuffer buf = new StringBuffer(value);	94	return org.netbeans.modules.xml.text.api.XMLTextUtils.replaceCharsWithEntityStrings(value);
122	for (int entity = 0; entity < knownEntityStrings.length; entity++) {
123	String curEntityString = knownEntityStrings[entity];
124	int indexOfEntity = buf.toString().indexOf(curEntityString);
125	while (indexOfEntity != -1) {
126	buf.replace(indexOfEntity, indexOfEntity + curEntityString.length(),
127	new String(new char[]{knownEntityChars[entity]}));
128	indexOfEntity = buf.toString().indexOf(curEntityString);
129	}
130	}
131
132	return buf.toString();
133	}	95	}
134		96
135	/**	97	/**
Lines 139-165 Link Here
139	* @return a string that may contain <", ">", "'", """ and "&"	101	* @return a string that may contain <", ">", "'", """ and "&"
140	*/	102	*/
141	public static String replaceCharsWithEntityStrings(String value) {	103	public static String replaceCharsWithEntityStrings(String value) {
142	if (value == null) {	104	return org.netbeans.modules.xml.text.api.XMLTextUtils.replaceCharsWithEntityStrings(value);
143	return null;
144	}
145	StringBuffer replBuf = new StringBuffer(value.length());
146	for (int ind = 0; ind < value.length(); ind++) {
147	boolean charReplaced = false;
148	char curChar = value.charAt(ind);
149	for (int entity = 0; entity < knownEntityChars.length; entity++) {
150	if (curChar == knownEntityChars[entity]) {
151	replBuf.append(knownEntityStrings[entity]);
152	charReplaced = true;
153	break;
154	}
155	}
156
157	if (!charReplaced) {
158	replBuf.append(curChar);
159	}
160	}
161
162	return replBuf.toString();
163	}	105	}
164		106
165	}	107	}

Line 0 Link Here

(-)a/xml.text.obsolete90/test/unit/data/goldenfiles/org/netbeans/modules/xml/text/indent/XMLFormatterTest/testReformatSample1.pass (+17 lines)
	1	<?xml version="1.0" encoding="UTF-8"?>
	2
	3	<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
	4	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
	5	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
	6	version="2.4">
	7	<session-config>
	8	<session-timeout>
	9	30
	10	</session-timeout>
	11	</session-config>
	12	<welcome-file-list>
	13	<welcome-file>
	14	index.jsp
	15	</welcome-file>
	16	</welcome-file-list>
	17	</web-app>

Lines 39-45 Link Here

(-)a/xml.text/test/unit/src/org/netbeans/modules/xml/text/AbstractTestCase.java (-3 / +5 lines)
39	*	39	*
40	* Portions Copyrighted 2007 Sun Microsystems, Inc.	40	* Portions Copyrighted 2007 Sun Microsystems, Inc.
41	*/	41	*/
42	package org.netbeans.modules.xml.text;	42	package org.netbeans.modules.xml.text.syntax;
43		43
44	import java.io.BufferedReader;	44	import java.io.BufferedReader;
45	import java.io.IOException;	45	import java.io.IOException;
Lines 52-64 Link Here
52	import org.netbeans.api.lexer.Language;	52	import org.netbeans.api.lexer.Language;
53	import org.netbeans.api.xml.lexer.XMLTokenId;	53	import org.netbeans.api.xml.lexer.XMLTokenId;
54	import org.netbeans.editor.BaseDocument;	54	import org.netbeans.editor.BaseDocument;
55	import org.netbeans.modules.xml.text.syntax.XMLSyntaxSupport;
56	import org.netbeans.modules.xml.xam.ModelSource;	55	import org.netbeans.modules.xml.xam.ModelSource;
57	import org.netbeans.modules.xml.xdm.XDMModel;	56	import org.netbeans.modules.xml.xdm.XDMModel;
58	import org.netbeans.modules.xml.xdm.diff.DefaultElementIdentity;	57	import org.netbeans.modules.xml.xdm.diff.DefaultElementIdentity;
59	import org.netbeans.modules.xml.xdm.diff.DiffFinder;	58	import org.netbeans.modules.xml.xdm.diff.DiffFinder;
60	import org.netbeans.modules.xml.xdm.diff.Difference;	59	import org.netbeans.modules.xml.xdm.diff.Difference;
61	import org.openide.util.Exceptions;
62	import org.openide.util.Lookup;	60	import org.openide.util.Lookup;
63	import org.openide.util.lookup.Lookups;	61	import org.openide.util.lookup.Lookups;
64		62
Lines 89-94 Link Here
89	}	87	}
90		88
91	protected static BaseDocument getResourceAsDocument(String path) throws Exception {	89	protected static BaseDocument getResourceAsDocument(String path) throws Exception {
		90	// AbstractTestCase was repackaged, tests typically contain path rooted at xml.text package.
		91	if (path.startsWith("syntax/")) {
		92	path = path.substring(7);
		93	}
92	InputStream in = AbstractTestCase.class.getResourceAsStream(path);	94	InputStream in = AbstractTestCase.class.getResourceAsStream(path);
93	BaseDocument sd = new BaseDocument(true, "text/xml"); //NOI18N	95	BaseDocument sd = new BaseDocument(true, "text/xml"); //NOI18N
94	BufferedReader br = new BufferedReader(new InputStreamReader(in,"UTF-8"));	96	BufferedReader br = new BufferedReader(new InputStreamReader(in,"UTF-8"));

Lines 107-112 Link Here

(-)a/xml.text/apichanges.xml (+64 lines)
107	<!-- ACTUAL CHANGES BEGIN HERE: -->	107	<!-- ACTUAL CHANGES BEGIN HERE: -->
108		108
109	<changes>	109	<changes>
		110	<change id="deprecated-syntax-api">
		111	<summary>Syntax API deprecated</summary>
		112	<version major="2" minor="60"/>
		113	<date day="11" month="10" year="2016"/>
		114	<author login="sdedic"/>
		115	<compatibility binary="compatible" source="incompatible" semantic="compatible" addition="yes" deprecation="yes" deletion="yes"/>
		116	<description>
		117	<p>
		118	The xml.text.syntax API uses the old and long deprecated lexer. The API is now moved to a new compatibility-only
		119	<code>xml.text.deprecated90</code> module and a new API in <code>org.netbeans.modules.xml.text.api.dom</code> package is offered.
		120	</p>
		121	<p>
		122	The following classes/packages have been moved to xml.text.obsolete90 module:
		123	</p>
		124	<ul>
		125	<li>
		126	<code>org.netbeans.modules.xml.text.syntax</code>
		127	<ul>
		128	<li>DTDSyntaxTokenMapper</li>
		129	<li>DTDTokenContext</li>
		130	<li>SyntaxElement</li>
		131	<li>UnicodeClasses</li>
		132	<li>XMLDefaultSyntax</li>
		133	<li>XMLSyntaxSupport</li>
		134	<li>XMLSyntaxTokenMapper</li>
		135	<li>XMLTokenIDs</li>
		136	</ul>
		137	</li>
		138	<li>
		139	<code>org.netbeans.modules.xml.text.syntax.dom</code>
		140	<ul>
		141	<li>AttrImpl</li>
		142	<li>CDataSectionImpl</li>
		143	<li>CommentImpl</li>
		144	<li>DocumentTypeImpl</li>
		145	<li>EmptyTag</li>
		146	<li>EndTag</li>
		147	<li>EntityReferenceImpl</li>
		148	<li>ProcessingInstructionImpl</li>
		149	<li>StartTag</li>
		150	<li>SyntaxNode</li>
		151	<li>TextImpl</li>
		152	<li>Util</li>
		153	</ul>
		154	</li>
		155	<li>
		156	<code>org.netbeans.modules.xml.text.indent</code>
		157	<ul>
		158	<li>XMLFormatter</li>
		159	</ul>
		160	</li>
		161	<li>
		162	<code>org.netbeans.modules.xml.text.api</code>
		163	<ul>
		164	<li>XMLDefaultTokenContext</li>
		165	</ul>
		166	</li>
		167	</ul>
		168	</description>
		169	<class name="XMLTextUtils" package="org.netbeans.modules.xml.text.api"/>
		170	<package name="org.netbeans.modules.xml.text.syntax"/>
		171	<package name="org.netbeans.modules.xml.text.api.dom"/>
		172	<issue number="268342"/>
		173	</change>
110	<change id="old-editor-settings-deprecation">	174	<change id="old-editor-settings-deprecation">
111	<summary>Removing old settings classes</summary>	175	<summary>Removing old settings classes</summary>
112	<version major="1" minor="16"/>	176	<version major="1" minor="16"/>

Lines 48-64 Link Here

(-)a/java.source/module-auto-deps.xml (-6 / +3 lines)
48		48
49	<transformations version="1.0">	49	<transformations version="1.0">
50	<transformationgroup>	50	<transformationgroup>
51	<description>The old editor settings and completion APIs have been deprecated, see http://wiki.netbeans.org/EditorSettingsUpgrade and update your module.</description>	51	<description>XML SyntaxElement API that depends on obsolete Lexer was deprecated and removed from main module.</description>
52	<transformation>	52	<transformation>
53	<trigger-dependency type="older">	53	<trigger-dependency type="older">
54	<module-dependency codenamebase="org.netbeans.modules.java.source" spec="0.141"/>	54	<module-dependency codenamebase="org.netbeans.modules.xml.text" major="2" spec="1.60"/>
55	</trigger-dependency>	55	</trigger-dependency>
56	<implies>	56	<implies>
57	<result>	57	<result>
58	<module-dependency codenamebase="org.netbeans.modules.java.source.base" spec="1.1"/>	58	<module-dependency codenamebase="org.netbeans.modules.xml.text.obsolete90" spec="1.0"/>
59	</result>
60	<result>
61	<module-dependency codenamebase="org.netbeans.modules.java.source.compat8" spec="9.0"/>
62	</result>	59	</result>
63	</implies>	60	</implies>
64	</transformation>	61	</transformation>

Lines 36-55 Link Here

(-)a/projectapi/src/org/netbeans/spi/project/package.html (-12 / +20 lines)
36	made subject to such option by the copyright holder.	36	made subject to such option by the copyright holder.
37		37
38	Contributor(s):	38	Contributor(s):
		39
		40	Portions Copyrighted 2016 Sun Microsystems, Inc.
39	-->	41	-->
40	<html>	42	<html>
41	<body>	43	<body>
42		44	<p>
43	Support for defining project types.	45	API for read-only access XML structure using DOM-like interface. Implemented over XML lexer,
44		46	so the structure can be obtained even on malformed, unfinished or errneous documents.
45	<p>Each kind of project in the system needs to be loaded by a	47	The caller may obtain a SyntaxElement corresponding to a given textual position in the XML document.
46	{@link org.netbeans.spi.project.ProjectFactory}, which defines how to recognize	48	The SyntaxElement can be used to both read contents (attributes, tag name, ...) of the document,
47	projects on disk, load their metadata into memory, and save their metadata back	49	or navigate to sibling, predecessor, parent or child Elements. SyntaxElement can be converted to
48	to disk. {@link org.netbeans.spi.project.ProjectState} is used to let the	50	DOM Node; DOM Nodes obtained originally as a result of SyntaxElement conversion can be converted
49	factory mark a project as being modified in memory.</p>	51	back to SyntaxElements so the caller can retrieve their position within the document.
50		52	</p>
51	<p>Projects will normally put implementations of several interfaces such as	53	<p>
52	{@link org.netbeans.spi.project.ActionProvider} into their lookup.</p>	54	It is advisable to perform searches or navigation through the document under a document read (write)
53		55	lock. Implementations in this package read-lock the document internally, but generally no lock is
		56	preserved across method calls.
		57	</p>
		58	<p>
		59	The design / structure of the API is intentionally almost the same as with the obsoleted api located in
		60	<code>org.netbeans.modules.xml.text.syntax.dom</code> package to make the existing code migration easier.
		61	</p>
54	</body>	62	</body>
55	</html>	63	</html>

Lines 62-72 Link Here

(-)a/xml.text/src/org/netbeans/modules/xml/text/completion/XMLResultItem.java (-19 / +24 lines)
62	import javax.swing.JLabel;	62	import javax.swing.JLabel;
63	import javax.swing.UIManager;	63	import javax.swing.UIManager;
64	import org.netbeans.api.editor.completion.Completion;	64	import org.netbeans.api.editor.completion.Completion;
		65	import org.netbeans.api.lexer.Token;
		66	import org.netbeans.api.lexer.TokenSequence;
65	import org.netbeans.api.queries.FileEncodingQuery;	67	import org.netbeans.api.queries.FileEncodingQuery;
		68	import org.netbeans.api.xml.lexer.XMLTokenId;
66	import org.netbeans.modules.xml.api.model.GrammarResult;	69	import org.netbeans.modules.xml.api.model.GrammarResult;
67	import org.netbeans.modules.xml.api.model.DescriptionSource;	70	import org.netbeans.modules.xml.api.model.DescriptionSource;
68	import org.netbeans.modules.xml.text.api.XMLDefaultTokenContext;	71	import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
69	import org.netbeans.modules.xml.text.syntax.XMLSyntaxSupport;
70	import org.netbeans.spi.editor.completion.CompletionDocumentation;	72	import org.netbeans.spi.editor.completion.CompletionDocumentation;
71	import org.netbeans.spi.editor.completion.CompletionItem;	73	import org.netbeans.spi.editor.completion.CompletionItem;
72	import org.netbeans.spi.editor.completion.CompletionResultSet;	74	import org.netbeans.spi.editor.completion.CompletionResultSet;
Lines 240-262 Link Here
240	}	242	}
241	return true;	243	return true;
242	}	244	}
243		245
244	//+++ fix for issues #166462, #173122	246	private boolean isRemovingAvailableLocked(TokenSequence ts, Document doc, int offset, String replaceToText) {
245	// (http://www.netbeans.org/issues/show_bug.cgi?id=166462)	247	ts.move(position);
246	// (http://www.netbeans.org/issues/show_bug.cgi?id=173122)	248	boolean isTextRemovingAllowable = true;
247	private boolean isTextRemovingAllowable(JTextComponent component,	249
248	BaseDocument doc, String replaceToText, int offset) throws BadLocationException {	250	while (ts.moveNext() && isTextRemovingAllowable) {
249	XMLSyntaxSupport support = (XMLSyntaxSupport)	251	Token<XMLTokenId> tokenItem = ts.token();
250	org.netbeans.editor.Utilities.getSyntaxSupport(component);	252	String tokenItemImage = tokenItem.text().toString();
251	TokenItem tokenItem = support.getTokenChain(offset, doc.getLength());
252	boolean isTextRemovingAllowable = (tokenItem == null);
253	if (! isTextRemovingAllowable) {
254	String tokenItemImage = tokenItem.getImage();
255	if ((tokenItemImage != null) && (tokenItemImage.length() > 0)) {	253	if ((tokenItemImage != null) && (tokenItemImage.length() > 0)) {
256	// See also issue #228865. In this case, the token also may include a prefix	254	// See also issue #228865. In this case, the token also may include a prefix
257	// of the replacement value	255	// of the replacement value
258	String replaceInclPrefix;	256	String replaceInclPrefix;
259	int offs = Math.max(0, offset - tokenItem.getOffset());	257	int offs = Math.max(0, offset - ts.offset());
260	replaceInclPrefix = tokenItemImage.substring(0, offs) + replaceToText;	258	replaceInclPrefix = tokenItemImage.substring(0, offs) + replaceToText;
261	int diffPos = getFirstDiffPosition(tokenItemImage, replaceInclPrefix);	259	int diffPos = getFirstDiffPosition(tokenItemImage, replaceInclPrefix);
262	diffPos = diffPos == 0 ? 1 : diffPos;	260	diffPos = diffPos == 0 ? 1 : diffPos;
Lines 268-277 Link Here
268	strText = replaceInclPrefix.length() >= diffPos ?	266	strText = replaceInclPrefix.length() >= diffPos ?
269	replaceInclPrefix.substring(0, diffPos) : replaceInclPrefix;	267	replaceInclPrefix.substring(0, diffPos) : replaceInclPrefix;
270		268
271	TokenID tokenID = tokenItem.getTokenID();	269	XMLTokenId id = tokenItem.id();
272	int id = (tokenID != null ? tokenID.getNumericID() : -1);	270	isTextRemovingAllowable = (id == XMLTokenId.TAG ?
273
274	isTextRemovingAllowable = (id == XMLDefaultTokenContext.TAG_ID ?
275	! strImg.startsWith(strText) /* <= for tags */ :	271	! strImg.startsWith(strText) /* <= for tags */ :
276	strImg.startsWith(strText) /* <= for attributes */);	272	strImg.startsWith(strText) /* <= for attributes */);
277	}	273	}
Lines 280-285 Link Here
280	return isTextRemovingAllowable;	276	return isTextRemovingAllowable;
281	}	277	}
282		278
		279	//+++ fix for issues #166462, #173122
		280	// (http://www.netbeans.org/issues/show_bug.cgi?id=166462)
		281	// (http://www.netbeans.org/issues/show_bug.cgi?id=173122)
		282	private boolean isTextRemovingAllowable(JTextComponent component,
		283	BaseDocument doc, String replaceToText, int offset) throws BadLocationException {
		284	XMLSyntaxSupport support = XMLSyntaxSupport.getSyntaxSupport(component.getDocument());
		285	return support.runWithSequence(offset, (TokenSequence ts) -> isRemovingAvailableLocked(ts, doc, offset, replaceToText));
		286	}
		287
283	/**	288	/**
284	* Calculates the index of the first difference between two strings.	289	* Calculates the index of the first difference between two strings.
285	* If they are differenent starting the first character, then 0 is returned.	290	* If they are differenent starting the first character, then 0 is returned.

Lines 52-58 Link Here

(-)a/xml.text/src/org/netbeans/modules/xml/text/navigator/NavigatorTreeCellRenderer.java (-6 / +6 lines)
52	import javax.swing.tree.DefaultTreeCellRenderer;	52	import javax.swing.tree.DefaultTreeCellRenderer;
53	import javax.swing.tree.TreeCellRenderer;	53	import javax.swing.tree.TreeCellRenderer;
54	import org.netbeans.modules.editor.structure.api.DocumentElement;	54	import org.netbeans.modules.editor.structure.api.DocumentElement;
55	import org.netbeans.modules.xml.text.structure.XMLDocumentModelProvider;	55	import static org.netbeans.modules.xml.text.structure.XMLConstants.*;
56	import org.openide.awt.HtmlRenderer;	56	import org.openide.awt.HtmlRenderer;
57	import org.openide.util.ImageUtilities;	57	import org.openide.util.ImageUtilities;
58	import org.openide.util.Utilities;	58	import org.openide.util.Utilities;
Lines 100-113 Link Here
100		100
101	boolean containsError = tna.getChildrenErrorCount() > 0;	101	boolean containsError = tna.getChildrenErrorCount() > 0;
102	//normal icons	102	//normal icons
103	if(de.getType().equals(XMLDocumentModelProvider.XML_TAG)	103	if(de.getType().equals(XML_TAG)
104	\|\| de.getType().equals(XMLDocumentModelProvider.XML_EMPTY_TAG)) {	104	\|\| de.getType().equals(XML_EMPTY_TAG)) {
105	setIcon(TAG_ICON, containsError);	105	setIcon(TAG_ICON, containsError);
106	} else if(de.getType().equals(XMLDocumentModelProvider.XML_PI)) {	106	} else if(de.getType().equals(XML_PI)) {
107	setIcon(PI_ICON, containsError);	107	setIcon(PI_ICON, containsError);
108	} else if(de.getType().equals(XMLDocumentModelProvider.XML_DOCTYPE)) {	108	} else if(de.getType().equals(XML_DOCTYPE)) {
109	setIcon(DOCTYPE_ICON, containsError);	109	setIcon(DOCTYPE_ICON, containsError);
110	} else if(de.getType().equals(XMLDocumentModelProvider.XML_CDATA)) {	110	} else if(de.getType().equals(XML_CDATA)) {
111	setIcon(CDATA_ICON, containsError);	111	setIcon(CDATA_ICON, containsError);
112	}	112	}
113		113