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 2015/01/14 14:32:23 UTC
svn commit: r1651667 - in /uima/ruta/trunk/ruta-ep-ide/src/main:
antlr3/org/apache/uima/ruta/ide/core/parser/RutaParser.g
java/org/apache/uima/ruta/ide/core/builder/RutaSimpleBuilder.java
Author: pkluegl
Date: Wed Jan 14 13:32:23 2015
New Revision: 1651667
URL: http://svn.apache.org/r1651667
Log:
UIMA-4047
- filter duplicates
- fixed null namespace in description of declared types
Modified:
uima/ruta/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaParser.g
uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/builder/RutaSimpleBuilder.java
Modified: uima/ruta/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaParser.g
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaParser.g?rev=1651667&r1=1651666&r2=1651667&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaParser.g (original)
+++ uima/ruta/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaParser.g Wed Jan 14 13:32:23 2015
@@ -128,7 +128,13 @@ import org.apache.uima.ruta.ide.parser.a
public void addType(RutaBlock parent, String type, String parentType) {
vars.add(type);
- descriptor.addType(parent.getNamespace()+"."+type.trim(), "Type defined in "+packageString+"."+module, parentType);
+ String descriptionString = null;
+ if(packageString == null) {
+ descriptionString = "Type defined in " + module;
+ } else {
+ descriptionString = "Type defined in " + packageString + "." + module;
+ }
+ descriptor.addType(parent.getNamespace()+"."+type.trim(), descriptionString, parentType);
}
public void addPredefinedType(String type) {
@@ -140,7 +146,13 @@ import org.apache.uima.ruta.ide.parser.a
public void addType(RutaBlock parent, String name, String parentType, List featuresTypes,
List<Token> featuresNames) {
name = parent.getNamespace() + "." + name.trim();
- descriptor.addType(name, "Type defined in " + packageString + "." + module, parentType);
+ String descriptionString = null;
+ if(packageString == null) {
+ descriptionString = "Type defined in " + module;
+ } else {
+ descriptionString = "Type defined in " + packageString + "." + module;
+ }
+ descriptor.addType(name, descriptionString, parentType);
for (int i = 0; i < featuresTypes.size(); i++) {
Object object = featuresTypes.get(i);
String ftype = "";
Modified: uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/builder/RutaSimpleBuilder.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/builder/RutaSimpleBuilder.java?rev=1651667&r1=1651666&r2=1651667&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/builder/RutaSimpleBuilder.java (original)
+++ uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/builder/RutaSimpleBuilder.java Wed Jan 14 13:32:23 2015
@@ -251,7 +251,7 @@ public class RutaSimpleBuilder {
}
Set<String> names = new HashSet<String>();
- List<TypeDescription> types = new ArrayList<TypeDescription>();
+ Collection<TypeDescription> types = new HashSet<TypeDescription>();
for (TypeDescription each : typeSystemDescription.getTypes()) {
String name = each.getName();
if (!names.contains(name)) {