Project

General

Profile

Revision 67a13c3a

ID67a13c3a48359a6e5cc57434a3d55eadec527bd5
Parent 196f57b5
Child 7dab818c, 9d12e9e1

Added by Patrick Plitzner almost 8 years ago

fixed encoding to UTF-8

View differences:

cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/NaturalLanguageTerm.java
101 101
	public static final NaturalLanguageTerm TO(){
102 102
		NaturalLanguageTerm nlt = TO;
103 103
		Representation representation = Representation.NewInstance("", "to", "", Language.ENGLISH());
104
		Representation representation2 = Representation.NewInstance("", "?", "", Language.FRENCH());
104
		Representation representation2 = Representation.NewInstance("", "à", "", Language.FRENCH());
105 105
		nlt.addRepresentation(representation);
106 106
		nlt.addRepresentation(representation2);
107 107
		return nlt;
......
110 110
	public static final NaturalLanguageTerm UP_TO(){
111 111
		NaturalLanguageTerm nlt = UP_TO;
112 112
		Representation representation = Representation.NewInstance("", "up to", "", Language.ENGLISH());
113
		Representation representation2 = Representation.NewInstance("", "jusqu'?", "", Language.FRENCH());
113
		Representation representation2 = Representation.NewInstance("", "jusqu'à", "", Language.FRENCH());
114 114
		nlt.addRepresentation(representation);
115 115
		nlt.addRepresentation(representation2);
116 116
		return nlt;
......
119 119
	public static final NaturalLanguageTerm MOST_FREQUENTLY(){
120 120
		NaturalLanguageTerm nlt = MOST_FREQUENTLY;
121 121
		Representation representation = Representation.NewInstance("", "most frequently", "", Language.ENGLISH());
122
		Representation representation2 = Representation.NewInstance("", "plus fr?quemment", "", Language.FRENCH());
122
		Representation representation2 = Representation.NewInstance("", "plus fréquemment", "", Language.FRENCH());
123 123
		nlt.addRepresentation(representation);
124 124
		nlt.addRepresentation(representation2);
125 125
		return nlt;
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/BotanicalName.java
316 316
	/**
317 317
	 * Checks if this name is an autonym.<BR>
318 318
	 * An autonym is a taxon name that has equal specific and infra specific epithets.<BR>
319
	 * {@link http://ibot.sav.sk/icbn/frameset/0010Ch2Sec1a006.htm#6.8. Vienna Code ?6.8}
319
	 * {@link http://ibot.sav.sk/icbn/frameset/0010Ch2Sec1a006.htm#6.8. Vienna Code §6.8}
320 320
	 * @return true, if name has Rank, Rank is below species and species epithet equals infraSpeciesEpithtet, else false
321 321
	 */
322 322
	@Override
cdmlib-model/src/test/java/eu/etaxonomy/cdm/datagenerator/TaxonGenerator.java
129 129
		taxonDescription.addElement(textData);
130 130
		
131 131
		//commonName
132
		String commonNameString = "Sch?nveilchen";
132
		String commonNameString = "Schönveilchen";
133 133
		CommonTaxonName commonName = CommonTaxonName.NewInstance(commonNameString, language);
134 134
		taxonDescription.addElement(commonName);
135 135
		
cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/location/PointTest.java
253 253
		
254 254
		try {
255 255
			point1.setLongitudeByParsing("191");
256
			Assert.fail("Longitude can be > 180?");
256
			Assert.fail("Longitude can be > 180°");
257 257
		} catch (ParseException e) {
258
			Assert.assertTrue("Longitude can not > 180?", true);
258
			Assert.assertTrue("Longitude can not > 180°", true);
259 259
		}
260 260
		try {
261 261
			point1.setLatitudeByParsing("2\u00B039'38,5956\"S");
262 262
		} catch (ParseException e) {
263
			Assert.fail("String '2?39'38,5956\"S'should be parsable");
263
			Assert.fail("String '2°39'38,5956\"S'should be parsable");
264 264
		}
265 265
}
266 266
	
cdmlib-model/src/test/java/eu/etaxonomy/cdm/test/function/strategy/TestTaxonNameParserBotanicalNameImpl.java
33 33
	private static final Logger logger = Logger.getLogger(TestTaxonNameParserBotanicalNameImpl.class);
34 34
	
35 35
	final private String strNameFamily = "Asteraceae";
36
	final private String strNameGenus = "Abies M?ller";
36
	final private String strNameGenus = "Abies Müller";
37 37
	final private String strNameAbies1 = "Abies alba";
38 38
	final private String strNameAbiesSub1 = "Abies alba subsp. beta";
39
	final private String strNameAbiesAuthor1 = "Abies alba M?ller";
40
	final private String strNameAbiesBasionymAuthor1 = "Abies alba (Ciardelli) D'M?ller";
41
	final private String strNameAbiesBasionymExAuthor1 ="Abies alba (Ciardelli ex D?hring) D'M?ller ex. de Greuther"; 
39
	final private String strNameAbiesAuthor1 = "Abies alba Müller";
40
	final private String strNameAbiesBasionymAuthor1 = "Abies alba (Ciardelli) D'Müller";
41
	final private String strNameAbiesBasionymExAuthor1 ="Abies alba (Ciardelli ex Döhring) D'Müller ex. de Greuther"; 
42 42
	final private String strNameAbiesBasionymAuthorUe = "Abies alba (Ciardelli) D'Mueller";
43 43
	
44 44
	private INonViralNameParser<BotanicalName> parser ;
......
104 104
//		result += parseIt( "Heterospathe elegans subsp. versteegiana M.S.Trudgen & W.J.Baker");
105 105
//		result += parseIt( "Hieracium asturicum Arv.-Touv.");
106 106
//		result += parseIt( "Hieracium mougeotii subsp. asturicum Zahn");
107
//		result += parseIt( "Hieracium vogesiacum subsp. asturicum (Zahn) O. Bol?s & Vigo");
107
//		result += parseIt( "Hieracium vogesiacum subsp. asturicum (Zahn) O. Bolòs & Vigo");
108 108
//		result += parseIt( "Hieracium cantabricum Arv.-Touv.");
109 109
//		result += parseIt( "Hieracium mougeotii subsp. cantabricum (Arv.-Touv.) Zahn");
110 110
//		result += parseIt( "Hieracium murorramondii Mateo");
111
		result += parseIt( "Micrasterias denticulata Br?bisson ex Ralfs 1848");
111
		result += parseIt( "Micrasterias denticulata Brébisson ex Ralfs 1848");
112 112
//		[13:11:55] Patricia Kelbert : Micrasterias denticulata var. angulosa (Hantzsch) W. et G.S. West 1902
113 113
//		[13:12:04] Patricia Kelbert : Micrasterias angulosa Hantzsch in Rabenhorst 1862
114 114
		

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)