Skip to content

Commit 32ffa58

Browse files
sharwellsharwell
authored
Merge pull request #63 from sharwell/nb82
Update to NetBeans 8.2
2 parents 7e8c4c7 + c0381e0 commit 32ffa58

File tree

11 files changed

+203
-8
lines changed

11 files changed

+203
-8
lines changed

‎editor.completionext/nbproject/genfiles.properties

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
build.xml.data.CRC32=085a3985
1+
build.xml.data.CRC32=faf3972a
22
build.xml.script.CRC32=2f9c443f
3-
build.xml.stylesheet.CRC32=a56c6a5b@2.71.1
3+
build.xml.stylesheet.CRC32=a56c6a5b@2.72.1
44
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
55
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
6-
nbproject/build-impl.xml.data.CRC32=085a3985
6+
nbproject/build-impl.xml.data.CRC32=faf3972a
77
nbproject/build-impl.xml.script.CRC32=a6455ae1
8-
nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.71.1
8+
nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.72.1

‎editor.completionext/nbproject/project.xml

+8
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,14 @@
2424
<specification-version>1.68.1.5.21.39</specification-version>
2525
</run-dependency>
2626
</dependency>
27+
<dependency>
28+
<code-name-base>org.netbeans.modules.editor.document</code-name-base>
29+
<build-prerequisite/>
30+
<compile-dependency/>
31+
<run-dependency>
32+
<specification-version>1.9.1.3</specification-version>
33+
</run-dependency>
34+
</dependency>
2735
<dependency>
2836
<code-name-base>org.netbeans.modules.editor.lib</code-name-base>
2937
<build-prerequisite/>

‎editor.containingfolder/nbproject/project.xml

+33
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,14 @@
66
<code-name-base>org.tvl.editor.containingfolder</code-name-base>
77
<suite-component/>
88
<module-dependencies>
9+
<dependency>
10+
<code-name-base>org.netbeans.api.templates</code-name-base>
11+
<build-prerequisite/>
12+
<compile-dependency/>
13+
<run-dependency>
14+
<specification-version>1.7.1</specification-version>
15+
</run-dependency>
16+
</dependency>
917
<dependency>
1018
<code-name-base>org.openide.actions</code-name-base>
1119
<build-prerequisite/>
@@ -30,6 +38,22 @@
3038
<specification-version>7.60</specification-version>
3139
</run-dependency>
3240
</dependency>
41+
<dependency>
42+
<code-name-base>org.openide.filesystems.compat8</code-name-base>
43+
<build-prerequisite/>
44+
<compile-dependency/>
45+
<run-dependency>
46+
<specification-version>9.9.1</specification-version>
47+
</run-dependency>
48+
</dependency>
49+
<dependency>
50+
<code-name-base>org.openide.filesystems.nb</code-name-base>
51+
<build-prerequisite/>
52+
<compile-dependency/>
53+
<run-dependency>
54+
<specification-version>9.9.1</specification-version>
55+
</run-dependency>
56+
</dependency>
3357
<dependency>
3458
<code-name-base>org.openide.loaders</code-name-base>
3559
<build-prerequisite/>
@@ -71,6 +95,15 @@
7195
</run-dependency>
7296
</dependency>
7397
</module-dependencies>
98+
<test-dependencies>
99+
<test-type>
100+
<name>unit</name>
101+
<test-dependency>
102+
<code-name-base>org.netbeans.libs.junit4</code-name-base>
103+
<compile-dependency/>
104+
</test-dependency>
105+
</test-type>
106+
</test-dependencies>
74107
<public-packages/>
75108
</data>
76109
</configuration>

‎nbproject/platform.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ cluster.path=\
88
${nbplatform.active.dir}/platform:\
99
${nbplatform.active.dir}/profiler:\
1010
${nbplatform.active.dir}/websvccommon
11-
nbjdk.active=JDK_1.7__x64_
12-
nbplatform.active=nb81
11+
nbjdk.active=JDK_1.8__x64_
12+
nbplatform.active=nb82

‎org-antlr-netbeans/nbproject/project.xml

+32
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,14 @@
2424
<specification-version>1.11</specification-version>
2525
</run-dependency>
2626
</dependency>
27+
<dependency>
28+
<code-name-base>org.netbeans.api.templates</code-name-base>
29+
<build-prerequisite/>
30+
<compile-dependency/>
31+
<run-dependency>
32+
<specification-version>1.7.1</specification-version>
33+
</run-dependency>
34+
</dependency>
2735
<dependency>
2836
<code-name-base>org.netbeans.modules.editor</code-name-base>
2937
<build-prerequisite/>
@@ -33,6 +41,14 @@
3341
<specification-version>1.60.0.5.19.25</specification-version>
3442
</run-dependency>
3543
</dependency>
44+
<dependency>
45+
<code-name-base>org.netbeans.modules.editor.document</code-name-base>
46+
<build-prerequisite/>
47+
<compile-dependency/>
48+
<run-dependency>
49+
<specification-version>1.9.1.3</specification-version>
50+
</run-dependency>
51+
</dependency>
3652
<dependency>
3753
<code-name-base>org.netbeans.modules.editor.fold</code-name-base>
3854
<build-prerequisite/>
@@ -181,6 +197,22 @@
181197
<specification-version>7.47.1</specification-version>
182198
</run-dependency>
183199
</dependency>
200+
<dependency>
201+
<code-name-base>org.openide.filesystems.compat8</code-name-base>
202+
<build-prerequisite/>
203+
<compile-dependency/>
204+
<run-dependency>
205+
<specification-version>9.9.1</specification-version>
206+
</run-dependency>
207+
</dependency>
208+
<dependency>
209+
<code-name-base>org.openide.filesystems.nb</code-name-base>
210+
<build-prerequisite/>
211+
<compile-dependency/>
212+
<run-dependency>
213+
<specification-version>9.9.1</specification-version>
214+
</run-dependency>
215+
</dependency>
184216
<dependency>
185217
<code-name-base>org.openide.loaders</code-name-base>
186218
<build-prerequisite/>

‎org-antlr-works-editor/nbproject/project.xml

+32
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,22 @@
114114
<specification-version>1.26</specification-version>
115115
</run-dependency>
116116
</dependency>
117+
<dependency>
118+
<code-name-base>org.netbeans.api.progress.compat8</code-name-base>
119+
<build-prerequisite/>
120+
<compile-dependency/>
121+
<run-dependency>
122+
<specification-version>1.47.1</specification-version>
123+
</run-dependency>
124+
</dependency>
125+
<dependency>
126+
<code-name-base>org.netbeans.api.progress.nb</code-name-base>
127+
<build-prerequisite/>
128+
<compile-dependency/>
129+
<run-dependency>
130+
<specification-version>1.47.1</specification-version>
131+
</run-dependency>
132+
</dependency>
117133
<dependency>
118134
<code-name-base>org.netbeans.api.templates</code-name-base>
119135
<build-prerequisite/>
@@ -140,6 +156,14 @@
140156
<specification-version>1.57.1.5.13.10</specification-version>
141157
</run-dependency>
142158
</dependency>
159+
<dependency>
160+
<code-name-base>org.netbeans.modules.editor.document</code-name-base>
161+
<build-prerequisite/>
162+
<compile-dependency/>
163+
<run-dependency>
164+
<specification-version>1.9.1.3</specification-version>
165+
</run-dependency>
166+
</dependency>
143167
<dependency>
144168
<code-name-base>org.netbeans.modules.editor.errorstripe</code-name-base>
145169
<build-prerequisite/>
@@ -307,6 +331,14 @@
307331
<specification-version>7.47.1</specification-version>
308332
</run-dependency>
309333
</dependency>
334+
<dependency>
335+
<code-name-base>org.openide.filesystems.compat8</code-name-base>
336+
<build-prerequisite/>
337+
<compile-dependency/>
338+
<run-dependency>
339+
<specification-version>9.9.1</specification-version>
340+
</run-dependency>
341+
</dependency>
310342
<dependency>
311343
<code-name-base>org.openide.filesystems.nb</code-name-base>
312344
<build-prerequisite/>

‎tvl-editor-actions/nbproject/project.xml

+25
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,14 @@
66
<code-name-base>org.tvl.netbeans.editor.actions</code-name-base>
77
<suite-component/>
88
<module-dependencies>
9+
<dependency>
10+
<code-name-base>org.netbeans.modules.editor.document</code-name-base>
11+
<build-prerequisite/>
12+
<compile-dependency/>
13+
<run-dependency>
14+
<specification-version>1.9.1.3</specification-version>
15+
</run-dependency>
16+
</dependency>
917
<dependency>
1018
<code-name-base>org.netbeans.modules.editor.indent</code-name-base>
1119
<build-prerequisite/>
@@ -41,7 +49,24 @@
4149
<specification-version>8.26</specification-version>
4250
</run-dependency>
4351
</dependency>
52+
<dependency>
53+
<code-name-base>org.openide.util.ui</code-name-base>
54+
<build-prerequisite/>
55+
<compile-dependency/>
56+
<run-dependency>
57+
<specification-version>9.6.1</specification-version>
58+
</run-dependency>
59+
</dependency>
4460
</module-dependencies>
61+
<test-dependencies>
62+
<test-type>
63+
<name>unit</name>
64+
<test-dependency>
65+
<code-name-base>org.netbeans.libs.junit4</code-name-base>
66+
<compile-dependency/>
67+
</test-dependency>
68+
</test-type>
69+
</test-dependencies>
4570
<public-packages/>
4671
</data>
4772
</configuration>

‎tvl-editor-actions/src/org/tvl/netbeans/editor/actions/InsertLineBelowAction.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@
1616
import javax.swing.text.JTextComponent;
1717
import javax.swing.text.Position;
1818
import org.netbeans.api.editor.EditorActionRegistration;
19+
import org.netbeans.api.editor.document.LineDocument;
20+
import org.netbeans.api.editor.document.LineDocumentUtils;
1921
import org.netbeans.editor.BaseAction;
2022
import org.netbeans.editor.BaseDocument;
21-
import org.netbeans.editor.Utilities;
2223
import org.netbeans.modules.editor.indent.api.Indent;
2324
import org.openide.util.NbBundle;
2425

@@ -59,7 +60,7 @@ public void run() {
5960
Caret caret = target.getCaret();
6061

6162
// insert new line, caret moves to the new line
62-
int eolDot = Utilities.getRowEnd(target, caret.getDot());
63+
int eolDot = LineDocumentUtils.getLineEnd(LineDocumentUtils.asRequired(doc, LineDocument.class), caret.getDot());
6364
doc.insertString(eolDot, "\n", null); //NOI18N
6465

6566
// reindent the new line

‎tvl.editor.whitespace/nbproject/project.xml

+16
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,14 @@
1515
<specification-version>1.13</specification-version>
1616
</run-dependency>
1717
</dependency>
18+
<dependency>
19+
<code-name-base>org.netbeans.modules.editor.document</code-name-base>
20+
<build-prerequisite/>
21+
<compile-dependency/>
22+
<run-dependency>
23+
<specification-version>1.9.1.3</specification-version>
24+
</run-dependency>
25+
</dependency>
1826
<dependency>
1927
<code-name-base>org.netbeans.modules.editor.lib2</code-name-base>
2028
<build-prerequisite/>
@@ -58,6 +66,14 @@
5866
<specification-version>8.12</specification-version>
5967
</run-dependency>
6068
</dependency>
69+
<dependency>
70+
<code-name-base>org.openide.util.ui</code-name-base>
71+
<build-prerequisite/>
72+
<compile-dependency/>
73+
<run-dependency>
74+
<specification-version>9.6.1</specification-version>
75+
</run-dependency>
76+
</dependency>
6177
</module-dependencies>
6278
<public-packages/>
6379
</data>

‎works.editor.antlr3/nbproject/project.xml

+16
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,14 @@
4242
<specification-version>1.13</specification-version>
4343
</run-dependency>
4444
</dependency>
45+
<dependency>
46+
<code-name-base>org.netbeans.modules.editor.document</code-name-base>
47+
<build-prerequisite/>
48+
<compile-dependency/>
49+
<run-dependency>
50+
<specification-version>1.9.1.3</specification-version>
51+
</run-dependency>
52+
</dependency>
4553
<dependency>
4654
<code-name-base>org.netbeans.modules.editor.lib2</code-name-base>
4755
<build-prerequisite/>
@@ -76,6 +84,14 @@
7684
<specification-version>8.22</specification-version>
7785
</run-dependency>
7886
</dependency>
87+
<dependency>
88+
<code-name-base>org.openide.util.ui</code-name-base>
89+
<build-prerequisite/>
90+
<compile-dependency/>
91+
<run-dependency>
92+
<specification-version>9.6.1</specification-version>
93+
</run-dependency>
94+
</dependency>
7995
</module-dependencies>
8096
<test-dependencies>
8197
<test-type>

‎works.editor.antlr4/nbproject/project.xml

+32
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,22 @@
4242
<specification-version>1.13</specification-version>
4343
</run-dependency>
4444
</dependency>
45+
<dependency>
46+
<code-name-base>org.netbeans.api.templates</code-name-base>
47+
<build-prerequisite/>
48+
<compile-dependency/>
49+
<run-dependency>
50+
<specification-version>1.7.1</specification-version>
51+
</run-dependency>
52+
</dependency>
53+
<dependency>
54+
<code-name-base>org.netbeans.modules.editor.document</code-name-base>
55+
<build-prerequisite/>
56+
<compile-dependency/>
57+
<run-dependency>
58+
<specification-version>1.9.1.3</specification-version>
59+
</run-dependency>
60+
</dependency>
4561
<dependency>
4662
<code-name-base>org.netbeans.modules.editor.indent</code-name-base>
4763
<build-prerequisite/>
@@ -112,6 +128,22 @@
112128
<specification-version>7.56</specification-version>
113129
</run-dependency>
114130
</dependency>
131+
<dependency>
132+
<code-name-base>org.openide.filesystems.compat8</code-name-base>
133+
<build-prerequisite/>
134+
<compile-dependency/>
135+
<run-dependency>
136+
<specification-version>9.9.1</specification-version>
137+
</run-dependency>
138+
</dependency>
139+
<dependency>
140+
<code-name-base>org.openide.filesystems.nb</code-name-base>
141+
<build-prerequisite/>
142+
<compile-dependency/>
143+
<run-dependency>
144+
<specification-version>9.9.1</specification-version>
145+
</run-dependency>
146+
</dependency>
115147
<dependency>
116148
<code-name-base>org.openide.loaders</code-name-base>
117149
<build-prerequisite/>

0 commit comments

Comments
 (0)