Revision 41917
trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.file/org.gvsig.fmap.dal.file.dbf/src/main/resources/org/gvsig/fmap/dal/store/dbf/DBFParameters.xml | ||
---|---|---|
39 | 39 |
<field name="DbfFile" label="DBF file" type="file" mandatory="true" group="Basic"> |
40 | 40 |
<description>dbf file</description> |
41 | 41 |
</field> |
42 |
<field name="Encoding" type="string" mandatory="false" group="Basic"> |
|
42 |
<field name="Encoding" type="string" mandatory="false" defaultValue="DEFAULT" group="Basic">
|
|
43 | 43 |
<description>Encoding used in this file</description> |
44 | 44 |
<availableValues> |
45 |
<value label="(default)"></value>
|
|
45 |
<value label="Default (use dbf language)">DEFAULT</value>
|
|
46 | 46 |
<value label="US-ASCII">US-ASCII</value> |
47 | 47 |
<value label="ISO-8859-1">ISO-8859-1</value> |
48 | 48 |
<value label="ISO-8859-15">ISO-8859-15</value> |
trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.file/org.gvsig.fmap.dal.file.dbf/src/main/java/org/gvsig/fmap/dal/store/dbf/DBFStoreParameters.java | ||
---|---|---|
114 | 114 |
} |
115 | 115 |
|
116 | 116 |
public String getEncodingName() { |
117 |
return (String) getDynValue(ENCODING_PARAMTER_NAME); |
|
118 |
} |
|
117 |
String s = (String) getDynValue(ENCODING_PARAMTER_NAME); |
|
118 |
if( StringUtils.isBlank(s) ) { |
|
119 |
return null; |
|
120 |
} |
|
121 |
if( "DEFAULT".equalsIgnoreCase(s.trim()) ) { |
|
122 |
return null; |
|
123 |
} |
|
124 |
return s.trim(); |
|
125 |
} |
|
119 | 126 |
|
120 | 127 |
public Charset getEncoding() { |
121 | 128 |
String name = getEncodingName(); |
122 |
if (name == null) {
|
|
123 |
return null;
|
|
124 |
}
|
|
129 |
if( StringUtils.isBlank(name) ) {
|
|
130 |
return null;
|
|
131 |
}
|
|
125 | 132 |
return Charset.forName(name); |
126 | 133 |
} |
127 | 134 |
|
Also available in: Unified diff