Project

General

Profile

« Previous | Next » 

Revision 4c980025

Added by Andreas Müller over 1 year ago

ref #10186 further remove ConversationHolder from TaxEditor code and some cleanup

View differences:

eu.etaxonomy.taxeditor.printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/wizard/AbstractPublishWizard.java
15 15
import org.eclipse.ui.IExportWizard;
16 16
import org.eclipse.ui.IWorkbench;
17 17

  
18
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
19 18
import eu.etaxonomy.cdm.print.PublishConfigurator;
20 19
import eu.etaxonomy.cdm.print.Publisher;
21 20
import eu.etaxonomy.cdm.print.out.IPublishOutputModule;
22 21
import eu.etaxonomy.taxeditor.model.CdmProgressMonitorAdapter;
23 22
import eu.etaxonomy.taxeditor.model.MessagingUtils;
24 23
import eu.etaxonomy.taxeditor.printpublisher.internal.PrintpublisherPlugin;
25
import eu.etaxonomy.taxeditor.store.CdmStore;
26 24

  
27 25
/**
28 26
 * <p>AbstractPublishWizard class.</p>
......
71 69
			@Override
72 70
			protected IStatus run(IProgressMonitor monitor) {
73 71
				monitor.beginTask("Print Publisher", getConfigurator().calculateNumberOfNodes() + 1);
74
				ConversationHolder conversation = null;
72

  
75 73
				try{
76 74
					getConfigurator().setProgressMonitor(CdmProgressMonitorAdapter.CreateMonitor(monitor));
77 75

  
78 76
					if(getConfigurator().isLocal()){
79
						conversation = CdmStore.createConversation();
80
						// we want to enforce that the session is closed and nothing is
81
						// instantiated beneath the regular cdmlib-remote object boundaries
82
						conversation.commit(false);
77
					    //TODO conversation not supported anymore as we use only remote
78
//						conversation = CdmStore.createConversation();
79
//						// we want to enforce that the session is closed and nothing is
80
//						// instantiated beneath the regular cdmlib-remote object boundaries
81
//						conversation.commit(false);
83 82
					}
84 83

  
85 84
					Publisher.publish(getConfigurator());
86 85

  
87 86
				}finally{
88 87
					monitor.done();
89
					if(conversation != null) {
90
                        conversation.close();
91
                    }
88
//					if(conversation != null) {
89
//                        conversation.close();
90
//                    }
92 91
					Display.getDefault().asyncExec(new Runnable() {
93 92
						@Override
94 93
						public void run() {

Also available in: Unified diff