Fix file encoding
diff --git a/src/com/atlassian/uwc/converters/IllegalPageNameConverterTest.java b/src/com/atlassian/uwc/converters/IllegalPageNameConverterTest.java
index bef6b43..88e5b9e 100644
--- a/src/com/atlassian/uwc/converters/IllegalPageNameConverterTest.java
+++ b/src/com/atlassian/uwc/converters/IllegalPageNameConverterTest.java
@@ -477,7 +477,7 @@
public void testDecodeUrl() {
String input, expected, actual;
//utf-4
- input = "Detta r en sida med och
";
+ input = "Detta r en sida med och
";
expected = input;
try {
String encoded = URLEncoder.encode(input, "utf-8");
diff --git a/src/com/atlassian/uwc/converters/ImageAttachmentConverter.java b/src/com/atlassian/uwc/converters/ImageAttachmentConverter.java
index 00a9610..377ecc5 100644
--- a/src/com/atlassian/uwc/converters/ImageAttachmentConverter.java
+++ b/src/com/atlassian/uwc/converters/ImageAttachmentConverter.java
@@ -38,7 +38,7 @@
// TODO: This pattern needs to be more generic!
// Unfortunately, the following does not work:
// pattern = compiler.compile("!\\s*[^\\n\\r\\|!]+?\\s*[\\|!]");
- pattern = compiler.compile("!(\\s*[a-zA-Z0-9åäöÅÄÖ%+.:/\\\\_-]+?\\s*)(\\|[^\\!]*)?!");
+ pattern = compiler.compile("!(\\s*[a-zA-Z0-9åäöÅÄÖ%+.:/\\\\_-]+?\\s*)(\\|[^\\!]*)?!");
} catch (MalformedPatternException e) {
log.error("Bad pattern.", e);
return;
diff --git a/src/com/atlassian/uwc/converters/dokuwiki/DokuWikiLinkConverter.java b/src/com/atlassian/uwc/converters/dokuwiki/DokuWikiLinkConverter.java
index 9f6f794..405d947 100644
--- a/src/com/atlassian/uwc/converters/dokuwiki/DokuWikiLinkConverter.java
+++ b/src/com/atlassian/uwc/converters/dokuwiki/DokuWikiLinkConverter.java
@@ -125,12 +125,12 @@
assert linkTarget != null;
linkTarget = linkTarget.replaceAll("\\\\", "/");
-/* linkTarget = linkTarget.replaceAll("¿", "%C3%A5");
- linkTarget = linkTarget.replaceAll("¿", "%C3%A4");
- linkTarget = linkTarget.replaceAll("¿", "%C3%B6");
- linkTarget = linkTarget.replaceAll("¿", "%C3%85");
- linkTarget = linkTarget.replaceAll("¿", "%C3%84");
- linkTarget = linkTarget.replaceAll("¿", "%C3%96");
+/* linkTarget = linkTarget.replaceAll("¿", "%C3%A5");
+ linkTarget = linkTarget.replaceAll("¿", "%C3%A4");
+ linkTarget = linkTarget.replaceAll("¿", "%C3%B6");
+ linkTarget = linkTarget.replaceAll("¿", "%C3%85");
+ linkTarget = linkTarget.replaceAll("¿", "%C3%84");
+ linkTarget = linkTarget.replaceAll("¿", "%C3%96");
linkTarget = linkTarget.replaceAll(" ", "+");
*/
if (linkTarget.startsWith("file:")) {
diff --git a/src/com/atlassian/uwc/converters/mediawiki/ExternalInternalLinksConverterTest.java b/src/com/atlassian/uwc/converters/mediawiki/ExternalInternalLinksConverterTest.java
index dff91b8..97d82d6 100644
--- a/src/com/atlassian/uwc/converters/mediawiki/ExternalInternalLinksConverterTest.java
+++ b/src/com/atlassian/uwc/converters/mediawiki/ExternalInternalLinksConverterTest.java
@@ -122,7 +122,7 @@
input = "[abc|https://mw.wiki.org/index.php/Image:foobar" +
"%E5%BC%80.docx" +
"]\n";
- expected = "[abc|^foobar开.docx]\n";
+ expected = "[abc|^foobarå¼.docx]\n";
actual = tester.convertExternalInternalLinks(input);
assertNotNull(actual);
assertEquals(expected, actual);
diff --git a/src/com/atlassian/uwc/converters/moinmoin/MoinListConverterTest.java b/src/com/atlassian/uwc/converters/moinmoin/MoinListConverterTest.java
index db45dbd..5631efc 100644
--- a/src/com/atlassian/uwc/converters/moinmoin/MoinListConverterTest.java
+++ b/src/com/atlassian/uwc/converters/moinmoin/MoinListConverterTest.java
@@ -144,7 +144,7 @@
" * hallo" + LSEP +
" * hallo" + LSEP +
" * hallo" + LSEP +
- " *Fett* aber glücklich" + LSEP +
+ " *Fett* aber glücklich" + LSEP +
" * hallo" + LSEP +
" * hallo" + LSEP;
@@ -152,7 +152,7 @@
" * hallo" + LSEP +
" ** hallo" + LSEP +
" *** hallo" + LSEP +
- " *Fett* aber glücklich" + LSEP +
+ " *Fett* aber glücklich" + LSEP +
" * hallo" + LSEP +
" * hallo" + LSEP;
diff --git a/src/com/atlassian/uwc/converters/moinmoin/MoinMoinAttachmentConverter.java b/src/com/atlassian/uwc/converters/moinmoin/MoinMoinAttachmentConverter.java
index c2deaed..0a3b3b7 100644
--- a/src/com/atlassian/uwc/converters/moinmoin/MoinMoinAttachmentConverter.java
+++ b/src/com/atlassian/uwc/converters/moinmoin/MoinMoinAttachmentConverter.java
@@ -224,7 +224,7 @@
String linkPage = null;
if (filePath.contains("/")) {
- log.debug(filePath + " inneh�ll /!");
+ log.debug(filePath + " inneh�ll /!");
// This is a link to an attachment on some other page.
// Get the page name and file name from the path
String path = filePath.substring(0, filePath.lastIndexOf("/"));
@@ -234,7 +234,7 @@
} else {
// This is a link to an attachment on this page. We need to
// move the attachment to Confluence!
- log.debug(filePath + " inneh�ll INTE /!");
+ log.debug(filePath + " inneh�ll INTE /!");
String pagename = page.getName();
// Remove the extension, if present
diff --git a/src/com/atlassian/uwc/converters/moinmoin/test/MoinMoinAttachmentConverterTest.java b/src/com/atlassian/uwc/converters/moinmoin/test/MoinMoinAttachmentConverterTest.java
index aa3c5c4..93c30f8 100644
--- a/src/com/atlassian/uwc/converters/moinmoin/test/MoinMoinAttachmentConverterTest.java
+++ b/src/com/atlassian/uwc/converters/moinmoin/test/MoinMoinAttachmentConverterTest.java
@@ -184,11 +184,11 @@
}
public void testConvertPageNameToUnicode() {
- assertEquals("é",
+ assertEquals("é",
MoinMoinAttachmentConverter.convertPageNameToUnicode("(c3a9)"));
- assertEquals("JeanBaptisteCatté",
+ assertEquals("JeanBaptisteCatté",
MoinMoinAttachmentConverter.convertPageNameToUnicode("JeanBaptisteCatt(c3a9)"));
- assertEquals("Jérôme_Topczenski",
+ assertEquals("Jérôme_Topczenski",
MoinMoinAttachmentConverter.convertPageNameToUnicode("J(c3a9)r(c3b4)me_Topczenski"));
assertEquals("WLS_8.1_to_9.0_Migration's_Steps",
MoinMoinAttachmentConverter.convertPageNameToUnicode("WLS_8(2e)1_to_9(2e)0_Migration(27)s_Steps"));
diff --git a/src/com/atlassian/uwc/converters/sharepoint/CleanConverterTest.java b/src/com/atlassian/uwc/converters/sharepoint/CleanConverterTest.java
index 6a78502..da866b2 100644
--- a/src/com/atlassian/uwc/converters/sharepoint/CleanConverterTest.java
+++ b/src/com/atlassian/uwc/converters/sharepoint/CleanConverterTest.java
@@ -738,7 +738,7 @@
String input = "<div class=\"ms-wikicontent\"><div class=ExternalClass6401589625F24EB681A45DBE6B1A1B3E>\n" +
"<h3 class=ExternalClassCCAFF3FAA0E340529C5A6A3E0B18184B><font face=Arial>xxxxxx</font></h3>\n" +
"<p class=ExternalClassCCAFF3FAA0E340529C5A6A3E0B18184B><strong><em><font face=Arial>xxxxxx</font></em></strong></p><font size=3>\n" +
- "<p class=ExternalClassCCAFF3FAA0E340529C5A6A3E0B18184B><span style=\"color:black\"><font face=Arial size=2>xxxxxx<a href=\"xxxxxx\">xxxxxx</a>Êxxxxxx</font></span></p>\n" +
+ "<p class=ExternalClassCCAFF3FAA0E340529C5A6A3E0B18184B><span style=\"color:black\"><font face=Arial size=2>xxxxxx<a href=\"xxxxxx\">xxxxxx</a>Êxxxxxx</font></span></p>\n" +
"<p class=ExternalClassCCAFF3FAA0E340529C5A6A3E0B18184B><span style=\"color:black\"><font face=Arial size=2>xxxxxx "xxxxxx" xxxxxx </font></span></p>\n" +
"<p class=ExternalClassCCAFF3FAA0E340529C5A6A3E0B18184B><span style=\"color:black\"><font face=Arial size=2>xxxxxx</font></span></p>\n" +
"<p class=ExternalClassCCAFF3FAA0E340529C5A6A3E0B18184B><font face=Arial></font></font></p>\n" +
@@ -748,7 +748,7 @@
"<p class=ExternalClassCCAFF3FAA0E340529C5A6A3E0B18184B><span style=\"color:black\"><font face=Arial size=2>xxxxxx</font></span></p>\n" +
"<div class=ExternalClassCCAFF3FAA0E340529C5A6A3E0B18184B>\n" +
"<ul type=disc>\n" +
- "<li class=MsoNormal style=\"margin:0in 0in 0pt;color:black;tab-stops:list .5in\"><font face=Arial size=2>xxxxxx</a>Ê</font></li>\n" +
+ "<li class=MsoNormal style=\"margin:0in 0in 0pt;color:black;tab-stops:list .5in\"><font face=Arial size=2>xxxxxx</a>Ê</font></li>\n" +
"<li class=MsoNormal style=\"margin:0in 0in 0pt;color:black;tab-stops:list .5in\"><font face=Arial size=2>xxxxxx</font></li>\n" +
"<li class=MsoNormal style=\"margin:0in 0in 0pt;color:black;tab-stops:list .5in\"><font face=Arial size=2>xxxxxx</font></li>\n" +
"<li class=MsoNormal style=\"margin:0in 0in 0pt;color:black;tab-stops:list .5in\"><font face=Arial size=2>xxxxxx</font></li>\n" +
@@ -824,7 +824,7 @@
"<p><i><span style=\"color:black\"><font face=Arial size=2>xxxxxx</font></span></i></p>\n" +
"<ul>\n" +
"<li>\n" +
- "<div class=MsoNormal style=\"margin:0in 0in 0pt\"><span style=\"color:black\"><font face=Arial size=2>xxxxxx<span>Ê </span>xxxxxx</font></span></div></li></ul>\n" +
+ "<div class=MsoNormal style=\"margin:0in 0in 0pt\"><span style=\"color:black\"><font face=Arial size=2>xxxxxx<span>Ê </span>xxxxxx</font></span></div></li></ul>\n" +
"<p><i><span style=\"color:black\"><font face=Arial size=2>xxxxxx</font></span></i></p>\n" +
"<ul>\n" +
"<li><span style=\"color:black\"><font face=Arial size=2>xxxxxx</font></span></li></ul>\n" +
@@ -1400,7 +1400,7 @@
} catch (Exception e) {
e.printStackTrace();
}
- String string = " ";
+ String string = " ";
byte[] bytes = null;
try {
bytes = string.getBytes("ascii");
@@ -1525,7 +1525,7 @@
assertNotNull(actual);
assertEquals(expected, actual);
- String weirdchar = " ";
+ String weirdchar = " ";
input = "<p class=MsoNormal style=\"margin:0in 0in 0pt;text-align:justify\"><span style=\"font-size:12pt\"><font face=\"Times New Roman\">abc <span style=\"font-size:12pt;font-family:\'Times New Roman\'\">def (<span style=\"font-size:12pt;font-family:\'Times New Roman\'\">xxxxxx</span>)" + weirdchar + " xxxxxx<span>" + weirdchar + " </span>xxxxxx</span></font></span></p>\n";
expected = "<html><p style=\"margin:0in 0in 0pt;text-align:justify\"><span style=\"font-size:12pt\"><font face=\"Times New Roman\">abc <span style=\"font-size:12pt;font-family:'Times New Roman'\">def (<span style=\"font-size:12pt;font-family:'Times New Roman'\">xxxxxx</span>) xxxxxx xxxxxx</span></font></span></p></html>";
actual = tester.clean(input);
diff --git a/src/com/atlassian/uwc/converters/sharepoint/ColorConverterTest.java b/src/com/atlassian/uwc/converters/sharepoint/ColorConverterTest.java
index 4ec3806..2d87639 100644
--- a/src/com/atlassian/uwc/converters/sharepoint/ColorConverterTest.java
+++ b/src/com/atlassian/uwc/converters/sharepoint/ColorConverterTest.java
@@ -661,8 +661,8 @@
"<td rowspan=\"1\" colspan=\"1\"><font color=\"#00ff00\">r1c2</font></td>" +
"</tr>" +
"<tr>" +
- "<td colspan=\"1\" style=\"background-color:rgb(255, 215, 0)\" rowspan=\"1\">ær2c1</td>" +
- "<td colspan=\"1\" rowspan=\"1\"><font size=\"6\">r2c2</font>æ</td>" +
+ "<td colspan=\"1\" style=\"background-color:rgb(255, 215, 0)\" rowspan=\"1\">ær2c1</td>" +
+ "<td colspan=\"1\" rowspan=\"1\"><font size=\"6\">r2c2</font>æ</td>" +
"</tr>" +
"</tbody></table>\n" +
"</html>";
@@ -674,8 +674,8 @@
"</tr>" +
"<tr>" +
"<td colspan=\"1\" rowspan=\"1\">" +
- "{panel:bgColor=#ffd700}ær2c1{panel}</td>" +
- "<td colspan=\"1\" rowspan=\"1\"><font size=\"6\">r2c2</font>æ</td>" +
+ "{panel:bgColor=#ffd700}ær2c1{panel}</td>" +
+ "<td colspan=\"1\" rowspan=\"1\"><font size=\"6\">r2c2</font>æ</td>" +
"</tr>" +
"</tbody></table>\n" +
"</html>";
diff --git a/src/com/atlassian/uwc/converters/sharepoint/TableConverterTest.java b/src/com/atlassian/uwc/converters/sharepoint/TableConverterTest.java
index 4d6dd04..7380558 100644
--- a/src/com/atlassian/uwc/converters/sharepoint/TableConverterTest.java
+++ b/src/com/atlassian/uwc/converters/sharepoint/TableConverterTest.java
@@ -73,8 +73,8 @@
"<td rowspan=\"1\" colspan=\"1\">{color:#00ff00}r1c2{color}</td>" +
"</tr>" +
"<tr>" +
- "<td colspan=\"1\" rowspan=\"1\">{panel:bgColor=#ffd700}ær2c1{panel}</td>" +
- "<td colspan=\"1\" rowspan=\"1\">h2. r2c2æ</td>" +
+ "<td colspan=\"1\" rowspan=\"1\">{panel:bgColor=#ffd700}ær2c1{panel}</td>" +
+ "<td colspan=\"1\" rowspan=\"1\">h2. r2c2æ</td>" +
"</tr>" +
"</tbody></table>\n" +
"</html>";
@@ -100,7 +100,7 @@
"</tr>" +
"<tr>" +
"<td colspan=\"1\" rowspan=\"1\">\n" +
- "* æa\n" +
+ "* æa\n" +
"* b\n" +
"* c\n" +
"\n" +
@@ -108,16 +108,16 @@
"<td colspan=\"1\" rowspan=\"1\">\n" +
"# one\n" +
"# two\n" +
- "## threeæ\n" +
+ "## threeæ\n" +
"\n" +
"</td>" +
"<td colspan=\"1\" rowspan=\"1\">\n" +
- "* æone\n" +
+ "* æone\n" +
"# b\n" +
"* c\n" +
"\n" +
"</td>" +
- "<td colspan=\"1\" rowspan=\"1\">æ</td>" +
+ "<td colspan=\"1\" rowspan=\"1\">æ</td>" +
"</tr>" +
"</tbody></table>" +
"</html>";
diff --git a/src/com/atlassian/uwc/converters/xwiki/XmlCleanerTest.java b/src/com/atlassian/uwc/converters/xwiki/XmlCleanerTest.java
index f400dfa..368f0be 100644
--- a/src/com/atlassian/uwc/converters/xwiki/XmlCleanerTest.java
+++ b/src/com/atlassian/uwc/converters/xwiki/XmlCleanerTest.java
@@ -186,7 +186,7 @@
entity +
"After</content>\n" +
"</xwikidoc>\n";
- expected = "BeforeÊAfter"; //XXX the ' ' space in this string is not a typical space.
+ expected = "BeforeÊAfter"; //XXX the ' ' space in this string is not a typical space.
actual = tester.cleanXml(input);
assertNotNull(actual);
assertEquals(expected, actual);
diff --git a/src/com/atlassian/uwc/exporters/MindtouchExporterTest.java b/src/com/atlassian/uwc/exporters/MindtouchExporterTest.java
index 43eb1e6..d9107ee 100644
--- a/src/com/atlassian/uwc/exporters/MindtouchExporterTest.java
+++ b/src/com/atlassian/uwc/exporters/MindtouchExporterTest.java
@@ -248,12 +248,12 @@
"<p>Testing</p>\n" +
"<div id=\"section_5\"><span id=\"Header_5\" /><h6 class=\"editable\">Header 5</h6>\n" +
"<p>Lorem Ipsum</p>\n" +
- "<p>Ê</p>\n" +
+ "<p>Ê</p>\n" +
"<p>What about Fonts?</p>\n" +
"<p><span style=\"font-family: Courier New;\">Testing Courier</span></p>\n" +
"<p><span style=\"font-family: Times New Roman;\">Times</span></p>\n" +
"<p><span style=\"font-family: Verdana;\">Verdana</span></p>\n" +
- "<p>Ê</p>\n" +
+ "<p>Ê</p>\n" +
"<p>and Font size?</p>\n" +
"<p><span style=\"font-size: xx-small;\">xxsmall</span></p>\n" +
"<p><span style=\"font-size: x-small;\">xsmall</span></p>\n" +
@@ -262,7 +262,7 @@
"<p><span style=\"font-size: large;\">large</span></p>\n" +
"<p><span style=\"font-size: x-large;\">xlarge</span></p>\n" +
"<p><span style=\"font-size: xx-large;\">xxlarge</span></p>\n" +
- "<p>Ê</p>\n" +
+ "<p>Ê</p>\n" +
"<p>What happens when we mix and match different stuff</p>\n" +
"<p style=\"margin-left: 40px;\"><code><strong>bold indent code</strong></code></p>\n" +
"<p><span style=\"font-family: Courier New;\"><span style=\"font-size: x-large;\">Courier xlarge</span></span></p>\n" +
