diff --git a/.idea/misc.xml b/.idea/misc.xml
index 16e3252..9100e4e 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -47,7 +47,7 @@
-
+
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ffca0d6..2f2e022 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -10,14 +10,11 @@
-
-
-
-
-
+
+
@@ -31,7 +28,7 @@
-
+
@@ -52,13 +49,15 @@
-
+
-
-
+
+
+
+
@@ -91,17 +90,17 @@
-
+
-
+
-
-
+
+
@@ -111,7 +110,7 @@
-
+
@@ -131,7 +130,7 @@
-
+
@@ -189,11 +188,11 @@
-
-
+
+
@@ -211,9 +210,10 @@
-
-
-
+
+
+
+
@@ -253,7 +253,7 @@
-
+
@@ -263,7 +263,7 @@
-
+
@@ -281,7 +281,7 @@
-
+
@@ -295,7 +295,7 @@
-
+
@@ -306,10 +306,6 @@
-
-
-
-
@@ -317,99 +313,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -427,12 +331,12 @@
-
+
-
+
@@ -444,6 +348,7 @@
+
@@ -599,19 +504,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -688,32 +580,32 @@
-
-
+
+
+
+
-
+
+
-
-
-
@@ -740,174 +632,6 @@
-
- file://$PROJECT_DIR$/src/de/marcelkapfer/c/morseconverter/intelligentCodeRecognization/WrittenMorseCodeRecognization.java
- 29
-
-
-
-
- file://$PROJECT_DIR$/src/de/marcelkapfer/c/morseconverter/intelligentCodeRecognization/WrittenMorseCodeRecognization.java
- 31
-
-
-
-
- file://$PROJECT_DIR$/src/de/marcelkapfer/c/morseconverter/intelligentCodeRecognization/WrittenMorseCodeRecognization.java
- 30
-
-
-
-
- file://$PROJECT_DIR$/src/de/marcelkapfer/c/morseconverter/intelligentCodeRecognization/WrittenMorseCodeRecognization.java
- 32
-
-
-
-
- file://$PROJECT_DIR$/src/de/marcelkapfer/c/morseconverter/intelligentCodeRecognization/WrittenMorseCodeRecognization.java
- 33
-
-
-
-
- file://$PROJECT_DIR$/src/de/marcelkapfer/c/morseconverter/intelligentCodeRecognization/WrittenMorseCodeRecognization.java
- 34
-
-
-
-
- file://$PROJECT_DIR$/src/de/marcelkapfer/c/morseconverter/intelligentCodeRecognization/WrittenMorseCodeRecognization.java
- 35
-
-
-
-
- file://$PROJECT_DIR$/src/de/marcelkapfer/c/morseconverter/intelligentCodeRecognization/WrittenMorseCodeRecognization.java
- 36
-
-
-
-
- file://$PROJECT_DIR$/src/de/marcelkapfer/c/morseconverter/intelligentCodeRecognization/WrittenMorseCodeRecognization.java
- 37
-
-
-
-
- file://$PROJECT_DIR$/src/de/marcelkapfer/c/morseconverter/intelligentCodeRecognization/WrittenMorseCodeRecognization.java
- 38
-
-
-
-
- file://$PROJECT_DIR$/src/de/marcelkapfer/c/morseconverter/intelligentCodeRecognization/WrittenMorseCodeRecognization.java
- 39
-
-
-
-
- file://$PROJECT_DIR$/src/de/marcelkapfer/c/morseconverter/intelligentCodeRecognization/WrittenMorseCodeRecognization.java
- 40
-
-
-
-
- file://$PROJECT_DIR$/src/de/marcelkapfer/c/morseconverter/intelligentCodeRecognization/WrittenMorseCodeRecognization.java
- 41
-
-
-
-
- file://$PROJECT_DIR$/src/de/marcelkapfer/c/morseconverter/intelligentCodeRecognization/WrittenMorseCodeRecognization.java
- 42
-
-
-
-
- file://$PROJECT_DIR$/src/de/marcelkapfer/c/morseconverter/intelligentCodeRecognization/WrittenMorseCodeRecognization.java
- 43
-
-
-
-
- file://$PROJECT_DIR$/src/de/marcelkapfer/c/morseconverter/intelligentCodeRecognization/WrittenMorseCodeRecognization.java
- 44
-
-
-
-
- file://$PROJECT_DIR$/src/de/marcelkapfer/c/morseconverter/intelligentCodeRecognization/WrittenMorseCodeRecognization.java
- 45
-
-
-
-
- file://$PROJECT_DIR$/src/de/marcelkapfer/c/morseconverter/intelligentCodeRecognization/WrittenMorseCodeRecognization.java
- 46
-
-
-
-
- file://$PROJECT_DIR$/src/de/marcelkapfer/c/morseconverter/intelligentCodeRecognization/WrittenMorseCodeRecognization.java
- 47
-
-
-
-
- file://$PROJECT_DIR$/src/de/marcelkapfer/c/morseconverter/intelligentCodeRecognization/WrittenMorseCodeRecognization.java
- 48
-
-
-
-
- file://$PROJECT_DIR$/src/de/marcelkapfer/c/morseconverter/intelligentCodeRecognization/WrittenMorseCodeRecognization.java
- 49
-
-
-
-
- file://$PROJECT_DIR$/src/de/marcelkapfer/c/morseconverter/intelligentCodeRecognization/WrittenMorseCodeRecognization.java
- 50
-
-
-
-
- file://$PROJECT_DIR$/src/de/marcelkapfer/c/morseconverter/intelligentCodeRecognization/WrittenMorseCodeRecognization.java
- 51
-
-
-
-
- file://$PROJECT_DIR$/src/de/marcelkapfer/c/morseconverter/intelligentCodeRecognization/WrittenMorseCodeRecognization.java
- 54
-
-
-
-
- file://$PROJECT_DIR$/src/de/marcelkapfer/c/morseconverter/intelligentCodeRecognization/WrittenMorseCodeRecognization.java
- 52
-
-
-
-
- file://$PROJECT_DIR$/src/de/marcelkapfer/c/morseconverter/intelligentCodeRecognization/WrittenMorseCodeRecognization.java
- 53
-
-
-
-
- file://$PROJECT_DIR$/src/de/marcelkapfer/c/morseconverter/intelligentCodeRecognization/WrittenMorseCodeRecognization.java
- 55
-
-
-
-
- file://$PROJECT_DIR$/src/de/marcelkapfer/c/morseconverter/intelligentCodeRecognization/WrittenMorseCodeRecognization.java
- 56
-
-
-
file://$PROJECT_DIR$/src/de/marcelkapfer/c/morseconverter/intelligentCodeRecognization/WrittenMorseCodeRecognization.java
58
@@ -926,51 +650,33 @@
-
- file://$PROJECT_DIR$/src/de/marcelkapfer/c/morseconverter/intelligentCodeRecognization/WrittenMorseCodeRecognization.java
- 60
-
-
-
-
- file://$PROJECT_DIR$/src/de/marcelkapfer/c/morseconverter/intelligentCodeRecognization/WrittenMorseCodeRecognization.java
- 61
-
-
-
-
- file://$PROJECT_DIR$/src/de/marcelkapfer/c/morseconverter/intelligentCodeRecognization/WrittenMorseCodeRecognization.java
- 63
-
-
-
file://$PROJECT_DIR$/src/de/marcelkapfer/c/morseconverter/Main.java
- 132
+ 130
file://$PROJECT_DIR$/src/de/marcelkapfer/c/morseconverter/Main.java
- 134
+ 132
file://$PROJECT_DIR$/src/de/marcelkapfer/c/morseconverter/Main.java
- 136
+ 134
file://$PROJECT_DIR$/src/de/marcelkapfer/c/morseconverter/Main.java
- 137
+ 135
file://$PROJECT_DIR$/src/de/marcelkapfer/c/morseconverter/Main.java
- 139
+ 137
@@ -1160,11 +866,95 @@
+
+ file://$PROJECT_DIR$/src/de/marcelkapfer/c/morseconverter/engine/EncodeWrittenMorseManager.java
+ 198
+
+
+
+
+ file://$PROJECT_DIR$/src/de/marcelkapfer/c/morseconverter/engine/EncodeWrittenMorseManager.java
+ 200
+
+
+
+
+ file://$PROJECT_DIR$/src/de/marcelkapfer/c/morseconverter/engine/EncodeWrittenMorseManager.java
+ 199
+
+
+
+
+ file://$PROJECT_DIR$/src/de/marcelkapfer/c/morseconverter/engine/EncodeWrittenMorseManager.java
+ 201
+
+
+
+
+ file://$PROJECT_DIR$/src/de/marcelkapfer/c/morseconverter/engine/EncodeWrittenMorseManager.java
+ 202
+
+
+
+
+ file://$PROJECT_DIR$/src/de/marcelkapfer/c/morseconverter/engine/EncodeWrittenMorseManager.java
+ 203
+
+
+
+
+ file://$PROJECT_DIR$/src/de/marcelkapfer/c/morseconverter/engine/EncodeWrittenMorseManager.java
+ 49
+
+
+
+
+ file://$PROJECT_DIR$/src/de/marcelkapfer/c/morseconverter/engine/EncodeWrittenMorseManager.java
+ 50
+
+
+
+
+ file://$PROJECT_DIR$/src/de/marcelkapfer/c/morseconverter/engine/EncodeWrittenMorseManager.java
+ 47
+
+
+
+
+ file://$PROJECT_DIR$/src/de/marcelkapfer/c/morseconverter/engine/EncodeWrittenMorseManager.java
+ 44
+
+
+
+
+ file://$PROJECT_DIR$/src/de/marcelkapfer/c/morseconverter/engine/EncodeWrittenMorseManager.java
+ 40
+
+
+
+
+ file://$PROJECT_DIR$/src/de/marcelkapfer/c/morseconverter/engine/EncodeWrittenMorseManager.java
+ 45
+
+
+
+
+ file://$PROJECT_DIR$/src/de/marcelkapfer/c/morseconverter/engine/EncodeWrittenMorseManager.java
+ 73
+
+
+
+
+ file://$PROJECT_DIR$/src/de/marcelkapfer/c/morseconverter/engine/EncodeWrittenMorseManager.java
+ 76
+
+
+
-
+
@@ -1179,6 +969,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -1199,6 +1000,8 @@
+
+
@@ -1263,6 +1066,8 @@
+
+
@@ -1330,6 +1135,8 @@
+
+
@@ -1394,6 +1201,8 @@
+
+
@@ -1437,9 +1246,6 @@
-
-
-
@@ -1465,64 +1271,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1545,6 +1293,14 @@
+
+
+
+
+
+
+
+
@@ -1556,6 +1312,11 @@
+
+
+
+
+
@@ -1567,16 +1328,50 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1653,6 +1448,18 @@
+
+
+ 1.8
+
+
+
+
+
diff --git a/src/de/marcelkapfer/c/morseconverter/Main.java b/src/de/marcelkapfer/c/morseconverter/Main.java
index e9b3c6b..fde27ae 100755
--- a/src/de/marcelkapfer/c/morseconverter/Main.java
+++ b/src/de/marcelkapfer/c/morseconverter/Main.java
@@ -67,9 +67,7 @@ public class Main extends JFrame {
Element element = htmlDocument.getDefaultRootElement();
try {
htmlDocument.setInnerHTML(element, resourceBundle.getString("about"));
- } catch (BadLocationException e) {
- e.printStackTrace();
- } catch (IOException e) {
+ } catch (BadLocationException | IOException e) {
e.printStackTrace();
}
aboutText.setDocument(htmlDocument);
diff --git a/src/de/marcelkapfer/c/morseconverter/engine/EncodeNormalMorseManager.java b/src/de/marcelkapfer/c/morseconverter/engine/EncodeNormalMorseManager.java
index 0cdf8ee..c750319 100755
--- a/src/de/marcelkapfer/c/morseconverter/engine/EncodeNormalMorseManager.java
+++ b/src/de/marcelkapfer/c/morseconverter/engine/EncodeNormalMorseManager.java
@@ -49,14 +49,13 @@ public class EncodeNormalMorseManager {
if (inputToSign.toString().startsWith(" ")) {
output.append(" ");
inputToSign.delete(d, d + 7);
- } else if(inputToSign.toString().startsWith(System.lineSeparator())){
+ }
+ if (inputToSign.toString().startsWith("\n")) {
output.append(System.lineSeparator());
- inputToSign.delete(0, System.lineSeparator().length());
- } else if (input.toString().startsWith("\n")) {
- output.append(System.lineSeparator());
- int indexLineSeparator = input.indexOf("\n");
+ int indexLineSeparator = inputToSign.indexOf("\n");
inputToSign.deleteCharAt(indexLineSeparator);
- } else if (inputToSign.toString().substring(d, d + 3).equals(" ")) {
+ }
+ if (inputToSign.toString().substring(d, d + 3).equals(" ")) {
if (d == 0) {
inputToSign.delete(0, 3);
} else {
@@ -122,9 +121,9 @@ public class EncodeNormalMorseManager {
} else if (sign.toString().equals("--..")) {
output.append("Z");
} else if (sign.toString().equals("-----")) {
- output.append(". (zero)");
+ output.append("0");
} else if (sign.toString().equals(".----")) {
- output.append("-");
+ output.append("1");
} else if (sign.toString().equals("..---")) {
output.append("2");
} else if (sign.toString().equals("...--")) {
diff --git a/src/de/marcelkapfer/c/morseconverter/engine/EncodeWrittenMorseManager.java b/src/de/marcelkapfer/c/morseconverter/engine/EncodeWrittenMorseManager.java
index 752aadc..60019d7 100755
--- a/src/de/marcelkapfer/c/morseconverter/engine/EncodeWrittenMorseManager.java
+++ b/src/de/marcelkapfer/c/morseconverter/engine/EncodeWrittenMorseManager.java
@@ -39,6 +39,9 @@ public class EncodeWrittenMorseManager {
String input;
StringBuffer output = new StringBuffer();
input = message.toString().toUpperCase() + "#";
+ input.replace(System.lineSeparator(), "\n");
+ input.replace("\r", "\n");
+ input.replace("\r\n", "\n");
StringBuffer inputToSign = new StringBuffer(input);
while (!inputToSign.toString().equals("#")) {
int d = 0;
@@ -47,22 +50,18 @@ public class EncodeWrittenMorseManager {
while (signFull) {
if (inputToSign.toString().charAt(d) == '+'
|| inputToSign.toString().charAt(d) == '#'
- || inputToSign.toString().startsWith(System.lineSeparator())) {
+ || inputToSign.toString().startsWith("\n")) {
if (d == 0) {
if (inputToSign.toString().startsWith("+")) {
output.append(" ");
inputToSign.deleteCharAt(0);
}
- if (inputToSign.toString().startsWith(System.lineSeparator())){
- output.append(System.lineSeparator());
- inputToSign.delete(0, System.lineSeparator().length());
- }
if (inputToSign.toString().startsWith("#")){
inputToSign.deleteCharAt(0);
}
- if (input.toString().startsWith("\n")) {
+ if (inputToSign.toString().startsWith("\n")) {
output.append(System.lineSeparator());
- int indexLineSeparator = input.indexOf("\n");
+ int indexLineSeparator = inputToSign.indexOf("\n");
inputToSign.deleteCharAt(indexLineSeparator);
}
} else {
@@ -128,7 +127,7 @@ public class EncodeWrittenMorseManager {
} else if (sign.toString().equals("1100")) {
output.append("Z");
} else if (sign.toString().equals("11111")) {
- output.append("0 (zero)");
+ output.append("0");
} else if (sign.toString().equals("01111")) {
output.append("1");
} else if (sign.toString().equals("00111")) {