Author: pkluegl Date: Tue Feb 16 15:27:24 2016 New Revision: 1730700 URL: http://svn.apache.org/viewvc?rev=1730700&view=rev Log: UIMA-4798 - upgrade DLTK version - add ep parent
Added: uima/ruta/branches/UIMA-4798/ruta-ep-parent/ uima/ruta/branches/UIMA-4798/ruta-ep-parent/pom.xml (with props) Modified: uima/ruta/branches/UIMA-4798/example-projects/ruta-ep-example-extensions/pom.xml uima/ruta/branches/UIMA-4798/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/ruta/example/extensions/ExampleActionIDEExtension.java uima/ruta/branches/UIMA-4798/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/ruta/example/extensions/ExampleBooleanFunctionIDEExtension.java uima/ruta/branches/UIMA-4798/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/ruta/example/extensions/ExampleConditionIDEExtension.java uima/ruta/branches/UIMA-4798/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/ruta/example/extensions/ExampleNumberFunctionIDEExtension.java uima/ruta/branches/UIMA-4798/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/ruta/example/extensions/ExampleStringFunctionIDEExtension.java uima/ruta/branches/UIMA-4798/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/ruta/example/extensions/ExampleTypeFunctionIDEExtension.java uima/ruta/branches/UIMA-4798/ruta-ep-addons/pom.xml uima/ruta/branches/UIMA-4798/ruta-ep-caseditor/pom.xml uima/ruta/branches/UIMA-4798/ruta-ep-core-ext/pom.xml uima/ruta/branches/UIMA-4798/ruta-ep-core-ext/src/main/java/org/apache/uima/ruta/string/BooleanOperationsIDEExtension.java uima/ruta/branches/UIMA-4798/ruta-ep-core-ext/src/main/java/org/apache/uima/ruta/string/StringOperationsIDEExtension.java uima/ruta/branches/UIMA-4798/ruta-ep-ide-ui/pom.xml uima/ruta/branches/UIMA-4798/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/formatter/RutaFormattedPrinter.java uima/ruta/branches/UIMA-4798/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/console/RutaFileHyperlink.java uima/ruta/branches/UIMA-4798/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/editor/ReferenceFinder.java uima/ruta/branches/UIMA-4798/ruta-ep-ide/pom.xml uima/ruta/branches/UIMA-4798/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ActionFactory.java uima/ruta/branches/UIMA-4798/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ConditionFactory.java uima/ruta/branches/UIMA-4798/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ExpressionFactory.java uima/ruta/branches/UIMA-4798/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaAction.java uima/ruta/branches/UIMA-4798/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaCondition.java uima/ruta/branches/UIMA-4798/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaFunction.java uima/ruta/branches/UIMA-4798/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaListExpression.java uima/ruta/branches/UIMA-4798/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaLogAction.java uima/ruta/branches/UIMA-4798/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaStringExpression.java uima/ruta/branches/UIMA-4798/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaStructureAction.java uima/ruta/branches/UIMA-4798/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ScriptFactory.java uima/ruta/branches/UIMA-4798/ruta-ep-textruler/pom.xml uima/ruta/branches/UIMA-4798/ruta-ep-textruler/src/main/java/org/apache/uima/ruta/textruler/ui/ConfigureLearnersHandler.java uima/ruta/branches/UIMA-4798/ruta-maven-plugin/pom.xml uima/ruta/branches/UIMA-4798/ruta-parent/pom.xml Modified: uima/ruta/branches/UIMA-4798/example-projects/ruta-ep-example-extensions/pom.xml URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4798/example-projects/ruta-ep-example-extensions/pom.xml?rev=1730700&r1=1730699&r2=1730700&view=diff ============================================================================== --- uima/ruta/branches/UIMA-4798/example-projects/ruta-ep-example-extensions/pom.xml (original) +++ uima/ruta/branches/UIMA-4798/example-projects/ruta-ep-example-extensions/pom.xml Tue Feb 16 15:27:24 2016 @@ -24,9 +24,9 @@ <name>Apache UIMA Ruta: ${project.artifactId}</name> <parent> <groupId>org.apache.uima</groupId> - <artifactId>ruta-parent</artifactId> + <artifactId>ruta-ep-parent</artifactId> <version>2.4.1-SNAPSHOT</version> - <relativePath>../../ruta-parent/pom.xml</relativePath> + <relativePath>../../ruta-ep-parent/pom.xml</relativePath> </parent> <properties> <postNoticeText /> @@ -50,12 +50,6 @@ <artifactId>ruta-ep-ide-ui</artifactId> <version>${project.parent.version}</version> </dependency> - <dependency> - <groupId>org.eclipse.dltk</groupId> - <artifactId>core</artifactId> - <version>[3.0.1,5.0.0)</version> - <scope>provided</scope> - </dependency> <dependency> <groupId>org.antlr</groupId> <artifactId>antlr-runtime</artifactId> Modified: uima/ruta/branches/UIMA-4798/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/ruta/example/extensions/ExampleActionIDEExtension.java URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4798/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/ruta/example/extensions/ExampleActionIDEExtension.java?rev=1730700&r1=1730699&r2=1730700&view=diff ============================================================================== --- uima/ruta/branches/UIMA-4798/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/ruta/example/extensions/ExampleActionIDEExtension.java (original) +++ uima/ruta/branches/UIMA-4798/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/ruta/example/extensions/ExampleActionIDEExtension.java Tue Feb 16 15:27:24 2016 @@ -26,6 +26,7 @@ import org.apache.uima.ruta.ide.core.ext import org.apache.uima.ruta.ide.core.extensions.IRutaCheckerProblemFactory; import org.apache.uima.ruta.ide.parser.ast.RutaAction; import org.apache.uima.ruta.ide.parser.ast.RutaTypeConstants; +import org.eclipse.dltk.ast.ASTNode; import org.eclipse.dltk.ast.expressions.Expression; import org.eclipse.dltk.compiler.problem.IProblem; import org.eclipse.dltk.compiler.problem.IProblemReporter; @@ -48,10 +49,10 @@ public class ExampleActionIDEExtension i return false; } boolean ok = true; - List<Expression> childs = a.getChilds(); - for (Expression expression : childs) { - if (expression.getKind() != RutaTypeConstants.RUTA_TYPE_N) { - IProblem problem = problemFactory.createWrongArgumentTypeProblem(expression, + List<ASTNode> childs = a.getChilds(); + for (ASTNode each : childs) { + if (each instanceof Expression && ((Expression)each).getKind() != RutaTypeConstants.RUTA_TYPE_N) { + IProblem problem = problemFactory.createWrongArgumentTypeProblem((Expression) each, "NumberExpression"); rep.reportProblem(problem); ok = false; Modified: uima/ruta/branches/UIMA-4798/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/ruta/example/extensions/ExampleBooleanFunctionIDEExtension.java URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4798/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/ruta/example/extensions/ExampleBooleanFunctionIDEExtension.java?rev=1730700&r1=1730699&r2=1730700&view=diff ============================================================================== --- uima/ruta/branches/UIMA-4798/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/ruta/example/extensions/ExampleBooleanFunctionIDEExtension.java (original) +++ uima/ruta/branches/UIMA-4798/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/ruta/example/extensions/ExampleBooleanFunctionIDEExtension.java Tue Feb 16 15:27:24 2016 @@ -26,6 +26,7 @@ import org.apache.uima.ruta.ide.core.ext import org.apache.uima.ruta.ide.core.extensions.IRutaCheckerProblemFactory; import org.apache.uima.ruta.ide.parser.ast.RutaFunction; import org.apache.uima.ruta.ide.parser.ast.RutaTypeConstants; +import org.eclipse.dltk.ast.ASTNode; import org.eclipse.dltk.ast.expressions.Expression; import org.eclipse.dltk.compiler.problem.IProblem; import org.eclipse.dltk.compiler.problem.IProblemReporter; @@ -48,15 +49,15 @@ public class ExampleBooleanFunctionIDEEx return false; } boolean ok = true; - List<Expression> childs = f.getChilds(); + List<ASTNode> childs = f.getChilds(); if (childs.size() != 1) { IProblem problem = problemFactory.createWrongNumberOfArgumentsProblem(name, element, 1); rep.reportProblem(problem); ok = false; } - Expression expr = childs.get(0); - if (expr.getKind() != RutaTypeConstants.RUTA_TYPE_AT) { - IProblem problem = problemFactory.createWrongArgumentTypeProblem(expr, "TypeExpression"); + ASTNode expr = childs.get(0); + if (expr instanceof Expression && ((Expression)expr).getKind() != RutaTypeConstants.RUTA_TYPE_AT) { + IProblem problem = problemFactory.createWrongArgumentTypeProblem((Expression) expr, "TypeExpression"); rep.reportProblem(problem); ok = false; } Modified: uima/ruta/branches/UIMA-4798/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/ruta/example/extensions/ExampleConditionIDEExtension.java URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4798/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/ruta/example/extensions/ExampleConditionIDEExtension.java?rev=1730700&r1=1730699&r2=1730700&view=diff ============================================================================== --- uima/ruta/branches/UIMA-4798/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/ruta/example/extensions/ExampleConditionIDEExtension.java (original) +++ uima/ruta/branches/UIMA-4798/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/ruta/example/extensions/ExampleConditionIDEExtension.java Tue Feb 16 15:27:24 2016 @@ -26,6 +26,7 @@ import org.apache.uima.ruta.ide.core.ext import org.apache.uima.ruta.ide.core.extensions.IRutaCheckerProblemFactory; import org.apache.uima.ruta.ide.parser.ast.RutaCondition; import org.apache.uima.ruta.ide.parser.ast.RutaTypeConstants; +import org.eclipse.dltk.ast.ASTNode; import org.eclipse.dltk.ast.expressions.Expression; import org.eclipse.dltk.compiler.problem.IProblem; import org.eclipse.dltk.compiler.problem.IProblemReporter; @@ -48,15 +49,15 @@ public class ExampleConditionIDEExtensio return false; } boolean ok = true; - List<Expression> childs = a.getChilds(); + List<ASTNode> childs = a.getChilds(); if (childs.size() != 2) { IProblem problem = problemFactory.createWrongNumberOfArgumentsProblem(name, element, 2); rep.reportProblem(problem); ok = false; } - for (Expression expression : childs) { - if (expression.getKind() != RutaTypeConstants.RUTA_TYPE_S) { - IProblem problem = problemFactory.createWrongArgumentTypeProblem(expression, + for (ASTNode expression : childs) { + if (expression instanceof Expression && ((Expression)expression).getKind() != RutaTypeConstants.RUTA_TYPE_S) { + IProblem problem = problemFactory.createWrongArgumentTypeProblem((Expression) expression, "StringExpression"); rep.reportProblem(problem); ok = false; Modified: uima/ruta/branches/UIMA-4798/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/ruta/example/extensions/ExampleNumberFunctionIDEExtension.java URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4798/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/ruta/example/extensions/ExampleNumberFunctionIDEExtension.java?rev=1730700&r1=1730699&r2=1730700&view=diff ============================================================================== --- uima/ruta/branches/UIMA-4798/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/ruta/example/extensions/ExampleNumberFunctionIDEExtension.java (original) +++ uima/ruta/branches/UIMA-4798/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/ruta/example/extensions/ExampleNumberFunctionIDEExtension.java Tue Feb 16 15:27:24 2016 @@ -26,6 +26,7 @@ import org.apache.uima.ruta.ide.core.ext import org.apache.uima.ruta.ide.core.extensions.IRutaCheckerProblemFactory; import org.apache.uima.ruta.ide.parser.ast.RutaFunction; import org.apache.uima.ruta.ide.parser.ast.RutaTypeConstants; +import org.eclipse.dltk.ast.ASTNode; import org.eclipse.dltk.ast.expressions.Expression; import org.eclipse.dltk.compiler.problem.IProblem; import org.eclipse.dltk.compiler.problem.IProblemReporter; @@ -48,15 +49,15 @@ public class ExampleNumberFunctionIDEExt return false; } boolean ok = true; - List<Expression> childs = f.getChilds(); + List<ASTNode> childs = f.getChilds(); if (childs.size() != 1) { IProblem problem = problemFactory.createWrongNumberOfArgumentsProblem(name, element, 1); rep.reportProblem(problem); ok = false; } - Expression expr = childs.get(0); - if (expr.getKind() != RutaTypeConstants.RUTA_TYPE_AT) { - IProblem problem = problemFactory.createWrongArgumentTypeProblem(expr, "TypeExpression"); + ASTNode expr = childs.get(0); + if (expr instanceof Expression && ((Expression)expr).getKind() != RutaTypeConstants.RUTA_TYPE_AT) { + IProblem problem = problemFactory.createWrongArgumentTypeProblem((Expression) expr, "TypeExpression"); rep.reportProblem(problem); ok = false; } Modified: uima/ruta/branches/UIMA-4798/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/ruta/example/extensions/ExampleStringFunctionIDEExtension.java URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4798/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/ruta/example/extensions/ExampleStringFunctionIDEExtension.java?rev=1730700&r1=1730699&r2=1730700&view=diff ============================================================================== --- uima/ruta/branches/UIMA-4798/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/ruta/example/extensions/ExampleStringFunctionIDEExtension.java (original) +++ uima/ruta/branches/UIMA-4798/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/ruta/example/extensions/ExampleStringFunctionIDEExtension.java Tue Feb 16 15:27:24 2016 @@ -26,6 +26,7 @@ import org.apache.uima.ruta.ide.core.ext import org.apache.uima.ruta.ide.core.extensions.IRutaCheckerProblemFactory; import org.apache.uima.ruta.ide.parser.ast.RutaFunction; import org.apache.uima.ruta.ide.parser.ast.RutaTypeConstants; +import org.eclipse.dltk.ast.ASTNode; import org.eclipse.dltk.ast.expressions.Expression; import org.eclipse.dltk.compiler.problem.IProblem; import org.eclipse.dltk.compiler.problem.IProblemReporter; @@ -48,15 +49,15 @@ public class ExampleStringFunctionIDEExt return false; } boolean ok = true; - List<Expression> childs = f.getChilds(); + List<ASTNode> childs = f.getChilds(); if (childs.size() != 1) { IProblem problem = problemFactory.createWrongNumberOfArgumentsProblem(name, element, 1); rep.reportProblem(problem); ok = false; } - Expression expr = childs.get(0); - if (expr.getKind() != RutaTypeConstants.RUTA_TYPE_AT) { - IProblem problem = problemFactory.createWrongArgumentTypeProblem(expr, "TypeExpression"); + ASTNode expr = childs.get(0); + if (expr instanceof Expression && ((Expression)expr).getKind() != RutaTypeConstants.RUTA_TYPE_AT) { + IProblem problem = problemFactory.createWrongArgumentTypeProblem((Expression) expr, "TypeExpression"); rep.reportProblem(problem); ok = false; } Modified: uima/ruta/branches/UIMA-4798/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/ruta/example/extensions/ExampleTypeFunctionIDEExtension.java URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4798/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/ruta/example/extensions/ExampleTypeFunctionIDEExtension.java?rev=1730700&r1=1730699&r2=1730700&view=diff ============================================================================== --- uima/ruta/branches/UIMA-4798/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/ruta/example/extensions/ExampleTypeFunctionIDEExtension.java (original) +++ uima/ruta/branches/UIMA-4798/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/ruta/example/extensions/ExampleTypeFunctionIDEExtension.java Tue Feb 16 15:27:24 2016 @@ -26,6 +26,7 @@ import org.apache.uima.ruta.ide.core.ext import org.apache.uima.ruta.ide.core.extensions.IRutaCheckerProblemFactory; import org.apache.uima.ruta.ide.parser.ast.RutaFunction; import org.apache.uima.ruta.ide.parser.ast.RutaTypeConstants; +import org.eclipse.dltk.ast.ASTNode; import org.eclipse.dltk.ast.expressions.Expression; import org.eclipse.dltk.compiler.problem.IProblem; import org.eclipse.dltk.compiler.problem.IProblemReporter; @@ -48,15 +49,15 @@ public class ExampleTypeFunctionIDEExten return false; } boolean ok = true; - List<Expression> childs = f.getChilds(); + List<ASTNode> childs = f.getChilds(); if (childs.size() != 1) { IProblem problem = problemFactory.createWrongNumberOfArgumentsProblem(name, element, 1); rep.reportProblem(problem); ok = false; } - Expression expr = childs.get(0); - if (expr.getKind() != RutaTypeConstants.RUTA_TYPE_S) { - IProblem problem = problemFactory.createWrongArgumentTypeProblem(expr, "NumberExpression"); + ASTNode expr = childs.get(0); + if (expr instanceof Expression && ((Expression)expr).getKind() != RutaTypeConstants.RUTA_TYPE_S) { + IProblem problem = problemFactory.createWrongArgumentTypeProblem((Expression) expr, "NumberExpression"); rep.reportProblem(problem); ok = false; } Modified: uima/ruta/branches/UIMA-4798/ruta-ep-addons/pom.xml URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4798/ruta-ep-addons/pom.xml?rev=1730700&r1=1730699&r2=1730700&view=diff ============================================================================== --- uima/ruta/branches/UIMA-4798/ruta-ep-addons/pom.xml (original) +++ uima/ruta/branches/UIMA-4798/ruta-ep-addons/pom.xml Tue Feb 16 15:27:24 2016 @@ -22,9 +22,9 @@ <artifactId>ruta-ep-addons</artifactId> <parent> <groupId>org.apache.uima</groupId> - <artifactId>ruta-parent</artifactId> + <artifactId>ruta-ep-parent</artifactId> <version>2.4.1-SNAPSHOT</version> - <relativePath>../ruta-parent/pom.xml</relativePath> + <relativePath>../ruta-ep-parent/pom.xml</relativePath> </parent> <properties> <uimaScmProject>${project.artifactId}</uimaScmProject> @@ -112,33 +112,13 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.eclipse.dltk</groupId> - <artifactId>core</artifactId> - <version>[3.0.1,5.0.0)</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.eclipse.dltk</groupId> - <artifactId>ui</artifactId> - <version>[3.0.1,5.0.0)</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.eclipse.dltk</groupId> - <artifactId>debug</artifactId> - <version>[3.0.1,5.0.0)</version> - <scope>provided</scope> - </dependency> - <dependency> <groupId>org.eclipse.emf</groupId> <artifactId>ecore</artifactId> - <version>[2.7.0,3.0.0)</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.eclipse.emf.ecore</groupId> <artifactId>xmi</artifactId> - <version>[2.7.0,3.0.0)</version> <scope>provided</scope> </dependency> <dependency> Modified: uima/ruta/branches/UIMA-4798/ruta-ep-caseditor/pom.xml URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4798/ruta-ep-caseditor/pom.xml?rev=1730700&r1=1730699&r2=1730700&view=diff ============================================================================== --- uima/ruta/branches/UIMA-4798/ruta-ep-caseditor/pom.xml (original) +++ uima/ruta/branches/UIMA-4798/ruta-ep-caseditor/pom.xml Tue Feb 16 15:27:24 2016 @@ -22,9 +22,9 @@ <artifactId>ruta-ep-caseditor</artifactId> <parent> <groupId>org.apache.uima</groupId> - <artifactId>ruta-parent</artifactId> + <artifactId>ruta-ep-parent</artifactId> <version>2.4.1-SNAPSHOT</version> - <relativePath>../ruta-parent/pom.xml</relativePath> + <relativePath>../ruta-ep-parent/pom.xml</relativePath> </parent> <properties> <uimaScmProject>${project.artifactId}</uimaScmProject> Modified: uima/ruta/branches/UIMA-4798/ruta-ep-core-ext/pom.xml URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4798/ruta-ep-core-ext/pom.xml?rev=1730700&r1=1730699&r2=1730700&view=diff ============================================================================== --- uima/ruta/branches/UIMA-4798/ruta-ep-core-ext/pom.xml (original) +++ uima/ruta/branches/UIMA-4798/ruta-ep-core-ext/pom.xml Tue Feb 16 15:27:24 2016 @@ -24,9 +24,9 @@ <name>Apache UIMA Ruta Eclipse: ${project.artifactId}</name> <parent> <groupId>org.apache.uima</groupId> - <artifactId>ruta-parent</artifactId> + <artifactId>ruta-ep-parent</artifactId> <version>2.4.1-SNAPSHOT</version> - <relativePath>../ruta-parent/pom.xml</relativePath> + <relativePath>../ruta-ep-parent/pom.xml</relativePath> </parent> <properties> <postNoticeText /> @@ -61,12 +61,6 @@ <artifactId>ruta-ep-ide-ui</artifactId> <version>${project.parent.version}</version> </dependency> - <dependency> - <groupId>org.eclipse.dltk</groupId> - <artifactId>core</artifactId> - <version>[3.0.1,5.0.0)</version> - <scope>provided</scope> - </dependency> <dependency> <groupId>org.antlr</groupId> <artifactId>antlr-runtime</artifactId> Modified: uima/ruta/branches/UIMA-4798/ruta-ep-core-ext/src/main/java/org/apache/uima/ruta/string/BooleanOperationsIDEExtension.java URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4798/ruta-ep-core-ext/src/main/java/org/apache/uima/ruta/string/BooleanOperationsIDEExtension.java?rev=1730700&r1=1730699&r2=1730700&view=diff ============================================================================== --- uima/ruta/branches/UIMA-4798/ruta-ep-core-ext/src/main/java/org/apache/uima/ruta/string/BooleanOperationsIDEExtension.java (original) +++ uima/ruta/branches/UIMA-4798/ruta-ep-core-ext/src/main/java/org/apache/uima/ruta/string/BooleanOperationsIDEExtension.java Tue Feb 16 15:27:24 2016 @@ -28,6 +28,7 @@ import org.apache.uima.ruta.ide.core.ext import org.apache.uima.ruta.ide.parser.ast.RutaFunction; import org.apache.uima.ruta.ide.parser.ast.RutaTypeConstants; import org.apache.uima.ruta.string.bool.BooleanOperationsExtension; +import org.eclipse.dltk.ast.ASTNode; import org.eclipse.dltk.ast.expressions.Expression; import org.eclipse.dltk.compiler.problem.IProblem; import org.eclipse.dltk.compiler.problem.IProblemReporter; @@ -46,13 +47,13 @@ public class BooleanOperationsIDEExtensi RutaFunction f = (RutaFunction) element; String name = f.getName(); boolean ok = true; - List<Expression> childs = f.getChilds(); + List<ASTNode> childs = f.getChilds(); if (childs.size() < 1) { IProblem problem = problemFactory.createWrongNumberOfArgumentsProblem(name, element, 1); rep.reportProblem(problem); ok = false; } - Expression expr = childs.get(0); + Expression expr = (Expression) childs.get(0); if (expr.getKind() != RutaTypeConstants.RUTA_TYPE_S) { IProblem problem = problemFactory.createWrongArgumentTypeProblem(expr, "TypeExpression"); rep.reportProblem(problem); Modified: uima/ruta/branches/UIMA-4798/ruta-ep-core-ext/src/main/java/org/apache/uima/ruta/string/StringOperationsIDEExtension.java URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4798/ruta-ep-core-ext/src/main/java/org/apache/uima/ruta/string/StringOperationsIDEExtension.java?rev=1730700&r1=1730699&r2=1730700&view=diff ============================================================================== --- uima/ruta/branches/UIMA-4798/ruta-ep-core-ext/src/main/java/org/apache/uima/ruta/string/StringOperationsIDEExtension.java (original) +++ uima/ruta/branches/UIMA-4798/ruta-ep-core-ext/src/main/java/org/apache/uima/ruta/string/StringOperationsIDEExtension.java Tue Feb 16 15:27:24 2016 @@ -26,6 +26,7 @@ import org.apache.uima.ruta.ide.core.ext import org.apache.uima.ruta.ide.core.extensions.IRutaCheckerProblemFactory; import org.apache.uima.ruta.ide.parser.ast.RutaFunction; import org.apache.uima.ruta.ide.parser.ast.RutaTypeConstants; +import org.eclipse.dltk.ast.ASTNode; import org.eclipse.dltk.ast.expressions.Expression; import org.eclipse.dltk.compiler.problem.IProblem; import org.eclipse.dltk.compiler.problem.IProblemReporter; @@ -50,13 +51,13 @@ public class StringOperationsIDEExtensio return false; } boolean ok = true; - List<Expression> childs = f.getChilds(); + List<ASTNode> childs = f.getChilds(); if (childs.size() != 1) { IProblem problem = problemFactory.createWrongNumberOfArgumentsProblem(name, element, 1); rep.reportProblem(problem); ok = false; } - Expression expr = childs.get(0); + Expression expr = (Expression) childs.get(0); if (expr.getKind() != RutaTypeConstants.RUTA_TYPE_AT) { IProblem problem = problemFactory.createWrongArgumentTypeProblem(expr, "TypeExpression"); rep.reportProblem(problem); Modified: uima/ruta/branches/UIMA-4798/ruta-ep-ide-ui/pom.xml URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4798/ruta-ep-ide-ui/pom.xml?rev=1730700&r1=1730699&r2=1730700&view=diff ============================================================================== --- uima/ruta/branches/UIMA-4798/ruta-ep-ide-ui/pom.xml (original) +++ uima/ruta/branches/UIMA-4798/ruta-ep-ide-ui/pom.xml Tue Feb 16 15:27:24 2016 @@ -23,9 +23,9 @@ <artifactId>ruta-ep-ide-ui</artifactId> <parent> <groupId>org.apache.uima</groupId> - <artifactId>ruta-parent</artifactId> + <artifactId>ruta-ep-parent</artifactId> <version>2.4.1-SNAPSHOT</version> - <relativePath>../ruta-parent/pom.xml</relativePath> + <relativePath>../ruta-ep-parent/pom.xml</relativePath> </parent> <properties> <uimaScmProject>${project.artifactId}</uimaScmProject> @@ -36,68 +36,44 @@ <dependencies> <dependency> <groupId>org.eclipse.dltk</groupId> - <artifactId>core</artifactId> - <version>[3.0.1,5.0.0)</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.eclipse.dltk</groupId> <artifactId>ui</artifactId> - <version>[3.0.1,5.0.0)</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.eclipse.dltk</groupId> - <artifactId>launching</artifactId> - <version>[3.0.0,5.0.0)</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.eclipse.dltk.validators</groupId> - <artifactId>core</artifactId> - <version>[3.0.0,5.0.0)</version> + <version>${dltk.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.eclipse.dltk.validators</groupId> <artifactId>ui</artifactId> - <version>[3.0.0,5.0.0)</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.eclipse.dltk</groupId> - <artifactId>console</artifactId> - <version>[3.0.0,5.0.0)</version> + <version>${dltk.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.eclipse.dltk.console</groupId> <artifactId>ui</artifactId> - <version>[3.0.0,5.0.0)</version> + <version>${dltk.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.eclipse.dltk</groupId> <artifactId>debug</artifactId> - <version>[3.0.1,5.0.0)</version> + <version>${dltk.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.eclipse.dltk.debug</groupId> <artifactId>ui</artifactId> - <version>[3.0.0,5.0.0)</version> + <version>${dltk.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.eclipse.dltk</groupId> <artifactId>formatter</artifactId> - <version>[3.0.0,5.0.0)</version> + <version>${dltk.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.eclipse.dltk</groupId> <artifactId>testing</artifactId> - <version>[3.0.0,5.0.0)</version> + <version>${dltk.version}</version> <scope>provided</scope> </dependency> <dependency> Modified: uima/ruta/branches/UIMA-4798/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/formatter/RutaFormattedPrinter.java URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4798/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/formatter/RutaFormattedPrinter.java?rev=1730700&r1=1730699&r2=1730700&view=diff ============================================================================== --- uima/ruta/branches/UIMA-4798/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/formatter/RutaFormattedPrinter.java (original) +++ uima/ruta/branches/UIMA-4798/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/formatter/RutaFormattedPrinter.java Tue Feb 16 15:27:24 2016 @@ -529,7 +529,7 @@ public class RutaFormattedPrinter extend append(COMMA); append(" "); // number expressions - List<Expression> indices = tmca.getExpressions(); + List<ASTNode> indices = tmca.getExpressions(); if (indices != null) { traverseAstNodes(indices); if (!indices.isEmpty()) { @@ -594,7 +594,7 @@ public class RutaFormattedPrinter extend append(COMMA); append(" "); // number expressions - List<Expression> indices = tmca.getExpressions(); + List<ASTNode> indices = tmca.getExpressions(); if (indices != null) { traverseAstNodes(indices); } Modified: uima/ruta/branches/UIMA-4798/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/console/RutaFileHyperlink.java URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4798/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/console/RutaFileHyperlink.java?rev=1730700&r1=1730699&r2=1730700&view=diff ============================================================================== --- uima/ruta/branches/UIMA-4798/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/console/RutaFileHyperlink.java (original) +++ uima/ruta/branches/UIMA-4798/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/console/RutaFileHyperlink.java Tue Feb 16 15:27:24 2016 @@ -124,12 +124,7 @@ public class RutaFileHyperlink implement } public IEditorInput getEditorInput(Object item) { - try { - return EditorUtility.getEditorInput(item); - } catch (CoreException e) { - DLTKDebugUIPlugin.log(e); - return null; - } + return EditorUtility.getEditorInput(item); } protected Object getSourceModule(String fileName) { Modified: uima/ruta/branches/UIMA-4798/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/editor/ReferenceFinder.java URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4798/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/editor/ReferenceFinder.java?rev=1730700&r1=1730699&r2=1730700&view=diff ============================================================================== --- uima/ruta/branches/UIMA-4798/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/editor/ReferenceFinder.java (original) +++ uima/ruta/branches/UIMA-4798/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/editor/ReferenceFinder.java Tue Feb 16 15:27:24 2016 @@ -48,7 +48,7 @@ public class ReferenceFinder extends AST if (node instanceof RutaAction) { RutaAction a = (RutaAction) node; if (ActionFactory.IMPLICIT.equals(a.getName()) && !a.getChilds().isEmpty()) { - Expression expression = a.getChilds().get(0); + ASTNode expression = a.getChilds().get(0); if (expression != null && !expression.getChilds().isEmpty()) { return (ASTNode) expression.getChilds().get(0); } @@ -57,7 +57,7 @@ public class ReferenceFinder extends AST if (node instanceof RutaCondition) { RutaCondition c = (RutaCondition) node; if (ConditionFactory.IMPLICIT.equals(c.getName()) && !c.getChilds().isEmpty()) { - Expression expression = c.getChilds().get(0); + ASTNode expression = c.getChilds().get(0); if (expression != null && !expression.getChilds().isEmpty()) { return (ASTNode) expression.getChilds().get(0); } Modified: uima/ruta/branches/UIMA-4798/ruta-ep-ide/pom.xml URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4798/ruta-ep-ide/pom.xml?rev=1730700&r1=1730699&r2=1730700&view=diff ============================================================================== --- uima/ruta/branches/UIMA-4798/ruta-ep-ide/pom.xml (original) +++ uima/ruta/branches/UIMA-4798/ruta-ep-ide/pom.xml Tue Feb 16 15:27:24 2016 @@ -21,11 +21,11 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <artifactId>ruta-ep-ide</artifactId> - <parent> + <parent> <groupId>org.apache.uima</groupId> - <artifactId>ruta-parent</artifactId> + <artifactId>ruta-ep-parent</artifactId> <version>2.4.1-SNAPSHOT</version> - <relativePath>../ruta-parent/pom.xml</relativePath> + <relativePath>../ruta-ep-parent/pom.xml</relativePath> </parent> <properties> <uimaScmProject>${project.artifactId}</uimaScmProject> @@ -36,24 +36,6 @@ <description>Provides the UIMA Ruta development environment for Eclipse</description> <dependencies> <dependency> - <groupId>org.eclipse.dltk</groupId> - <artifactId>core</artifactId> - <version>[3.0.1,5.0.0)</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.eclipse.dltk</groupId> - <artifactId>launching</artifactId> - <version>[3.0.0,5.0.0)</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.eclipse.dltk.validators</groupId> - <artifactId>core</artifactId> - <version>[3.0.0,5.0.0)</version> - <scope>provided</scope> - </dependency> - <dependency> <groupId>org.eclipse.core</groupId> <artifactId>runtime</artifactId> <version>[3.3.0,5.0.0)</version> Modified: uima/ruta/branches/UIMA-4798/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ActionFactory.java URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4798/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ActionFactory.java?rev=1730700&r1=1730699&r2=1730700&view=diff ============================================================================== --- uima/ruta/branches/UIMA-4798/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ActionFactory.java (original) +++ uima/ruta/branches/UIMA-4798/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ActionFactory.java Tue Feb 16 15:27:24 2016 @@ -26,6 +26,7 @@ import java.util.List; import java.util.Map; import org.antlr.runtime.Token; +import org.eclipse.dltk.ast.ASTNode; import org.eclipse.dltk.ast.expressions.Expression; import org.eclipse.dltk.ast.expressions.ExpressionConstants; @@ -33,11 +34,11 @@ public class ActionFactory extends Abstr public static final String IMPLICIT = "Implicit"; - public static RutaAction createAction(Token type, List exprsRaw) { + public static RutaAction createAction(Token type, List<Expression> exprsRaw) { int bounds[] = getBounds(type); int nameStart = bounds[0]; int nameEnd = bounds[1]; - List<Expression> exprs = new ArrayList<Expression>(); + List<ASTNode> exprs = new ArrayList<>(); if (exprsRaw != null) { for (Object expressionObj : exprsRaw) { Expression expr = (Expression) expressionObj; @@ -69,7 +70,7 @@ public class ActionFactory extends Abstr public static RutaAction createEmptyAction(Token token) { int bounds[] = getBounds(token); - return new RutaAction(bounds[0], bounds[1], new ArrayList<Expression>(), + return new RutaAction(bounds[0], bounds[1], new ArrayList<ASTNode>(), RutaConditionConstants.CONSTANT_OFFSET, "", bounds[0], bounds[1]); } @@ -110,7 +111,7 @@ public class ActionFactory extends Abstr * @param bounds * @param exprs */ - private static void filterNullObjsAndSetBounds(List left, int[] bounds, List<Expression> exprs) { + private static void filterNullObjsAndSetBounds(List left, int[] bounds, List<ASTNode> exprs) { if (left != null) { for (Object expressionObj : left) { Expression expr = (Expression) expressionObj; @@ -119,7 +120,7 @@ public class ActionFactory extends Abstr } } if (!exprs.isEmpty()) { - Expression lastExpr = exprs.get(exprs.size() - 1); + ASTNode lastExpr = exprs.get(exprs.size() - 1); bounds[1] = Math.max(bounds[1], lastExpr.sourceEnd()); } } @@ -149,7 +150,7 @@ public class ActionFactory extends Abstr int bounds[] = getBounds(type); int nameStart = bounds[0]; int nameEnd = bounds[1]; - List<Expression> numExprs = new ArrayList<Expression>(); + List<ASTNode> numExprs = new ArrayList<>(); Map<Expression, Expression> assignments = new LinkedHashMap<Expression, Expression>(); List<Expression> indexes = new ArrayList<Expression>(); indexes.add(table); @@ -211,7 +212,7 @@ public class ActionFactory extends Abstr int bounds[] = getBounds(name); int nameStart = bounds[0]; int nameEnd = bounds[1]; - List<Expression> numExprs = new ArrayList<Expression>(); + List<ASTNode> numExprs = new ArrayList<>(); Map<Expression, Expression> assignments = new LinkedHashMap<Expression, Expression>(); filterNullObjsAndSetBounds(args, bounds, numExprs); if (left != null && right != null) { @@ -236,7 +237,7 @@ public class ActionFactory extends Abstr } public static RutaAction createAction(Expression... exprsArray) { - List<Expression> exprL = new ArrayList<Expression>(); + List<ASTNode> exprL = new ArrayList<>(); if (exprsArray != null) { for (int i = 0; i < exprsArray.length; i++) { Expression expression = exprsArray[i]; Modified: uima/ruta/branches/UIMA-4798/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ConditionFactory.java URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4798/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ConditionFactory.java?rev=1730700&r1=1730699&r2=1730700&view=diff ============================================================================== --- uima/ruta/branches/UIMA-4798/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ConditionFactory.java (original) +++ uima/ruta/branches/UIMA-4798/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ConditionFactory.java Tue Feb 16 15:27:24 2016 @@ -23,6 +23,7 @@ import java.util.ArrayList; import java.util.List; import org.antlr.runtime.Token; +import org.eclipse.dltk.ast.ASTNode; import org.eclipse.dltk.ast.expressions.Expression; public class ConditionFactory extends AbstractFactory { @@ -47,11 +48,11 @@ public class ConditionFactory extends Ab nameEnd); } - public static RutaCondition createCondition(Expression... exprsArray) { - List<Expression> exprL = new ArrayList<Expression>(); + public static RutaCondition createCondition(ASTNode... exprsArray) { + List<ASTNode> exprL = new ArrayList<ASTNode>(); if (exprsArray != null) { for (int i = 0; i < exprsArray.length; i++) { - Expression expression = exprsArray[i]; + ASTNode expression = exprsArray[i]; if (expression != null) { exprL.add(expression); } @@ -80,7 +81,7 @@ public class ConditionFactory extends Ab return null; } int bounds[] = getBounds(token); - return new RutaCondition(bounds[0], bounds[1], new ArrayList<Expression>(), + return new RutaCondition(bounds[0], bounds[1], new ArrayList<ASTNode>(), RutaConditionConstants.CONSTANT_OFFSET, "", bounds[0], bounds[1]); } Modified: uima/ruta/branches/UIMA-4798/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ExpressionFactory.java URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4798/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ExpressionFactory.java?rev=1730700&r1=1730699&r2=1730700&view=diff ============================================================================== --- uima/ruta/branches/UIMA-4798/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ExpressionFactory.java (original) +++ uima/ruta/branches/UIMA-4798/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ExpressionFactory.java Tue Feb 16 15:27:24 2016 @@ -25,6 +25,7 @@ import java.util.List; import org.antlr.runtime.CommonToken; import org.antlr.runtime.Token; import org.apache.uima.ruta.parser.RutaLexer; +import org.eclipse.dltk.ast.ASTNode; import org.eclipse.dltk.ast.expressions.BooleanLiteral; import org.eclipse.dltk.ast.expressions.Expression; import org.eclipse.dltk.ast.expressions.ExpressionConstants; @@ -152,16 +153,17 @@ public class ExpressionFactory extends A // =====> STRING-EXPRESSIONS <====== public static RutaStringExpression createStringExpression(List<Expression> exprList) { - if (exprList == null) { - exprList = new ArrayList<Expression>(); - } + List<ASTNode> l = new ArrayList<>(); int start = 0; int end = 0; - if (!exprList.isEmpty()) { - start = exprList.get(0).sourceStart(); - end = exprList.get(exprList.size() - 1).sourceEnd(); + if (exprList != null) { + l.addAll(exprList); + if (!exprList.isEmpty()) { + start = exprList.get(0).sourceStart(); + end = exprList.get(exprList.size() - 1).sourceEnd(); + } } - return new RutaStringExpression(start, end, exprList); + return new RutaStringExpression(start, end, l); } public static StringLiteral createSimpleString(Token stringToken) { @@ -319,21 +321,22 @@ public class ExpressionFactory extends A } public static Expression createListExpression(List<Expression> exprList, int type) { - if (exprList == null) { - exprList = new ArrayList<Expression>(); - } + List<ASTNode> l = new ArrayList<>(); int start = 0; int end = 0; - if (!exprList.isEmpty()) { - start = exprList.get(0).sourceStart(); - Expression expression = exprList.get(exprList.size() - 1); - if (expression != null) { - end = expression.sourceEnd(); - } else { - exprList.get(0).sourceEnd(); + if (exprList != null) { + l.addAll(exprList); + if (!exprList.isEmpty()) { + start = exprList.get(0).sourceStart(); + Expression expression = exprList.get(exprList.size() - 1); + if (expression != null) { + end = expression.sourceEnd(); + } else { + end = exprList.get(0).sourceEnd(); + } } } - return new RutaListExpression(start, end, exprList, type); + return new RutaListExpression(start, end, l, type); } public static Expression createListExpression(Token var, int type) { @@ -374,7 +377,7 @@ public class ExpressionFactory extends A int bounds[] = getBounds(type); int nameStart = bounds[0]; int nameEnd = bounds[1]; - List<Expression> exprs = new ArrayList<Expression>(); + List<ASTNode> exprs = new ArrayList<>(); if (exprsRaw != null) { for (Object expressionObj : exprsRaw) { Expression expr = (Expression) expressionObj; @@ -399,6 +402,7 @@ public class ExpressionFactory extends A list.add(fe); return createStringExpression(list); } + public static Expression createNullExpression(Token t) { int bounds[] = getBounds(t); return new NullExpression(bounds[0], bounds[1]); Modified: uima/ruta/branches/UIMA-4798/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaAction.java URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4798/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaAction.java?rev=1730700&r1=1730699&r2=1730700&view=diff ============================================================================== --- uima/ruta/branches/UIMA-4798/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaAction.java (original) +++ uima/ruta/branches/UIMA-4798/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaAction.java Tue Feb 16 15:27:24 2016 @@ -22,11 +22,12 @@ package org.apache.uima.ruta.ide.parser. import java.util.ArrayList; import java.util.List; +import org.eclipse.dltk.ast.ASTNode; import org.eclipse.dltk.ast.ASTVisitor; import org.eclipse.dltk.ast.expressions.Expression; public class RutaAction extends Expression { - protected List<Expression> exprs; + protected List<ASTNode> exprs; protected int kind; @@ -50,13 +51,13 @@ public class RutaAction extends Expressi * @param exprs * @param kind */ - public RutaAction(int start, int end, List<Expression> exprs, int kind, String name, + public RutaAction(int start, int end, List<ASTNode> exprs, int kind, String name, int nameStart, int nameEnd) { super(start, end); if (exprs != null) { this.exprs = exprs; } else { - this.exprs = new ArrayList<Expression>(); + this.exprs = new ArrayList<ASTNode>(); } this.kind = kind; this.name = name; @@ -87,7 +88,7 @@ public class RutaAction extends Expressi @Override public void traverse(ASTVisitor visitor) throws Exception { if (visitor.visit(this)) { - for (Expression expr : exprs) { + for (ASTNode expr : exprs) { if (expr != null) { expr.traverse(visitor); } @@ -98,7 +99,7 @@ public class RutaAction extends Expressi } @Override - public List<Expression> getChilds() { + public List<ASTNode> getChilds() { return exprs; } Modified: uima/ruta/branches/UIMA-4798/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaCondition.java URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4798/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaCondition.java?rev=1730700&r1=1730699&r2=1730700&view=diff ============================================================================== --- uima/ruta/branches/UIMA-4798/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaCondition.java (original) +++ uima/ruta/branches/UIMA-4798/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaCondition.java Tue Feb 16 15:27:24 2016 @@ -23,11 +23,12 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import org.eclipse.dltk.ast.ASTNode; import org.eclipse.dltk.ast.ASTVisitor; import org.eclipse.dltk.ast.expressions.Expression; public class RutaCondition extends Expression { - protected List<Expression> exprs; + protected List<ASTNode> exprs; protected int kind; @@ -43,13 +44,13 @@ public class RutaCondition extends Expre * @param exprs * @param kind */ - public RutaCondition(int start, int end, List<Expression> exprs, int kind, String name, + public RutaCondition(int start, int end, List<ASTNode> exprs, int kind, String name, int nameStart, int nameEnd) { super(start, end); if (exprs != null) { this.exprs = exprs; } else { - this.exprs = new ArrayList<Expression>(); + this.exprs = new ArrayList<ASTNode>(); } this.kind = kind; this.name = name; @@ -65,8 +66,8 @@ public class RutaCondition extends Expre @Override public void traverse(ASTVisitor visitor) throws Exception { if (visitor.visit(this)) { - for (Iterator<Expression> iterator = exprs.iterator(); iterator.hasNext();) { - Expression expr = iterator.next(); + for (Iterator<ASTNode> iterator = exprs.iterator(); iterator.hasNext();) { + ASTNode expr = iterator.next(); if (expr != null) { expr.traverse(visitor); } @@ -76,7 +77,7 @@ public class RutaCondition extends Expre } @Override - public List<Expression> getChilds() { + public List<ASTNode> getChilds() { return exprs; } Modified: uima/ruta/branches/UIMA-4798/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaFunction.java URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4798/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaFunction.java?rev=1730700&r1=1730699&r2=1730700&view=diff ============================================================================== --- uima/ruta/branches/UIMA-4798/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaFunction.java (original) +++ uima/ruta/branches/UIMA-4798/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaFunction.java Tue Feb 16 15:27:24 2016 @@ -22,11 +22,12 @@ package org.apache.uima.ruta.ide.parser. import java.util.ArrayList; import java.util.List; +import org.eclipse.dltk.ast.ASTNode; import org.eclipse.dltk.ast.ASTVisitor; import org.eclipse.dltk.ast.expressions.Expression; public class RutaFunction extends Expression { - protected List<Expression> exprs; + protected List<ASTNode> exprs; protected int kind; @@ -42,13 +43,13 @@ public class RutaFunction extends Expres * @param exprs * @param kind */ - public RutaFunction(int start, int end, List<Expression> exprs, int kind, String name, + public RutaFunction(int start, int end, List<ASTNode> exprs, int kind, String name, int nameStart, int nameEnd) { super(start, end); if (exprs != null) { this.exprs = exprs; } else { - this.exprs = new ArrayList<Expression>(); + this.exprs = new ArrayList<ASTNode>(); } this.kind = kind; this.name = name; @@ -79,7 +80,7 @@ public class RutaFunction extends Expres @Override public void traverse(ASTVisitor visitor) throws Exception { if (visitor.visit(this)) { - for (Expression expr : exprs) { + for (ASTNode expr : exprs) { if (expr != null) { expr.traverse(visitor); } @@ -89,7 +90,7 @@ public class RutaFunction extends Expres } @Override - public List<Expression> getChilds() { + public List<ASTNode> getChilds() { return exprs; } Modified: uima/ruta/branches/UIMA-4798/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaListExpression.java URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4798/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaListExpression.java?rev=1730700&r1=1730699&r2=1730700&view=diff ============================================================================== --- uima/ruta/branches/UIMA-4798/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaListExpression.java (original) +++ uima/ruta/branches/UIMA-4798/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaListExpression.java Tue Feb 16 15:27:24 2016 @@ -22,8 +22,8 @@ package org.apache.uima.ruta.ide.parser. import java.util.List; import org.eclipse.dltk.ast.ASTListNode; +import org.eclipse.dltk.ast.ASTNode; import org.eclipse.dltk.ast.ASTVisitor; -import org.eclipse.dltk.ast.expressions.Expression; import org.eclipse.dltk.ast.expressions.ExpressionConstants; import org.eclipse.dltk.utils.CorePrinter; @@ -32,7 +32,7 @@ public class RutaListExpression extends private int type; - public RutaListExpression(int start, int end, List<Expression> exprList, int type) { + public RutaListExpression(int start, int end, List<ASTNode> exprList, int type) { super(start, end, null, RutaTypeConstants.RUTA_TYPE_S); this.setExprs(new ASTListNode(start, end, exprList)); this.type = type; Modified: uima/ruta/branches/UIMA-4798/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaLogAction.java URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4798/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaLogAction.java?rev=1730700&r1=1730699&r2=1730700&view=diff ============================================================================== --- uima/ruta/branches/UIMA-4798/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaLogAction.java (original) +++ uima/ruta/branches/UIMA-4798/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaLogAction.java Tue Feb 16 15:27:24 2016 @@ -21,7 +21,7 @@ package org.apache.uima.ruta.ide.parser. import java.util.List; -import org.eclipse.dltk.ast.expressions.Expression; +import org.eclipse.dltk.ast.ASTNode; public class RutaLogAction extends RutaAction { int[] logLevelBounds; @@ -29,7 +29,7 @@ public class RutaLogAction extends RutaA boolean logLevelAssigned; public RutaLogAction(int exprStart, int exprEnd, String name, int nameStart, int nameEnd, - List<Expression> exprs, int levelStart, int levelEnd) { + List<ASTNode> exprs, int levelStart, int levelEnd) { super(exprStart, exprEnd, exprs, RutaActionConstants.A_LOG, name, nameStart, nameEnd); logLevelBounds = new int[2]; logLevelBounds[0] = levelStart; Modified: uima/ruta/branches/UIMA-4798/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaStringExpression.java URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4798/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaStringExpression.java?rev=1730700&r1=1730699&r2=1730700&view=diff ============================================================================== --- uima/ruta/branches/UIMA-4798/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaStringExpression.java (original) +++ uima/ruta/branches/UIMA-4798/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaStringExpression.java Tue Feb 16 15:27:24 2016 @@ -22,8 +22,8 @@ package org.apache.uima.ruta.ide.parser. import java.util.List; import org.eclipse.dltk.ast.ASTListNode; +import org.eclipse.dltk.ast.ASTNode; import org.eclipse.dltk.ast.ASTVisitor; -import org.eclipse.dltk.ast.expressions.Expression; import org.eclipse.dltk.utils.CorePrinter; /** @@ -34,7 +34,7 @@ import org.eclipse.dltk.utils.CorePrinte public class RutaStringExpression extends RutaExpression { private ASTListNode exprs; - public RutaStringExpression(int start, int end, List<Expression> exprList) { + public RutaStringExpression(int start, int end, List<ASTNode> exprList) { super(start, end, null, RutaTypeConstants.RUTA_TYPE_S); this.exprs = new ASTListNode(start, end, exprList); } Modified: uima/ruta/branches/UIMA-4798/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaStructureAction.java URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4798/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaStructureAction.java?rev=1730700&r1=1730699&r2=1730700&view=diff ============================================================================== --- uima/ruta/branches/UIMA-4798/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaStructureAction.java (original) +++ uima/ruta/branches/UIMA-4798/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaStructureAction.java Tue Feb 16 15:27:24 2016 @@ -25,6 +25,7 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; +import org.eclipse.dltk.ast.ASTNode; import org.eclipse.dltk.ast.ASTVisitor; import org.eclipse.dltk.ast.expressions.Expression; @@ -33,7 +34,7 @@ public class RutaStructureAction extends private Map<Expression, Expression> assignments; - public RutaStructureAction(int start, int end, List<Expression> exprs, int kind, String name, + public RutaStructureAction(int start, int end, List<ASTNode> exprs, int kind, String name, int nameStart, int nameEnd, Map<Expression, Expression> assignments, Expression structure) { super(start, end, exprs, kind, name, nameStart, nameEnd); this.assignments = assignments; @@ -44,7 +45,7 @@ public class RutaStructureAction extends public void traverse(ASTVisitor visitor) throws Exception { if (visitor.visit(this)) { structure.traverse(visitor); - for (Expression e : super.exprs) { + for (ASTNode e : super.exprs) { e.traverse(visitor); } Iterator<Entry<Expression, Expression>> it = assignments.entrySet().iterator(); @@ -60,8 +61,8 @@ public class RutaStructureAction extends } @Override - public List<Expression> getChilds() { - List<Expression> l = new ArrayList<Expression>(); + public List<ASTNode> getChilds() { + List<ASTNode> l = new ArrayList<>(); l.add(structure); l.addAll(assignments.keySet()); l.addAll(assignments.values()); @@ -77,7 +78,7 @@ public class RutaStructureAction extends return structure; } - public List<Expression> getExpressions() { + public List<ASTNode> getExpressions() { return super.exprs; } } Modified: uima/ruta/branches/UIMA-4798/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ScriptFactory.java URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4798/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ScriptFactory.java?rev=1730700&r1=1730699&r2=1730700&view=diff ============================================================================== --- uima/ruta/branches/UIMA-4798/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ScriptFactory.java (original) +++ uima/ruta/branches/UIMA-4798/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ScriptFactory.java Tue Feb 16 15:27:24 2016 @@ -230,11 +230,13 @@ public class ScriptFactory extends Abstr filterNullObjects(body); int innerStart = 0; int innerEnd = 0; + List<ASTNode> list = new ArrayList<>(); if (body != null && !body.isEmpty()) { innerStart = body.get(0).sourceStart(); innerEnd = body.get(body.size() - 1).sourceEnd(); + list.addAll(body); } - Block inner = new Block(innerStart, innerEnd, body); + Block inner = new Block(innerStart, innerEnd, list); block.acceptBody(inner, false); block.setRule(rule); block.setEnd(rc != null ? getBounds(rc)[1] : rule.sourceEnd()); Added: uima/ruta/branches/UIMA-4798/ruta-ep-parent/pom.xml URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4798/ruta-ep-parent/pom.xml?rev=1730700&view=auto ============================================================================== --- uima/ruta/branches/UIMA-4798/ruta-ep-parent/pom.xml (added) +++ uima/ruta/branches/UIMA-4798/ruta-ep-parent/pom.xml Tue Feb 16 15:27:24 2016 @@ -0,0 +1,239 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.uima</groupId> + <artifactId>ruta-parent</artifactId> + <version>2.4.1-SNAPSHOT</version> + <relativePath /> + </parent> + + <artifactId>ruta-ep-parent</artifactId> + <packaging>pom</packaging> + <name>Apache UIMA Ruta: ${project.artifactId}</name> + <url>${uimaWebsiteUrl}</url> + <inceptionYear>2011</inceptionYear> + <description>The common parent pom for the UIMA Ruta Eclipse Plugins</description> + + <!-- Special inheritance note + even though the <scm> element that follows is exactly the + same as those in super poms, it cannot be inherited because + there is some special code that computes the connection elements + from the chain of parent poms, if this is omitted. + + Keeping this a bit factored allows cutting/pasting the <scm> + element, and just changing the following two properties --> + <scm> + <url>http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-parent</url> + <connection>scm:svn:http://svn.apache.org/repos/asf/uima/ruta/trunk/ruta-ep-parent</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/uima/ruta/trunk/ruta-ep-parent</developerConnection> + </scm> + + <properties> + <dltk.version>[3.0.1,6.0.0)</dltk.version> + </properties> + + + <dependencies> + <dependency> + <groupId>org.eclipse.dltk</groupId> + <artifactId>core</artifactId> + <version>${dltk.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.eclipse.dltk</groupId> + <artifactId>ui</artifactId> + <version>${dltk.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.eclipse.dltk</groupId> + <artifactId>debug</artifactId> + <version>${dltk.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.eclipse.dltk</groupId> + <artifactId>annotations</artifactId> + <version>${dltk.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.eclipse.dltk</groupId> + <artifactId>launching</artifactId> + <version>${dltk.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.eclipse.dltk.core</groupId> + <artifactId>manipulation</artifactId> + <version>${dltk.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.eclipse.dltk.validators</groupId> + <artifactId>core</artifactId> + <version>${dltk.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.eclipse.dltk</groupId> + <artifactId>console</artifactId> + <version>${dltk.version}</version> + <scope>provided</scope> + </dependency> + </dependencies> + + <dependencyManagement> +<!-- explicit dependencies for mars.1 --> + <dependencies> + <dependency> + <groupId>org.eclipse.e4.core</groupId> + <artifactId>commands</artifactId> + <version>0.11.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.eclipse.e4.core</groupId> + <artifactId>di</artifactId> + <version>1.5.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.eclipse.e4.core</groupId> + <artifactId>services</artifactId> + <version>2.0.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.eclipse.e4.ui</groupId> + <artifactId>bindings</artifactId> + <version>0.11.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.eclipse.e4.ui</groupId> + <artifactId>di</artifactId> + <version>1.1.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.eclipse.e4.ui</groupId> + <artifactId>workbench</artifactId> + <version>1.3.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.eclipse.e4.ui</groupId> + <artifactId>workbench3</artifactId> + <version>0.13.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.eclipse.e4.ui.css</groupId> + <artifactId>core</artifactId> + <version>0.11.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.eclipse.e4.ui.css</groupId> + <artifactId>core</artifactId> + <version>0.11.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.eclipse.e4.ui.css</groupId> + <artifactId>swt</artifactId> + <version>0.12.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.eclipse.e4.ui.css.swt</groupId> + <artifactId>theme</artifactId> + <version>0.10.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.eclipse.e4.ui.model</groupId> + <artifactId>workbench</artifactId> + <version>1.1.100</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.eclipse.e4.ui.workbench</groupId> + <artifactId>swt</artifactId> + <version>0.13.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.eclipse.e4.ui.workbench.addons</groupId> + <artifactId>swt</artifactId> + <version>1.2.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.eclipse.e4.ui.workbench.renderers</groupId> + <artifactId>swt</artifactId> + <version>0.13.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.eclipse.e4.ui</groupId> + <artifactId>widgets</artifactId> + <version>1.1.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.eclipse.emf</groupId> + <artifactId>ecore</artifactId> + <version>2.11.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.eclipse.emf.ecore</groupId> + <artifactId>change</artifactId> + <version>2.11.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.eclipse.emf.ecore</groupId> + <artifactId>xmi</artifactId> + <version>2.11.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.w3c.css</groupId> + <artifactId>sac</artifactId> + <version>1.3.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>jxpath</artifactId> + <version>1.3.0</version> + <scope>provided</scope> + </dependency> + </dependencies> + </dependencyManagement> +</project> Propchange: uima/ruta/branches/UIMA-4798/ruta-ep-parent/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Modified: uima/ruta/branches/UIMA-4798/ruta-ep-textruler/pom.xml URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4798/ruta-ep-textruler/pom.xml?rev=1730700&r1=1730699&r2=1730700&view=diff ============================================================================== --- uima/ruta/branches/UIMA-4798/ruta-ep-textruler/pom.xml (original) +++ uima/ruta/branches/UIMA-4798/ruta-ep-textruler/pom.xml Tue Feb 16 15:27:24 2016 @@ -22,9 +22,9 @@ <artifactId>ruta-ep-textruler</artifactId> <parent> <groupId>org.apache.uima</groupId> - <artifactId>ruta-parent</artifactId> + <artifactId>ruta-ep-parent</artifactId> <version>2.4.1-SNAPSHOT</version> - <relativePath>../ruta-parent/pom.xml</relativePath> + <relativePath>../ruta-ep-parent/pom.xml</relativePath> </parent> <properties> <uimaScmProject>${project.artifactId}</uimaScmProject> @@ -75,68 +75,26 @@ </dependency> <dependency> <groupId>org.eclipse.dltk</groupId> - <artifactId>core</artifactId> - <version>[3.0.1,5.0.0)</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.eclipse.dltk</groupId> <artifactId>ui</artifactId> - <version>[3.0.1,5.0.0)</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.eclipse.dltk</groupId> - <artifactId>launching</artifactId> - <version>[3.0.0,5.0.0)</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.eclipse.dltk.validators</groupId> - <artifactId>core</artifactId> - <version>[3.0.0,5.0.0)</version> + <version>${dltk.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.eclipse.dltk.validators</groupId> <artifactId>ui</artifactId> - <version>[3.0.0,5.0.0)</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.eclipse.dltk</groupId> - <artifactId>console</artifactId> - <version>[3.0.0,5.0.0)</version> + <version>${dltk.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.eclipse.dltk.console</groupId> <artifactId>ui</artifactId> - <version>[3.0.0,5.0.0)</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.eclipse.dltk</groupId> - <artifactId>debug</artifactId> - <version>[3.0.1,5.0.0)</version> + <version>${dltk.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.eclipse.dltk.debug</groupId> <artifactId>ui</artifactId> - <version>[3.0.0,5.0.0)</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.eclipse.dltk</groupId> - <artifactId>formatter</artifactId> - <version>[3.0.0,5.0.0)</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.eclipse.dltk</groupId> - <artifactId>testing</artifactId> - <version>[3.0.0,5.0.0)</version> + <version>${dltk.version}</version> <scope>provided</scope> </dependency> <dependency> Modified: uima/ruta/branches/UIMA-4798/ruta-ep-textruler/src/main/java/org/apache/uima/ruta/textruler/ui/ConfigureLearnersHandler.java URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4798/ruta-ep-textruler/src/main/java/org/apache/uima/ruta/textruler/ui/ConfigureLearnersHandler.java?rev=1730700&r1=1730699&r2=1730700&view=diff ============================================================================== --- uima/ruta/branches/UIMA-4798/ruta-ep-textruler/src/main/java/org/apache/uima/ruta/textruler/ui/ConfigureLearnersHandler.java (original) +++ uima/ruta/branches/UIMA-4798/ruta-ep-textruler/src/main/java/org/apache/uima/ruta/textruler/ui/ConfigureLearnersHandler.java Tue Feb 16 15:27:24 2016 @@ -31,6 +31,7 @@ import org.eclipse.core.commands.Executi import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.commands.IHandler; import org.eclipse.core.commands.IHandlerListener; +import org.eclipse.jface.preference.IPreferenceNode; import org.eclipse.jface.preference.PreferenceDialog; import org.eclipse.jface.preference.PreferenceManager; import org.eclipse.jface.preference.PreferenceNode; @@ -55,9 +56,9 @@ public class ConfigureLearnersHandler im PreferenceNode node = new PreferenceNode("org.apache.uima.ruta.textruler.config", page); pm.addToRoot(node); - List<PreferenceNode> nodes = pm.getElements(0); - PreferenceNode top = null; - for (PreferenceNode n : nodes) + List<IPreferenceNode> nodes = pm.getElements(0); + IPreferenceNode top = null; + for (IPreferenceNode n : nodes) if (n.getId().equals("org.apache.uima.ruta.textruler.config")) top = n; if (top != null) { Modified: uima/ruta/branches/UIMA-4798/ruta-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4798/ruta-maven-plugin/pom.xml?rev=1730700&r1=1730699&r2=1730700&view=diff ============================================================================== --- uima/ruta/branches/UIMA-4798/ruta-maven-plugin/pom.xml (original) +++ uima/ruta/branches/UIMA-4798/ruta-maven-plugin/pom.xml Tue Feb 16 15:27:24 2016 @@ -110,6 +110,32 @@ </execution> </executions> </plugin> + <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.--> + <plugin> + <groupId>org.eclipse.m2e</groupId> + <artifactId>lifecycle-mapping</artifactId> + <version>1.0.0</version> + <configuration> + <lifecycleMappingMetadata> + <pluginExecutions> + <pluginExecution> + <pluginExecutionFilter> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-plugin-plugin</artifactId> + <versionRange>[3.3,)</versionRange> + <goals> + <goal>descriptor</goal> + <goal>helpmojo</goal> + </goals> + </pluginExecutionFilter> + <action> + <ignore></ignore> + </action> + </pluginExecution> + </pluginExecutions> + </lifecycleMappingMetadata> + </configuration> + </plugin> </plugins> </pluginManagement> <plugins> Modified: uima/ruta/branches/UIMA-4798/ruta-parent/pom.xml URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4798/ruta-parent/pom.xml?rev=1730700&r1=1730699&r2=1730700&view=diff ============================================================================== --- uima/ruta/branches/UIMA-4798/ruta-parent/pom.xml (original) +++ uima/ruta/branches/UIMA-4798/ruta-parent/pom.xml Tue Feb 16 15:27:24 2016 @@ -101,10 +101,10 @@ <!-- Temporary repository that contains osgi bundles like DLTK 3.0. Added to ease building the UIMA Ruta Eclipse plugins that depend on bundles, which are not provided by public maven repositories. --> - <repository> - <id>ukp-osgi-releases</id> - <url>http://zoidberg.ukp.informatik.tu-darmstadt.de/artifactory/public-ext-osgi-releases-local</url> - </repository> +<!-- <repository> --> +<!-- <id>ukp-osgi-releases</id> --> +<!-- <url>http://zoidberg.ukp.informatik.tu-darmstadt.de/artifactory/public-ext-osgi-releases-local</url> --> +<!-- </repository> --> </repositories> @@ -141,8 +141,8 @@ Creative Commons Attribution 3.0 License BACKWARD_COMPATIBLE_USER - minor version (=.+.0) NON_BACKWARD_COMPATIBLE - major version (+.0.0) --> - <compat.level>BACKWARD_COMPATIBLE_USER</compat.level> - <compat.previous.version>2.3.1</compat.previous.version> + <compat.level>BACKWARD_COMPATIBLE_IMPLEMENTER</compat.level> + <compat.previous.version>2.4.0</compat.previous.version> </properties>