Project

General

Profile

« Previous | Next » 

Revision 58480902

Added by Katja Luther almost 7 years ago

avoid that mediaViewPart is inactive when details view has the focus

View differences:

eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java
43 43
import org.eclipse.swt.layout.GridLayout;
44 44
import org.eclipse.swt.widgets.Composite;
45 45
import org.eclipse.swt.widgets.Tree;
46
import org.eclipse.ui.IEditorPart;
46 47
import org.eclipse.ui.IMemento;
47 48

  
48 49
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
......
374 375
    @Override
375 376
    public void changed(Object element) {
376 377
        setDirty(true);
377
//        firePropertyChange(IEditorPart.PROP_DIRTY);
378
        //firePropertyChange(IEditorPart.PROP_DIRTY);
378 379
        viewer.update(new TreeNode(element), null);
379 380
    }
380 381

  
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/MediaViewPart.java
22 22
import org.eclipse.swt.widgets.Control;
23 23
import org.eclipse.swt.widgets.Menu;
24 24
import org.eclipse.swt.widgets.Tree;
25
import org.eclipse.ui.IEditorPart;
26
import org.eclipse.ui.ISaveablePart;
25 27
import org.eclipse.ui.IWorkbenchActionConstants;
26 28
import org.eclipse.ui.IWorkbenchPart;
27 29
import org.eclipse.ui.internal.E4PartWrapper;
......
34 36
import eu.etaxonomy.taxeditor.editor.l10n.Messages;
35 37
import eu.etaxonomy.taxeditor.editor.view.descriptive.DescriptiveViewPart;
36 38
import eu.etaxonomy.taxeditor.model.AbstractUtility;
39
import eu.etaxonomy.taxeditor.model.IDirtyMarkable;
37 40
import eu.etaxonomy.taxeditor.model.IPartContentHasDetails;
38 41
import eu.etaxonomy.taxeditor.model.IPartContentHasMedia;
39 42
import eu.etaxonomy.taxeditor.model.IPartContentHasSupplementalData;
......
95 98
	    if(part==this){
96 99
	        return;
97 100
	    }
98
		if(AbstractUtility.getActiveE4Editor() == null){
99
			showEmptyPage();
100
			return;
101
		}
101
//		if(AbstractUtility.getActiveE4Editor() == null){
102
//			showEmptyPage();
103
//			return;
104
//		}
102 105
		
103 106

  
104 107
        if (part instanceof DetailsViewPart || part instanceof SupplementalDataViewPart
......
154 157
            ((BulkEditor) part).changed(selection.getFirstElement());
155 158

  
156 159
	    }
160
	    if (part instanceof E4PartWrapper){
161
	    	part = AbstractUtility.getE4WrappedPart(part);
162
	    	if (part instanceof IDirtyMarkable){
163
	    		 StructuredSelection selection = new StructuredSelection(object);
164
	    		((IDirtyMarkable)part).changed(selection.getFirstElement());
165
	    	}
166
	    }
167
	        
168
	    
157 169
	    super.changed(object);
158 170
	}
159 171

  

Also available in: Unified diff