Bug 469144 - Fix LocalizationService for the Preview
https://bugs.eclipse.org/bugs/show_bug.cgi?id=469144
Change-Id: I2aa2ad2a346133b80fc0e09bdd8e23a95a57ab6d
Signed-off-by: Alexandra Buzila <abuzila@eclipsesource.com>
diff --git a/bundles/org.eclipse.emf.ecp.view.model.preview.common/src/org/eclipse/emf/ecp/view/model/preview/common/Preview.java b/bundles/org.eclipse.emf.ecp.view.model.preview.common/src/org/eclipse/emf/ecp/view/model/preview/common/Preview.java
index 2ae2bf8..e60317f 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.preview.common/src/org/eclipse/emf/ecp/view/model/preview/common/Preview.java
+++ b/bundles/org.eclipse.emf.ecp.view.model.preview.common/src/org/eclipse/emf/ecp/view/model/preview/common/Preview.java
@@ -36,6 +36,7 @@
import org.eclipse.emf.ecp.view.model.common.edit.provider.CustomReflectiveItemProviderAdapterFactory;
import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
import org.eclipse.emf.ecp.view.spi.context.ViewModelContextFactory;
+import org.eclipse.emf.ecp.view.spi.model.LocalizationAdapter;
import org.eclipse.emf.ecp.view.spi.model.VControl;
import org.eclipse.emf.ecp.view.spi.model.VView;
import org.eclipse.emf.ecp.view.spi.model.VViewPackage;
@@ -146,9 +147,15 @@
final ReferenceService previewRefServ = new DefaultReferenceService();
final VView copy = EcoreUtil.copy(view);
+ copy.eAdapters().add(new LocalizationAdapter() {
+ @Override
+ public String localize(String key) {
+ return key;
+ }
+ });
clearViewDiagnostics(copy);
final ViewModelContext viewModelContext = ViewModelContextFactory.INSTANCE.createViewModelContext(
- copy, dummyData, previewRefServ, new PreviewLocalizationViewModelService(), new EMFDeleteServiceImpl());
+ copy, dummyData, previewRefServ, new EMFDeleteServiceImpl());
composite = createComposite(parent);
render = ECPSWTViewRenderer.INSTANCE.render(composite, viewModelContext);
composite.layout();
diff --git a/bundles/org.eclipse.emf.ecp.view.model.preview.common/src/org/eclipse/emf/ecp/view/model/preview/common/PreviewLocalizationViewModelService.java b/bundles/org.eclipse.emf.ecp.view.model.preview.common/src/org/eclipse/emf/ecp/view/model/preview/common/PreviewLocalizationViewModelService.java
deleted file mode 100644
index 692d4c2..0000000
--- a/bundles/org.eclipse.emf.ecp.view.model.preview.common/src/org/eclipse/emf/ecp/view/model/preview/common/PreviewLocalizationViewModelService.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011-2015 EclipseSource Muenchen GmbH and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Eugen Neufeld - initial API and implementation
- ******************************************************************************/
-package org.eclipse.emf.ecp.view.model.preview.common;
-
-import org.eclipse.emf.ecp.view.spi.model.LocalizationAdapter;
-import org.eclipse.emf.ecp.view.spi.model.VElement;
-import org.eclipse.emfforms.internal.view.model.localization.LocalizationViewModelService;
-
-/**
- * Specific Preview Service, that changes the label text for the preview.
- *
- * @author Eugen Neufeld
- *
- */
-@SuppressWarnings("restriction")
-public class PreviewLocalizationViewModelService extends LocalizationViewModelService {
-
- /**
- * {@inheritDoc}
- *
- * @see org.eclipse.emfforms.internal.view.model.localization.LocalizationViewModelService#localize(org.eclipse.emf.ecp.view.spi.model.LocalizationAdapter,
- * org.eclipse.emf.ecp.view.spi.model.VElement)
- */
- @Override
- protected void localize(LocalizationAdapter localizationAdapter, VElement vElement) {
- if (vElement.getName() == null) {
- vElement.setLabel(""); //$NON-NLS-1$
- } else if (vElement.getName().startsWith("%")) { //$NON-NLS-1$
- vElement.setLabel(vElement.getName().substring(1));
- } else {
- vElement.setLabel(vElement.getName());
- }
- }
-
- /**
- * {@inheritDoc}
- *
- * @see org.eclipse.emfforms.internal.view.model.localization.LocalizationViewModelService#getPriority()
- */
- @Override
- public int getPriority() {
- return super.getPriority() + 1;
- }
-
-}
