Project

General

Profile

Revision 25d560ea

ID25d560ea091a5db6d6423c901c94e6bc8773be8c
Parent daaa3a02
Child 909ddfb3, 07c232f0

Added by Katja Luther over 2 years ago

smaller changes for pro parte syn and MA in name editor

View differences:

eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/ConceptContainerE4.java
80 80
		TaxonName conceptName = HibernateProxyHelper.deproxy(getMisappliedName().getName());
81 81
		if (isMisapplication && StringUtils.isNotBlank(conceptName.getAuthorshipCache())){
82 82
			author = ", non " + conceptName.getAuthorshipCache();
83
		}else if (!isMisapplication && StringUtils.isNotBlank(conceptName.getAuthorshipCache())){
84
		    author = conceptName.getAuthorshipCache();
85 83
		}
86 84
		if ((isMisapplication &&getMisappliedName().getSec() == null) || (!isMisapplication && relationship.getCitation() == null)) {
87 85
		    if (getMisappliedName().getAppendedPhrase() != null ){
......
96 94
		    if (isMisapplication){
97 95
		        sec = " sensu ";
98 96
		    }else{
99
		        sec = " syn sec ";
97
		        sec = " syn. sec. ";
100 98
		    }
101 99
			if (getMisappliedName().getAppendedPhrase() != null ){
102 100
			    sec = getMisappliedName().getAppendedPhrase() + " " + sec;
......
154 152
		updateIndent();
155 153

  
156 154
		updateIcon();
157

  
158
		String text = NameHelper.getDisplayNameCache(getData());
155
		String text;
156
		if (isMisapplication){
157
		    text = NameHelper.getDisplayNameCache(getData());
158
		}else{
159
		    text = NameHelper.getDisplayName(getData());
160
		}
159 161

  
160 162
		if (text.length() == 0) {
161 163
			initEmptyText();
......
170 172
    public void refresh() {
171 173
		// showNameRelations();
172 174

  
173
		String text = NameHelper.getDisplayNameCache(getData());
175
		String text;
176
		if (isMisapplication){
177
            text = NameHelper.getDisplayNameCache(getData());
178
        }else{
179
            text = NameHelper.getDisplayName(getData());
180
        }
181

  
174 182

  
175 183
		if (getNameViewer().getTextWidget() == null) {
176 184
			// we might get here via dnd. Look slike it can be ignored
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/TaxonRelationshipDetailElement.java
110 110
            addElement(taxonElement);
111 111

  
112 112

  
113
            sensuReference = formFactory.createSelectionElement(Reference.class,//getConversationHolder(),
114
                 formElement, "Sec",
115
                taxon.getSec(), EntitySelectionElement.ALL,
116
                style);
117 113

  
118
            text_sensu_microreference = formFactory.createTextWithLabelElement(
119
                    formElement, "Detail",
120
                    taxon.getSecMicroReference(),null,
121
                    SWT.WRAP);
122 114

  
123 115
            secReference = formFactory.createSelectionElement(Reference.class,//getConversationHolder(),
124
                    formElement, "Syn Sec.",
116
                    formElement, "Syn. Sec.",
125 117
                    entity.getCitation(), EntitySelectionElement.ALL,
126 118
                    style);
127 119

  
......
129 121
                    formElement, "Detail",
130 122
                    entity.getCitationMicroReference(),null,
131 123
                    SWT.WRAP);
124
            sensuReference = formFactory.createSelectionElement(Reference.class,//getConversationHolder(),
125
                    formElement, "Sec",
126
                   taxon.getSec(), EntitySelectionElement.ALL,
127
                   style);
128

  
129
               text_sensu_microreference = formFactory.createTextWithLabelElement(
130
                       formElement, "Detail",
131
                       taxon.getSecMicroReference(),null,
132
                       SWT.WRAP);
132 133

  
133 134
            combo_misappliedRelationshipType = formFactory.createMisappliedRelationshipComboElement(formElement, "Synonym Type",
134 135
                    entity.getType(), style);
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/AbstractCdmEditorPartE4.java
201 201
                                TaxonRelationship rel = rels.iterator().next();
202 202
                                if ((rel.getType().isAnyMisappliedName() || rel.getType().isAnySynonym())&& !rel.getFromTaxon().equals(((ITaxonEditor) part).getTaxon())){
203 203
                                    viewer.setInput(rel);
204

  
204
                                    selectionProvidingPart = activePart;
205 205
                                    return;
206 206
                                }
207 207
                            }

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)