Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEsteban Dugueperoux2015-06-22 09:49:05 +0000
committerEsteban DUGUEPEROUX2015-06-22 15:23:08 +0000
commit55a9d1b55fdcb6eccc63dddf74f47e300e4712a3 (patch)
treec5e8e40e22349b2b9759909c2da713497218bdf2
parentf406ccbb4f26a16eee055f72243058fc9b1e799b (diff)
downloadorg.eclipse.sirius-55a9d1b55fdcb6eccc63dddf74f47e300e4712a3.tar.gz
org.eclipse.sirius-55a9d1b55fdcb6eccc63dddf74f47e300e4712a3.tar.xz
org.eclipse.sirius-55a9d1b55fdcb6eccc63dddf74f47e300e4712a3.zip
[cleanup] Remove useless SiriusAbstractExpression.
Change-Id: Ic14fa91f0c4d346341443ec428d5df193dbac208 Signed-off-by: Esteban Dugueperoux <esteban.dugueperoux@obeo.fr>
-rw-r--r--plugins/org.eclipse.sirius.diagram.ui/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/expressions/SiriusAbstractExpression.java219
2 files changed, 0 insertions, 220 deletions
diff --git a/plugins/org.eclipse.sirius.diagram.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.diagram.ui/META-INF/MANIFEST.MF
index 4684f54503..a0c2c249f6 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.diagram.ui/META-INF/MANIFEST.MF
@@ -81,7 +81,6 @@ Export-Package: org.eclipse.sirius.diagram.description.concern.provider;version=
org.eclipse.sirius.diagram.ui.internal.edit.parts;x-internal:=true;version="3.0.0",
org.eclipse.sirius.diagram.ui.internal.edit.policies;x-internal:=true;version="2.1.0",
org.eclipse.sirius.diagram.ui.internal.edit.policies.canonicals;x-internal:=true;version="3.0.0",
- org.eclipse.sirius.diagram.ui.internal.expressions;x-internal:=true;version="2.0.4",
org.eclipse.sirius.diagram.ui.internal.operation;x-internal:=true;version="3.0.0",
org.eclipse.sirius.diagram.ui.internal.parsers;x-internal:=true;version="2.0.4",
org.eclipse.sirius.diagram.ui.internal.preferences;x-internal:=true;version="2.0.4",
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/expressions/SiriusAbstractExpression.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/expressions/SiriusAbstractExpression.java
deleted file mode 100644
index 8ee7c7b2ac..0000000000
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/expressions/SiriusAbstractExpression.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2014 THALES GLOBAL SERVICES 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:
- * Obeo - initial API and implementation
- *******************************************************************************/
-package org.eclipse.sirius.diagram.ui.internal.expressions;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.ETypedElement;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.sirius.diagram.DiagramPlugin;
-
-/**
- * @was-generated
- */
-public abstract class SiriusAbstractExpression {
- /**
- * @was-generated
- */
- private static final boolean DISABLED_NO_IMPL_EXCEPTION_LOG = Boolean.valueOf(
- Platform.getDebugOption(DiagramPlugin.getDefault().getBundle().getSymbolicName() + "/debug/disableNoExprImplExceptionLog")).booleanValue();
-
- /**
- * @was-generated
- */
- private final String body;
-
- /**
- * @was-generated
- */
- private final EClassifier context;
-
- /**
- * @was-generated
- */
- private IStatus status = Status.OK_STATUS;
-
- /**
- * @was-generated
- */
- protected SiriusAbstractExpression(EClassifier context) {
- this(null, context);
- }
-
- /**
- * @was-generated
- */
- protected SiriusAbstractExpression(String body, EClassifier context) {
- this.body = body;
- this.context = context;
- }
-
- /**
- * @was-generated
- */
- protected void setStatus(int severity, String message, Throwable throwable) {
- String pluginID = DiagramPlugin.ID;
- this.status = new Status(severity, pluginID, -1, (message != null) ? message : "", throwable); //$NON-NLS-1$
- if (!this.status.isOK()) {
- DiagramPlugin.getDefault().logError("Expression problem:" + message + "body:" + body, throwable); //$NON-NLS-1$ //$NON-NLS-2$
-
- }
- }
-
- /**
- * @was-generated
- */
- protected abstract Object doEvaluate(Object context, Map env);
-
- /**
- * @was-generated
- */
- public Object evaluate(Object context) {
- return evaluate(context, Collections.EMPTY_MAP);
- }
-
- /**
- * @was-generated
- */
- public Object evaluate(Object context, Map env) {
- if (context().isInstance(context)) {
- try {
- return doEvaluate(context, env);
- } catch (Exception e) {
- if (DISABLED_NO_IMPL_EXCEPTION_LOG && e instanceof NoImplException) {
- return null;
- }
- DiagramPlugin.getDefault().logError("Expression evaluation failure: " + body, e);
- }
- }
- return null;
- }
-
- /**
- * @was-generated
- */
- public IStatus getStatus() {
- return status;
- }
-
- /**
- * @was-generated
- */
- public String body() {
- return body;
- }
-
- /**
- * @was-generated
- */
- public EClassifier context() {
- return context;
- }
-
- /**
- * @was-generated
- */
- public void assignTo(EStructuralFeature feature, EObject target) {
- Object value = evaluate(target);
- value = (value != null) ? performCast(value, feature) : null;
- if (feature.isMany()) {
- Collection destCollection = (Collection) target.eGet(feature);
- destCollection.clear();
- if (value instanceof Collection) {
- Collection valueCollection = (Collection) value;
- for (Iterator it = valueCollection.iterator(); it.hasNext();) {
- destCollection.add(performCast(it.next(), feature));
- }
- } else {
- destCollection.add(value);
- }
- return;
- }
- target.eSet(feature, value);
- }
-
- /**
- * @was-generated
- */
- protected Object performCast(Object value, ETypedElement targetType) {
- if (targetType.getEType() == null || targetType.getEType().getInstanceClass() == null) {
- return value;
- }
- Class<?> targetClass = targetType.getEType().getInstanceClass();
- if (value != null && value instanceof Number) {
- Number num = (Number) value;
- Class<?> valClass = value.getClass();
- Class<?> targetWrapperClass = targetClass;
- if (targetClass.isPrimitive()) {
- targetWrapperClass = EcoreUtil.wrapperClassFor(targetClass);
- }
- if (valClass.equals(targetWrapperClass)) {
- return value;
- }
- if (Number.class.isAssignableFrom(targetWrapperClass)) {
- if (targetWrapperClass.equals(Byte.class))
- return new Byte(num.byteValue());
- if (targetWrapperClass.equals(Integer.class))
- return new Integer(num.intValue());
- if (targetWrapperClass.equals(Short.class))
- return new Short(num.shortValue());
- if (targetWrapperClass.equals(Long.class))
- return new Long(num.longValue());
- if (targetWrapperClass.equals(BigInteger.class))
- return BigInteger.valueOf(num.longValue());
- if (targetWrapperClass.equals(Float.class))
- return new Float(num.floatValue());
- if (targetWrapperClass.equals(Double.class))
- return new Double(num.doubleValue());
- if (targetWrapperClass.equals(BigDecimal.class))
- return new BigDecimal(num.doubleValue());
- }
- }
- return value;
- }
-
- /**
- * @was-generated
- */
- public static final SiriusAbstractExpression createNullExpression(EClassifier context) {
- return new SiriusAbstractExpression(context) {
- protected Object doEvaluate(Object context, Map env) {
- // TODO - log entry about not provider available for this
- // expression
- return null;
- }
- };
- }
-
- /**
- * @was-generated
- */
- @SuppressWarnings("serial")
- public static class NoImplException extends RuntimeException {
- /**
- * @was-generated
- */
- public NoImplException(String message) {
- super(message);
- }
- }
-}

Back to the top