Bug 434501 - Refactor view model editor contribution after code review https://bugs.eclipse.org/bugs/show_bug.cgi?id=434501
diff --git a/bundles/org.eclipse.emf.ecp.ide.view.service/src/org/eclipse/emf/ecp/ide/view/internal/service/IDEViewModelRegistryImpl.java b/bundles/org.eclipse.emf.ecp.ide.view.service/src/org/eclipse/emf/ecp/ide/view/internal/service/IDEViewModelRegistryImpl.java index 7d8d07f..07fd645 100644 --- a/bundles/org.eclipse.emf.ecp.ide.view.service/src/org/eclipse/emf/ecp/ide/view/internal/service/IDEViewModelRegistryImpl.java +++ b/bundles/org.eclipse.emf.ecp.ide.view.service/src/org/eclipse/emf/ecp/ide/view/internal/service/IDEViewModelRegistryImpl.java
@@ -131,7 +131,8 @@ } - private void persistSelectedEcore(String ecorePath, String viewModelPath) { + @Override + public void persistSelectedEcore(String ecorePath, String viewModelPath) { final ResourceSet resourceSet = new ResourceSetImpl(); final int nameStart = viewModelPath.lastIndexOf("/") + 1; //$NON-NLS-1$
diff --git a/bundles/org.eclipse.emf.ecp.ide.view.service/src/org/eclipse/emf/ecp/ide/view/service/IDEViewModelRegistry.java b/bundles/org.eclipse.emf.ecp.ide.view.service/src/org/eclipse/emf/ecp/ide/view/service/IDEViewModelRegistry.java index 8f25e8e..7fcdad5 100644 --- a/bundles/org.eclipse.emf.ecp.ide.view.service/src/org/eclipse/emf/ecp/ide/view/service/IDEViewModelRegistry.java +++ b/bundles/org.eclipse.emf.ecp.ide.view.service/src/org/eclipse/emf/ecp/ide/view/service/IDEViewModelRegistry.java
@@ -59,14 +59,14 @@ */ void unregisterViewModelEditor(VView viewModel, ViewModelEditorCallback viewModelEditor); - // /** - // * Saves the path {@code ecorePath} of the Ecore associated with the {@linkplain VView} located at the path - // * {@code viewModelPath} in an IDEConfig file. - // * - // * @param ecorePath path to the Ecore associated with the {@code viewModel} - // * @param viewModelPath the path to the VView - // */ - // void persistSelectedEcore(String ecorePath, String viewModelPath); + /** + * Saves the path {@code ecorePath} of the Ecore associated with the {@linkplain VView} located at the path + * {@code viewModelPath} in an IDEConfig file. + * + * @param ecorePath path to the Ecore associated with the {@code viewModel} + * @param viewModelPath the path to the VView + */ + void persistSelectedEcore(String ecorePath, String viewModelPath); /** * Saves the path {@code ecorePath} of the Ecore associated with the {@code viewModel} in an {@link IDEConfig} file.
diff --git a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/editor/controls/ControlRootEClassControl2SWTRendererTester.java b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/editor/controls/ControlRootEClassControl2SWTRendererTester.java index 37dbe7c..6f2d761 100644 --- a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/editor/controls/ControlRootEClassControl2SWTRendererTester.java +++ b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/editor/controls/ControlRootEClassControl2SWTRendererTester.java
@@ -13,7 +13,7 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.emf.ecp.view.internal.core.swt.renderer.SimpleControlSWTRendererTester; +import org.eclipse.emf.ecp.view.model.common.SimpleControlRendererTester; import org.eclipse.emf.ecp.view.spi.context.ViewModelContext; import org.eclipse.emf.ecp.view.spi.model.VControl; import org.eclipse.emf.ecp.view.spi.model.VElement; @@ -23,12 +23,12 @@ * @author Alexandra Buzila * */ -public class ControlRootEClassControl2SWTRendererTester extends SimpleControlSWTRendererTester { +public class ControlRootEClassControl2SWTRendererTester extends SimpleControlRendererTester { /** * {@inheritDoc} * - * @see org.eclipse.emf.ecp.view.internal.core.swt.renderer.SimpleControlSWTRendererTester#isSingleValue() + * @see org.eclipse.emf.ecp.view.internal.core.swt.renderer.SimpleControlRendererTester#isSingleValue() */ @Override protected boolean isSingleValue() { @@ -38,7 +38,7 @@ /** * {@inheritDoc} * - * @see org.eclipse.emf.ecp.view.internal.core.swt.renderer.SimpleControlSWTRendererTester#getPriority() + * @see org.eclipse.emf.ecp.view.internal.core.swt.renderer.SimpleControlRendererTester#getPriority() */ @Override protected int getPriority() { @@ -55,7 +55,7 @@ /** * {@inheritDoc} * - * @see org.eclipse.emf.ecp.view.internal.core.swt.renderer.SimpleControlSWTRendererTester#getSupportedClassType() + * @see org.eclipse.emf.ecp.view.internal.core.swt.renderer.SimpleControlRendererTester#getSupportedClassType() */ @Override public int isApplicable(VElement vElement, ViewModelContext context) { @@ -70,7 +70,7 @@ /** * {@inheritDoc} * - * @see org.eclipse.emf.ecp.view.internal.core.swt.renderer.SimpleControlSWTRendererTester#getSupportedClassType() + * @see org.eclipse.emf.ecp.view.internal.core.swt.renderer.SimpleControlRendererTester#getSupportedClassType() */ @Override protected Class<?> getSupportedClassType() {