diff options
author | jkohnlein | 2008-03-13 14:03:19 +0000 |
---|---|---|
committer | jkohnlein | 2008-03-13 14:03:19 +0000 |
commit | 91f48116208fc393ff67eeaedb6eee8a409f05f0 (patch) | |
tree | 8f7ca7f0a204172fbdaf4e5c63c74279cb21fa58 | |
parent | 9111ff462b07b2407fc521b9679e8dd881114fde (diff) | |
download | org.eclipse.xpand-91f48116208fc393ff67eeaedb6eee8a409f05f0.tar.gz org.eclipse.xpand-91f48116208fc393ff67eeaedb6eee8a409f05f0.tar.xz org.eclipse.xpand-91f48116208fc393ff67eeaedb6eee8a409f05f0.zip |
Fixed copyright entries
16 files changed, 231 insertions, 7 deletions
diff --git a/plugins/org.eclipse.xpand3.parser/src/org/eclipse/xpand3/parser/node2ast/Node2AstTransformer.java b/plugins/org.eclipse.xpand3.parser/src/org/eclipse/xpand3/parser/node2ast/Node2AstTransformer.java index 9a1ff3e9..08516e1c 100644 --- a/plugins/org.eclipse.xpand3.parser/src/org/eclipse/xpand3/parser/node2ast/Node2AstTransformer.java +++ b/plugins/org.eclipse.xpand3.parser/src/org/eclipse/xpand3/parser/node2ast/Node2AstTransformer.java @@ -1,3 +1,16 @@ +/******************************************************************************* + * <copyright> + * Copyright (c) 2008 itemis AG 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: + * committers of openArchitectureWare - initial API and implementation + * </copyright> + *******************************************************************************/ + package org.eclipse.xpand3.parser.node2ast; import org.eclipse.emf.common.util.EList; @@ -93,6 +106,9 @@ import org.eclipse.xpand3.statement.IfStatement; import org.eclipse.xpand3.statement.StatementFactory; import org.eclipse.xpand3.statement.TextStatement; +/** + * @author Jan Köhnlein + */ public class Node2AstTransformer extends AbstractXpand3NodeSwitch<SyntaxElement, TransformationException> { @@ -248,6 +264,8 @@ public class Node2AstTransformer extends .setConstraint((AbstractExpression) doSwitch(node .getConstraint())); check.setMsg((AbstractExpression) doSwitch(node.getMessage())); + createAndAddImplicitlyDeclaredThisParameter(node.getType(), check + .getParams()); return check; } diff --git a/plugins/org.eclipse.xpand3.parser/src/org/eclipse/xpand3/parser/node2ast/Node2AstUtil.java b/plugins/org.eclipse.xpand3.parser/src/org/eclipse/xpand3/parser/node2ast/Node2AstUtil.java index 8aa876ae..2444eeee 100644 --- a/plugins/org.eclipse.xpand3.parser/src/org/eclipse/xpand3/parser/node2ast/Node2AstUtil.java +++ b/plugins/org.eclipse.xpand3.parser/src/org/eclipse/xpand3/parser/node2ast/Node2AstUtil.java @@ -1,3 +1,16 @@ +/******************************************************************************* + * <copyright> + * Copyright (c) 2008 itemis AG 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: + * committers of openArchitectureWare - initial API and implementation + * </copyright> + *******************************************************************************/ + package org.eclipse.xpand3.parser.node2ast; import java.util.List; @@ -9,6 +22,9 @@ import org.eclipse.xpand3.expression.AbstractExpression; import org.eclipse.xpand3.expression.BinaryOperation; import org.eclipse.xpand3.expression.ExpressionFactory; +/** + * @author Jan Köhnlein + */ public class Node2AstUtil { public static SyntaxElement createBinaryOperationChainFromList( diff --git a/plugins/org.eclipse.xpand3.parser/src/org/eclipse/xpand3/parser/node2ast/TransformationException.java b/plugins/org.eclipse.xpand3.parser/src/org/eclipse/xpand3/parser/node2ast/TransformationException.java index bffd7ae4..6314deb8 100644 --- a/plugins/org.eclipse.xpand3.parser/src/org/eclipse/xpand3/parser/node2ast/TransformationException.java +++ b/plugins/org.eclipse.xpand3.parser/src/org/eclipse/xpand3/parser/node2ast/TransformationException.java @@ -1,7 +1,23 @@ +/******************************************************************************* + * <copyright> + * Copyright (c) 2008 itemis AG 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: + * committers of openArchitectureWare - initial API and implementation + * </copyright> + *******************************************************************************/ + package org.eclipse.xpand3.parser.node2ast; import org.eclipse.tmf.common.node.Node; +/** + * @author Jan Köhnlein + */ public class TransformationException extends RuntimeException { private Node node; diff --git a/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/util/ClassLoaderLoaderImpl.java b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/util/ClassLoaderLoaderImpl.java index 718922cb..7f9ec44f 100644 --- a/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/util/ClassLoaderLoaderImpl.java +++ b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/util/ClassLoaderLoaderImpl.java @@ -1,3 +1,18 @@ +/** + * <copyright> + * + * Copyright (c) 2002-2007 itemis AG 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: + * itemis AG - Initial API and implementation + * + * </copyright> + * + */ package org.eclipse.xpand3.util; import java.io.IOException; @@ -5,7 +20,6 @@ import java.io.InputStream; import java.net.URL; import java.util.Enumeration; - /** * @author Sven Efftinge * diff --git a/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/util/Loader.java b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/util/Loader.java index 979bfa16..1670f1cd 100644 --- a/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/util/Loader.java +++ b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/util/Loader.java @@ -1,3 +1,18 @@ +/** + * <copyright> + * + * Copyright (c) 2002-2007 itemis AG 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: + * itemis AG - Initial API and implementation + * + * </copyright> + * + */ package org.eclipse.xpand3.util; import java.io.InputStream; diff --git a/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/AbstractXpand3NodeParserTest.java b/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/AbstractXpand3NodeParserTest.java index b6eb7543..de58a144 100644 --- a/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/AbstractXpand3NodeParserTest.java +++ b/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/AbstractXpand3NodeParserTest.java @@ -1,3 +1,16 @@ +/******************************************************************************* + * <copyright> + * Copyright (c) 2008 itemis AG 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: + * committers of openArchitectureWare - initial API and implementation + * </copyright> + *******************************************************************************/ + package org.eclipse.xpand3.parser; import java.util.List; @@ -9,6 +22,9 @@ import org.eclipse.tmf.common.node.LeafNode; import org.eclipse.tmf.common.node.LexedToken; import org.eclipse.tmf.common.node.Node; +/** + * @author Jan Köhnlein + */ public abstract class AbstractXpand3NodeParserTest extends TestCase { public static final char LG = '\u00AB'; diff --git a/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/AllTests.java b/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/AllTests.java index 3b749c68..0d92b4ca 100644 --- a/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/AllTests.java +++ b/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/AllTests.java @@ -1,19 +1,35 @@ +/******************************************************************************* + * <copyright> + * Copyright (c) 2008 itemis AG 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: + * committers of openArchitectureWare - initial API and implementation + * </copyright> + *******************************************************************************/ + package org.eclipse.xpand3.parser; import junit.framework.Test; import junit.framework.TestSuite; +/** + * @author Jan Köhnlein + */ public class AllTests { public static Test suite() { TestSuite suite = new TestSuite("Test for org.eclipse.xpand3.parser"); - //$JUnit-BEGIN$ + // $JUnit-BEGIN$ suite.addTestSuite(XpandLexerTest.class); suite.addTestSuite(ExpressionNodeParserTest.class); suite.addTestSuite(Xpand3ScannerTest.class); suite.addTestSuite(Xpand3NodeParserTest.class); suite.addTestSuite(StatementNodeParserTest.class); - //$JUnit-END$ + // $JUnit-END$ return suite; } diff --git a/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/ExpressionNodeParserTest.java b/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/ExpressionNodeParserTest.java index b7d8eae4..f4beb1ff 100644 --- a/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/ExpressionNodeParserTest.java +++ b/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/ExpressionNodeParserTest.java @@ -1,3 +1,16 @@ +/******************************************************************************* + * <copyright> + * Copyright (c) 2008 itemis AG 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: + * committers of openArchitectureWare - initial API and implementation + * </copyright> + *******************************************************************************/ + package org.eclipse.xpand3.parser; import org.antlr.runtime.ANTLRStringStream; @@ -5,6 +18,9 @@ import org.antlr.runtime.CommonTokenStream; import org.eclipse.tmf.common.node.CompositeNode; import org.eclipse.tmf.common.node.Node; +/** + * @author Jan Köhnlein + */ public class ExpressionNodeParserTest extends AbstractXpand3NodeParserTest { public final void testSimple() throws Exception { diff --git a/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/StatementNodeParserTest.java b/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/StatementNodeParserTest.java index 6e035683..53f3a0e0 100644 --- a/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/StatementNodeParserTest.java +++ b/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/StatementNodeParserTest.java @@ -1,12 +1,14 @@ /******************************************************************************* - * Copyright (c) 2005, 2007 committers of openArchitectureWare and others. + * <copyright> + * Copyright (c) 2008 itemis AG 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: - * committers of openArchitectureWare - initial API and implementation + * committers of openArchitectureWare - initial API and implementation + * </copyright> *******************************************************************************/ package org.eclipse.xpand3.parser; @@ -17,7 +19,7 @@ import org.eclipse.tmf.common.node.CompositeNode; import org.eclipse.tmf.common.node.Node; /** - * @author Jan Kšhnlein + * @author Jan Köhnlein */ public class StatementNodeParserTest extends AbstractXpand3NodeParserTest { private CompositeNode parse(String s) throws Exception { diff --git a/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/SyntaxUtil.java b/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/SyntaxUtil.java index 645b728d..8adc3066 100644 --- a/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/SyntaxUtil.java +++ b/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/SyntaxUtil.java @@ -1,6 +1,22 @@ +/******************************************************************************* + * <copyright> + * Copyright (c) 2008 itemis AG 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: + * committers of openArchitectureWare - initial API and implementation + * </copyright> + *******************************************************************************/ + package org.eclipse.xpand3.parser; +/** + * @author Jan Köhnlein + */ public class SyntaxUtil { public static final String LG = "\u00AB"; public static final String RG = "\u00BB"; -} +} diff --git a/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/Xpand3NodeParserTest.java b/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/Xpand3NodeParserTest.java index f02e4818..bd258eb8 100644 --- a/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/Xpand3NodeParserTest.java +++ b/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/Xpand3NodeParserTest.java @@ -1,3 +1,16 @@ +/******************************************************************************* + * <copyright> + * Copyright (c) 2008 itemis AG 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: + * committers of openArchitectureWare - initial API and implementation + * </copyright> + *******************************************************************************/ + package org.eclipse.xpand3.parser; import static org.eclipse.xpand3.parser.SyntaxUtil.LG; @@ -8,6 +21,9 @@ import org.antlr.runtime.ANTLRStringStream; import org.antlr.runtime.CommonTokenStream; import org.eclipse.tmf.common.node.Node; +/** + * @author Jan Köhnlein + */ public class Xpand3NodeParserTest extends TestCase { private Node parse(String s) throws Exception { diff --git a/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/XpandLexerTest.java b/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/XpandLexerTest.java index fec987a5..3eab26a7 100644 --- a/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/XpandLexerTest.java +++ b/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/XpandLexerTest.java @@ -16,6 +16,9 @@ import org.antlr.runtime.ANTLRStringStream; import org.antlr.runtime.CommonToken; import org.antlr.runtime.CommonTokenStream; +/** + * @author Jan Köhnlein + */ public class XpandLexerTest extends AbstractXpand3NodeParserTest { public void testComments() throws Exception { diff --git a/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/node2ast/Node2AstTest.java b/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/node2ast/Node2AstTest.java index 3436f4d4..d73173f3 100644 --- a/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/node2ast/Node2AstTest.java +++ b/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/node2ast/Node2AstTest.java @@ -1,3 +1,16 @@ +/******************************************************************************* + * <copyright> + * Copyright (c) 2008 itemis AG 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: + * committers of openArchitectureWare - initial API and implementation + * </copyright> + *******************************************************************************/ + package org.eclipse.xpand3.parser.node2ast; import junit.framework.TestCase; @@ -13,6 +26,9 @@ import org.eclipse.xpand3.SyntaxElement; import org.eclipse.xpand3.parser.Xpand3NodeLexer; import org.eclipse.xpand3.parser.Xpand3NodeParser; +/** + * @author Jan Köhnlein + */ public class Node2AstTest extends TestCase { private SyntaxElement parseAndTransform(String s) throws Exception { diff --git a/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/node2ast/ParseStuff.java b/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/node2ast/ParseStuff.java index 7c34a3db..e63b0ced 100644 --- a/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/node2ast/ParseStuff.java +++ b/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/node2ast/ParseStuff.java @@ -1,3 +1,16 @@ +/******************************************************************************* + * <copyright> + * Copyright (c) 2008 itemis AG 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: + * committers of openArchitectureWare - initial API and implementation + * </copyright> + *******************************************************************************/ + package org.eclipse.xpand3.parser.node2ast; import java.io.StringReader; @@ -10,6 +23,10 @@ import org.eclipse.xpand3.parser.Xpand3NodeLexer; import org.eclipse.xpand3.parser.Xpand3NodeParser; import org.openarchitectureware.xtend.parser.ParseFacade; +/** + * @author Sven Efftinge + * @author Jan Köhnlein + */ public class ParseStuff { private static boolean useNodeParser; diff --git a/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/node2ast/TreetestInterpreterTest.java b/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/node2ast/TreetestInterpreterTest.java index 013a1ef7..9ae8f2e5 100644 --- a/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/node2ast/TreetestInterpreterTest.java +++ b/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/node2ast/TreetestInterpreterTest.java @@ -1,3 +1,16 @@ +/******************************************************************************* + * <copyright> + * Copyright (c) 2008 itemis AG 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: + * committers of openArchitectureWare - initial API and implementation + * </copyright> + *******************************************************************************/ + package org.eclipse.xpand3.parser.node2ast; import java.io.UnsupportedEncodingException; @@ -11,10 +24,17 @@ import org.eclipse.tmf.common.treetest.AbstractEcoreTreeTestInterpreter; import org.eclipse.xpand3.parser.Xpand3NodeLexer; import org.eclipse.xpand3.parser.Xpand3NodeParser; +/** + * @author Jan Köhnlein + */ public class TreetestInterpreterTest extends AbstractEcoreTreeTestInterpreter { private boolean parseExpression; + public TreetestInterpreterTest() { + super("MM"); + } + public void testStatement() throws Throwable { parseExpression = false; test("org/eclipse/xpand3/parser/node2ast/statement.ttst"); diff --git a/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/node2ast/statement.ttst b/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/node2ast/statement.ttst index 3d2196cb..b9d1bdc9 100644 --- a/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/node2ast/statement.ttst +++ b/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/node2ast/statement.ttst @@ -303,4 +303,11 @@ expected guard=BinaryOperation msg=BinaryOperation constraint=BinaryOperation + guard=BinaryOperation + params=[ + DeclaredParameter { + name=Identifier(value="this") + type=Identifier(value="EObject") + } + ] }
\ No newline at end of file |