BGBM BDI Projects
/
taxeditor.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d63fc1f
)
#4018: don't allow to finish, if no language is selected, quick fix
author
Katja Luther
<k.luther@bgbm.org>
Mon, 4 Jul 2016 13:20:35 +0000
(15:20 +0200)
committer
Katja Luther
<k.luther@bgbm.org>
Mon, 4 Jul 2016 13:21:09 +0000
(15:21 +0200)
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/TermTranslationWizard.java
patch
|
blob
|
history
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/TranslationWizard.java
patch
|
blob
|
history
diff --git
a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/TermTranslationWizard.java
b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/TermTranslationWizard.java
index d10192048cf915942b0a56bdf347032b9188312f..37d7385d085712f9be610bd8c388ac9983b5876f 100644
(file)
--- a/
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/TermTranslationWizard.java
+++ b/
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/TermTranslationWizard.java
@@
-53,7
+53,10
@@
public class TermTranslationWizard extends Wizard {
@Override
public boolean performFinish() {
Representation representation = page.getTargetRepresentation();
@Override
public boolean performFinish() {
Representation representation = page.getTargetRepresentation();
-
+
+ if (representation.getLanguage() == null){
+ return false;
+ }
if (!representation.getText().equals("") || !representation.getLabel().equals("") || !representation.getAbbreviatedLabel().equals("")) {
term.addRepresentation(representation);
}
if (!representation.getText().equals("") || !representation.getLabel().equals("") || !representation.getAbbreviatedLabel().equals("")) {
term.addRepresentation(representation);
}
diff --git
a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/TranslationWizard.java
b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/TranslationWizard.java
index 93c48b11f0ac99906713b3646919d88271b2577e..18a51060efff80821065e55e6b9afbc035ac1d98 100644
(file)
--- a/
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/TranslationWizard.java
+++ b/
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/TranslationWizard.java
@@
-59,6
+59,9
@@
public class TranslationWizard extends Wizard {
public boolean performFinish() {
LanguageString languageString = page.getTargetLanguageString();
public boolean performFinish() {
LanguageString languageString = page.getTargetLanguageString();
+ if (languageString.getLanguage() == null){
+ return false;
+ }
if (!languageString.getText().equals("")) {
multilanguageText.put(languageString.getLanguage(), languageString);
}
if (!languageString.getText().equals("")) {
multilanguageText.put(languageString.getLanguage(), languageString);
}