Project

General

Profile

« Previous | Next » 

Revision 021fa6b5

Added by Niels Hoffmann over 12 years ago

Bugfix for a problem that was introduced by fixing #2545

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/AbstractFormSection.java
61 61

  
62 62
	private ICdmFormElement parentElement;
63 63

  
64
	private ConversationHolder conversation;
65

  
66
	private boolean handlingPropertyChange;
67

  
68 64
	private Color persistentBackgroundColor;
69 65

  
70 66
	/**
......
85 81
	 * @param <ENTITY>
86 82
	 *            a ENTITY object.
87 83
	 */
88
	protected AbstractFormSection(CdmFormFactory formFactory,
89
			ConversationHolder conversation, ICdmFormElement parentElement,
84
	protected AbstractFormSection(CdmFormFactory formFactory, ICdmFormElement parentElement,
90 85
			int style) {
91 86
		super(parentElement.getLayoutComposite(), style);
92 87

  
......
94 89

  
95 90
		this.formFactory = formFactory;
96 91

  
97
		this.conversation = conversation;
98

  
99 92
		this.setLayoutData(CdmFormFactory.FILL());
100 93

  
101 94
		Composite client = formFactory.createComposite(this, SWT.WRAP);
......
130 123
	 *            a int.
131 124
	 */
132 125
	protected AbstractFormSection(CdmFormFactory formFactory,
133
			ConversationHolder conversation, ICdmFormElement parentElement,
126
			ICdmFormElement parentElement,
134 127
			ISelectionProvider selectionProvider, int style) {
135
		this(formFactory, conversation, parentElement, style);
128
		this(formFactory, parentElement, style);
136 129
		this.selectionProvider = selectionProvider;
137 130
	}
138 131

  
......
557 550
	 *         object.
558 551
	 */
559 552
	public ConversationHolder getConversationHolder() {
560
		IEditorPart activeEditor = StoreUtil.getActiveEditor();
561
		if(activeEditor instanceof IConversationEnabled){
562
			ConversationHolder conversation = ((IConversationEnabled) StoreUtil.getActiveEditor()).getConversationHolder();
563
			return conversation;
553
		if(getParentElement() == null){
554
		
555
			IEditorPart activeEditor = StoreUtil.getActiveEditor();
556
			if(activeEditor instanceof IConversationEnabled){
557
				ConversationHolder conversation = ((IConversationEnabled) StoreUtil.getActiveEditor()).getConversationHolder();
558
				return conversation;
559
			}
560
		}else if(getParentElement() instanceof IConversationEnabled){
561
			return ((IConversationEnabled) getParentElement()).getConversationHolder();
564 562
		}
565 563
		StoreUtil.errorDialog("Could not get conversation for AbstractFormSection", 
566 564
				getClass(), "There is an error in the implementation. There should have been an active editor but it wasn't", 
567 565
				new IllegalArgumentException());
568 566
		return null;
569
	}
570 567
	
571
	public void setConversationHolder(ConversationHolder conversation) {
572
		this.conversation = conversation;
573 568
	}
574 569

  
575 570
	/** {@inheritDoc} */
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/DateDetailSection.java
50 50
	 */
51 51
	protected DateDetailSection(CdmFormFactory formFactory,
52 52
			ICdmFormElement parentElement, int style) {
53
		super(formFactory, null, parentElement, style);
53
		super(formFactory, parentElement, style);
54 54

  
55 55
		partialElement_start = formFactory.createPartialElement(this,
56 56
				"Start: ", null, style);
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractCdmDetailSection.java
68 68
	public AbstractCdmDetailSection(CdmFormFactory formFactory,
69 69
			ConversationHolder conversation, ICdmFormElement parentElement,
70 70
			ISelectionProvider selectionProvider, int style) {
71
		super(formFactory, conversation, parentElement, selectionProvider,
71
		super(formFactory, parentElement, selectionProvider,
72 72
				Section.CLIENT_INDENT | style);
73 73

  
74 74
		setText(getHeading());
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractEntityCollectionSection.java
59 59
	 * @param <ELEMENT> a ELEMENT object.
60 60
	 */
61 61
	public AbstractEntityCollectionSection(CdmFormFactory formFactory, ConversationHolder conversation, ICdmFormElement parentElement, String title, int style) {
62
		super(formFactory, conversation, parentElement, Section.CLIENT_INDENT | style);
62
		super(formFactory, parentElement, Section.CLIENT_INDENT | style);
63 63
		this.title = title;
64 64
		this.setText(getTitleString());
65 65
		showToolbar();
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/HeadlineSection.java
28 28
	 */
29 29
	public HeadlineSection(CdmFormFactory cdmFormFactory, ICdmFormElement parentElement,
30 30
			int style) {
31
		super(cdmFormFactory, null, parentElement, style);
31
		super(cdmFormFactory, parentElement, style);
32 32
	}
33 33
	
34 34
	/** {@inheritDoc} */
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/VersionSection.java
10 10

  
11 11
package eu.etaxonomy.taxeditor.ui.section.supplemental;
12 12

  
13
import org.apache.log4j.Logger;
14

  
15 13
import eu.etaxonomy.cdm.model.common.VersionableEntity;
16 14
import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
17 15
import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
......
26 24
 */
27 25
public class VersionSection extends AbstractFormSection<VersionableEntity>{
28 26

  
29
	private static final Logger logger = Logger.getLogger(VersionSection.class);
30 27
	private VersionElement versionElement;
31 28
	
32 29
	/**
......
38 35
	 */
39 36
	public VersionSection(CdmFormFactory cdmFormFactory, ICdmFormElement parentElement,
40 37
			int style) {
41
		super(cdmFormFactory, null, parentElement, style);
38
		super(cdmFormFactory, parentElement, style);
42 39
		versionElement = cdmFormFactory.createVersionElement(this, null, style);
43 40
	}
44 41
	

Also available in: Unified diff