From 0a025e9cc8b49ef2097fccc742769bfa096b28be Mon Sep 17 00:00:00 2001 From: "n.hoffmann" Date: Mon, 4 Oct 2010 14:34:43 +0000 Subject: [PATCH] correcting utf8 chars --- .../cdm/io/berlinModel/in/BerlinModelAuthorImport.java | 2 +- .../cdm/io/berlinModel/out/BerlinModelAuthorExport.java | 4 ++-- .../eu/etaxonomy/cdm/io/eflora/EfloraTaxonImport.java | 8 ++++---- .../eu/etaxonomy/cdm/io/erms/ErmsSourceUsesImport.java | 2 +- .../java/eu/etaxonomy/cdm/io/erms/ErmsTransformer.java | 2 +- .../eu/etaxonomy/cdm/io/pesi/out/PesiTransformer.java | 6 +++--- .../reference/endnote/in/EndnoteImportConfigurator.java | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelAuthorImport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelAuthorImport.java index d6e214ccc4..444e7d0440 100644 --- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelAuthorImport.java +++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelAuthorImport.java @@ -122,7 +122,7 @@ public class BerlinModelAuthorImport extends BerlinModelImportBase { String initials = null; for (int j = 1; j <= rs.getMetaData().getColumnCount(); j++){ String label = rs.getMetaData().getColumnLabel(j); - if (label.equalsIgnoreCase("Initials") || label.equalsIgnoreCase("Kürzel")){ + if (label.equalsIgnoreCase("Initials") || label.equalsIgnoreCase("Kürzel")){ initials = rs.getString(j); break; } diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/BerlinModelAuthorExport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/BerlinModelAuthorExport.java index 3726a10f5b..69f64d3dee 100644 --- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/BerlinModelAuthorExport.java +++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/BerlinModelAuthorExport.java @@ -66,8 +66,8 @@ public class BerlinModelAuthorExport extends BerlinModelExportBase { mapping.addMapper(DbExtensionMapper.NewInstance(ExtensionType.NOMENCLATURAL_STANDARD(), "NomStandard")); mapping.addMapper(DbExtensionMapper.NewInstance(ExtensionType.AREA_OF_INTREREST(), "AreaOfInterest")); mapping.addMapper(DbExtensionMapper.NewInstance(ExtensionType.ABBREVIATION(), "Initials")); -// mapping.addMapper(DbExtensionMapper.NewInstance(ExtensionType.ABBREVIATION(),Kürzel")); //Initials used instead -// mapping.addMapper(DbExtensionMapper.NewInstance(ExtensionType.ABBREVIATION(), "DraftKürz")); //Initials used instead +// mapping.addMapper(DbExtensionMapper.NewInstance(ExtensionType.ABBREVIATION(),Kürzel")); //Initials used instead +// mapping.addMapper(DbExtensionMapper.NewInstance(ExtensionType.ABBREVIATION(), "DraftKürz")); //Initials used instead mapping.addMapper(CreatedAndNotesMapper.NewInstance()); return mapping; diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/eflora/EfloraTaxonImport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/eflora/EfloraTaxonImport.java index 9dacad3fb9..f8d6d62055 100644 --- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/eflora/EfloraTaxonImport.java +++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/eflora/EfloraTaxonImport.java @@ -841,7 +841,7 @@ public class EfloraTaxonImport extends EfloraImportBase implements ICdmIO { */ private IdentifiableEntity makeCombinationReference(ResultSetPartitioner partitioner, ErmsImportState state, ReferenceBase ref, String strTaxonId, String strPageNr) { // Kopie von Orig. Comb. - //TODO ist das wirklich der richtige Name, oder muss ein verknüpfter Name verwendet werden + //TODO ist das wirklich der richtige Name, oder muss ein verknüpfter Name verwendet werden TaxonNameBase taxonName = (TaxonNameBase)state.getRelatedObject(ErmsTaxonImport.NAME_NAMESPACE, strTaxonId); taxonName.setNomenclaturalReference(ref); taxonName.setNomenclaturalMicroReference(strPageNr); diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/erms/ErmsTransformer.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/erms/ErmsTransformer.java index efa2d0d2b2..4f81b20154 100644 --- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/erms/ErmsTransformer.java +++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/erms/ErmsTransformer.java @@ -217,7 +217,7 @@ public final class ErmsTransformer extends InputTransformerBase { }else if (ermsAbbrev.equals("de")){return Language.GERMAN(); // }else if (ermsAbbrev.equals("ec")){return Language.ENGLISH-CANADIAN(); //no iso }else if (ermsAbbrev.equals("ee")){return Language.ESTONIAN(); -// }else if (ermsAbbrev.equals("ek")){return Language.EVEN-KAMCHATKA(); //iso639-3: eve Lamut, Ewen, Eben, Orich, Ilqan; Russian: ???´????? ???´?, earlier also ????????? ???´?) is a Tungusic language spoken by the Evens in Siberia +// }else if (ermsAbbrev.equals("ek")){return Language.EVEN-KAMCHATKA(); //iso639-3: eve Lamut, Ewen, Eben, Orich, Ilqan; Russian: ???´????? ???´?, earlier also ????????? ???´?) is a Tungusic language spoken by the Evens in Siberia }else if (ermsAbbrev.equals("en")){return Language.ENGLISH(); }else if (ermsAbbrev.equals("ep")){return Language.ESPERANTO(); }else if (ermsAbbrev.equals("es")){return Language.SPANISH_CATALAN(); diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/pesi/out/PesiTransformer.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/pesi/out/PesiTransformer.java index 1102c4f718..72dc78d3a3 100644 --- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/pesi/out/PesiTransformer.java +++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/pesi/out/PesiTransformer.java @@ -1017,9 +1017,9 @@ public final class PesiTransformer { public static String STR_AREA_CORVO = "Corvo"; public static String STR_AREA_FAIAL = "Faial"; public static String STR_AREA_GRACIOSA = "Graciosa"; - public static String STR_AREA_SAO_JORGE = "São Jorge"; + public static String STR_AREA_SAO_JORGE = "São Jorge"; public static String STR_AREA_FLORES = "Flores"; - public static String STR_AREA_SAO_MIGUEL = "São Miguel"; + public static String STR_AREA_SAO_MIGUEL = "São Miguel"; public static String STR_AREA_PICO = "Pico"; public static String STR_AREA_SANTA_MARIA = "Santa Maria"; public static String STR_AREA_TERCEIRA = "Terceira"; @@ -1102,7 +1102,7 @@ public final class PesiTransformer { public static String STR_AREA_RUSSIA_NORTHERN = "Russia Northern"; public static String STR_AREA_RUSSIA_SOUTHWEST = "Russia Southwest"; public static String STR_AREA_SARDEGNA = "Sardegna"; - public static String STR_AREA_SVALBARD_WITH_BJORNOYA_AND_JAN_MAYEN = "Svalbard with Björnöya and Jan Mayen"; + public static String STR_AREA_SVALBARD_WITH_BJORNOYA_AND_JAN_MAYEN = "Svalbard with Björnöya and Jan Mayen"; public static String STR_AREA_SELVAGENS_ISLANDS = "Selvagens Islands"; public static String STR_AREA_SICILY_WITH_MALTA = "Sicily with Malta"; public static String STR_AREA_MALTA = "Malta"; diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/reference/endnote/in/EndnoteImportConfigurator.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/reference/endnote/in/EndnoteImportConfigurator.java index ef8b1ae01a..0fb3668cec 100644 --- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/reference/endnote/in/EndnoteImportConfigurator.java +++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/reference/endnote/in/EndnoteImportConfigurator.java @@ -48,7 +48,7 @@ public class EndnoteImportConfigurator extends ImportConfiguratorBase