Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitc949421

Browse files
cleanup: reorder modifiers to comply with JLS; remove redundant casts
1 parentad6c43f commitc949421

File tree

1 file changed

+34
-34
lines changed

1 file changed

+34
-34
lines changed

‎src/main/java/org/codehaus/stax2/ri/typed/ValueDecoderFactory.java‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -178,14 +178,14 @@ public DoubleArrayDecoder getDoubleArrayDecoder()
178178
publicabstractstaticclassDecoderBase
179179
extendsTypedValueDecoder
180180
{
181-
finalstaticlongL_BILLION =1000000000;
181+
staticfinallongL_BILLION =1000000000;
182182

183-
finalstaticlongL_MAX_INT = (long)Integer.MAX_VALUE;
183+
staticfinallongL_MAX_INT =Integer.MAX_VALUE;
184184

185-
finalstaticlongL_MIN_INT = (long)Integer.MIN_VALUE;
185+
staticfinallongL_MIN_INT =Integer.MIN_VALUE;
186186

187-
finalstaticBigIntegerBD_MIN_LONG =BigInteger.valueOf(Long.MIN_VALUE);
188-
finalstaticBigIntegerBD_MAX_LONG =BigInteger.valueOf(Long.MAX_VALUE);
187+
staticfinalBigIntegerBD_MIN_LONG =BigInteger.valueOf(Long.MIN_VALUE);
188+
staticfinalBigIntegerBD_MAX_LONG =BigInteger.valueOf(Long.MAX_VALUE);
189189

190190
/**
191191
* Pointer to the next character to check, within lexical value
@@ -319,7 +319,7 @@ protected int skipSignAndZeroes(char[] lexical, char ch, boolean hasSign, final
319319
*
320320
* @return Parsed integer value
321321
*/
322-
protectedfinalstaticintparseInt(char[]digitChars,intstart,intend)
322+
protectedstaticfinalintparseInt(char[]digitChars,intstart,intend)
323323
{
324324
/* This looks ugly, but appears to be the fastest way
325325
* (based on perf testing, profiling)
@@ -352,7 +352,7 @@ protected final static int parseInt(char[] digitChars, int start, int end)
352352
returnnum;
353353
}
354354

355-
protectedfinalstaticintparseInt(intnum,char[]digitChars,intstart,intend)
355+
protectedstaticfinalintparseInt(intnum,char[]digitChars,intstart,intend)
356356
{
357357
num = (num *10) + (digitChars[start] -'0');
358358
if (++start <end) {
@@ -379,7 +379,7 @@ protected final static int parseInt(int num, char[] digitChars, int start, int e
379379
returnnum;
380380
}
381381

382-
protectedfinalstaticintparseInt(StringdigitChars,intstart,intend)
382+
protectedstaticfinalintparseInt(StringdigitChars,intstart,intend)
383383
{
384384
intnum =digitChars.charAt(start) -'0';
385385
if (++start <end) {
@@ -409,7 +409,7 @@ protected final static int parseInt(String digitChars, int start, int end)
409409
returnnum;
410410
}
411411

412-
protectedfinalstaticintparseInt(intnum,StringdigitChars,intstart,intend)
412+
protectedstaticfinalintparseInt(intnum,StringdigitChars,intstart,intend)
413413
{
414414
num = (num *10) + (digitChars.charAt(start) -'0');
415415
if (++start <end) {
@@ -436,20 +436,20 @@ protected final static int parseInt(int num, String digitChars, int start, int e
436436
returnnum;
437437
}
438438

439-
protectedfinalstaticlongparseLong(char[]digitChars,intstart,intend)
439+
protectedstaticfinallongparseLong(char[]digitChars,intstart,intend)
440440
{
441441
// Note: caller must ensure length is [10, 18]
442442
intstart2 =end-9;
443443
longval =parseInt(digitChars,start,start2) *L_BILLION;
444-
returnval +(long)parseInt(digitChars,start2,end);
444+
returnval +parseInt(digitChars,start2,end);
445445
}
446446

447-
protectedfinalstaticlongparseLong(StringdigitChars,intstart,intend)
447+
protectedstaticfinallongparseLong(StringdigitChars,intstart,intend)
448448
{
449449
// Note: caller must ensure length is [10, 18]
450450
intstart2 =end-9;
451451
longval =parseInt(digitChars,start,start2) *L_BILLION;
452-
returnval +(long)parseInt(digitChars,start2,end);
452+
returnval +parseInt(digitChars,start2,end);
453453
}
454454

455455
/*
@@ -492,7 +492,7 @@ protected String _clean(String str)
492492
/////////////////////////////////////////////////////
493493
*/
494494

495-
publicfinalstaticclassBooleanDecoder
495+
publicstaticfinalclassBooleanDecoder
496496
extendsDecoderBase
497497
{
498498
protectedbooleanmValue;
@@ -579,7 +579,7 @@ public void decode(char[] lexical, int start, int end)
579579
}
580580
}
581581

582-
publicfinalstaticclassIntDecoder
582+
publicstaticfinalclassIntDecoder
583583
extendsDecoderBase
584584
{
585585
protectedintmValue;
@@ -627,7 +627,7 @@ public void decode(String lexical) throws IllegalArgumentException
627627
base +=L_BILLION;
628628
}
629629
inti =parseInt(lexical,ptr,ptr+charsLeft);
630-
longl =base +(long)i;
630+
longl =base +i;
631631
if (neg) {
632632
l = -l;
633633
if (l >=L_MIN_INT) {
@@ -682,7 +682,7 @@ public void decode(char[] lexical, final int start, final int end)
682682
base +=L_BILLION;
683683
}
684684
inti =parseInt(lexical,ptr,ptr+charsLeft);
685-
longl =base +(long)i;
685+
longl =base +i;
686686
if (neg) {
687687
l = -l;
688688
if (l >=L_MIN_INT) {
@@ -700,7 +700,7 @@ public void decode(char[] lexical, final int start, final int end)
700700
}
701701
}
702702

703-
publicfinalstaticclassLongDecoder
703+
publicstaticfinalclassLongDecoder
704704
extendsDecoderBase
705705
{
706706
protectedlongmValue;
@@ -731,15 +731,15 @@ public void decode(String lexical)
731731
// Quick check for short (single-digit) values:
732732
intcharsLeft =end-ptr;
733733
if (charsLeft ==0) {
734-
mValue = (long) (neg ? -nr :nr);
734+
mValue = (neg ? -nr :nr);
735735
return;
736736
}
737737
verifyDigits(lexical,ptr,end);
738738
// Note: charsLeft one less than total length (skipped first digit)
739739
// Can parse more cheaply, if it's really just an int...
740740
if (charsLeft <=8) {// no overflow
741741
inti =parseInt(nr,lexical,ptr,ptr+charsLeft);
742-
mValue = (long) (neg ? -i :i);
742+
mValue = (neg ? -i :i);
743743
return;
744744
}
745745
// At this point, let's just push back the first digit... simpler
@@ -777,7 +777,7 @@ public void decode(char[] lexical, final int start, final int end)
777777
// Quick check for short (single-digit) values:
778778
intcharsLeft =end-ptr;
779779
if (charsLeft ==0) {
780-
mValue = (long) (neg ? -nr :nr);
780+
mValue = (neg ? -nr :nr);
781781
return;
782782
}
783783
verifyDigits(lexical,start,end,ptr);
@@ -823,7 +823,7 @@ private long parseUsingBD(String lexical, boolean neg)
823823
}
824824
}
825825

826-
publicfinalstaticclassFloatDecoder
826+
publicstaticfinalclassFloatDecoder
827827
extendsDecoderBase
828828
{
829829
protectedfloatmValue;
@@ -915,7 +915,7 @@ public void decode(char[] lexical, int start, int end)
915915
}
916916
}
917917

918-
publicfinalstaticclassDoubleDecoder
918+
publicstaticfinalclassDoubleDecoder
919919
extendsDecoderBase
920920
{
921921
protecteddoublemValue;
@@ -1013,7 +1013,7 @@ public void decode(char[] lexical, int start, int end)
10131013
/////////////////////////////////////////////////////
10141014
*/
10151015

1016-
publicfinalstaticclassIntegerDecoder
1016+
publicstaticfinalclassIntegerDecoder
10171017
extendsDecoderBase
10181018
{
10191019
protectedBigIntegermValue;
@@ -1047,7 +1047,7 @@ public void decode(char[] lexical, int start, int end) throws IllegalArgumentExc
10471047
}
10481048
}
10491049

1050-
publicfinalstaticclassDecimalDecoder
1050+
publicstaticfinalclassDecimalDecoder
10511051
extendsDecoderBase
10521052
{
10531053
protectedBigDecimalmValue;
@@ -1086,7 +1086,7 @@ public void decode(char[] lexical, int start, int end) throws IllegalArgumentExc
10861086
}
10871087
}
10881088

1089-
publicfinalstaticclassQNameDecoder
1089+
publicstaticfinalclassQNameDecoder
10901090
extendsDecoderBase
10911091
{
10921092
finalNamespaceContextmNsCtxt;
@@ -1141,7 +1141,7 @@ protected QName resolveQName(String localName) throws IllegalArgumentException
11411141
protectedQNameresolveQName(Stringprefix,StringlocalName)
11421142
throwsIllegalArgumentException
11431143
{
1144-
if (prefix.length()==0||localName.length() ==0) {
1144+
if (prefix.isEmpty() ||localName.isEmpty()) {
11451145
// either prefix or local name is empty String, illegal
11461146
throwconstructInvalidValue(prefix+":"+localName);
11471147
}
@@ -1150,7 +1150,7 @@ protected QName resolveQName(String prefix, String localName)
11501150
* namespace' has empty URI)
11511151
*/
11521152
Stringuri =mNsCtxt.getNamespaceURI(prefix);
1153-
if (uri ==null ||uri.length() ==0) {
1153+
if (uri ==null ||uri.isEmpty()) {
11541154
thrownewIllegalArgumentException("Value\""+lexicalDesc(prefix+":"+localName)+"\" not a valid QName: prefix '"+prefix+"' not bound to a namespace");
11551155
}
11561156
returnnewQName(uri,localName,prefix);
@@ -1177,13 +1177,13 @@ public abstract static class BaseArrayDecoder
11771177
* Let's use some modest array size for allocating initial
11781178
* result buffer
11791179
*/
1180-
protectedfinalstaticintINITIAL_RESULT_BUFFER_SIZE =40;
1180+
protectedstaticfinalintINITIAL_RESULT_BUFFER_SIZE =40;
11811181

11821182
/**
11831183
* When expanding 'small' result buffers, we will expand
11841184
* size by bigger factor than for larger ones.
11851185
*/
1186-
protectedfinalstaticintSMALL_RESULT_BUFFER_SIZE =4000;
1186+
protectedstaticfinalintSMALL_RESULT_BUFFER_SIZE =4000;
11871187

11881188
protectedintmStart;
11891189

@@ -1223,7 +1223,7 @@ protected int calcNewSize(int currSize)
12231223
}
12241224
}
12251225

1226-
publicfinalstaticclassIntArrayDecoder
1226+
publicstaticfinalclassIntArrayDecoder
12271227
extendsBaseArrayDecoder
12281228
{
12291229
int[]mResult;
@@ -1291,7 +1291,7 @@ public boolean decodeValue(char[] buffer, int start, int end) throws IllegalArgu
12911291

12921292
}
12931293

1294-
publicfinalstaticclassLongArrayDecoder
1294+
publicstaticfinalclassLongArrayDecoder
12951295
extendsBaseArrayDecoder
12961296
{
12971297
long[]mResult;
@@ -1349,7 +1349,7 @@ public boolean decodeValue(char[] buffer, int start, int end) throws IllegalArgu
13491349
}
13501350
}
13511351

1352-
publicfinalstaticclassFloatArrayDecoder
1352+
publicstaticfinalclassFloatArrayDecoder
13531353
extendsBaseArrayDecoder
13541354
{
13551355
float[]mResult;
@@ -1407,7 +1407,7 @@ public boolean decodeValue(char[] buffer, int start, int end) throws IllegalArgu
14071407
}
14081408
}
14091409

1410-
publicfinalstaticclassDoubleArrayDecoder
1410+
publicstaticfinalclassDoubleArrayDecoder
14111411
extendsBaseArrayDecoder
14121412
{
14131413
double[]mResult;

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp