lkrsnik/list
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Fixed multiple notifications for one Error bug

Browse Source
This commit is contained in:
Luka 2019-02-27 11:04:08 +01:00
parent 82d111eade
commit 39624fa4f2
4 changed files with 404 additions and 258 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/main/java/gui/CharacterAnalysisTab.java
View File

@ -175,6 +175,9 @@ public class CharacterAnalysisTab {
private boolean useDb; private boolean useDb;
private HostServices hostService; private HostServices hostService;
private ListChangeListener<String> taxonomyListener; private ListChangeListener<String> taxonomyListener;
private ChangeListener<Boolean> msdListener;
private ChangeListener<Boolean> minimalOccurrencesListener;
private ChangeListener<Boolean> minimalTaxonomyListener;
private static final String [] N_GRAM_COMPUTE_FOR_LETTERS_ARRAY = {"calculateFor.WORD", "calculateFor.LEMMA"}; private static final String [] N_GRAM_COMPUTE_FOR_LETTERS_ARRAY = {"calculateFor.WORD", "calculateFor.LEMMA"};
private static final ArrayList<String> N_GRAM_COMPUTE_FOR_LETTERS = new ArrayList<>(Arrays.asList(N_GRAM_COMPUTE_FOR_LETTERS_ARRAY)); private static final ArrayList<String> N_GRAM_COMPUTE_FOR_LETTERS = new ArrayList<>(Arrays.asList(N_GRAM_COMPUTE_FOR_LETTERS_ARRAY));
@ -236,8 +239,14 @@ public class CharacterAnalysisTab {
taxonomySetOperationCB.getSelectionModel().select(0); taxonomySetOperationCB.getSelectionModel().select(0);
if (msdListener != null){
msdTF.focusedProperty().removeListener(msdListener);
}
// msd // msd
msdTF.focusedProperty().addListener((observable, oldValue, newValue) -> { msdListener = new ChangeListener<Boolean>() {
@Override
public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
if (!newValue) { if (!newValue) {
// focus lost // focus lost
String value = msdTF.getText(); String value = msdTF.getText();
@ -265,7 +274,9 @@ public class CharacterAnalysisTab {
msdStrings = new ArrayList<>(); msdStrings = new ArrayList<>();
} }
} }
}); }
};
msdTF.focusedProperty().addListener(msdListener);
msdTF.setText(""); msdTF.setText("");
msd = new ArrayList<>(); msd = new ArrayList<>();
@ -381,7 +392,14 @@ public class CharacterAnalysisTab {
minimalTaxonomyTF.setDisable(true); minimalTaxonomyTF.setDisable(true);
minimalOccurrencesTF.focusedProperty().addListener((observable, oldValue, newValue) -> { if (minimalOccurrencesListener != null){
minimalOccurrencesTF.focusedProperty().removeListener(minimalOccurrencesListener);
}
// msd
minimalOccurrencesListener = new ChangeListener<Boolean>() {
@Override
public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
if (!newValue) { if (!newValue) {
// focus lost // focus lost
String value = minimalOccurrencesTF.getText(); String value = minimalOccurrencesTF.getText();
@ -397,9 +415,18 @@ public class CharacterAnalysisTab {
minimalOccurrences = 1; minimalOccurrences = 1;
} }
} }
}); }
};
minimalOccurrencesTF.focusedProperty().addListener(minimalOccurrencesListener);
minimalTaxonomyTF.focusedProperty().addListener((observable, oldValue, newValue) -> {
if (minimalTaxonomyListener != null){
minimalTaxonomyTF.focusedProperty().removeListener(minimalTaxonomyListener);
}
minimalTaxonomyListener = new ChangeListener<Boolean>() {
@Override
public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
if (!newValue) { if (!newValue) {
// focus lost // focus lost
String value = minimalTaxonomyTF.getText(); String value = minimalTaxonomyTF.getText();
@ -415,7 +442,9 @@ public class CharacterAnalysisTab {
minimalTaxonomy = 1; minimalTaxonomy = 1;
} }
} }
}); }
};
minimalTaxonomyTF.focusedProperty().addListener(minimalTaxonomyListener);
computeNgramsB.setOnAction(e -> { computeNgramsB.setOnAction(e -> {
compute(); compute();

55
src/main/java/gui/OneWordAnalysisTab.java
View File

@ -192,6 +192,10 @@ public class OneWordAnalysisTab {
private ListChangeListener<String> taxonomyListener; private ListChangeListener<String> taxonomyListener;
private ListChangeListener<String> alsoVisualizeListener; private ListChangeListener<String> alsoVisualizeListener;
private ChangeListener<String> calculateForListener; private ChangeListener<String> calculateForListener;
private ChangeListener<Boolean> msdListener;
private ChangeListener<Boolean> minimalOccurrencesListener;
private ChangeListener<Boolean> minimalTaxonomyListener;
private ChangeListener<Boolean> minimalRelFreListener;
// private static final ObservableList<String> N_GRAM_COMPUTE_FOR_WORDS = FXCollections.observableArrayList("lema", "različnica", "oblikoskladenjska oznaka"); // private static final ObservableList<String> N_GRAM_COMPUTE_FOR_WORDS = FXCollections.observableArrayList("lema", "različnica", "oblikoskladenjska oznaka");
// private static final ObservableList<String> N_GRAM_COMPUTE_FOR_LETTERS = FXCollections.observableArrayList("lema", "različnica"); // private static final ObservableList<String> N_GRAM_COMPUTE_FOR_LETTERS = FXCollections.observableArrayList("lema", "različnica");
@ -367,8 +371,14 @@ public class OneWordAnalysisTab {
taxonomySetOperationCB.getSelectionModel().select(0); taxonomySetOperationCB.getSelectionModel().select(0);
if (msdListener != null){
msdTF.focusedProperty().removeListener(msdListener);
}
// msd // msd
msdTF.focusedProperty().addListener((observable, oldValue, newValue) -> { msdListener = new ChangeListener<Boolean>() {
@Override
public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
if (!newValue) { if (!newValue) {
// focus lost // focus lost
String value = msdTF.getText(); String value = msdTF.getText();
@ -396,7 +406,10 @@ public class OneWordAnalysisTab {
msdStrings = new ArrayList<>(); msdStrings = new ArrayList<>();
} }
} }
}); }
};
msdTF.focusedProperty().addListener(msdListener);
msdTF.setText(""); msdTF.setText("");
msd = new ArrayList<>(); msd = new ArrayList<>();
@ -535,7 +548,14 @@ public class OneWordAnalysisTab {
minimalTaxonomyTF.setDisable(true); minimalTaxonomyTF.setDisable(true);
minimalOccurrencesTF.focusedProperty().addListener((observable, oldValue, newValue) -> { if (minimalOccurrencesListener != null){
minimalOccurrencesTF.focusedProperty().removeListener(minimalOccurrencesListener);
}
// msd
minimalOccurrencesListener = new ChangeListener<Boolean>() {
@Override
public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
if (!newValue) { if (!newValue) {
// focus lost // focus lost
String value = minimalOccurrencesTF.getText(); String value = minimalOccurrencesTF.getText();
@ -551,9 +571,18 @@ public class OneWordAnalysisTab {
minimalOccurrences = 1; minimalOccurrences = 1;
} }
} }
}); }
};
minimalOccurrencesTF.focusedProperty().addListener(minimalOccurrencesListener);
minimalTaxonomyTF.focusedProperty().addListener((observable, oldValue, newValue) -> {
if (minimalTaxonomyListener != null){
minimalTaxonomyTF.focusedProperty().removeListener(minimalTaxonomyListener);
}
minimalTaxonomyListener = new ChangeListener<Boolean>() {
@Override
public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
if (!newValue) { if (!newValue) {
// focus lost // focus lost
String value = minimalTaxonomyTF.getText(); String value = minimalTaxonomyTF.getText();
@ -569,13 +598,21 @@ public class OneWordAnalysisTab {
minimalTaxonomy = 1; minimalTaxonomy = 1;
} }
} }
}); }
};
minimalTaxonomyTF.focusedProperty().addListener(minimalTaxonomyListener);
// set default values // set default values
minimalRelFreTF.setText("1"); minimalRelFreTF.setText("1");
minimalRelFre = 1; minimalRelFre = 1;
minimalRelFreTF.focusedProperty().addListener((observable, oldValue, newValue) -> { if (minimalRelFreListener != null){
minimalRelFreTF.focusedProperty().removeListener(minimalRelFreListener);
}
minimalRelFreListener = new ChangeListener<Boolean>() {
@Override
public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
if (!newValue) { if (!newValue) {
// focus lost // focus lost
String value = minimalRelFreTF.getText(); String value = minimalRelFreTF.getText();
@ -591,7 +628,9 @@ public class OneWordAnalysisTab {
minimalRelFre = 1; minimalRelFre = 1;
} }
} }
}); }
};
minimalRelFreTF.focusedProperty().addListener(minimalRelFreListener);
changeLanguageB.setOnAction(e -> { changeLanguageB.setOnAction(e -> {

61
src/main/java/gui/StringAnalysisTabNew2.java
View File

@ -232,6 +232,10 @@ public class StringAnalysisTabNew2 {
private ListChangeListener<String> alsoVisualizeListener; private ListChangeListener<String> alsoVisualizeListener;
private ListChangeListener<String> collocabilityListener; private ListChangeListener<String> collocabilityListener;
private ChangeListener<String> calculateForListener; private ChangeListener<String> calculateForListener;
private ChangeListener<Boolean> msdListener;
private ChangeListener<Boolean> minimalOccurrencesListener;
private ChangeListener<Boolean> minimalTaxonomyListener;
private ChangeListener<Boolean> minimalRelFreListener;
// private static final ObservableList<String> N_GRAM_COMPUTE_FOR_WORDS = FXCollections.observableArrayList("lema", "različnica", "oblikoskladenjska oznaka"); // private static final ObservableList<String> N_GRAM_COMPUTE_FOR_WORDS = FXCollections.observableArrayList("lema", "različnica", "oblikoskladenjska oznaka");
// private static final ObservableList<String> N_GRAM_COMPUTE_FOR_LETTERS = FXCollections.observableArrayList("lema", "različnica"); // private static final ObservableList<String> N_GRAM_COMPUTE_FOR_LETTERS = FXCollections.observableArrayList("lema", "različnica");
@ -318,9 +322,6 @@ public class StringAnalysisTabNew2 {
ngramValue = 2; // actual value at that index ngramValue = 2; // actual value at that index
// set default values // set default values
minimalOccurrencesTF.setText("1");
minimalOccurrences = 1;
minimalTaxonomyTF.setText("1"); minimalTaxonomyTF.setText("1");
minimalTaxonomy = 1; minimalTaxonomy = 1;
@ -511,7 +512,14 @@ public class StringAnalysisTabNew2 {
// msd // msd
msdTF.focusedProperty().addListener((observable, oldValue, newValue) -> { if (msdListener != null){
msdTF.focusedProperty().removeListener(msdListener);
}
// msd
msdListener = new ChangeListener<Boolean>() {
@Override
public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
if (!newValue) { if (!newValue) {
// focus lost // focus lost
String value = msdTF.getText(); String value = msdTF.getText();
@ -539,7 +547,9 @@ public class StringAnalysisTabNew2 {
msdStrings = new ArrayList<>(); msdStrings = new ArrayList<>();
} }
} }
}); }
};
msdTF.focusedProperty().addListener(msdListener);
msdTF.setText(""); msdTF.setText("");
msd = new ArrayList<>(); msd = new ArrayList<>();
@ -662,7 +672,17 @@ public class StringAnalysisTabNew2 {
// } // }
// }); // });
minimalOccurrencesTF.focusedProperty().addListener((observable, oldValue, newValue) -> { minimalOccurrencesTF.setText("1");
minimalOccurrences = 1;
if (minimalOccurrencesListener != null){
minimalOccurrencesTF.focusedProperty().removeListener(minimalOccurrencesListener);
}
// msd
minimalOccurrencesListener = new ChangeListener<Boolean>() {
@Override
public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
if (!newValue) { if (!newValue) {
// focus lost // focus lost
String value = minimalOccurrencesTF.getText(); String value = minimalOccurrencesTF.getText();
@ -678,9 +698,18 @@ public class StringAnalysisTabNew2 {
minimalOccurrences = 1; minimalOccurrences = 1;
} }
} }
}); }
};
minimalOccurrencesTF.focusedProperty().addListener(minimalOccurrencesListener);
minimalTaxonomyTF.focusedProperty().addListener((observable, oldValue, newValue) -> {
if (minimalTaxonomyListener != null){
minimalTaxonomyTF.focusedProperty().removeListener(minimalTaxonomyListener);
}
minimalTaxonomyListener = new ChangeListener<Boolean>() {
@Override
public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
if (!newValue) { if (!newValue) {
// focus lost // focus lost
String value = minimalTaxonomyTF.getText(); String value = minimalTaxonomyTF.getText();
@ -696,13 +725,21 @@ public class StringAnalysisTabNew2 {
minimalTaxonomy = 1; minimalTaxonomy = 1;
} }
} }
}); }
};
minimalTaxonomyTF.focusedProperty().addListener(minimalTaxonomyListener);
// set default values // set default values
minimalRelFreTF.setText("1"); minimalRelFreTF.setText("1");
minimalRelFre = 1; minimalRelFre = 1;
minimalRelFreTF.focusedProperty().addListener((observable, oldValue, newValue) -> { if (minimalRelFreListener != null){
minimalRelFreTF.focusedProperty().removeListener(minimalRelFreListener);
}
minimalRelFreListener = new ChangeListener<Boolean>() {
@Override
public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
if (!newValue) { if (!newValue) {
// focus lost // focus lost
String value = minimalRelFreTF.getText(); String value = minimalRelFreTF.getText();
@ -718,7 +755,9 @@ public class StringAnalysisTabNew2 {
minimalRelFre = 1; minimalRelFre = 1;
} }
} }
}); }
};
minimalRelFreTF.focusedProperty().addListener(minimalRelFreListener);
changeLanguageB.setOnAction(e -> { changeLanguageB.setOnAction(e -> {

55
src/main/java/gui/WordLevelTab.java
View File

@ -221,6 +221,10 @@ public class WordLevelTab {
private ListChangeListener<String> taxonomyListener; private ListChangeListener<String> taxonomyListener;
private ListChangeListener<String> alsoVisualizeListener; private ListChangeListener<String> alsoVisualizeListener;
private ChangeListener<String> calculateForListener; private ChangeListener<String> calculateForListener;
private ChangeListener<Boolean> msdListener;
private ChangeListener<Boolean> minimalOccurrencesListener;
private ChangeListener<Boolean> minimalTaxonomyListener;
private ChangeListener<Boolean> minimalRelFreListener;
// private static final ObservableList<String> N_GRAM_COMPUTE_FOR_WORDS = FXCollections.observableArrayList("lema", "različnica"); // private static final ObservableList<String> N_GRAM_COMPUTE_FOR_WORDS = FXCollections.observableArrayList("lema", "različnica");
// private static final ObservableList<String> N_GRAM_COMPUTE_FOR_LETTERS = FXCollections.observableArrayList("lema", "različnica"); // private static final ObservableList<String> N_GRAM_COMPUTE_FOR_LETTERS = FXCollections.observableArrayList("lema", "različnica");
@ -491,8 +495,14 @@ public class WordLevelTab {
// prefixLengthCB.setDisable(true); // prefixLengthCB.setDisable(true);
if (msdListener != null){
msdTF.focusedProperty().removeListener(msdListener);
}
// msd // msd
msdTF.focusedProperty().addListener((observable, oldValue, newValue) -> { msdListener = new ChangeListener<Boolean>() {
@Override
public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
if (!newValue) { if (!newValue) {
// focus lost // focus lost
String value = msdTF.getText(); String value = msdTF.getText();
@ -520,7 +530,10 @@ public class WordLevelTab {
msdStrings = new ArrayList<>(); msdStrings = new ArrayList<>();
} }
} }
}); }
};
msdTF.focusedProperty().addListener(msdListener);
msdTF.setText(""); msdTF.setText("");
msd = new ArrayList<>(); msd = new ArrayList<>();
@ -644,7 +657,14 @@ public class WordLevelTab {
minimalTaxonomyTF.setDisable(true); minimalTaxonomyTF.setDisable(true);
minimalOccurrencesTF.focusedProperty().addListener((observable, oldValue, newValue) -> { if (minimalOccurrencesListener != null){
minimalOccurrencesTF.focusedProperty().removeListener(minimalOccurrencesListener);
}
// msd
minimalOccurrencesListener = new ChangeListener<Boolean>() {
@Override
public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
if (!newValue) { if (!newValue) {
// focus lost // focus lost
String value = minimalOccurrencesTF.getText(); String value = minimalOccurrencesTF.getText();
@ -660,9 +680,18 @@ public class WordLevelTab {
minimalOccurrences = 1; minimalOccurrences = 1;
} }
} }
}); }
};
minimalOccurrencesTF.focusedProperty().addListener(minimalOccurrencesListener);
minimalTaxonomyTF.focusedProperty().addListener((observable, oldValue, newValue) -> {
if (minimalTaxonomyListener != null){
minimalTaxonomyTF.focusedProperty().removeListener(minimalTaxonomyListener);
}
minimalTaxonomyListener = new ChangeListener<Boolean>() {
@Override
public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
if (!newValue) { if (!newValue) {
// focus lost // focus lost
String value = minimalTaxonomyTF.getText(); String value = minimalTaxonomyTF.getText();
@ -678,13 +707,21 @@ public class WordLevelTab {
minimalTaxonomy = 1; minimalTaxonomy = 1;
} }
} }
}); }
};
minimalTaxonomyTF.focusedProperty().addListener(minimalTaxonomyListener);
// set default values // set default values
minimalRelFreTF.setText("1"); minimalRelFreTF.setText("1");
minimalRelFre = 1; minimalRelFre = 1;
minimalRelFreTF.focusedProperty().addListener((observable, oldValue, newValue) -> { if (minimalRelFreListener != null){
minimalRelFreTF.focusedProperty().removeListener(minimalRelFreListener);
}
minimalRelFreListener = new ChangeListener<Boolean>() {
@Override
public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
if (!newValue) { if (!newValue) {
// focus lost // focus lost
String value = minimalRelFreTF.getText(); String value = minimalRelFreTF.getText();
@ -700,7 +737,9 @@ public class WordLevelTab {
minimalRelFre = 1; minimalRelFre = 1;
} }
} }
}); }
};
minimalRelFreTF.focusedProperty().addListener(minimalRelFreListener);
changeLanguageB.setOnAction(e -> { changeLanguageB.setOnAction(e -> {