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 2013/05/01 13:36:06 UTC
svn commit: r1477953 - in /uima/sandbox/ruta/trunk:
ruta-core/src/main/java/org/apache/uima/ruta/
ruta-core/src/main/java/org/apache/uima/ruta/action/
ruta-core/src/main/java/org/apache/uima/ruta/engine/
ruta-core/src/main/java/org/apache/uima/ruta/rul...
Author: pkluegl
Date: Wed May 1 11:36:05 2013
New Revision: 1477953
URL: http://svn.apache.org/r1477953
Log:
UIMA-2850
- renaming
Modified:
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaModule.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ReplaceAction.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RuleElementIsolator.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/seed/SeedLexer.flex
uima/sandbox/ruta/trunk/ruta-ep-addons/schema/evaluators.exsd
uima/sandbox/ruta/trunk/ruta-ep-ide/schema/actionExtension.exsd
uima/sandbox/ruta/trunk/ruta-ep-ide/schema/booleanFunctionExtension.exsd
uima/sandbox/ruta/trunk/ruta-ep-ide/schema/conditionExtension.exsd
uima/sandbox/ruta/trunk/ruta-ep-ide/schema/engineExtension.exsd
uima/sandbox/ruta/trunk/ruta-ep-ide/schema/numberFunctionExtension.exsd
uima/sandbox/ruta/trunk/ruta-ep-ide/schema/stringFunctionExtension.exsd
uima/sandbox/ruta/trunk/ruta-ep-ide/schema/tmCommandDetector.exsd
uima/sandbox/ruta/trunk/ruta-ep-ide/schema/tmCommandProcessor.exsd
uima/sandbox/ruta/trunk/ruta-ep-ide/schema/tmExtension.exsd
uima/sandbox/ruta/trunk/ruta-ep-ide/schema/tmSemanticHighlighting.exsd
uima/sandbox/ruta/trunk/ruta-ep-ide/schema/tmkeywords.exsd
uima/sandbox/ruta/trunk/ruta-ep-ide/schema/typeFunctionExtension.exsd
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ScriptFactory.java
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/editor/RutaEditor.java
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/resources/org/apache/uima/ruta/ide/ui/documentation/Actions.html
uima/sandbox/ruta/trunk/ruta-ep-textruler/schema/learners.exsd
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaModule.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaModule.java?rev=1477953&r1=1477952&r2=1477953&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaModule.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaModule.java Wed May 1 11:36:05 2013
@@ -84,8 +84,8 @@ public class RutaModule extends RutaElem
public void setScriptDependencies(Map<String, RutaModule> additionalScripts) {
for (String eachTarget : scripts.keySet()) {
- RutaModule textMarkerModule = additionalScripts.get(eachTarget);
- addScript(eachTarget, textMarkerModule);
+ RutaModule module = additionalScripts.get(eachTarget);
+ addScript(eachTarget, module);
}
}
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ReplaceAction.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ReplaceAction.java?rev=1477953&r1=1477952&r2=1477953&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ReplaceAction.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ReplaceAction.java Wed May 1 11:36:05 2013
@@ -50,8 +50,8 @@ public class ReplaceAction extends Abstr
for (AnnotationFS matchedAnnotation : matchedAnnotations) {
List<RutaBasic> annotationsInWindow = stream.getBasicsInWindow(matchedAnnotation);
boolean replaced = false;
- for (RutaBasic textMarkerBasic : annotationsInWindow) {
- textMarkerBasic.setReplacement(replaced ? "" : replacement.getStringValue(element
+ for (RutaBasic basic : annotationsInWindow) {
+ basic.setReplacement(replaced ? "" : replacement.getStringValue(element
.getParent()));
replaced = true;
}
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java?rev=1477953&r1=1477952&r2=1477953&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java Wed May 1 11:36:05 2013
@@ -330,8 +330,8 @@ public class RutaEngine extends JCasAnno
RutaBlock block = script.getBlock(null);
block.setParent(mainRootBlock);
Collection<RutaModule> innerScripts = script.getScripts().values();
- for (RutaModule textMarkerModule : innerScripts) {
- relinkEnvironments(textMarkerModule, mainRootBlock);
+ for (RutaModule module : innerScripts) {
+ relinkEnvironments(module, mainRootBlock);
}
}
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RuleElementIsolator.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RuleElementIsolator.java?rev=1477953&r1=1477952&r2=1477953&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RuleElementIsolator.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RuleElementIsolator.java Wed May 1 11:36:05 2013
@@ -73,7 +73,7 @@ public class RuleElementIsolator impleme
return container.getRule();
}
- public RuleElement getNextElement(boolean after, RuleElement textMarkerRuleElement) {
+ public RuleElement getNextElement(boolean after, RuleElement ruleElement) {
return null;
}
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/seed/SeedLexer.flex
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/seed/SeedLexer.flex?rev=1477953&r1=1477952&r2=1477953&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/seed/SeedLexer.flex (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/seed/SeedLexer.flex Wed May 1 11:36:05 2013
@@ -18,29 +18,29 @@
*/
-package org.apache.uima.textmarker.seed;
+package org.apache.uima.ruta.seed;
import java.util.*;
import java.util.regex.*;
import org.apache.uima.cas.text.AnnotationFS;
import org.apache.uima.jcas.JCas;
-import org.apache.uima.textmarker.type.AMP;
-import org.apache.uima.textmarker.type.BREAK;
-import org.apache.uima.textmarker.type.CAP;
-import org.apache.uima.textmarker.type.COLON;
-import org.apache.uima.textmarker.type.COMMA;
-import org.apache.uima.textmarker.type.CW;
-import org.apache.uima.textmarker.type.EXCLAMATION;
-import org.apache.uima.textmarker.type.MARKUP;
-import org.apache.uima.textmarker.type.NBSP;
-import org.apache.uima.textmarker.type.NUM;
-import org.apache.uima.textmarker.type.PERIOD;
-import org.apache.uima.textmarker.type.QUESTION;
-import org.apache.uima.textmarker.type.SEMICOLON;
-import org.apache.uima.textmarker.type.SPACE;
-import org.apache.uima.textmarker.type.SPECIAL;
-import org.apache.uima.textmarker.type.SW;
+import org.apache.uima.ruta.type.AMP;
+import org.apache.uima.ruta.type.BREAK;
+import org.apache.uima.ruta.type.CAP;
+import org.apache.uima.ruta.type.COLON;
+import org.apache.uima.ruta.type.COMMA;
+import org.apache.uima.ruta.type.CW;
+import org.apache.uima.ruta.type.EXCLAMATION;
+import org.apache.uima.ruta.type.MARKUP;
+import org.apache.uima.ruta.type.NBSP;
+import org.apache.uima.ruta.type.NUM;
+import org.apache.uima.ruta.type.PERIOD;
+import org.apache.uima.ruta.type.QUESTION;
+import org.apache.uima.ruta.type.SEMICOLON;
+import org.apache.uima.ruta.type.SPACE;
+import org.apache.uima.ruta.type.SPECIAL;
+import org.apache.uima.ruta.type.SW;
%%
Modified: uima/sandbox/ruta/trunk/ruta-ep-addons/schema/evaluators.exsd
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-addons/schema/evaluators.exsd?rev=1477953&r1=1477952&r2=1477953&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-addons/schema/evaluators.exsd (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-addons/schema/evaluators.exsd Wed May 1 11:36:05 2013
@@ -18,10 +18,10 @@ specific language governing permissions
under the License.
-->
-<schema targetNamespace="org.apache.uima.textmarker.addons" xmlns="http://www.w3.org/2001/XMLSchema">
+<schema targetNamespace="org.apache.uima.ruta.addons" xmlns="http://www.w3.org/2001/XMLSchema">
<annotation>
<appInfo>
- <meta.schema plugin="org.apache.uima.textmarker.addons" id="evaluators" name="CAS Evaluator"/>
+ <meta.schema plugin="org.apache.uima.ruta.addons" id="evaluators" name="CAS Evaluator"/>
</appInfo>
<documentation>
[Enter description of this extension point.]
@@ -80,7 +80,7 @@ under the License.
</documentation>
<appInfo>
- <meta.attribute kind="java" basedOn=":org.apache.uima.textmarker.testing.evaluator.ICasEvaluatorFactory"/>
+ <meta.attribute kind="java" basedOn=":org.apache.uima.ruta.testing.evaluator.ICasEvaluatorFactory"/>
</appInfo>
</annotation>
</attribute>
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/schema/actionExtension.exsd
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/schema/actionExtension.exsd?rev=1477953&r1=1477952&r2=1477953&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/schema/actionExtension.exsd (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/schema/actionExtension.exsd Wed May 1 11:36:05 2013
@@ -18,10 +18,10 @@ specific language governing permissions
under the License.
-->
-<schema targetNamespace="org.apache.uima.textmarker.ide" xmlns="http://www.w3.org/2001/XMLSchema">
+<schema targetNamespace="org.apache.uima.ruta.ide" xmlns="http://www.w3.org/2001/XMLSchema">
<annotation>
<appinfo>
- <meta.schema plugin="org.apache.uima.textmarker.ide" id="actionExtension" name="actionExtension"/>
+ <meta.schema plugin="org.apache.uima.ruta.ide" id="actionExtension" name="actionExtension"/>
</appinfo>
<documentation>
[Enter description of this extension point.]
@@ -73,7 +73,7 @@ under the License.
</documentation>
<appinfo>
- <meta.attribute kind="java" basedOn=":org.apache.uima.textmarker.ide.core.extensions.IIDEActionExtension"/>
+ <meta.attribute kind="java" basedOn=":org.apache.uima.ruta.ide.core.extensions.IIDEActionExtension"/>
</appinfo>
</annotation>
</attribute>
@@ -83,7 +83,7 @@ under the License.
</documentation>
<appinfo>
- <meta.attribute kind="java" basedOn=":org.apache.uima.textmarker.extensions.IRutaActionExtension"/>
+ <meta.attribute kind="java" basedOn=":org.apache.uima.ruta.extensions.IRutaActionExtension"/>
</appinfo>
</annotation>
</attribute>
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/schema/booleanFunctionExtension.exsd
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/schema/booleanFunctionExtension.exsd?rev=1477953&r1=1477952&r2=1477953&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/schema/booleanFunctionExtension.exsd (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/schema/booleanFunctionExtension.exsd Wed May 1 11:36:05 2013
@@ -18,10 +18,10 @@ specific language governing permissions
under the License.
-->
-<schema targetNamespace="org.apache.uima.textmarker.ide" xmlns="http://www.w3.org/2001/XMLSchema">
+<schema targetNamespace="org.apache.uima.ruta.ide" xmlns="http://www.w3.org/2001/XMLSchema">
<annotation>
<appinfo>
- <meta.schema plugin="org.apache.uima.textmarker.ide" id="booleanFunctionExtension" name="booleanFunctionExtension"/>
+ <meta.schema plugin="org.apache.uima.ruta.ide" id="booleanFunctionExtension" name="booleanFunctionExtension"/>
</appinfo>
<documentation>
[Enter description of this extension point.]
@@ -73,7 +73,7 @@ under the License.
</documentation>
<appinfo>
- <meta.attribute kind="java" basedOn=":org.apache.uima.textmarker.ide.core.extensions.IIDEActionExtension"/>
+ <meta.attribute kind="java" basedOn=":org.apache.uima.ruta.ide.core.extensions.IIDEActionExtension"/>
</appinfo>
</annotation>
</attribute>
@@ -83,7 +83,7 @@ under the License.
</documentation>
<appinfo>
- <meta.attribute kind="java" basedOn=":org.apache.uima.textmarker.extensions.IRutaActionExtension"/>
+ <meta.attribute kind="java" basedOn=":org.apache.uima.ruta.extensions.IRutaActionExtension"/>
</appinfo>
</annotation>
</attribute>
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/schema/conditionExtension.exsd
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/schema/conditionExtension.exsd?rev=1477953&r1=1477952&r2=1477953&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/schema/conditionExtension.exsd (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/schema/conditionExtension.exsd Wed May 1 11:36:05 2013
@@ -18,10 +18,10 @@ specific language governing permissions
under the License.
-->
-<schema targetNamespace="org.apache.uima.textmarker.ide" xmlns="http://www.w3.org/2001/XMLSchema">
+<schema targetNamespace="org.apache.uima.ruta.ide" xmlns="http://www.w3.org/2001/XMLSchema">
<annotation>
<appinfo>
- <meta.schema plugin="org.apache.uima.textmarker.textmarker.ide" id="conditionExtension" name="conditionExtension"/>
+ <meta.schema plugin="org.apache.uima.ruta.ruta.ide" id="conditionExtension" name="conditionExtension"/>
</appinfo>
<documentation>
[Enter description of this extension point.]
@@ -73,7 +73,7 @@ under the License.
</documentation>
<appinfo>
- <meta.attribute kind="java" basedOn=":org.apache.uima.textmarker.textmarker.ide.core.extensions.IIDEConditionExtension"/>
+ <meta.attribute kind="java" basedOn=":org.apache.uima.ruta.ruta.ide.core.extensions.IIDEConditionExtension"/>
</appinfo>
</annotation>
</attribute>
@@ -83,7 +83,7 @@ under the License.
</documentation>
<appinfo>
- <meta.attribute kind="java" basedOn=":org.apache.uima.textmarker.extensions.IRutaConditionExtension"/>
+ <meta.attribute kind="java" basedOn=":org.apache.uima.ruta.extensions.IRutaConditionExtension"/>
</appinfo>
</annotation>
</attribute>
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/schema/engineExtension.exsd
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/schema/engineExtension.exsd?rev=1477953&r1=1477952&r2=1477953&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/schema/engineExtension.exsd (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/schema/engineExtension.exsd Wed May 1 11:36:05 2013
@@ -18,10 +18,10 @@ specific language governing permissions
under the License.
-->
-<schema targetNamespace="org.apache.uima.textmarker.ide" xmlns="http://www.w3.org/2001/XMLSchema">
+<schema targetNamespace="org.apache.uima.ruta.ide" xmlns="http://www.w3.org/2001/XMLSchema">
<annotation>
<appinfo>
- <meta.schema plugin="org.apache.uima.textmarker.ide" id="engineExtension" name="engineExtension"/>
+ <meta.schema plugin="org.apache.uima.ruta.ide" id="engineExtension" name="engineExtension"/>
</appinfo>
<documentation>
[Enter description of this extension point.]
@@ -73,7 +73,7 @@ under the License.
</documentation>
<appinfo>
- <meta.attribute kind="java" basedOn=":org.apache.uima.textmarker.extensions.IEngineLoader"/>
+ <meta.attribute kind="java" basedOn=":org.apache.uima.ruta.extensions.IEngineLoader"/>
</appinfo>
</annotation>
</attribute>
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/schema/numberFunctionExtension.exsd
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/schema/numberFunctionExtension.exsd?rev=1477953&r1=1477952&r2=1477953&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/schema/numberFunctionExtension.exsd (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/schema/numberFunctionExtension.exsd Wed May 1 11:36:05 2013
@@ -18,10 +18,10 @@ specific language governing permissions
under the License.
-->
-<schema targetNamespace="org.apache.uima.textmarker.ide" xmlns="http://www.w3.org/2001/XMLSchema">
+<schema targetNamespace="org.apache.uima.ruta.ide" xmlns="http://www.w3.org/2001/XMLSchema">
<annotation>
<appinfo>
- <meta.schema plugin="org.apache.uima.textmarker.ide" id="numberFunctionExtension" name="numberFunctionExtension"/>
+ <meta.schema plugin="org.apache.uima.ruta.ide" id="numberFunctionExtension" name="numberFunctionExtension"/>
</appinfo>
<documentation>
[Enter description of this extension point.]
@@ -73,7 +73,7 @@ under the License.
</documentation>
<appinfo>
- <meta.attribute kind="java" basedOn=":org.apache.uima.textmarker.ide.core.extensions.IIDEActionExtension"/>
+ <meta.attribute kind="java" basedOn=":org.apache.uima.ruta.ide.core.extensions.IIDEActionExtension"/>
</appinfo>
</annotation>
</attribute>
@@ -83,7 +83,7 @@ under the License.
</documentation>
<appinfo>
- <meta.attribute kind="java" basedOn=":org.apache.uima.textmarker.extensions.IRutaActionExtension"/>
+ <meta.attribute kind="java" basedOn=":org.apache.uima.ruta.extensions.IRutaActionExtension"/>
</appinfo>
</annotation>
</attribute>
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/schema/stringFunctionExtension.exsd
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/schema/stringFunctionExtension.exsd?rev=1477953&r1=1477952&r2=1477953&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/schema/stringFunctionExtension.exsd (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/schema/stringFunctionExtension.exsd Wed May 1 11:36:05 2013
@@ -18,10 +18,10 @@ specific language governing permissions
under the License.
-->
-<schema targetNamespace="org.apache.uima.textmarker.ide" xmlns="http://www.w3.org/2001/XMLSchema">
+<schema targetNamespace="org.apache.uima.ruta.ide" xmlns="http://www.w3.org/2001/XMLSchema">
<annotation>
<appinfo>
- <meta.schema plugin="org.apache.uima.textmarker.ide" id="stringFunctionExtension" name="stringFunctionExtension"/>
+ <meta.schema plugin="org.apache.uima.ruta.ide" id="stringFunctionExtension" name="stringFunctionExtension"/>
</appinfo>
<documentation>
[Enter description of this extension point.]
@@ -73,7 +73,7 @@ under the License.
</documentation>
<appinfo>
- <meta.attribute kind="java" basedOn=":org.apache.uima.textmarker.ide.core.extensions.IIDEActionExtension"/>
+ <meta.attribute kind="java" basedOn=":org.apache.uima.ruta.ide.core.extensions.IIDEActionExtension"/>
</appinfo>
</annotation>
</attribute>
@@ -83,7 +83,7 @@ under the License.
</documentation>
<appinfo>
- <meta.attribute kind="java" basedOn=":org.apache.uima.textmarker.extensions.IRutaActionExtension"/>
+ <meta.attribute kind="java" basedOn=":org.apache.uima.ruta.extensions.IRutaActionExtension"/>
</appinfo>
</annotation>
</attribute>
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/schema/tmCommandDetector.exsd
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/schema/tmCommandDetector.exsd?rev=1477953&r1=1477952&r2=1477953&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/schema/tmCommandDetector.exsd (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/schema/tmCommandDetector.exsd Wed May 1 11:36:05 2013
@@ -18,10 +18,10 @@ specific language governing permissions
under the License.
-->
-<schema targetNamespace="org.apache.uima.textmarker.ide">
+<schema targetNamespace="org.apache.uima.ruta.ide">
<annotation>
<appInfo>
- <meta.schema plugin="org.apache.uima.textmarker.ide" id="tmCommandProcessor" name="tmCommandProcessor"/>
+ <meta.schema plugin="org.apache.uima.ruta.ide" id="tmCommandProcessor" name="tmCommandProcessor"/>
</appInfo>
<documentation>
[Enter description of this extension point.]
@@ -68,7 +68,7 @@ under the License.
</documentation>
<appInfo>
- <meta.attribute kind="java" basedOn=":org.apache.uima.textmarker.ide.core.IRutaCommandDetector"/>
+ <meta.attribute kind="java" basedOn=":org.apache.uima.ruta.ide.core.IRutaCommandDetector"/>
</appInfo>
</annotation>
</attribute>
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/schema/tmCommandProcessor.exsd
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/schema/tmCommandProcessor.exsd?rev=1477953&r1=1477952&r2=1477953&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/schema/tmCommandProcessor.exsd (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/schema/tmCommandProcessor.exsd Wed May 1 11:36:05 2013
@@ -18,10 +18,10 @@ specific language governing permissions
under the License.
-->
-<schema targetNamespace="org.apache.uima.textmarker.ide">
+<schema targetNamespace="org.apache.uima.ruta.ide">
<annotation>
<appInfo>
- <meta.schema plugin="org.apache.uima.textmarker.ide" id="tmCommandProcessor" name="tmCommandProcessor"/>
+ <meta.schema plugin="org.apache.uima.ruta.ide" id="tmCommandProcessor" name="tmCommandProcessor"/>
</appInfo>
<documentation>
[Enter description of this extension point.]
@@ -75,7 +75,7 @@ under the License.
</documentation>
<appInfo>
- <meta.attribute kind="java" basedOn=":org.apache.uima.textmarker.ide.core.IRutaCommandProcessor"/>
+ <meta.attribute kind="java" basedOn=":org.apache.uima.ruta.ide.core.IRutaCommandProcessor"/>
</appInfo>
</annotation>
</attribute>
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/schema/tmExtension.exsd
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/schema/tmExtension.exsd?rev=1477953&r1=1477952&r2=1477953&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/schema/tmExtension.exsd (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/schema/tmExtension.exsd Wed May 1 11:36:05 2013
@@ -18,10 +18,10 @@ specific language governing permissions
under the License.
-->
-<schema targetNamespace="org.apache.uima.textmarker.ide">
+<schema targetNamespace="org.apache.uima.ruta.ide">
<annotation>
<appInfo>
- <meta.schema plugin="org.apache.uima.textmarker.ide" id="tmExtension" name="tmExtension"/>
+ <meta.schema plugin="org.apache.uima.ruta.ide" id="tmExtension" name="tmExtension"/>
</appInfo>
<documentation>
[Enter description of this extension point.]
@@ -75,7 +75,7 @@ under the License.
</documentation>
<appInfo>
- <meta.attribute kind="java" basedOn=":org.apache.uima.textmarker.ide.core.extensions.IRutaLanguageExtension"/>
+ <meta.attribute kind="java" basedOn=":org.apache.uima.ruta.ide.core.extensions.IRutaLanguageExtension"/>
</appInfo>
</annotation>
</attribute>
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/schema/tmSemanticHighlighting.exsd
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/schema/tmSemanticHighlighting.exsd?rev=1477953&r1=1477952&r2=1477953&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/schema/tmSemanticHighlighting.exsd (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/schema/tmSemanticHighlighting.exsd Wed May 1 11:36:05 2013
@@ -18,10 +18,10 @@ specific language governing permissions
under the License.
-->
-<schema targetNamespace="org.apache.uima.textmarker.ide" xmlns="http://www.w3.org/2001/XMLSchema">
+<schema targetNamespace="org.apache.uima.ruta.ide" xmlns="http://www.w3.org/2001/XMLSchema">
<annotation>
<appInfo>
- <meta.schema plugin="org.apache.uima.textmarker.ide" id="tmSemanticHighlighting" name="tmSemanticHighlighting"/>
+ <meta.schema plugin="org.apache.uima.ruta.ide" id="tmSemanticHighlighting" name="tmSemanticHighlighting"/>
</appInfo>
<documentation>
[Enter description of this extension point.]
@@ -73,7 +73,7 @@ under the License.
</documentation>
<appInfo>
- <meta.attribute kind="java" basedOn=":org.apache.uima.textmarker.ide.ui.ISemanticHighlightingExtension"/>
+ <meta.attribute kind="java" basedOn=":org.apache.uima.ruta.ide.ui.ISemanticHighlightingExtension"/>
</appInfo>
</annotation>
</attribute>
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/schema/tmkeywords.exsd
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/schema/tmkeywords.exsd?rev=1477953&r1=1477952&r2=1477953&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/schema/tmkeywords.exsd (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/schema/tmkeywords.exsd Wed May 1 11:36:05 2013
@@ -18,10 +18,10 @@ specific language governing permissions
under the License.
-->
-<schema targetNamespace="org.apache.uima.textmarker.ide">
+<schema targetNamespace="org.apache.uima.ruta.ide">
<annotation>
<appInfo>
- <meta.schema plugin="org.apache.uima.textmarker.ide" id="tmkeywords" name="tmkeywords"/>
+ <meta.schema plugin="org.apache.uima.ruta.ide" id="tmkeywords" name="tmkeywords"/>
</appInfo>
<documentation>
[Enter description of this extension point.]
@@ -68,7 +68,7 @@ under the License.
</documentation>
<appInfo>
- <meta.attribute kind="java" basedOn=":org.apache.uima.textmarker.ide.IRutaKeywords"/>
+ <meta.attribute kind="java" basedOn=":org.apache.uima.ruta.ide.IRutaKeywords"/>
</appInfo>
</annotation>
</attribute>
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/schema/typeFunctionExtension.exsd
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/schema/typeFunctionExtension.exsd?rev=1477953&r1=1477952&r2=1477953&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/schema/typeFunctionExtension.exsd (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/schema/typeFunctionExtension.exsd Wed May 1 11:36:05 2013
@@ -18,10 +18,10 @@ specific language governing permissions
under the License.
-->
-<schema targetNamespace="org.apache.uima.textmarker.ide" xmlns="http://www.w3.org/2001/XMLSchema">
+<schema targetNamespace="org.apache.uima.ruta.ide" xmlns="http://www.w3.org/2001/XMLSchema">
<annotation>
<appinfo>
- <meta.schema plugin="org.apache.uima.textmarker.ide" id="typeFunctionExtension" name="typeFunctionExtension"/>
+ <meta.schema plugin="org.apache.uima.ruta.ide" id="typeFunctionExtension" name="typeFunctionExtension"/>
</appinfo>
<documentation>
[Enter description of this extension point.]
@@ -73,7 +73,7 @@ under the License.
</documentation>
<appinfo>
- <meta.attribute kind="java" basedOn=":org.apache.uima.textmarker.ide.core.extensions.IIDEActionExtension"/>
+ <meta.attribute kind="java" basedOn=":org.apache.uima.ruta.ide.core.extensions.IIDEActionExtension"/>
</appinfo>
</annotation>
</attribute>
@@ -83,7 +83,7 @@ under the License.
</documentation>
<appinfo>
- <meta.attribute kind="java" basedOn=":org.apache.uima.textmarker.extensions.IRutaActionExtension"/>
+ <meta.attribute kind="java" basedOn=":org.apache.uima.ruta.extensions.IRutaActionExtension"/>
</appinfo>
</annotation>
</attribute>
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ScriptFactory.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ScriptFactory.java?rev=1477953&r1=1477952&r2=1477953&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ScriptFactory.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ScriptFactory.java Wed May 1 11:36:05 2013
@@ -145,18 +145,18 @@ public class ScriptFactory extends Abstr
*
* @param id
* @param type
- * @param textMarkerBlock
+ * @param rutaBlock
* @return
*/
- public RutaBlock createScriptBlock(Token id, Token type, RutaBlock textMarkerBlock) {
+ public RutaBlock createScriptBlock(Token id, Token type, RutaBlock rutaBlock) {
int[] bounds = getBounds(type, id);
int[] nameBounds = getBounds(id);
- if (textMarkerBlock == null) {
+ if (rutaBlock == null) {
RutaBlock block = new RutaBlock(id.getText(), "error", nameBounds[0],
nameBounds[1], bounds[0], bounds[1]);
return block;
} else {
- RutaBlock block = new RutaBlock(id.getText(), textMarkerBlock.getNamespace(),
+ RutaBlock block = new RutaBlock(id.getText(), rutaBlock.getNamespace(),
nameBounds[0], nameBounds[1], bounds[0], bounds[1]);
return block;
}
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/editor/RutaEditor.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/editor/RutaEditor.java?rev=1477953&r1=1477952&r2=1477953&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/editor/RutaEditor.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/editor/RutaEditor.java Wed May 1 11:36:05 2013
@@ -420,7 +420,7 @@ public class RutaEditor extends ScriptEd
@Override
protected void initializeKeyBindingScopes() {
- setKeyBindingScopes(new String[] { "org.apache.uima.ruta.ide.ui.textMarkerEditorScope" }); //$NON-NLS-1$
+ setKeyBindingScopes(new String[] { "org.apache.uima.ruta.ide.ui.rutaEditorScope" }); //$NON-NLS-1$
}
@Override
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/resources/org/apache/uima/ruta/ide/ui/documentation/Actions.html
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/resources/org/apache/uima/ruta/ide/ui/documentation/Actions.html?rev=1477953&r1=1477952&r2=1477953&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/resources/org/apache/uima/ruta/ide/ui/documentation/Actions.html (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/resources/org/apache/uima/ruta/ide/ui/documentation/Actions.html Wed May 1 11:36:05 2013
@@ -4,7 +4,7 @@
The ADD action adds all the elements of the passed
RutaExpressions to a given list. For example, this expressions
could be a string, an integer variable or a list. For a
- complete overview on Textmarker expressions see
+ complete overview on Ruta expressions see
<a class="xref" href="#ugr.tools.tm.language.expressions" title="2.5. Expressions">Section 2.5, “Expressions”</a>.
</p>
<div class="section" title="2.7.1.1. Definition:"><div class="titlepage"><div><div><h4 class="title" id="d5e1345">2.7.1.1.
Modified: uima/sandbox/ruta/trunk/ruta-ep-textruler/schema/learners.exsd
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-textruler/schema/learners.exsd?rev=1477953&r1=1477952&r2=1477953&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-textruler/schema/learners.exsd (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-textruler/schema/learners.exsd Wed May 1 11:36:05 2013
@@ -18,10 +18,10 @@ specific language governing permissions
under the License.
-->
-<schema targetNamespace="org.apache.uima.textmarker.textruler" xmlns="http://www.w3.org/2001/XMLSchema">
+<schema targetNamespace="org.apache.uima.ruta.textruler" xmlns="http://www.w3.org/2001/XMLSchema">
<annotation>
<appInfo>
- <meta.schema plugin="org.apache.uima.textmarker.textruler" id="learners" name="Ruta ML"/>
+ <meta.schema plugin="org.apache.uima.ruta.textruler" id="learners" name="Ruta ML"/>
</appInfo>
<documentation>
[Enter description of this extension point.]
@@ -87,7 +87,7 @@ under the License.
</documentation>
<appInfo>
- <meta.attribute kind="java" basedOn=":org.apache.uima.textmarker.textruler.extension.TextRulerLearnerFactory"/>
+ <meta.attribute kind="java" basedOn=":org.apache.uima.ruta.textruler.extension.TextRulerLearnerFactory"/>
</appInfo>
</annotation>
</attribute>