Index: /trunk/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java (revision 19356) +++ /trunk/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java (revision 19357) @@ -311,5 +311,5 @@ "accountant", // accountant dot Accountant Limited "accountants", // accountants Binky Moon, LLC - "aco", // aco ACO Severin Ahlmann GmbH & Co. KG + "aco", // aco ACO Severin Ahlmann GmbH & Co. KG "actor", // actor Dog Beach, LLC "ads", // ads Charleston Road Registry Inc. @@ -388,5 +388,5 @@ "bayern", // bayern Bayern Connect GmbH "bbc", // bbc British Broadcasting Corporation - "bbt", // bbt BB&T Corporation + "bbt", // bbt BB&T Corporation "bbva", // bbva BANCO BILBAO VIZCAYA ARGENTARIA, S.A. "bcg", // bcg The Boston Consulting Group, Inc. @@ -396,5 +396,5 @@ "beer", // beer Registry Services, LLC "bentley", // bentley Bentley Motors Limited - "berlin", // berlin dotBERLIN GmbH & Co. KG + "berlin", // berlin dotBERLIN GmbH & Co. KG "best", // best BestTLD Pty Ltd "bestbuy", // bestbuy BBY Solutions, Inc. @@ -583,5 +583,5 @@ "dtv", // dtv Dish DBS Corporation "dubai", // dubai Dubai Smart Government Department - "dunlop", // dunlop The Goodyear Tire & Rubber Company + "dunlop", // dunlop The Goodyear Tire & Rubber Company "dupont", // dupont DuPont Specialty Products USA, LLC "durban", // durban ZA Central Registry NPC trading as ZA Central Registry @@ -696,5 +696,5 @@ "gmbh", // gmbh Binky Moon, LLC "gmo", // gmo GMO Internet, Inc. - "gmx", // gmx 1&1 Mail & Media GmbH + "gmx", // gmx 1&1 Mail & Media GmbH "godaddy", // godaddy Go Daddy East, LLC "gold", // gold Binky Moon, LLC @@ -702,5 +702,5 @@ "golf", // golf Binky Moon, LLC "goo", // goo NTT Resonant Inc. - "goodyear", // goodyear The Goodyear Tire & Rubber Company + "goodyear", // goodyear The Goodyear Tire & Rubber Company "goog", // goog Charleston Road Registry Inc. "google", // google Charleston Road Registry Inc. @@ -799,5 +799,5 @@ "jll", // jll Jones Lang LaSalle Incorporated "jmp", // jmp Matrix IP LLC - "jnj", // jnj Johnson & Johnson Services, Inc. + "jnj", // jnj Johnson & Johnson Services, Inc. "jobs", // jobs Employ Media LLC "joburg", // joburg ZA Central Registry NPC trading as ZA Central Registry @@ -828,5 +828,5 @@ "kuokgroup", // kuokgroup Kerry Trading Co. Limited "kyoto", // kyoto Academic Institution: Kyoto Jyoho Gakuen - "lacaixa", // lacaixa Fundación Bancaria Caixa d'Estalvis i Pensions de Barcelona, "la Caixa" + "lacaixa", // lacaixa Fundación Bancaria Caixa d'Estalvis i Pensions de Barcelona, "la Caixa" "lamborghini", // lamborghini Automobili Lamborghini S.p.A. "lamer", // lamer The Estée Lauder Companies Inc. @@ -849,5 +849,5 @@ "lexus", // lexus TOYOTA MOTOR CORPORATION "lgbt", // lgbt Identity Digital Limited - "lidl", // lidl Schwarz Domains und Services GmbH & Co. KG + "lidl", // lidl Schwarz Domains und Services GmbH & Co. KG "life", // life Binky Moon, LLC "lifeinsurance", // lifeinsurance American Council of Life Insurers @@ -884,5 +884,5 @@ "maison", // maison Binky Moon, LLC "makeup", // makeup XYZ.COM LLC - "man", // man MAN Truck & Bus SE + "man", // man MAN Truck & Bus SE "management", // management Binky Moon, LLC "mango", // mango PUNTO FA S.L. @@ -969,6 +969,6 @@ "nrw", // nrw Minds + Machines GmbH "ntt", // ntt NIPPON TELEGRAPH AND TELEPHONE CORPORATION - "nyc", // nyc The City of New York by and through the New York City Department of Information Technology & Telecommunications - "obi", // obi OBI Group Holding SE & Co. KGaA + "nyc", // nyc The City of New York by and through the New York City Department of Information Technology & Telecommunications + "obi", // obi OBI Group Holding SE & Co. KGaA "observer", // observer Fegistry, LLC "office", // office Microsoft Corporation @@ -1113,10 +1113,10 @@ "sbs", // sbs Shortdot SA "scb", // scb The Siam Commercial Bank Public Company Limited ("SCB") - "schaeffler", // schaeffler Schaeffler Technologies AG & Co. KG + "schaeffler", // schaeffler Schaeffler Technologies AG & Co. KG "schmidt", // schmidt SCHMIDT GROUPE S.A.S. "scholarships", // scholarships Scholarships.com, LLC "school", // school Binky Moon, LLC "schule", // schule Binky Moon, LLC - "schwarz", // schwarz Schwarz Domains und Services GmbH & Co. KG + "schwarz", // schwarz Schwarz Domains und Services GmbH & Co. KG "science", // science dot Science Limited "scot", // scot Dot Scot Registry Limited @@ -1130,5 +1130,5 @@ "services", // services Binky Moon, LLC "seven", // seven Seven West Media Ltd - "sew", // sew SEW-EURODRIVE GmbH & Co KG + "sew", // sew SEW-EURODRIVE GmbH & Co KG "sex", // sex ICM Registry SX LLC "sexy", // sexy Internet Naming Co. @@ -1251,5 +1251,5 @@ "tunes", // tunes Amazon Registry Services, Inc. "tushu", // tushu Amazon Registry Services, Inc. - "tvs", // tvs T V SUNDRAM IYENGAR & SONS PRIVATE LIMITED + "tvs", // tvs T V SUNDRAM IYENGAR & SONS PRIVATE LIMITED "ubank", // ubank National Australia Bank Limited "ubs", // ubs UBS AG @@ -1302,5 +1302,5 @@ "weibo", // weibo Sina Corporation "weir", // weir Weir Group IP Limited - "whoswho", // whoswho Who's Who Registry + "whoswho", // whoswho Who's Who Registry "wien", // wien punkt.wien GmbH "wiki", // wiki Registry Services, LLC @@ -1681,5 +1681,5 @@ "ws", // Samoa (formerly Western Samoa) "xn--2scrj9c", // ಭಾರತ National Internet eXchange of India - "xn--3e0b707e", // 한국 KISA (Korea Internet & Security Agency) + "xn--3e0b707e", // 한국 KISA (Korea Internet & Security Agency) "xn--3hcrj9c", // ଭାରତ National Internet eXchange of India "xn--45br5cyl", // ভাৰত National Internet eXchange of India @@ -1728,5 +1728,5 @@ "xn--ogbpf8fl", // سورية National Agency for Network Services (NANS) "xn--p1ai", // рф Coordination Center for TLD RU - "xn--pgbs0dh", // تونس Agence Tunisienne d'Internet + "xn--pgbs0dh", // تونس Agence Tunisienne d'Internet "xn--q7ce6a", // ລາວ Lao National Internet Center (LANIC), Ministry of Technology and Communications "xn--qxa6a", // ευ EURid vzw @@ -1740,5 +1740,5 @@ "xn--y9a3aq", // հայ "Internet Society" Non-governmental Organization "xn--yfro4i67o", // 新加坡 Singapore Network Information Centre (SGNIC) Pte Ltd - "xn--ygbi2ammx", // فلسطين Ministry of Telecom & Information Technology (MTIT) + "xn--ygbi2ammx", // فلسطين Ministry of Telecom & Information Technology (MTIT) "ye", // Yemen "yt", // Mayotte Index: /trunk/test/unit/org/openstreetmap/josm/data/validation/routines/DomainValidatorTestIT.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/data/validation/routines/DomainValidatorTestIT.java (revision 19356) +++ /trunk/test/unit/org/openstreetmap/josm/data/validation/routines/DomainValidatorTestIT.java (revision 19357) @@ -124,5 +124,5 @@ if (info != null) { String type = info[0]; - String comment = info[1]; + String comment = info[1].replaceAll(""","\"").replaceAll("'","'").replaceAll("&","&"); if ("country-code".equals(type)) { // Which list to use? allCC.put(asciiTld, unicodeTld + " " + comment);