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.
After recent discussions with Vita and others I would like to make a convention to have xxxTokenId class in the API only (e.g. JavaTokenId or HTMLTokenId) and have the particular language accessible by xxxTokenId.language() static method. The xxxLanguage classes will be removed. Also I would like to move the HTML stuff out of the java/lexer into a new html/lexer module.
Marking this for fasttrack review. If there are no objections I would like to commit this sooner than after a week.
Less classes in API is always better.
Fixed in trunk: Checking in html/editor/src/org/netbeans/modules/editor/html/HTMLKit.java; /cvs/html/editor/src/org/netbeans/modules/editor/html/HTMLKit.java,v <-- HTMLKit.java new revision: 1.16; previous revision: 1.15 done Removing html/lexer/src/org/netbeans/api/html/lexer/HTMLLanguage.java; /cvs/html/lexer/src/org/netbeans/api/html/lexer/HTMLLanguage.java,v <-- HTMLLanguage.java new revision: delete; previous revision: 1.2 done Checking in html/lexer/src/org/netbeans/api/html/lexer/HTMLTokenId.java; /cvs/html/lexer/src/org/netbeans/api/html/lexer/HTMLTokenId.java,v <-- HTMLTokenId.java new revision: 1.2; previous revision: 1.1 done Removing java/lexer/src/org/netbeans/api/java/lexer/HTMLLanguage.java; /cvs/java/lexer/src/org/netbeans/api/java/lexer/HTMLLanguage.java,v <-- HTMLLanguage.java new revision: delete; previous revision: 1.2 done Removing java/lexer/src/org/netbeans/api/java/lexer/HTMLTokenId.java; /cvs/java/lexer/src/org/netbeans/api/java/lexer/HTMLTokenId.java,v <-- HTMLTokenId.java new revision: delete; previous revision: 1.2 done Removing java/lexer/src/org/netbeans/api/java/lexer/JavaLanguage.java; /cvs/java/lexer/src/org/netbeans/api/java/lexer/JavaLanguage.java,v <-- JavaLanguage.java new revision: delete; previous revision: 1.3 done Removing java/lexer/src/org/netbeans/api/java/lexer/JavaStringLanguage.java; /cvs/java/lexer/src/org/netbeans/api/java/lexer/JavaStringLanguage.java,v <-- JavaStringLanguage.java new revision: delete; previous revision: 1.2 done Checking in java/lexer/src/org/netbeans/api/java/lexer/JavaStringTokenId.java; /cvs/java/lexer/src/org/netbeans/api/java/lexer/JavaStringTokenId.java,v <-- JavaStringTokenId.java new revision: 1.3; previous revision: 1.2 done Checking in java/lexer/src/org/netbeans/api/java/lexer/JavaTokenId.java; /cvs/java/lexer/src/org/netbeans/api/java/lexer/JavaTokenId.java,v <-- JavaTokenId.java new revision: 1.3; previous revision: 1.2 done Removing java/lexer/src/org/netbeans/api/java/lexer/JavadocLanguage.java; /cvs/java/lexer/src/org/netbeans/api/java/lexer/JavadocLanguage.java,v <-- JavadocLanguage.java new revision: delete; previous revision: 1.3 done Checking in java/lexer/src/org/netbeans/api/java/lexer/JavadocTokenId.java; /cvs/java/lexer/src/org/netbeans/api/java/lexer/JavadocTokenId.java,v <-- JavadocTokenId.java new revision: 1.3; previous revision: 1.2 done Removing java/lexer/src/org/netbeans/lib/java/lexer/HTMLLexer.java; /cvs/java/lexer/src/org/netbeans/lib/java/lexer/HTMLLexer.java,v <-- HTMLLexer.java new revision: delete; previous revision: 1.2 done Removing web/jspsyntax/lexer/src/org/netbeans/api/jsp/lexer/JspLanguage.java; /cvs/web/jspsyntax/lexer/src/org/netbeans/api/jsp/lexer/JspLanguage.java,v <-- JspLanguage.java new revision: delete; previous revision: 1.1 done Checking in web/jspsyntax/lexer/src/org/netbeans/api/jsp/lexer/JspTokenId.java; /cvs/web/jspsyntax/lexer/src/org/netbeans/api/jsp/lexer/JspTokenId.java,v <-- JspTokenId.java new revision: 1.2; previous revision: 1.1 done Checking in web/jspsyntax/src/org/netbeans/modules/web/core/syntax/JSPKit.java; /cvs/web/jspsyntax/src/org/netbeans/modules/web/core/syntax/JSPKit.java,v <-- JSPKit.java new revision: 1.31; previous revision: 1.30 done
xml/lexer is not in compliance with this convention.
Fixed xml/lexer as well.