Project

General

Profile

« Previous | Next » 

Revision 8ab62f50

Added by Cherian Mathew almost 9 years ago

fixed problems with new classes in merge

View differences:

eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/TaxonNameEditor.java
9 9

  
10 10
package eu.etaxonomy.taxeditor.editor.name;
11 11

  
12
import java.awt.Color;
13
import java.awt.Composite;
14
import java.awt.Menu;
15
import java.awt.dnd.DropTarget;
16 12
import java.util.ArrayList;
17 13
import java.util.HashSet;
18 14
import java.util.List;
19 15
import java.util.Set;
20 16

  
17
import org.apache.commons.lang.StringUtils;
18
import org.eclipse.core.commands.operations.IUndoContext;
19
import org.eclipse.core.runtime.IProgressMonitor;
20
import org.eclipse.core.runtime.OperationCanceledException;
21
import org.eclipse.jface.action.MenuManager;
22
import org.eclipse.jface.viewers.ISelection;
23
import org.eclipse.jface.viewers.ISelectionProvider;
24
import org.eclipse.jface.viewers.StructuredSelection;
25
import org.eclipse.swt.dnd.DND;
26
import org.eclipse.swt.dnd.DropTarget;
27
import org.eclipse.swt.dnd.Transfer;
28
import org.eclipse.swt.graphics.Color;
29
import org.eclipse.swt.widgets.Composite;
30
import org.eclipse.swt.widgets.Menu;
31
import org.eclipse.ui.IEditorInput;
32
import org.eclipse.ui.IEditorSite;
33
import org.eclipse.ui.ISelectionListener;
34
import org.eclipse.ui.ISelectionService;
35
import org.eclipse.ui.IWorkbenchPart;
36
import org.eclipse.ui.IWorkbenchPartReference;
37
import org.eclipse.ui.PartInitException;
38
import org.eclipse.ui.PlatformUI;
39
import org.eclipse.ui.forms.ManagedForm;
40
import org.eclipse.ui.forms.widgets.FormToolkit;
41
import org.eclipse.ui.forms.widgets.ScrolledForm;
42
import org.eclipse.ui.forms.widgets.TableWrapLayout;
43
import org.eclipse.ui.part.EditorPart;
44

  
45
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
46
import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
47
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
48
import eu.etaxonomy.cdm.model.common.CdmBase;
49
import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
50
import eu.etaxonomy.cdm.model.taxon.Taxon;
51
import eu.etaxonomy.cdm.model.taxon.TaxonBase;
52
import eu.etaxonomy.cdm.model.taxon.TaxonNode;
53
import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
21 54
import eu.etaxonomy.taxeditor.editor.CdmDataTransfer;
22 55
import eu.etaxonomy.taxeditor.editor.IDropTargetable;
23 56
import eu.etaxonomy.taxeditor.editor.IMultiPageTaxonEditorPage;
......
39 72
import eu.etaxonomy.taxeditor.model.TaxeditorPartService;
40 73
import eu.etaxonomy.taxeditor.preference.Resources;
41 74
import eu.etaxonomy.taxeditor.security.RequiredPermissions;
75
import eu.etaxonomy.taxeditor.session.ICdmEntitySession;
76
import eu.etaxonomy.taxeditor.session.ICdmEntitySessionEnabled;
42 77
import eu.etaxonomy.taxeditor.store.CdmStore;
43 78

  
44 79
/**
......
201 236
	 * </p>
202 237
	 */
203 238
	public void createOrUpdateNameComposites() {
204

  
205
		//this.taxon = (Taxon)CdmStore.getService(ITaxonService.class).load(this.getTaxon().getUuid());
206
		//this.taxon = HibernateProxyHelper.deproxy(this.taxon, Taxon.class);
239
//		this.taxon = (Taxon)CdmStore.getService(ITaxonService.class).load(this.getTaxon().getUuid());
207 240
		ContainerFactory.createOrUpdateAcceptedTaxonsHomotypicGroup(this);
208 241
		ContainerFactory.createOrUpdateHeterotypicSynonymyGroups(this);
209 242
		ContainerFactory.createOrUpdateMisapplicationsGroup(this);

Also available in: Unified diff