Skip to content

Commit ed6b5b9

Browse files
committed
Fix single line comments.
By "[;,{}|()][ \t]*//" regexp DEVSIX-3314
1 parent d8aa793 commit ed6b5b9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+893
-288
lines changed

barcodes/src/main/java/com/itextpdf/barcodes/BarcodeCodabar.java

Lines changed: 60 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -64,26 +64,66 @@ public class BarcodeCodabar extends Barcode1D {
6464
*/
6565
private static final byte[][] BARS =
6666
{
67-
{0, 0, 0, 0, 0, 1, 1}, // 0
68-
{0, 0, 0, 0, 1, 1, 0}, // 1
69-
{0, 0, 0, 1, 0, 0, 1}, // 2
70-
{1, 1, 0, 0, 0, 0, 0}, // 3
71-
{0, 0, 1, 0, 0, 1, 0}, // 4
72-
{1, 0, 0, 0, 0, 1, 0}, // 5
73-
{0, 1, 0, 0, 0, 0, 1}, // 6
74-
{0, 1, 0, 0, 1, 0, 0}, // 7
75-
{0, 1, 1, 0, 0, 0, 0}, // 8
76-
{1, 0, 0, 1, 0, 0, 0}, // 9
77-
{0, 0, 0, 1, 1, 0, 0}, // -
78-
{0, 0, 1, 1, 0, 0, 0}, // $
79-
{1, 0, 0, 0, 1, 0, 1}, // :
80-
{1, 0, 1, 0, 0, 0, 1}, // /
81-
{1, 0, 1, 0, 1, 0, 0}, // .
82-
{0, 0, 1, 0, 1, 0, 1}, // +
83-
{0, 0, 1, 1, 0, 1, 0}, // a
84-
{0, 1, 0, 1, 0, 0, 1}, // b
85-
{0, 0, 0, 1, 0, 1, 1}, // c
86-
{0, 0, 0, 1, 1, 1, 0} // d
67+
68+
// 0
69+
{0, 0, 0, 0, 0, 1, 1},
70+
71+
// 1
72+
{0, 0, 0, 0, 1, 1, 0},
73+
74+
// 2
75+
{0, 0, 0, 1, 0, 0, 1},
76+
77+
// 3
78+
{1, 1, 0, 0, 0, 0, 0},
79+
80+
// 4
81+
{0, 0, 1, 0, 0, 1, 0},
82+
83+
// 5
84+
{1, 0, 0, 0, 0, 1, 0},
85+
86+
// 6
87+
{0, 1, 0, 0, 0, 0, 1},
88+
89+
// 7
90+
{0, 1, 0, 0, 1, 0, 0},
91+
92+
// 8
93+
{0, 1, 1, 0, 0, 0, 0},
94+
95+
// 9
96+
{1, 0, 0, 1, 0, 0, 0},
97+
98+
// -
99+
{0, 0, 0, 1, 1, 0, 0},
100+
101+
// $
102+
{0, 0, 1, 1, 0, 0, 0},
103+
104+
// :
105+
{1, 0, 0, 0, 1, 0, 1},
106+
107+
// /
108+
{1, 0, 1, 0, 0, 0, 1},
109+
110+
// .
111+
{1, 0, 1, 0, 1, 0, 0},
112+
113+
// +
114+
{0, 0, 1, 0, 1, 0, 1},
115+
116+
// a
117+
{0, 0, 1, 1, 0, 1, 0},
118+
119+
// b
120+
{0, 1, 0, 1, 0, 0, 1},
121+
122+
// c
123+
{0, 0, 0, 1, 0, 1, 1},
124+
125+
// d
126+
{0, 0, 0, 1, 1, 1, 0}
87127
};
88128

89129
/**

barcodes/src/main/java/com/itextpdf/barcodes/BarcodeEAN.java

Lines changed: 131 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -100,16 +100,35 @@ public class BarcodeEAN extends Barcode1D {
100100
*/
101101
private static final byte[][] BARS =
102102
{
103-
{3, 2, 1, 1}, // 0
104-
{2, 2, 2, 1}, // 1
105-
{2, 1, 2, 2}, // 2
106-
{1, 4, 1, 1}, // 3
107-
{1, 1, 3, 2}, // 4
108-
{1, 2, 3, 1}, // 5
109-
{1, 1, 1, 4}, // 6
110-
{1, 3, 1, 2}, // 7
111-
{1, 2, 1, 3}, // 8
112-
{3, 1, 1, 2} // 9
103+
// 0
104+
{3, 2, 1, 1},
105+
106+
// 1
107+
{2, 2, 2, 1},
108+
109+
// 2
110+
{2, 1, 2, 2},
111+
112+
// 3
113+
{1, 4, 1, 1},
114+
115+
// 4
116+
{1, 1, 3, 2},
117+
118+
// 5
119+
{1, 2, 3, 1},
120+
121+
// 6
122+
{1, 1, 1, 4},
123+
124+
// 7
125+
{1, 3, 1, 2},
126+
127+
// 8
128+
{1, 2, 1, 3},
129+
130+
// 9
131+
{3, 1, 1, 2}
113132
};
114133

115134
/**
@@ -146,61 +165,129 @@ public class BarcodeEAN extends Barcode1D {
146165
*/
147166
private static final byte[][] PARITY13 =
148167
{
149-
{ODD, ODD, ODD, ODD, ODD, ODD}, // 0
150-
{ODD, ODD, EVEN, ODD, EVEN, EVEN}, // 1
151-
{ODD, ODD, EVEN, EVEN, ODD, EVEN}, // 2
152-
{ODD, ODD, EVEN, EVEN, EVEN, ODD}, // 3
153-
{ODD, EVEN, ODD, ODD, EVEN, EVEN}, // 4
154-
{ODD, EVEN, EVEN, ODD, ODD, EVEN}, // 5
155-
{ODD, EVEN, EVEN, EVEN, ODD, ODD}, // 6
156-
{ODD, EVEN, ODD, EVEN, ODD, EVEN}, // 7
157-
{ODD, EVEN, ODD, EVEN, EVEN, ODD}, // 8
158-
{ODD, EVEN, EVEN, ODD, EVEN, ODD} // 9
168+
169+
// 0
170+
{ODD, ODD, ODD, ODD, ODD, ODD},
171+
172+
// 1
173+
{ODD, ODD, EVEN, ODD, EVEN, EVEN},
174+
175+
// 2
176+
{ODD, ODD, EVEN, EVEN, ODD, EVEN},
177+
178+
// 3
179+
{ODD, ODD, EVEN, EVEN, EVEN, ODD},
180+
181+
// 4
182+
{ODD, EVEN, ODD, ODD, EVEN, EVEN},
183+
184+
// 5
185+
{ODD, EVEN, EVEN, ODD, ODD, EVEN},
186+
187+
// 6
188+
{ODD, EVEN, EVEN, EVEN, ODD, ODD},
189+
190+
// 7
191+
{ODD, EVEN, ODD, EVEN, ODD, EVEN},
192+
193+
// 8
194+
{ODD, EVEN, ODD, EVEN, EVEN, ODD},
195+
196+
// 9
197+
{ODD, EVEN, EVEN, ODD, EVEN, ODD}
159198
};
160199

161200
/**
162201
* Sequence of parities to be used with supplemental 2.
163202
*/
164203
private static final byte[][] PARITY2 =
165204
{
166-
{ODD, ODD}, // 0
167-
{ODD, EVEN}, // 1
168-
{EVEN, ODD}, // 2
169-
{EVEN, EVEN} // 3
205+
206+
// 0
207+
{ODD, ODD},
208+
209+
// 1
210+
{ODD, EVEN},
211+
212+
// 2
213+
{EVEN, ODD},
214+
215+
// 3
216+
{EVEN, EVEN}
170217
};
171218

172219
/**
173220
* Sequence of parities to be used with supplemental 2.
174221
*/
175222
private static final byte[][] PARITY5 =
176223
{
177-
{EVEN, EVEN, ODD, ODD, ODD}, // 0
178-
{EVEN, ODD, EVEN, ODD, ODD}, // 1
179-
{EVEN, ODD, ODD, EVEN, ODD}, // 2
180-
{EVEN, ODD, ODD, ODD, EVEN}, // 3
181-
{ODD, EVEN, EVEN, ODD, ODD}, // 4
182-
{ODD, ODD, EVEN, EVEN, ODD}, // 5
183-
{ODD, ODD, ODD, EVEN, EVEN}, // 6
184-
{ODD, EVEN, ODD, EVEN, ODD}, // 7
185-
{ODD, EVEN, ODD, ODD, EVEN}, // 8
186-
{ODD, ODD, EVEN, ODD, EVEN} // 9
224+
225+
// 0
226+
{EVEN, EVEN, ODD, ODD, ODD},
227+
228+
// 1
229+
{EVEN, ODD, EVEN, ODD, ODD},
230+
231+
// 2
232+
{EVEN, ODD, ODD, EVEN, ODD},
233+
234+
// 3
235+
{EVEN, ODD, ODD, ODD, EVEN},
236+
237+
// 4
238+
{ODD, EVEN, EVEN, ODD, ODD},
239+
240+
// 5
241+
{ODD, ODD, EVEN, EVEN, ODD},
242+
243+
// 6
244+
{ODD, ODD, ODD, EVEN, EVEN},
245+
246+
// 7
247+
{ODD, EVEN, ODD, EVEN, ODD},
248+
249+
// 8
250+
{ODD, EVEN, ODD, ODD, EVEN},
251+
252+
// 9
253+
{ODD, ODD, EVEN, ODD, EVEN}
187254
};
188255

189256
/**
190257
* Sequence of parities to be used with UPCE.
191258
*/
192259
private static final byte[][] PARITYE =
193260
{
194-
{EVEN, EVEN, EVEN, ODD, ODD, ODD}, // 0
195-
{EVEN, EVEN, ODD, EVEN, ODD, ODD}, // 1
196-
{EVEN, EVEN, ODD, ODD, EVEN, ODD}, // 2
197-
{EVEN, EVEN, ODD, ODD, ODD, EVEN}, // 3
198-
{EVEN, ODD, EVEN, EVEN, ODD, ODD}, // 4
199-
{EVEN, ODD, ODD, EVEN, EVEN, ODD}, // 5
200-
{EVEN, ODD, ODD, ODD, EVEN, EVEN}, // 6
201-
{EVEN, ODD, EVEN, ODD, EVEN, ODD}, // 7
202-
{EVEN, ODD, EVEN, ODD, ODD, EVEN}, // 8
203-
{EVEN, ODD, ODD, EVEN, ODD, EVEN} // 9
261+
262+
// 0
263+
{EVEN, EVEN, EVEN, ODD, ODD, ODD},
264+
265+
// 1
266+
{EVEN, EVEN, ODD, EVEN, ODD, ODD},
267+
268+
// 2
269+
{EVEN, EVEN, ODD, ODD, EVEN, ODD},
270+
271+
// 3
272+
{EVEN, EVEN, ODD, ODD, ODD, EVEN},
273+
274+
// 4
275+
{EVEN, ODD, EVEN, EVEN, ODD, ODD},
276+
277+
// 5
278+
{EVEN, ODD, ODD, EVEN, EVEN, ODD},
279+
280+
// 6
281+
{EVEN, ODD, ODD, ODD, EVEN, EVEN},
282+
283+
// 7
284+
{EVEN, ODD, EVEN, ODD, EVEN, ODD},
285+
286+
// 8
287+
{EVEN, ODD, EVEN, ODD, ODD, EVEN},
288+
289+
// 9
290+
{EVEN, ODD, ODD, EVEN, ODD, EVEN}
204291
};
205292

206293
/**

barcodes/src/main/java/com/itextpdf/barcodes/BarcodeMSI.java

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -75,16 +75,36 @@ public class BarcodeMSI extends Barcode1D {
7575
* The bars to generate the code.
7676
*/
7777
private static final byte[][] BARS = new byte[][]{
78-
{1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0}, // 0
79-
{1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0}, // 1
80-
{1, 0, 0, 1, 0, 0, 1, 1, 0, 1, 0, 0}, // 2
81-
{1, 0, 0, 1, 0, 0, 1, 1, 0, 1, 1, 0}, // 3
82-
{1, 0, 0, 1, 1, 0, 1, 0, 0, 1, 0, 0}, // 4
83-
{1, 0, 0, 1, 1, 0, 1, 0, 0, 1, 1, 0}, // 5
84-
{1, 0, 0, 1, 1, 0, 1, 1, 0, 1, 0, 0}, // 6
85-
{1, 0, 0, 1, 1, 0, 1, 1, 0, 1, 1, 0}, // 7
86-
{1, 1, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0}, // 8
87-
{1, 1, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0} // 9
78+
79+
// 0
80+
{1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0},
81+
82+
// 1
83+
{1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0},
84+
85+
// 2
86+
{1, 0, 0, 1, 0, 0, 1, 1, 0, 1, 0, 0},
87+
88+
// 3
89+
{1, 0, 0, 1, 0, 0, 1, 1, 0, 1, 1, 0},
90+
91+
// 4
92+
{1, 0, 0, 1, 1, 0, 1, 0, 0, 1, 0, 0},
93+
94+
// 5
95+
{1, 0, 0, 1, 1, 0, 1, 0, 0, 1, 1, 0},
96+
97+
// 6
98+
{1, 0, 0, 1, 1, 0, 1, 1, 0, 1, 0, 0},
99+
100+
// 7
101+
{1, 0, 0, 1, 1, 0, 1, 1, 0, 1, 1, 0},
102+
103+
// 8
104+
{1, 1, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0},
105+
106+
// 9
107+
{1, 1, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0}
88108
};
89109

90110
/**

barcodes/src/main/java/com/itextpdf/barcodes/qrcode/BitArray.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,13 @@ public boolean isRange(int start, int end, boolean value) {
127127
throw new IllegalArgumentException();
128128
}
129129
if (end == start) {
130-
return true; // empty range matches
130+
131+
// empty range matches
132+
return true;
131133
}
132-
end--; // will be easier to treat this as the last actually set bit -- inclusive
134+
135+
// will be easier to treat this as the last actually set bit -- inclusive
136+
end--;
133137
int firstInt = start >> 5;
134138
int lastInt = end >> 5;
135139
for (int i = firstInt; i <= lastInt; i++) {

0 commit comments

Comments
 (0)