You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by pk...@apache.org on 2019/02/13 10:54:20 UTC
svn commit: r1853488 - in
/uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide:
core/codeassist/ core/packages/ core/parser/ parser/ast/
Author: pkluegl
Date: Wed Feb 13 10:54:19 2019
New Revision: 1853488
URL: http://svn.apache.org/viewvc?rev=1853488&view=rev
Log:
UIMA-5982 - remove useless javadoc
Modified:
uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/codeassist/RutaASTUtil.java
uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/packages/PackagesManager.java
uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/packages/RutaCheckBuilder.java
uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/parser/RutaParseUtils.java
uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/AbstractFactory.java
uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ExpressionFactory.java
uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaAction.java
uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaCondition.java
uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaExpressionList.java
uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaFunction.java
uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaInnerListExpression.java
uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaStatement.java
uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaVariableReference.java
uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ScriptFactory.java
uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/StatementFactory.java
Modified: uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/codeassist/RutaASTUtil.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/codeassist/RutaASTUtil.java?rev=1853488&r1=1853487&r2=1853488&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/codeassist/RutaASTUtil.java (original)
+++ uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/codeassist/RutaASTUtil.java Wed Feb 13 10:54:19 2019
@@ -75,8 +75,8 @@ public class RutaASTUtil {
// return null;
}
- /**
- * We need to extend all statements to end of lines or to begining of next statement. This is
+ /*
+ * We need to extend all statements to end of lines or to beginning of next statement. This is
* needed to for correct completion in statements. Such as variable completion and so on.
*/
public static void extendStatements(ASTNode node, String content) {
Modified: uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/packages/PackagesManager.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/packages/PackagesManager.java?rev=1853488&r1=1853487&r2=1853488&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/packages/PackagesManager.java (original)
+++ uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/packages/PackagesManager.java Wed Feb 13 10:54:19 2019
@@ -323,9 +323,6 @@ public class PackagesManager {
return key;
}
- /**
- * Return paths specific only for selected package.
- */
public synchronized IPath[] getPathsForPackage(IInterpreterInstall install, String packageName) {
PackageKey key = makeKey(packageName, getInterpreterKey(install));
if (this.packages.containsKey(key)) {
@@ -449,9 +446,6 @@ public class PackagesManager {
save();
}
- /**
- * Return all packages paths in one call.
- */
public synchronized IPath[] getPathsForPackages(IInterpreterInstall install,
Set packagesInBuild) {
@@ -517,11 +511,6 @@ public class PackagesManager {
return (IPath[]) result.toArray(new IPath[result.size()]);
}
- /**
- * This method removes all information about specified interpreter.
- *
- * @param install
- */
public synchronized void removeInterprterInfo(IInterpreterInstall install) {
// Remove interpreter to packages set
String interpreterPath = getInterpreterKey(install);
Modified: uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/packages/RutaCheckBuilder.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/packages/RutaCheckBuilder.java?rev=1853488&r1=1853487&r2=1853488&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/packages/RutaCheckBuilder.java (original)
+++ uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/packages/RutaCheckBuilder.java Wed Feb 13 10:54:19 2019
@@ -58,8 +58,8 @@ import org.eclipse.dltk.launching.IInter
import org.eclipse.dltk.launching.ScriptRuntime;
import org.eclipse.osgi.util.NLS;
-public class RutaCheckBuilder implements IBuildParticipant, IBuildParticipantExtension,
- IBuildParticipantExtension2 {
+public class RutaCheckBuilder
+ implements IBuildParticipant, IBuildParticipantExtension, IBuildParticipantExtension2 {
private final IScriptProject project;
@@ -89,19 +89,13 @@ public class RutaCheckBuilder implements
}
- /**
- * @param project
- * @throws CoreException
- * @throws IllegalStateException
- * if associated interpreter could not be found
- */
public RutaCheckBuilder(IScriptProject project) throws CoreException, IllegalStateException {
this.project = project;
install = ScriptRuntime.getInterpreterInstall(project);
if (install == null) {
// thrown exception is caught in the RutaPackageCheckerType
- throw new IllegalStateException(NLS.bind(Messages.RutaCheckBuilder_interpreterNotFound,
- project.getElementName()));
+ throw new IllegalStateException(
+ NLS.bind(Messages.RutaCheckBuilder_interpreterNotFound, project.getElementName()));
}
knownPackageNames = manager.getPackageNames(install);
buildpath = getBuildpath(project);
@@ -109,12 +103,13 @@ public class RutaCheckBuilder implements
private int buildType;
+ @Override
public boolean beginBuild(int buildType) {
this.buildType = buildType;
if (buildType != FULL_BUILD) {
// retrieve packages provided by this project
- packageCollector.getPackagesProvided().addAll(
- manager.getInternalPackageNames(install, project));
+ packageCollector.getPackagesProvided()
+ .addAll(manager.getInternalPackageNames(install, project));
}
loadProvidedPackagesFromRequiredProjects();
return true;
@@ -135,13 +130,14 @@ public class RutaCheckBuilder implements
final IPath path = entry.getPath();
final IProject project = workspaceRoot.getProject(path.lastSegment());
if (project.exists()) {
- packageCollector.getPackagesProvided().addAll(
- manager.getInternalPackageNames(install, project));
+ packageCollector.getPackagesProvided()
+ .addAll(manager.getInternalPackageNames(install, project));
}
}
}
}
+ @Override
public void buildExternalModule(IBuildContext context) throws CoreException {
final ModuleDeclaration ast = (ModuleDeclaration) context
.get(IBuildContext.ATTR_MODULE_DECLARATION);
@@ -151,6 +147,7 @@ public class RutaCheckBuilder implements
}
}
+ @Override
public void build(IBuildContext context) throws CoreException {
ModuleDeclaration ast = (ModuleDeclaration) context.get(ModuleDeclaration.class.getName());
if (ast == null) {
@@ -159,13 +156,13 @@ public class RutaCheckBuilder implements
packageCollector.getRequireDirectives().clear();
packageCollector.process(ast);
if (!packageCollector.getRequireDirectives().isEmpty()) {
- resourceToModuleInfos.put(
- context.getSourceModule(),
- new ModuleInfo(context.getProblemReporter(), new ArrayList(packageCollector
- .getRequireDirectives())));
+ resourceToModuleInfos.put(context.getSourceModule(),
+ new ModuleInfo(context.getProblemReporter(),
+ new ArrayList(packageCollector.getRequireDirectives())));
}
}
+ @Override
public void endBuild(IProgressMonitor monitor) {
if (buildType != RECONCILE_BUILD) {
// Save packages provided by the project
@@ -310,6 +307,7 @@ public class RutaCheckBuilder implements
return false;
}
+ @Override
public void prepare(IBuildChange buildChange, IBuildState buildState) throws CoreException {
}
Modified: uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/parser/RutaParseUtils.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/parser/RutaParseUtils.java?rev=1853488&r1=1853487&r2=1853488&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/parser/RutaParseUtils.java (original)
+++ uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/parser/RutaParseUtils.java Wed Feb 13 10:54:19 2019
@@ -166,12 +166,6 @@ public class RutaParseUtils {
return null;
}
- /**
- * @param token
- * @return (start, end)
- * @throws IllegalArgumentException
- * when token==null or !(token instanceof CommonToken)
- */
public static final int[] getBounds(Token token) throws IllegalArgumentException {
if (token == null) {
throw new IllegalArgumentException();
@@ -184,15 +178,6 @@ public class RutaParseUtils {
return bounds;
}
- /**
- * @param tokenA
- * startToken
- * @param tokenB
- * endToken
- * @return positions of a.start // b.end
- * @throws IllegalArgumentException
- * when some token is null or not instanceof CommonToken
- */
public static final int[] getBounds(Token tokenA, Token tokenB) throws IllegalArgumentException {
if (!((tokenA instanceof CommonToken) && (tokenB instanceof CommonToken || tokenB == null))) {
throw new IllegalArgumentException();
@@ -208,10 +193,6 @@ public class RutaParseUtils {
}
}
- /**
- * @param member
- * @return see {@link RutaTypeConstants}, -1 if not valid
- */
public static final int getTypeOfIModelElement(IMember member) {
int type;
try {
Modified: uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/AbstractFactory.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/AbstractFactory.java?rev=1853488&r1=1853487&r2=1853488&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/AbstractFactory.java (original)
+++ uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/AbstractFactory.java Wed Feb 13 10:54:19 2019
@@ -27,36 +27,15 @@ import org.eclipse.dltk.ast.ASTNode;
public abstract class AbstractFactory {
- /**
- * @param token
- * @return (start, end)
- * @throws IllegalArgumentException
- * when token==null or !(token instanceof CommonToken)
- */
protected static final int[] getBounds(Token token) throws IllegalArgumentException {
return RutaParseUtils.getBounds(token);
}
- /**
- * @param tokenA
- * startToken
- * @param tokenB
- * endToken
- * @return positions of a.start // b.end
- * @throws IllegalArgumentException
- * when some token is null or not instanceof CommonToken
- */
protected static final int[] getBounds(Token tokenA, Token tokenB)
throws IllegalArgumentException {
return RutaParseUtils.getBounds(tokenA, tokenB);
}
- /**
- *
- * @param a
- * @param b
- * @return indexarray a.start // b.end
- */
protected static final int[] getBounds(Token a, ASTNode b) {
int[] bounds = { 0, 0 };
if (a == null && b == null) {
@@ -89,13 +68,6 @@ public abstract class AbstractFactory {
return bounds;
}
- /**
- * @param head
- * first element. determines bounds[0].
- * @param astnodeListArray
- * in ascending elements order
- * @return bounds of arguments
- */
@SuppressWarnings({ "rawtypes", "unchecked" })
protected static final int[] getSurroundingBounds(ASTNode head, List... astnodeListArray) {
int bounds[] = { Integer.MAX_VALUE, -1 };
@@ -135,12 +107,6 @@ public abstract class AbstractFactory {
}
}
- /**
- * Applies start/end positions of <code>Token token</code> to <code>Node node</code>
- *
- * @param node
- * @param token
- */
protected static final void setBounds(ASTNode node, Token token) {
if (node == null || token == null) {
return;
Modified: uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ExpressionFactory.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ExpressionFactory.java?rev=1853488&r1=1853487&r2=1853488&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ExpressionFactory.java (original)
+++ uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ExpressionFactory.java Wed Feb 13 10:54:19 2019
@@ -36,12 +36,6 @@ import org.eclipse.dltk.ast.references.V
public class ExpressionFactory extends AbstractFactory implements ExpressionConstants {
- /**
- * @param ref
- * @param kind
- * see {@link RutaExpressionConstants}
- * @return instance of VariableReference
- */
private static VariableReference newVariableReference(Token ref, int kind) {
int bounds[] = getBounds(ref);
return new RutaVariableReference(bounds[0], bounds[1], ref.getText(), kind);
@@ -216,12 +210,6 @@ public class ExpressionFactory extends A
return new FloatNumericLiteral(bounds[0], bounds[1], value);
}
- /**
- * Creates (local) NumberVariableReference
- *
- * @param numVarRef
- * @return new VariableReference of Token
- */
public static VariableReference createNumberVariableReference(Token numVarRef) {
return newVariableReference(numVarRef, RutaTypeConstants.RUTA_TYPE_N);
}
Modified: uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaAction.java?rev=1853488&r1=1853487&r2=1853488&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaAction.java (original)
+++ uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaAction.java Wed Feb 13 10:54:19 2019
@@ -47,12 +47,6 @@ public class RutaAction extends Expressi
private String label;
- /**
- * @param start
- * @param end
- * @param exprs
- * @param kind
- */
public RutaAction(int start, int end, List<ASTNode> exprs, int kind, String name, int nameStart,
int nameEnd) {
super(start, end);
@@ -67,11 +61,6 @@ public class RutaAction extends Expressi
this.nameEnd = nameEnd;
}
- /**
- * Copy-Constructor
- *
- * @param source
- */
public RutaAction(RutaAction source) {
super(source.sourceStart(), source.sourceEnd());
this.exprs = source.exprs;
Modified: uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaCondition.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaCondition.java?rev=1853488&r1=1853487&r2=1853488&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaCondition.java (original)
+++ uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaCondition.java Wed Feb 13 10:54:19 2019
@@ -38,12 +38,6 @@ public class RutaCondition extends Expre
private String name;
- /**
- * @param start
- * @param end
- * @param exprs
- * @param kind
- */
public RutaCondition(int start, int end, List<ASTNode> exprs, int kind, String name,
int nameStart, int nameEnd) {
super(start, end);
@@ -81,6 +75,7 @@ public class RutaCondition extends Expre
return exprs;
}
+ @Override
public String toString() {
return this.getClass().getSimpleName() + " : " + super.toString();
}
Modified: uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaExpressionList.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaExpressionList.java?rev=1853488&r1=1853487&r2=1853488&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaExpressionList.java (original)
+++ uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaExpressionList.java Wed Feb 13 10:54:19 2019
@@ -32,11 +32,6 @@ import org.eclipse.dltk.utils.CorePrinte
public class RutaExpressionList extends Expression {
private List<? extends Expression> expressions;
- /**
- * Statement with bounds from first to last expression.
- *
- * @param expressions
- */
public RutaExpressionList(List<? extends Expression> expressions) {
if (!expressions.isEmpty()) {
// First
@@ -53,13 +48,6 @@ public class RutaExpressionList extends
this.expressions = expressions;
}
- /**
- * Statement with specified bounds and expression list.
- *
- * @param start
- * @param end
- * @param expressions
- */
public RutaExpressionList(int start, int end, List<Expression> expressions) {
super(start, end);
if (expressions == null) {
@@ -111,7 +99,7 @@ public class RutaExpressionList extends
output.formatPrintLn("");
Iterator<? extends Expression> i = this.expressions.iterator();
while (i.hasNext()) {
- ASTNode node = (ASTNode) i.next();
+ ASTNode node = i.next();
node.printNode(output);
output.formatPrintLn(" ");
}
@@ -124,7 +112,7 @@ public class RutaExpressionList extends
if (this.expressions != null) {
Iterator<? extends Expression> i = this.expressions.iterator();
while (i.hasNext()) {
- ASTNode node = (ASTNode) i.next();
+ ASTNode node = i.next();
value += node.toString();
value += " ";
}
Modified: uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaFunction.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaFunction.java?rev=1853488&r1=1853487&r2=1853488&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaFunction.java (original)
+++ uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaFunction.java Wed Feb 13 10:54:19 2019
@@ -37,14 +37,8 @@ public class RutaFunction extends Expres
private String name;
- /**
- * @param start
- * @param end
- * @param exprs
- * @param kind
- */
- public RutaFunction(int start, int end, List<ASTNode> exprs, int kind, String name,
- int nameStart, int nameEnd) {
+ 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;
@@ -57,11 +51,6 @@ public class RutaFunction extends Expres
this.nameEnd = nameEnd;
}
- /**
- * Copy-Constructor
- *
- * @param source
- */
public RutaFunction(RutaFunction source) {
super(source.sourceStart(), source.sourceEnd());
this.exprs = source.exprs;
@@ -94,6 +83,7 @@ public class RutaFunction extends Expres
return exprs;
}
+ @Override
public String toString() {
return this.getClass().getSimpleName() + " : " + super.toString();
}
Modified: uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaInnerListExpression.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaInnerListExpression.java?rev=1853488&r1=1853487&r2=1853488&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaInnerListExpression.java (original)
+++ uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaInnerListExpression.java Wed Feb 13 10:54:19 2019
@@ -25,10 +25,6 @@ import org.eclipse.dltk.ast.expressions.
public class RutaInnerListExpression extends Expression {
private String innerList;
- /**
- * @param start
- * @param end
- */
public RutaInnerListExpression(int start, int end, String inner) {
super(start, end);
this.innerList = inner == null ? "" : inner;
@@ -56,17 +52,10 @@ public class RutaInnerListExpression ext
return RutaExpressionConstants.E_INNERLIST;
}
- /**
- * @param innerList
- * the innerList to set
- */
public void setInnerList(String innerList) {
this.innerList = innerList;
}
- /**
- * @return the innerList
- */
public String getInnerList() {
return innerList;
}
Modified: uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaStatement.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaStatement.java?rev=1853488&r1=1853487&r2=1853488&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaStatement.java (original)
+++ uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaStatement.java Wed Feb 13 10:54:19 2019
@@ -33,11 +33,6 @@ import org.eclipse.dltk.utils.CorePrinte
public class RutaStatement extends Statement {
private List<Expression> expressions;
- /**
- * Statement with bounds from first to last expression.
- *
- * @param expressions
- */
public RutaStatement(List<Expression> expressions) {
if (!expressions.isEmpty()) {
// First
@@ -54,13 +49,6 @@ public class RutaStatement extends State
this.expressions = expressions;
}
- /**
- * Statement with specified bounds and expression list.
- *
- * @param start
- * @param end
- * @param expressions
- */
public RutaStatement(int start, int end, List<Expression> expressions) {
super(start, end);
if (expressions == null) {
@@ -112,7 +100,7 @@ public class RutaStatement extends State
output.formatPrintLn("");
Iterator<Expression> i = this.expressions.iterator();
while (i.hasNext()) {
- ASTNode node = (ASTNode) i.next();
+ ASTNode node = i.next();
node.printNode(output);
output.formatPrintLn(" ");
}
@@ -125,7 +113,7 @@ public class RutaStatement extends State
if (this.expressions != null) {
Iterator<Expression> i = this.expressions.iterator();
while (i.hasNext()) {
- ASTNode node = (ASTNode) i.next();
+ ASTNode node = i.next();
value += node.toString();
value += " ";
}
Modified: uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaVariableReference.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaVariableReference.java?rev=1853488&r1=1853487&r2=1853488&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaVariableReference.java (original)
+++ uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaVariableReference.java Wed Feb 13 10:54:19 2019
@@ -24,13 +24,6 @@ import org.eclipse.dltk.ast.references.V
public class RutaVariableReference extends VariableReference {
private int typeId;
- /**
- * @param start
- * @param end
- * @param name
- * @param typedId
- * raw type id from {@link RutaTypeConstants}
- */
public RutaVariableReference(int start, int end, String name, int typedId) {
super(start, end, name);
this.typeId = typedId;
Modified: uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ScriptFactory.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ScriptFactory.java?rev=1853488&r1=1853487&r2=1853488&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ScriptFactory.java (original)
+++ uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ScriptFactory.java Wed Feb 13 10:54:19 2019
@@ -28,8 +28,6 @@ import java.util.Set;
import org.antlr.runtime.Token;
import org.apache.commons.lang3.StringUtils;
-import org.apache.uima.ruta.ide.core.parser.RutaLexer;
-import org.apache.uima.ruta.parser.RutaParser;
import org.eclipse.dltk.ast.ASTNode;
import org.eclipse.dltk.ast.expressions.Expression;
import org.eclipse.dltk.ast.statements.Block;
@@ -79,7 +77,7 @@ public class ScriptFactory extends Abstr
Map<Expression, Map<Expression, Expression>> fa, Token s) {
return createRegExpRule(exprs, fa, s, false);
}
-
+
public RutaRule createRegExpRule(List<Expression> exprs,
Map<Expression, Map<Expression, Expression>> fa, Token s, boolean updateCounter) {
List<Expression> expressions = new ArrayList<Expression>();
@@ -97,7 +95,7 @@ public class ScriptFactory extends Abstr
}
}
RutaRegExpRule rule = new RutaRegExpRule(expressions, fa, idCounter);
- if(updateCounter) {
+ if (updateCounter) {
idCounter++;
}
if (s != null) {
@@ -178,34 +176,12 @@ public class ScriptFactory extends Abstr
return rutaRuleElement;
}
- /**
- * Creates Root-Block.
- *
- * @param declStart
- * @param declEnd
- * @param nameStart
- * @param nameEnd
- * @param string
- * @param res
- * @param block
- * @param packageString
- * @return new RutaScriptBlock
- */
public RutaScriptBlock createScriptBlock(int declStart, int declEnd, int nameStart, int nameEnd,
String string, List<RutaRuleElement> res, Block block, String packageString) {
createRule(new ArrayList<Expression>(), null);
return new RutaScriptBlock(string, packageString, nameStart, nameEnd, declStart, declEnd);
}
- /**
- * Creates Method-Blocks.<br>
- * Please call finalizeScriptBlock afterwards.
- *
- * @param id
- * @param type
- * @param rutaBlock
- * @return RutaBlock
- */
public RutaBlock createScriptBlock(Token id, Token type, RutaBlock rutaBlock) {
boolean forEach = false;
if (type != null) {
@@ -235,14 +211,6 @@ public class ScriptFactory extends Abstr
}
}
- /**
- * Creates an AST element for an external block construct
- *
- * @param type
- * @param parent
- * block
- * @return new external block construct
- */
public RutaBlock createExternalBlock(Token type, RutaBlock parent) {
int[] bounds = getBounds(type);
int[] nameBounds = getBounds(type);
@@ -269,9 +237,6 @@ public class ScriptFactory extends Abstr
block.setEnd(rc != null ? getBounds(rc)[1] : rule.sourceEnd());
}
- /**
- * @param body
- */
private void filterNullObjects(List<?> body) {
if (body == null) {
return;
Modified: uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/StatementFactory.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/StatementFactory.java?rev=1853488&r1=1853487&r2=1853488&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/StatementFactory.java (original)
+++ uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/StatementFactory.java Wed Feb 13 10:54:19 2019
@@ -32,12 +32,7 @@ import org.eclipse.dltk.ast.references.S
import org.eclipse.dltk.ast.statements.Statement;
public class StatementFactory extends AbstractFactory {
- /**
- * @param component
- * @param impString - import string
- * @param type - type of import
- * @return new Import-Statement
- */
+
public static RutaImportStatement createImport(ComponentDeclaration component, Token impString,
int type) {
int bounds[] = getBounds(impString, component);
@@ -60,18 +55,19 @@ public class StatementFactory extends Ab
public static Statement createImportType(Token importToken, Token type, ComponentDeclaration ts,
Token alias) {
int bounds[] = getBounds(importToken, type);
- if(ts != null) {
+ if (ts != null) {
bounds = getBounds(importToken, ts);
}
- if(alias != null) {
+ if (alias != null) {
bounds = getBounds(importToken, alias);
}
return new RutaImportTypesStatement(bounds[0], bounds[1], ts, type, null, alias);
}
- public static Statement createImportAllPackagew(Token importToken, ComponentDeclaration ts, Token alias) {
+ public static Statement createImportAllPackagew(Token importToken, ComponentDeclaration ts,
+ Token alias) {
int bounds[] = getBounds(importToken, ts);
- if(alias != null) {
+ if (alias != null) {
bounds = getBounds(importToken, alias);
}
return new RutaImportTypesStatement(bounds[0], bounds[1], ts, null, null, alias);
@@ -80,16 +76,15 @@ public class StatementFactory extends Ab
public static Statement createImportPackage(Token importToken, Token pkg, ComponentDeclaration ts,
Token alias) {
int bounds[] = getBounds(importToken, pkg);
- if(ts != null) {
+ if (ts != null) {
bounds = getBounds(importToken, ts);
}
- if(alias != null) {
+ if (alias != null) {
bounds = getBounds(importToken, alias);
}
return new RutaImportTypesStatement(bounds[0], bounds[1], ts, null, pkg, alias);
}
-
-
+
public static RutaImportStatement createImportScript(ComponentDeclaration dottedId,
Token impString) {
if (dottedId != null) {
@@ -112,29 +107,17 @@ public class StatementFactory extends Ab
return createImport(dottedId, impString, kind);
}
- /**
- * @param pString
- * Antlr-Token "PACKAGE"
- * @param dottedId
- * Antlr-Token (dotted-identifier/id)
- * @return new RutaPackageDeclaration
- */
public static RutaPackageDeclaration createPkgDeclaration(Token dottedId, Token pString) {
int bounds[] = getBounds(pString, dottedId);
int nameBounds[] = new int[2];
if (dottedId != null) {
nameBounds = getBounds(dottedId);
}
- SimpleReference ref = new SimpleReference(nameBounds[0], nameBounds[1], dottedId == null ? ""
- : dottedId.getText());
+ SimpleReference ref = new SimpleReference(nameBounds[0], nameBounds[1],
+ dottedId == null ? "" : dottedId.getText());
return new RutaPackageDeclaration(bounds[0], bounds[1], ref);
}
- /**
- * @param id
- * @param type
- * @return new RutaVariableDeclaration
- */
private static RutaVariableDeclaration createVariable(Token id, Token typeToken, int type) {
return createVariable(id, typeToken, type, null);
}
@@ -150,86 +133,38 @@ public class StatementFactory extends Ab
declBounds[1], ref, type, expr);
}
- /**
- * @param id
- * @param type
- * @return new RutaVariableDeclaration
- */
public static RutaVariableDeclaration createIntVariable(Token id, Token type) {
return createVariable(id, type, RutaTypeConstants.RUTA_TYPE_I);
}
- /**
- * @param id
- * @param type
- * @return new variable
- */
public static Object createFloatVariable(Token id, Token type) {
return createVariable(id, type, RutaTypeConstants.RUTA_TYPE_F);
}
- /**
- * @param id
- * @param type
- * @return new RutaVariableDeclaration
- */
public static RutaVariableDeclaration createDoubleVariable(Token id, Token type) {
return createVariable(id, type, RutaTypeConstants.RUTA_TYPE_D);
}
- /**
- * @param id
- * @param type
- * @return new RutaVariableDeclaration
- */
public static RutaVariableDeclaration createStringVariable(Token id, Token type) {
return createVariable(id, type, RutaTypeConstants.RUTA_TYPE_S);
}
- /**
- * @param id
- * @param type
- * @return new RutaVariableDeclaration
- */
public static RutaVariableDeclaration createBooleanVariable(Token id, Token type) {
return createVariable(id, type, RutaTypeConstants.RUTA_TYPE_B);
}
- /**
- * @param id
- * @param type
- * @return new RutaVariableDeclaration
- */
public static RutaVariableDeclaration createTypeVariable(Token id, Token type) {
return createVariable(id, type, RutaTypeConstants.RUTA_TYPE_AT);
}
- /**
- * @param id
- * @param type
- * @return new RutaVariableDeclaration
- */
public static RutaVariableDeclaration createListVariable(Token id, Token type, Expression expr) {
return createVariable(id, type, RutaTypeConstants.RUTA_TYPE_WL, expr);
}
- /**
- * @param id
- * @param type
- * @return new RutaVariableDeclaration
- */
public static RutaVariableDeclaration createTableVariable(Token id, Token type, Expression expr) {
return createVariable(id, type, RutaTypeConstants.RUTA_TYPE_WT, expr);
}
- /**
- * @param id
- * @param declareToken
- * @param type
- * @param features
- * @return new Declaration
- */
-
public static Declaration createAnnotationType(Token id, Token declareToken, Expression type,
List<RutaFeatureDeclaration> features) {
@@ -277,9 +212,10 @@ public class StatementFactory extends Ab
@SuppressWarnings({ "rawtypes" })
public static Statement createDeclareDeclarationsStatement(Token declareToken, List declarations,
ASTNode parent) {
- return createDeclareDeclarationsStatement(declareToken, declarations, parent, new ArrayList<RutaFeatureDeclaration>(0));
+ return createDeclareDeclarationsStatement(declareToken, declarations, parent,
+ new ArrayList<RutaFeatureDeclaration>(0));
}
-
+
@SuppressWarnings({ "unchecked", "rawtypes" })
public static Statement createDeclareDeclarationsStatement(Token declareToken, List declarations,
ASTNode parent, List<RutaFeatureDeclaration> features) {
@@ -297,14 +233,13 @@ public class StatementFactory extends Ab
int end = decls.get(decls.size() - 1).sourceEnd();
statementBounds[1] = Math.max(statementBounds[1], end);
}
- if(features != null && !features.isEmpty()) {
+ if (features != null && !features.isEmpty()) {
int end = features.get(features.size() - 1).sourceEnd();
statementBounds[1] = Math.max(statementBounds[1], end);
}
- return new RutaDeclareDeclarationsStatement(statementBounds[0], statementBounds[1],
- decls, parent, declBounds[0], declBounds[1], features);
+ return new RutaDeclareDeclarationsStatement(statementBounds[0], statementBounds[1], decls,
+ parent, declBounds[0], declBounds[1], features);
}
-
@SuppressWarnings({ "rawtypes", "unchecked" })
public static Statement createDeclarationsStatement(Token declareToken, List declarations,
@@ -323,11 +258,10 @@ public class StatementFactory extends Ab
int end = decls.get(decls.size() - 1).sourceEnd();
statementBounds[1] = Math.max(statementBounds[1], end);
}
- return new RutaDeclarationsStatement(statementBounds[0], statementBounds[1], declarations,
- init, declBounds[0], declBounds[1]);
+ return new RutaDeclarationsStatement(statementBounds[0], statementBounds[1], declarations, init,
+ declBounds[0], declBounds[1]);
}
-
@SuppressWarnings("rawtypes")
public static Statement createDeclarationsStatement(Token declareToken, List declarations) {
return createDeclarationsStatement(declareToken, declarations, null);
@@ -344,7 +278,8 @@ public class StatementFactory extends Ab
return null;
}
- public static Statement createComposedVariableActionDeclaration(Token id, List<RutaAction> actions) {
+ public static Statement createComposedVariableActionDeclaration(Token id,
+ List<RutaAction> actions) {
return null;
}
@@ -372,17 +307,16 @@ public class StatementFactory extends Ab
public static Statement createMacroStatement(Token kind, Token name, Map<Token, Token> def,
List<? extends Expression> elements) {
- int declBounds[] = getBounds(kind, elements.get(elements.size()-1));
+ int declBounds[] = getBounds(kind, elements.get(elements.size() - 1));
int nameBounds[] = getBounds(name);
- int k = kind.equals("CONDITION") ? RutaTypeConstants.RUTA_TYPE_C : RutaTypeConstants.RUTA_TYPE_A;
+ int k = kind.getText().equals("CONDITION") ? RutaTypeConstants.RUTA_TYPE_C
+ : RutaTypeConstants.RUTA_TYPE_A;
// FieldDeclaration
SimpleReference ref = new RutaVariableReference(nameBounds[0], nameBounds[1], name.getText(),
k);
- RutaExpressionList expr = new RutaExpressionList(elements);
+ RutaExpressionList expr = new RutaExpressionList(elements);
return new RutaMacroDeclaration(name.getText(), nameBounds[0], nameBounds[1], declBounds[0],
declBounds[1], ref, k, def, expr);
}
-
-
}