BGBM BDI Projects
/
taxeditor.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
a9e5166
)
Merge branch 'hotfix/4.8.1' into develop
author
jenkins
<jenkins-int@bgbm.org>
Mon, 10 Jul 2017 11:57:33 +0000
(13:57 +0200)
committer
jenkins
<jenkins-int@bgbm.org>
Mon, 10 Jul 2017 11:57:33 +0000
(13:57 +0200)
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/container/MisapplicationContainer.java
patch
|
blob
|
history
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/grantedAuthority/GrantedAuthorityDetailSection.java
patch
|
blob
|
history
diff --git
a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/container/MisapplicationContainer.java
b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/container/MisapplicationContainer.java
index 3be30d737c8e73eeca33f476b24c9ad06f7e39b0..71d4c0a9adcdfc431fd18d8c5986f8c5da9a738a 100644
(file)
--- a/
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/container/MisapplicationContainer.java
+++ b/
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/container/MisapplicationContainer.java
@@
-97,7
+97,7
@@
public class MisapplicationContainer extends AbstractGroupedContainer<Taxon> {
if (getMisappliedName().getAppendedPhrase() != null ){
sec = getMisappliedName().getAppendedPhrase() + " "+sec; //$NON-NLS-1$
}
- title += sec +
misapplication.getCitation
().getTitleCache();
+ title += sec +
getMisappliedName().getSec
().getTitleCache();
diff --git
a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/grantedAuthority/GrantedAuthorityDetailSection.java
b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/grantedAuthority/GrantedAuthorityDetailSection.java
index f83a8d31273e598bc0ac5b475947dfd012a3218b..de07e5e74ef54836b9d0944d9c4f6524aac46a24 100644
(file)
--- a/
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/grantedAuthority/GrantedAuthorityDetailSection.java
+++ b/
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/grantedAuthority/GrantedAuthorityDetailSection.java
@@
-119,7
+119,7
@@
public class GrantedAuthorityDetailSection extends
*/
@Override
public GrantedAuthority addExisting() {
- System.err.println("Test");
+
return null;
}