Skip to content

Commit fed65da

Browse files
author
DGrothe-PhD
committed
addressed #36. Words highlighted when extra hyphens.
1 parent cf579cf commit fed65da

File tree

4 files changed

+25
-17
lines changed

4 files changed

+25
-17
lines changed

‎src/app/StringCompare.java‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
public class StringCompare {
1111

1212
private String subseq ="";
13-
private int levenshtein_distance;
13+
private int levenshteinDistance;
1414
private static int NUMW = 5;
1515
private static double ALLOVAR = 0.5;
1616

1717
private LinkedList<String> words;
1818

1919
public StringCompare() {
2020
subseq = "";
21-
levenshtein_distance = 0;
21+
levenshteinDistance = 0;
2222
words = new LinkedList<String>();
2323
}
2424

@@ -34,7 +34,7 @@ private int diff(String firstword, String secondword) {
3434
word_a = secondword;
3535
}
3636

37-
levenshtein_distance = 0;
37+
levenshteinDistance = 0;
3838
subseq = "";
3939
int matrix[][] = new int[word_a.length() + 1][word_b.length() + 1];
4040
int i;
@@ -61,7 +61,7 @@ private int diff(String firstword, String secondword) {
6161
}
6262
}
6363

64-
levenshtein_distance = matrix[word_a.length()][word_b.length()];
64+
levenshteinDistance = matrix[word_a.length()][word_b.length()];
6565
//blanks for differences in similar words
6666
if (matrix[word_a.length()][word_b.length()] < ALLOVAR *word_a.length()) {
6767
subseq="###";
@@ -94,20 +94,22 @@ private String showDifference(String a, String b, Localization lang) {
9494
return "";
9595
}
9696

97-
if(levenshtein_distance < 3) {
97+
if(levenshteinDistance < 3) {
9898
return "; "+ ((occa>=occb && occb>0)?lang.Header("also")+" (A)":lang.Header("more")+" (*)")
9999
+ ": <em><b><font color=red>" + b + "</font></b></em>";
100100
}
101101

102-
//Anagram checker
102+
//Anagram and hyphen checker
103103
char[] cha = worda.replace("&emsp;", "").toCharArray();
104104
Arrays.sort(cha);
105105
String ta = new String(cha);
106106
ta = ta.strip();
107+
ta = ta.replaceAll("-", "");
107108
char[] chb = wordb.replace("&emsp;", "").toCharArray();
108109
Arrays.sort(chb);
109110
String tb = new String(chb);
110111
tb = tb.strip();
112+
tb = tb.replaceAll("-", "");
111113

112114
if(ta.equals(tb)) {
113115
return "; "+ ((occa>=occb && occb>0)?lang.Header("also")+" (A)":lang.Header("more")+" (A)")

‎src/app/UserDialog.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public class UserDialog {
4949
private JCBox searchTermBox, localizationBox;
5050
private ToggleFunction chkNumbers, chkSymbols, chkWords, chkUserTerms;
5151
private JComboBox<Integer> extractLength;
52-
private Integer[] extractLengthValues = new Integer[] {10, 20, 50, 100, 150};
52+
private Integer[] extractLengthValues = new Integer[] {10, 20, 50, 75, 100, 120, 150};
5353
private JPanel controlPanel, statusPanel, top;
5454
private ImagePanel background;
5555
private Image image;
@@ -101,7 +101,7 @@ public UserDialog(){
101101
System.out.println("Screen height = " + d.height);
102102

103103
mainFrame = new JFrame("Java Wordchecker");
104-
mainFrame.setSize(500,460);
104+
mainFrame.setSize(600,460);
105105
mainFrame.setLayout(new GridLayout());
106106

107107
makeFields();
@@ -280,6 +280,7 @@ private void makeFields() {
280280
userTermsTextArea.setFont(WFont.descriptionFont);
281281
userTermsTextArea.setColumns(LabelledField.FIELD_WIDTH);
282282
userTermsTextArea.setRows(5);
283+
userTermsTextArea.setToolTipText(lang.getLocalizedText("Edit tooltip"));
283284
userTermsTextArea.setEditable(true);
284285
}
285286

@@ -314,6 +315,7 @@ protected void addTextToButtons() {
314315
searchTermBoxLabel.setText(lang.getLocalizedText("Search terms:"));
315316
extractLengthLabel.setText(lang.getLocalizedText("Extract length:"));
316317
textareaLabel.setText(lang.getLocalizedText("Edit search terms:"));
318+
userTermsTextArea.setToolTipText(lang.getLocalizedText("Edit tooltip"));
317319

318320
field_topic.setText(lang.getLocalizedText("Result word list"));
319321
field_topic.thelabel.setText(lang.getLocalizedText("Type topic:"));

‎src/json/localized.json‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"Digits": "Zeichenfolge beginnend mit Ziffer:",
99
"EMail": "E-Mail erkannt",
1010
"Edit search terms:": "Suchbegriffe bearbeiten:",
11+
"Edit tooltip":"<html>Ergänzen oder ändern Sie, wie Sie möchten.<br>Jeder Suchbegriff oder Begriffsfolge wird in einer Zeile eingegeben.</html>",
1112
"Extract length:": "Textausschnittlänge:",
1213
"FileNotRead": "Dateilesefehler",
1314
"FilePrepFailed": "Konnte Ausgabedatei nicht erzeugen.",
@@ -33,7 +34,7 @@
3334
"Selected folder:": "Gewählter Ordner:",
3435
"Show Results": "Ergebnisse",
3536
"Start": "Start",
36-
"Symbols": "Zeichenketten",
37+
"Symbols": "Sonderzeichen",
3738
"Target file:": "Zieldatei:",
3839
"Type topic:": "Kurztitel eingeben:",
3940
"URL": "URL erkannt",
@@ -58,7 +59,8 @@
5859
"Datetime": "Date ou heure reconnue",
5960
"Digits": "Commençant par des chiffres",
6061
"EMail": "Adresse e-mail reconnue",
61-
"Edit search terms:": "Termes de recherche:",
62+
"Edit search terms:": "Termes choisis:",
63+
"Edit tooltip":"<html>Ajoutez ou modifiez les termes comme vous voulez.<br>Les mots à chercher sont ajoutés par ligne.</html>",
6264
"Extract length:": "Longueur d'extrait:",
6365
"FileNotRead": "Erreur de fichier",
6466
"FilePrepFailed": "Impossible de créer un fichier de sortie.",
@@ -77,14 +79,14 @@
7779
"PossibleFileWriteError": "Erreur d'enregistrer au fichier.",
7880
"Results": "Résultats",
7981
"Result word list": "Liste des mots de résultat",
80-
"Search terms": "Termes de recherche",
81-
"Search terms:": "Termes de recherche:",
82+
"Search terms": "Termes choisis",
83+
"Search terms:": "Termes choisis:",
8284
"Select file": "Sélectionner un fichier",
8385
"Selected file:": "Fichier sélectionné:",
8486
"Selected folder:": "Dossier sélectionné:",
8587
"Show Results": "Résultats",
8688
"Start": "Démarrer",
87-
"Symbols": "Chaîne de caractères",
89+
"Symbols": "Caractères spéc.",
8890
"Target file:": "Fichier de sortie:",
8991
"Type topic:": "Titre ou sujet:",
9092
"URL": "Adresse URL reconnue",
@@ -110,6 +112,7 @@
110112
"Digits": "Tokens beginning with a digit:",
111113
"EMail": "E-Mail address found",
112114
"Edit search terms:": "Edit search terms:",
115+
"Edit tooltip":"<html>Edit or add search terms here.<br>Expressions to search for are typed line by line.</html>",
113116
"Extract length:": "Extract length:",
114117
"FileNotRead": "File could not be read",
115118
"FilePrepFailed": "Could not prepare output file.",

‎src/json/searchwords.json‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
{
22
"jobOfferDE": [
3-
"reise", "Reise", "Assist", "befrist", "befrist", "Teilzeit", "Kunde",
4-
"Vertrieb", "Büro", "Homeoffice"
3+
"reise", "Reise", "Assist", "befrist", "Teilzeit", "Kunde",
4+
"Vertrieb", "Büro", "Homeoffice", "remote", "Projekt", "Gehaltsvorstellung", "Anschreiben", "Lebenslauf",
5+
"Zeugnisse", "Bewerbungsfrist", "Startup", "einschlägig", "Studium", "Ausbildung"
56
],
67
"weatherEN": [
7-
"Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday",
8+
"yesterday", "tomorrow", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday",
89
"rain", "sun", "cloudy", "clouds", "snow", "ice", "precipitation", "wet"
910
],
1011
"weatherDE": [
11-
"Montag", "Dienstag", "Mittwoch", "Donnerstag", "Freitag", "Samstag", "Sonntag",
12+
"gestern", "morgen", "übermorgen", "Montag", "Dienstag", "Mittwoch", "Donnerstag", "Freitag", "Samstag", "Sonntag",
1213
"Regen", "Sonne", "sonnig", "wolkig", "Wolke", "Schnee", "Niederschl"
1314
],
1415
"months": [

0 commit comments

Comments
 (0)