(root)/android/import-contacts
» Revision
62
(compared to revision 40)
: 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 62
- compare with another revision
- download diff
- download tarball
- view history from revision 62
- Committer: edam
- Date: 2012-12-19 17:51:35 UTC
- Revision ID: tim@ed.am-20121219175135-1cpuafp76jg1ib1p
added preliminary (buggy) ContactsContract backend
- files added:
- gen/am
- gen/am/ed
- gen/am/ed/importcontacts
- src/am
- src/am/ed
- files removed:
- default.properties
- gen/org
- gen/org/waxworlds
- gen/org/waxworlds/edam
- gen/org/waxworlds/edam/importcontacts
- src/org
- src/org/waxworlds
- src/org/waxworlds/edam
- files renamed:
- src/org/waxworlds/edam/importcontacts/ => src/am/ed/importcontacts/
- src/org/waxworlds/edam/importcontacts/VCFImporter.java => src/am/ed/importcontacts/VcardImporter.java
- files modified:
- .classpath
added
removed
src/am/ed/importcontacts/VcardImporter.java
1
1
/*
2
2
* VCFImporter.java
3
3
*
4
* Copyright (C) 2009 to 2011 Tim Marston <edam@waxworlds.org>
4
* Copyright (C) 2009 to 2011 Tim Marston <tim@ed.am>
5
5
*
6
6
* This file is part of the Import Contacts program (hereafter referred
7
7
* to as "this program"). For more information, see
8
* http://www.waxworlds.org/edam/software/android/import-contacts
8
* http://ed.am/dev/android/import-contacts
9
9
*
10
10
* This program is free software: you can redistribute it and/or modify
11
11
* it under the terms of the GNU General Public License as published by
21
21
* along with this program. If not, see <http://www.gnu.org/licenses/>.
22
22
*/
23
23
24
package org.waxworlds.edam.importcontacts;
24
package am.ed.importcontacts;
25
25
26
26
import java.io.BufferedReader;
27
27
import java.io.File;
38
38
import java.util.HashSet;
39
39
import java.util.Iterator;
40
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
47
import org.waxworlds.edam.importcontacts.Importer.ContactData.ExtraDetail;
48
48
import android.annotation.SuppressLint;
49
49
import android.content.SharedPreferences;
50
import android.provider.Contacts;
51
import android.provider.Contacts.PhonesColumns;
52
50
53
public class VCFImporter extends Importer
51
public class VcardImporter extends Importer
54
52
{
55
private int _vCardCount = 0;
53
private int _vcard_count = 0;
56
54
private int _progress = 0;
57
55
58
public VCFImporter( Doit doit )
56
public VcardImporter( Doit doit )
59
57
{
60
58
super( doit );
61
59
}
62
60
61
@SuppressLint( "SdCardPath" )
63
62
@Override
64
63
protected void onImport() throws AbortImportException
65
64
{
84
83
// get files
85
84
class VCardFilter implements FilenameFilter {
86
85
public boolean accept( File dir, String name ) {
87
return name.toLowerCase().endsWith( ".vcf" );
86
return name.toLowerCase( Locale.US ).endsWith( ".vcf" );
88
87
}
89
88
}
90
89
files = file.listFiles( new VCardFilter() );
112
111
countVCardFile( files[ i ] );
113
112
setTmpProgress( i );
114
113
}
115
setProgressMax( _vCardCount ); // will also update tmp progress
114
setProgressMax( _vcard_count ); // will also update tmp progress
116
115
117
116
// import them
118
117
setProgress( 0 );
119
118
for( int i = 0; i < files.length; i++ )
120
119
importVCardFile( files[ i ] );
120
setProgress( _vcard_count );
121
121
}
122
122
123
123
private void countVCardFile( File file ) throws AbortImportException
130
130
131
131
// read
132
132
String line;
133
boolean inVCard = false;
133
boolean in_vcard = false;
134
134
while( ( line = reader.readLine() ) != null )
135
135
{
136
if( !inVCard ) {
136
if( !in_vcard ) {
137
137
// look for vcard beginning
138
138
if( line.matches( "^BEGIN:VCARD" ) ) {
139
inVCard = true;
140
_vCardCount++;
139
in_vcard = true;
140
_vcard_count++;
141
141
}
142
142
}
143
143
else if( line.matches( "^END:VCARD" ) )
144
inVCard = false;
144
in_vcard = false;
145
145
}
146
146
147
147
}
170
170
FileInputStream istream = new FileInputStream( file );
171
171
byte[] content = new byte[ (int)file.length() ];
172
172
istream.read( content );
173
istream = null;
173
174
174
175
// import
175
176
importVCardFileContent( content, file.getName() );
187
188
throws AbortImportException
188
189
{
189
190
// go through lines
190
VCard vCard = null;
191
Vcard vcard = null;
192
int vcard_start_line = 0;
191
193
ContentLineIterator cli = new ContentLineIterator( content );
192
194
while( cli.hasNext() )
193
195
{
204
206
line = "";
205
207
}
206
208
207
if( vCard == null ) {
209
if( vcard == null ) {
208
210
// look for vcard beginning
209
211
if( line.matches( "^BEGIN:VCARD" ) ) {
210
setProgress( ++_progress );
211
vCard = new VCard();
212
setProgress( _progress++ );
213
vcard = new Vcard();
214
vcard_start_line = cli.getLineNumber();
212
215
}
213
216
}
214
217
else {
215
218
// look for vcard content or ending
216
219
if( line.matches( "^END:VCARD" ) )
217
220
{
218
// store vcard and do away with it
221
// finalise the vcard/contact
219
222
try {
220
vCard.finaliseParsing();
221
importContact( vCard );
222
}
223
catch( VCard.ParseException e ) {
224
skipContact();
225
if( !showContinue(
226
getText( R.string.error_vcf_parse ).toString()
227
+ fileName + "\n" + e.getMessage() ) )
228
{
229
finish( ACTION_ABORT );
230
}
231
}
232
catch( VCard.SkipContactException e ) {
233
skipContact();
234
// do nothing
235
}
236
vCard = null;
223
vcard.finaliseVcard();
224
225
// pass the finalised contact to the importer
226
importContact( vcard );
227
}
228
catch( Vcard.ParseException e ) {
229
if( !showContinue(
230
getText( R.string.error_vcf_parse ).toString()
231
+ fileName +
232
getText( R.string.error_vcf_parse_line ).toString()
233
+ cli.getLineNumber() + ":\n" + e.getMessage() ) )
234
{
235
finish( ACTION_ABORT );
236
}
237
else
238
skipContact();
239
}
240
catch( ContactData.ContactNotIdentifiableException e ) {
241
if( !showContinue(
242
getText( R.string.error_vcf_parse ).toString()
243
+ fileName +
244
getText( R.string.error_vcf_parse_line ).toString()
245
+ vcard_start_line + ":\n" + getText(
246
R.string.error_vcf_notenoughinfo ).toString()
247
) )
248
{
249
finish( ACTION_ABORT );
250
}
251
else
252
skipContact();
253
}
254
255
// discard this vcard
256
vcard = null;
237
257
}
238
258
else
239
259
{
240
260
// try giving the line to the vcard
241
261
try {
242
vCard.parseLine( buffer, line,
262
vcard.parseLine( buffer, line,
243
263
cli.doesNextLineLookFolded() );
244
264
}
245
catch( VCard.ParseException e ) {
265
catch( Vcard.ParseException e ) {
246
266
skipContact();
247
267
if( !showContinue(
248
268
getText( R.string.error_vcf_parse ).toString()
249
+ fileName + "\n" + e.getMessage() ) )
269
+ fileName +
270
getText( R.string.error_vcf_parse_line ).toString()
271
+ cli.getLineNumber() + "\n" + e.getMessage() ) )
250
272
{
251
273
finish( ACTION_ABORT );
252
274
}
254
276
// although we're continuing, we still need to abort
255
277
// this vCard. Further lines will be ignored until we
256
278
// get to another BEGIN:VCARD line.
257
vCard = null;
279
vcard = null;
258
280
}
259
catch( VCard.SkipContactException e ) {
281
catch( Vcard.SkipImportException e ) {
260
282
skipContact();
261
283
// abort this vCard. Further lines will be ignored until
262
284
// we get to another BEGIN:VCARD line.
263
vCard = null;
285
vcard = null;
264
286
}
265
287
}
266
288
}
271
293
{
272
294
protected byte[] _content = null;
273
295
protected int _pos = 0;
296
protected int _line = 0;
274
297
275
298
public ContentLineIterator( byte[] content )
276
299
{
296
319
int to = ( _pos > 0 && _content[ _pos - 1 ] == '\r' &&
297
320
_pos > initial_pos )? _pos - 1 : _pos;
298
321
_pos++;
322
_line++;
299
323
return ByteBuffer.wrap( _content, initial_pos,
300
324
to - initial_pos );
301
325
}
304
328
if( _pos != initial_pos ) {
305
329
int to = _pos;
306
330
_pos++;
331
_line++;
307
332
return ByteBuffer.wrap( _content, initial_pos,
308
333
to - initial_pos );
309
334
}
328
353
return _pos > 0 && _pos < _content.length &&
329
354
_content[ _pos - 1 ] == '\n' && _content[ _pos ] == ' ';
330
355
}
356
357
public int getLineNumber()
358
{
359
return _line;
360
}
331
361
}
332
362
333
private class VCard extends ContactData
363
private class Vcard extends ContactData
334
364
{
335
365
private final static int NAMELEVEL_NONE = 0;
336
private final static int NAMELEVEL_FN = 1;
337
private final static int NAMELEVEL_N = 2;
366
private final static int NAMELEVEL_N = 1;
367
private final static int NAMELEVEL_FN = 2;
338
368
339
369
private final static int MULTILINE_NONE = 0;
340
370
private final static int MULTILINE_ENCODED = 1; // v2.1 quoted-printable
384
414
385
415
public ParseException( int res )
386
416
{
387
super( VCFImporter.this.getText( res ).toString() );
417
super( VcardImporter.this.getText( res ).toString() );
388
418
}
389
419
}
390
420
391
421
@SuppressWarnings("serial")
392
protected class SkipContactException extends Exception { }
422
protected class SkipImportException extends Exception { }
393
423
394
424
private String extractCollonPartFromLine( ByteBuffer buffer,
395
425
String line, boolean former )
431
461
432
462
public void parseLine( ByteBuffer buffer, String line,
433
463
boolean next_line_looks_folded )
434
throws ParseException, SkipContactException,
464
throws ParseException, SkipImportException,
435
465
AbortImportException
436
466
{
437
467
// do we have a version yet?
537
567
for( int i = 0; i < name_param_parts.length; i++ )
538
568
name_param_parts[ i ] = name_param_parts[ i ].trim();
539
569
570
// determine whether we care about this entry
571
final HashSet< String > interesting_fields =
572
new HashSet< String >( Arrays.asList( new String[] { "N",
573
"FN", "ORG", "TITLE", "TEL", "EMAIL", "ADR", "LABEL" }
574
) );
575
boolean is_interesting_field =
576
interesting_fields.contains( name_param_parts[ 0 ] );
577
540
578
// parse encoding parameter
541
579
String encoding = checkParam( name_param_parts, "ENCODING" );
542
if( encoding != null ) encoding = encoding.toUpperCase();
543
if( encoding != null && !encoding.equals( "8BIT" ) &&
580
if( encoding != null )
581
encoding = encoding.toUpperCase( Locale.US );
582
if( is_interesting_field && encoding != null &&
583
!encoding.equals( "8BIT" ) &&
544
584
!encoding.equals( "QUOTED-PRINTABLE" ) )
545
585
//&& !encoding.equals( "BASE64" ) )
546
586
{
549
589
550
590
// parse charset parameter
551
591
String charset = checkParam( name_param_parts, "CHARSET" );
552
if( charset != null ) charset = charset.toUpperCase();
553
if( charset != null && !charset.equals( "US-ASCII" ) &&
592
if( charset != null )
593
charset = charset.toUpperCase( Locale.US );
594
if( charset != null &&
595
!charset.equals( "US-ASCII" ) &&
554
596
!charset.equals( "ASCII" ) &&
555
597
!charset.equals( "UTF-8" ) )
556
598
{
570
612
_parser_multiline_state = MULTILINE_ENCODED;
571
613
}
572
614
573
// convert 8-bit ASCII charset to US-ASCII
574
if( charset == null || charset.equals( "ASCII" ) ) {
615
// convert 8-bit US-ASCII charset to UTF-8 (where no charset is
616
// specified for a v2.1 vcard entry, we assume it's US-ASCII)
617
if( ( charset == null && _version.equals( "2.1" ) ) ||
618
( charset != null && (
619
charset.equals( "ASCII" ) ||
620
charset.equals( "US-ASCII" ) ) ) )
621
{
575
622
value = transcodeAsciiToUtf8( value );
576
charset = "UTF-8";
577
623
}
578
624
579
// process charset
625
// process charset (value is now in UTF-8)
580
626
String string_value;
581
627
try {
582
628
string_value = new String( value.array(), value.position(),
583
value.limit() - value.position(), charset );
629
value.limit() - value.position(), "UTF-8" );
584
630
} catch( UnsupportedEncodingException e ) {
585
631
throw new ParseException( R.string.error_vcf_charset );
586
632
}
633
679
parseEMAIL( name_param_parts, complete_value );
634
680
else if( name_param_parts[ 0 ].equals( "ADR" ) )
635
681
parseADR( name_param_parts, complete_value );
682
else if( name_param_parts[ 0 ].equals( "LABEL" ) )
683
parseLABEL( name_param_parts, complete_value );
636
684
}
637
685
}
638
686
651
699
return ( count & 1 ) == 1;
652
700
}
653
701
654
private String[] splitValueBySemicolon( String value )
702
private String[] splitValueByCharacter( String value, char character )
655
703
{
656
// split string in to parts by semicolon
704
// split string in to parts by specified character
657
705
ArrayList< String > parts = new ArrayList< String >(
658
Arrays.asList( value.split( ";" ) ) );
706
Arrays.asList( value.split( "" + character ) ) );
659
707
660
708
// go through parts
661
709
for( int a = 0; a < parts.size(); a++ )
669
717
if( a < parts.size() - 1 &&
670
718
doesStringEndInAnEscapeChar( str ) )
671
719
{
672
// join the next part to this part and remove the next part
720
// append the escaped character, join the next part to this
721
// part and remove the next part
673
722
parts.set( a, str.substring( 0, str.length() - 1 ) +
674
';' + parts.get( a + 1 ) );
723
character + parts.get( a + 1 ) );
675
724
parts.remove( a + 1 );
676
725
677
726
// re-visit this part
688
737
return parts.toArray( ret );
689
738
}
690
739
740
private String unescapeValue( String value )
741
{
742
StringBuilder ret = new StringBuilder( value.length() );
743
boolean in_escape = false;
744
for( int a = 0; a < value.length(); a++ )
745
{
746
int c = value.codePointAt( a );
747
748
// process a normal character
749
if( !in_escape ) {
750
if( c == '\\' )
751
in_escape = true;
752
else
753
ret.append( Character.toChars( c ) );
754
continue;
755
}
756
757
// process an escape sequence
758
in_escape = false;
759
switch( c )
760
{
761
case 'N':
762
case 'n':
763
// add newline
764
ret.append( '\n' );
765
break;
766
case '\\':
767
case ',':
768
case ';':
769
// add escaped character
770
ret.append( Character.toChars( c ) );
771
break;
772
default:
773
// unknown escape sequence, so add it unescaped
774
ret.append( "\\" );
775
ret.append( Character.toChars( c ) );
776
break;
777
}
778
}
779
780
return ret.toString();
781
}
782
691
783
private void parseN( String[] params, String value )
692
784
{
693
785
// already got a better name?
694
786
if( _name_level >= NAMELEVEL_N ) return;
695
787
696
788
// get name parts
697
String[] name_parts = splitValueBySemicolon( value );
789
String[] name_parts = splitValueByCharacter( value, ';' );
698
790
699
791
// build name
700
792
value = "";
701
if( name_parts.length > 1 && name_parts[ 1 ].length() > 0 )
702
value += name_parts[ 1 ];
703
if( name_parts.length > 0 && name_parts[ 0 ].length() > 0 )
704
value += ( value.length() == 0? "" : " " ) + name_parts[ 0 ];
793
final int[] part_order = { 3, 1, 2, 0, 4 };
794
for( int a = 0; a < part_order.length; a++ )
795
if( name_parts.length > part_order[ a ] &&
796
name_parts[ part_order[ a ] ].length() > 0 )
797
{
798
// split this part in to it's comma-separated bits
799
String[] name_part_parts = splitValueByCharacter(
800
name_parts[ part_order[ a ] ], ',' );
801
for( int b = 0; b < name_part_parts.length; b++ )
802
if( name_part_parts[ b ].length() > 0 )
803
{
804
if( value.length() == 0 ) value += " ";
805
value += name_part_parts[ b ];
806
}
807
}
705
808
706
809
// set name
707
setName( value );
810
setName( unescapeValue( value ) );
708
811
_name_level = NAMELEVEL_N;
709
812
}
710
813
714
817
if( _name_level >= NAMELEVEL_FN ) return;
715
818
716
819
// set name
717
setName( value );
820
setName( unescapeValue( value ) );
718
821
_name_level = NAMELEVEL_FN;
719
822
}
720
823
721
824
private void parseORG( String[] params, String value )
722
825
{
723
826
// get org parts
724
String[] org_parts = splitValueBySemicolon( value );
827
String[] org_parts = splitValueByCharacter( value, ';' );
725
828
if( org_parts == null || org_parts.length < 1 ) return;
726
829
727
830
// build organisation name
729
832
String.valueOf( org_parts[ 0 ] ) );
730
833
for( int a = 1; a < org_parts.length; a++ )
731
834
builder.append( ", " ).append( org_parts[ a ] );
732
String organisation = builder.toString();
835
String organisation = unescapeValue( builder.toString() );
733
836
734
837
// set organisation name (using a title we've previously found)
735
838
addOrganisation( organisation, _cached_title, true );
746
849
747
850
private void parseTITLE( String[] params, String value )
748
851
{
852
value = unescapeValue( value );
853
749
854
// if we previously had an organisation, look it up and append this
750
855
// title to it
751
856
if( _cached_organisation != null && hasOrganisations() ) {
773
878
"PAGER", "BBS", "MODEM", "CAR", "ISDN", "VIDEO" ) );
774
879
775
880
// here's the logic...
776
boolean preferred = types.contains( "PREF" );
881
boolean is_preferred = types.contains( "PREF" );
777
882
int type;
778
883
if( types.contains( "FAX" ) )
779
884
if( types.contains( "HOME" ) )
780
type = PhonesColumns.TYPE_FAX_HOME;
885
type = TYPE_FAX_HOME;
781
886
else
782
type = PhonesColumns.TYPE_FAX_WORK;
887
type = TYPE_FAX_WORK;
783
888
else if( types.contains( "CELL" ) || types.contains( "VIDEO" ) )
784
type = PhonesColumns.TYPE_MOBILE;
889
type = TYPE_MOBILE;
785
890
else if( types.contains( "PAGER" ) )
786
type = PhonesColumns.TYPE_PAGER;
891
type = TYPE_PAGER;
787
892
else if( types.contains( "WORK" ) )
788
type = PhonesColumns.TYPE_WORK;
893
type = TYPE_WORK;
789
894
else
790
type = PhonesColumns.TYPE_HOME;
895
type = TYPE_HOME;
791
896
792
897
// add phone number
793
addNumber( value, type, preferred );
898
addNumber( value, type, is_preferred );
794
899
}
795
900
796
901
public void parseEMAIL( String[] params, String value )
801
906
"PREF", "WORK", "HOME", "INTERNET" ) );
802
907
803
908
// add email address
804
boolean preferred = types.contains( "PREF" );
909
boolean is_preferred = types.contains( "PREF" );
805
910
int type;
806
911
if( types.contains( "WORK" ) )
807
type = Contacts.ContactMethods.TYPE_WORK;
912
type = TYPE_WORK;
808
913
else
809
type = Contacts.ContactMethods.TYPE_HOME;
914
type = TYPE_HOME;
810
915
811
addEmail( value, type, preferred );
916
addEmail( unescapeValue( value ), type, is_preferred );
812
917
}
813
918
814
919
private void parseADR( String[] params, String value )
815
920
{
816
921
// get address parts
817
String[] adr_parts = splitValueBySemicolon( value );
922
String[] adr_parts = splitValueByCharacter( value, ';' );
818
923
819
924
// build address
820
925
value = "";
821
for( int a = 0; a < adr_parts.length; a++ ) {
822
if( value.length() > 0 ) value += "\n";
823
value += adr_parts[ a ].trim();
824
}
825
826
Set< String > types = extractTypes( params, Arrays.asList(
827
"PREF", "WORK", "HOME", "INTERNET" ) );
828
829
// add address
830
int type;
831
if( types.contains( "WORK" ) )
832
type = Contacts.ContactMethods.TYPE_WORK;
833
else
834
type = Contacts.ContactMethods.TYPE_HOME;
835
836
addAddress( value, type );
837
}
838
839
public void finaliseParsing()
840
throws ParseException, SkipContactException,
841
AbortImportException
926
for( int a = 0; a < adr_parts.length; a++ )
927
if( adr_parts[ a ].length() > 0 )
928
{
929
// split this part in to it's comma-separated bits
930
String[] adr_part_parts =
931
splitValueByCharacter( adr_parts[ a ], ',' );
932
for( int b = 0; b < adr_part_parts.length; b++ )
933
if( adr_part_parts[ b ].length() > 0 )
934
{
935
if( value.length() > 0 ) value += "\n";
936
value += adr_part_parts[ b ];
937
}
938
}
939
940
Set< String > types = extractTypes( params, Arrays.asList(
941
"PREF", "WORK", "HOME" ) );
942
943
// add address
944
int type;
945
if( types.contains( "WORK" ) )
946
type = TYPE_WORK;
947
else
948
type = TYPE_HOME;
949
950
addAddress( unescapeValue( value ), type );
951
}
952
953
private void parseLABEL( String[] params, String value )
954
{
955
Set< String > types = extractTypes( params, Arrays.asList(
956
"PREF", "WORK", "HOME" ) );
957
958
// add address
959
int type;
960
if( types.contains( "WORK" ) )
961
type = TYPE_WORK;
962
else
963
type = TYPE_HOME;
964
965
addAddress( unescapeValue( value ), type );
966
}
967
968
public void finaliseVcard()
969
throws ParseException, ContactNotIdentifiableException
842
970
{
843
971
// missing version (and data is present)
844
972
if( _version == null && _buffers != null )
845
973
throw new ParseException( R.string.error_vcf_malformed );
846
974
847
// check if we should import this contact
848
try {
849
if( !isImportRequired( this ) )
850
throw new SkipContactException();
851
}
852
catch( ContactNeedsMoreInfoException e ) {
853
throw new ParseException( R.string.error_vcf_notenoughinfo );
854
}
975
// finalise the parent class
976
finalise();
855
977
}
856
978
979
/**
980
* Amongst the params, find the value of the first, only, of any with
981
* the specified name
982
* @param params
983
* @param name
984
* @return a value, or null
985
*/
857
986
private String checkParam( String[] params, String name )
858
987
{
988
String[] res = checkParams( params, name );
989
return res.length > 0? res[ 0 ] : null;
990
}
991
992
/**
993
* Amongst the params, find the values of any with the specified name
994
* @param params
995
* @param name
996
* @return an array of values, or null
997
*/
998
private String[] checkParams( String[] params, String name )
999
{
1000
HashSet< String > ret = new HashSet< String >();
1001
859
1002
Pattern p = Pattern.compile(
860
1003
"^" + name + "[ \\t]*=[ \\t]*(\"?)(.*)\\1$" );
861
1004
for( int i = 0; i < params.length; i++ ) {
862
1005
Matcher m = p.matcher( params[ i ] );
863
1006
if( m.matches() )
864
return m.group( 2 );
1007
ret.add( m.group( 2 ) );
865
1008
}
866
return null;
1009
1010
return (String[]) ret.toArray( new String[ ret.size() ] );
867
1011
}
868
1012
1013
/**
1014
* Amongst the params, return any type values present. For v2.1 vCards,
1015
* those types are just parameters. For v3.0, they are prefixed with
1016
* "TYPE=". There may also be multiple type parameters.
1017
* @param params
1018
* @param a list of type values to look for
1019
* @return a set of present type values
1020
*/
869
1021
private Set< String > extractTypes( String[] params,
870
1022
List< String > valid_types )
871
1023
{
872
1024
HashSet< String > types = new HashSet< String >();
873
1025
874
1026
// get 3.0-style TYPE= param
875
String type_param;
876
if( ( type_param = checkParam( params, "TYPE" ) ) != null ) {
877
String[] parts = type_param.split( "," );
1027
String type_params[] = checkParams( params, "TYPE" );
1028
for( int a = 0; a < type_params.length; a++ )
1029
{
1030
// check for a comma-separated list of types (why? this isn't in
1031
// the specs!)
1032
String[] parts = type_params[ a ].split( "," );
878
1033
for( int i = 0; i < parts.length; i++ )
879
1034
if( valid_types.contains( parts[ i ] ) )
880
1035
types.add( parts[ i ] );
Loggerhead is a web-based interface for Bazaar branches
Version: 1.18.2, Revision: 480