diffed 0.0.11 → 0.0.12
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/lib/diffed/version.rb +1 -1
- data/lib/formatters/diff_html.rb +4 -2
- data/lib/models/line.rb +12 -9
- data/spec/diffed_spec.rb +2 -2
- data/testdata/diff1.styled.html +24 -24
- data/testdata/diff2.classed.html +1 -1
- data/testdata/diff2.styled.html +10 -10
- data/testdata/git-show.styled.html +82 -82
- data/testdata/p4-describe.styled.html +82 -82
- metadata +10 -10
@@ -1,5 +1,5 @@
|
|
1
|
-
<table cellpadding="5" style="border-collapse: collapse; border: 1px solid #CCC; font-family: Consolas, courier, monospace; font-size: 11px; color: #888">
|
2
|
-
<tr style="background-color: #F0F0FF"
|
1
|
+
<table cellpadding="5" style="border-collapse: collapse; border: 1px solid #CCC; font-family: Consolas, courier, monospace; font-size: 11px; color: #888; line-height: 80%">
|
2
|
+
<tr style="background-color: #F0F0FF">
|
3
3
|
<td style="border-left: 1px solid #CCC">...</td>
|
4
4
|
<td style="border-left: 1px solid #CCC">...</td>
|
5
5
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #888"><pre>@@ -23,7 +23,6 @@</pre></td>
|
@@ -19,7 +19,7 @@
|
|
19
19
|
<td style="border-left: 1px solid #CCC">25</td>
|
20
20
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre> import java.io.IOException;</pre></td>
|
21
21
|
</tr>
|
22
|
-
<tr style="background-color: #FDD"
|
22
|
+
<tr style="background-color: #FDD">
|
23
23
|
<td style="border-left: 1px solid #CCC">26</td>
|
24
24
|
<td style="border-left: 1px solid #CCC">.</td>
|
25
25
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>-import java.io.InputStream;</pre></td>
|
@@ -39,7 +39,7 @@
|
|
39
39
|
<td style="border-left: 1px solid #CCC">28</td>
|
40
40
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre> import java.lang.reflect.Method;</pre></td>
|
41
41
|
</tr>
|
42
|
-
<tr style="background-color: #F0F0FF"
|
42
|
+
<tr style="background-color: #F0F0FF">
|
43
43
|
<td style="border-left: 1px solid #CCC">...</td>
|
44
44
|
<td style="border-left: 1px solid #CCC">...</td>
|
45
45
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #888"><pre>@@ -75,7 +74,7 @@</pre></td>
|
@@ -59,12 +59,12 @@
|
|
59
59
|
<td style="border-left: 1px solid #CCC">76</td>
|
60
60
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre> */</pre></td>
|
61
61
|
</tr>
|
62
|
-
<tr style="background-color: #FDD"
|
62
|
+
<tr style="background-color: #FDD">
|
63
63
|
<td style="border-left: 1px solid #CCC">78</td>
|
64
64
|
<td style="border-left: 1px solid #CCC">.</td>
|
65
65
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>- private static final Object JS_LOCK = new Object();</pre></td>
|
66
66
|
</tr>
|
67
|
-
<tr style="background-color: #DFD"
|
67
|
+
<tr style="background-color: #DFD">
|
68
68
|
<td style="border-left: 1px solid #CCC">.</td>
|
69
69
|
<td style="border-left: 1px solid #CCC">77</td>
|
70
70
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>+ private final Object jsLock = new Object();</pre></td>
|
@@ -84,7 +84,7 @@
|
|
84
84
|
<td style="border-left: 1px solid #CCC">80</td>
|
85
85
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre> * A pre-compiled JavaScript function.</pre></td>
|
86
86
|
</tr>
|
87
|
-
<tr style="background-color: #F0F0FF"
|
87
|
+
<tr style="background-color: #F0F0FF">
|
88
88
|
<td style="border-left: 1px solid #CCC">...</td>
|
89
89
|
<td style="border-left: 1px solid #CCC">...</td>
|
90
90
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #888"><pre>@@ -85,12 +84,12 @@</pre></td>
|
@@ -104,12 +104,12 @@
|
|
104
104
|
<td style="border-left: 1px solid #CCC">86</td>
|
105
105
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre> */</pre></td>
|
106
106
|
</tr>
|
107
|
-
<tr style="background-color: #FDD"
|
107
|
+
<tr style="background-color: #FDD">
|
108
108
|
<td style="border-left: 1px solid #CCC">88</td>
|
109
109
|
<td style="border-left: 1px solid #CCC">.</td>
|
110
110
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>- private static final String HBS_FILE = "/handlebars-1.0.rc.3.js";</pre></td>
|
111
111
|
</tr>
|
112
|
-
<tr style="background-color: #DFD"
|
112
|
+
<tr style="background-color: #DFD">
|
113
113
|
<td style="border-left: 1px solid #CCC">.</td>
|
114
114
|
<td style="border-left: 1px solid #CCC">87</td>
|
115
115
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>+ private static final String HBS_FILE = "/handlebars-1.0.0.js";</pre></td>
|
@@ -134,12 +134,12 @@
|
|
134
134
|
<td style="border-left: 1px solid #CCC">91</td>
|
135
135
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre> */</pre></td>
|
136
136
|
</tr>
|
137
|
-
<tr style="background-color: #FDD"
|
137
|
+
<tr style="background-color: #FDD">
|
138
138
|
<td style="border-left: 1px solid #CCC">93</td>
|
139
139
|
<td style="border-left: 1px solid #CCC">.</td>
|
140
140
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>- private static ScriptableObject sharedScope;</pre></td>
|
141
141
|
</tr>
|
142
|
-
<tr style="background-color: #DFD"
|
142
|
+
<tr style="background-color: #DFD">
|
143
143
|
<td style="border-left: 1px solid #CCC">.</td>
|
144
144
|
<td style="border-left: 1px solid #CCC">92</td>
|
145
145
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>+ private ScriptableObject sharedScope;</pre></td>
|
@@ -159,7 +159,7 @@
|
|
159
159
|
<td style="border-left: 1px solid #CCC">95</td>
|
160
160
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre> * {@inheritDoc}</pre></td>
|
161
161
|
</tr>
|
162
|
-
<tr style="background-color: #F0F0FF"
|
162
|
+
<tr style="background-color: #F0F0FF">
|
163
163
|
<td style="border-left: 1px solid #CCC">...</td>
|
164
164
|
<td style="border-left: 1px solid #CCC">...</td>
|
165
165
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #888"><pre>@@ -287,7 +286,7 @@</pre></td>
|
@@ -179,12 +179,12 @@
|
|
179
179
|
<td style="border-left: 1px solid #CCC">288</td>
|
180
180
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre> public String toJavaScript() throws IOException {</pre></td>
|
181
181
|
</tr>
|
182
|
-
<tr style="background-color: #FDD"
|
182
|
+
<tr style="background-color: #FDD">
|
183
183
|
<td style="border-left: 1px solid #CCC">290</td>
|
184
184
|
<td style="border-left: 1px solid #CCC">.</td>
|
185
185
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>- synchronized (JS_LOCK) {</pre></td>
|
186
186
|
</tr>
|
187
|
-
<tr style="background-color: #DFD"
|
187
|
+
<tr style="background-color: #DFD">
|
188
188
|
<td style="border-left: 1px solid #CCC">.</td>
|
189
189
|
<td style="border-left: 1px solid #CCC">289</td>
|
190
190
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>+ synchronized (jsLock) {</pre></td>
|
@@ -204,7 +204,7 @@
|
|
204
204
|
<td style="border-left: 1px solid #CCC">292</td>
|
205
205
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre> try {</pre></td>
|
206
206
|
</tr>
|
207
|
-
<tr style="background-color: #F0F0FF"
|
207
|
+
<tr style="background-color: #F0F0FF">
|
208
208
|
<td style="border-left: 1px solid #CCC">...</td>
|
209
209
|
<td style="border-left: 1px solid #CCC">...</td>
|
210
210
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #888"><pre>@@ -330,7 +329,7 @@</pre></td>
|
@@ -224,12 +224,12 @@
|
|
224
224
|
<td style="border-left: 1px solid #CCC">331</td>
|
225
225
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre> */</pre></td>
|
226
226
|
</tr>
|
227
|
-
<tr style="background-color: #FDD"
|
227
|
+
<tr style="background-color: #FDD">
|
228
228
|
<td style="border-left: 1px solid #CCC">333</td>
|
229
229
|
<td style="border-left: 1px solid #CCC">.</td>
|
230
230
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>- private static Scriptable newScope(final org.mozilla.javascript.Context ctx) {</pre></td>
|
231
231
|
</tr>
|
232
|
-
<tr style="background-color: #DFD"
|
232
|
+
<tr style="background-color: #DFD">
|
233
233
|
<td style="border-left: 1px solid #CCC">.</td>
|
234
234
|
<td style="border-left: 1px solid #CCC">332</td>
|
235
235
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>+ private Scriptable newScope(final org.mozilla.javascript.Context ctx) {</pre></td>
|
@@ -249,7 +249,7 @@
|
|
249
249
|
<td style="border-left: 1px solid #CCC">335</td>
|
250
250
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre> scope.setParentScope(null);</pre></td>
|
251
251
|
</tr>
|
252
|
-
<tr style="background-color: #F0F0FF"
|
252
|
+
<tr style="background-color: #F0F0FF">
|
253
253
|
<td style="border-left: 1px solid #CCC">...</td>
|
254
254
|
<td style="border-left: 1px solid #CCC">...</td>
|
255
255
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #888"><pre>@@ -345,12 +344,10 @@</pre></td>
|
@@ -269,17 +269,17 @@
|
|
269
269
|
<td style="border-left: 1px solid #CCC">346</td>
|
270
270
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre> */</pre></td>
|
271
271
|
</tr>
|
272
|
-
<tr style="background-color: #FDD"
|
272
|
+
<tr style="background-color: #FDD">
|
273
273
|
<td style="border-left: 1px solid #CCC">348</td>
|
274
274
|
<td style="border-left: 1px solid #CCC">.</td>
|
275
275
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>- private static Scriptable</pre></td>
|
276
276
|
</tr>
|
277
|
-
<tr style="background-color: #FDD"
|
277
|
+
<tr style="background-color: #FDD">
|
278
278
|
<td style="border-left: 1px solid #CCC">349</td>
|
279
279
|
<td style="border-left: 1px solid #CCC">.</td>
|
280
280
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>- sharedScope(final org.mozilla.javascript.Context ctx) {</pre></td>
|
281
281
|
</tr>
|
282
|
-
<tr style="background-color: #DFD"
|
282
|
+
<tr style="background-color: #DFD">
|
283
283
|
<td style="border-left: 1px solid #CCC">.</td>
|
284
284
|
<td style="border-left: 1px solid #CCC">347</td>
|
285
285
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>+ private Scriptable sharedScope(final org.mozilla.javascript.Context ctx) {</pre></td>
|
@@ -294,17 +294,17 @@
|
|
294
294
|
<td style="border-left: 1px solid #CCC">349</td>
|
295
295
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre> sharedScope = ctx.initStandardObjects();</pre></td>
|
296
296
|
</tr>
|
297
|
-
<tr style="background-color: #FDD"
|
297
|
+
<tr style="background-color: #FDD">
|
298
298
|
<td style="border-left: 1px solid #CCC">352</td>
|
299
299
|
<td style="border-left: 1px solid #CCC">.</td>
|
300
300
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>- ctx.evaluateString(sharedScope, handlebarsScript(HBS_FILE), HBS_FILE, 1,</pre></td>
|
301
301
|
</tr>
|
302
|
-
<tr style="background-color: #FDD"
|
302
|
+
<tr style="background-color: #FDD">
|
303
303
|
<td style="border-left: 1px solid #CCC">353</td>
|
304
304
|
<td style="border-left: 1px solid #CCC">.</td>
|
305
305
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>- null);</pre></td>
|
306
306
|
</tr>
|
307
|
-
<tr style="background-color: #DFD"
|
307
|
+
<tr style="background-color: #DFD">
|
308
308
|
<td style="border-left: 1px solid #CCC">.</td>
|
309
309
|
<td style="border-left: 1px solid #CCC">350</td>
|
310
310
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>+ ctx.evaluateString(sharedScope, handlebarsScript(HBS_FILE), HBS_FILE, 1, null);</pre></td>
|
@@ -324,7 +324,7 @@
|
|
324
324
|
<td style="border-left: 1px solid #CCC">353</td>
|
325
325
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre> }</pre></td>
|
326
326
|
</tr>
|
327
|
-
<tr style="background-color: #F0F0FF"
|
327
|
+
<tr style="background-color: #F0F0FF">
|
328
328
|
<td style="border-left: 1px solid #CCC">...</td>
|
329
329
|
<td style="border-left: 1px solid #CCC">...</td>
|
330
330
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #888"><pre>@@ -361,25 +358,11 @@</pre></td>
|
@@ -344,22 +344,22 @@
|
|
344
344
|
<td style="border-left: 1px solid #CCC">360</td>
|
345
345
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre> */</pre></td>
|
346
346
|
</tr>
|
347
|
-
<tr style="background-color: #FDD"
|
347
|
+
<tr style="background-color: #FDD">
|
348
348
|
<td style="border-left: 1px solid #CCC">364</td>
|
349
349
|
<td style="border-left: 1px solid #CCC">.</td>
|
350
350
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>- private static String handlebarsScript(final String location) {</pre></td>
|
351
351
|
</tr>
|
352
|
-
<tr style="background-color: #FDD"
|
352
|
+
<tr style="background-color: #FDD">
|
353
353
|
<td style="border-left: 1px solid #CCC">365</td>
|
354
354
|
<td style="border-left: 1px solid #CCC">.</td>
|
355
355
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>- InputStream in = BaseTemplate.class.getResourceAsStream(location);</pre></td>
|
356
356
|
</tr>
|
357
|
-
<tr style="background-color: #FDD"
|
357
|
+
<tr style="background-color: #FDD">
|
358
358
|
<td style="border-left: 1px solid #CCC">366</td>
|
359
359
|
<td style="border-left: 1px solid #CCC">.</td>
|
360
360
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>- notNull(in, "Handlebars.js script not found at " + location);</pre></td>
|
361
361
|
</tr>
|
362
|
-
<tr style="background-color: #DFD"
|
362
|
+
<tr style="background-color: #DFD">
|
363
363
|
<td style="border-left: 1px solid #CCC">.</td>
|
364
364
|
<td style="border-left: 1px solid #CCC">361</td>
|
365
365
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>+ private String handlebarsScript(final String location) {</pre></td>
|
@@ -369,42 +369,42 @@
|
|
369
369
|
<td style="border-left: 1px solid #CCC">362</td>
|
370
370
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre> try {</pre></td>
|
371
371
|
</tr>
|
372
|
-
<tr style="background-color: #FDD"
|
372
|
+
<tr style="background-color: #FDD">
|
373
373
|
<td style="border-left: 1px solid #CCC">368</td>
|
374
374
|
<td style="border-left: 1px solid #CCC">.</td>
|
375
375
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>- int ch = in.read();</pre></td>
|
376
376
|
</tr>
|
377
|
-
<tr style="background-color: #FDD"
|
377
|
+
<tr style="background-color: #FDD">
|
378
378
|
<td style="border-left: 1px solid #CCC">369</td>
|
379
379
|
<td style="border-left: 1px solid #CCC">.</td>
|
380
380
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>- StringBuilder script = new StringBuilder();</pre></td>
|
381
381
|
</tr>
|
382
|
-
<tr style="background-color: #FDD"
|
382
|
+
<tr style="background-color: #FDD">
|
383
383
|
<td style="border-left: 1px solid #CCC">370</td>
|
384
384
|
<td style="border-left: 1px solid #CCC">.</td>
|
385
385
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>- while (ch != -1) {</pre></td>
|
386
386
|
</tr>
|
387
|
-
<tr style="background-color: #FDD"
|
387
|
+
<tr style="background-color: #FDD">
|
388
388
|
<td style="border-left: 1px solid #CCC">371</td>
|
389
389
|
<td style="border-left: 1px solid #CCC">.</td>
|
390
390
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>- script.append((char) ch);</pre></td>
|
391
391
|
</tr>
|
392
|
-
<tr style="background-color: #FDD"
|
392
|
+
<tr style="background-color: #FDD">
|
393
393
|
<td style="border-left: 1px solid #CCC">372</td>
|
394
394
|
<td style="border-left: 1px solid #CCC">.</td>
|
395
395
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>- ch = in.read();</pre></td>
|
396
396
|
</tr>
|
397
|
-
<tr style="background-color: #FDD"
|
397
|
+
<tr style="background-color: #FDD">
|
398
398
|
<td style="border-left: 1px solid #CCC">373</td>
|
399
399
|
<td style="border-left: 1px solid #CCC">.</td>
|
400
400
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>- }</pre></td>
|
401
401
|
</tr>
|
402
|
-
<tr style="background-color: #FDD"
|
402
|
+
<tr style="background-color: #FDD">
|
403
403
|
<td style="border-left: 1px solid #CCC">374</td>
|
404
404
|
<td style="border-left: 1px solid #CCC">.</td>
|
405
405
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>- return script.toString();</pre></td>
|
406
406
|
</tr>
|
407
|
-
<tr style="background-color: #DFD"
|
407
|
+
<tr style="background-color: #DFD">
|
408
408
|
<td style="border-left: 1px solid #CCC">.</td>
|
409
409
|
<td style="border-left: 1px solid #CCC">363</td>
|
410
410
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>+ return Files.read(location);</pre></td>
|
@@ -414,42 +414,42 @@
|
|
414
414
|
<td style="border-left: 1px solid #CCC">364</td>
|
415
415
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre> } catch (IOException ex) {</pre></td>
|
416
416
|
</tr>
|
417
|
-
<tr style="background-color: #FDD"
|
417
|
+
<tr style="background-color: #FDD">
|
418
418
|
<td style="border-left: 1px solid #CCC">376</td>
|
419
419
|
<td style="border-left: 1px solid #CCC">.</td>
|
420
420
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>- throw new IllegalStateException("Unable to read file " + location);</pre></td>
|
421
421
|
</tr>
|
422
|
-
<tr style="background-color: #FDD"
|
422
|
+
<tr style="background-color: #FDD">
|
423
423
|
<td style="border-left: 1px solid #CCC">377</td>
|
424
424
|
<td style="border-left: 1px solid #CCC">.</td>
|
425
425
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>- } finally {</pre></td>
|
426
426
|
</tr>
|
427
|
-
<tr style="background-color: #FDD"
|
427
|
+
<tr style="background-color: #FDD">
|
428
428
|
<td style="border-left: 1px solid #CCC">378</td>
|
429
429
|
<td style="border-left: 1px solid #CCC">.</td>
|
430
430
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>- try {</pre></td>
|
431
431
|
</tr>
|
432
|
-
<tr style="background-color: #FDD"
|
432
|
+
<tr style="background-color: #FDD">
|
433
433
|
<td style="border-left: 1px solid #CCC">379</td>
|
434
434
|
<td style="border-left: 1px solid #CCC">.</td>
|
435
435
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>- in.close();</pre></td>
|
436
436
|
</tr>
|
437
|
-
<tr style="background-color: #FDD"
|
437
|
+
<tr style="background-color: #FDD">
|
438
438
|
<td style="border-left: 1px solid #CCC">380</td>
|
439
439
|
<td style="border-left: 1px solid #CCC">.</td>
|
440
440
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>- } catch (IOException ex) {</pre></td>
|
441
441
|
</tr>
|
442
|
-
<tr style="background-color: #FDD"
|
442
|
+
<tr style="background-color: #FDD">
|
443
443
|
<td style="border-left: 1px solid #CCC">381</td>
|
444
444
|
<td style="border-left: 1px solid #CCC">.</td>
|
445
445
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>- throw new IllegalStateException("Unable to close file " + location);</pre></td>
|
446
446
|
</tr>
|
447
|
-
<tr style="background-color: #FDD"
|
447
|
+
<tr style="background-color: #FDD">
|
448
448
|
<td style="border-left: 1px solid #CCC">382</td>
|
449
449
|
<td style="border-left: 1px solid #CCC">.</td>
|
450
450
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>- }</pre></td>
|
451
451
|
</tr>
|
452
|
-
<tr style="background-color: #DFD"
|
452
|
+
<tr style="background-color: #DFD">
|
453
453
|
<td style="border-left: 1px solid #CCC">.</td>
|
454
454
|
<td style="border-left: 1px solid #CCC">365</td>
|
455
455
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>+ throw new IllegalArgumentException("Unable to read file: " + location, ex);</pre></td>
|
@@ -469,7 +469,7 @@
|
|
469
469
|
<td style="border-left: 1px solid #CCC">368</td>
|
470
470
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre> }</pre></td>
|
471
471
|
</tr>
|
472
|
-
<tr style="background-color: #F0F0FF"
|
472
|
+
<tr style="background-color: #F0F0FF">
|
473
473
|
<td style="border-left: 1px solid #CCC">...</td>
|
474
474
|
<td style="border-left: 1px solid #CCC">...</td>
|
475
475
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #888"><pre>@@ -2,32 +2,32 @@</pre></td>
|
@@ -489,12 +489,12 @@
|
|
489
489
|
<td style="border-left: 1px solid #CCC">4</td>
|
490
490
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre> </pre></td>
|
491
491
|
</tr>
|
492
|
-
<tr style="background-color: #DFD"
|
492
|
+
<tr style="background-color: #DFD">
|
493
493
|
<td style="border-left: 1px solid #CCC">.</td>
|
494
494
|
<td style="border-left: 1px solid #CCC">5</td>
|
495
495
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>+import java.io.IOException;</pre></td>
|
496
496
|
</tr>
|
497
|
-
<tr style="background-color: #DFD"
|
497
|
+
<tr style="background-color: #DFD">
|
498
498
|
<td style="border-left: 1px solid #CCC">.</td>
|
499
499
|
<td style="border-left: 1px solid #CCC">6</td>
|
500
500
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>+</pre></td>
|
@@ -509,12 +509,12 @@
|
|
509
509
|
<td style="border-left: 1px solid #CCC">8</td>
|
510
510
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre> </pre></td>
|
511
511
|
</tr>
|
512
|
-
<tr style="background-color: #FDD"
|
512
|
+
<tr style="background-color: #FDD">
|
513
513
|
<td style="border-left: 1px solid #CCC">7</td>
|
514
514
|
<td style="border-left: 1px solid #CCC">.</td>
|
515
515
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>-import java.io.IOException;</pre></td>
|
516
516
|
</tr>
|
517
|
-
<tr style="background-color: #FDD"
|
517
|
+
<tr style="background-color: #FDD">
|
518
518
|
<td style="border-left: 1px solid #CCC">8</td>
|
519
519
|
<td style="border-left: 1px solid #CCC">.</td>
|
520
520
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>-</pre></td>
|
@@ -529,22 +529,22 @@
|
|
529
529
|
<td style="border-left: 1px solid #CCC">10</td>
|
530
530
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre> </pre></td>
|
531
531
|
</tr>
|
532
|
-
<tr style="background-color: #FDD"
|
532
|
+
<tr style="background-color: #FDD">
|
533
533
|
<td style="border-left: 1px solid #CCC">11</td>
|
534
534
|
<td style="border-left: 1px solid #CCC">.</td>
|
535
535
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>- public static class UnsafeString {</pre></td>
|
536
536
|
</tr>
|
537
|
-
<tr style="background-color: #FDD"
|
537
|
+
<tr style="background-color: #FDD">
|
538
538
|
<td style="border-left: 1px solid #CCC">12</td>
|
539
539
|
<td style="border-left: 1px solid #CCC">.</td>
|
540
540
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>- String underlying;</pre></td>
|
541
541
|
</tr>
|
542
|
-
<tr style="background-color: #DFD"
|
542
|
+
<tr style="background-color: #DFD">
|
543
543
|
<td style="border-left: 1px solid #CCC">.</td>
|
544
544
|
<td style="border-left: 1px solid #CCC">11</td>
|
545
545
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>+ public static class UnsafeString {</pre></td>
|
546
546
|
</tr>
|
547
|
-
<tr style="background-color: #DFD"
|
547
|
+
<tr style="background-color: #DFD">
|
548
548
|
<td style="border-left: 1px solid #CCC">.</td>
|
549
549
|
<td style="border-left: 1px solid #CCC">12</td>
|
550
550
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>+ String underlying;</pre></td>
|
@@ -554,32 +554,32 @@
|
|
554
554
|
<td style="border-left: 1px solid #CCC">13</td>
|
555
555
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre> </pre></td>
|
556
556
|
</tr>
|
557
|
-
<tr style="background-color: #FDD"
|
557
|
+
<tr style="background-color: #FDD">
|
558
558
|
<td style="border-left: 1px solid #CCC">14</td>
|
559
559
|
<td style="border-left: 1px solid #CCC">.</td>
|
560
560
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>- public UnsafeString(String underlying) {</pre></td>
|
561
561
|
</tr>
|
562
|
-
<tr style="background-color: #FDD"
|
562
|
+
<tr style="background-color: #FDD">
|
563
563
|
<td style="border-left: 1px solid #CCC">15</td>
|
564
564
|
<td style="border-left: 1px solid #CCC">.</td>
|
565
565
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>- this.underlying = underlying;</pre></td>
|
566
566
|
</tr>
|
567
|
-
<tr style="background-color: #FDD"
|
567
|
+
<tr style="background-color: #FDD">
|
568
568
|
<td style="border-left: 1px solid #CCC">16</td>
|
569
569
|
<td style="border-left: 1px solid #CCC">.</td>
|
570
570
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>- }</pre></td>
|
571
571
|
</tr>
|
572
|
-
<tr style="background-color: #DFD"
|
572
|
+
<tr style="background-color: #DFD">
|
573
573
|
<td style="border-left: 1px solid #CCC">.</td>
|
574
574
|
<td style="border-left: 1px solid #CCC">14</td>
|
575
575
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>+ public UnsafeString(final String underlying) {</pre></td>
|
576
576
|
</tr>
|
577
|
-
<tr style="background-color: #DFD"
|
577
|
+
<tr style="background-color: #DFD">
|
578
578
|
<td style="border-left: 1px solid #CCC">.</td>
|
579
579
|
<td style="border-left: 1px solid #CCC">15</td>
|
580
580
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>+ this.underlying = underlying;</pre></td>
|
581
581
|
</tr>
|
582
|
-
<tr style="background-color: #DFD"
|
582
|
+
<tr style="background-color: #DFD">
|
583
583
|
<td style="border-left: 1px solid #CCC">.</td>
|
584
584
|
<td style="border-left: 1px solid #CCC">16</td>
|
585
585
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>+ }</pre></td>
|
@@ -589,37 +589,37 @@
|
|
589
589
|
<td style="border-left: 1px solid #CCC">17</td>
|
590
590
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre> </pre></td>
|
591
591
|
</tr>
|
592
|
-
<tr style="background-color: #FDD"
|
592
|
+
<tr style="background-color: #FDD">
|
593
593
|
<td style="border-left: 1px solid #CCC">18</td>
|
594
594
|
<td style="border-left: 1px solid #CCC">.</td>
|
595
595
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>- @Override</pre></td>
|
596
596
|
</tr>
|
597
|
-
<tr style="background-color: #FDD"
|
597
|
+
<tr style="background-color: #FDD">
|
598
598
|
<td style="border-left: 1px solid #CCC">19</td>
|
599
599
|
<td style="border-left: 1px solid #CCC">.</td>
|
600
600
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>- public String toString() {</pre></td>
|
601
601
|
</tr>
|
602
|
-
<tr style="background-color: #FDD"
|
602
|
+
<tr style="background-color: #FDD">
|
603
603
|
<td style="border-left: 1px solid #CCC">20</td>
|
604
604
|
<td style="border-left: 1px solid #CCC">.</td>
|
605
605
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>- return "<h1>" + underlying + "</h1>";</pre></td>
|
606
606
|
</tr>
|
607
|
-
<tr style="background-color: #FDD"
|
607
|
+
<tr style="background-color: #FDD">
|
608
608
|
<td style="border-left: 1px solid #CCC">21</td>
|
609
609
|
<td style="border-left: 1px solid #CCC">.</td>
|
610
610
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>- }</pre></td>
|
611
611
|
</tr>
|
612
|
-
<tr style="background-color: #DFD"
|
612
|
+
<tr style="background-color: #DFD">
|
613
613
|
<td style="border-left: 1px solid #CCC">.</td>
|
614
614
|
<td style="border-left: 1px solid #CCC">18</td>
|
615
615
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>+ @Override</pre></td>
|
616
616
|
</tr>
|
617
|
-
<tr style="background-color: #DFD"
|
617
|
+
<tr style="background-color: #DFD">
|
618
618
|
<td style="border-left: 1px solid #CCC">.</td>
|
619
619
|
<td style="border-left: 1px solid #CCC">19</td>
|
620
620
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>+ public String toString() {</pre></td>
|
621
621
|
</tr>
|
622
|
-
<tr style="background-color: #DFD"
|
622
|
+
<tr style="background-color: #DFD">
|
623
623
|
<td style="border-left: 1px solid #CCC">.</td>
|
624
624
|
<td style="border-left: 1px solid #CCC">20</td>
|
625
625
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>+ return "<h1>" + underlying + "</h1>";</pre></td>
|
@@ -629,7 +629,7 @@
|
|
629
629
|
<td style="border-left: 1px solid #CCC">21</td>
|
630
630
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre> }</pre></td>
|
631
631
|
</tr>
|
632
|
-
<tr style="background-color: #DFD"
|
632
|
+
<tr style="background-color: #DFD">
|
633
633
|
<td style="border-left: 1px solid #CCC">.</td>
|
634
634
|
<td style="border-left: 1px solid #CCC">22</td>
|
635
635
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>+ }</pre></td>
|
@@ -639,42 +639,42 @@
|
|
639
639
|
<td style="border-left: 1px solid #CCC">23</td>
|
640
640
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre> </pre></td>
|
641
641
|
</tr>
|
642
|
-
<tr style="background-color: #FDD"
|
642
|
+
<tr style="background-color: #FDD">
|
643
643
|
<td style="border-left: 1px solid #CCC">24</td>
|
644
644
|
<td style="border-left: 1px solid #CCC">.</td>
|
645
645
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>- @Test</pre></td>
|
646
646
|
</tr>
|
647
|
-
<tr style="background-color: #FDD"
|
647
|
+
<tr style="background-color: #FDD">
|
648
648
|
<td style="border-left: 1px solid #CCC">25</td>
|
649
649
|
<td style="border-left: 1px solid #CCC">.</td>
|
650
650
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>- public void unsafeString() throws IOException {</pre></td>
|
651
651
|
</tr>
|
652
|
-
<tr style="background-color: #FDD"
|
652
|
+
<tr style="background-color: #FDD">
|
653
653
|
<td style="border-left: 1px solid #CCC">26</td>
|
654
654
|
<td style="border-left: 1px solid #CCC">.</td>
|
655
655
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>- Handlebars handlebars = new Handlebars();</pre></td>
|
656
656
|
</tr>
|
657
|
-
<tr style="background-color: #FDD"
|
657
|
+
<tr style="background-color: #FDD">
|
658
658
|
<td style="border-left: 1px solid #CCC">27</td>
|
659
659
|
<td style="border-left: 1px solid #CCC">.</td>
|
660
660
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>- Template template = handlebars.compileInline("{{this}}");</pre></td>
|
661
661
|
</tr>
|
662
|
-
<tr style="background-color: #DFD"
|
662
|
+
<tr style="background-color: #DFD">
|
663
663
|
<td style="border-left: 1px solid #CCC">.</td>
|
664
664
|
<td style="border-left: 1px solid #CCC">24</td>
|
665
665
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>+ @Test</pre></td>
|
666
666
|
</tr>
|
667
|
-
<tr style="background-color: #DFD"
|
667
|
+
<tr style="background-color: #DFD">
|
668
668
|
<td style="border-left: 1px solid #CCC">.</td>
|
669
669
|
<td style="border-left: 1px solid #CCC">25</td>
|
670
670
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>+ public void unsafeString() throws IOException {</pre></td>
|
671
671
|
</tr>
|
672
|
-
<tr style="background-color: #DFD"
|
672
|
+
<tr style="background-color: #DFD">
|
673
673
|
<td style="border-left: 1px solid #CCC">.</td>
|
674
674
|
<td style="border-left: 1px solid #CCC">26</td>
|
675
675
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>+ Handlebars handlebars = new Handlebars();</pre></td>
|
676
676
|
</tr>
|
677
|
-
<tr style="background-color: #DFD"
|
677
|
+
<tr style="background-color: #DFD">
|
678
678
|
<td style="border-left: 1px solid #CCC">.</td>
|
679
679
|
<td style="border-left: 1px solid #CCC">27</td>
|
680
680
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>+ Template template = handlebars.compileInline("{{this}}");</pre></td>
|
@@ -684,12 +684,12 @@
|
|
684
684
|
<td style="border-left: 1px solid #CCC">28</td>
|
685
685
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre> </pre></td>
|
686
686
|
</tr>
|
687
|
-
<tr style="background-color: #FDD"
|
687
|
+
<tr style="background-color: #FDD">
|
688
688
|
<td style="border-left: 1px solid #CCC">29</td>
|
689
689
|
<td style="border-left: 1px solid #CCC">.</td>
|
690
690
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>- String result = template.apply(new UnsafeString("Hello"));</pre></td>
|
691
691
|
</tr>
|
692
|
-
<tr style="background-color: #DFD"
|
692
|
+
<tr style="background-color: #DFD">
|
693
693
|
<td style="border-left: 1px solid #CCC">.</td>
|
694
694
|
<td style="border-left: 1px solid #CCC">29</td>
|
695
695
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>+ String result = template.apply(new UnsafeString("Hello"));</pre></td>
|
@@ -699,22 +699,22 @@
|
|
699
699
|
<td style="border-left: 1px solid #CCC">30</td>
|
700
700
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre> </pre></td>
|
701
701
|
</tr>
|
702
|
-
<tr style="background-color: #FDD"
|
702
|
+
<tr style="background-color: #FDD">
|
703
703
|
<td style="border-left: 1px solid #CCC">31</td>
|
704
704
|
<td style="border-left: 1px solid #CCC">.</td>
|
705
705
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>- assertEquals("&lt;h1&gt;Hello&lt;/h1&gt;", result);</pre></td>
|
706
706
|
</tr>
|
707
|
-
<tr style="background-color: #FDD"
|
707
|
+
<tr style="background-color: #FDD">
|
708
708
|
<td style="border-left: 1px solid #CCC">32</td>
|
709
709
|
<td style="border-left: 1px solid #CCC">.</td>
|
710
710
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>- }</pre></td>
|
711
711
|
</tr>
|
712
|
-
<tr style="background-color: #DFD"
|
712
|
+
<tr style="background-color: #DFD">
|
713
713
|
<td style="border-left: 1px solid #CCC">.</td>
|
714
714
|
<td style="border-left: 1px solid #CCC">31</td>
|
715
715
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>+ assertEquals("&lt;h1&gt;Hello&lt;/h1&gt;", result);</pre></td>
|
716
716
|
</tr>
|
717
|
-
<tr style="background-color: #DFD"
|
717
|
+
<tr style="background-color: #DFD">
|
718
718
|
<td style="border-left: 1px solid #CCC">.</td>
|
719
719
|
<td style="border-left: 1px solid #CCC">32</td>
|
720
720
|
<td style="border-left: 1px solid #CCC; border-right: 1px solid #CCC; color: #000"><pre>+ }</pre></td>
|