Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2015-04-22 16:16:16 +0000
committerEike Stepper2015-04-22 16:16:16 +0000
commitd2c5b0ee9d0634fb6c79d99e6952ee0d7c752dd7 (patch)
tree6488f73e26dcddd9b1c7befccf7ba721215edce9 /plugins/org.eclipse.emf.cdo.expressions
parentef5341796d793607c49d863f8607f3193ceb08ae (diff)
downloadcdo-d2c5b0ee9d0634fb6c79d99e6952ee0d7c752dd7.tar.gz
cdo-d2c5b0ee9d0634fb6c79d99e6952ee0d7c752dd7.tar.xz
cdo-d2c5b0ee9d0634fb6c79d99e6952ee0d7c752dd7.zip
[Releng] Reformat everything with M6 formatter
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.expressions')
-rw-r--r--plugins/org.eclipse.emf.cdo.expressions/META-INF/MANIFEST.MF8
-rw-r--r--plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/DoubleValueImpl.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/EvaluationContextImpl.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/ExpressionsPackageImpl.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/FloatValueImpl.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/ShortValueImpl.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/StringValueImpl.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/package-info.java13
-rw-r--r--plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/package-info.java13
-rw-r--r--plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/util/package-info.java13
10 files changed, 31 insertions, 42 deletions
diff --git a/plugins/org.eclipse.emf.cdo.expressions/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.expressions/META-INF/MANIFEST.MF
index de78b1b764..9374bfdf2b 100644
--- a/plugins/org.eclipse.emf.cdo.expressions/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.expressions/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.cdo.expressions;singleton:=true
-Bundle-Version: 4.3.0.qualifier
+Bundle-Version: 4.3.100.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.emf.cdo.expressions;version="4.3.0",
- org.eclipse.emf.cdo.expressions.impl;version="4.3.0",
- org.eclipse.emf.cdo.expressions.util;version="4.3.0"
+Export-Package: org.eclipse.emf.cdo.expressions;version="4.3.100",
+ org.eclipse.emf.cdo.expressions.impl;version="4.3.100",
+ org.eclipse.emf.cdo.expressions.util;version="4.3.100"
Require-Bundle: org.eclipse.emf.cdo;visibility:=reexport;bundle-version="[4.1.0,5.0.0)"
Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/DoubleValueImpl.java b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/DoubleValueImpl.java
index 5067955a33..4b347c4524 100644
--- a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/DoubleValueImpl.java
+++ b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/DoubleValueImpl.java
@@ -80,7 +80,8 @@ public class DoubleValueImpl extends ValueImpl implements DoubleValue
*/
public void setLiteral(double newLiteral)
{
- eDynamicSet(ExpressionsPackage.DOUBLE_VALUE__LITERAL, ExpressionsPackage.Literals.DOUBLE_VALUE__LITERAL, newLiteral);
+ eDynamicSet(ExpressionsPackage.DOUBLE_VALUE__LITERAL, ExpressionsPackage.Literals.DOUBLE_VALUE__LITERAL,
+ newLiteral);
}
/**
diff --git a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/EvaluationContextImpl.java b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/EvaluationContextImpl.java
index 709bc96296..bb6ffbb717 100644
--- a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/EvaluationContextImpl.java
+++ b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/EvaluationContextImpl.java
@@ -22,7 +22,7 @@ import java.util.Map;
*
* @author Eike Stepper
*/
-public class EvaluationContextImpl extends HashMap<String, Object> implements EvaluationContext
+public class EvaluationContextImpl extends HashMap<String, Object>implements EvaluationContext
{
private static final long serialVersionUID = 1L;
diff --git a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/ExpressionsPackageImpl.java b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/ExpressionsPackageImpl.java
index 679af06609..bcc9b41098 100644
--- a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/ExpressionsPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/ExpressionsPackageImpl.java
@@ -243,7 +243,7 @@ public class ExpressionsPackageImpl extends EPackageImpl implements ExpressionsP
/**
* Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
- *
+ *
* <p>This method is used to initialize {@link ExpressionsPackage#eINSTANCE} when that field is accessed.
* Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
* <!-- begin-user-doc -->
@@ -261,8 +261,9 @@ public class ExpressionsPackageImpl extends EPackageImpl implements ExpressionsP
}
// Obtain or create and register package
- ExpressionsPackageImpl theExpressionsPackage = (ExpressionsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ExpressionsPackageImpl ? EPackage.Registry.INSTANCE
- .get(eNS_URI) : new ExpressionsPackageImpl());
+ ExpressionsPackageImpl theExpressionsPackage = (ExpressionsPackageImpl)(EPackage.Registry.INSTANCE
+ .get(eNS_URI) instanceof ExpressionsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
+ : new ExpressionsPackageImpl());
isInited = true;
@@ -872,7 +873,8 @@ public class ExpressionsPackageImpl extends EPackageImpl implements ExpressionsP
listConstructionEClass.getESuperTypes().add(getExpression());
// Initialize classes, features, and operations; add parameters
- initEClass(expressionEClass, Expression.class, "Expression", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEClass(expressionEClass, Expression.class, "Expression", IS_ABSTRACT, IS_INTERFACE,
+ IS_GENERATED_INSTANCE_CLASS);
EOperation op = initEOperation(getExpression__Evaluate__EvaluationContext(), ecorePackage.getEJavaObject(),
"evaluate", 0, 1, IS_UNIQUE, IS_ORDERED);
diff --git a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/FloatValueImpl.java b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/FloatValueImpl.java
index c145ed23a6..bf4736bedf 100644
--- a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/FloatValueImpl.java
+++ b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/FloatValueImpl.java
@@ -69,8 +69,8 @@ public class FloatValueImpl extends ValueImpl implements FloatValue
@Override
public Float getLiteral()
{
- return (Float)eDynamicGet(ExpressionsPackage.FLOAT_VALUE__LITERAL,
- ExpressionsPackage.Literals.FLOAT_VALUE__LITERAL, true, true);
+ return (Float)eDynamicGet(ExpressionsPackage.FLOAT_VALUE__LITERAL, ExpressionsPackage.Literals.FLOAT_VALUE__LITERAL,
+ true, true);
}
/**
diff --git a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/ShortValueImpl.java b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/ShortValueImpl.java
index 4aa789e00d..1f1fb25cc7 100644
--- a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/ShortValueImpl.java
+++ b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/ShortValueImpl.java
@@ -69,8 +69,8 @@ public class ShortValueImpl extends ValueImpl implements ShortValue
@Override
public Short getLiteral()
{
- return (Short)eDynamicGet(ExpressionsPackage.SHORT_VALUE__LITERAL,
- ExpressionsPackage.Literals.SHORT_VALUE__LITERAL, true, true);
+ return (Short)eDynamicGet(ExpressionsPackage.SHORT_VALUE__LITERAL, ExpressionsPackage.Literals.SHORT_VALUE__LITERAL,
+ true, true);
}
/**
diff --git a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/StringValueImpl.java b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/StringValueImpl.java
index da1878aefe..c8556446c7 100644
--- a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/StringValueImpl.java
+++ b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/StringValueImpl.java
@@ -80,7 +80,8 @@ public class StringValueImpl extends ValueImpl implements StringValue
*/
public void setLiteral(String newLiteral)
{
- eDynamicSet(ExpressionsPackage.STRING_VALUE__LITERAL, ExpressionsPackage.Literals.STRING_VALUE__LITERAL, newLiteral);
+ eDynamicSet(ExpressionsPackage.STRING_VALUE__LITERAL, ExpressionsPackage.Literals.STRING_VALUE__LITERAL,
+ newLiteral);
}
/**
diff --git a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/package-info.java b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/package-info.java
index 66b5dd723c..a41845e1a7 100644
--- a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/package-info.java
@@ -1,12 +1,8 @@
/*
- * Copyright (c) 2013 Eike Stepper (Berlin, Germany) 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:
- * Eike Stepper - initial API and implementation
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) 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: Eike Stepper - initial API and
+ * implementation
*/
/**
@@ -15,4 +11,3 @@
* @apiviz.exclude .*
*/
package org.eclipse.emf.cdo.expressions.impl;
-
diff --git a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/package-info.java b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/package-info.java
index ebf8d3bbd4..794a23f5b3 100644
--- a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/package-info.java
@@ -1,12 +1,8 @@
/*
- * Copyright (c) 2013 Eike Stepper (Berlin, Germany) 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:
- * Eike Stepper - initial API and implementation
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) 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: Eike Stepper - initial API and
+ * implementation
*/
/**
@@ -16,4 +12,3 @@
* @apiviz.exclude .*\.ExpressionsFactory.*
*/
package org.eclipse.emf.cdo.expressions;
-
diff --git a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/util/package-info.java b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/util/package-info.java
index 609c570899..66c38ce9f6 100644
--- a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/util/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/util/package-info.java
@@ -1,16 +1,11 @@
/*
- * Copyright (c) 2013 Eike Stepper (Berlin, Germany) 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:
- * Eike Stepper - initial API and implementation
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) 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: Eike Stepper - initial API and
+ * implementation
*/
/**
* The generated EMF utilities of the CDO expressions model.
*/
package org.eclipse.emf.cdo.expressions.util;
-

Back to the top