Project

General

Profile

« Previous | Next » 

Revision 381bdda4

Added by Patrick Plitzner over 6 years ago

ref #6913 Remove IEditorInput dependency from bulk editor input

View differences:

eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditor.java
103 103
    protected ISourceViewer createSourceViewer(Composite parent,
104 104
			IVerticalRuler ruler, int styles) {
105 105
		ISourceViewer viewer = super.createSourceViewer(parent, ruler, styles);
106
		if (getEditorInput().isMergingEnabled()) {
107
			addToggleMergeCandidateListener(ruler.getControl());
108
		}
106
//		if (getEditorInput().isMergingEnabled()) {
107
//			addToggleMergeCandidateListener(ruler.getControl());
108
//		}
109 109
		return viewer;
110 110
	}
111 111

  
......
308 308
			//conversation.clear();
309 309
			//conversation.commit(true);
310 310

  
311
			getEditorInput().dispose();
312
			getEditorInput().bind();
313
			getEditorInput().performSearch(query);
311
//			getEditorInput().dispose();
312
//			getEditorInput().bind();
313
//			getEditorInput().performSearch(query);
314 314

  
315 315
			refresh();
316 316

  
......
333 333
		setInput(getEditorInput());
334 334
	}
335 335

  
336
	/** {@inheritDoc} */
337
	@Override
338
	public AbstractBulkEditorInput getEditorInput() {
339
		return (AbstractBulkEditorInput) super.getEditorInput();
340
	}
336
//	/** {@inheritDoc} */
337
//	@Override
338
//	public AbstractBulkEditorInput getEditorInput() {
339
//		return (AbstractBulkEditorInput) super.getEditorInput();
340
//	}
341 341

  
342 342
	@Override
343 343
    protected void editorContextMenuAboutToShow(IMenuManager menu) {

Also available in: Unified diff