/android/import-contacts : revision 77

38

import java.util.HashSet;

39

import java.util.Iterator;

40

import java.util.List;

41

import java.util.Locale;

41

42

import java.util.NoSuchElementException;

42

43

import java.util.Set;

43

44

import java.util.Vector;

44

45

import java.util.regex.Matcher;

45

46

import java.util.regex.Pattern;

46

47

48

import android.annotation.SuppressLint;

47

49

import android.content.SharedPreferences;

48

import android.provider.Contacts;

49

import android.provider.Contacts.PhonesColumns;

50

51

public class VcardImporter extends Importer

52

{

58

super( doit );

59

}

60

61

@SuppressLint( "SdCardPath" )

61

62

@Override

62

63

protected void onImport() throws AbortImportException

63

64

{

82

83

// get files

83

84

class VCardFilter implements FilenameFilter {

84

85

public boolean accept( File dir, String name ) {

85

return name.toLowerCase().endsWith( ".vcf" );

86

return name.toLowerCase( Locale.US ).endsWith( ".vcf" );

86

87

}

87

88

}

88

89

files = file.listFiles( new VCardFilter() );

174

175

// import

175

176

importVCardFileContent( content, file.getName() );

176

177

}

178

catch( OutOfMemoryError e ) {

179

showError( R.string.error_outofmemory );

180

}

177

181

catch( FileNotFoundException e ) {

178

182

showError( getText( R.string.error_filenotfound ) +

179

183

file.getName() );

192

196

ContentLineIterator cli = new ContentLineIterator( content );

193

197

while( cli.hasNext() )

194

198

{

195

ByteBuffer buffer = cli.next();

199

ContentLine content_line = cli.next();

196

200

197

// get a US-ASCII version of the line for processing

198

String line;

199

try {

200

line = new String( buffer.array(), buffer.position(),

201

buffer.limit() - buffer.position(), "US-ASCII" );

202

}

203

catch( UnsupportedEncodingException e ) {

204

// we know US-ASCII is supported, so appease the compiler...

205

line = "";

206

}

201

// get a US-ASCII version of the string, for processing

202

String line = content_line.getUsAsciiLine();

207

203

208

204

if( vcard == null ) {

209

205

// look for vcard beginning

210

if( line.matches( "^BEGIN:VCARD" ) ) {

206

if( line.matches( "^BEGIN[ \t]*:[ \t]*VCARD" ) ) {

211

207

setProgress( _progress++ );

212

208

vcard = new Vcard();

213

209

vcard_start_line = cli.getLineNumber();

215

211

}

216

212

else {

217

213

// look for vcard content or ending

218

if( line.matches( "^END:VCARD" ) )

214

if( line.matches( "^END[ \t]*:[ \t]*VCARD" ) )

219

215

{

220

216

// finalise the vcard/contact

221

217

try {

258

254

{

259

255

// try giving the line to the vcard

260

256

try {

261

vcard.parseLine( buffer, line,

262

cli.doesNextLineLookFolded() );

257

vcard.parseLine( content_line );

263

258

}

264

259

catch( Vcard.ParseException e ) {

265

260

skipContact();

288

283

}

289

284

}

290

285

291

class ContentLineIterator implements Iterator< ByteBuffer >

286

class ContentLine

287

{

288

private ByteBuffer _buffer;

289

private boolean _folded_next;

290

private String _line;

291

292

public ContentLine( ByteBuffer buffer, boolean folded_next )

293

{

294

_buffer = buffer;

295

_folded_next = folded_next;

296

_line = null;

297

}

298

299

public ByteBuffer getBuffer()

300

{

301

return _buffer;

302

}

303

304

public boolean doesNextLineLookFolded()

305

{

306

return _folded_next;

307

}

308

309

public String getUsAsciiLine()

310

{

311

// generated line and cache it

312

if( _line == null ) {

313

try {

314

_line = new String( _buffer.array(), _buffer.position(),

315

_buffer.limit() - _buffer.position(), "US-ASCII" );

316

}

317

catch( UnsupportedEncodingException e ) {

318

// we know US-ASCII *is* supported, so appease the

319

// compiler...

320

}

321

}

322

323

// return cached line

324

return _line;

325

}

326

}

327

328

class ContentLineIterator implements Iterator< ContentLine >

292

329

{

293

330

protected byte[] _content = null;

294

331

protected int _pos = 0;

306

343

}

307

344

308

345

@Override

309

public ByteBuffer next()

346

public ContentLine next()

310

347

{

311

348

int initial_pos = _pos;

312

349

319

356

_pos > initial_pos )? _pos - 1 : _pos;

320

357

_pos++;

321

358

_line++;

322

return ByteBuffer.wrap( _content, initial_pos,

323

to - initial_pos );

359

return new ContentLine(

360

ByteBuffer.wrap( _content, initial_pos,

361

to - initial_pos ),

362

doesNextLineLookFolded() );

324

363

}

325

364

326

365

// we didn't find one, but were there bytes left?

328

367

int to = _pos;

329

368

_pos++;

330

369

_line++;

331

return ByteBuffer.wrap( _content, initial_pos,

332

to - initial_pos );

370

return new ContentLine(

371

ByteBuffer.wrap( _content, initial_pos,

372

to - initial_pos ),

373

doesNextLineLookFolded() );

333

374

}

334

375

335

376

// no bytes left

347

388

* onto the end of this one?

348

389

* @return

349

390

*/

350

public boolean doesNextLineLookFolded()

391

private boolean doesNextLineLookFolded()

351

392

{

352

393

return _pos > 0 && _pos < _content.length &&

353

_content[ _pos - 1 ] == '\n' && _content[ _pos ] == ' ';

394

_content[ _pos - 1 ] == '\n' &&

395

( _content[ _pos ] == ' ' || _content[ _pos ] == '\t' );

354

396

}

355

397

356

398

public int getLineNumber()

368

410

private final static int MULTILINE_NONE = 0;

369

411

private final static int MULTILINE_ENCODED = 1; // v2.1 quoted-printable

370

412

private final static int MULTILINE_ESCAPED = 2; // v2.1 \\CRLF

371

private final static int MULTILINE_FOLDED = 3; // v3.0 folding

413

private final static int MULTILINE_FOLDED = 3; // MIME-DIR folding

372

414

373

415

private String _version = null;

374

private Vector< ByteBuffer > _buffers = null;

416

private Vector< ContentLine > _content_lines = null;

375

417

private int _name_level = NAMELEVEL_NONE;

376

418

private int _parser_multiline_state = MULTILINE_NONE;

377

419

private String _parser_current_name_and_params = null;

420

462

@SuppressWarnings("serial")

421

463

protected class SkipImportException extends Exception { }

422

464

423

private String extractCollonPartFromLine( ByteBuffer buffer,

424

String line, boolean former )

465

private String extractCollonPartFromLine( ContentLine content_line,

466

boolean former )

425

467

{

426

468

String ret = null;

427

469

428

// get a US-ASCII version of the line for processing, unless we were

429

// supplied with one

430

if( line == null ) {

431

try {

432

line = new String( buffer.array(), buffer.position(),

433

buffer.limit() - buffer.position(), "US-ASCII" );

434

}

435

catch( UnsupportedEncodingException e ) {

436

// we know US-ASCII is supported, so appease the compiler...

437

line = "";

438

}

439

}

440

441

470

// split line into name and value parts and check to make sure we

442

471

// only got 2 parts and that the first part is not zero in length

443

String[] parts = line.split( ":", 2 );

472

String[] parts = content_line.getUsAsciiLine().split( ":", 2 );

444

473

if( parts.length == 2 && parts[ 0 ].length() > 0 )

445

474

ret = parts[ former? 0 : 1 ];

446

475

447

476

return ret;

448

477

}

449

478

450

private String extractNameAndParamsFromLine( ByteBuffer buffer,

451

String line )

452

{

453

return extractCollonPartFromLine( buffer, line, true );

454

}

455

456

private String extractValueFromLine( ByteBuffer buffer, String line )

457

{

458

return extractCollonPartFromLine( buffer, line, false );

459

}

460

461

public void parseLine( ByteBuffer buffer, String line,

462

boolean next_line_looks_folded )

479

private String extractNameAndParamsFromLine( ContentLine content_line )

480

{

481

return extractCollonPartFromLine( content_line, true );

482

}

483

484

private String extractValueFromLine( ContentLine content_line )

485

{

486

return extractCollonPartFromLine( content_line, false );

487

}

488

489

public void parseLine( ContentLine content_line )

463

490

throws ParseException, SkipImportException,

464

491

AbortImportException

465

492

{

468

495

{

469

496

// tentatively get name and params from line

470

497

String name_and_params =

471

extractNameAndParamsFromLine( buffer, line );

498

extractNameAndParamsFromLine( content_line );

472

499

473

500

// is it a version line?

474

501

if( name_and_params != null &&

475

name_and_params.equals( "VERSION" ) )

502

name_and_params.equalsIgnoreCase( "VERSION" ) )

476

503

{

477

504

// yes, get it!

478

String value = extractValueFromLine( buffer, line );

505

String value = extractValueFromLine( content_line );

479

506

if( !value.equals( "2.1" ) && !value.equals( "3.0" ) )

480

507

throw new ParseException( R.string.error_vcf_version );

481

508

_version = value;

482

509

483

510

// parse any buffers we've been accumulating while we waited

484

511

// for a version

485

if( _buffers != null )

486

for( int i = 0; i < _buffers.size(); i++ )

487

parseLine( _buffers.get( i ), null,

488

i + 1 < _buffers.size() &&

489

_buffers.get( i + 1 ).hasRemaining() &&

490

_buffers.get( i + 1 ).get(

491

_buffers.get( i + 1 ).position() ) == ' ' );

492

_buffers = null;

512

if( _content_lines != null )

513

for( int i = 0; i < _content_lines.size(); i++ )

514

parseLine( _content_lines.get( i ) );

515

_content_lines = null;

493

516

}

494

517

else

495

518

{

496

519

// no, so stash this line till we get a version

497

if( _buffers == null )

498

_buffers = new Vector< ByteBuffer >();

499

_buffers.add( buffer );

520

if( _content_lines == null )

521

_content_lines = new Vector< ContentLine >();

522

_content_lines.add( content_line );

500

523

}

501

524

}

502

525

else

503

526

{

504

527

// name and params and the position in the buffer where the

505

// "value" part of the line start

528

// "value" part of the line starts

506

529

String name_and_params;

507

530

int pos;

508

531

514

537

515

538

// skip some initial line characters, depending on the type

516

539

// of multi-line we're handling

517

pos = buffer.position();

540

pos = content_line.getBuffer().position();

518

541

switch( _parser_multiline_state )

519

542

{

520

543

case MULTILINE_FOLDED:

521

544

pos++;

522

545

break;

523

546

case MULTILINE_ENCODED:

524

while( pos < buffer.limit() && (

525

buffer.get( pos ) == ' ' ||

526

buffer.get( pos ) == '\t' ) )

547

while( pos < content_line.getBuffer().limit() && (

548

content_line.getBuffer().get( pos ) == ' ' ||

549

content_line.getBuffer().get( pos ) == '\t' ) )

527

550

{

528

551

pos++;

529

552

}

538

561

}

539

562

else

540

563

{

564

// skip empty lines

565

if( content_line.getUsAsciiLine().trim().length() == 0 )

566

return;

567

541

568

// get name and params from line, and since we're not

542

569

// parsing a subsequent line in a multi-line, this should

543

570

// not fail, or it's an error

544

571

name_and_params =

545

extractNameAndParamsFromLine( buffer, line );

572

extractNameAndParamsFromLine( content_line );

546

573

if( name_and_params == null )

547

574

throw new ParseException(

548

575

R.string.error_vcf_malformed );

549

576

550

577

// calculate how many chars to skip from beginning of line

551

578

// so we skip the property "name:" part

552

pos = buffer.position() + name_and_params.length() + 1;

579

pos = content_line.getBuffer().position() +

580

name_and_params.length() + 1;

553

581

554

582

// reset the saved multi-line state

555

583

_parser_current_name_and_params = name_and_params;

558

586

559

587

// get value from buffer, as raw bytes

560

588

ByteBuffer value;

561

value = ByteBuffer.wrap( buffer.array(), pos,

562

buffer.limit() - pos );

589

value = ByteBuffer.wrap( content_line.getBuffer().array(), pos,

590

content_line.getBuffer().limit() - pos );

563

591

564

592

// get parameter parts

565

593

String[] name_param_parts = name_and_params.split( ";", -1 );

572

600

"FN", "ORG", "TITLE", "TEL", "EMAIL", "ADR", "LABEL" }

573

601

) );

574

602

boolean is_interesting_field =

575

interesting_fields.contains( name_param_parts[ 0 ] );

603

interesting_fields.contains(

604

name_param_parts[ 0 ].toUpperCase( Locale.US ) );

576

605

577

606

// parse encoding parameter

578

607

String encoding = checkParam( name_param_parts, "ENCODING" );

579

if( encoding != null ) encoding = encoding.toUpperCase();

608

if( encoding != null )

609

encoding = encoding.toUpperCase( Locale.US );

580

610

if( is_interesting_field && encoding != null &&

581

!encoding.equals( "8BIT" ) &&

582

!encoding.equals( "QUOTED-PRINTABLE" ) )

583

//&& !encoding.equals( "BASE64" ) )

611

!encoding.equalsIgnoreCase( "8BIT" ) &&

612

!encoding.equalsIgnoreCase( "QUOTED-PRINTABLE" ) )

613

//&& !encoding.equalsIgnoreCase( "BASE64" ) )

584

614

{

585

615

throw new ParseException( R.string.error_vcf_encoding );

586

616

}

587

617

588

618

// parse charset parameter

589

619

String charset = checkParam( name_param_parts, "CHARSET" );

590

if( charset != null ) charset = charset.toUpperCase();

620

if( charset != null )

621

charset = charset.toUpperCase( Locale.US );

591

622

if( charset != null &&

592

!charset.equals( "US-ASCII" ) &&

593

!charset.equals( "ASCII" ) &&

594

!charset.equals( "UTF-8" ) )

623

!charset.equalsIgnoreCase( "US-ASCII" ) &&

624

!charset.equalsIgnoreCase( "ASCII" ) &&

625

!charset.equalsIgnoreCase( "UTF-8" ) )

595

626

{

596

627

throw new ParseException( R.string.error_vcf_charset );

597

628

}

599

630

// do unencoding (or default to a fake unencoding result with

600

631

// the raw string)

601

632

UnencodeResult unencoding_result = null;

602

if( encoding != null && encoding.equals( "QUOTED-PRINTABLE" ) )

633

if( encoding != null &&

634

encoding.equalsIgnoreCase( "QUOTED-PRINTABLE" ) )

635

{

603

636

unencoding_result = unencodeQuotedPrintable( value );

604

// else if( encoding != null && encoding.equals( "BASE64" ) )

637

}

638

// else if( encoding != null &&

639

// encoding.equalsIgnoreCase( "BASE64" ) )

640

// {

605

641

// unencoding_result = unencodeBase64( props[ 1 ], charset );

642

// }

606

643

if( unencoding_result != null ) {

607

644

value = unencoding_result.getBuffer();

608

645

if( unencoding_result.isAnotherLineRequired() )

613

650

// specified for a v2.1 vcard entry, we assume it's US-ASCII)

614

651

if( ( charset == null && _version.equals( "2.1" ) ) ||

615

652

( charset != null && (

616

charset.equals( "ASCII" ) ||

617

charset.equals( "US-ASCII" ) ) ) )

653

charset.equalsIgnoreCase( "ASCII" ) ||

654

charset.equalsIgnoreCase( "US-ASCII" ) ) ) )

618

655

{

619

656

value = transcodeAsciiToUtf8( value );

620

657

}

631

668

// for some entries that have semicolon-separated value parts,

632

669

// check to see if the value ends in an escape character, which

633

670

// indicates that we have a multi-line value

634

if( ( name_param_parts[ 0 ].equals( "N" ) ||

635

name_param_parts[ 0 ].equals( "ORG" ) ||

636

name_param_parts[ 0 ].equals( "ADR" ) ) &&

671

if( ( name_param_parts[ 0 ].equalsIgnoreCase( "N" ) ||

672

name_param_parts[ 0 ].equalsIgnoreCase( "ORG" ) ||

673

name_param_parts[ 0 ].equalsIgnoreCase( "ADR" ) ) &&

637

674

doesStringEndInAnEscapeChar( string_value ) )

638

675

{

639

676

_parser_multiline_state = MULTILINE_ESCAPED;

641

678

string_value.length() - 1 );

642

679

}

643

680

644

// now we know whether we're in an encoding multi-line,

645

// determine if we're in a v3 folded multi-line or not

681

// if we know we're not in an encoding-based multi-line, check

682

// to see if we're in a folded multi-line

646

683

if( _parser_multiline_state == MULTILINE_NONE &&

647

_version.equals( "3.0" ) && next_line_looks_folded )

684

content_line.doesNextLineLookFolded() )

648

685

{

649

686

_parser_multiline_state = MULTILINE_FOLDED;

650

687

}

662

699

if( complete_value.length() < 1 ) return;

663

700

664

701

// parse some properties

665

if( name_param_parts[ 0 ].equals( "N" ) )

702

if( name_param_parts[ 0 ].equalsIgnoreCase( "N" ) )

666

703

parseN( name_param_parts, complete_value );

667

else if( name_param_parts[ 0 ].equals( "FN" ) )

704

else if( name_param_parts[ 0 ].equalsIgnoreCase( "FN" ) )

668

705

parseFN( name_param_parts, complete_value );

669

else if( name_param_parts[ 0 ].equals( "ORG" ) )

706

else if( name_param_parts[ 0 ].equalsIgnoreCase( "ORG" ) )

670

707

parseORG( name_param_parts, complete_value );

671

else if( name_param_parts[ 0 ].equals( "TITLE" ) )

708

else if( name_param_parts[ 0 ].equalsIgnoreCase( "TITLE" ) )

672

709

parseTITLE( name_param_parts, complete_value );

673

else if( name_param_parts[ 0 ].equals( "TEL" ) )

710

else if( name_param_parts[ 0 ].equalsIgnoreCase( "TEL" ) )

674

711

parseTEL( name_param_parts, complete_value );

675

else if( name_param_parts[ 0 ].equals( "EMAIL" ) )

712

else if( name_param_parts[ 0 ].equalsIgnoreCase( "EMAIL" ) )

676

713

parseEMAIL( name_param_parts, complete_value );

677

else if( name_param_parts[ 0 ].equals( "ADR" ) )

714

else if( name_param_parts[ 0 ].equalsIgnoreCase( "ADR" ) )

678

715

parseADR( name_param_parts, complete_value );

679

else if( name_param_parts[ 0 ].equals( "LABEL" ) )

716

else if( name_param_parts[ 0 ].equalsIgnoreCase( "LABEL" ) )

680

717

parseLABEL( name_param_parts, complete_value );

718

else if( name_param_parts[ 0 ].equalsIgnoreCase( "NOTE" ) )

719

parseNOTE( name_param_parts, complete_value );

681

720

}

682

721

}

683

722

755

794

in_escape = false;

756

795

switch( c )

757

796

{

797

case 'T':

798

case 't':

799

// add tab (invalid/non-standard, but accepted)

800

ret.append( '\t' );

801

break;

758

802

case 'N':

759

803

case 'n':

760

804

// add newline

768

812

break;

769

813

default:

770

814

// unknown escape sequence, so add it unescaped

815

// (invalid/non-standard, but accepted)

771

816

ret.append( "\\" );

772

817

ret.append( Character.toChars( c ) );

773

818

break;

798

843

for( int b = 0; b < name_part_parts.length; b++ )

799

844

if( name_part_parts[ b ].length() > 0 )

800

845

{

801

if( value.length() == 0 ) value += " ";

846

if( value.length() > 0 ) value += " ";

802

847

value += name_part_parts[ b ];

803

848

}

804

849

}

879

924

int type;

880

925

if( types.contains( "FAX" ) )

881

926

if( types.contains( "HOME" ) )

882

type = PhonesColumns.TYPE_FAX_HOME;

927

type = TYPE_FAX_HOME;

883

928

else

884

type = PhonesColumns.TYPE_FAX_WORK;

929

type = TYPE_FAX_WORK;

885

930

else if( types.contains( "CELL" ) || types.contains( "VIDEO" ) )

886

type = PhonesColumns.TYPE_MOBILE;

931

type = TYPE_MOBILE;

887

932

else if( types.contains( "PAGER" ) )

888

type = PhonesColumns.TYPE_PAGER;

933

type = TYPE_PAGER;

889

934

else if( types.contains( "WORK" ) )

890

type = PhonesColumns.TYPE_WORK;

935

type = TYPE_WORK;

891

936

else

892

type = PhonesColumns.TYPE_HOME;

937

type = TYPE_HOME;

893

938

894

939

// add phone number

895

940

addNumber( value, type, is_preferred );

906

951

boolean is_preferred = types.contains( "PREF" );

907

952

int type;

908

953

if( types.contains( "WORK" ) )

909

type = Contacts.ContactMethods.TYPE_WORK;

954

type = TYPE_WORK;

910

955

else

911

type = Contacts.ContactMethods.TYPE_HOME;

956

type = TYPE_HOME;

912

957

913

958

addEmail( unescapeValue( value ), type, is_preferred );

914

959

}

923

968

for( int a = 0; a < adr_parts.length; a++ )

924

969

if( adr_parts[ a ].length() > 0 )

925

970

{

926

// split this part in to it's comma-separated bits

927

String[] adr_part_parts =

928

splitValueByCharacter( adr_parts[ a ], ',' );

929

for( int b = 0; b < adr_part_parts.length; b++ )

930

if( adr_part_parts[ b ].length() > 0 )

931

{

932

if( value.length() > 0 ) value += "\n";

933

value += adr_part_parts[ b ];

934

}

971

// version 3.0 vCards allow further splitting by comma

972

if( _version.equals( "3.0" ) )

973

{

974

// split this part in to it's comma-separated bits and

975

// add them on individual lines

976

String[] adr_part_parts =

977

splitValueByCharacter( adr_parts[ a ], ',' );

978

for( int b = 0; b < adr_part_parts.length; b++ )

979

if( adr_part_parts[ b ].length() > 0 )

980

{

981

if( value.length() > 0 ) value += "\n";

982

value += adr_part_parts[ b ];

983

}

984

}

985

else

986

{

987

// add this part on an individual line

988

if( value.length() > 0 ) value += "\n";

989

value += adr_parts[ a ];

990

}

935

991

}

936

992

937

993

Set< String > types = extractTypes( params, Arrays.asList(

940

996

// add address

941

997

int type;

942

998

if( types.contains( "WORK" ) )

943

type = Contacts.ContactMethods.TYPE_WORK;

999

type = TYPE_WORK;

944

1000

else

945

type = Contacts.ContactMethods.TYPE_HOME;

1001

type = TYPE_HOME;

946

1002

947

1003

addAddress( unescapeValue( value ), type );

948

1004

}

955

1011

// add address

956

1012

int type;

957

1013

if( types.contains( "WORK" ) )

958

type = Contacts.ContactMethods.TYPE_WORK;

1014

type = TYPE_WORK;

959

1015

else

960

type = Contacts.ContactMethods.TYPE_HOME;

1016

type = TYPE_HOME;

961

1017

962

1018

addAddress( unescapeValue( value ), type );

963

1019

}

964

1020

1021

private void parseNOTE( String[] params, String value )

1022

{

1023

addNote( unescapeValue( value ) );

1024

}

1025

965

1026

public void finaliseVcard()

966

1027

throws ParseException, ContactNotIdentifiableException

967

1028

{

968

1029

// missing version (and data is present)

969

if( _version == null && _buffers != null )

1030

if( _version == null && _content_lines != null )

970

1031

throw new ParseException( R.string.error_vcf_malformed );

971

1032

972

1033

// finalise the parent class

997

1058

HashSet< String > ret = new HashSet< String >();

998

1059

999

1060

Pattern p = Pattern.compile(

1000

"^" + name + "[ \\t]*=[ \\t]*(\"?)(.*)\\1$" );

1061

"^" + name + "[ \\t]*=[ \\t]*(\"?)(.*)\\1$",

1062

Pattern.CASE_INSENSITIVE );

1001

1063

for( int i = 0; i < params.length; i++ ) {

1002

1064

Matcher m = p.matcher( params[ i ] );

1003

1065

if( m.matches() )

1011

1073

* Amongst the params, return any type values present. For v2.1 vCards,

1012

1074

* those types are just parameters. For v3.0, they are prefixed with

1013

1075

* "TYPE=". There may also be multiple type parameters.

1014

* @param params

1015

* @param a list of type values to look for

1076

* @param params an array of params to look for types in

1077

* @param valid_types an list of upper-case type values to look for

1016

1078

* @return a set of present type values

1017

1079

*/

1018

1080

private Set< String > extractTypes( String[] params,

1024

1086

String type_params[] = checkParams( params, "TYPE" );

1025

1087

for( int a = 0; a < type_params.length; a++ )

1026

1088

{

1027

// check for a comma-separated list of types (why? this isn't in

1028

// the specs!)

1089

// check for a comma-separated list of types (why? I don't think

1090

// this is in the specs!)

1029

1091

String[] parts = type_params[ a ].split( "," );

1030

for( int i = 0; i < parts.length; i++ )

1031

if( valid_types.contains( parts[ i ] ) )

1032

types.add( parts[ i ] );

1092

for( int i = 0; i < parts.length; i++ ) {

1093

String ucpart = parts[ i ].toUpperCase( Locale.US );

1094

if( valid_types.contains( ucpart ) )

1095

types.add( ucpart );

1096

}

1033

1097

}

1034

1098

1035

1099

// get 2.1-style type param

1036

1100

if( _version.equals( "2.1" ) ) {

1037

for( int i = 1; i < params.length; i++ )

1038

if( valid_types.contains( params[ i ] ) )

1039

types.add( params[ i ] );

1101

for( int i = 1; i < params.length; i++ ) {

1102

String ucparam = params[ i ].toUpperCase( Locale.US );

1103

if( valid_types.contains( ucparam ) )

1104

types.add( ucparam );

1105

}

1040

1106

}

1041

1107

1042

1108

return types;