Project

General

Profile

« Previous | Next » 

Revision 49d3c2dd

Added by Katja Luther over 1 year ago

ref #10186: remove conversation holder

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EditFromSelectionWizard.java
98 98
			rootElement = service.load(entity.getUuid());
99 99
		}
100 100
		if (rootElement.isInstanceOf(Reference.class)&& selectionElement instanceof EntitySelectionElementWithAbbreviatedTitle<?>) {
101
			addPage(new ReferenceWizardPage(formFactory,
102
					selectionElement.getConversationHolder(),
101
			addPage(new ReferenceWizardPage(formFactory,					
103 102
					HibernateProxyHelper.deproxy(rootElement, Reference.class), true));
104 103
		} else if (rootElement.isInstanceOf(Reference.class) ) {
105 104
			addPage(new ReferenceWizardPage(formFactory,
106
					selectionElement.getConversationHolder(), HibernateProxyHelper.deproxy(rootElement, Reference.class), false));
105
					HibernateProxyHelper.deproxy(rootElement, Reference.class), false));
107 106
		} else if (rootElement.isInstanceOf(Team.class) && (selectionElement instanceof EntitySelectionElementWithAbbreviatedTitle<?> )) {
108 107
			addPage(new TeamWizardPage(formFactory,
109
					selectionElement.getConversationHolder(), HibernateProxyHelper.deproxy(rootElement, Team.class), true, false));
108
					HibernateProxyHelper.deproxy(rootElement, Team.class), true, false));
110 109
		} else if (rootElement.isInstanceOf(Team.class) && (selectionElement.getClass().equals(CollectorSelectionElement.class)) ){
111 110
			addPage(new TeamWizardPage(formFactory,
112
					selectionElement.getConversationHolder(), HibernateProxyHelper.deproxy(rootElement, Team.class), false, true));
111
					HibernateProxyHelper.deproxy(rootElement, Team.class), false, true));
113 112
		} else if (rootElement.isInstanceOf(Team.class) && (selectionElement instanceof EntitySelectionElement<?>)) {
114 113
            addPage(new TeamWizardPage(formFactory,
115
                    selectionElement.getConversationHolder(), HibernateProxyHelper.deproxy(rootElement, Team.class), false, false));
114
                    HibernateProxyHelper.deproxy(rootElement, Team.class), false, false));
116 115
        } else if (rootElement.isInstanceOf(Person.class)) {
117 116
			addPage(new PersonWizardPage(formFactory,
118
					selectionElement.getConversationHolder(), HibernateProxyHelper.deproxy(rootElement, Person.class)));
117
					HibernateProxyHelper.deproxy(rootElement, Person.class)));
119 118
		} else if (rootElement.isInstanceOf(TaxonName.class)) {
120 119
			addPage(new NonViralNameWizardPage(formFactory,
121
					selectionElement.getConversationHolder(),
122 120
					HibernateProxyHelper.deproxy(rootElement, TaxonName.class)));
123 121
		} else if (rootElement.isInstanceOf(TaxonBase.class)) {
124 122
            addPage(new TaxonWizardPage(formFactory,
125
                    selectionElement.getConversationHolder(),
126 123
                    HibernateProxyHelper.deproxy(rootElement, TaxonBase.class)));
127 124
        }  else if (rootElement.isInstanceOf(SpecimenOrObservationBase.class)) {
128 125

  
......
144 141
				throw new IllegalStateException();
145 142
			}
146 143

  
147
			addPage(new DerivedUnitGeneralWizardPage(formFactory,
148
					selectionElement.getConversationHolder(), facade));
149
			addPage(new GatheringEventWizardPage(formFactory,
150
					selectionElement.getConversationHolder(), facade));
151
			addPage(new FieldUnitWizardPage(formFactory,
152
					selectionElement.getConversationHolder(), facade));
144
			addPage(new DerivedUnitGeneralWizardPage(formFactory,facade));
145
			addPage(new GatheringEventWizardPage(formFactory, facade));
146
			addPage(new FieldUnitWizardPage(formFactory, facade));
153 147
			if(facade.innerDerivedUnit()!=null){
154
			    addPage(new DerivedUnitBaseWizardPage(formFactory,
155
			            selectionElement.getConversationHolder(), facade));
148
			    addPage(new DerivedUnitBaseWizardPage(formFactory, facade));
156 149
			}
157 150
		} else if (rootElement.isInstanceOf(Collection.class)) {
158
			addPage(new CollectionWizardPage(formFactory,
159
					selectionElement.getConversationHolder(),
151
			addPage(new CollectionWizardPage(formFactory,					
160 152
					HibernateProxyHelper.deproxy(rootElement, Collection.class)));
161 153
		} else if (rootElement instanceof Institution) {
162 154
			addPage(new InstitutionWizardPage(formFactory,
163
					selectionElement.getConversationHolder(),
164 155
					HibernateProxyHelper.deproxy(rootElement, Institution.class)));
165 156
		} else if (rootElement instanceof User) {
166 157
			addPage(new UserDetailWizardPage(formFactory,
167
					selectionElement.getConversationHolder(),
168 158
					HibernateProxyHelper.deproxy(rootElement, User.class)));
169 159
		} else if (rootElement instanceof Primer) {
170 160
            addPage(new PrimerWizardPage(formFactory,
171
                    selectionElement.getConversationHolder(),
172 161
                    HibernateProxyHelper.deproxy(rootElement, Primer.class)));
173 162
        } else if (rootElement instanceof Amplification) {
174 163
            addPage(new AmplificationGeneralWizardPage(formFactory,
175
                    selectionElement.getConversationHolder(),
176 164
                    HibernateProxyHelper.deproxy(rootElement, Amplification.class)));
177 165
        } else if (rootElement instanceof PolytomousKey) {
178 166
            addPage(new PolytomousKeyWizardPage(formFactory,
179
                    selectionElement.getConversationHolder(),
180 167
                    HibernateProxyHelper.deproxy(rootElement, PolytomousKey.class)));
181 168
        } else {
182 169
			MessagingUtils.warningDialog("Missing interface", this,

Also available in: Unified diff