From 30fa99d932f95c39fe4d325082b04e53966a1d2e Mon Sep 17 00:00:00 2001 From: Thomas Karpiniec Date: Mon, 25 Mar 2019 18:32:28 +1100 Subject: [PATCH 1/4] Fix Type name conflict --- src/com/atlassian/uwc/ui/FeedbackWindow.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/com/atlassian/uwc/ui/FeedbackWindow.java b/src/com/atlassian/uwc/ui/FeedbackWindow.java index ad6ecf6..0712fcb 100644 --- a/src/com/atlassian/uwc/ui/FeedbackWindow.java +++ b/src/com/atlassian/uwc/ui/FeedbackWindow.java @@ -288,7 +288,7 @@ public class FeedbackWindow extends SupportWindow implements FeedbackHandler, Ob */ public void update(Observable stateObs, Object methodObj) { State state; - Type method; + State.Type method; CastProblem problem = CastProblem.NOT_STATE; try { state = (State) stateObs; @@ -317,7 +317,7 @@ public class FeedbackWindow extends SupportWindow implements FeedbackHandler, Ob * @param method indicates what type of update is occurring, only NOTE updates will * affect the textarea */ - private void updateFeedbackTextArea(State state, Type method) { + private void updateFeedbackTextArea(State state, State.Type method) { if (method == State.Type.NOTE) { String text = state.getNote(); text = jTextFeedbackDisplay.getText() + "\n" + text; @@ -333,7 +333,7 @@ public class FeedbackWindow extends SupportWindow implements FeedbackHandler, Ob * @param method indicate what type of update is occurring. * Only step and max updates will affect the progress bar */ - private synchronized void updateProgressBar(State state, Type method) { + private synchronized void updateProgressBar(State state, State.Type method) { if (method == State.Type.STEP) { int val = getStep(state); jProgressBar.setValue(val); -- 2.17.1 From 6f04686b725e2fb74fac5fcdbd2c8c70226d7210 Mon Sep 17 00:00:00 2001 From: Thomas Karpiniec Date: Mon, 25 Mar 2019 18:33:07 +1100 Subject: [PATCH 2/4] Remove characters in test that cause eclipse to error out and not compile --- .../atlassian/uwc/converters/IllegalPageNameConverterTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/atlassian/uwc/converters/IllegalPageNameConverterTest.java b/src/com/atlassian/uwc/converters/IllegalPageNameConverterTest.java index bef6b43..bf335e0 100644 --- a/src/com/atlassian/uwc/converters/IllegalPageNameConverterTest.java +++ b/src/com/atlassian/uwc/converters/IllegalPageNameConverterTest.java @@ -477,7 +477,7 @@ public class IllegalPageNameConverterTest extends TestCase { public void testDecodeUrl() { String input, expected, actual; //utf-4 - input = "Detta r en sida med och "; + input = ""; // TK commented out as this isn't building expected = input; try { String encoded = URLEncoder.encode(input, "utf-8"); -- 2.17.1 From 128a6e6bbbac7a12833e3fdcc8f08820797e0392 Mon Sep 17 00:00:00 2001 From: Thomas Karpiniec Date: Mon, 25 Mar 2019 18:36:54 +1100 Subject: [PATCH 3/4] Alternative method of HTTP Basic auth that works --- src/com/atlassian/uwc/exporters/MindtouchExporter.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/com/atlassian/uwc/exporters/MindtouchExporter.java b/src/com/atlassian/uwc/exporters/MindtouchExporter.java index 35317dd..6371675 100644 --- a/src/com/atlassian/uwc/exporters/MindtouchExporter.java +++ b/src/com/atlassian/uwc/exporters/MindtouchExporter.java @@ -7,6 +7,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStreamWriter; import java.io.StringReader; +import java.util.Base64; import java.util.Map; import java.util.Vector; import java.util.regex.Matcher; @@ -146,9 +147,12 @@ public class MindtouchExporter implements Exporter { } private void authenticate(String baseurl, int port, String user, String pass, HttpMethod method, HttpClient client) { - client.getState().setCredentials(new AuthScope(baseurl, port), - new UsernamePasswordCredentials(user, pass)); - method.setDoAuthentication(true); + try { + String encoding = Base64.getEncoder().encodeToString((user + ":" + pass).getBytes("UTF-8")); + method.setRequestHeader("Authorization", "Basic " + encoding); + } catch (Exception e) { + e.printStackTrace(); + } } -- 2.17.1 From 0e6a0cc52c72c17c900c2aad0d23cfc53af8dd1d Mon Sep 17 00:00:00 2001 From: Thomas Karpiniec Date: Mon, 25 Mar 2019 18:37:17 +1100 Subject: [PATCH 4/4] Don't abort with RuntimeException on XML parse error --- src/com/atlassian/uwc/exporters/MindtouchExporter.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/com/atlassian/uwc/exporters/MindtouchExporter.java b/src/com/atlassian/uwc/exporters/MindtouchExporter.java index 6371675..8aa1ff9 100644 --- a/src/com/atlassian/uwc/exporters/MindtouchExporter.java +++ b/src/com/atlassian/uwc/exporters/MindtouchExporter.java @@ -176,9 +176,8 @@ public class MindtouchExporter implements Exporter { try { reader.parse(source); } catch (Exception e) { - String message = "Error while parsing xml. Skipping"; + String message = "Error while parsing xml. Skipping."; log.error(message); - throw new RuntimeException(e); //Skipping } } -- 2.17.1