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 17:21:53 UTC
svn commit: r1478049 [1/2] - in /uima/sandbox/ruta/trunk:
ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/
ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/builder/
ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/codeassist/ ruta...
Author: pkluegl
Date: Wed May 1 15:21:51 2013
New Revision: 1478049
URL: http://svn.apache.org/r1478049
Log:
UIMA-2850
- renaming
Modified:
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/RutaConstants.java
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/RutaExtensionManager.java
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/RutaKeywordsManager.java
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/RutaLanguageToolkit.java
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/builder/RutaBuilder.java
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/builder/RutaProjectUtils.java
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/codeassist/RutaSelectionEngine.java
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/packages/DLTKRutaHelper.java
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/parser/RutaSourceParser.java
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/formatter/RutaFormattedPrinter.java
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/formatter/RutaFormatter.java
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/formatter/RutaFormatterFactory.java
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/formatter/preferences/RutaFormatterBlankLinesPage.java
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/formatter/preferences/RutaFormatterIndentationTabPage.java
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/formatter/preferences/RutaFormatterLineWrappingPage.java
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/launching/GenericRutaInstall.java
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaExpressionList.java
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaStatement.java
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/RutaPartitions.java
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/RutaPreferenceConstants.java
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/RutaUILanguageToolkit.java
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/editor/RutaDocumentSetupParticipant.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/java/org/apache/uima/ruta/ide/ui/preferences/RutaEditorColoringConfigurationBlock.java
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/preferences/RutaFormatterPreferencePage.java
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/templates/RutaCodeTemplatesPreferencePage.java
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/text/RutaAutoEditStrategy.java
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/text/RutaCodeScanner.java
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/text/RutaColorConstants.java
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/text/RutaPartitionScanner.java
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/text/RutaSourceViewerConfiguration.java
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/text/RutaStringScanner.java
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/text/RutaTextTools.java
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/text/folding/RutaFoldingStructureProvider.java
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/validator/RutaCheckerUtils.java
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/validator/RutaEngineAndCallChecker.java
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/resources/org/apache/uima/ruta/ide/launching/builtins.ruta
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-ide/src/main/resources/org/apache/uima/ruta/ide/ui/documentation/Conditions.html
uima/sandbox/ruta/trunk/ruta-ep-textruler/src/main/java/org/apache/uima/ruta/textruler/core/TextRulerBasicLearner.java
uima/sandbox/ruta/trunk/ruta-ep-textruler/src/main/java/org/apache/uima/ruta/textruler/core/TextRulerExampleDocument.java
uima/sandbox/ruta/trunk/ruta-ep-textruler/src/main/java/org/apache/uima/ruta/textruler/core/TextRulerExampleDocumentSet.java
uima/sandbox/ruta/trunk/ruta-ep-textruler/src/main/java/org/apache/uima/ruta/textruler/core/TextRulerToolkit.java
uima/sandbox/ruta/trunk/ruta-ep-textruler/src/main/java/org/apache/uima/ruta/textruler/core/TextRulerWordConstraint.java
uima/sandbox/ruta/trunk/ruta-ep-textruler/src/main/java/org/apache/uima/ruta/textruler/extension/TextRulerPreprocessor.java
uima/sandbox/ruta/trunk/ruta-ep-textruler/src/main/java/org/apache/uima/ruta/textruler/learner/lp2/BasicLP2.java
uima/sandbox/ruta/trunk/ruta-ep-textruler/src/main/java/org/apache/uima/ruta/textruler/learner/lp2/NaiveLP2.java
uima/sandbox/ruta/trunk/ruta-ep-textruler/src/main/java/org/apache/uima/ruta/textruler/learner/lp2/OptimizedLP2.java
uima/sandbox/ruta/trunk/ruta-ep-textruler/src/main/java/org/apache/uima/ruta/textruler/learner/rapier/Rapier.java
uima/sandbox/ruta/trunk/ruta-ep-textruler/src/main/java/org/apache/uima/ruta/textruler/learner/whisk/token/Whisk.java
uima/sandbox/ruta/trunk/ruta-ep-textruler/src/main/java/org/apache/uima/ruta/textruler/learner/wien/Wien.java
uima/sandbox/ruta/trunk/ruta-ep-textruler/src/main/java/org/apache/uima/ruta/textruler/tools/BatchRuleEvaluator.java
uima/sandbox/ruta/trunk/ruta-ep-textruler/src/main/java/org/apache/uima/ruta/textruler/tools/SGMLToXMIConverter.java
uima/sandbox/ruta/trunk/ruta-ep-textruler/src/main/java/org/apache/uima/ruta/textruler/ui/TextRulerViewComposite.java
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/RutaConstants.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/RutaConstants.java?rev=1478049&r1=1478048&r2=1478049&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/RutaConstants.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/RutaConstants.java Wed May 1 15:21:51 2013
@@ -23,5 +23,5 @@ public class RutaConstants {
protected RutaConstants() {
}
- public final static String TM_PARTITIONING = "__ruta_partitioning";
+ public final static String RUTA_PARTITIONING = "__ruta_partitioning";
}
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/RutaExtensionManager.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/RutaExtensionManager.java?rev=1478049&r1=1478048&r2=1478049&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/RutaExtensionManager.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/RutaExtensionManager.java Wed May 1 15:21:51 2013
@@ -52,7 +52,7 @@ import org.eclipse.dltk.core.PriorityDLT
public class RutaExtensionManager {
PriorityClassDLTKExtensionManager manager = new PriorityClassDLTKExtensionManager(
- RutaIdePlugin.PLUGIN_ID + ".tmExtension", "language");
+ RutaIdePlugin.PLUGIN_ID + ".rutaExtension", "language");
private static RutaExtensionManager sInstance;
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/RutaKeywordsManager.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/RutaKeywordsManager.java?rev=1478049&r1=1478048&r2=1478049&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/RutaKeywordsManager.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/RutaKeywordsManager.java Wed May 1 15:21:51 2013
@@ -31,7 +31,7 @@ import org.eclipse.core.runtime.Platform
import org.eclipse.dltk.core.DLTKCore;
public final class RutaKeywordsManager {
- private static final String EXTENSION_POINT = "org.apache.uima.ruta.ide.tmkeywords";
+ private static final String EXTENSION_POINT = "org.apache.uima.ruta.ide.rutakeywords";
private static final String CLASS = "class";
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/RutaLanguageToolkit.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/RutaLanguageToolkit.java?rev=1478049&r1=1478048&r2=1478049&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/RutaLanguageToolkit.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/RutaLanguageToolkit.java Wed May 1 15:21:51 2013
@@ -22,6 +22,7 @@ package org.apache.uima.ruta.ide.core;
import java.io.File;
import java.io.FilenameFilter;
+import org.apache.uima.ruta.engine.RutaEngine;
import org.apache.uima.ruta.ide.RutaIdePlugin;
import org.eclipse.core.runtime.IPath;
import org.eclipse.dltk.core.AbstractLanguageToolkit;
@@ -45,7 +46,7 @@ public class RutaLanguageToolkit extends
String members[] = file.list(new FilenameFilter() {
public boolean accept(File dir, String name) {
- if (name.toLowerCase().equals("__init__.tm")) {
+ if (name.toLowerCase().equals("__init__" + RutaEngine.SCRIPT_FILE_EXTENSION)) {
return true;
}
return false;
@@ -71,7 +72,7 @@ public class RutaLanguageToolkit extends
}
public String getLanguageContentType() {
- return "org.apache.uima.ruta.ide.tmContentType";
+ return "org.apache.uima.ruta.ide.rutaContentType";
}
public static RutaLanguageToolkit getDefault() {
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/builder/RutaBuilder.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/builder/RutaBuilder.java?rev=1478049&r1=1478048&r2=1478049&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/builder/RutaBuilder.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/builder/RutaBuilder.java Wed May 1 15:21:51 2013
@@ -22,6 +22,7 @@ package org.apache.uima.ruta.ide.core.bu
import java.util.ArrayList;
import java.util.List;
+import org.apache.uima.ruta.engine.RutaEngine;
import org.apache.uima.ruta.extensions.IEngineLoader;
import org.apache.uima.ruta.extensions.IRutaActionExtension;
import org.apache.uima.ruta.extensions.IRutaBooleanFunctionExtension;
@@ -154,7 +155,7 @@ public class RutaBuilder extends Abstrac
String[] scriptPaths = scriptPathList.toArray(new String[0]);
String mainScript = relativeTo.toPortableString();
mainScript = mainScript.replaceAll("/", ".");
- if (mainScript.endsWith(".tm")) {
+ if (mainScript.endsWith(RutaEngine.SCRIPT_FILE_EXTENSION)) {
mainScript = mainScript.substring(0, mainScript.length() - 5);
}
build(basicTS, basicE, typeSystem, engine, sm, mainScript, scriptPaths, descriptorPaths);
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/builder/RutaProjectUtils.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/builder/RutaProjectUtils.java?rev=1478049&r1=1478048&r2=1478049&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/builder/RutaProjectUtils.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/builder/RutaProjectUtils.java Wed May 1 15:21:51 2013
@@ -30,6 +30,7 @@ import java.util.TreeSet;
import javax.swing.UIManager;
import org.apache.commons.lang3.StringUtils;
+import org.apache.uima.ruta.engine.RutaEngine;
import org.apache.uima.ruta.ide.RutaIdePlugin;
import org.apache.uima.ruta.ide.core.RutaNature;
import org.eclipse.core.resources.IFolder;
@@ -220,7 +221,7 @@ public class RutaProjectUtils {
public static String getModuleName(IPath path) {
String result = path.lastSegment();
- int lastIndexOf = result.lastIndexOf(".tm");
+ int lastIndexOf = result.lastIndexOf(RutaEngine.SCRIPT_FILE_EXTENSION);
if (lastIndexOf != -1) {
result = result.substring(0, lastIndexOf);
}
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/codeassist/RutaSelectionEngine.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/codeassist/RutaSelectionEngine.java?rev=1478049&r1=1478048&r2=1478049&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/codeassist/RutaSelectionEngine.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/codeassist/RutaSelectionEngine.java Wed May 1 15:21:51 2013
@@ -313,7 +313,7 @@ public class RutaSelectionEngine extends
private void importScript(String sRefName) throws ModelException {
int lastDot = sRefName.lastIndexOf('.');
String fileNameShort = sRefName.substring(lastDot + 1);
- String fileName = fileNameShort + ".tm";
+ String fileName = fileNameShort + RutaEngine.SCRIPT_FILE_EXTENSION;
org.eclipse.dltk.core.ISourceModule sm = null;
IScriptFolder[] scriptFolders = sourceModule.getScriptProject().getScriptFolders();
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/packages/DLTKRutaHelper.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/packages/DLTKRutaHelper.java?rev=1478049&r1=1478048&r2=1478049&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/packages/DLTKRutaHelper.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/packages/DLTKRutaHelper.java Wed May 1 15:21:51 2013
@@ -36,6 +36,7 @@ import javax.xml.parsers.DocumentBuilder
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
+import org.apache.uima.ruta.engine.RutaEngine;
import org.apache.uima.ruta.ide.RutaIdePlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
@@ -57,7 +58,7 @@ import org.xml.sax.helpers.DefaultHandle
public class DLTKRutaHelper {
- private static final String DLTK_TM = "scripts/dltk.tm"; //$NON-NLS-1$
+ private static final String DLTK_TM = "scripts/dltk" + RutaEngine.SCRIPT_FILE_EXTENSION; //$NON-NLS-1$
public static List getScriptOutput(InputStream stream) {
final List elements = new ArrayList();
@@ -158,8 +159,8 @@ public class DLTKRutaHelper {
// return autoPath;
}
- public static RutaPackage[] getSrcs(IExecutionEnvironment exeEnv,
- IFileHandle installLocation, EnvironmentVariable[] environment, String packageName) {
+ public static RutaPackage[] getSrcs(IExecutionEnvironment exeEnv, IFileHandle installLocation,
+ EnvironmentVariable[] environment, String packageName) {
IDeployment deployment = exeEnv.createDeployment();
IFileHandle script = deploy(deployment);
if (script == null) {
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/parser/RutaSourceParser.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/parser/RutaSourceParser.java?rev=1478049&r1=1478048&r2=1478049&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/parser/RutaSourceParser.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/parser/RutaSourceParser.java Wed May 1 15:21:51 2013
@@ -27,6 +27,7 @@ import org.antlr.runtime.ANTLRStringStre
import org.antlr.runtime.CharStream;
import org.antlr.runtime.CommonTokenStream;
import org.antlr.runtime.Token;
+import org.apache.uima.ruta.engine.RutaEngine;
import org.apache.uima.ruta.ide.core.IRutaKeywords;
import org.apache.uima.ruta.ide.core.RutaKeywordsManager;
import org.apache.uima.ruta.ide.core.builder.DescriptorManager;
@@ -123,7 +124,7 @@ public class RutaSourceParser extends Ab
if (fileName != null) {
File fn = new File(fileName);
name = fn.getName();
- int lastIndexOf = name.lastIndexOf(".tm");
+ int lastIndexOf = name.lastIndexOf(RutaEngine.SCRIPT_FILE_EXTENSION);
if(lastIndexOf>0) {
name = name.substring(0, lastIndexOf);
}
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/formatter/RutaFormattedPrinter.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/formatter/RutaFormattedPrinter.java?rev=1478049&r1=1478048&r2=1478049&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/formatter/RutaFormattedPrinter.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/formatter/RutaFormattedPrinter.java Wed May 1 15:21:51 2013
@@ -209,11 +209,6 @@ public class RutaFormattedPrinter extend
return false;
// return true;
}
- // if (s instanceof RutaVariableDeclaration && s.getKind() ==
- // TMTypeConstants.TM_TYPE_WL ||
- // s.getKind() == TMTC)
- // special format for declaration statements (they're wrapped in a
- // declarations-statement)
if (s instanceof RutaTypeDeclaration) {
append(s);
List<RutaFeatureDeclaration> features = ((RutaTypeDeclaration) s).getFeatures();
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/formatter/RutaFormatter.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/formatter/RutaFormatter.java?rev=1478049&r1=1478048&r2=1478049&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/formatter/RutaFormatter.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/formatter/RutaFormatter.java Wed May 1 15:21:51 2013
@@ -29,6 +29,7 @@ import org.antlr.runtime.BitSet;
import org.antlr.runtime.CommonToken;
import org.antlr.runtime.CommonTokenStream;
import org.apache.commons.lang3.StringUtils;
+import org.apache.uima.ruta.engine.RutaEngine;
import org.apache.uima.ruta.ide.core.parser.RutaSourceParser;
import org.eclipse.dltk.ast.declarations.ModuleDeclaration;
import org.eclipse.dltk.ast.parser.IModuleDeclaration;
@@ -47,7 +48,6 @@ public class RutaFormatter extends Abstr
private boolean gotProblems = false;
-
public void reportProblem(IProblem problem) {
setProblems(true);
}
@@ -84,7 +84,8 @@ public class RutaFormatter extends Abstr
RutaSourceParser tmsp = new RutaSourceParser();
DummyReporter reporter = new DummyReporter();
- IModuleDeclaration md = tmsp.parse("format.tm", source, reporter);
+ IModuleDeclaration md = tmsp.parse("format" + RutaEngine.SCRIPT_FILE_EXTENSION, source,
+ reporter);
CommonTokenStream tokenStream = tmsp.getTokenStream();
if (!reporter.gotProblems()) {
@@ -94,7 +95,7 @@ public class RutaFormatter extends Abstr
bs.add(org.apache.uima.ruta.parser.RutaParser.COMMENT);
List<CommonToken> comments = tokenStream.getTokens(0, tokenStream.size(), bs);
- final String output = format(input, (ModuleDeclaration)md, comments, indent);
+ final String output = format(input, (ModuleDeclaration) md, comments, indent);
if (output != null) {
if (!input.equals(output)) {
return new ReplaceEdit(0, source.length(), output);
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/formatter/RutaFormatterFactory.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/formatter/RutaFormatterFactory.java?rev=1478049&r1=1478048&r2=1478049&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/formatter/RutaFormatterFactory.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/formatter/RutaFormatterFactory.java Wed May 1 15:21:51 2013
@@ -22,6 +22,7 @@ package org.apache.uima.ruta.ide.formatt
import java.net.URL;
import java.util.Map;
+import org.apache.uima.ruta.engine.RutaEngine;
import org.apache.uima.ruta.ide.RutaIdePlugin;
import org.apache.uima.ruta.ide.formatter.preferences.RutaFormatterModifyDialog;
import org.eclipse.dltk.formatter.AbstractScriptFormatterFactory;
@@ -34,13 +35,11 @@ public class RutaFormatterFactory extend
private static final String[] KEYS = {
// RutaUI.PLUGIN_ID :
- RutaFormatterConstants.FORMATTER_TAB_CHAR,
- RutaFormatterConstants.FORMATTER_INDENTATION_SIZE,
+ RutaFormatterConstants.FORMATTER_TAB_CHAR, RutaFormatterConstants.FORMATTER_INDENTATION_SIZE,
RutaFormatterConstants.FORMATTER_TAB_SIZE,
// RutaFormatterPlugin.PLUGIN_ID :
RutaFormatterConstants.INDENT_BLOCK, RutaFormatterConstants.INDENT_STRUCTURE,
- RutaFormatterConstants.LINES_BEFORE_LONG_DECLARATIONS,
- RutaFormatterConstants.MAX_LINE_LENGTH };
+ RutaFormatterConstants.LINES_BEFORE_LONG_DECLARATIONS, RutaFormatterConstants.MAX_LINE_LENGTH };
public PreferenceKey[] getPreferenceKeys() {
final PreferenceKey[] result = new PreferenceKey[KEYS.length];
@@ -61,8 +60,7 @@ public class RutaFormatterFactory extend
@Override
public PreferenceKey getProfilesKey() {
- return new PreferenceKey(RutaIdePlugin.PLUGIN_ID,
- RutaFormatterConstants.FORMATTER_PROFILES);
+ return new PreferenceKey(RutaIdePlugin.PLUGIN_ID, RutaFormatterConstants.FORMATTER_PROFILES);
}
public PreferenceKey getActiveProfileKey() {
@@ -76,7 +74,7 @@ public class RutaFormatterFactory extend
@Override
public URL getPreviewContent() {
- return getClass().getResource("formatPreviewScript.tm"); //$NON-NLS-1$
+ return getClass().getResource("formatPreviewScript" + RutaEngine.SCRIPT_FILE_EXTENSION); //$NON-NLS-1$
}
public IFormatterModifyDialog createDialog(IFormatterModifyDialogOwner dialogOwner) {
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/formatter/preferences/RutaFormatterBlankLinesPage.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/formatter/preferences/RutaFormatterBlankLinesPage.java?rev=1478049&r1=1478048&r2=1478049&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/formatter/preferences/RutaFormatterBlankLinesPage.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/formatter/preferences/RutaFormatterBlankLinesPage.java Wed May 1 15:21:51 2013
@@ -21,6 +21,7 @@ package org.apache.uima.ruta.ide.formatt
import java.net.URL;
+import org.apache.uima.ruta.engine.RutaEngine;
import org.apache.uima.ruta.ide.formatter.RutaFormatterConstants;
import org.eclipse.dltk.ui.formatter.FormatterModifyTabPage;
import org.eclipse.dltk.ui.formatter.IFormatterControlManager;
@@ -84,7 +85,7 @@ public class RutaFormatterBlankLinesPage
@Override
protected URL getPreviewContent() {
- return getClass().getResource("blank-lines-preview.tm"); //$NON-NLS-1$
+ return getClass().getResource("blank-lines-preview"+RutaEngine.SCRIPT_FILE_EXTENSION); //$NON-NLS-1$
}
}
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/formatter/preferences/RutaFormatterIndentationTabPage.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/formatter/preferences/RutaFormatterIndentationTabPage.java?rev=1478049&r1=1478048&r2=1478049&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/formatter/preferences/RutaFormatterIndentationTabPage.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/formatter/preferences/RutaFormatterIndentationTabPage.java Wed May 1 15:21:51 2013
@@ -21,6 +21,7 @@ package org.apache.uima.ruta.ide.formatt
import java.net.URL;
+import org.apache.uima.ruta.engine.RutaEngine;
import org.apache.uima.ruta.ide.formatter.RutaFormatterConstants;
import org.eclipse.dltk.ui.CodeFormatterConstants;
import org.eclipse.dltk.ui.formatter.FormatterModifyTabPage;
@@ -127,6 +128,6 @@ public class RutaFormatterIndentationTab
@Override
protected URL getPreviewContent() {
- return getClass().getResource("indentation-preview.tm");
+ return getClass().getResource("indentation-preview"+RutaEngine.SCRIPT_FILE_EXTENSION);
}
}
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/formatter/preferences/RutaFormatterLineWrappingPage.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/formatter/preferences/RutaFormatterLineWrappingPage.java?rev=1478049&r1=1478048&r2=1478049&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/formatter/preferences/RutaFormatterLineWrappingPage.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/formatter/preferences/RutaFormatterLineWrappingPage.java Wed May 1 15:21:51 2013
@@ -21,6 +21,7 @@ package org.apache.uima.ruta.ide.formatt
import java.net.URL;
+import org.apache.uima.ruta.engine.RutaEngine;
import org.apache.uima.ruta.ide.formatter.RutaFormatterConstants;
import org.eclipse.dltk.ui.formatter.FormatterModifyTabPage;
import org.eclipse.dltk.ui.formatter.IFormatterControlManager;
@@ -83,7 +84,7 @@ public class RutaFormatterLineWrappingPa
@Override
protected URL getPreviewContent() {
- return getClass().getResource("wrapping-preview.tm"); //$NON-NLS-1$
+ return getClass().getResource("wrapping-preview"+RutaEngine.SCRIPT_FILE_EXTENSION); //$NON-NLS-1$
}
}
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/launching/GenericRutaInstall.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/launching/GenericRutaInstall.java?rev=1478049&r1=1478048&r2=1478049&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/launching/GenericRutaInstall.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/launching/GenericRutaInstall.java Wed May 1 15:21:51 2013
@@ -24,6 +24,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
+import org.apache.uima.ruta.engine.RutaEngine;
import org.apache.uima.ruta.ide.RutaIdePlugin;
import org.apache.uima.ruta.ide.core.RutaNature;
import org.eclipse.debug.core.ILaunchManager;
@@ -39,9 +40,10 @@ public class GenericRutaInstall extends
@Override
public String getBuiltinModuleContent(String name) {
- InputStream stream = GenericRutaInstall.class.getResourceAsStream("builtins.tm");
+ InputStream stream = GenericRutaInstall.class.getResourceAsStream("builtins"
+ + RutaEngine.SCRIPT_FILE_EXTENSION);
if (stream == null) {
- return "PACKAGE org.apache.uima.tm;\n";
+ return "PACKAGE org.apache.uima.ruta;\n";
}
BufferedReader br = new BufferedReader(new InputStreamReader(stream));
StringBuffer buf = new StringBuffer();
@@ -59,10 +61,9 @@ public class GenericRutaInstall extends
@Override
public String[] getBuiltinModules() {
- return new String[] { "builtins.tm" };
+ return new String[] { "builtins" + RutaEngine.SCRIPT_FILE_EXTENSION };
}
-
-
+
@Override
public IInterpreterRunner getInterpreterRunner(String mode) {
IInterpreterRunner runner = super.getInterpreterRunner(mode);
@@ -79,5 +80,5 @@ public class GenericRutaInstall extends
public String getNatureId() {
return RutaNature.NATURE_ID;
}
-
+
}
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaExpressionList.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaExpressionList.java?rev=1478049&r1=1478048&r2=1478049&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaExpressionList.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaExpressionList.java Wed May 1 15:21:51 2013
@@ -88,7 +88,6 @@ public class RutaExpressionList extends
@Override
public int getKind() {
return StatementConstants.S_BLOCK;
- // return RutaConstants.TM_STATEMENT;
}
@Override
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaStatement.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaStatement.java?rev=1478049&r1=1478048&r2=1478049&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaStatement.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaStatement.java Wed May 1 15:21:51 2013
@@ -89,7 +89,6 @@ public class RutaStatement extends State
@Override
public int getKind() {
return StatementConstants.S_BLOCK;
- // return RutaConstants.TM_STATEMENT;
}
@Override
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/RutaPartitions.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/RutaPartitions.java?rev=1478049&r1=1478048&r2=1478049&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/RutaPartitions.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/RutaPartitions.java Wed May 1 15:21:51 2013
@@ -25,14 +25,14 @@ import org.eclipse.jface.text.IDocument;
public interface RutaPartitions {
- public final static String TM_PARTITIONING = RutaConstants.TM_PARTITIONING;
+ public final static String RUTA_PARTITIONING = RutaConstants.RUTA_PARTITIONING;
- public final static String TM_COMMENT = "__ruta_comment";
+ public final static String RUTA_COMMENT = "__ruta_comment";
- public final static String TM_STRING = "__ruta_string";
+ public final static String RUTA_STRING = "__ruta_string";
- public static final String TM_INNER_CODE = "__tm_inner_code";
+ public static final String RUTA_INNER_CODE = "__tm_inner_code";
- public final static String[] TM_PARTITION_TYPES = new String[] { RutaPartitions.TM_STRING,
- RutaPartitions.TM_COMMENT, IDocument.DEFAULT_CONTENT_TYPE };
+ public final static String[] RUTA_PARTITION_TYPES = new String[] { RutaPartitions.RUTA_STRING,
+ RutaPartitions.RUTA_COMMENT, IDocument.DEFAULT_CONTENT_TYPE };
}
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/RutaPreferenceConstants.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/RutaPreferenceConstants.java?rev=1478049&r1=1478048&r2=1478049&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/RutaPreferenceConstants.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/RutaPreferenceConstants.java Wed May 1 15:21:51 2013
@@ -56,158 +56,158 @@ public class RutaPreferenceConstants ext
public static final String EDITOR_FOLDING_COMMENTS_FOLDING = "editor_folding_comments";
- public final static String EDITOR_SINGLE_LINE_COMMENT_COLOR = RutaColorConstants.TM_SINGLE_LINE_COMMENT;
+ public final static String EDITOR_SINGLE_LINE_COMMENT_COLOR = RutaColorConstants.RUTA_SINGLE_LINE_COMMENT;
- public final static String EDITOR_SINGLE_LINE_COMMENT_BOLD = RutaColorConstants.TM_SINGLE_LINE_COMMENT
+ public final static String EDITOR_SINGLE_LINE_COMMENT_BOLD = RutaColorConstants.RUTA_SINGLE_LINE_COMMENT
+ EDITOR_BOLD_SUFFIX;
- public final static String EDITOR_SINGLE_LINE_COMMENT_ITALIC = RutaColorConstants.TM_SINGLE_LINE_COMMENT
+ public final static String EDITOR_SINGLE_LINE_COMMENT_ITALIC = RutaColorConstants.RUTA_SINGLE_LINE_COMMENT
+ EDITOR_ITALIC_SUFFIX;
- public final static String EDITOR_SINGLE_LINE_COMMENT_STRIKETHROUGH = RutaColorConstants.TM_SINGLE_LINE_COMMENT
+ public final static String EDITOR_SINGLE_LINE_COMMENT_STRIKETHROUGH = RutaColorConstants.RUTA_SINGLE_LINE_COMMENT
+ EDITOR_STRIKETHROUGH_SUFFIX;
- public final static String EDITOR_SINGLE_LINE_COMMENT_UNDERLINE = RutaColorConstants.TM_SINGLE_LINE_COMMENT
+ public final static String EDITOR_SINGLE_LINE_COMMENT_UNDERLINE = RutaColorConstants.RUTA_SINGLE_LINE_COMMENT
+ EDITOR_UNDERLINE_SUFFIX;
- public final static String EDITOR_NUMBER_COLOR = RutaColorConstants.TM_NUMBER;
+ public final static String EDITOR_NUMBER_COLOR = RutaColorConstants.RUTA_NUMBER;
- public final static String EDITOR_NUMBER_BOLD = RutaColorConstants.TM_NUMBER
+ public final static String EDITOR_NUMBER_BOLD = RutaColorConstants.RUTA_NUMBER
+ EDITOR_BOLD_SUFFIX;
- public final static String EDITOR_NUMBER_ITALIC = RutaColorConstants.TM_NUMBER
+ public final static String EDITOR_NUMBER_ITALIC = RutaColorConstants.RUTA_NUMBER
+ EDITOR_ITALIC_SUFFIX;
- public final static String EDITOR_NUMBER_STRIKETHROUGH = RutaColorConstants.TM_NUMBER
+ public final static String EDITOR_NUMBER_STRIKETHROUGH = RutaColorConstants.RUTA_NUMBER
+ EDITOR_STRIKETHROUGH_SUFFIX;
- public final static String EDITOR_NUMBER_UNDERLINE = RutaColorConstants.TM_NUMBER
+ public final static String EDITOR_NUMBER_UNDERLINE = RutaColorConstants.RUTA_NUMBER
+ EDITOR_UNDERLINE_SUFFIX;
- public final static String EDITOR_STRING_COLOR = RutaColorConstants.TM_STRING;
+ public final static String EDITOR_STRING_COLOR = RutaColorConstants.RUTA_STRING;
- public final static String EDITOR_STRING_BOLD = RutaColorConstants.TM_STRING
+ public final static String EDITOR_STRING_BOLD = RutaColorConstants.RUTA_STRING
+ EDITOR_BOLD_SUFFIX;
- public final static String EDITOR_STRING_ITALIC = RutaColorConstants.TM_STRING
+ public final static String EDITOR_STRING_ITALIC = RutaColorConstants.RUTA_STRING
+ EDITOR_ITALIC_SUFFIX;
- public final static String EDITOR_STRING_STRIKETHROUGH = RutaColorConstants.TM_STRING
+ public final static String EDITOR_STRING_STRIKETHROUGH = RutaColorConstants.RUTA_STRING
+ EDITOR_STRIKETHROUGH_SUFFIX;
- public final static String EDITOR_STRING_UNDERLINE = RutaColorConstants.TM_STRING
+ public final static String EDITOR_STRING_UNDERLINE = RutaColorConstants.RUTA_STRING
+ EDITOR_UNDERLINE_SUFFIX;
- public final static String EDITOR_FUNCTION_COLOR = RutaColorConstants.TM_FUNCTION;
+ public final static String EDITOR_FUNCTION_COLOR = RutaColorConstants.RUTA_FUNCTION;
- public final static String EDITOR_FUNCTION_COLOR_BOLD = RutaColorConstants.TM_FUNCTION
+ public final static String EDITOR_FUNCTION_COLOR_BOLD = RutaColorConstants.RUTA_FUNCTION
+ EDITOR_BOLD_SUFFIX;
- public final static String EDITOR_FUNCTION_COLOR_ITALIC = RutaColorConstants.TM_FUNCTION
+ public final static String EDITOR_FUNCTION_COLOR_ITALIC = RutaColorConstants.RUTA_FUNCTION
+ EDITOR_ITALIC_SUFFIX;
- public final static String EDITOR_FUNCTION_COLOR_STRIKETHROUGH = RutaColorConstants.TM_FUNCTION
+ public final static String EDITOR_FUNCTION_COLOR_STRIKETHROUGH = RutaColorConstants.RUTA_FUNCTION
+ EDITOR_STRIKETHROUGH_SUFFIX;
- public final static String EDITOR_FUNCTION_COLOR_UNDERLINE = RutaColorConstants.TM_FUNCTION
+ public final static String EDITOR_FUNCTION_COLOR_UNDERLINE = RutaColorConstants.RUTA_FUNCTION
+ EDITOR_UNDERLINE_SUFFIX;
- public final static String EDITOR_CONDITION_COLOR = RutaColorConstants.TM_CONDITION;
+ public final static String EDITOR_CONDITION_COLOR = RutaColorConstants.RUTA_CONDITION;
- public final static String EDITOR_CONDITION_COLOR_BOLD = RutaColorConstants.TM_CONDITION
+ public final static String EDITOR_CONDITION_COLOR_BOLD = RutaColorConstants.RUTA_CONDITION
+ EDITOR_BOLD_SUFFIX;
- public final static String EDITOR_CONDITION_COLOR_ITALIC = RutaColorConstants.TM_CONDITION
+ public final static String EDITOR_CONDITION_COLOR_ITALIC = RutaColorConstants.RUTA_CONDITION
+ EDITOR_ITALIC_SUFFIX;
- public final static String EDITOR_CONDITION_COLOR_STRIKETHROUGH = RutaColorConstants.TM_CONDITION
+ public final static String EDITOR_CONDITION_COLOR_STRIKETHROUGH = RutaColorConstants.RUTA_CONDITION
+ EDITOR_STRIKETHROUGH_SUFFIX;
- public final static String EDITOR_CONDITION_COLOR_UNDERLINE = RutaColorConstants.TM_CONDITION
+ public final static String EDITOR_CONDITION_COLOR_UNDERLINE = RutaColorConstants.RUTA_CONDITION
+ EDITOR_UNDERLINE_SUFFIX;
- public final static String EDITOR_ACTION_COLOR = RutaColorConstants.TM_ACTION;
+ public final static String EDITOR_ACTION_COLOR = RutaColorConstants.RUTA_ACTION;
- public final static String EDITOR_ACTION_COLOR_BOLD = RutaColorConstants.TM_ACTION
+ public final static String EDITOR_ACTION_COLOR_BOLD = RutaColorConstants.RUTA_ACTION
+ EDITOR_BOLD_SUFFIX;
- public final static String EDITOR_ACTION_COLOR_ITALIC = RutaColorConstants.TM_ACTION
+ public final static String EDITOR_ACTION_COLOR_ITALIC = RutaColorConstants.RUTA_ACTION
+ EDITOR_ITALIC_SUFFIX;
- public final static String EDITOR_ACTION_COLOR_STRIKETHROUGH = RutaColorConstants.TM_ACTION
+ public final static String EDITOR_ACTION_COLOR_STRIKETHROUGH = RutaColorConstants.RUTA_ACTION
+ EDITOR_STRIKETHROUGH_SUFFIX;
- public final static String EDITOR_ACTION_COLOR_UNDERLINE = RutaColorConstants.TM_ACTION
+ public final static String EDITOR_ACTION_COLOR_UNDERLINE = RutaColorConstants.RUTA_ACTION
+ EDITOR_UNDERLINE_SUFFIX;
- public final static String EDITOR_THEN_COLOR = RutaColorConstants.TM_THEN;
+ public final static String EDITOR_THEN_COLOR = RutaColorConstants.RUTA_THEN;
- public final static String EDITOR_THEN_COLOR_BOLD = RutaColorConstants.TM_THEN
+ public final static String EDITOR_THEN_COLOR_BOLD = RutaColorConstants.RUTA_THEN
+ EDITOR_BOLD_SUFFIX;
- public final static String EDITOR_THEN_COLOR_ITALIC = RutaColorConstants.TM_THEN
+ public final static String EDITOR_THEN_COLOR_ITALIC = RutaColorConstants.RUTA_THEN
+ EDITOR_ITALIC_SUFFIX;
- public final static String EDITOR_THEN_COLOR_STRIKETHROUGH = RutaColorConstants.TM_THEN
+ public final static String EDITOR_THEN_COLOR_STRIKETHROUGH = RutaColorConstants.RUTA_THEN
+ EDITOR_STRIKETHROUGH_SUFFIX;
- public final static String EDITOR_THEN_COLOR_UNDERLINE = RutaColorConstants.TM_THEN
+ public final static String EDITOR_THEN_COLOR_UNDERLINE = RutaColorConstants.RUTA_THEN
+ EDITOR_UNDERLINE_SUFFIX;
- public final static String EDITOR_DECLARATION_DEFINITION_COLOR = RutaColorConstants.TM_DECLARATION;
+ public final static String EDITOR_DECLARATION_DEFINITION_COLOR = RutaColorConstants.RUTA_DECLARATION;
- public final static String EDITOR_DECLARATION_DEFINITION_COLOR_BOLD = RutaColorConstants.TM_DECLARATION
+ public final static String EDITOR_DECLARATION_DEFINITION_COLOR_BOLD = RutaColorConstants.RUTA_DECLARATION
+ EDITOR_BOLD_SUFFIX;
- public final static String EDITOR_DECLARATION_DEFINITION_COLOR_ITALIC = RutaColorConstants.TM_DECLARATION
+ public final static String EDITOR_DECLARATION_DEFINITION_COLOR_ITALIC = RutaColorConstants.RUTA_DECLARATION
+ EDITOR_ITALIC_SUFFIX;
- public final static String EDITOR_DECLARATION_DEFINITION_COLOR_STRIKETHROUGH = RutaColorConstants.TM_DECLARATION
+ public final static String EDITOR_DECLARATION_DEFINITION_COLOR_STRIKETHROUGH = RutaColorConstants.RUTA_DECLARATION
+ EDITOR_STRIKETHROUGH_SUFFIX;
- public final static String EDITOR_DECLARATION_DEFINITION_COLOR_UNDERLINE = RutaColorConstants.TM_DECLARATION
+ public final static String EDITOR_DECLARATION_DEFINITION_COLOR_UNDERLINE = RutaColorConstants.RUTA_DECLARATION
+ EDITOR_UNDERLINE_SUFFIX;
- public final static String EDITOR_BASICSYMBOL_DEFINITION_COLOR = RutaColorConstants.TM_BASICSYMBOL;
+ public final static String EDITOR_BASICSYMBOL_DEFINITION_COLOR = RutaColorConstants.RUTA_BASICSYMBOL;
- public final static String EDITOR_BASICSYMBOL_DEFINITION_COLOR_BOLD = RutaColorConstants.TM_BASICSYMBOL
+ public final static String EDITOR_BASICSYMBOL_DEFINITION_COLOR_BOLD = RutaColorConstants.RUTA_BASICSYMBOL
+ EDITOR_BOLD_SUFFIX;
- public final static String EDITOR_BASICSYMBOL_DEFINITION_COLOR_ITALIC = RutaColorConstants.TM_BASICSYMBOL
+ public final static String EDITOR_BASICSYMBOL_DEFINITION_COLOR_ITALIC = RutaColorConstants.RUTA_BASICSYMBOL
+ EDITOR_ITALIC_SUFFIX;
- public final static String EDITOR_BASICSYMBOL_DEFINITION_COLOR_STRIKETHROUGH = RutaColorConstants.TM_BASICSYMBOL
+ public final static String EDITOR_BASICSYMBOL_DEFINITION_COLOR_STRIKETHROUGH = RutaColorConstants.RUTA_BASICSYMBOL
+ EDITOR_STRIKETHROUGH_SUFFIX;
- public final static String EDITOR_BASICSYMBOL_DEFINITION_COLOR_UNDERLINE = RutaColorConstants.TM_BASICSYMBOL
+ public final static String EDITOR_BASICSYMBOL_DEFINITION_COLOR_UNDERLINE = RutaColorConstants.RUTA_BASICSYMBOL
+ EDITOR_UNDERLINE_SUFFIX;
- public final static String EDITOR_DOC_COMMENT_COLOR = RutaColorConstants.TM_DOC_COMMENT;
+ public final static String EDITOR_DOC_COMMENT_COLOR = RutaColorConstants.RUTA_DOC_COMMENT;
- public final static String EDITOR_DOC_COMMENT_COLOR_BOLD = RutaColorConstants.TM_DOC_COMMENT
+ public final static String EDITOR_DOC_COMMENT_COLOR_BOLD = RutaColorConstants.RUTA_DOC_COMMENT
+ EDITOR_BOLD_SUFFIX;
- public final static String EDITOR_DOC_COMMENT_COLOR_ITALIC = RutaColorConstants.TM_DOC_COMMENT
+ public final static String EDITOR_DOC_COMMENT_COLOR_ITALIC = RutaColorConstants.RUTA_DOC_COMMENT
+ EDITOR_ITALIC_SUFFIX;
- public final static String EDITOR_DOC_COMMENT_COLOR_STRIKETHROUGH = RutaColorConstants.TM_DOC_COMMENT
+ public final static String EDITOR_DOC_COMMENT_COLOR_STRIKETHROUGH = RutaColorConstants.RUTA_DOC_COMMENT
+ EDITOR_STRIKETHROUGH_SUFFIX;
- public final static String EDITOR_DOC_COMMENT_COLOR_UNDERLINE = RutaColorConstants.TM_DOC_COMMENT
+ public final static String EDITOR_DOC_COMMENT_COLOR_UNDERLINE = RutaColorConstants.RUTA_DOC_COMMENT
+ EDITOR_UNDERLINE_SUFFIX;
- public final static String EDITOR_VARIABLE_COLOR = RutaColorConstants.TM_DOC_COMMENT;
+ public final static String EDITOR_VARIABLE_COLOR = RutaColorConstants.RUTA_DOC_COMMENT;
- public final static String EDITOR_VARIABLE_COLOR_BOLD = RutaColorConstants.TM_DOC_COMMENT
+ public final static String EDITOR_VARIABLE_COLOR_BOLD = RutaColorConstants.RUTA_DOC_COMMENT
+ EDITOR_BOLD_SUFFIX;
- public final static String EDITOR_VARIABLE_COLOR_ITALIC = RutaColorConstants.TM_DOC_COMMENT
+ public final static String EDITOR_VARIABLE_COLOR_ITALIC = RutaColorConstants.RUTA_DOC_COMMENT
+ EDITOR_ITALIC_SUFFIX;
- public final static String EDITOR_VARIABLE_COLOR_STRIKETHROUGH = RutaColorConstants.TM_DOC_COMMENT
+ public final static String EDITOR_VARIABLE_COLOR_STRIKETHROUGH = RutaColorConstants.RUTA_DOC_COMMENT
+ EDITOR_STRIKETHROUGH_SUFFIX;
- public final static String EDITOR_VARIABLE_COLOR_UNDERLINE = RutaColorConstants.TM_DOC_COMMENT
+ public final static String EDITOR_VARIABLE_COLOR_UNDERLINE = RutaColorConstants.RUTA_DOC_COMMENT
+ EDITOR_UNDERLINE_SUFFIX;
public final static String EDITOR_SMART_PASTE_MODE = "smartPasteMode"; //$NON-NLS-1$
@@ -218,7 +218,7 @@ public class RutaPreferenceConstants ext
public static final String DOC_TM_PAGES_LOCATIONS = "doc_tm_pages_location";
- public static final String COMMENT_TASK_TAGS = RutaColorConstants.TM_TODO_TAG;// RutaColorConstants
+ public static final String COMMENT_TASK_TAGS = RutaColorConstants.RUTA_TODO_TAG;// RutaColorConstants
public static final String COMMENT_TASK_TAGS_BOLD = COMMENT_TASK_TAGS + EDITOR_BOLD_SUFFIX;
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/RutaUILanguageToolkit.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/RutaUILanguageToolkit.java?rev=1478049&r1=1478048&r2=1478049&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/RutaUILanguageToolkit.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/RutaUILanguageToolkit.java Wed May 1 15:21:51 2013
@@ -90,7 +90,7 @@ public class RutaUILanguageToolkit exten
@Override
public String getPartitioningId() {
- return RutaConstants.TM_PARTITIONING;
+ return RutaConstants.RUTA_PARTITIONING;
}
@Override
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/editor/RutaDocumentSetupParticipant.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/editor/RutaDocumentSetupParticipant.java?rev=1478049&r1=1478048&r2=1478049&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/editor/RutaDocumentSetupParticipant.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/editor/RutaDocumentSetupParticipant.java Wed May 1 15:21:51 2013
@@ -36,6 +36,6 @@ public class RutaDocumentSetupParticipan
*/
public void setup(IDocument document) {
RutaTextTools tools = RutaIdePlugin.getDefault().getTextTools();
- tools.setupDocumentPartitioner(document, RutaPartitions.TM_PARTITIONING);
+ tools.setupDocumentPartitioner(document, RutaPartitions.RUTA_PARTITIONING);
}
}
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=1478049&r1=1478048&r2=1478049&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 15:21:51 2013
@@ -105,7 +105,7 @@ public class RutaEditor extends ScriptEd
viewer.setRedraw(false);
final String type = TextUtilities.getContentType(viewer.getDocument(),
- RutaPartitions.TM_PARTITIONING, selection.x, true);
+ RutaPartitions.RUTA_PARTITIONING, selection.x, true);
if (type.equals(IDocument.DEFAULT_CONTENT_TYPE) && selection.y == 0) {
try {
@@ -280,7 +280,7 @@ public class RutaEditor extends ScriptEd
protected void connectPartitioningToElement(IEditorInput input, IDocument document) {
if (document instanceof IDocumentExtension3) {
IDocumentExtension3 doc = (IDocumentExtension3) document;
- if (doc.getDocumentPartitioner(RutaPartitions.TM_PARTITIONING) == null) {
+ if (doc.getDocumentPartitioner(RutaPartitions.RUTA_PARTITIONING) == null) {
IDocumentSetupParticipant participant = new RutaDocumentSetupParticipant();
participant.setup(document);
}
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/preferences/RutaEditorColoringConfigurationBlock.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/preferences/RutaEditorColoringConfigurationBlock.java?rev=1478049&r1=1478048&r2=1478049&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/preferences/RutaEditorColoringConfigurationBlock.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/preferences/RutaEditorColoringConfigurationBlock.java Wed May 1 15:21:51 2013
@@ -106,7 +106,7 @@ public class RutaEditorColoringConfigura
IColorManager colorManager, IPreferenceStore preferenceStore, ITextEditor editor,
boolean configureFormatter) {
return new SimpleRutaSourceViewerConfiguration(colorManager, preferenceStore, editor,
- RutaPartitions.TM_PARTITIONING, configureFormatter);
+ RutaPartitions.RUTA_PARTITIONING, configureFormatter);
}
@Override
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/preferences/RutaFormatterPreferencePage.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/preferences/RutaFormatterPreferencePage.java?rev=1478049&r1=1478048&r2=1478049&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/preferences/RutaFormatterPreferencePage.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/preferences/RutaFormatterPreferencePage.java Wed May 1 15:21:51 2013
@@ -70,7 +70,7 @@ public class RutaFormatterPreferencePage
IColorManager colorManager, IPreferenceStore preferenceStore, ITextEditor editor,
boolean configureFormatter) {
return new SimpleRutaSourceViewerConfiguration(colorManager, preferenceStore, editor,
- RutaPartitions.TM_PARTITIONING, configureFormatter);
+ RutaPartitions.RUTA_PARTITIONING, configureFormatter);
}
@Override
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/templates/RutaCodeTemplatesPreferencePage.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/templates/RutaCodeTemplatesPreferencePage.java?rev=1478049&r1=1478048&r2=1478049&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/templates/RutaCodeTemplatesPreferencePage.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/templates/RutaCodeTemplatesPreferencePage.java Wed May 1 15:21:51 2013
@@ -40,7 +40,7 @@ public class RutaCodeTemplatesPreference
@Override
protected ScriptSourceViewerConfiguration createSourceViewerConfiguration() {
return new SimpleRutaSourceViewerConfiguration(getTextTools().getColorManager(),
- getPreferenceStore(), null, RutaPartitions.TM_PARTITIONING, false);
+ getPreferenceStore(), null, RutaPartitions.RUTA_PARTITIONING, false);
}
/*
@@ -50,7 +50,7 @@ public class RutaCodeTemplatesPreference
*/
@Override
protected void setDocumentParticioner(IDocument document) {
- getTextTools().setupDocumentPartitioner(document, RutaPartitions.TM_PARTITIONING);
+ getTextTools().setupDocumentPartitioner(document, RutaPartitions.RUTA_PARTITIONING);
}
/*
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/text/RutaAutoEditStrategy.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/text/RutaAutoEditStrategy.java?rev=1478049&r1=1478048&r2=1478049&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/text/RutaAutoEditStrategy.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/text/RutaAutoEditStrategy.java Wed May 1 15:21:51 2013
@@ -222,11 +222,11 @@ public class RutaAutoEditStrategy extend
if (forward) {
while (i < d.getLength()) {
ITypedRegion region = TextUtilities.getPartition(d, fPartitioning, i, true);
- if (region.getType() == RutaPartitions.TM_COMMENT && skipCommentLines) {
+ if (region.getType() == RutaPartitions.RUTA_COMMENT && skipCommentLines) {
i = region.getOffset() + region.getLength();
continue;
}
- if (region.getType() == RutaPartitions.TM_STRING && skipStrings) {
+ if (region.getType() == RutaPartitions.RUTA_STRING && skipStrings) {
i = region.getOffset() + region.getLength();
continue;
}
@@ -245,11 +245,11 @@ public class RutaAutoEditStrategy extend
} else {
while (i >= 0) {
ITypedRegion region = TextUtilities.getPartition(d, fPartitioning, i, true);
- if (region.getType() == RutaPartitions.TM_COMMENT && skipCommentLines) {
+ if (region.getType() == RutaPartitions.RUTA_COMMENT && skipCommentLines) {
i = region.getOffset() - 1;
continue;
}
- if (region.getType() == RutaPartitions.TM_STRING && skipStrings) {
+ if (region.getType() == RutaPartitions.RUTA_STRING && skipStrings) {
i = region.getOffset() - 1;
continue;
}
@@ -346,11 +346,11 @@ public class RutaAutoEditStrategy extend
* the document
*/
private static void installStuff(Document document) {
- String[] types = new String[] { RutaPartitions.TM_STRING,
- RutaPartitions.TM_COMMENT, IDocument.DEFAULT_CONTENT_TYPE };
+ String[] types = new String[] { RutaPartitions.RUTA_STRING,
+ RutaPartitions.RUTA_COMMENT, IDocument.DEFAULT_CONTENT_TYPE };
FastPartitioner partitioner = new FastPartitioner(new RutaPartitionScanner(), types);
partitioner.connect(document);
- document.setDocumentPartitioner(RutaPartitions.TM_PARTITIONING, partitioner);
+ document.setDocumentPartitioner(RutaPartitions.RUTA_PARTITIONING, partitioner);
}
/**
@@ -360,7 +360,7 @@ public class RutaAutoEditStrategy extend
* the document
*/
private static void removeStuff(Document document) {
- document.setDocumentPartitioner(RutaPartitions.TM_PARTITIONING, null);
+ document.setDocumentPartitioner(RutaPartitions.RUTA_PARTITIONING, null);
}
/**
@@ -391,13 +391,13 @@ public class RutaAutoEditStrategy extend
// STRINGS
if (newLine) {
// if we wrap string
- if (getRegionType(d, offset) == RutaPartitions.TM_STRING) {
+ if (getRegionType(d, offset) == RutaPartitions.RUTA_STRING) {
int realLine = d.getLineOfOffset(offset);
String curIndent = getLineIndent(d, realLine);
// if we just closed string
if (d.getChar(offset - 1) != '"') {
// if we are fully in string
- if (getRegionType(d, d.getLineOffset(realLine)) == RutaPartitions.TM_STRING) {
+ if (getRegionType(d, d.getLineOffset(realLine)) == RutaPartitions.RUTA_STRING) {
return curIndent;
}
// if we first time wrap string
@@ -406,7 +406,7 @@ public class RutaAutoEditStrategy extend
}
} else {
// don't correct strings
- if (getRegionType(d, d.getLineOffset(line)) == RutaPartitions.TM_STRING) {
+ if (getRegionType(d, d.getLineOffset(line)) == RutaPartitions.RUTA_STRING) {
return getLineIndent(d, line); // notice, that we don't use
// null
}
@@ -469,7 +469,7 @@ public class RutaAutoEditStrategy extend
// first check, if we not inside string, if yes, jump to start
ITypedRegion region = TextUtilities.getPartition(d, fPartitioning,
d.getLineOffset(lastNonEmptyLine), true);
- if (region.getType() == RutaPartitions.TM_STRING) {
+ if (region.getType() == RutaPartitions.RUTA_STRING) {
lastNonEmptyLine = d.getLineOfOffset(region.getOffset());
}
@@ -595,7 +595,7 @@ public class RutaAutoEditStrategy extend
// after-string
int prevLine = getLastNonEmptyLine(d, line - 1);
- if (getRegionType(d, d.getLineOffset(prevLine)) == RutaPartitions.TM_STRING)
+ if (getRegionType(d, d.getLineOffset(prevLine)) == RutaPartitions.RUTA_STRING)
return previousLineIndent;
return null;
@@ -872,14 +872,7 @@ public class RutaAutoEditStrategy extend
if (DLTKCore.DEBUG) {
System.err.println("Bug:PTN-9");
}
- // if (c.offset - 1 >= 0 &&
- // d.getChar(c.offset - 1) != '"' &&
- // getRegionType(d, c.offset - 1) ==
- // RutaPartitions.TM_STRING)
- // c.text = "\\" + c.text + indent;
- // else {
c.text = c.text + indent;
- // }
}
} catch (BadLocationException e) {
super.customizeDocumentCommand(d, c);
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/text/RutaCodeScanner.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/text/RutaCodeScanner.java?rev=1478049&r1=1478048&r2=1478049&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/text/RutaCodeScanner.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/text/RutaCodeScanner.java Wed May 1 15:21:51 2013
@@ -35,12 +35,12 @@ import org.eclipse.jface.text.rules.Whit
public class RutaCodeScanner extends AbstractScriptScanner {
private static String fgTokenProperties[] = new String[] {
- RutaColorConstants.TM_SINGLE_LINE_COMMENT, RutaColorConstants.TM_DEFAULT,
- RutaColorConstants.TM_KEYWORD, RutaColorConstants.TM_KEYWORD_RETURN,
- RutaColorConstants.TM_NUMBER, RutaColorConstants.TM_FUNCTION,
- RutaColorConstants.TM_CONDITION, RutaColorConstants.TM_ACTION,
- RutaColorConstants.TM_RULE, RutaColorConstants.TM_DECLARATION,
- RutaColorConstants.TM_BASICSYMBOL, RutaColorConstants.TM_THEN };
+ RutaColorConstants.RUTA_SINGLE_LINE_COMMENT, RutaColorConstants.RUTA_DEFAULT,
+ RutaColorConstants.RUTA_KEYWORD, RutaColorConstants.RUTA_KEYWORD_RETURN,
+ RutaColorConstants.RUTA_NUMBER, RutaColorConstants.RUTA_FUNCTION,
+ RutaColorConstants.RUTA_CONDITION, RutaColorConstants.RUTA_ACTION,
+ RutaColorConstants.RUTA_RULE, RutaColorConstants.RUTA_DECLARATION,
+ RutaColorConstants.RUTA_BASICSYMBOL, RutaColorConstants.RUTA_THEN };
public RutaCodeScanner(IColorManager manager, IPreferenceStore store) {
super(manager, store);
@@ -55,18 +55,18 @@ public class RutaCodeScanner extends Abs
@Override
protected List createRules() {
List<IRule> rules = new ArrayList<IRule>();
- IToken keyword = getToken(RutaColorConstants.TM_KEYWORD);
- IToken rule = getToken(RutaColorConstants.TM_RULE);
- IToken comment = getToken(RutaColorConstants.TM_SINGLE_LINE_COMMENT);
- IToken other = getToken(RutaColorConstants.TM_DEFAULT);
- IToken declaration = getToken(RutaColorConstants.TM_DECLARATION);
- IToken basicSymbol = getToken(RutaColorConstants.TM_BASICSYMBOL);
- IToken function = getToken(RutaColorConstants.TM_FUNCTION);
- IToken condition = getToken(RutaColorConstants.TM_CONDITION);
- IToken action = getToken(RutaColorConstants.TM_ACTION);
- IToken then = getToken(RutaColorConstants.TM_THEN);
- IToken number = getToken(RutaColorConstants.TM_NUMBER);
- IToken string = getToken(RutaColorConstants.TM_STRING);
+ IToken keyword = getToken(RutaColorConstants.RUTA_KEYWORD);
+ IToken rule = getToken(RutaColorConstants.RUTA_RULE);
+ IToken comment = getToken(RutaColorConstants.RUTA_SINGLE_LINE_COMMENT);
+ IToken other = getToken(RutaColorConstants.RUTA_DEFAULT);
+ IToken declaration = getToken(RutaColorConstants.RUTA_DECLARATION);
+ IToken basicSymbol = getToken(RutaColorConstants.RUTA_BASICSYMBOL);
+ IToken function = getToken(RutaColorConstants.RUTA_FUNCTION);
+ IToken condition = getToken(RutaColorConstants.RUTA_CONDITION);
+ IToken action = getToken(RutaColorConstants.RUTA_ACTION);
+ IToken then = getToken(RutaColorConstants.RUTA_THEN);
+ IToken number = getToken(RutaColorConstants.RUTA_NUMBER);
+ IToken string = getToken(RutaColorConstants.RUTA_STRING);
// rules.add(new MultiLineRule("/*", "*/", comment, '\\', true));
// rules.add(new EndOfLineRule("//", comment));
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/text/RutaColorConstants.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/text/RutaColorConstants.java?rev=1478049&r1=1478048&r2=1478049&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/text/RutaColorConstants.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/text/RutaColorConstants.java Wed May 1 15:21:51 2013
@@ -26,35 +26,35 @@ public final class RutaColorConstants {
private RutaColorConstants() {
}
- public static final String TM_STRING = DLTKColorConstants.DLTK_STRING;
+ public static final String RUTA_STRING = DLTKColorConstants.DLTK_STRING;
- public static final String TM_SINGLE_LINE_COMMENT = DLTKColorConstants.DLTK_SINGLE_LINE_COMMENT;
+ public static final String RUTA_SINGLE_LINE_COMMENT = DLTKColorConstants.DLTK_SINGLE_LINE_COMMENT;
- public static final String TM_DOC_COMMENT = DLTKColorConstants.DLTK_DOC;
+ public static final String RUTA_DOC_COMMENT = DLTKColorConstants.DLTK_DOC;
- public static final String TM_NUMBER = DLTKColorConstants.DLTK_NUMBER;
+ public static final String RUTA_NUMBER = DLTKColorConstants.DLTK_NUMBER;
- public static final String TM_KEYWORD = DLTKColorConstants.DLTK_KEYWORD;
+ public static final String RUTA_KEYWORD = DLTKColorConstants.DLTK_KEYWORD;
- public static final String TM_KEYWORD_RETURN = DLTKColorConstants.DLTK_KEYWORD_RETURN;
+ public static final String RUTA_KEYWORD_RETURN = DLTKColorConstants.DLTK_KEYWORD_RETURN;
- public static final String TM_DEFAULT = DLTKColorConstants.DLTK_DEFAULT;
+ public static final String RUTA_DEFAULT = DLTKColorConstants.DLTK_DEFAULT;
- public static final String TM_CONDITION = "tm_condition"; //$NON-NLS-1$
+ public static final String RUTA_CONDITION = "ruta_condition"; //$NON-NLS-1$
- public static final String TM_ACTION = "tm_action"; //$NON-NLS-1$
+ public static final String RUTA_ACTION = "ruta_action"; //$NON-NLS-1$
- public static final String TM_RULE = "tm_rule";
+ public static final String RUTA_RULE = "ruta_rule";
- public static final String TM_THEN = "tm_then";
+ public static final String RUTA_THEN = "ruta_then";
- public static final String TM_DECLARATION = "tm_declaration";
+ public static final String RUTA_DECLARATION = "ruta_declaration";
- public static final String TM_BASICSYMBOL = "tm_basicSymbol";
+ public static final String RUTA_BASICSYMBOL = "ruta_basicSymbol";
- public static final String TM_FUNCTION = "tm_function";
+ public static final String RUTA_FUNCTION = "ruta_function";
- public static final String TM_VARIABLE = "tm_variable"; //$NON-NLS-1$
+ public static final String RUTA_VARIABLE = "ruta_variable"; //$NON-NLS-1$
- public static final String TM_TODO_TAG = DLTKColorConstants.TASK_TAG; // DLTKColorConstants.TASK_TAG;
+ public static final String RUTA_TODO_TAG = DLTKColorConstants.TASK_TAG; // DLTKColorConstants.TASK_TAG;
}
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/text/RutaPartitionScanner.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/text/RutaPartitionScanner.java?rev=1478049&r1=1478048&r2=1478049&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/text/RutaPartitionScanner.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/text/RutaPartitionScanner.java Wed May 1 15:21:51 2013
@@ -36,8 +36,8 @@ public class RutaPartitionScanner extend
public RutaPartitionScanner() {
super();
- IToken string = new Token(RutaPartitions.TM_STRING);
- IToken comment = new Token(RutaPartitions.TM_COMMENT);
+ IToken string = new Token(RutaPartitions.RUTA_STRING);
+ IToken comment = new Token(RutaPartitions.RUTA_COMMENT);
List/* < IPredicateRule > */rules = new ArrayList/* <IPredicateRule> */();
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/text/RutaSourceViewerConfiguration.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/text/RutaSourceViewerConfiguration.java?rev=1478049&r1=1478048&r2=1478049&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/text/RutaSourceViewerConfiguration.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/text/RutaSourceViewerConfiguration.java Wed May 1 15:21:51 2013
@@ -75,7 +75,7 @@ public class RutaSourceViewerConfigurati
@Override
public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) {
- return RutaPartitions.TM_PARTITION_TYPES;
+ return RutaPartitions.RUTA_PARTITION_TYPES;
}
@Override
@@ -99,11 +99,8 @@ public class RutaSourceViewerConfigurati
Assert.isTrue(isNewSetup());
fCodeScanner = new RutaCodeScanner(getColorManager(), fPreferenceStore);
fStringScanner = new RutaStringScanner(getColorManager(), fPreferenceStore);
- fCommentScanner = createCommentScanner(RutaColorConstants.TM_SINGLE_LINE_COMMENT,
- RutaColorConstants.TM_TODO_TAG);
- // fCommentScanner = new SingleTokenScriptScanner(getColorManager(),
- // fPreferenceStore,
- // RutaColorConstants.TM_SINGLE_LINE_COMMENT);
+ fCommentScanner = createCommentScanner(RutaColorConstants.RUTA_SINGLE_LINE_COMMENT,
+ RutaColorConstants.RUTA_TODO_TAG);
}
@Override
@@ -113,15 +110,13 @@ public class RutaSourceViewerConfigurati
assistant, IDocument.DEFAULT_CONTENT_TYPE);
assistant.setContentAssistProcessor(scriptProcessor, IDocument.DEFAULT_CONTENT_TYPE);
- // RutaPartitions.TM_COMMENT
ContentAssistProcessor singleLineProcessor = new RutaScriptCompletionProcessor(
- getEditor(), assistant, RutaPartitions.TM_COMMENT);
- assistant.setContentAssistProcessor(singleLineProcessor, RutaPartitions.TM_COMMENT);
+ getEditor(), assistant, RutaPartitions.RUTA_COMMENT);
+ assistant.setContentAssistProcessor(singleLineProcessor, RutaPartitions.RUTA_COMMENT);
- // RutaPartitions.TM_STRING
ContentAssistProcessor stringProcessor = new RutaScriptCompletionProcessor(getEditor(),
- assistant, RutaPartitions.TM_STRING);
- assistant.setContentAssistProcessor(stringProcessor, RutaPartitions.TM_STRING);
+ assistant, RutaPartitions.RUTA_STRING);
+ assistant.setContentAssistProcessor(stringProcessor, RutaPartitions.RUTA_STRING);
}
private boolean isNewSetup() {
@@ -151,12 +146,12 @@ public class RutaSourceViewerConfigurati
reconciler.setRepairer(dr, IDocument.DEFAULT_CONTENT_TYPE);
dr = new DefaultDamagerRepairer(getStringScanner());
- reconciler.setDamager(dr, RutaPartitions.TM_STRING);
- reconciler.setRepairer(dr, RutaPartitions.TM_STRING);
+ reconciler.setDamager(dr, RutaPartitions.RUTA_STRING);
+ reconciler.setRepairer(dr, RutaPartitions.RUTA_STRING);
dr = new DefaultDamagerRepairer(getCommentScanner());
- reconciler.setDamager(dr, RutaPartitions.TM_COMMENT);
- reconciler.setRepairer(dr, RutaPartitions.TM_COMMENT);
+ reconciler.setDamager(dr, RutaPartitions.RUTA_COMMENT);
+ reconciler.setRepairer(dr, RutaPartitions.RUTA_COMMENT);
return reconciler;
}
@@ -258,8 +253,8 @@ public class RutaSourceViewerConfigurati
@Override
protected void initializeQuickOutlineContexts(InformationPresenter presenter,
IInformationProvider provider) {
- presenter.setInformationProvider(provider, RutaPartitions.TM_COMMENT);
- presenter.setInformationProvider(provider, RutaPartitions.TM_STRING);
+ presenter.setInformationProvider(provider, RutaPartitions.RUTA_COMMENT);
+ presenter.setInformationProvider(provider, RutaPartitions.RUTA_STRING);
}
@Override
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/text/RutaStringScanner.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/text/RutaStringScanner.java?rev=1478049&r1=1478048&r2=1478049&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/text/RutaStringScanner.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/text/RutaStringScanner.java Wed May 1 15:21:51 2013
@@ -30,8 +30,8 @@ import org.eclipse.jface.text.rules.Whit
public class RutaStringScanner extends AbstractScriptScanner {
private static final String[] tokenProperties = new String[] {
- RutaColorConstants.TM_STRING, RutaColorConstants.TM_NUMBER,
- RutaColorConstants.TM_VARIABLE };
+ RutaColorConstants.RUTA_STRING, RutaColorConstants.RUTA_NUMBER,
+ RutaColorConstants.RUTA_VARIABLE };
public RutaStringScanner(IColorManager manager, IPreferenceStore store) {
super(manager, store);
@@ -51,7 +51,7 @@ public class RutaStringScanner extends A
// Add generic whitespace rule.
rules.add(new WhitespaceRule(new RutaWhitespaceDetector()));
- setDefaultReturnToken(getToken(RutaColorConstants.TM_STRING));
+ setDefaultReturnToken(getToken(RutaColorConstants.RUTA_STRING));
return rules;
}
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/text/RutaTextTools.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/text/RutaTextTools.java?rev=1478049&r1=1478048&r2=1478049&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/text/RutaTextTools.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/text/RutaTextTools.java Wed May 1 15:21:51 2013
@@ -41,13 +41,13 @@ public class RutaTextTools extends Scrip
private IPartitionTokenScanner fPartitionScanner;
private SimpleClassDLTKExtensionManager extensions = new SimpleClassDLTKExtensionManager(
- RutaIdePlugin.PLUGIN_ID + ".tmSemanticHighlighting"); //$NON-NLS-1$
+ RutaIdePlugin.PLUGIN_ID + ".rutaSemanticHighlighting"); //$NON-NLS-1$
private final static String[] LEGAL_CONTENT_TYPES = new String[] {
- RutaPartitions.TM_STRING, RutaPartitions.TM_COMMENT };
+ RutaPartitions.RUTA_STRING, RutaPartitions.RUTA_COMMENT };
public RutaTextTools(boolean autoDisposeOnDisplayDispose) {
- super(RutaPartitions.TM_PARTITIONING, LEGAL_CONTENT_TYPES, autoDisposeOnDisplayDispose);
+ super(RutaPartitions.RUTA_PARTITIONING, LEGAL_CONTENT_TYPES, autoDisposeOnDisplayDispose);
fPartitionScanner = new RutaPartitionScanner();
}
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/text/folding/RutaFoldingStructureProvider.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/text/folding/RutaFoldingStructureProvider.java?rev=1478049&r1=1478048&r2=1478049&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/text/folding/RutaFoldingStructureProvider.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/text/folding/RutaFoldingStructureProvider.java Wed May 1 15:21:51 2013
@@ -133,7 +133,7 @@ public class RutaFoldingStructureProvide
*/
@Override
protected String getCommentPartition() {
- return RutaPartitions.TM_COMMENT;
+ return RutaPartitions.RUTA_COMMENT;
}
/*
@@ -149,7 +149,7 @@ public class RutaFoldingStructureProvide
*/
@Override
protected String getPartition() {
- return RutaPartitions.TM_PARTITIONING;
+ return RutaPartitions.RUTA_PARTITIONING;
}
/*
@@ -165,7 +165,7 @@ public class RutaFoldingStructureProvide
*/
@Override
protected String[] getPartitionTypes() {
- return RutaPartitions.TM_PARTITION_TYPES;
+ return RutaPartitions.RUTA_PARTITION_TYPES;
}
/*
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/validator/RutaCheckerUtils.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/validator/RutaCheckerUtils.java?rev=1478049&r1=1478048&r2=1478049&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/validator/RutaCheckerUtils.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/validator/RutaCheckerUtils.java Wed May 1 15:21:51 2013
@@ -76,7 +76,7 @@ public class RutaCheckerUtils {
e.printStackTrace();
}
String fileNameWithoutExtension = path.substring(path.lastIndexOf('.') + 1);
- String fileNameWithExtension = fileNameWithoutExtension + ".tm";
+ String fileNameWithExtension = fileNameWithoutExtension + RutaEngine.SCRIPT_FILE_EXTENSION;
ISourceModule sourceModule = null;
boolean found = false;
for (IFolder eachFolder : scriptFolders) {
@@ -191,7 +191,7 @@ public class RutaCheckerUtils {
return false;
}
for (IFolder folder : allDescriptorFolders) {
- String fileExtended = xmlFilePath.replaceAll("[.]", "/") + ".tm";
+ String fileExtended = xmlFilePath.replaceAll("[.]", "/") + RutaEngine.SCRIPT_FILE_EXTENSION;
IFile iFile = RutaCheckerUtils.getFile(folder, fileExtended);
result |= iFile.exists();
}
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/validator/RutaEngineAndCallChecker.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/validator/RutaEngineAndCallChecker.java?rev=1478049&r1=1478048&r2=1478049&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/validator/RutaEngineAndCallChecker.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/validator/RutaEngineAndCallChecker.java Wed May 1 15:21:51 2013
@@ -210,23 +210,5 @@ public class RutaEngineAndCallChecker im
}
}
- // /**
- // * @param filePath
- // * absolute full path. i.e.: "org.apache.uima.myengine" ".xml" will be
- // * added.
- // * @return file.exists
- // */
- // private boolean checkBlockCall(String filePath) {
- // // try engine
- // if (checkEngineImport(filePath)) {
- // return true;
- // }
- // String fileExtended = filePath + ".tm";
- // IFolder scriptFolder = project.getProject().getFolder(
- // RutaLanguageToolkit.getDefault()
- // .getDefaultDescriptorLocation());
- // IFile iFile = getFile(scriptFolder, fileExtended);
- // return iFile.exists();
- // }
}
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/resources/org/apache/uima/ruta/ide/launching/builtins.ruta
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/resources/org/apache/uima/ruta/ide/launching/builtins.ruta?rev=1478049&r1=1478048&r2=1478049&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/resources/org/apache/uima/ruta/ide/launching/builtins.ruta (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/resources/org/apache/uima/ruta/ide/launching/builtins.ruta Wed May 1 15:21:51 2013
@@ -1 +1 @@
-PACKAGE org.apache.uima.tm;
\ No newline at end of file
+PACKAGE org.apache.uima.ruta;
\ No newline at end of file