From 5c099210f151249e9df50173afceca188255a917 Mon Sep 17 00:00:00 2001 From: Edwin_Carvajal Date: Sun, 31 Mar 2019 10:53:04 -0400 Subject: [PATCH 1/4] .idea file added. Switched to master to create new feature development branch. --- .idea/CodeBusters.iml | 9 + .idea/codeStyles/codeStyleConfig.xml | 5 + .idea/encodings.xml | 4 + .idea/misc.xml | 6 + .idea/modules.xml | 8 + .idea/vcs.xml | 6 + .idea/workspace.xml | 452 +++++++++++++++++++++++++++ 7 files changed, 490 insertions(+) create mode 100644 .idea/CodeBusters.iml create mode 100644 .idea/codeStyles/codeStyleConfig.xml create mode 100644 .idea/encodings.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml create mode 100644 .idea/workspace.xml diff --git a/.idea/CodeBusters.iml b/.idea/CodeBusters.iml new file mode 100644 index 0000000..d6ebd48 --- /dev/null +++ b/.idea/CodeBusters.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000..b9d18bf --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..15a15b2 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..caf51dd --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..61e6741 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..70a3134 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,452 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + buildMessageDiv + fetch + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -263,16 +190,15 @@ - - + - + @@ -395,15 +321,15 @@ - - + + - - + + @@ -443,8 +369,20 @@ - - + + + + + + + + + + + + + + From 843c9f110224aa6e34aa23c811c3e1af1ac69000 Mon Sep 17 00:00:00 2001 From: Edwin_Carvajal Date: Tue, 2 Apr 2019 11:27:21 -0400 Subject: [PATCH 3/4] working through bugs showing the links --- .idea/workspace.xml | 198 +++++++++++++----- pom.xml | 6 + .../java/com/google/codeu/data/Message.java | 4 + .../google/codeu/servlets/MessageServlet.java | 26 +++ src/main/webapp/js/user-page-loader.js | 31 ++- src/main/webapp/user-page.html | 1 + 6 files changed, 214 insertions(+), 52 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 490adda..0724f8d 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -3,6 +3,11 @@ + + + + + @@ -79,15 +100,15 @@ @@ -121,6 +142,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -282,16 +269,15 @@ - - + - + @@ -345,9 +331,6 @@ - - - @@ -386,20 +369,8 @@ - - - - - - - - - - - - - - + + @@ -422,23 +393,38 @@ - + + + + + - - + + - + + + + + + + + + + + + - + @@ -451,34 +437,14 @@ - - - - - - - - - - - - - - - - - - - - - - + + diff --git a/src/main/java/com/google/codeu/data/Message.java b/src/main/java/com/google/codeu/data/Message.java index 01a9e40..2e0f396 100644 --- a/src/main/java/com/google/codeu/data/Message.java +++ b/src/main/java/com/google/codeu/data/Message.java @@ -64,6 +64,6 @@ public String getRecipient() { } public void setText(String translatedText) { - this.text = translatedText; + this.text = translatedText; } } diff --git a/src/main/java/com/google/codeu/servlets/MessageServlet.java b/src/main/java/com/google/codeu/servlets/MessageServlet.java index 86c8705..5d8d379 100644 --- a/src/main/java/com/google/codeu/servlets/MessageServlet.java +++ b/src/main/java/com/google/codeu/servlets/MessageServlet.java @@ -18,6 +18,10 @@ import com.google.appengine.api.users.UserService; import com.google.appengine.api.users.UserServiceFactory; +import com.google.cloud.translate.Translate; +import com.google.cloud.translate.Translate.TranslateOption; +import com.google.cloud.translate.TranslateOptions; +import com.google.cloud.translate.Translation; import com.google.codeu.data.Datastore; import com.google.codeu.data.Message; import com.google.gson.Gson; @@ -30,11 +34,6 @@ import org.jsoup.Jsoup; import org.jsoup.safety.Whitelist; -import com.google.cloud.translate.Translate; -import com.google.cloud.translate.Translate.TranslateOption; -import com.google.cloud.translate.TranslateOptions; -import com.google.cloud.translate.Translation; - /** Handles fetching and saving {@link Message} instances. */ @WebServlet("/messages") public class MessageServlet extends HttpServlet { @@ -49,7 +48,7 @@ public void init() { private void translateMessages(List messages, String targetLanguageCode) { Translate translate = TranslateOptions.getDefaultInstance().getService(); - for(Message message : messages) { + for (Message message : messages) { String originalText = message.getText(); Translation translation = @@ -81,7 +80,7 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) thro String targetLanguageCode = request.getParameter("language"); - if(targetLanguageCode != null) { + if (targetLanguageCode != null) { translateMessages(messages, targetLanguageCode); }