From 1ef4c97f54ffcd89cc367902f503f570e342f2db Mon Sep 17 00:00:00 2001 From: Piotr Marecki Date: Fri, 9 Sep 2016 19:12:46 +0200 Subject: [PATCH 1/5] d --- dd | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 dd diff --git a/dd b/dd new file mode 100644 index 0000000..e69de29 From 8be2fed90e98fb0a315c1c94962882a4356d6c4d Mon Sep 17 00:00:00 2001 From: Krystian Date: Fri, 9 Sep 2016 19:22:20 +0200 Subject: [PATCH 2/5] wrzucam petle --- src/main/java/arytmetyka/Kalkulator.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/arytmetyka/Kalkulator.java b/src/main/java/arytmetyka/Kalkulator.java index cf196f0..a327f19 100644 --- a/src/main/java/arytmetyka/Kalkulator.java +++ b/src/main/java/arytmetyka/Kalkulator.java @@ -19,5 +19,10 @@ public int div(int x, int y) { } return x / y; } +public void petla(int x){ + for (int i = 0; i Date: Fri, 9 Sep 2016 19:28:40 +0200 Subject: [PATCH 3/5] wrzucam petle --- src/main/java/arytmetyka/Kalkulator.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/arytmetyka/Kalkulator.java b/src/main/java/arytmetyka/Kalkulator.java index a327f19..d6dc133 100644 --- a/src/main/java/arytmetyka/Kalkulator.java +++ b/src/main/java/arytmetyka/Kalkulator.java @@ -22,6 +22,7 @@ public int div(int x, int y) { public void petla(int x){ for (int i = 0; i Date: Fri, 9 Sep 2016 20:37:05 +0200 Subject: [PATCH 4/5] =?UTF-8?q?Dodano=20klas=C4=99=20Tablice=20i=20mo?= =?UTF-8?q?=C5=BCliwo=C5=9B=C4=87=20tworzenia=20dwuwymiarowych=20tablic?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/arytmetyka/Startowa.java | 3 +++ src/main/java/arytmetyka/Tablice.java | 12 ++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 src/main/java/arytmetyka/Tablice.java diff --git a/src/main/java/arytmetyka/Startowa.java b/src/main/java/arytmetyka/Startowa.java index 6bd6126..723d07c 100644 --- a/src/main/java/arytmetyka/Startowa.java +++ b/src/main/java/arytmetyka/Startowa.java @@ -7,5 +7,8 @@ public class Startowa { public static void main(String[] args) { Kalkulator k = new Kalkulator(); System.out.println(k.add(1, 2)); + + Tablice tablica = new Tablice(); + tablica.stworzTablice(5, 5); } } diff --git a/src/main/java/arytmetyka/Tablice.java b/src/main/java/arytmetyka/Tablice.java new file mode 100644 index 0000000..ff2e0f9 --- /dev/null +++ b/src/main/java/arytmetyka/Tablice.java @@ -0,0 +1,12 @@ +package arytmetyka; + +/** + * Created by Blazej on 2016-09-09. + */ +public class Tablice { + private int[][] tablica; + + public void stworzTablice(int x, int y){ + tablica = new int[x][y]; + } +} \ No newline at end of file From 2f58eb30e213bf51ce8a58c4ea6b5212a27377bb Mon Sep 17 00:00:00 2001 From: Piotr Marecki Date: Sat, 10 Sep 2016 09:09:10 +0200 Subject: [PATCH 5/5] Dodane odfiltrowywanie html-a --- pom.xml | 9 ++++++ src/main/java/htmlutils/RemoveHtmlTags.java | 12 ++++++++ .../java/htmlutils/RemoveHtmlTagsTest.java | 30 +++++++++++++++++++ 3 files changed, 51 insertions(+) create mode 100644 src/main/java/htmlutils/RemoveHtmlTags.java create mode 100644 src/test/java/htmlutils/RemoveHtmlTagsTest.java diff --git a/pom.xml b/pom.xml index 7bf895a..257f22b 100644 --- a/pom.xml +++ b/pom.xml @@ -22,6 +22,15 @@ 3.5.2 + + + org.jsoup + jsoup + 1.8.3 + + + + diff --git a/src/main/java/htmlutils/RemoveHtmlTags.java b/src/main/java/htmlutils/RemoveHtmlTags.java new file mode 100644 index 0000000..f5aa59f --- /dev/null +++ b/src/main/java/htmlutils/RemoveHtmlTags.java @@ -0,0 +1,12 @@ +package htmlutils; + +import org.jsoup.Jsoup; + +/** + * Created on 10.09.16, at 08:59 + */ +public class RemoveHtmlTags { + public String removeTags(String source) { + return Jsoup.parse(source).text(); + } +} diff --git a/src/test/java/htmlutils/RemoveHtmlTagsTest.java b/src/test/java/htmlutils/RemoveHtmlTagsTest.java new file mode 100644 index 0000000..1498719 --- /dev/null +++ b/src/test/java/htmlutils/RemoveHtmlTagsTest.java @@ -0,0 +1,30 @@ +package htmlutils; + +import org.junit.Before; +import org.junit.Test; + +import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; + + +public class RemoveHtmlTagsTest { + RemoveHtmlTags testee; + + @Before + public void setUp() throws Exception { + testee = new RemoveHtmlTags(); + + } + + @Test + public void simpleremoveTest() { + String src = ""; + assertThat(testee.removeTags(src)).isEqualTo(""); + } + + @Test + public void moreComplicatedTest() { + String src = "

foo bar foobar baz

"; + assertThat(testee.removeTags(src)).isEqualTo("foo bar foobar baz"); + } +} \ No newline at end of file