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

(-)a/html.editor/nbproject/project.xml (+8 lines)
Lines 233-238 Link Here
233
                    </run-dependency>
233
                    </run-dependency>
234
                </dependency>
234
                </dependency>
235
                <dependency>
235
                <dependency>
236
                    <code-name-base>org.openide.dialogs</code-name-base>
237
                    <build-prerequisite/>
238
                    <compile-dependency/>
239
                    <run-dependency>
240
                        <specification-version>7.14</specification-version>
241
                    </run-dependency>
242
                </dependency>
243
                <dependency>
236
                    <code-name-base>org.openide.filesystems</code-name-base>
244
                    <code-name-base>org.openide.filesystems</code-name-base>
237
                    <build-prerequisite/>
245
                    <build-prerequisite/>
238
                    <compile-dependency/>
246
                    <compile-dependency/>
(-)a/html.editor/src/org/netbeans/modules/html/editor/api/Utils.java (-2 / +2 lines)
Lines 134-140 Link Here
134
    }
134
    }
135
135
136
      /** This method returns an image, which is displayed for the FileObject in the explorer.
136
      /** This method returns an image, which is displayed for the FileObject in the explorer.
137
     * @param doc This is the documet, in which the icon will be used (for exmaple for completion).
137
     * @param doc This is the document, in which the icon will be used (for example for completion).
138
     * @param fo file object for which the icon is looking for
138
     * @param fo file object for which the icon is looking for
139
     * @return an Image which is dislayed in the explorer for the file.
139
     * @return an Image which is dislayed in the explorer for the file.
140
     */
140
     */
Lines 147-153 Link Here
147
        return null;
147
        return null;
148
    }
148
    }
149
149
150
    /** returns top most joined html token seuence for the document at the specified offset. */
150
    /** returns top most joined html token sequence for the document at the specified offset. */
151
    public static TokenSequence<HTMLTokenId> getJoinedHtmlSequence(Document doc, int offset) {
151
    public static TokenSequence<HTMLTokenId> getJoinedHtmlSequence(Document doc, int offset) {
152
        TokenHierarchy th = TokenHierarchy.get(doc);
152
        TokenHierarchy th = TokenHierarchy.get(doc);
153
        TokenSequence ts = th.tokenSequence();
153
        TokenSequence ts = th.tokenSequence();
(-)a/html.editor/src/org/netbeans/modules/html/editor/resources/layer.xml (+10 lines)
Lines 215-220 Link Here
215
215
216
            <folder name="html">
216
            <folder name="html">
217
217
218
                <folder name="CodeGenerators">
219
                    <file name="org-netbeans-modules-html-editor-codegen-LoremIpsumGenerator$Factory.instance">
220
                        <attr name="position" intvalue="100"/>
221
                    </file>
222
                </folder>
223
218
                <file name="org-netbeans-modules-html-editor-HtmlCaretAwareSourceTask$Factory.instance">
224
                <file name="org-netbeans-modules-html-editor-HtmlCaretAwareSourceTask$Factory.instance">
219
                    <attr name="instanceOf" stringvalue="org.netbeans.modules.parsing.spi.TaskFactory"/>
225
                    <attr name="instanceOf" stringvalue="org.netbeans.modules.parsing.spi.TaskFactory"/>
220
                </file>
226
                </file>
Lines 309-314 Link Here
309
                    <file name="format">
315
                    <file name="format">
310
                        <attr name="position" intvalue="1400"/>
316
                        <attr name="position" intvalue="1400"/>
311
                    </file>
317
                    </file>
318
319
                    <file name="generate-code">
320
                        <attr name="position" intvalue="1480"/>
321
                    </file>
312
                    <file name="SeparatorAfterFormat.instance">
322
                    <file name="SeparatorAfterFormat.instance">
313
                        <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
323
                        <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
314
                        <attr name="position" intvalue="1666"/>
324
                        <attr name="position" intvalue="1666"/>
(-)a/html.editor/test/unit/src/org/netbeans/modules/html/editor/test/Utils.java (-2 / +2 lines)
Lines 53-59 Link Here
53
public class Utils {
53
public class Utils {
54
54
55
    public static String readFileContentToString(File file) throws IOException {
55
    public static String readFileContentToString(File file) throws IOException {
56
        StringBuffer buff = new StringBuffer();
56
        StringBuilder buff = new StringBuilder();
57
57
58
        BufferedReader rdr = new BufferedReader(new FileReader(file));
58
        BufferedReader rdr = new BufferedReader(new FileReader(file));
59
59
Lines 61-67 Link Here
61
61
62
        try{
62
        try{
63
            while ((line = rdr.readLine()) != null){
63
            while ((line = rdr.readLine()) != null){
64
                buff.append(line + "\n");
64
                buff.append(line).append("\n");
65
            }
65
            }
66
        } finally{
66
        } finally{
67
            rdr.close();
67
            rdr.close();

Return to bug 179565