(root)/android/import-contacts
» Revision
102
(compared to revision 68)
: src/am/ed/importcontacts/VcardImporter.java
To get this branch, use:
bzr branch
http://bzr.ed.am/android/import-contacts
« back to all changes in this revision
Viewing changes to src/am/ed/importcontacts/VcardImporter.java
- browse files at revision 102
- compare with another revision
- download diff
- download tarball
- view history from revision 102
- Committer: Tim Marston
- Date: 2013-12-08 18:43:52 UTC
- Revision ID: tim@ed.am-20131208184352-0giww6zoy58bx07h
close some streams properly
- files added:
- res/drawable/family_pic.png
- files removed:
- TODO
- files modified:
- .bzrignore
added
removed
src/am/ed/importcontacts/VcardImporter.java
1
1
/*
2
2
* VCFImporter.java
3
3
*
4
* Copyright (C) 2009 to 2011 Tim Marston <tim@ed.am>
4
* Copyright (C) 2009 to 2013 Tim Marston <tim@ed.am>
5
5
*
6
6
* This file is part of the Import Contacts program (hereafter referred
7
* to as "this program"). For more information, see
7
* to as "this program"). For more information, see
8
8
* http://ed.am/dev/android/import-contacts
9
9
*
10
10
* This program is free software: you can redistribute it and/or modify
133
133
boolean in_vcard = false;
134
134
while( ( line = reader.readLine() ) != null )
135
135
{
136
if( !in_vcard ) {
136
if( !in_vcard )
137
{
137
138
// look for vcard beginning
138
if( line.matches( "^BEGIN:VCARD" ) ) {
139
if( line.matches( "(?i)BEGIN[ \t]*:[ \t]*VCARD.*" ) ) {
139
140
in_vcard = true;
140
141
_vcard_count++;
141
142
}
143
// check for vMsg files
144
else if( line.matches( "(?i)BEGIN[ \t]*:[ \t]*VMSG.*" ) ) {
145
showError( getText( R.string.error_vcf_vmsgfile )
146
+ file.getName() );
147
}
142
148
}
143
else if( line.matches( "^END:VCARD" ) )
149
else if( line.matches( "(?i)END[ \t]*:[ \t]*VCARD.*" ) )
144
150
in_vcard = false;
145
151
}
152
reader.close();
146
153
147
154
}
148
155
catch( FileNotFoundException e ) {
170
177
FileInputStream istream = new FileInputStream( file );
171
178
byte[] content = new byte[ (int)file.length() ];
172
179
istream.read( content );
173
istream = null;
180
istream.close();
174
181
175
182
// import
176
183
importVCardFileContent( content, file.getName() );
177
184
}
185
catch( OutOfMemoryError e ) {
186
showError( R.string.error_outofmemory );
187
}
178
188
catch( FileNotFoundException e ) {
179
189
showError( getText( R.string.error_filenotfound ) +
180
190
file.getName() );
193
203
ContentLineIterator cli = new ContentLineIterator( content );
194
204
while( cli.hasNext() )
195
205
{
196
ByteBuffer buffer = cli.next();
206
ContentLine content_line = cli.next();
197
207
198
// get a US-ASCII version of the line for processing
199
String line;
200
try {
201
line = new String( buffer.array(), buffer.position(),
202
buffer.limit() - buffer.position(), "US-ASCII" );
203
}
204
catch( UnsupportedEncodingException e ) {
205
// we know US-ASCII is supported, so appease the compiler...
206
line = "";
207
}
208
// get a US-ASCII version of the string, for processing
209
String line = content_line.getUsAsciiLine();
208
210
209
211
if( vcard == null ) {
210
212
// look for vcard beginning
211
if( line.matches( "^BEGIN:VCARD" ) ) {
213
if( line.matches( "(?i)BEGIN[ \t]*:[ \t]*VCARD.*" ) ) {
212
214
setProgress( _progress++ );
213
215
vcard = new Vcard();
214
216
vcard_start_line = cli.getLineNumber();
216
218
}
217
219
else {
218
220
// look for vcard content or ending
219
if( line.matches( "^END:VCARD" ) )
221
if( line.matches( "(?i)END[ \t]*:[ \t]*VCARD.*" ) )
220
222
{
221
223
// finalise the vcard/contact
222
224
try {
259
261
{
260
262
// try giving the line to the vcard
261
263
try {
262
vcard.parseLine( buffer, line,
263
cli.doesNextLineLookFolded() );
264
vcard.parseLine( content_line );
264
265
}
265
266
catch( Vcard.ParseException e ) {
266
267
skipContact();
273
274
finish( ACTION_ABORT );
274
275
}
275
276
276
// although we're continuing, we still need to abort
277
// this vCard. Further lines will be ignored until we
277
// Although we're continuing, we still need to abort
278
// this vCard. Further lines will be ignored until we
278
279
// get to another BEGIN:VCARD line.
279
280
vcard = null;
280
281
}
281
282
catch( Vcard.SkipImportException e ) {
282
283
skipContact();
283
// abort this vCard. Further lines will be ignored until
284
// Abort this vCard. Further lines will be ignored until
284
285
// we get to another BEGIN:VCARD line.
285
286
vcard = null;
286
287
}
289
290
}
290
291
}
291
292
292
class ContentLineIterator implements Iterator< ByteBuffer >
293
class ContentLine
294
{
295
private ByteBuffer _buffer;
296
private boolean _folded_next;
297
private String _line;
298
299
public ContentLine( ByteBuffer buffer, boolean folded_next )
300
{
301
_buffer = buffer;
302
_folded_next = folded_next;
303
_line = null;
304
}
305
306
public ByteBuffer getBuffer()
307
{
308
return _buffer;
309
}
310
311
public boolean doesNextLineLookFolded()
312
{
313
return _folded_next;
314
}
315
316
public String getUsAsciiLine()
317
{
318
// generated line and cache it
319
if( _line == null ) {
320
try {
321
_line = new String( _buffer.array(), _buffer.position(),
322
_buffer.limit() - _buffer.position(), "US-ASCII" );
323
}
324
catch( UnsupportedEncodingException e ) {
325
// we know US-ASCII *is* supported, so appease the
326
// compiler...
327
}
328
}
329
330
// return cached line
331
return _line;
332
}
333
}
334
335
class ContentLineIterator implements Iterator< ContentLine >
293
336
{
294
337
protected byte[] _content = null;
295
338
protected int _pos = 0;
307
350
}
308
351
309
352
@Override
310
public ByteBuffer next()
353
public ContentLine next()
311
354
{
312
355
int initial_pos = _pos;
313
356
320
363
_pos > initial_pos )? _pos - 1 : _pos;
321
364
_pos++;
322
365
_line++;
323
return ByteBuffer.wrap( _content, initial_pos,
324
to - initial_pos );
366
return new ContentLine(
367
ByteBuffer.wrap( _content, initial_pos,
368
to - initial_pos ),
369
doesNextLineLookFolded() );
325
370
}
326
371
327
372
// we didn't find one, but were there bytes left?
329
374
int to = _pos;
330
375
_pos++;
331
376
_line++;
332
return ByteBuffer.wrap( _content, initial_pos,
333
to - initial_pos );
377
return new ContentLine(
378
ByteBuffer.wrap( _content, initial_pos,
379
to - initial_pos ),
380
doesNextLineLookFolded() );
334
381
}
335
382
336
383
// no bytes left
348
395
* onto the end of this one?
349
396
* @return
350
397
*/
351
public boolean doesNextLineLookFolded()
398
private boolean doesNextLineLookFolded()
352
399
{
353
400
return _pos > 0 && _pos < _content.length &&
354
_content[ _pos - 1 ] == '\n' && _content[ _pos ] == ' ';
401
_content[ _pos - 1 ] == '\n' &&
402
( _content[ _pos ] == ' ' || _content[ _pos ] == '\t' );
355
403
}
356
404
357
405
public int getLineNumber()
369
417
private final static int MULTILINE_NONE = 0;
370
418
private final static int MULTILINE_ENCODED = 1; // v2.1 quoted-printable
371
419
private final static int MULTILINE_ESCAPED = 2; // v2.1 \\CRLF
372
private final static int MULTILINE_FOLDED = 3; // v3.0 folding
420
private final static int MULTILINE_FOLDED = 3; // MIME-DIR folding
373
421
374
422
private String _version = null;
375
private Vector< ByteBuffer > _buffers = null;
423
private Vector< ContentLine > _content_lines = null;
376
424
private int _name_level = NAMELEVEL_NONE;
377
425
private int _parser_multiline_state = MULTILINE_NONE;
378
426
private String _parser_current_name_and_params = null;
421
469
@SuppressWarnings("serial")
422
470
protected class SkipImportException extends Exception { }
423
471
424
private String extractCollonPartFromLine( ByteBuffer buffer,
425
String line, boolean former )
472
private String extractCollonPartFromLine( ContentLine content_line,
473
boolean former )
426
474
{
427
String ret = null;
428
429
// get a US-ASCII version of the line for processing, unless we were
430
// supplied with one
431
if( line == null ) {
432
try {
433
line = new String( buffer.array(), buffer.position(),
434
buffer.limit() - buffer.position(), "US-ASCII" );
435
}
436
catch( UnsupportedEncodingException e ) {
437
// we know US-ASCII is supported, so appease the compiler...
438
line = "";
439
}
440
}
441
442
475
// split line into name and value parts and check to make sure we
443
476
// only got 2 parts and that the first part is not zero in length
444
String[] parts = line.split( ":", 2 );
477
String[] parts = content_line.getUsAsciiLine().split( ":", 2 );
445
478
if( parts.length == 2 && parts[ 0 ].length() > 0 )
446
ret = parts[ former? 0 : 1 ];
447
448
return ret;
449
}
450
451
private String extractNameAndParamsFromLine( ByteBuffer buffer,
452
String line )
453
{
454
return extractCollonPartFromLine( buffer, line, true );
455
}
456
457
private String extractValueFromLine( ByteBuffer buffer, String line )
458
{
459
return extractCollonPartFromLine( buffer, line, false );
460
}
461
462
public void parseLine( ByteBuffer buffer, String line,
463
boolean next_line_looks_folded )
479
return parts[ former? 0 : 1 ].trim();
480
481
return null;
482
}
483
484
private String extractNameAndParamsFromLine( ContentLine content_line )
485
{
486
return extractCollonPartFromLine( content_line, true );
487
}
488
489
private String extractValueFromLine( ContentLine content_line )
490
{
491
return extractCollonPartFromLine( content_line, false );
492
}
493
494
public void parseLine( ContentLine content_line )
464
495
throws ParseException, SkipImportException,
465
496
AbortImportException
466
497
{
469
500
{
470
501
// tentatively get name and params from line
471
502
String name_and_params =
472
extractNameAndParamsFromLine( buffer, line );
503
extractNameAndParamsFromLine( content_line );
473
504
474
505
// is it a version line?
475
506
if( name_and_params != null &&
476
name_and_params.equals( "VERSION" ) )
507
name_and_params.equalsIgnoreCase( "VERSION" ) )
477
508
{
478
509
// yes, get it!
479
String value = extractValueFromLine( buffer, line );
480
if( !value.equals( "2.1" ) && !value.equals( "3.0" ) )
510
String value = extractValueFromLine( content_line );
511
if( value == null || (
512
!value.equals( "2.1" ) && !value.equals( "3.0" ) ) )
513
{
481
514
throw new ParseException( R.string.error_vcf_version );
515
}
482
516
_version = value;
483
517
484
518
// parse any buffers we've been accumulating while we waited
485
519
// for a version
486
if( _buffers != null )
487
for( int i = 0; i < _buffers.size(); i++ )
488
parseLine( _buffers.get( i ), null,
489
i + 1 < _buffers.size() &&
490
_buffers.get( i + 1 ).hasRemaining() &&
491
_buffers.get( i + 1 ).get(
492
_buffers.get( i + 1 ).position() ) == ' ' );
493
_buffers = null;
520
if( _content_lines != null )
521
for( int i = 0; i < _content_lines.size(); i++ )
522
parseLine( _content_lines.get( i ) );
523
_content_lines = null;
494
524
}
495
525
else
496
526
{
497
527
// no, so stash this line till we get a version
498
if( _buffers == null )
499
_buffers = new Vector< ByteBuffer >();
500
_buffers.add( buffer );
528
if( _content_lines == null )
529
_content_lines = new Vector< ContentLine >();
530
_content_lines.add( content_line );
501
531
}
502
532
}
503
533
else
504
534
{
505
535
// name and params and the position in the buffer where the
506
// "value" part of the line start
536
// "value" part of the line starts
507
537
String name_and_params;
508
538
int pos;
509
539
515
545
516
546
// skip some initial line characters, depending on the type
517
547
// of multi-line we're handling
518
pos = buffer.position();
548
pos = content_line.getBuffer().position();
519
549
switch( _parser_multiline_state )
520
550
{
521
551
case MULTILINE_FOLDED:
522
552
pos++;
523
553
break;
524
554
case MULTILINE_ENCODED:
525
while( pos < buffer.limit() && (
526
buffer.get( pos ) == ' ' ||
527
buffer.get( pos ) == '\t' ) )
555
while( pos < content_line.getBuffer().limit() && (
556
content_line.getBuffer().get( pos ) == ' ' ||
557
content_line.getBuffer().get( pos ) == '\t' ) )
528
558
{
529
559
pos++;
530
560
}
539
569
}
540
570
else
541
571
{
572
// skip empty lines
573
if( content_line.getUsAsciiLine().trim().length() == 0 )
574
return;
575
542
576
// get name and params from line, and since we're not
543
577
// parsing a subsequent line in a multi-line, this should
544
578
// not fail, or it's an error
545
579
name_and_params =
546
extractNameAndParamsFromLine( buffer, line );
580
extractNameAndParamsFromLine( content_line );
547
581
if( name_and_params == null )
548
582
throw new ParseException(
549
583
R.string.error_vcf_malformed );
550
584
551
585
// calculate how many chars to skip from beginning of line
552
586
// so we skip the property "name:" part
553
pos = buffer.position() + name_and_params.length() + 1;
587
pos = content_line.getBuffer().position() +
588
name_and_params.length() + 1;
554
589
555
590
// reset the saved multi-line state
556
591
_parser_current_name_and_params = name_and_params;
559
594
560
595
// get value from buffer, as raw bytes
561
596
ByteBuffer value;
562
value = ByteBuffer.wrap( buffer.array(), pos,
563
buffer.limit() - pos );
597
value = ByteBuffer.wrap( content_line.getBuffer().array(), pos,
598
content_line.getBuffer().limit() - pos );
564
599
565
600
// get parameter parts
566
601
String[] name_param_parts = name_and_params.split( ";", -1 );
573
608
"FN", "ORG", "TITLE", "TEL", "EMAIL", "ADR", "LABEL" }
574
609
) );
575
610
boolean is_interesting_field =
576
interesting_fields.contains( name_param_parts[ 0 ] );
611
interesting_fields.contains(
612
name_param_parts[ 0 ].toUpperCase( Locale.US ) );
577
613
578
614
// parse encoding parameter
579
615
String encoding = checkParam( name_param_parts, "ENCODING" );
580
616
if( encoding != null )
581
617
encoding = encoding.toUpperCase( Locale.US );
582
618
if( is_interesting_field && encoding != null &&
583
!encoding.equals( "8BIT" ) &&
584
!encoding.equals( "QUOTED-PRINTABLE" ) )
585
//&& !encoding.equals( "BASE64" ) )
619
!encoding.equalsIgnoreCase( "8BIT" ) &&
620
!encoding.equalsIgnoreCase( "QUOTED-PRINTABLE" ) )
621
//&& !encoding.equalsIgnoreCase( "BASE64" ) )
586
622
{
587
623
throw new ParseException( R.string.error_vcf_encoding );
588
624
}
592
628
if( charset != null )
593
629
charset = charset.toUpperCase( Locale.US );
594
630
if( charset != null &&
595
!charset.equals( "US-ASCII" ) &&
596
!charset.equals( "ASCII" ) &&
597
!charset.equals( "UTF-8" ) )
631
!charset.equalsIgnoreCase( "US-ASCII" ) &&
632
!charset.equalsIgnoreCase( "ASCII" ) &&
633
!charset.equalsIgnoreCase( "UTF-8" ) )
598
634
{
599
635
throw new ParseException( R.string.error_vcf_charset );
600
636
}
602
638
// do unencoding (or default to a fake unencoding result with
603
639
// the raw string)
604
640
UnencodeResult unencoding_result = null;
605
if( encoding != null && encoding.equals( "QUOTED-PRINTABLE" ) )
641
if( encoding != null &&
642
encoding.equalsIgnoreCase( "QUOTED-PRINTABLE" ) )
643
{
606
644
unencoding_result = unencodeQuotedPrintable( value );
607
// else if( encoding != null && encoding.equals( "BASE64" ) )
645
}
646
// else if( encoding != null &&
647
// encoding.equalsIgnoreCase( "BASE64" ) )
648
// {
608
649
// unencoding_result = unencodeBase64( props[ 1 ], charset );
650
// }
609
651
if( unencoding_result != null ) {
610
652
value = unencoding_result.getBuffer();
611
653
if( unencoding_result.isAnotherLineRequired() )
616
658
// specified for a v2.1 vcard entry, we assume it's US-ASCII)
617
659
if( ( charset == null && _version.equals( "2.1" ) ) ||
618
660
( charset != null && (
619
charset.equals( "ASCII" ) ||
620
charset.equals( "US-ASCII" ) ) ) )
661
charset.equalsIgnoreCase( "ASCII" ) ||
662
charset.equalsIgnoreCase( "US-ASCII" ) ) ) )
621
663
{
622
664
value = transcodeAsciiToUtf8( value );
623
665
}
634
676
// for some entries that have semicolon-separated value parts,
635
677
// check to see if the value ends in an escape character, which
636
678
// indicates that we have a multi-line value
637
if( ( name_param_parts[ 0 ].equals( "N" ) ||
638
name_param_parts[ 0 ].equals( "ORG" ) ||
639
name_param_parts[ 0 ].equals( "ADR" ) ) &&
679
if( ( name_param_parts[ 0 ].equalsIgnoreCase( "N" ) ||
680
name_param_parts[ 0 ].equalsIgnoreCase( "ORG" ) ||
681
name_param_parts[ 0 ].equalsIgnoreCase( "ADR" ) ) &&
640
682
doesStringEndInAnEscapeChar( string_value ) )
641
683
{
642
684
_parser_multiline_state = MULTILINE_ESCAPED;
644
686
string_value.length() - 1 );
645
687
}
646
688
647
// now we know whether we're in an encoding multi-line,
648
// determine if we're in a v3 folded multi-line or not
689
// if we know we're not in an encoding-based multi-line, check
690
// to see if we're in a folded multi-line
649
691
if( _parser_multiline_state == MULTILINE_NONE &&
650
_version.equals( "3.0" ) && next_line_looks_folded )
692
content_line.doesNextLineLookFolded() )
651
693
{
652
694
_parser_multiline_state = MULTILINE_FOLDED;
653
695
}
665
707
if( complete_value.length() < 1 ) return;
666
708
667
709
// parse some properties
668
if( name_param_parts[ 0 ].equals( "N" ) )
710
if( name_param_parts[ 0 ].equalsIgnoreCase( "N" ) )
669
711
parseN( name_param_parts, complete_value );
670
else if( name_param_parts[ 0 ].equals( "FN" ) )
712
else if( name_param_parts[ 0 ].equalsIgnoreCase( "FN" ) )
671
713
parseFN( name_param_parts, complete_value );
672
else if( name_param_parts[ 0 ].equals( "ORG" ) )
714
else if( name_param_parts[ 0 ].equalsIgnoreCase( "ORG" ) )
673
715
parseORG( name_param_parts, complete_value );
674
else if( name_param_parts[ 0 ].equals( "TITLE" ) )
716
else if( name_param_parts[ 0 ].equalsIgnoreCase( "TITLE" ) )
675
717
parseTITLE( name_param_parts, complete_value );
676
else if( name_param_parts[ 0 ].equals( "TEL" ) )
718
else if( name_param_parts[ 0 ].equalsIgnoreCase( "TEL" ) )
677
719
parseTEL( name_param_parts, complete_value );
678
else if( name_param_parts[ 0 ].equals( "EMAIL" ) )
720
else if( name_param_parts[ 0 ].equalsIgnoreCase( "EMAIL" ) )
679
721
parseEMAIL( name_param_parts, complete_value );
680
else if( name_param_parts[ 0 ].equals( "ADR" ) )
722
else if( name_param_parts[ 0 ].equalsIgnoreCase( "ADR" ) )
681
723
parseADR( name_param_parts, complete_value );
682
else if( name_param_parts[ 0 ].equals( "LABEL" ) )
724
else if( name_param_parts[ 0 ].equalsIgnoreCase( "LABEL" ) )
683
725
parseLABEL( name_param_parts, complete_value );
684
else if( name_param_parts[ 0 ].equals( "NOTE" ) )
726
else if( name_param_parts[ 0 ].equalsIgnoreCase( "NOTE" ) )
685
727
parseNOTE( name_param_parts, complete_value );
728
else if( name_param_parts[ 0 ].equalsIgnoreCase( "BDAY" ) )
729
parseBDAY( name_param_parts, complete_value );
686
730
}
687
731
}
688
732
712
756
{
713
757
String str = parts.get( a );
714
758
715
// look for parts that end in an escape character, but ignore
716
// the final part. We've already detected escape chars at the
759
// Look for parts that end in an escape character, but ignore
760
// the final part. We've already detected escape chars at the
717
761
// end of the final part in parseLine() and handled multi-lines
718
762
// accordingly.
719
763
if( a < parts.size() - 1 &&
809
853
for( int b = 0; b < name_part_parts.length; b++ )
810
854
if( name_part_parts[ b ].length() > 0 )
811
855
{
812
if( value.length() == 0 ) value += " ";
856
if( value.length() > 0 ) value += " ";
813
857
value += name_part_parts[ b ];
814
858
}
815
859
}
934
978
for( int a = 0; a < adr_parts.length; a++ )
935
979
if( adr_parts[ a ].length() > 0 )
936
980
{
937
// split this part in to it's comma-separated bits
938
String[] adr_part_parts =
939
splitValueByCharacter( adr_parts[ a ], ',' );
940
for( int b = 0; b < adr_part_parts.length; b++ )
941
if( adr_part_parts[ b ].length() > 0 )
942
{
943
if( value.length() > 0 ) value += "\n";
944
value += adr_part_parts[ b ];
945
}
981
// version 3.0 vCards allow further splitting by comma
982
if( _version.equals( "3.0" ) )
983
{
984
// split this part in to it's comma-separated bits and
985
// add them on individual lines
986
String[] adr_part_parts =
987
splitValueByCharacter( adr_parts[ a ], ',' );
988
for( int b = 0; b < adr_part_parts.length; b++ )
989
if( adr_part_parts[ b ].length() > 0 )
990
{
991
if( value.length() > 0 ) value += "\n";
992
value += adr_part_parts[ b ];
993
}
994
}
995
else
996
{
997
// add this part on an individual line
998
if( value.length() > 0 ) value += "\n";
999
value += adr_parts[ a ];
1000
}
946
1001
}
947
1002
948
1003
Set< String > types = extractTypes( params, Arrays.asList(
978
1033
addNote( unescapeValue( value ) );
979
1034
}
980
1035
1036
private void parseBDAY( String[] params, String value )
1037
{
1038
setBirthday( value );
1039
}
1040
981
1041
public void finaliseVcard()
982
1042
throws ParseException, ContactNotIdentifiableException
983
1043
{
984
1044
// missing version (and data is present)
985
if( _version == null && _buffers != null )
1045
if( _version == null && _content_lines != null )
986
1046
throw new ParseException( R.string.error_vcf_malformed );
987
1047
988
1048
// finalise the parent class
991
1051
992
1052
/**
993
1053
* Amongst the params, find the value of the first, only, of any with
994
* the specified name
1054
* the specified name.
1055
*
995
1056
* @param params
996
1057
* @param name
997
1058
* @return a value, or null
1003
1064
}
1004
1065
1005
1066
/**
1006
* Amongst the params, find the values of any with the specified name
1067
* Amongst the params, find the values of any with the specified name.
1068
*
1007
1069
* @param params
1008
1070
* @param name
1009
1071
* @return an array of values, or null
1025
1087
}
1026
1088
1027
1089
/**
1028
* Amongst the params, return any type values present. For v2.1 vCards,
1029
* those types are just parameters. For v3.0, they are prefixed with
1030
* "TYPE=". There may also be multiple type parameters.
1090
* Amongst the params, return any type values present. For v2.1 vCards,
1091
* those types are just parameters. For v3.0, they are prefixed with
1092
* "TYPE=". There may also be multiple type parameters.
1093
*
1031
1094
* @param params an array of params to look for types in
1032
1095
* @param valid_types an list of upper-case type values to look for
1033
1096
* @return a set of present type values
1041
1104
String type_params[] = checkParams( params, "TYPE" );
1042
1105
for( int a = 0; a < type_params.length; a++ )
1043
1106
{
1044
// check for a comma-separated list of types (why? this isn't in
1045
// the specs!)
1107
// check for a comma-separated list of types (why? I don't think
1108
// this is in the specs!)
1046
1109
String[] parts = type_params[ a ].split( "," );
1047
for( int i = 0; i < parts.length; i++ )
1048
parts[ i ] = parts[ i ].toUpperCase( Locale.US );
1049
for( int i = 0; i < parts.length; i++ )
1050
if( valid_types.contains( parts[ i ] ) )
1051
types.add( parts[ i ] );
1110
for( int i = 0; i < parts.length; i++ ) {
1111
String ucpart = parts[ i ].toUpperCase( Locale.US );
1112
if( valid_types.contains( ucpart ) )
1113
types.add( ucpart );
1114
}
1052
1115
}
1053
1116
1054
1117
// get 2.1-style type param
1055
1118
if( _version.equals( "2.1" ) ) {
1056
for( int i = 1; i < params.length; i++ )
1057
if( valid_types.contains( params[ i ] ) )
1058
types.add( params[ i ] );
1119
for( int i = 1; i < params.length; i++ ) {
1120
String ucparam = params[ i ].toUpperCase( Locale.US );
1121
if( valid_types.contains( ucparam ) )
1122
types.add( ucparam );
1123
}
1059
1124
}
1060
1125
1061
1126
return types;
1083
1148
else if( ch == '=' && i == in.limit() - 1 )
1084
1149
{
1085
1150
// we found a '=' at the end of a line signifying a multi-
1086
// line string, so we don't add it.
1151
// line string, so we don't add it
1087
1152
another = true;
1088
1153
continue;
1089
1154
}
Loggerhead is a web-based interface for Bazaar branches
Version: 1.18.2, Revision: 480