Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/text/completion/TextMarkerCompletionProposalCollector.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/completion/TextMarkerCompletionProposalCollector.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/completion/TextMarkerCompletionProposalCollector.java (original) +++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/text/completion/TextMarkerCompletionProposalCollector.java Tue Jan 17 18:21:36 2012 @@ -19,14 +19,13 @@ package org.apache.uima.textmarker.ide.ui.text.completion; +import org.apache.uima.textmarker.ide.core.TextMarkerNature; import org.eclipse.dltk.core.CompletionProposal; import org.eclipse.dltk.core.IScriptProject; import org.eclipse.dltk.core.ISourceModule; -import org.eclipse.dltk.ui.text.completion.CompletionProposalLabelProvider; import org.eclipse.dltk.ui.text.completion.IScriptCompletionProposal; import org.eclipse.dltk.ui.text.completion.ScriptCompletionProposal; import org.eclipse.dltk.ui.text.completion.ScriptCompletionProposalCollector; -import org.eclipse.dltk.ui.text.completion.ScriptContentAssistInvocationContext; import org.eclipse.swt.graphics.Image; public class TextMarkerCompletionProposalCollector extends ScriptCompletionProposalCollector { @@ -42,23 +41,7 @@ public class TextMarkerCompletionProposa super(module); } - // Label provider - @Override - protected CompletionProposalLabelProvider createLabelProvider() { - return new TextMarkerCompletionProposalLabelProvider(); - } - - // Invocation context - @Override - protected ScriptContentAssistInvocationContext createScriptContentAssistInvocationContext( - ISourceModule sourceModule) { - return new ScriptContentAssistInvocationContext(sourceModule) { - @Override - protected CompletionProposalLabelProvider createLabelProvider() { - return new TextMarkerCompletionProposalLabelProvider(); - } - }; - } + // Specific proposals creation. May be use factory? @Override @@ -93,4 +76,9 @@ public class TextMarkerCompletionProposa int relevance = computeRelevance(proposal); return createScriptCompletionProposal(completion, start, length, img, label, relevance); } + + @Override + protected String getNatureId() { + return TextMarkerNature.NATURE_ID; + } }
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/text/completion/TextMarkerCompletionProposalLabelProvider.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/completion/TextMarkerCompletionProposalLabelProvider.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/completion/TextMarkerCompletionProposalLabelProvider.java (original) +++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/text/completion/TextMarkerCompletionProposalLabelProvider.java Tue Jan 17 18:21:36 2012 @@ -32,7 +32,7 @@ public class TextMarkerCompletionProposa // parameters nameBuffer.append('('); - appendUnboundedParameterList(nameBuffer, methodProposal); + appendParameterList(nameBuffer, methodProposal); nameBuffer.append(')'); return nameBuffer.toString(); @@ -47,7 +47,7 @@ public class TextMarkerCompletionProposa // parameters nameBuffer.append('('); - appendUnboundedParameterList(nameBuffer, methodProposal); + appendParameterList(nameBuffer, methodProposal); nameBuffer.append(") "); //$NON-NLS-1$ return nameBuffer.toString(); Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/text/completion/TextMarkerScriptCompletionProcessor.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/completion/TextMarkerScriptCompletionProcessor.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/completion/TextMarkerScriptCompletionProcessor.java (original) +++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/text/completion/TextMarkerScriptCompletionProcessor.java Tue Jan 17 18:21:36 2012 @@ -19,13 +19,8 @@ package org.apache.uima.textmarker.ide.ui.text.completion; -import org.apache.uima.textmarker.ide.TextMarkerIdePlugin; import org.apache.uima.textmarker.ide.core.TextMarkerNature; -import org.eclipse.dltk.ui.text.completion.CompletionProposalLabelProvider; -import org.eclipse.dltk.ui.text.completion.ContentAssistInvocationContext; import org.eclipse.dltk.ui.text.completion.ScriptCompletionProcessor; -import org.eclipse.dltk.ui.text.completion.ScriptContentAssistInvocationContext; -import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.text.ITextViewer; import org.eclipse.jface.text.TextPresentation; import org.eclipse.jface.text.contentassist.ContentAssistant; @@ -40,23 +35,7 @@ public class TextMarkerScriptCompletionP super(editor, assistant, partition); } - @Override - protected IPreferenceStore getPreferenceStore() { - return TextMarkerIdePlugin.getDefault().getPreferenceStore(); - } - - @Override - protected ContentAssistInvocationContext createContext(ITextViewer viewer, int offset) { - return new ScriptContentAssistInvocationContext(viewer, offset, fEditor, - TextMarkerNature.NATURE_ID) { - @Override - protected CompletionProposalLabelProvider createLabelProvider() { - return new TextMarkerCompletionProposalLabelProvider(); - } - }; - } - - @Override + @Override protected String getNatureId() { return TextMarkerNature.NATURE_ID; } @@ -79,11 +58,7 @@ public class TextMarkerScriptCompletionP } } - @Override - protected CompletionProposalLabelProvider getProposalLabelProvider() { - return new TextMarkerCompletionProposalLabelProvider(); - } - + private IContextInformationValidator validator; @Override Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/text/folding/TextMarkerFoldingStructureProvider.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/folding/TextMarkerFoldingStructureProvider.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/folding/TextMarkerFoldingStructureProvider.java (original) +++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/text/folding/TextMarkerFoldingStructureProvider.java Tue Jan 17 18:21:36 2012 @@ -37,6 +37,7 @@ import org.eclipse.dltk.ast.declarations import org.eclipse.dltk.ast.parser.ISourceParser; import org.eclipse.dltk.ast.references.SimpleReference; import org.eclipse.dltk.ast.statements.Statement; +import org.eclipse.dltk.compiler.env.ModuleSource; import org.eclipse.dltk.core.DLTKLanguageManager; import org.eclipse.dltk.ui.text.folding.AbstractASTFoldingStructureProvider; import org.eclipse.jface.preference.IPreferenceStore; @@ -70,7 +71,7 @@ public class TextMarkerFoldingStructureP */ ISourceParser pp = null; pp = DLTKLanguageManager.getSourceParser(TextMarkerNature.NATURE_ID); - ModuleDeclaration md = pp.parse(null, code.toCharArray(), null); + ModuleDeclaration md = (ModuleDeclaration) pp.parse(new ModuleSource(code), null); List statements = md.getStatements(); if (statements == null) { return new CodeBlock[0]; Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/wizards/TextMarkerFileCreationPage.java URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/wizards/TextMarkerFileCreationPage.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/wizards/TextMarkerFileCreationPage.java (original) +++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/wizards/TextMarkerFileCreationPage.java Tue Jan 17 18:21:36 2012 @@ -21,7 +21,6 @@ package org.apache.uima.textmarker.ide.u import org.apache.uima.textmarker.ide.core.TextMarkerNature; import org.eclipse.core.runtime.IPath; -import org.eclipse.dltk.core.IModelElement; import org.eclipse.dltk.core.IScriptFolder; import org.eclipse.dltk.ui.wizards.NewSourceModulePage; @@ -38,8 +37,7 @@ public class TextMarkerFileCreationPage StringBuilder sb = new StringBuilder(); sb.append("PACKAGE "); IScriptFolder scriptFolder = getScriptFolder(); - IModelElement ancestor = scriptFolder.getAncestor(IModelElement.PROJECT_FRAGMENT); - IPath path = ancestor.getPath().removeFirstSegments(1); + IPath path = scriptFolder.getPath().removeFirstSegments(1); String pathString = ""; for (int i = 1; i < path.segments().length; i++) { pathString += path.segments()[i]; Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/wizards/TextMarkerProjectCreationWizard.java URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/wizards/TextMarkerProjectCreationWizard.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/wizards/TextMarkerProjectCreationWizard.java (original) +++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/wizards/TextMarkerProjectCreationWizard.java Tue Jan 17 18:21:36 2012 @@ -28,6 +28,7 @@ import java.util.ArrayList; import java.util.List; import org.apache.uima.textmarker.engine.TextMarkerEngine; +import org.apache.uima.textmarker.ide.core.TextMarkerNature; import org.apache.uima.textmarker.ide.core.builder.TextMarkerProjectUtils; import org.apache.uima.textmarker.ide.ui.TextMarkerImages; import org.eclipse.core.resources.IFolder; @@ -35,25 +36,22 @@ import org.eclipse.core.resources.IProje import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; -import org.eclipse.core.runtime.IExecutableExtension; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.SubProgressMonitor; import org.eclipse.dltk.core.DLTKCore; import org.eclipse.dltk.core.IBuildpathEntry; -import org.eclipse.dltk.core.IModelElement; import org.eclipse.dltk.internal.ui.util.CoreUtility; import org.eclipse.dltk.internal.ui.wizards.buildpath.BPListElement; import org.eclipse.dltk.ui.DLTKUIPlugin; import org.eclipse.dltk.ui.wizards.BuildpathsBlock; -import org.eclipse.dltk.ui.wizards.NewElementWizard; +import org.eclipse.dltk.ui.wizards.ProjectWizard; import org.eclipse.dltk.ui.wizards.ProjectWizardFirstPage; import org.eclipse.dltk.ui.wizards.ProjectWizardSecondPage; -import org.eclipse.ui.INewWizard; import org.eclipse.ui.wizards.newresource.BasicNewProjectResourceWizard; -public class TextMarkerProjectCreationWizard extends NewElementWizard implements INewWizard, - IExecutableExtension { +public class TextMarkerProjectCreationWizard extends ProjectWizard { + public static final String ID_WIZARD = "org.apache.uima.textmarker.ide.ui.wizards.TextMarkerProjectWizard"; //$NON-NLS-1$ private ProjectWizardFirstPage fFirstPage; @@ -68,6 +66,7 @@ public class TextMarkerProjectCreationWi setWindowTitle(TextMarkerWizardMessages.ProjectCreationWizard_title); } + @Override public void addPages() { super.addPages(); @@ -82,8 +81,7 @@ public class TextMarkerProjectCreationWi @Override protected void finishPage(IProgressMonitor monitor) throws InterruptedException, CoreException { - - fSecondPage.performFinish(monitor); // use the full progress monitor +super.finishPage(monitor); createProject(monitor); } @@ -249,12 +247,11 @@ public class TextMarkerProjectCreationWi @Override public boolean performCancel() { - fSecondPage.performCancel(); return super.performCancel(); } @Override - public IModelElement getCreatedElement() { - return DLTKCore.create(fFirstPage.getProjectHandle()); + public String getScriptNature() { + return TextMarkerNature.NATURE_ID; } } Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/wizards/TextMarkerProjectWizardFirstPage.java URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/wizards/TextMarkerProjectWizardFirstPage.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/wizards/TextMarkerProjectWizardFirstPage.java (original) +++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/wizards/TextMarkerProjectWizardFirstPage.java Tue Jan 17 18:21:36 2012 @@ -19,7 +19,6 @@ package org.apache.uima.textmarker.ide.ui.wizards; -import org.apache.uima.textmarker.ide.core.TextMarkerNature; import org.eclipse.dltk.ui.wizards.ProjectWizardFirstPage; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; @@ -39,26 +38,10 @@ final class TextMarkerProjectWizardFirst setDescription(TextMarkerWizardMessages.ProjectCreationWizardFirstPage_description); } - final class TextMarkerInterpreterGroup extends AbstractInterpreterGroup { - - public TextMarkerInterpreterGroup(Composite composite) { - super(composite); - } - - @Override - protected String getCurrentLanguageNature() { - return TextMarkerNature.NATURE_ID; - } - - @Override - protected String getIntereprtersPreferencePageId() { - return "org.apache.uima.textmarker.ide.preferences.interpreters"; //$NON-NLS-1$ - } - } - + @Override protected IInterpreterGroup createInterpreterGroup(Composite parent) { - return new TextMarkerInterpreterGroup(parent); + return new DefaultInterpreterGroup(parent); } @Override Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/wizards/TextMarkerProjectWizardSecondPage.java URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/wizards/TextMarkerProjectWizardSecondPage.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/wizards/TextMarkerProjectWizardSecondPage.java (original) +++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/wizards/TextMarkerProjectWizardSecondPage.java Tue Jan 17 18:21:36 2012 @@ -19,15 +19,12 @@ package org.apache.uima.textmarker.ide.ui.wizards; -import org.apache.uima.textmarker.ide.TextMarkerIdePlugin; -import org.apache.uima.textmarker.ide.core.TextMarkerNature; import org.apache.uima.textmarker.ide.ui.preferences.TextMarkerBuildPathsBlock; import org.eclipse.dltk.ui.util.BusyIndicatorRunnableContext; import org.eclipse.dltk.ui.util.IStatusChangeListener; import org.eclipse.dltk.ui.wizards.BuildpathsBlock; import org.eclipse.dltk.ui.wizards.ProjectWizardFirstPage; import org.eclipse.dltk.ui.wizards.ProjectWizardSecondPage; -import org.eclipse.jface.preference.IPreferenceStore; final class TextMarkerProjectWizardSecondPage extends ProjectWizardSecondPage { TextMarkerProjectWizardSecondPage(ProjectWizardFirstPage mainPage) { @@ -39,17 +36,9 @@ final class TextMarkerProjectWizardSecon return new TextMarkerBuildPathsBlock(new BusyIndicatorRunnableContext(), listener, 0, useNewSourcePage(), null); } + - @Override - protected String getScriptNature() { - return TextMarkerNature.NATURE_ID; - } - - @Override - protected IPreferenceStore getPreferenceStore() { - return TextMarkerIdePlugin.getDefault().getPreferenceStore(); - } - + // protected BuildpathDetector createBuildpathDetector( // IProgressMonitor monitor, IDLTKLanguageToolkit toolkit) // throws CoreException { Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/validator/TextMarkerCheckerDefaultProblem.java URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/validator/TextMarkerCheckerDefaultProblem.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/validator/TextMarkerCheckerDefaultProblem.java (original) +++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/validator/TextMarkerCheckerDefaultProblem.java Tue Jan 17 18:21:36 2012 @@ -22,38 +22,27 @@ package org.apache.uima.textmarker.ide.v import org.apache.uima.textmarker.ide.parser.ast.TextMarkerAbstractDeclaration; import org.eclipse.dltk.ast.ASTNode; import org.eclipse.dltk.compiler.problem.DefaultProblem; -import org.eclipse.dltk.compiler.problem.ProblemSeverities; +import org.eclipse.dltk.compiler.problem.ProblemSeverity; public class TextMarkerCheckerDefaultProblem extends DefaultProblem { - public static final int WARNING = ProblemSeverities.Warning; - public static final int ERROR = ProblemSeverities.Error; - - // public TextMarkerCheckerDefaultProblem(String message, int id, String[] - // stringArguments, - // int severity, int start, int end) { - // super(message, id, stringArguments, severity, start, - // end, 10); - // } - - public TextMarkerCheckerDefaultProblem(String fileName, String message, - TextMarkerAbstractDeclaration node, int line, int severity) { - super(fileName, message, 0, new String[] {}, severity, node.getNameStart(), node.getNameEnd(), - line); + public TextMarkerCheckerDefaultProblem(String fileName, String message, + TextMarkerAbstractDeclaration node, int line, int column, ProblemSeverity severity) { + super(fileName, message, TextMarkerProblemIdentifier.PROBLEM, new String[] {}, severity, node.getNameStart(), node.getNameEnd(), line, column); } public TextMarkerCheckerDefaultProblem(String fileName, String message, TextMarkerAbstractDeclaration node, int line) { - super(fileName, message, 0, new String[] {}, ERROR, node.getNameStart(), node.getNameEnd(), + super(fileName, message, 0, new String[] {}, ProblemSeverity.ERROR, node.getNameStart(), node.getNameEnd(), line); } public TextMarkerCheckerDefaultProblem(String fileName, String message, ASTNode node, int line) { - this(fileName, message, node, line, ERROR); + this(fileName, message, node, line, ProblemSeverity.ERROR); } public TextMarkerCheckerDefaultProblem(String fileName, String message, ASTNode node, int line, - int severity) { + ProblemSeverity severity) { super(fileName, message, 0, new String[] {}, severity, node.sourceStart(), node.sourceEnd(), line); } Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/validator/TextMarkerCheckerProblemFactory.java URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/validator/TextMarkerCheckerProblemFactory.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/validator/TextMarkerCheckerProblemFactory.java (original) +++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/validator/TextMarkerCheckerProblemFactory.java Tue Jan 17 18:21:36 2012 @@ -29,6 +29,7 @@ import org.eclipse.dltk.ast.ASTNode; import org.eclipse.dltk.ast.expressions.Expression; import org.eclipse.dltk.ast.expressions.StringLiteral; import org.eclipse.dltk.compiler.problem.IProblem; +import org.eclipse.dltk.compiler.problem.ProblemSeverity; import org.eclipse.dltk.core.ISourceModule; import org.eclipse.dltk.core.builder.ISourceLineTracker; @@ -67,7 +68,7 @@ public class TextMarkerCheckerProblemFac } public IProblem createDuplicateShortNameInImported(ASTNode node, String localPath, - List<String> checkDuplicateShortNames, int severity) { + List<String> checkDuplicateShortNames, ProblemSeverity severity) { StringBuilder sb = new StringBuilder(); for (String string : checkDuplicateShortNames) { sb.append(string); @@ -79,7 +80,7 @@ public class TextMarkerCheckerProblemFac getLine(node), severity); } - public IProblem createDuplicateShortName(TextMarkerAbstractDeclaration var, int severity) { + public IProblem createDuplicateShortName(TextMarkerAbstractDeclaration var, ProblemSeverity severity) { return new TextMarkerCheckerDefaultProblem(this.fileName, "The type " + var.getName() + " conflicts with other types with same short name, but different namespace.", var, getLine(var), severity); Added: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/validator/TextMarkerProblemIdentifier.java URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/validator/TextMarkerProblemIdentifier.java?rev=1232523&view=auto ============================================================================== --- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/validator/TextMarkerProblemIdentifier.java (added) +++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/validator/TextMarkerProblemIdentifier.java Tue Jan 17 18:21:36 2012 @@ -0,0 +1,34 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.uima.textmarker.ide.validator; + +import org.apache.uima.textmarker.ide.TextMarkerIdePlugin; +import org.eclipse.dltk.compiler.problem.IProblemIdentifier; + +public enum TextMarkerProblemIdentifier implements IProblemIdentifier { + + PROBLEM; + + public String contributor() { + return TextMarkerIdePlugin.PLUGIN_ID; + } + +} + Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/validator/TextMarkerTypeChecker.java URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/validator/TextMarkerTypeChecker.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/validator/TextMarkerTypeChecker.java (original) +++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/validator/TextMarkerTypeChecker.java Tue Jan 17 18:21:36 2012 @@ -64,6 +64,7 @@ import org.eclipse.dltk.ast.references.S import org.eclipse.dltk.ast.statements.Statement; import org.eclipse.dltk.compiler.problem.IProblem; import org.eclipse.dltk.compiler.problem.IProblemReporter; +import org.eclipse.dltk.compiler.problem.ProblemSeverity; import org.eclipse.dltk.core.IModelElement; import org.eclipse.dltk.core.IScriptProject; import org.eclipse.dltk.core.ISourceModule; @@ -223,7 +224,7 @@ public class TextMarkerTypeChecker imple TextMarkerTypeDeclaration newType = (TextMarkerTypeDeclaration) s; if (reportWarningOnShortNames && shortTypes.contains(newType.getName())) { IProblem problem = problemFactory.createDuplicateShortName(newType, - TextMarkerCheckerDefaultProblem.WARNING); + ProblemSeverity.WARNING); rep.reportProblem(problem); return false; } @@ -281,7 +282,7 @@ public class TextMarkerTypeChecker imple if (!checkDuplicateShortNames.isEmpty()) { rep.reportProblem(problemFactory.createDuplicateShortNameInImported(sRef, localPath, checkDuplicateShortNames, - TextMarkerCheckerDefaultProblem.WARNING)); + ProblemSeverity.WARNING)); } } completeTypes.addAll(importedTypes); @@ -314,7 +315,7 @@ public class TextMarkerTypeChecker imple if (!checkDuplicateShortNames.isEmpty()) { rep.reportProblem(problemFactory.createDuplicateShortNameInImported(sRef, localpath, checkDuplicateShortNames, - TextMarkerCheckerDefaultProblem.WARNING)); + ProblemSeverity.WARNING)); } } completeTypes.addAll(importedTypes); Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-textruler/META-INF/MANIFEST.MF URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-textruler/META-INF/MANIFEST.MF?rev=1232523&r1=1232522&r2=1232523&view=diff ============================================================================== --- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-textruler/META-INF/MANIFEST.MF (original) +++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-textruler/META-INF/MANIFEST.MF Tue Jan 17 18:21:36 2012 @@ -9,10 +9,10 @@ Require-Bundle: org.eclipse.ui, org.apache.uima.textmarker.engine, org.apache.uima.runtime;bundle-version="2.3.0", org.eclipse.jface.text, - org.eclipse.dltk.ui;bundle-version="[1.0.0,2.0.0)", + org.eclipse.dltk.ui;bundle-version="[3.0.0,4.0.0)", org.apache.uima.textmarker.ide, org.eclipse.ui.workbench.texteditor, org.eclipse.ui.editors, - org.eclipse.dltk.core;bundle-version="[1.0.0,2.0.0)" + org.eclipse.dltk.core;bundle-version="[3.0.0,4.0.0)" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6