Project

General

Profile

« Previous | Next » 

Revision 6bbe08fd

Added by Katja Luther over 3 years ago

ref #9065: fix loading of image

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/ImageElement.java
18 18
import org.eclipse.core.runtime.IStatus;
19 19
import org.eclipse.core.runtime.Status;
20 20
import org.eclipse.core.runtime.jobs.Job;
21
import org.eclipse.e4.core.contexts.IEclipseContext;
21 22
import org.eclipse.e4.ui.model.application.ui.basic.MPart;
22 23
import org.eclipse.e4.ui.workbench.modeling.EPartService;
23 24
import org.eclipse.jface.operation.IRunnableWithProgress;
......
35 36
import eu.etaxonomy.cdm.common.UriUtils;
36 37
import eu.etaxonomy.taxeditor.model.AbstractUtility;
37 38
import eu.etaxonomy.taxeditor.model.MessagingUtils;
39
import eu.etaxonomy.taxeditor.store.StoreUtil;
38 40
import eu.etaxonomy.taxeditor.view.e4.AbstractCdmDataViewerE4;
39 41
import eu.etaxonomy.taxeditor.view.e4.details.DetailsPartE4;
40 42
import eu.etaxonomy.taxeditor.view.e4.supplementaldata.SupplementalDataPartE4;
......
80 82
            try{
81 83
                if (getFormFactory() != null && getFormFactory().getContext() != null){
82 84
                    EPartService partService = getFormFactory().getContext().get(EPartService.class);
85
                    IEclipseContext context =  getFormFactory().getContext().getActiveChild();
83 86
                    DetailsPartE4 detailsView = AbstractUtility.getDetailsView(partService);
84 87
                    if(detailsView!=null){
85 88
                        AbstractCdmDataViewerE4 viewer = (AbstractCdmDataViewerE4) detailsView.getViewer();
......
99 102
                        }
100 103
                    }
101 104
                }
105
                StoreUtil.reflowParentScrolledForm(getLayoutComposite(), true);
102 106
            }
103 107
            catch(IllegalStateException e){
104 108
                //when migrating to E4 this execption should not be thrown anymore
......
153 157
                            PaintEvent event = new PaintEvent(untypedEvent);
154 158
                            event.gc = new GC(container);
155 159
                            paintControl(event);
156
                            getLayoutComposite().layout();
160

  
157 161
                        }
158 162
                    }
159 163
                });
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaDetailElement.java
89 89
                    disposeImage();
90 90
                    if (!parentFormElement.getLayoutComposite().isDisposed()) {
91 91
                        element_image = formFactory.createImageElement(parentFormElement, uri, style);
92
                        StoreUtil.reflowParentScrolledForm(getLayoutComposite(), true);
92
//                        StoreUtil.reflowParentScrolledForm(getLayoutComposite(), true);
93 93
                        try {
94 94
                            element_image.initImageUri(uri);
95 95
                        } catch (IOException | HttpException e) {
96 96
                            exception(e);
97 97
                        }
98 98
                        element_image.loadImage();
99

  
99 100
                        disposeErrorLabel();
101
                        StoreUtil.reflowParentScrolledForm(getLayoutComposite(), true);
102

  
103

  
100 104
                    }
101 105
                });
102 106
            } catch (Exception e){

Also available in: Unified diff