diff --git a/editor.completionext/nbproject/genfiles.properties b/editor.completionext/nbproject/genfiles.properties index 7f6c8aec..f903103c 100644 --- a/editor.completionext/nbproject/genfiles.properties +++ b/editor.completionext/nbproject/genfiles.properties @@ -1,8 +1,8 @@ -build.xml.data.CRC32=085a3985 +build.xml.data.CRC32=faf3972a build.xml.script.CRC32=2f9c443f -build.xml.stylesheet.CRC32=a56c6a5b@2.71.1 +build.xml.stylesheet.CRC32=a56c6a5b@2.72.1 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=085a3985 +nbproject/build-impl.xml.data.CRC32=faf3972a nbproject/build-impl.xml.script.CRC32=a6455ae1 -nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.71.1 +nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.72.1 diff --git a/editor.completionext/nbproject/project.xml b/editor.completionext/nbproject/project.xml index 304182ad..0356336b 100644 --- a/editor.completionext/nbproject/project.xml +++ b/editor.completionext/nbproject/project.xml @@ -24,6 +24,14 @@ 1.68.1.5.21.39 + + org.netbeans.modules.editor.document + + + + 1.9.1.3 + + org.netbeans.modules.editor.lib diff --git a/editor.containingfolder/nbproject/project.xml b/editor.containingfolder/nbproject/project.xml index 5a9a7a50..df236bba 100644 --- a/editor.containingfolder/nbproject/project.xml +++ b/editor.containingfolder/nbproject/project.xml @@ -6,6 +6,14 @@ org.tvl.editor.containingfolder + + org.netbeans.api.templates + + + + 1.7.1 + + org.openide.actions @@ -30,6 +38,22 @@ 7.60 + + org.openide.filesystems.compat8 + + + + 9.9.1 + + + + org.openide.filesystems.nb + + + + 9.9.1 + + org.openide.loaders @@ -71,6 +95,15 @@ + + + unit + + org.netbeans.libs.junit4 + + + + diff --git a/nbproject/platform.properties b/nbproject/platform.properties index 3a3114cd..acfd5438 100644 --- a/nbproject/platform.properties +++ b/nbproject/platform.properties @@ -8,5 +8,5 @@ cluster.path=\ ${nbplatform.active.dir}/platform:\ ${nbplatform.active.dir}/profiler:\ ${nbplatform.active.dir}/websvccommon -nbjdk.active=JDK_1.7__x64_ -nbplatform.active=nb81 +nbjdk.active=JDK_1.8__x64_ +nbplatform.active=nb82 diff --git a/org-antlr-netbeans/nbproject/project.xml b/org-antlr-netbeans/nbproject/project.xml index 8015fd8e..68b8a101 100644 --- a/org-antlr-netbeans/nbproject/project.xml +++ b/org-antlr-netbeans/nbproject/project.xml @@ -24,6 +24,14 @@ 1.11 + + org.netbeans.api.templates + + + + 1.7.1 + + org.netbeans.modules.editor @@ -33,6 +41,14 @@ 1.60.0.5.19.25 + + org.netbeans.modules.editor.document + + + + 1.9.1.3 + + org.netbeans.modules.editor.fold @@ -181,6 +197,22 @@ 7.47.1 + + org.openide.filesystems.compat8 + + + + 9.9.1 + + + + org.openide.filesystems.nb + + + + 9.9.1 + + org.openide.loaders diff --git a/org-antlr-works-editor/nbproject/project.xml b/org-antlr-works-editor/nbproject/project.xml index 9f8d35d6..d3292c49 100644 --- a/org-antlr-works-editor/nbproject/project.xml +++ b/org-antlr-works-editor/nbproject/project.xml @@ -114,6 +114,22 @@ 1.26 + + org.netbeans.api.progress.compat8 + + + + 1.47.1 + + + + org.netbeans.api.progress.nb + + + + 1.47.1 + + org.netbeans.api.templates @@ -140,6 +156,14 @@ 1.57.1.5.13.10 + + org.netbeans.modules.editor.document + + + + 1.9.1.3 + + org.netbeans.modules.editor.errorstripe @@ -307,6 +331,14 @@ 7.47.1 + + org.openide.filesystems.compat8 + + + + 9.9.1 + + org.openide.filesystems.nb diff --git a/tvl-editor-actions/nbproject/project.xml b/tvl-editor-actions/nbproject/project.xml index 364ed3af..120e5157 100644 --- a/tvl-editor-actions/nbproject/project.xml +++ b/tvl-editor-actions/nbproject/project.xml @@ -6,6 +6,14 @@ org.tvl.netbeans.editor.actions + + org.netbeans.modules.editor.document + + + + 1.9.1.3 + + org.netbeans.modules.editor.indent @@ -41,7 +49,24 @@ 8.26 + + org.openide.util.ui + + + + 9.6.1 + + + + + unit + + org.netbeans.libs.junit4 + + + + diff --git a/tvl-editor-actions/src/org/tvl/netbeans/editor/actions/InsertLineBelowAction.java b/tvl-editor-actions/src/org/tvl/netbeans/editor/actions/InsertLineBelowAction.java index c2859ce5..d80e128d 100644 --- a/tvl-editor-actions/src/org/tvl/netbeans/editor/actions/InsertLineBelowAction.java +++ b/tvl-editor-actions/src/org/tvl/netbeans/editor/actions/InsertLineBelowAction.java @@ -16,9 +16,10 @@ import javax.swing.text.JTextComponent; import javax.swing.text.Position; import org.netbeans.api.editor.EditorActionRegistration; +import org.netbeans.api.editor.document.LineDocument; +import org.netbeans.api.editor.document.LineDocumentUtils; import org.netbeans.editor.BaseAction; import org.netbeans.editor.BaseDocument; -import org.netbeans.editor.Utilities; import org.netbeans.modules.editor.indent.api.Indent; import org.openide.util.NbBundle; @@ -59,7 +60,7 @@ public void run() { Caret caret = target.getCaret(); // insert new line, caret moves to the new line - int eolDot = Utilities.getRowEnd(target, caret.getDot()); + int eolDot = LineDocumentUtils.getLineEnd(LineDocumentUtils.asRequired(doc, LineDocument.class), caret.getDot()); doc.insertString(eolDot, "\n", null); //NOI18N // reindent the new line diff --git a/tvl.editor.whitespace/nbproject/project.xml b/tvl.editor.whitespace/nbproject/project.xml index 08438104..11e4a0d8 100644 --- a/tvl.editor.whitespace/nbproject/project.xml +++ b/tvl.editor.whitespace/nbproject/project.xml @@ -15,6 +15,14 @@ 1.13 + + org.netbeans.modules.editor.document + + + + 1.9.1.3 + + org.netbeans.modules.editor.lib2 @@ -58,6 +66,14 @@ 8.12 + + org.openide.util.ui + + + + 9.6.1 + + diff --git a/works.editor.antlr3/nbproject/project.xml b/works.editor.antlr3/nbproject/project.xml index c7d8f027..708c5eeb 100644 --- a/works.editor.antlr3/nbproject/project.xml +++ b/works.editor.antlr3/nbproject/project.xml @@ -42,6 +42,14 @@ 1.13 + + org.netbeans.modules.editor.document + + + + 1.9.1.3 + + org.netbeans.modules.editor.lib2 @@ -76,6 +84,14 @@ 8.22 + + org.openide.util.ui + + + + 9.6.1 + + diff --git a/works.editor.antlr4/nbproject/project.xml b/works.editor.antlr4/nbproject/project.xml index fe28d447..2978b799 100644 --- a/works.editor.antlr4/nbproject/project.xml +++ b/works.editor.antlr4/nbproject/project.xml @@ -42,6 +42,22 @@ 1.13 + + org.netbeans.api.templates + + + + 1.7.1 + + + + org.netbeans.modules.editor.document + + + + 1.9.1.3 + + org.netbeans.modules.editor.indent @@ -112,6 +128,22 @@ 7.56 + + org.openide.filesystems.compat8 + + + + 9.9.1 + + + + org.openide.filesystems.nb + + + + 9.9.1 + + org.openide.loaders