diff options
3 files changed, 7 insertions, 13 deletions
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/views/DIResourceQuery.java b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/views/DIResourceQuery.java index 1ac8e3c81d1..317db10849f 100644 --- a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/views/DIResourceQuery.java +++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/views/DIResourceQuery.java @@ -269,14 +269,13 @@ public class DIResourceQuery { diResources.set(ImmutableSet.copyOf(result)); - if(viewer.getControl() != null) { + if((viewer != null) && (viewer.getControl() != null)) { Display display = viewer.getControl().getDisplay(); if(display != null) { display.asyncExec(new Runnable() { public void run() { - if((viewer.getControl() != null) && !viewer.getControl().isDisposed()) { - + if((viewer != null) && (viewer.getControl() != null) && !viewer.getControl().isDisposed()) { refresh(); } } diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.ui/src/org/eclipse/papyrus/cdo/uml/internal/ui/importsources/CDOPackageImportSource.java b/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.ui/src/org/eclipse/papyrus/cdo/uml/internal/ui/importsources/CDOPackageImportSource.java index e3fcaf440ff..0a676330152 100644 --- a/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.ui/src/org/eclipse/papyrus/cdo/uml/internal/ui/importsources/CDOPackageImportSource.java +++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.ui/src/org/eclipse/papyrus/cdo/uml/internal/ui/importsources/CDOPackageImportSource.java @@ -198,12 +198,15 @@ public class CDOPackageImportSource extends AbstractPackageImportSource { public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { if(newInput == null) { itemProvider.inputChanged(viewer, repoMan, null); + super.inputChanged(viewer, repoMan, null); } else { // substitute the repository manager as the input element itemProvider.inputChanged(viewer, null, repoMan); // prime the internal nodes for the repositories - itemProvider.getChildren(repoMan); + itemProvider.getElements(repoMan); + + super.inputChanged(viewer, null, repoMan); } } diff --git a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/tests/AbstractPapyrusCDOTest.java b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/tests/AbstractPapyrusCDOTest.java index 632c9bf226d..b4322a658f0 100644 --- a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/tests/AbstractPapyrusCDOTest.java +++ b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/tests/AbstractPapyrusCDOTest.java @@ -17,7 +17,6 @@ import static org.junit.Assert.assertThat; import java.util.Map; import java.util.regex.Pattern; -import org.eclipse.emf.cdo.CDOObject; import org.eclipse.emf.cdo.common.CDOCommonRepository; import org.eclipse.emf.cdo.net4j.CDONet4jUtil; import org.eclipse.emf.cdo.server.CDOServerUtil; @@ -27,7 +26,6 @@ import org.eclipse.emf.cdo.server.net4j.CDONet4jServerUtil; import org.eclipse.emf.cdo.session.CDOSession; import org.eclipse.emf.cdo.spi.server.InternalRepository; import org.eclipse.emf.cdo.transaction.CDOTransaction; -import org.eclipse.emf.cdo.util.CDOUtil; import org.eclipse.emf.cdo.view.CDOView; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EObject; @@ -124,7 +122,6 @@ public abstract class AbstractPapyrusCDOTest { props.put(Props.OVERRIDE_UUID, ""); // use the name as the UUID props.put(Props.SUPPORTING_AUDITS, "false"); props.put(Props.SUPPORTING_BRANCHES, "false"); - props.put(Props.SUPPORTING_ECORE, "true"); props.put(Props.ID_GENERATION_LOCATION, CDOCommonRepository.IDGenerationLocation.STORE.toString()); } @@ -234,13 +231,8 @@ public abstract class AbstractPapyrusCDOTest { } protected <T extends EObject> T getMasterViewObject(T object) { - CDOObject cdo = CDOUtil.getCDOObject(object); - CDOView view = getInternalPapyrusRepository().getMasterView(); - @SuppressWarnings("unchecked") - T result = (T)CDOUtil.getEObject(view.getObject(cdo.cdoID())); - - return result; + return view.getObject(object); } public static <T extends Number & Comparable<T>> Matcher<T> lessThan(final T max) { |