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 2012/01/17 19:21:38 UTC
svn commit: r1232523 [1/2] - in /uima/sandbox/trunk/TextMarker:
uimaj-ep-textmarker-addons/META-INF/
uimaj-ep-textmarker-caseditor/META-INF/ uimaj-ep-textmarker-ide/META-INF/
uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/
ui...
Author: pkluegl
Date: Tue Jan 17 18:21:36 2012
New Revision: 1232523
URL: http://svn.apache.org/viewvc?rev=1232523&view=rev
Log:
UIMA-2256
Switched DLTK dependency to R3_0_maintenance. Adapted TextMarker implementation to new interfaces and general changes in DLTK Core. Tested overall functionality of IDE, but there are probably still some issues.
Added:
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/validator/TextMarkerProblemIdentifier.java
Removed:
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/TextMarkerSourceIndexerRequestor.java
Modified:
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/META-INF/MANIFEST.MF
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/META-INF/MANIFEST.MF
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/META-INF/MANIFEST.MF
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/TextMarkerCalleeProcessor.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/TextMarkerSearchFactory.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/builder/TextMarkerBuilder.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/codeassist/TextMarkerAssistParser.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/codeassist/TextMarkerCompletionEngine.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/codeassist/TextMarkerCompletionParser.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/codeassist/TextMarkerSelectionEngine.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/codeassist/TextMarkerSelectionParser.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/packages/TextMarkerCheckBuilder.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/packages/TextMarkerPackagesInterpreterContainerExtension.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerSourceElementRequestVisitor.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerSourceParser.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/search/TextMarkerMatchLocator.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/debug/ui/interpreters/TextMarkerInterpreterComboBlock.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/debug/ui/interpreters/TextMarkerInterpreterContainerWizardPage.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/debug/ui/interpreters/TextMarkerInterpreterTab.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/debug/ui/launchConfiguration/TextMarkerMainLaunchConfigurationTab.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/formatter/TextMarkerFormattedPrinter.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/formatter/TextMarkerFormatter.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/DefaultTextMarkerSemanticHighlightingExtension.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/TextMarkerSemanticPositionUpdater.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/console/PasteTextMarkerTextToConsoleAction.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/console/TextMarkerConsoleFactory.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/editor/TextMarkerEditor.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/preferences/TextMarkerBuildpathPropertyPage.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/text/TextMarkerCorrectionProcessor.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/text/TextMarkerPairMatcher.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/text/TextMarkerTextTools.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/text/completion/TextMarkerCompletionProposalCollector.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/text/completion/TextMarkerCompletionProposalLabelProvider.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/text/completion/TextMarkerScriptCompletionProcessor.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/text/folding/TextMarkerFoldingStructureProvider.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/wizards/TextMarkerFileCreationPage.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/wizards/TextMarkerProjectCreationWizard.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/wizards/TextMarkerProjectWizardFirstPage.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/wizards/TextMarkerProjectWizardSecondPage.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/validator/TextMarkerCheckerDefaultProblem.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/validator/TextMarkerCheckerProblemFactory.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/validator/TextMarkerTypeChecker.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-textruler/META-INF/MANIFEST.MF
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/META-INF/MANIFEST.MF?rev=1232523&r1=1232522&r2=1232523&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/META-INF/MANIFEST.MF (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/META-INF/MANIFEST.MF Tue Jan 17 18:21:36 2012
@@ -11,11 +11,11 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.core.resources,
org.apache.uima.textmarker.ide;bundle-version="1.0.0",
org.eclipse.ui.ide,
- org.eclipse.dltk.core;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.dltk.core;bundle-version="[3.0.0,4.0.0)",
org.eclipse.jface.text,
org.eclipse.dltk.ui;bundle-version="1.0.2",
org.eclipse.ui.editors,
- org.eclipse.dltk.launching;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.dltk.launching;bundle-version="[3.0.0,4.0.0)",
org.eclipse.debug.ui;bundle-version="3.5.0",
org.apache.uima.caseditor;bundle-version="2.4.0",
org.apache.uima.textmarker.caseditor;bundle-version="1.0.0",
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/META-INF/MANIFEST.MF?rev=1232523&r1=1232522&r2=1232523&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/META-INF/MANIFEST.MF (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/META-INF/MANIFEST.MF Tue Jan 17 18:21:36 2012
@@ -12,11 +12,9 @@ Require-Bundle: org.apache.uima.casedito
org.eclipse.core.resources,
org.apache.uima.textmarker.ide;bundle-version="1.0.0",
org.eclipse.ui.ide,
- org.eclipse.dltk.core;bundle-version="[1.0.0,2.0.0)",
org.eclipse.jface.text,
org.eclipse.dltk.ui;bundle-version="1.0.2",
org.eclipse.ui.editors,
- org.eclipse.dltk.launching;bundle-version="[1.0.0,2.0.0)",
org.eclipse.debug.ui;bundle-version="3.5.0"
Export-Package: org.apache.uima.textmarker.caseditor.view.browser,
org.apache.uima.textmarker.caseditor.view.selection,
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/META-INF/MANIFEST.MF?rev=1232523&r1=1232522&r2=1232523&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/META-INF/MANIFEST.MF (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/META-INF/MANIFEST.MF Tue Jan 17 18:21:36 2012
@@ -7,21 +7,21 @@ Bundle-Activator: org.apache.uima.textma
Bundle-Vendor: University of Würzburg
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.dltk.core;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.dltk.core;bundle-version="[3.0.0,4.0.0)",
org.eclipse.core.resources,
- org.eclipse.dltk.launching;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.dltk.validators.core;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.dltk.launching;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.dltk.validators.core;bundle-version="[3.0.0,4.0.0)",
org.eclipse.ui,
org.apache.uima.runtime;bundle-version="2.3.0",
- org.eclipse.dltk.console;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.dltk.console.ui;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.dltk;bundle-version="[1.0.1,2.0.0)",
- org.eclipse.dltk.debug;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.dltk.debug.ui;bundle-version="[1.0.1,2.0.0)",
- org.eclipse.dltk.formatter;bundle-version="[1.0.1,2.0.0)",
- org.eclipse.dltk.testing;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.dltk.ui;bundle-version="[1.0.2,2.0.0)",
- org.eclipse.dltk.validators.ui;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.dltk.console;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.dltk.console.ui;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.dltk;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.dltk.debug;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.dltk.debug.ui;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.dltk.formatter;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.dltk.testing;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.dltk.ui;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.dltk.validators.ui;bundle-version="[3.0.0,4.0.0)",
org.eclipse.jface.text;bundle-version="3.5.0",
org.eclipse.ui.editors;bundle-version="3.5.0",
org.eclipse.ui.ide;bundle-version="3.5.0",
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/TextMarkerCalleeProcessor.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/TextMarkerCalleeProcessor.java?rev=1232523&r1=1232522&r2=1232523&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/TextMarkerCalleeProcessor.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/TextMarkerCalleeProcessor.java Tue Jan 17 18:21:36 2012
@@ -61,8 +61,8 @@ public class TextMarkerCalleeProcessor i
private class CaleeSourceElementRequestor extends SourceElementRequestorAdaptor {
@Override
- public void acceptMethodReference(char[] methodName, int argCount, int sourcePosition,
- int sourceEndPosition) {
+ public void acceptMethodReference(String methodName, int argCount,
+ int sourcePosition, int sourceEndPosition) {
String name = new String(methodName);
int off = 0;
try {
@@ -85,7 +85,7 @@ public class TextMarkerCalleeProcessor i
ISourceElementParser parser = DLTKLanguageManager
.getSourceElementParser(TextMarkerNature.NATURE_ID);
parser.setRequestor(requestor);
- parser.parseSourceModule(new MethodSourceCode(method), null);
+ parser.parseSourceModule(new MethodSourceCode(method));
} else {
// TODO: Report error here.
}
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/TextMarkerSearchFactory.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/TextMarkerSearchFactory.java?rev=1232523&r1=1232522&r2=1232523&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/TextMarkerSearchFactory.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/TextMarkerSearchFactory.java Tue Jan 17 18:21:36 2012
@@ -19,13 +19,8 @@
package org.apache.uima.textmarker.ide.core;
-import org.eclipse.core.runtime.SubProgressMonitor;
import org.eclipse.dltk.core.search.AbstractSearchFactory;
-import org.eclipse.dltk.core.search.IDLTKSearchScope;
import org.eclipse.dltk.core.search.IMatchLocatorParser;
-import org.eclipse.dltk.core.search.SearchPattern;
-import org.eclipse.dltk.core.search.SearchRequestor;
-import org.eclipse.dltk.core.search.indexing.SourceIndexerRequestor;
import org.eclipse.dltk.core.search.matching.MatchLocator;
@@ -34,33 +29,15 @@ import org.eclipse.dltk.core.search.matc
*/
public class TextMarkerSearchFactory extends AbstractSearchFactory {
- /*
- * @see
- * org.eclipse.dltk.core.ISearchFactory#createMatchParser(org.eclipse.dltk.core.search.matching
- * .MatchLocator)
- */
public IMatchLocatorParser createMatchParser(MatchLocator locator) {
return new TextMarkerMatchLocatorParser(locator);
}
- /*
- * @see
- * org.eclipse.dltk.core.ISearchFactory#createMatchLocator(org.eclipse.dltk.core.search.SearchPattern
- * , org.eclipse.dltk.core.search.SearchRequestor, org.eclipse.dltk.core.search.IDLTKSearchScope,
- * org.eclipse.core.runtime.SubProgressMonitor)
- */
- @Override
- public MatchLocator createMatchLocator(SearchPattern pattern, SearchRequestor requestor,
- IDLTKSearchScope scope, SubProgressMonitor monitor) {
- return new MatchLocator(pattern, requestor, scope, monitor); // TextMarkerMatchLocator(pattern,
- // requestor, scope, monitor);
- }
-
- /*
- * @see org.eclipse.dltk.core.search.AbstractSearchFactory#createSourceRequestor()
- */
- @Override
- public SourceIndexerRequestor createSourceRequestor() {
- return new TextMarkerSourceIndexerRequestor();
- }
+// public SourceIndexerRequestor createSourceRequestor() {
+// return new TextMarkerSourceIndexerRequestor();
+// }
+
+// public ISearchPatternProcessor createSearchPatternProcessor() {
+// return new TextMarkerSearchPatternProcessor();
+// }
}
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/builder/TextMarkerBuilder.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/builder/TextMarkerBuilder.java?rev=1232523&r1=1232522&r2=1232523&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/builder/TextMarkerBuilder.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/builder/TextMarkerBuilder.java Tue Jan 17 18:21:36 2012
@@ -46,7 +46,6 @@ import org.eclipse.core.resources.IResou
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.SubProgressMonitor;
@@ -56,12 +55,9 @@ import org.eclipse.dltk.core.IDLTKLangua
import org.eclipse.dltk.core.IScriptProject;
import org.eclipse.dltk.core.ISourceModule;
import org.eclipse.dltk.core.ModelException;
-import org.eclipse.dltk.core.SourceParserUtil;
import org.eclipse.dltk.core.builder.IBuildContext;
import org.eclipse.dltk.core.builder.IBuildParticipant;
-import org.eclipse.dltk.internal.core.builder.BuildProblemReporter;
import org.eclipse.dltk.internal.core.builder.Messages;
-import org.eclipse.dltk.internal.core.builder.SourceModuleBuildContext;
import org.eclipse.dltk.internal.core.builder.StandardScriptBuilder;
import org.eclipse.jface.preference.IPreferenceStore;
@@ -75,25 +71,25 @@ public class TextMarkerBuilder extends S
super();// m
}
- @Override
- @SuppressWarnings("unchecked")
- public IStatus buildModelElements(IScriptProject project, List elements,
- IProgressMonitor monitor, int status) {
- List<ISourceModule> sources = elements;
- for (ISourceModule sourceModule : sources) {
- ModuleDeclaration moduleDeclaration = SourceParserUtil.getModuleDeclaration(sourceModule,
- null);
- generateDescriptorResources(sourceModule, moduleDeclaration, monitor);
- // callParticipants(project, moduleDeclaration);
- initialize(project);
- final SourceModuleBuildContext context = new SourceModuleBuildContext(sourceModule, status); // guessed
- context.set(IBuildContext.ATTR_MODULE_DECLARATION, moduleDeclaration);
- buildModule(context);
- BuildProblemReporter bpr = (BuildProblemReporter) context.getProblemReporter();
- bpr.flush();
- }
- return super.buildModelElements(project, elements, monitor, status);
- }
+// @Override
+// @SuppressWarnings("unchecked")
+// public IStatus buildModelElements(IScriptProject project, List elements,
+// IProgressMonitor monitor, int status) {
+// List<ISourceModule> sources = elements;
+// for (ISourceModule sourceModule : sources) {
+// ModuleDeclaration moduleDeclaration = SourceParserUtil.getModuleDeclaration(sourceModule,
+// null);
+// generateDescriptorResources(sourceModule, moduleDeclaration, monitor);
+// // callParticipants(project, moduleDeclaration);
+// initialize(project);
+// final SourceModuleBuildContext context = new SourceModuleBuildContext(sourceModule, status); // guessed
+// context.set(IBuildContext.ATTR_MODULE_DECLARATION, moduleDeclaration);
+// buildModule(context);
+// BuildProblemReporter bpr = (BuildProblemReporter) context.getProblemReporter();
+// bpr.flush();
+// }
+// return super.buildModelElements(project, elements, monitor, status);
+// }
private void buildModule(IBuildContext context) {
if (participants != null) {
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/codeassist/TextMarkerAssistParser.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/codeassist/TextMarkerAssistParser.java?rev=1232523&r1=1232522&r2=1232523&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/codeassist/TextMarkerAssistParser.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/codeassist/TextMarkerAssistParser.java Tue Jan 17 18:21:36 2012
@@ -28,7 +28,6 @@ import org.eclipse.dltk.ast.ASTNode;
import org.eclipse.dltk.ast.declarations.ModuleDeclaration;
import org.eclipse.dltk.ast.parser.ISourceParser;
import org.eclipse.dltk.codeassist.IAssistParser;
-import org.eclipse.dltk.compiler.env.ISourceModule;
import org.eclipse.dltk.core.DLTKLanguageManager;
@@ -97,16 +96,16 @@ public abstract class TextMarkerAssistPa
this.module = unit;
}
- public ModuleDeclaration parse(ISourceModule sourceUnit) {
- module = this.parser.parse(sourceUnit.getFileName(), sourceUnit.getSourceContents()
- .toCharArray(), null);
- module.rebuild();
-
- // TextMarkerASTUtil.extendStatements(module, sourceUnit
- // .getSourceContents());
-
- return module;
- }
+// public ModuleDeclaration parse(ISourceModule sourceUnit) {
+//
+// module = this.parser.parse(sourceUnit., null);
+// module.rebuild();
+//
+// // TextMarkerASTUtil.extendStatements(module, sourceUnit
+// // .getSourceContents());
+//
+// return module;
+// }
public ModuleDeclaration getModule() {
return this.module;
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/codeassist/TextMarkerCompletionEngine.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/codeassist/TextMarkerCompletionEngine.java?rev=1232523&r1=1232522&r2=1232523&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/codeassist/TextMarkerCompletionEngine.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/codeassist/TextMarkerCompletionEngine.java Tue Jan 17 18:21:36 2012
@@ -56,11 +56,10 @@ import org.eclipse.core.resources.IResou
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.dltk.ast.ASTNode;
-import org.eclipse.dltk.codeassist.IAssistParser;
import org.eclipse.dltk.codeassist.RelevanceConstants;
import org.eclipse.dltk.codeassist.ScriptCompletionEngine;
import org.eclipse.dltk.compiler.CharOperation;
-import org.eclipse.dltk.compiler.env.ISourceModule;
+import org.eclipse.dltk.compiler.env.IModuleSource;
import org.eclipse.dltk.core.CompletionProposal;
import org.eclipse.dltk.core.IField;
import org.eclipse.dltk.core.IMethod;
@@ -74,7 +73,7 @@ public class TextMarkerCompletionEngine
protected TextMarkerCompletionParser parser;
- protected org.eclipse.dltk.core.ISourceModule sourceModule;
+ protected IModuleSource sourceModule;
protected final static boolean TRACE_COMPLETION_TIME = false;
@@ -91,11 +90,6 @@ public class TextMarkerCompletionEngine
}
@Override
- protected String processFieldName(IField field, String token) {
- return TextMarkerParseUtils.processFieldName(field, token);
- }
-
- @Override
protected String processMethodName(IMethod method, String token) {
return TextMarkerParseUtils.processMethodName(method, token);
}
@@ -106,16 +100,12 @@ public class TextMarkerCompletionEngine
}
@Override
- public IAssistParser getParser() {
- return parser;
- }
-
- public void complete(ISourceModule cu, int position, int i) {
- this.sourceModule = (org.eclipse.dltk.core.ISourceModule) cu.getModelElement();
+ public void complete(IModuleSource module, int position, int i) {
+ this.sourceModule = module;
this.actualCompletionPosition = position;
this.offset = i;
this.requestor.beginReporting();
- String content = cu.getSourceContents();
+ String content = module.getSourceContents();
if (position < 0 || position > content.length()) {
return;
}
@@ -126,7 +116,7 @@ public class TextMarkerCompletionEngine
this.setSourceRange(position - startPart.length(), position);
// 090813:
- TextMarkerModuleDeclaration parsed = (TextMarkerModuleDeclaration) this.parser.parse(cu);
+ TextMarkerModuleDeclaration parsed = (TextMarkerModuleDeclaration) this.parser.parse(module);
// types = getShortNames(types);
@@ -138,24 +128,24 @@ public class TextMarkerCompletionEngine
parsed.traverse(referenceVisitor);
node = referenceVisitor.getResult();
if (node == null) {
- doCompletionOnEmptyStatement(cu, position, i);
- doCompletionOnDeclaration(cu, startPart);
+ doCompletionOnEmptyStatement(module, position, i);
+ doCompletionOnDeclaration(module, startPart);
} else if (node instanceof TextMarkerVariableReference) {
int type = ((TextMarkerVariableReference) node).getType();
- doCompletionOnVarRef(cu, parsed, startPart, type,
+ doCompletionOnVarRef(module, parsed, startPart, type,
((TextMarkerVariableReference) node).getName());
// TODO: only if first rule element
- doCompletionOnDeclaration(cu, startPart);
+ doCompletionOnDeclaration(module, startPart);
} else if (node instanceof ComponentDeclaration) {
- doCompletionOnComponentDeclaration(cu, parsed, startPart,
+ doCompletionOnComponentDeclaration(module, parsed, startPart,
((ComponentDeclaration) node).getType(), startPart);
} else if (node instanceof ComponentReference) {
- doCompletionOnComponentReference(cu, parsed, startPart,
+ doCompletionOnComponentReference(module, parsed, startPart,
((ComponentReference) node).getType(), startPart);
} else if (node instanceof TextMarkerAction) {
- doCompletionOnAction(cu, parsed, startPart, TMTypeConstants.TM_TYPE_A, startPart);
+ doCompletionOnAction(module, parsed, startPart, TMTypeConstants.TM_TYPE_A, startPart);
} else if (node instanceof TextMarkerCondition) {
- doCompletionOnCondition(cu, parsed, startPart, TMTypeConstants.TM_TYPE_C, startPart);
+ doCompletionOnCondition(module, parsed, startPart, TMTypeConstants.TM_TYPE_C, startPart);
}
// if(requestor.)
// doCompletionOnKeyword(position, i, startPart);
@@ -170,7 +160,7 @@ public class TextMarkerCompletionEngine
}
}
- private void doCompletionOnComponentReference(ISourceModule cu,
+ private void doCompletionOnComponentReference(IModuleSource cu,
TextMarkerModuleDeclaration parsed, String startPart, int type, String complString) {
Collection<String> importedEngines = parsed.descriptorInfo.getImportedEngines();
for (String string : importedEngines) {
@@ -188,7 +178,7 @@ public class TextMarkerCompletionEngine
}
List<IMethod> blocks = new ArrayList<IMethod>();
try {
- IModelElement[] children = sourceModule.getChildren();
+ IModelElement[] children = sourceModule.getModelElement().getModel().getChildren();
for (IModelElement iModelElement : children) {
if (iModelElement instanceof SourceMethod) {
collectBlocks((SourceMethod) iModelElement, blocks);
@@ -204,11 +194,11 @@ public class TextMarkerCompletionEngine
}
}
- private void doCompletionOnComponentDeclaration(ISourceModule cu,
+ private void doCompletionOnComponentDeclaration(IModuleSource cu,
TextMarkerModuleDeclaration parsed, String startPart, int type, String complString)
throws CoreException {
if (type == ComponentDeclaration.SCRIPT) {
- List<IFolder> scriptFolders = TextMarkerProjectUtils.getAllScriptFolders(sourceModule
+ List<IFolder> scriptFolders = TextMarkerProjectUtils.getAllScriptFolders(sourceModule.getModelElement()
.getScriptProject());
List<String> scripts = new ArrayList<String>();
@@ -224,7 +214,7 @@ public class TextMarkerCompletionEngine
}
}
} else if (type == ComponentDeclaration.ENGINE) {
- List<IFolder> descriptorFolders = TextMarkerProjectUtils.getAllDescriptorFolders(sourceModule
+ List<IFolder> descriptorFolders = TextMarkerProjectUtils.getAllDescriptorFolders(sourceModule.getModelElement()
.getScriptProject().getProject());
List<String> engines = new ArrayList<String>();
for (IFolder folder : descriptorFolders) {
@@ -239,7 +229,7 @@ public class TextMarkerCompletionEngine
}
}
} else {
- List<IFolder> descriptorFolders = TextMarkerProjectUtils.getAllDescriptorFolders(sourceModule
+ List<IFolder> descriptorFolders = TextMarkerProjectUtils.getAllDescriptorFolders(sourceModule.getModelElement()
.getScriptProject().getProject());
List<String> tss = new ArrayList<String>();
for (IFolder folder : descriptorFolders) {
@@ -324,7 +314,7 @@ public class TextMarkerCompletionEngine
return result;
}
- private void doCompletionOnDeclaration(ISourceModule cu, String startPart) {
+ private void doCompletionOnDeclaration(IModuleSource cu, String startPart) {
String[] keywords = TextMarkerKeywordsManager.getKeywords(ITextMarkerKeywords.DECLARATION);
for (String string : keywords) {
if (match(startPart, string)) {
@@ -396,7 +386,7 @@ public class TextMarkerCompletionEngine
return folder.getFile(fName);
}
- private void doCompletionOnAction(ISourceModule cu, TextMarkerModuleDeclaration parsed,
+ private void doCompletionOnAction(IModuleSource cu, TextMarkerModuleDeclaration parsed,
String startPart, int type, String complString) {
String[] keywords = TextMarkerKeywordsManager.getKeywords(ITextMarkerKeywords.ACTION);
for (String string : keywords) {
@@ -406,7 +396,7 @@ public class TextMarkerCompletionEngine
}
}
- private void doCompletionOnCondition(ISourceModule cu, TextMarkerModuleDeclaration parsed,
+ private void doCompletionOnCondition(IModuleSource cu, TextMarkerModuleDeclaration parsed,
String startPart, int type, String complString) {
if (complString.startsWith("-")) {
complString = complString.substring(1, complString.length());
@@ -419,13 +409,13 @@ public class TextMarkerCompletionEngine
}
}
- private void doCompletionOnVarRef(ISourceModule cu, TextMarkerModuleDeclaration parsed,
+ private void doCompletionOnVarRef(IModuleSource cu, TextMarkerModuleDeclaration parsed,
String startPart, int type, String complString) {
Collection<String> types = new HashSet<String>();
try {
- IPath path = sourceModule.getPath();
+ IPath path = sourceModule.getModelElement().getPath();
path = path.removeFirstSegments(2);
- types = importTypeSystem(path.toPortableString(), sourceModule.getScriptProject()
+ types = importTypeSystem(path.toPortableString(), sourceModule.getModelElement().getScriptProject()
.getProject());
} catch (Exception e) {
}
@@ -434,35 +424,35 @@ public class TextMarkerCompletionEngine
addProposal(complString, string, CompletionProposal.TYPE_REF);
}
}
- try {
- if (cu != null) {
- IField[] fieldsArray = sourceModule.getFields();
- for (IField field : fieldsArray) {
- // if (type != TMTypeConstants.TM_TYPE_AT && Flags.isPrivate(field.getFlags())
- // || (type & TMTypeConstants.TM_TYPE_AT) != 0 && Flags.isPublic(field.getFlags())) {
- if ((type & TextMarkerParseUtils.getTypeOfIModelElement(field)) != 0) {
- addProposal(complString, new ArrayList<String>(), field);
- }
- }
- List<IField> fields = new ArrayList<IField>();
- IModelElement[] children = sourceModule.getChildren();
- for (IModelElement iModelElement : children) {
- if (iModelElement instanceof SourceMethod) {
- collectFields((SourceMethod) iModelElement, fields);
- }
- }
- for (IField field : fields) {
- // if (type != TMTypeConstants.TM_TYPE_AT && Flags.isPrivate(field.getFlags())
- // || (type & TMTypeConstants.TM_TYPE_AT) != 0 && Flags.isPublic(field.getFlags())) {
- // if ((type & TextMarkerParseUtils.getTypeOfIModelElement(field)) != 0) {
- if (!types.contains(field.getElementName())) {
- addProposal(complString, new ArrayList<String>(), field);
- }
+// try {
+// if (cu != null) {
+// IField[] fieldsArray = sourceModule.getModelElement().getFields();
+// for (IField field : fieldsArray) {
+// // if (type != TMTypeConstants.TM_TYPE_AT && Flags.isPrivate(field.getFlags())
+// // || (type & TMTypeConstants.TM_TYPE_AT) != 0 && Flags.isPublic(field.getFlags())) {
+// if ((type & TextMarkerParseUtils.getTypeOfIModelElement(field)) != 0) {
+// addProposal(complString, new ArrayList<String>(), field);
+// }
+// }
+// List<IField> fields = new ArrayList<IField>();
+// IModelElement[] children = sourceModule.getModelElement().getChildren();
+// for (IModelElement iModelElement : children) {
+// if (iModelElement instanceof SourceMethod) {
+// collectFields((SourceMethod) iModelElement, fields);
+// }
+// }
+// for (IField field : fields) {
+// // if (type != TMTypeConstants.TM_TYPE_AT && Flags.isPrivate(field.getFlags())
+// // || (type & TMTypeConstants.TM_TYPE_AT) != 0 && Flags.isPublic(field.getFlags())) {
+// // if ((type & TextMarkerParseUtils.getTypeOfIModelElement(field)) != 0) {
+// if (!types.contains(field.getElementName())) {
+// addProposal(complString, new ArrayList<String>(), field);
+// }
// }
- }
- }
- } catch (ModelException e) {
- }
+// }
+// }
+// } catch (ModelException e) {
+// }
}
private boolean match(String complString, String string) {
@@ -497,7 +487,7 @@ public class TextMarkerCompletionEngine
}
@SuppressWarnings({ "unchecked" })
- private void doCompletionOnEmptyStatement(ISourceModule cu, int position, int i) {
+ private void doCompletionOnEmptyStatement(IModuleSource cu, int position, int i) {
int kind = CompletionProposal.LOCAL_VARIABLE_REF;
// doCompletionOnKeyword(position, i, "");
if (!super.requestor.isIgnored(kind)) {
@@ -508,38 +498,36 @@ public class TextMarkerCompletionEngine
/**
* @param cu
*/
- private void suggestFields(ISourceModule cu) {
- List names = new ArrayList();
- try {
- if (cu != null) {
- IField[] fieldsArray = sourceModule.getFields();
- for (IField field : fieldsArray) {
- int relevance = RelevanceConstants.R_EXACT_EXPECTED_TYPE;
- // accept result
- super.noProposal = false;
- int kind = CompletionProposal.LOCAL_VARIABLE_REF;
- if (!super.requestor.isIgnored(kind)) {
- CompletionProposal proposal = super.createProposal(kind, actualCompletionPosition);
- proposal.setRelevance(relevance);
- proposal.setModelElement(field);
- char[] fieldName = field.getElementName().toCharArray();
- proposal.setName(fieldName);
- proposal.setCompletion(fieldName);
- proposal.setReplaceRange(this.startPosition - this.offset, this.endPosition
- - this.offset);
- try {
- proposal.setFlags(field.getFlags());
- } catch (ModelException e) {
- }
- this.requestor.accept(proposal);
- if (DEBUG) {
- this.printDebug(proposal);
- }
- }
- }
- }
- } catch (ModelException e) {
- }
+ private void suggestFields(IModuleSource cu) {
+// try {
+// if (cu != null) {
+// IField[] fieldsArray = sourceModule.getFields();
+// for (IField field : fieldsArray) {
+// int relevance = RelevanceConstants.R_EXACT_EXPECTED_TYPE;
+// // accept result
+// super.noProposal = false;
+// int kind = CompletionProposal.LOCAL_VARIABLE_REF;
+// if (!super.requestor.isIgnored(kind)) {
+// CompletionProposal proposal = super.createProposal(kind, actualCompletionPosition);
+// proposal.setRelevance(relevance);
+// proposal.setModelElement(field);
+// proposal.setName(field.getElementName());
+// proposal.setCompletion(field.getElementName());
+// proposal.setReplaceRange(this.startPosition - this.offset, this.endPosition
+// - this.offset);
+// try {
+// proposal.setFlags(field.getFlags());
+// } catch (ModelException e) {
+// }
+// this.requestor.accept(proposal);
+// if (DEBUG) {
+// this.printDebug(proposal);
+// }
+// }
+// }
+// }
+// } catch (ModelException e) {
+// }
}
/**
@@ -555,7 +543,7 @@ public class TextMarkerCompletionEngine
|| match(complString, field.getElementName())) {
int relevance = RelevanceConstants.R_DEFAULT +1;
- relevance += computeRelevanceForCaseMatching(complFragment, fieldName);
+ relevance += computeRelevanceForCaseMatching(complFragment, field.getElementName());
// accept result
super.noProposal = false;
@@ -564,8 +552,8 @@ public class TextMarkerCompletionEngine
CompletionProposal proposal = super.createProposal(kind, actualCompletionPosition);
proposal.setRelevance(relevance);
proposal.setModelElement(field);
- proposal.setName(fieldName);
- proposal.setCompletion(fieldName);
+ proposal.setName(field.getElementName());
+ proposal.setCompletion(field.getElementName());
proposal.setReplaceRange(this.startPosition - this.offset, this.endPosition - this.offset);
try {
proposal.setFlags(field.getFlags());
@@ -590,15 +578,15 @@ public class TextMarkerCompletionEngine
if (CharOperation.camelCaseMatch(pattern, fieldName) || match(complString, string)) {
int relevance = RelevanceConstants.R_DEFAULT +1;
- relevance += computeRelevanceForCaseMatching(complFragment, fieldName);
+ relevance += computeRelevanceForCaseMatching(complFragment, string);
// accept result
super.noProposal = false;
if (!super.requestor.isIgnored(kind)) {
CompletionProposal proposal = super.createProposal(kind, actualCompletionPosition);
proposal.setRelevance(relevance);
- proposal.setName(fieldName);
- proposal.setCompletion(fieldName);
+ proposal.setName(string);
+ proposal.setCompletion(string);
proposal.setReplaceRange(this.startPosition - this.offset, this.endPosition - this.offset);
// try {
// proposal.setFlags(field.getFlags());
@@ -621,7 +609,9 @@ public class TextMarkerCompletionEngine
for (int a = 0; a < keywords.size(); a++) {
keyWordsArray[a] = keywords.get(a).toCharArray();
}
- findKeywords(startPart.toCharArray(), keyWordsArray, true);
+ findKeywords(startPart.toCharArray(), keywords.toArray( new String[0]), true);
}
+
+
}
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/codeassist/TextMarkerCompletionParser.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/codeassist/TextMarkerCompletionParser.java?rev=1232523&r1=1232522&r2=1232523&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/codeassist/TextMarkerCompletionParser.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/codeassist/TextMarkerCompletionParser.java Tue Jan 17 18:21:36 2012
@@ -35,6 +35,7 @@ import org.eclipse.dltk.ast.references.S
import org.eclipse.dltk.ast.statements.Block;
import org.eclipse.dltk.ast.statements.Statement;
import org.eclipse.dltk.codeassist.complete.CompletionNodeFound;
+import org.eclipse.dltk.compiler.env.IModuleSource;
public class TextMarkerCompletionParser extends TextMarkerAssistParser {
private static class TextMarkerEmptyCompleteStatement extends TextMarkerStatement {
@@ -385,4 +386,12 @@ public class TextMarkerCompletionParser
public void setAssistNodeParent(ASTNode prevParent) {
this.assistNodeParent = prevParent;
}
+
+ @Override
+ public ModuleDeclaration parse(IModuleSource sourceModule) {
+ ModuleDeclaration module = (ModuleDeclaration) this.parser.parse(sourceModule, null);
+ module.rebuild();
+ return module;
+ }
+
}
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/codeassist/TextMarkerSelectionEngine.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/codeassist/TextMarkerSelectionEngine.java?rev=1232523&r1=1232522&r2=1232523&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/codeassist/TextMarkerSelectionEngine.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/codeassist/TextMarkerSelectionEngine.java Tue Jan 17 18:21:36 2012
@@ -41,7 +41,6 @@ import org.apache.uima.util.XMLInputSour
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.runtime.IPath;
-import org.eclipse.dltk.ast.ASTNode;
import org.eclipse.dltk.ast.ASTVisitor;
import org.eclipse.dltk.ast.declarations.MethodDeclaration;
import org.eclipse.dltk.ast.declarations.ModuleDeclaration;
@@ -50,9 +49,8 @@ import org.eclipse.dltk.ast.expressions.
import org.eclipse.dltk.ast.references.SimpleReference;
import org.eclipse.dltk.ast.references.VariableReference;
import org.eclipse.dltk.ast.statements.Statement;
-import org.eclipse.dltk.codeassist.IAssistParser;
import org.eclipse.dltk.codeassist.ScriptSelectionEngine;
-import org.eclipse.dltk.compiler.env.ISourceModule;
+import org.eclipse.dltk.compiler.env.IModuleSource;
import org.eclipse.dltk.core.DLTKCore;
import org.eclipse.dltk.core.IDLTKLanguageToolkit;
import org.eclipse.dltk.core.IField;
@@ -410,19 +408,14 @@ public class TextMarkerSelectionEngine e
protected IDLTKLanguageToolkit toolkit;
- @Override
- public IAssistParser getParser() {
- return parser;
- }
-
- public IModelElement[] select(ISourceModule module, final int offset, int i) {
+
+ public IModelElement[] select(IModuleSource module, final int offset, int i) {
sourceModule = (org.eclipse.dltk.core.ISourceModule) module.getModelElement();
ModuleDeclaration moduleDeclaration = this.parser.parse(module);
final List results = new ArrayList();
try {
- moduleDeclaration.traverse(new ModelElementFinder(offset, results, String.copyValueOf(module
- .getFileName())));
+ moduleDeclaration.traverse(new ModelElementFinder(offset, results, module.getFileName()));
} catch (Exception e) {
if (DLTKCore.DEBUG) {
e.printStackTrace();
@@ -465,10 +458,4 @@ public class TextMarkerSelectionEngine e
return true;
}
- @Override
- protected ASTNode parseBlockStatements(ModuleDeclaration unit, int position) {
- // TODO Auto-generated method stub
- return super.parseBlockStatements(unit, position);
- }
-
}
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/codeassist/TextMarkerSelectionParser.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/codeassist/TextMarkerSelectionParser.java?rev=1232523&r1=1232522&r2=1232523&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/codeassist/TextMarkerSelectionParser.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/codeassist/TextMarkerSelectionParser.java Tue Jan 17 18:21:36 2012
@@ -20,17 +20,23 @@
package org.apache.uima.textmarker.ide.core.codeassist;
import org.eclipse.dltk.ast.ASTNode;
+import org.eclipse.dltk.ast.declarations.ModuleDeclaration;
+import org.eclipse.dltk.compiler.env.IModuleSource;
public class TextMarkerSelectionParser extends TextMarkerAssistParser {
public void handleNotInElement(ASTNode unit, int position) {
- // TODO Auto-generated method stub
}
public void parseBlockStatements(ASTNode node, ASTNode unit, int position) {
- // TODO Auto-generated method stub
}
+ @Override
+ public ModuleDeclaration parse(IModuleSource sourceModule) {
+ ModuleDeclaration module = (ModuleDeclaration) this.parser.parse(sourceModule, null);
+ module.rebuild();
+ return module;
+ }
}
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/packages/TextMarkerCheckBuilder.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/packages/TextMarkerCheckBuilder.java?rev=1232523&r1=1232522&r2=1232523&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/packages/TextMarkerCheckBuilder.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/packages/TextMarkerCheckBuilder.java Tue Jan 17 18:21:36 2012
@@ -47,11 +47,12 @@ import org.eclipse.dltk.core.IBuildpathE
import org.eclipse.dltk.core.IScriptProject;
import org.eclipse.dltk.core.ISourceModule;
import org.eclipse.dltk.core.ModelException;
+import org.eclipse.dltk.core.builder.IBuildChange;
import org.eclipse.dltk.core.builder.IBuildContext;
import org.eclipse.dltk.core.builder.IBuildParticipant;
import org.eclipse.dltk.core.builder.IBuildParticipantExtension;
import org.eclipse.dltk.core.builder.IBuildParticipantExtension2;
-import org.eclipse.dltk.core.builder.IScriptBuilder.DependencyResponse;
+import org.eclipse.dltk.core.builder.IBuildState;
import org.eclipse.dltk.core.environment.EnvironmentPathUtils;
import org.eclipse.dltk.launching.IInterpreterInstall;
import org.eclipse.dltk.launching.ScriptRuntime;
@@ -316,13 +317,11 @@ public class TextMarkerCheckBuilder impl
return false;
}
- public DependencyResponse getDependencies(int buildType, Set localElements, Set externalElements,
- Set oldExternalFolders, Set externalFolders) {
- if (buildType == FULL_BUILD || !oldExternalFolders.equals(externalFolders)) {
- return DependencyResponse.FULL_EXTERNAL_BUILD;
- } else {
- return null;
- }
+ @Override
+ public void prepare(IBuildChange buildChange, IBuildState buildState) throws CoreException {
+
}
+
+
}
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/packages/TextMarkerPackagesInterpreterContainerExtension.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/packages/TextMarkerPackagesInterpreterContainerExtension.java?rev=1232523&r1=1232522&r2=1232523&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/packages/TextMarkerPackagesInterpreterContainerExtension.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/packages/TextMarkerPackagesInterpreterContainerExtension.java Tue Jan 17 18:21:36 2012
@@ -31,12 +31,12 @@ import org.eclipse.dltk.core.DLTKCore;
import org.eclipse.dltk.core.IAccessRule;
import org.eclipse.dltk.core.IBuildpathAttribute;
import org.eclipse.dltk.core.IBuildpathEntry;
-import org.eclipse.dltk.core.IInterpreterContainerExtension;
import org.eclipse.dltk.core.IScriptProject;
import org.eclipse.dltk.core.environment.EnvironmentManager;
import org.eclipse.dltk.core.environment.EnvironmentPathUtils;
import org.eclipse.dltk.core.environment.IEnvironment;
import org.eclipse.dltk.internal.core.BuildpathEntry;
+import org.eclipse.dltk.launching.IInterpreterContainerExtension;
import org.eclipse.dltk.launching.IInterpreterInstall;
import org.eclipse.dltk.launching.InterpreterContainerHelper;
import org.eclipse.dltk.launching.ScriptRuntime;
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerSourceElementRequestVisitor.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerSourceElementRequestVisitor.java?rev=1232523&r1=1232522&r2=1232523&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerSourceElementRequestVisitor.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerSourceElementRequestVisitor.java Tue Jan 17 18:21:36 2012
@@ -196,7 +196,7 @@ public class TextMarkerSourceElementRequ
public boolean visit(Expression expression) throws Exception {
if (expression instanceof VariableReference) {
VariableReference varRef = (VariableReference) expression;
- this.fRequestor.acceptFieldReference(varRef.getName().toCharArray(), varRef.sourceStart());
+ this.fRequestor.acceptFieldReference(varRef.getName(), varRef.sourceStart());
}
return super.visit(expression);
}
@@ -204,7 +204,7 @@ public class TextMarkerSourceElementRequ
private void processPackage(Statement statement) {
TextMarkerPackageDeclaration pack = (TextMarkerPackageDeclaration) statement;
this.fRequestor.acceptPackage(pack.getNameStart(), pack.getNameEnd(),
- (pack.getName()).toCharArray());
+ pack.getName());
}
private void processFieldDeclaration(SimpleReference variableIDRef, Statement fullDeclaration) {
@@ -274,10 +274,9 @@ public class TextMarkerSourceElementRequ
mi.nameSourceEnd = method.getNameEnd() - 1;
mi.declarationStart = method.sourceStart();
- this.fRequestor.enterMethodRemoveSame(mi);
-
this.fInMethod = true;
this.fCurrentMethod = method;
+ this.fRequestor.enterMethod(mi);
return true;
}
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerSourceParser.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerSourceParser.java?rev=1232523&r1=1232522&r2=1232523&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerSourceParser.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerSourceParser.java Tue Jan 17 18:21:36 2012
@@ -32,8 +32,9 @@ import org.apache.uima.textmarker.ide.co
import org.apache.uima.textmarker.ide.core.builder.DescriptorManager;
import org.apache.uima.textmarker.ide.parser.ast.TextMarkerModuleDeclaration;
import org.apache.uima.textmarker.parser.TextMarkerLexer;
-import org.eclipse.dltk.ast.declarations.ModuleDeclaration;
import org.eclipse.dltk.ast.parser.AbstractSourceParser;
+import org.eclipse.dltk.ast.parser.IModuleDeclaration;
+import org.eclipse.dltk.compiler.env.IModuleSource;
import org.eclipse.dltk.compiler.problem.IProblemReporter;
import org.eclipse.dltk.core.DLTKCore;
@@ -58,14 +59,17 @@ public class TextMarkerSourceParser exte
return super.nextToken();
}
}
+ public IModuleDeclaration parse(IModuleSource input, IProblemReporter reporter) {
+ return parse(input.getFileName(), input.getSourceContents(), reporter);
+ }
- public ModuleDeclaration parse(char[] fileName, char[] content, IProblemReporter reporter) {// throws
+ public IModuleDeclaration parse(String fileName, String content, IProblemReporter reporter) {
this.problemReporter = reporter;
- TextMarkerModuleDeclaration moduleDeclaration = new TextMarkerModuleDeclaration(content.length,
+ TextMarkerModuleDeclaration moduleDeclaration = new TextMarkerModuleDeclaration(content.length(),
true);
- CharStream st = new ANTLRStringStream(new String(content));
+ CharStream st = new ANTLRStringStream(content);
TextMarkerLexer lexer = new TMLexer(st);
CommonTokenStream tokens = new CommonTokenStream(lexer);
@@ -107,8 +111,8 @@ public class TextMarkerSourceParser exte
parser.addPredefinedType("Annotation");
parser.md = moduleDeclaration;
- parser.length = content.length;
- parser.converter = new DLTKTokenConverter(content);
+ parser.length = content.length();
+ parser.converter = new DLTKTokenConverter(content.toCharArray());
parser.reporter = new DLTKTextMarkerErrorReporter(parser.converter, problemReporter, parser);
parser.descriptor = new DescriptorManager();
@@ -117,10 +121,12 @@ public class TextMarkerSourceParser exte
String name = "Dynamic";
if (fileName != null) {
- File fn = new File(new String(fileName));
+ File fn = new File(fileName);
name = fn.getName();
int lastIndexOf = name.lastIndexOf(".tm");
- name = name.substring(0, lastIndexOf);
+ if(lastIndexOf>0) {
+ name = name.substring(0, lastIndexOf);
+ }
}
try {
parser.file_input(name);
@@ -131,9 +137,11 @@ public class TextMarkerSourceParser exte
}
return moduleDeclaration;
}
-
+
+
public CommonTokenStream getTokenStream() {
return tokenStream;
}
+
}
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/search/TextMarkerMatchLocator.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/search/TextMarkerMatchLocator.java?rev=1232523&r1=1232522&r2=1232523&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/search/TextMarkerMatchLocator.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/search/TextMarkerMatchLocator.java Tue Jan 17 18:21:36 2012
@@ -19,16 +19,12 @@
package org.apache.uima.textmarker.ide.core.search;
-import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.dltk.ast.declarations.MethodDeclaration;
import org.eclipse.dltk.core.IMethod;
import org.eclipse.dltk.core.IModelElement;
import org.eclipse.dltk.core.IParent;
import org.eclipse.dltk.core.ISourceModule;
import org.eclipse.dltk.core.IType;
-import org.eclipse.dltk.core.search.IDLTKSearchScope;
-import org.eclipse.dltk.core.search.SearchPattern;
-import org.eclipse.dltk.core.search.SearchRequestor;
import org.eclipse.dltk.core.search.matching.MatchLocator;
import org.eclipse.dltk.internal.core.BuiltinSourceModule;
import org.eclipse.dltk.internal.core.ExternalSourceModule;
@@ -37,9 +33,8 @@ import org.eclipse.dltk.internal.core.So
public class TextMarkerMatchLocator extends MatchLocator {
- public TextMarkerMatchLocator(SearchPattern pattern, SearchRequestor requestor,
- IDLTKSearchScope scope, IProgressMonitor progressMonitor) {
- super(pattern, requestor, scope, progressMonitor);
+ public TextMarkerMatchLocator() {
+ super();
}
@Override
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/debug/ui/interpreters/TextMarkerInterpreterComboBlock.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/debug/ui/interpreters/TextMarkerInterpreterComboBlock.java?rev=1232523&r1=1232522&r2=1232523&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/debug/ui/interpreters/TextMarkerInterpreterComboBlock.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/debug/ui/interpreters/TextMarkerInterpreterComboBlock.java Tue Jan 17 18:21:36 2012
@@ -19,19 +19,19 @@
package org.apache.uima.textmarker.ide.debug.ui.interpreters;
-import org.apache.uima.textmarker.ide.core.TextMarkerNature;
import org.eclipse.dltk.internal.debug.ui.interpreters.AbstractInterpreterComboBlock;
+import org.eclipse.dltk.internal.debug.ui.interpreters.IInterpreterComboBlockContext;
import org.eclipse.jface.preference.IPreferencePage;
public class TextMarkerInterpreterComboBlock extends AbstractInterpreterComboBlock {
+ public TextMarkerInterpreterComboBlock(IInterpreterComboBlockContext context) {
+ super(context);
+ }
+
@Override
protected void showInterpreterPreferencePage() {
IPreferencePage page = new TextMarkerInterpreterPreferencePage();
}
- @Override
- protected String getCurrentLanguageNature() {
- return TextMarkerNature.NATURE_ID;
- }
}
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/debug/ui/interpreters/TextMarkerInterpreterContainerWizardPage.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/debug/ui/interpreters/TextMarkerInterpreterContainerWizardPage.java?rev=1232523&r1=1232522&r2=1232523&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/debug/ui/interpreters/TextMarkerInterpreterContainerWizardPage.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/debug/ui/interpreters/TextMarkerInterpreterContainerWizardPage.java Tue Jan 17 18:21:36 2012
@@ -19,14 +19,15 @@
package org.apache.uima.textmarker.ide.debug.ui.interpreters;
-import org.eclipse.dltk.internal.debug.ui.interpreters.AbstractInterpreterComboBlock;
+import org.apache.uima.textmarker.ide.core.TextMarkerNature;
import org.eclipse.dltk.internal.debug.ui.interpreters.AbstractInterpreterContainerWizardPage;
public class TextMarkerInterpreterContainerWizardPage extends
AbstractInterpreterContainerWizardPage {
+
@Override
- protected AbstractInterpreterComboBlock getInterpreterBlock() {
- return new TextMarkerInterpreterComboBlock();
+ public String getScriptNature() {
+ return TextMarkerNature.NATURE_ID;
}
}
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/debug/ui/interpreters/TextMarkerInterpreterTab.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/debug/ui/interpreters/TextMarkerInterpreterTab.java?rev=1232523&r1=1232522&r2=1232523&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/debug/ui/interpreters/TextMarkerInterpreterTab.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/debug/ui/interpreters/TextMarkerInterpreterTab.java Tue Jan 17 18:21:36 2012
@@ -19,25 +19,27 @@
package org.apache.uima.textmarker.ide.debug.ui.interpreters;
-import org.apache.uima.textmarker.ide.core.TextMarkerNature;
-import org.eclipse.dltk.debug.ui.launchConfigurations.IMainLaunchConfigurationTabListenerManager;
+import org.eclipse.dltk.debug.ui.launchConfigurations.IMainLaunchConfigurationTab;
import org.eclipse.dltk.debug.ui.launchConfigurations.InterpreterTab;
import org.eclipse.dltk.internal.debug.ui.interpreters.AbstractInterpreterComboBlock;
+import org.eclipse.dltk.internal.debug.ui.interpreters.IInterpreterComboBlockContext;
public class TextMarkerInterpreterTab extends InterpreterTab {
- public TextMarkerInterpreterTab(IMainLaunchConfigurationTabListenerManager listenerManager) {
- super(listenerManager);
+ public TextMarkerInterpreterTab(IMainLaunchConfigurationTab mainTab) {
+ super(mainTab);
}
@Override
- protected AbstractInterpreterComboBlock getInterpreterBlock() {
- return new TextMarkerInterpreterComboBlock();
+ protected AbstractInterpreterComboBlock createInterpreterBlock(
+ IInterpreterComboBlockContext context) {
+ return new TextMarkerInterpreterComboBlock(context);
}
@Override
- protected String getNature() {
- return TextMarkerNature.NATURE_ID;
+ protected void refreshInterpreters() {
+// ((TextMarkerInterpreterComboBlock) fInterpreterBlock)
+// .initialize(getScriptProject());
+ super.refreshInterpreters();
}
-
}
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/debug/ui/launchConfiguration/TextMarkerMainLaunchConfigurationTab.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/debug/ui/launchConfiguration/TextMarkerMainLaunchConfigurationTab.java?rev=1232523&r1=1232522&r2=1232523&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/debug/ui/launchConfiguration/TextMarkerMainLaunchConfigurationTab.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/debug/ui/launchConfiguration/TextMarkerMainLaunchConfigurationTab.java Tue Jan 17 18:21:36 2012
@@ -52,12 +52,11 @@ public class TextMarkerMainLaunchConfigu
DLTKDebugPreferenceConstants.PREF_DBGP_ENABLE_LOGGING);
}
- /*
- * @see org.eclipse.dltk.debug.ui.launchConfigurations.ScriptLaunchConfigurationTab#getNatureID()
- */
@Override
- protected String getNatureID() {
+ public String getNatureID() {
return TextMarkerNature.NATURE_ID;
}
+
+
}
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/formatter/TextMarkerFormattedPrinter.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/formatter/TextMarkerFormattedPrinter.java?rev=1232523&r1=1232522&r2=1232523&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/formatter/TextMarkerFormattedPrinter.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/formatter/TextMarkerFormattedPrinter.java Tue Jan 17 18:21:36 2012
@@ -59,7 +59,7 @@ import org.eclipse.dltk.ast.expressions.
import org.eclipse.dltk.ast.statements.Block;
import org.eclipse.dltk.ast.statements.Statement;
import org.eclipse.dltk.formatter.FormatterDocument;
-import org.eclipse.dltk.ui.formatter.IFormatterIndentGenerator;
+import org.eclipse.dltk.formatter.IFormatterIndentGenerator;
/**
* Formats a document.<br>
@@ -99,7 +99,7 @@ public class TextMarkerFormattedPrinter
private IFormatterIndentGenerator indentGenerator;
- private StringBuffer output;
+ private StringBuilder output;
private List<CommonToken> comments;
@@ -130,7 +130,7 @@ public class TextMarkerFormattedPrinter
this.document = document;
this.lineDelimiter = lineDelimiter;
this.indentGenerator = indentGenerator;
- this.output = new StringBuffer();
+ this.output = new StringBuilder();
// read format preferences
this.lines_before_long_declarations = tmf
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/formatter/TextMarkerFormatter.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/formatter/TextMarkerFormatter.java?rev=1232523&r1=1232522&r2=1232523&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/formatter/TextMarkerFormatter.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/formatter/TextMarkerFormatter.java Tue Jan 17 18:21:36 2012
@@ -31,6 +31,7 @@ import org.antlr.runtime.CommonTokenStre
import org.apache.uima.textmarker.ide.core.parser.TextMarkerParser;
import org.apache.uima.textmarker.ide.core.parser.TextMarkerSourceParser;
import org.eclipse.dltk.ast.declarations.ModuleDeclaration;
+import org.eclipse.dltk.ast.parser.IModuleDeclaration;
import org.eclipse.dltk.compiler.problem.IProblem;
import org.eclipse.dltk.compiler.problem.IProblemReporter;
import org.eclipse.dltk.formatter.AbstractScriptFormatter;
@@ -46,10 +47,6 @@ public class TextMarkerFormatter extends
private boolean gotProblems = false;
- @Override
- public Object getAdapter(Class adapter) {
- return null;
- }
@Override
public void reportProblem(IProblem problem) {
@@ -88,8 +85,7 @@ public class TextMarkerFormatter extends
TextMarkerSourceParser tmsp = new TextMarkerSourceParser();
DummyReporter reporter = new DummyReporter();
-
- ModuleDeclaration md = tmsp.parse("format.tm".toCharArray(), source.toCharArray(), reporter);
+ IModuleDeclaration md = tmsp.parse("format.tm", source, reporter);
CommonTokenStream tokenStream = tmsp.getTokenStream();
if (!reporter.gotProblems()) {
@@ -99,7 +95,7 @@ public class TextMarkerFormatter extends
bs.add(TextMarkerParser.COMMENT);
List<CommonToken> comments = tokenStream.getTokens(0, tokenStream.size(), bs);
- final String output = format(input, 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/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/DefaultTextMarkerSemanticHighlightingExtension.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/DefaultTextMarkerSemanticHighlightingExtension.java?rev=1232523&r1=1232522&r2=1232523&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/DefaultTextMarkerSemanticHighlightingExtension.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/DefaultTextMarkerSemanticHighlightingExtension.java Tue Jan 17 18:21:36 2012
@@ -50,18 +50,6 @@ public class DefaultTextMarkerSemanticHi
new TextMarkerTextTools.SH(TextMarkerPreferenceConstants.EDITOR_VARIABLE_COLOR,
TextMarkerPreferenceConstants.EDITOR_CONDITION_COLOR, null) };
- private static final int HL_PROCEDURES = 0;
-
- private static final int HL_ARGUMENTS = 1;
-
- private static final int HL_CLASSES = 2;
-
- private static final int HL_BASE_CLASSES = 3;
-
- private static final int HL_STRINGS = 4;
-
- private static final int HL_VARIABLES = 5;
-
public DefaultTextMarkerSemanticHighlightingExtension() {
}
@@ -70,16 +58,14 @@ public class DefaultTextMarkerSemanticHi
// Check TextMarker procedures
if (node instanceof MethodDeclaration) {
-
MethodDeclaration m = (MethodDeclaration) node;
- requestor.addPosition(m.getNameStart(), m.getNameEnd(), HL_PROCEDURES);
+ requestor.addPosition(m.getNameStart(), m.getNameEnd(), TextMarkerPreferenceConstants.EDITOR_FUNCTION_COLOR);
}
if (node instanceof Argument) {
Argument m = (Argument) node;
- requestor.addPosition(m.getNameStart(), m.getNameEnd(), HL_ARGUMENTS);
-
+ requestor.addPosition(m.getNameStart(), m.getNameEnd(), TextMarkerPreferenceConstants.EDITOR_VARIABLE_COLOR);
}
if (node instanceof TypeDeclaration) {
@@ -95,13 +81,11 @@ public class DefaultTextMarkerSemanticHi
Iterator it = children.iterator();
while (it.hasNext()) {
ASTNode n = (ASTNode) it.next();
-
- requestor.addPosition(n.sourceStart(), n.sourceEnd(), HL_BASE_CLASSES);
-
+ requestor.addPosition(n.sourceStart(), n.sourceEnd(), TextMarkerPreferenceConstants.EDITOR_DECLARATION_DEFINITION_COLOR);
}
}
- requestor.addPosition(t.getNameStart(), t.getNameEnd(), HL_CLASSES);
+ requestor.addPosition(t.getNameStart(), t.getNameEnd(), TextMarkerPreferenceConstants.EDITOR_VARIABLE_COLOR);
}
return null;
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/TextMarkerSemanticPositionUpdater.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/TextMarkerSemanticPositionUpdater.java?rev=1232523&r1=1232522&r2=1232523&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/TextMarkerSemanticPositionUpdater.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/TextMarkerSemanticPositionUpdater.java Tue Jan 17 18:21:36 2012
@@ -20,11 +20,11 @@
package org.apache.uima.textmarker.ide.ui;
import org.apache.uima.textmarker.ide.core.TextMarkerNature;
-import org.eclipse.dltk.ast.ASTNode;
-import org.eclipse.dltk.ast.ASTVisitor;
-import org.eclipse.dltk.core.ModelException;
+import org.apache.uima.textmarker.ide.ui.text.TextMarkerTextTools;
+import org.eclipse.dltk.compiler.env.IModuleSource;
import org.eclipse.dltk.ui.editor.highlighting.ASTSemanticHighlighter;
import org.eclipse.dltk.ui.editor.highlighting.ISemanticHighlightingRequestor;
+import org.eclipse.dltk.ui.editor.highlighting.SemanticHighlighting;
public class TextMarkerSemanticPositionUpdater extends ASTSemanticHighlighter {
@@ -48,8 +48,10 @@ public class TextMarkerSemanticPositionU
this.requestor = requestor;
}
- public void addPosition(int start, int end, int highlightingIndex) {
- requestor.addPosition(start, end, highlightingIndex + offset);
+ @Override
+ public void addPosition(int start, int end, String highlightingKey) {
+ requestor.addPosition(start, end, highlightingKey);
+
}
}
@@ -64,24 +66,32 @@ public class TextMarkerSemanticPositionU
}
}
+
+
@Override
- protected ASTVisitor createVisitor(org.eclipse.dltk.compiler.env.ISourceModule sourceCode)
- throws ModelException {
- return new ASTVisitor() {
-
- @Override
- public boolean visitGeneral(ASTNode node) throws Exception {
- for (int i = 0; i < extensions.length; i++) {
- extensions[i].processNode(node, requestors[i]);
- }
- return true;
- }
+ protected String getNature() {
+ return TextMarkerNature.NATURE_ID;
+ }
+
+
- };
+ @Override
+ public SemanticHighlighting[] getSemanticHighlightings() {
+ return new SemanticHighlighting[] {
+ new TextMarkerTextTools.SH(TextMarkerPreferenceConstants.EDITOR_DECLARATION_DEFINITION_COLOR,
+ null, null),
+ new TextMarkerTextTools.SH(TextMarkerPreferenceConstants.EDITOR_FUNCTION_COLOR, null, null),
+ new TextMarkerTextTools.SH(TextMarkerPreferenceConstants.EDITOR_ACTION_COLOR, null, null),
+ new TextMarkerTextTools.SH(TextMarkerPreferenceConstants.EDITOR_CONDITION_COLOR, null, null),
+ new TextMarkerTextTools.SH(TextMarkerPreferenceConstants.EDITOR_STRING_COLOR, null, null),
+ new TextMarkerTextTools.SH(TextMarkerPreferenceConstants.EDITOR_VARIABLE_COLOR,
+ TextMarkerPreferenceConstants.EDITOR_CONDITION_COLOR, null) };
}
+
+
@Override
- protected String getNature() {
- return TextMarkerNature.NATURE_ID;
+ protected boolean doHighlighting(IModuleSource code) throws Exception {
+ return false;
}
}
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/console/PasteTextMarkerTextToConsoleAction.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/console/PasteTextMarkerTextToConsoleAction.java?rev=1232523&r1=1232522&r2=1232523&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/console/PasteTextMarkerTextToConsoleAction.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/console/PasteTextMarkerTextToConsoleAction.java Tue Jan 17 18:21:36 2012
@@ -19,7 +19,7 @@
package org.apache.uima.textmarker.ide.ui.console;
-import org.eclipse.dltk.console.ui.ScriptConsole;
+import org.eclipse.dltk.console.ui.IScriptConsole;
import org.eclipse.dltk.console.ui.ScriptConsoleManager;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.text.IDocument;
@@ -52,7 +52,7 @@ public class PasteTextMarkerTextToConsol
public void run(IAction action) {
ScriptConsoleManager manager = ScriptConsoleManager.getInstance();
- ScriptConsole console = manager.getActiveScriptConsole(TextMarkerConsole.CONSOLE_TYPE);
+ IScriptConsole console = manager.getActiveScriptConsole(TextMarkerConsole.CONSOLE_TYPE);
if (console == null) {
return;
@@ -60,7 +60,7 @@ public class PasteTextMarkerTextToConsol
if (selection instanceof ITextSelection) {
String text = ((ITextSelection) selection).getText();
- console.getInput().insertText(text);
+ console.insertText(text);
}
}
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/console/TextMarkerConsoleFactory.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/console/TextMarkerConsoleFactory.java?rev=1232523&r1=1232522&r2=1232523&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/console/TextMarkerConsoleFactory.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/console/TextMarkerConsoleFactory.java Tue Jan 17 18:21:36 2012
@@ -23,6 +23,7 @@ import org.apache.uima.textmarker.ide.Te
import org.eclipse.debug.core.ILaunch;
import org.eclipse.dltk.console.IScriptInterpreter;
import org.eclipse.dltk.console.ScriptConsolePrompt;
+import org.eclipse.dltk.console.ui.IScriptConsole;
import org.eclipse.dltk.console.ui.IScriptConsoleFactory;
import org.eclipse.dltk.console.ui.ScriptConsole;
import org.eclipse.dltk.console.ui.ScriptConsoleFactoryBase;
@@ -74,10 +75,11 @@ public class TextMarkerConsoleFactory ex
registerAndOpenConsole(createConsoleInstance(interpreter, id));
}
- public void openConsole(IScriptInterpreter interpreter, String id, ILaunch launch) {
+ public IScriptConsole openConsole(IScriptInterpreter interpreter, String id, ILaunch launch) {
TextMarkerConsole tmConsole = createConsoleInstance(interpreter, id);
tmConsole.setLaunch(launch);
registerAndOpenConsole(tmConsole);
+ return tmConsole;
}
}
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/editor/TextMarkerEditor.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/editor/TextMarkerEditor.java?rev=1232523&r1=1232522&r2=1232523&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/editor/TextMarkerEditor.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/editor/TextMarkerEditor.java Tue Jan 17 18:21:36 2012
@@ -221,8 +221,8 @@ public class TextMarkerEditor extends Sc
ActionGroup generateActions = new TextMarkerGenerateActionGroup(this,
ITextEditorActionConstants.GROUP_EDIT);
- fActionGroups.addGroup(generateActions);
- fContextMenuGroup.addGroup(generateActions);
+// getActionGroup().addGroup(generateActions);
+// fContextMenuGroup.addGroup(generateActions);
// commented 090326->
// action = new FormatElementAction();
// action
@@ -304,7 +304,7 @@ public class TextMarkerEditor extends Sc
// }
@Override
- protected IPreferenceStore getScriptPreferenceStore() {
+ public IPreferenceStore getScriptPreferenceStore() {
return TextMarkerIdePlugin.getDefault().getPreferenceStore();
}
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/preferences/TextMarkerBuildpathPropertyPage.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/preferences/TextMarkerBuildpathPropertyPage.java?rev=1232523&r1=1232522&r2=1232523&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/preferences/TextMarkerBuildpathPropertyPage.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/preferences/TextMarkerBuildpathPropertyPage.java Tue Jan 17 18:21:36 2012
@@ -19,6 +19,8 @@
package org.apache.uima.textmarker.ide.ui.preferences;
+import org.apache.uima.textmarker.ide.core.TextMarkerLanguageToolkit;
+import org.eclipse.dltk.core.IDLTKLanguageToolkit;
import org.eclipse.dltk.ui.preferences.BuildPathsPropertyPage;
import org.eclipse.dltk.ui.util.BusyIndicatorRunnableContext;
import org.eclipse.dltk.ui.wizards.BuildpathsBlock;
@@ -36,4 +38,9 @@ public class TextMarkerBuildpathProperty
.getInt(INDEX), false, pageContainer);
}
+ @Override
+ public IDLTKLanguageToolkit getLanguageToolkit() {
+ return TextMarkerLanguageToolkit.getDefault();
+ }
+
}
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/text/TextMarkerCorrectionProcessor.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/text/TextMarkerCorrectionProcessor.java?rev=1232523&r1=1232522&r2=1232523&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/text/TextMarkerCorrectionProcessor.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/text/TextMarkerCorrectionProcessor.java Tue Jan 17 18:21:36 2012
@@ -39,7 +39,6 @@ import org.eclipse.dltk.core.IDLTKLangua
import org.eclipse.dltk.core.IModelElement;
import org.eclipse.dltk.core.IScriptModelMarker;
import org.eclipse.dltk.core.IScriptProject;
-import org.eclipse.dltk.core.ISourceModule;
import org.eclipse.dltk.internal.ui.editor.ScriptEditor;
import org.eclipse.dltk.launching.IInterpreterInstall;
import org.eclipse.dltk.launching.ScriptRuntime;
@@ -137,20 +136,20 @@ public class TextMarkerCorrectionProcess
}
public static boolean isFixable(IScriptAnnotation annotation) {
- if (annotation.getId() == TextMarkerProblems.UNKNOWN_REQUIRED_PACKAGE) {
- final String[] args = annotation.getArguments();
- if (args != null && args.length != 0 && args[0] != null) {
- final ISourceModule module = annotation.getSourceModule();
- if (module != null) {
- final IScriptProject project = module.getScriptProject();
- if (project != null) {
- if (isFixable(args[0], project)) {
- return true;
- }
- }
- }
- }
- }
+// if (annotation.getId() == TextMarkerProblems.UNKNOWN_REQUIRED_PACKAGE) {
+// final String[] args = annotation.getArguments();
+// if (args != null && args.length != 0 && args[0] != null) {
+// final ISourceModule module = annotation.getSourceModule();
+// if (module != null) {
+// final IScriptProject project = module.getScriptProject();
+// if (project != null) {
+// if (isFixable(args[0], project)) {
+// return true;
+// }
+// }
+// }
+// }
+// }
return false;
}
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/text/TextMarkerPairMatcher.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/text/TextMarkerPairMatcher.java?rev=1232523&r1=1232522&r2=1232523&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/text/TextMarkerPairMatcher.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/text/TextMarkerPairMatcher.java Tue Jan 17 18:21:36 2012
@@ -29,6 +29,7 @@ import org.eclipse.dltk.ast.declarations
import org.eclipse.dltk.ast.expressions.StringLiteral;
import org.eclipse.dltk.ast.parser.ISourceParser;
import org.eclipse.dltk.ast.statements.Block;
+import org.eclipse.dltk.compiler.env.ModuleSource;
import org.eclipse.dltk.core.DLTKCore;
import org.eclipse.dltk.core.DLTKLanguageManager;
import org.eclipse.dltk.core.IModelElement;
@@ -101,7 +102,7 @@ public final class TextMarkerPairMatcher
md = SourceParserUtil.getModuleDeclaration((ISourceModule) el, null);
}
if (md == null) {
- md = pp.parse(null, contents.toCharArray(), null);
+ md = (ModuleDeclaration) pp.parse(new ModuleSource(contents), null);
}
if (md == null) {
return new PairBlock[0];
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/text/TextMarkerTextTools.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/text/TextMarkerTextTools.java?rev=1232523&r1=1232522&r2=1232523&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/text/TextMarkerTextTools.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/text/TextMarkerTextTools.java Tue Jan 17 18:21:36 2012
@@ -28,7 +28,7 @@ import org.apache.uima.textmarker.ide.ui
import org.apache.uima.textmarker.ide.ui.TextMarkerPartitions;
import org.apache.uima.textmarker.ide.ui.TextMarkerSemanticPositionUpdater;
import org.eclipse.dltk.core.SimpleClassDLTKExtensionManager;
-import org.eclipse.dltk.ui.editor.highlighting.ISemanticHighlighter;
+import org.eclipse.dltk.ui.editor.highlighting.ISemanticHighlightingUpdater;
import org.eclipse.dltk.ui.editor.highlighting.SemanticHighlighting;
import org.eclipse.dltk.ui.text.ScriptSourceViewerConfiguration;
import org.eclipse.dltk.ui.text.ScriptTextTools;
@@ -90,11 +90,12 @@ public class TextMarkerTextTools extends
return ret;
}
- @Override
- public ISemanticHighlighter getSemanticPositionUpdater() {
- return new TextMarkerSemanticPositionUpdater(getExtensions());
- }
+ public ISemanticHighlightingUpdater getSemanticPositionUpdater(
+ String natureId) {
+ return new TextMarkerSemanticPositionUpdater(getExtensions());
+ }
+
public final static class SH extends SemanticHighlighting {
private final String preferenceKey;