You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by jo...@apache.org on 2011/08/04 11:31:46 UTC
svn commit: r1153805 [1/2] - in /uima/sandbox/trunk/TextMarker:
org.apache.uima.tm.cev.feature/ org.apache.uima.tm.cev.html.feature/
org.apache.uima.tm.cev/META-INF/
org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/palette/
org.apache....
Author: joern
Date: Thu Aug 4 09:31:37 2011
New Revision: 1153805
URL: http://svn.apache.org/viewvc?rev=1153805&view=rev
Log:
Applied UIMA-2196 patch: Correct outdated namespaces
Modified:
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev.feature/feature.xml
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev.html.feature/feature.xml
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/META-INF/MANIFEST.MF
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/palette/CEVAnnotationMarkerPalettePage.java
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.core/src/main/java/org/apache/uima/tm/dltk/core/TextMarkerLanguageToolkit.java
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.core/src/main/java/org/apache/uima/tm/dltk/internal/core/codeassist/TextMarkerSelectionEngine.java
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/plugin.xml
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/src/main/java/org/apache/uima/tm/dltk/internal/debug/TextMarkerDebugPlugin.java
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.formatter/src/main/java/org/apache/uima/tm/dltk/formatter/bak_formatPreviewScript.tm
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.formatter/src/main/java/org/apache/uima/tm/dltk/formatter/formatPreviewScript.tm
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.formatter/src/main/java/org/apache/uima/tm/dltk/formatter/preferences/bak_indentation-preview.tm
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.formatter/src/main/java/org/apache/uima/tm/dltk/formatter/preferences/blank-lines-preview.tm
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.formatter/src/main/java/org/apache/uima/tm/dltk/formatter/preferences/indentation-preview.tm
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.formatter/src/main/java/org/apache/uima/tm/dltk/formatter/preferences/wrapping-preview.tm
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.launching/plugin.xml
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.testing/plugin.xml
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.testing/src/main/java/org/apache/uima/tm/dltk/internal/testing/TextMarkerTestingLaunchShortcut.java
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.testing/src/main/java/org/apache/uima/tm/dltk/internal/testing/TextMarkerTestingPlugin.java
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.ui/plugin.xml
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.ui/src/main/java/org/apache/uima/tm/dltk/internal/ui/actions/OpenTextMarkerSearchPageAction.java
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.ui/src/main/java/org/apache/uima/tm/dltk/internal/ui/editor/TextMarkerEditor.java
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.ui/src/main/java/org/apache/uima/tm/dltk/internal/ui/preferences/PreviewFile.txt
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.validator/src/main/java/org/apache/uima/tm/dltk/validator/TextMarkerCheckerUtils.java
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.validator/src/main/java/org/apache/uima/tm/dltk/validator/TextMarkerEngineAndCallChecker.java
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.validator/src/main/java/org/apache/uima/tm/dltk/validator/TextMarkerRessourceChecker.java
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.validator/src/main/java/org/apache/uima/tm/dltk/validator/TextMarkerTypeChecker.java
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/src/main/java/org/apache/uima/tm/textmarker/parser/TextMarkerDescriptorParser.g
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.feature/feature.xml
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.lp2/src/main/java/org/apache/uima/tm/textruler/lp2/BasicLP2.java
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.lp2/src/main/java/org/apache/uima/tm/textruler/lp2/OptimizedLP2.java
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.rapier/src/main/java/org/apache/uima/tm/textruler/rapier/Rapier.java
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.whisk/src/main/java/org/apache/uima/tm/textruler/whisk/generic/Whisk.java
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.whisk/src/main/java/org/apache/uima/tm/textruler/whisk/token/Whisk.java
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler/src/main/java/org/apache/uima/tm/textruler/extension/TextRulerPreprocessor.java
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler/src/main/java/org/apache/uima/tm/textruler/tools/BatchRuleEvaluator.java
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler/src/main/java/org/apache/uima/tm/textruler/tools/BatchRuleScorer.java
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler/src/main/java/org/apache/uima/tm/textruler/tools/F1Scorer.java
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler/src/main/java/org/apache/uima/tm/textruler/tools/SGMLToXMIConverter.java
Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev.feature/feature.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev.feature/feature.xml?rev=1153805&r1=1153804&r2=1153805&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev.feature/feature.xml (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev.feature/feature.xml Thu Aug 4 09:31:37 2011
@@ -19,7 +19,7 @@ under the License.
-->
<feature
- id="de.uniwue.tm.cev.feature"
+ id="org.apache.uima.tm.cev.feature"
label="CEV Feature"
version="1.0.0.qualifier"
provider-name="University of Würzburg">
@@ -213,7 +213,7 @@ Library.
</requires>
<plugin
- id="de.uniwue.tm.cev"
+ id="org.apache.uima.tm.cev"
download-size="0"
install-size="0"
version="0.0.0"
Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev.html.feature/feature.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev.html.feature/feature.xml?rev=1153805&r1=1153804&r2=1153805&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev.html.feature/feature.xml (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev.html.feature/feature.xml Thu Aug 4 09:31:37 2011
@@ -19,7 +19,7 @@ under the License.
-->
<feature
- id="de.uniwue.tm.cev.html.feature"
+ id="org.apache.uima.tm.cev.html.feature"
label="CEV HTML Feature"
version="1.0.0.qualifier"
provider-name="University of Würzburg">
@@ -203,14 +203,14 @@ Library.
<requires>
<import plugin="org.eclipse.ui"/>
<import plugin="org.eclipse.core.runtime"/>
- <import plugin="de.uniwue.tm.cev"/>
+ <import plugin="org.apache.uima.tm.cev"/>
<import plugin="org.apache.uima.runtime" version="2.3.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.resources"/>
<import plugin="org.mozilla.xpcom"/>
</requires>
<plugin
- id="de.uniwue.tm.cev.html"
+ id="org.apache.uima.tm.cev.html"
download-size="0"
install-size="0"
version="0.0.0"
Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/META-INF/MANIFEST.MF?rev=1153805&r1=1153804&r2=1153805&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/META-INF/MANIFEST.MF (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/META-INF/MANIFEST.MF Thu Aug 4 09:31:37 2011
@@ -16,78 +16,118 @@ Require-Bundle: org.eclipse.ui,
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .,
lib/htmlparser.jar
-Export-Package: org.apache.uima.tm.cev;uses:="org.eclipse.jface.resource,org.eclipse.ui.plugin,org.osgi.framework",
- org.apache.uima.tm.cev.artifactViewer,
+Export-Package: org.apache.uima.tm.cev;
+ uses:="org.eclipse.jface.resource,
+ org.eclipse.core.runtime.jobs,
+ org.eclipse.ui,
+ org.eclipse.ui.plugin,
+ org.osgi.framework",
+ org.apache.uima.tm.cev.artifactViewer;
+ uses:="org.apache.uima.tm.cev.data,
+ org.apache.uima.tm.cev.editor,
+ org.eclipse.swt.custom,
+ org.apache.uima.cas.text,
+ org.eclipse.swt.graphics,
+ org.apache.uima.cas,
+ org.apache.uima.tm.cev.extension,
+ org.eclipse.swt.widgets",
org.apache.uima.tm.cev.data;
- uses:="de.uniwue.tm.cev.data.treerepresentation,
- org.mozilla.interfaces,
+ uses:="org.apache.uima.tm.cev.data.tree,
org.apache.uima.tools.stylemap,
- org.apache.uima.cas,
- org.apache.uima.cas.text,
- org.eclipse.swt.browser,
org.eclipse.core.resources,
+ org.eclipse.jface.viewers,
+ org.apache.uima.cas.text,
org.eclipse.swt.graphics,
- org.eclipse.jface.viewers",
+ org.apache.uima.cas",
org.apache.uima.tm.cev.data.tree;uses:="org.apache.uima.cas,org.apache.uima.cas.text",
org.apache.uima.tm.cev.dialog;uses:="org.eclipse.jface.viewers",
org.apache.uima.tm.cev.editor;
- uses:="org.eclipse.ui.texteditor,
+ uses:="org.eclipse.jface.action,
+ org.apache.uima.tm.cev.data,
+ org.eclipse.ui.texteditor,
org.eclipse.core.runtime,
- org.mozilla.interfaces,
- org.eclipse.ui,
org.eclipse.swt.events,
+ org.eclipse.ui,
+ org.eclipse.core.resources,
+ org.apache.uima.cas.text,
org.apache.uima.cas,
+ org.eclipse.ui.part",
+ org.apache.uima.tm.cev.extension;
+ uses:="org.apache.uima.tm.cev.data,
+ org.apache.uima.tm.cev.editor,
+ org.eclipse.core.resources,
+ org.eclipse.swt.custom,
org.apache.uima.cas.text,
- org.eclipse.ui.part,
- de.uniwue.tm.cev.data,
- org.eclipse.jface.action,
- org.eclipse.core.resources",
- org.apache.uima.tm.cev.extension;uses:="de.uniwue.tm.cev.editor,de.uniwue.tm.cev.data",
+ org.eclipse.swt.graphics,
+ org.apache.uima.cas",
org.apache.uima.tm.cev.preferences;
uses:="org.eclipse.jface.preference,
org.eclipse.ui,
- org.eclipse.core.runtime.preferences,
- org.eclipse.swt.widgets",
- org.apache.uima.tm.cev.searchStrategy,
- org.apache.uima.tm.cev.views,
- org.apache.uima.tm.cev.views.annotationBrowser;
+ org.eclipse.swt.widgets,
+ org.eclipse.core.runtime.preferences",
+ org.apache.uima.tm.cev.searchStrategy;uses:="org.eclipse.core.resources,org.apache.uima.tm.cev.extension,org.eclipse.jface.viewers",
+ org.apache.uima.tm.cev.views;
uses:="org.eclipse.core.runtime,
+ org.apache.uima.tm.cev.editor,
org.eclipse.ui,
- de.uniwue.tm.cev.editor,
+ org.eclipse.swt.events,
+ org.apache.uima.tm.cev.extension,
+ org.apache.uima.cas,
org.apache.uima.cas.text,
- de.uniwue.tm.cev.views,
org.eclipse.ui.part,
- org.eclipse.swt.widgets,
- de.uniwue.tm.cev.data",
+ org.apache.uima.tm.cev.data,
+ org.eclipse.swt.dnd,
+ org.eclipse.swt.graphics,
+ org.eclipse.jface.viewers,
+ org.eclipse.swt.widgets",
+ org.apache.uima.tm.cev.views.annotationBrowser;
+ uses:="org.apache.uima.tm.cev.data,
+ org.eclipse.core.runtime,
+ org.apache.uima.tm.cev.editor,
+ org.apache.uima.tm.cev.views,
+ org.eclipse.ui,
+ org.apache.uima.tm.cev.extension,
+ org.eclipse.ui.part,
+ org.eclipse.swt.widgets",
org.apache.uima.tm.cev.views.editor;
uses:="org.eclipse.core.runtime,
+ org.apache.uima.tm.cev.editor,
org.eclipse.ui,
- de.uniwue.tm.cev.extension,
org.eclipse.swt.events,
- de.uniwue.tm.cev.editor,
- de.uniwue.tm.cev.views,
+ org.apache.uima.tm.cev.extension,
org.apache.uima.cas,
org.apache.uima.cas.text,
org.eclipse.ui.part,
- org.eclipse.swt.widgets,
- de.uniwue.tm.cev.data",
- org.apache.uima.tm.cev.views.fsBrowser,
+ org.apache.uima.tm.cev.data,
+ org.apache.uima.tm.cev.views,
+ org.eclipse.swt.widgets",
+ org.apache.uima.tm.cev.views.fsBrowser;
+ uses:="org.apache.uima.tm.cev.data,
+ org.apache.uima.tm.cev.editor,
+ org.apache.uima.tm.cev.views,
+ org.eclipse.ui,
+ org.apache.uima.tm.cev.extension,
+ org.apache.uima.cas.text,
+ org.apache.uima.cas,
+ org.eclipse.ui.part,
+ org.eclipse.swt.widgets",
org.apache.uima.tm.cev.views.palette;
- uses:="org.eclipse.ui,
- de.uniwue.tm.cev.extension,
- de.uniwue.tm.cev.editor,
- de.uniwue.tm.cev.views,
+ uses:="org.apache.uima.tm.cev.data,
+ org.apache.uima.tm.cev.editor,
+ org.apache.uima.tm.cev.views,
+ org.eclipse.ui,
+ org.apache.uima.tm.cev.extension,
org.apache.uima.cas.text,
org.apache.uima.cas,
org.eclipse.ui.part,
- org.eclipse.swt.widgets,
- de.uniwue.tm.cev.data",
+ org.eclipse.swt.widgets",
org.apache.uima.tm.cev.views.selection;
- uses:="org.eclipse.ui,
- de.uniwue.tm.cev.editor,
- org.apache.uima.cas.text,
- de.uniwue.tm.cev.views,
+ uses:="org.apache.uima.tm.cev.data,
+ org.apache.uima.tm.cev.editor,
+ org.apache.uima.tm.cev.views,
+ org.eclipse.ui,
+ org.apache.uima.tm.cev.extension,
org.eclipse.ui.part,
- de.uniwue.tm.cev.data"
+ org.eclipse.swt.widgets"
Bundle-Vendor: University of Würzburg
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/palette/CEVAnnotationMarkerPalettePage.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/palette/CEVAnnotationMarkerPalettePage.java?rev=1153805&r1=1153804&r2=1153805&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/palette/CEVAnnotationMarkerPalettePage.java (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/palette/CEVAnnotationMarkerPalettePage.java Thu Aug 4 09:31:37 2011
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
-*/
+ */
package org.apache.uima.tm.cev.views.palette;
@@ -235,8 +235,9 @@ public class CEVAnnotationMarkerPaletteP
while (typeIterator.hasNext()) {
Type type = (Type) typeIterator.next();
- if (!(type.getName().startsWith("de.uniwue.tm.textmarker.kernel.type")
- || type.getName().startsWith("de.uniwue.tm.type")
+ // TODO find a generic way to filter these types:
+ if (!(type.getName().startsWith("org.apache.uima.tm.textmarker.kernel.type")
+ || type.getName().startsWith("org.apache.uima.tm.type")
|| type.getName().startsWith("uima.cas") || type.getName().startsWith("uima.tcas"))) {
types.add(type);
int typeShortName = type.getShortName().length();
Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.core/src/main/java/org/apache/uima/tm/dltk/core/TextMarkerLanguageToolkit.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.core/src/main/java/org/apache/uima/tm/dltk/core/TextMarkerLanguageToolkit.java?rev=1153805&r1=1153804&r2=1153805&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.core/src/main/java/org/apache/uima/tm/dltk/core/TextMarkerLanguageToolkit.java (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.core/src/main/java/org/apache/uima/tm/dltk/core/TextMarkerLanguageToolkit.java Thu Aug 4 09:31:37 2011
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
-*/
+ */
package org.apache.uima.tm.dltk.core;
@@ -70,7 +70,7 @@ public class TextMarkerLanguageToolkit e
}
public String getLanguageContentType() {
- return "de.uniwue.dltk.tmContentType";
+ return "org.apache.uima.tm.dltk.tmContentType";
}
public static TextMarkerLanguageToolkit getDefault() {
Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.core/src/main/java/org/apache/uima/tm/dltk/internal/core/codeassist/TextMarkerSelectionEngine.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.core/src/main/java/org/apache/uima/tm/dltk/internal/core/codeassist/TextMarkerSelectionEngine.java?rev=1153805&r1=1153804&r2=1153805&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.core/src/main/java/org/apache/uima/tm/dltk/internal/core/codeassist/TextMarkerSelectionEngine.java (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.core/src/main/java/org/apache/uima/tm/dltk/internal/core/codeassist/TextMarkerSelectionEngine.java Thu Aug 4 09:31:37 2011
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
-*/
+ */
package org.apache.uima.tm.dltk.internal.core.codeassist;
@@ -64,7 +64,6 @@ import org.eclipse.dltk.core.IScriptFold
import org.eclipse.dltk.core.IScriptProject;
import org.eclipse.dltk.core.ModelException;
-
public class TextMarkerSelectionEngine extends ScriptSelectionEngine {
/**
* @author Martin Toepfer
@@ -242,7 +241,7 @@ public class TextMarkerSelectionEngine e
/**
* @param xmlFilePath
- * absolute full path. i.e.: "de.uniwue.myengine" ".xml" will be added.
+ * absolute full path. i.e.: "org.apache.uima.myengine" ".xml" will be added.
* @return file.exists
*/
public IFile getEngine(String xmlFilePath, IScriptProject project) {
@@ -281,8 +280,8 @@ public class TextMarkerSelectionEngine e
private void importTypesystem(String sRefName) {
typesystems.add(sRefName);
- IFolder folder = sourceModule.getScriptProject().getProject().getFolder(
- TextMarkerProjectUtils.getDefaultDescriptorLocation());
+ IFolder folder = sourceModule.getScriptProject().getProject()
+ .getFolder(TextMarkerProjectUtils.getDefaultDescriptorLocation());
if (folder != null) {
int lastDot = sRefName.lastIndexOf('.');
String fileNameShort = sRefName.substring(lastDot + 1);
Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/plugin.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/plugin.xml?rev=1153805&r1=1153804&r2=1153805&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/plugin.xml (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/plugin.xml Thu Aug 4 09:31:37 2011
@@ -30,7 +30,7 @@ under the License.
point="org.eclipse.dltk.debug.scriptDebugModel">
<debugModel
debugModelId="org.eclipse.dltk.debug.textmarkerModel"
- natureId="de.uniwue.dltk.textmarker.core.nature"
+ natureId="org.apache.uima.tm.dltk.core.TextMarkerNature"
typeFactory="org.apache.uima.tm.dltk.internal.debug.TextMarkerTypeFactory">
</debugModel>
</extension>
Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/src/main/java/org/apache/uima/tm/dltk/internal/debug/TextMarkerDebugPlugin.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/src/main/java/org/apache/uima/tm/dltk/internal/debug/TextMarkerDebugPlugin.java?rev=1153805&r1=1153804&r2=1153805&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/src/main/java/org/apache/uima/tm/dltk/internal/debug/TextMarkerDebugPlugin.java (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/src/main/java/org/apache/uima/tm/dltk/internal/debug/TextMarkerDebugPlugin.java Thu Aug 4 09:31:37 2011
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
-*/
+ */
package org.apache.uima.tm.dltk.internal.debug;
@@ -25,7 +25,7 @@ import org.osgi.framework.BundleContext;
public class TextMarkerDebugPlugin extends Plugin {
// The plug-in ID
- public static final String PLUGIN_ID = "de.uniwue.dltk.textmarker.debug";
+ public static final String PLUGIN_ID = "org.apache.uima.tm.dltk.debug";
// The shared instance
private static TextMarkerDebugPlugin plugin;
Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.formatter/src/main/java/org/apache/uima/tm/dltk/formatter/bak_formatPreviewScript.tm
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.formatter/src/main/java/org/apache/uima/tm/dltk/formatter/bak_formatPreviewScript.tm?rev=1153805&r1=1153804&r2=1153805&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.formatter/src/main/java/org/apache/uima/tm/dltk/formatter/bak_formatPreviewScript.tm (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.formatter/src/main/java/org/apache/uima/tm/dltk/formatter/bak_formatPreviewScript.tm Thu Aug 4 09:31:37 2011
@@ -1,9 +1,9 @@
-PACKAGE de.uniwue.casetrain;
+PACKAGE org.apache.uima;
-SCRIPT de.uniwue.casetrain.DashTree;
-SCRIPT de.uniwue.casetrain.DashTreeError;
-SCRIPT de.uniwue.casetrain.BuildTree;
-TYPESYSTEM de.uniwue.casetrain.TerminologyTypeSystem;
+SCRIPT org.apache.uima.DashTree;
+SCRIPT org.apache.uima.DashTreeError;
+SCRIPT org.apache.uima.BuildTree;
+TYPESYSTEM org.apache.uima.TerminologyTypeSystem;
Document(CALL,DashTree);
Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.formatter/src/main/java/org/apache/uima/tm/dltk/formatter/formatPreviewScript.tm
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.formatter/src/main/java/org/apache/uima/tm/dltk/formatter/formatPreviewScript.tm?rev=1153805&r1=1153804&r2=1153805&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.formatter/src/main/java/org/apache/uima/tm/dltk/formatter/formatPreviewScript.tm (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.formatter/src/main/java/org/apache/uima/tm/dltk/formatter/formatPreviewScript.tm Thu Aug 4 09:31:37 2011
@@ -1,9 +1,9 @@
-PACKAGE de.uniwue.casetrain;
+PACKAGE org.apache.uima;
-SCRIPT de.uniwue.casetrain.DashTree;
-SCRIPT de.uniwue.casetrain.DashTreeError;
-SCRIPT de.uniwue.casetrain.BuildTree;
-TYPESYSTEM de.uniwue.casetrain.TerminologyTypeSystem;
+SCRIPT org.apache.uima.DashTree;
+SCRIPT org.apache.uima.DashTreeError;
+SCRIPT org.apache.uima.BuildTree;
+TYPESYSTEM org.apache.uima.TerminologyTypeSystem;
Document{->CALL(DashTree)};
DECLARE link1, link2, link3, link4;
Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.formatter/src/main/java/org/apache/uima/tm/dltk/formatter/preferences/bak_indentation-preview.tm
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.formatter/src/main/java/org/apache/uima/tm/dltk/formatter/preferences/bak_indentation-preview.tm?rev=1153805&r1=1153804&r2=1153805&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.formatter/src/main/java/org/apache/uima/tm/dltk/formatter/preferences/bak_indentation-preview.tm (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.formatter/src/main/java/org/apache/uima/tm/dltk/formatter/preferences/bak_indentation-preview.tm Thu Aug 4 09:31:37 2011
@@ -1,9 +1,9 @@
-PACKAGE de.uniwue.casetrain;
+PACKAGE org.apache.uima;
-SCRIPT de.uniwue.casetrain.DashTree;
-SCRIPT de.uniwue.casetrain.DashTreeError;
-SCRIPT de.uniwue.casetrain.BuildTree;
-TYPESYSTEM de.uniwue.casetrain.TerminologyTypeSystem;
+SCRIPT org.apache.uima.DashTree;
+SCRIPT org.apache.uima.DashTreeError;
+SCRIPT org.apache.uima.BuildTree;
+TYPESYSTEM org.apache.uima.TerminologyTypeSystem;
Document(CALL,DashTree);
Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.formatter/src/main/java/org/apache/uima/tm/dltk/formatter/preferences/blank-lines-preview.tm
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.formatter/src/main/java/org/apache/uima/tm/dltk/formatter/preferences/blank-lines-preview.tm?rev=1153805&r1=1153804&r2=1153805&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.formatter/src/main/java/org/apache/uima/tm/dltk/formatter/preferences/blank-lines-preview.tm (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.formatter/src/main/java/org/apache/uima/tm/dltk/formatter/preferences/blank-lines-preview.tm Thu Aug 4 09:31:37 2011
@@ -1,4 +1,4 @@
-PACKAGE de.uniwue.casetrain;
+PACKAGE org.apache.uima;
DECLARE childRow, Doc2, Doc3, Doc4, Doc5;
INT id;
Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.formatter/src/main/java/org/apache/uima/tm/dltk/formatter/preferences/indentation-preview.tm
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.formatter/src/main/java/org/apache/uima/tm/dltk/formatter/preferences/indentation-preview.tm?rev=1153805&r1=1153804&r2=1153805&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.formatter/src/main/java/org/apache/uima/tm/dltk/formatter/preferences/indentation-preview.tm (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.formatter/src/main/java/org/apache/uima/tm/dltk/formatter/preferences/indentation-preview.tm Thu Aug 4 09:31:37 2011
@@ -1,4 +1,4 @@
-PACKAGE de.uniwue.casetrain;
+PACKAGE org.apache.uima;
DECLARE childRow, Doc2, Doc3, Doc4, Doc5;
INT id;
Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.formatter/src/main/java/org/apache/uima/tm/dltk/formatter/preferences/wrapping-preview.tm
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.formatter/src/main/java/org/apache/uima/tm/dltk/formatter/preferences/wrapping-preview.tm?rev=1153805&r1=1153804&r2=1153805&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.formatter/src/main/java/org/apache/uima/tm/dltk/formatter/preferences/wrapping-preview.tm (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.formatter/src/main/java/org/apache/uima/tm/dltk/formatter/preferences/wrapping-preview.tm Thu Aug 4 09:31:37 2011
@@ -1,4 +1,4 @@
-PACKAGE de.uniwue.casetrain;
+PACKAGE org.apache.uima;
DECLARE childRow, Doc2, Doc3, Doc4, Doc5;
INT id;
Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.launching/plugin.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.launching/plugin.xml?rev=1153805&r1=1153804&r2=1153805&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.launching/plugin.xml (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.launching/plugin.xml Thu Aug 4 09:31:37 2011
@@ -23,7 +23,7 @@ under the License.
<extension point="org.eclipse.dltk.launching.interpreterInstallTypes">
<interpreterInstallType
class="org.apache.uima.tm.dltk.internal.launching.GenericTextMarkerInstallType"
- id="de.uniwue.dltk.internal.debug.ui.launcher.GenericTextMarkerInstallType">
+ id="org.apache.uima.tm.dltk.internal.debug.ui.launcher.GenericTextMarkerInstallType">
</interpreterInstallType>
</extension>
@@ -86,7 +86,7 @@ under the License.
<interpreterInstall
home="${eclipse_home}"
id="org.apache.uima.tm.dltk.launching.embeddedTextMarker"
- interpreterInstallType="de.uniwue.dltk.internal.debug.ui.launcher.GenericTextMarkerInstallType"
+ interpreterInstallType="org.apache.uima.tm.dltk.internal.debug.ui.launcher.GenericTextMarkerInstallType"
name="TextMarker Interpreter">
</interpreterInstall>
</extension>
Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.testing/plugin.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.testing/plugin.xml?rev=1153805&r1=1153804&r2=1153805&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.testing/plugin.xml (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.testing/plugin.xml Thu Aug 4 09:31:37 2011
@@ -38,7 +38,7 @@ under the License.
<launchConfigurationTypeImage
configTypeID="org.apache.uima.tm.dltk.testing.launchConfig"
icon="icons/full/obj16/textmarker.png"
- id="org.de.uniwue.dltk.textmarker.testing.launchConfigImage">
+ id="org.apache.uima.tm.dltk.textmarker.testing.launchConfigImage">
</launchConfigurationTypeImage>
</extension>
<extension
Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.testing/src/main/java/org/apache/uima/tm/dltk/internal/testing/TextMarkerTestingLaunchShortcut.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.testing/src/main/java/org/apache/uima/tm/dltk/internal/testing/TextMarkerTestingLaunchShortcut.java?rev=1153805&r1=1153804&r2=1153805&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.testing/src/main/java/org/apache/uima/tm/dltk/internal/testing/TextMarkerTestingLaunchShortcut.java (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.testing/src/main/java/org/apache/uima/tm/dltk/internal/testing/TextMarkerTestingLaunchShortcut.java Thu Aug 4 09:31:37 2011
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
-*/
+ */
package org.apache.uima.tm.dltk.internal.testing;
@@ -57,7 +57,6 @@ import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.dialogs.ElementListSelectionDialog;
-
public class TextMarkerTestingLaunchShortcut implements ILaunchShortcut {
private static final String EMPTY_STRING = ""; //$NON-NLS-1$
@@ -68,11 +67,6 @@ public class TextMarkerTestingLaunchShor
public TextMarkerTestingLaunchShortcut() {
}
- /*
- * (non-Javadoc)
- *
- * @see de.uniwue.debug.ui.ILaunchShortcut#launch(de.uniwue.ui.IEditorPart, java.lang.String)
- */
public void launch(IEditorPart editor, String mode) {
IModelElement element = DLTKUIPlugin.getEditorInputModelElement(editor.getEditorInput());
if (element != null) {
@@ -82,12 +76,6 @@ public class TextMarkerTestingLaunchShor
}
}
- /*
- * (non-Javadoc)
- *
- * @see de.uniwue.debug.ui.ILaunchShortcut#launch(de.uniwue.jface.viewers.ISelection,
- * java.lang.String)
- */
public void launch(ISelection selection, String mode) {
if (selection instanceof IStructuredSelection) {
launch(((IStructuredSelection) selection).toArray(), mode);
Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.testing/src/main/java/org/apache/uima/tm/dltk/internal/testing/TextMarkerTestingPlugin.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.testing/src/main/java/org/apache/uima/tm/dltk/internal/testing/TextMarkerTestingPlugin.java?rev=1153805&r1=1153804&r2=1153805&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.testing/src/main/java/org/apache/uima/tm/dltk/internal/testing/TextMarkerTestingPlugin.java (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.testing/src/main/java/org/apache/uima/tm/dltk/internal/testing/TextMarkerTestingPlugin.java Thu Aug 4 09:31:37 2011
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
-*/
+ */
package org.apache.uima.tm.dltk.internal.testing;
@@ -31,22 +31,12 @@ public class TextMarkerTestingPlugin ext
public TextMarkerTestingPlugin() {
}
- /*
- * (non-Javadoc)
- *
- * @see de.uniwue.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
@Override
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
}
- /*
- * (non-Javadoc)
- *
- * @see de.uniwue.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
@Override
public void stop(BundleContext context) throws Exception {
plugin = null;
Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.ui/plugin.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.ui/plugin.xml?rev=1153805&r1=1153804&r2=1153805&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.ui/plugin.xml (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.ui/plugin.xml Thu Aug 4 09:31:37 2011
@@ -64,7 +64,7 @@ under the License.
point="org.eclipse.ui.contexts">
<context
description="%TextMarkerEditContext.description"
- id="de.uniwue.dltk.ui.textMarkerEditorScope"
+ id="org.apache.uima.tm.dltk.ui.textMarkerEditorScope"
name="%TextMarkerEditContext.name"
parentId="org.eclipse.dltk.ui.scriptEditorScope">
</context>
@@ -195,7 +195,7 @@ under the License.
id="org.apache.uima.tm.dltk.ui.editor.TextMarkerEditor"
name="%TextMarkerEditor.name">
<contentTypeBinding
- contentTypeId="de.uniwue.dltk.tmContentType">
+ contentTypeId="org.apache.uima.tm.dltk.tmContentType">
</contentTypeBinding>
</editor>
</extension>
@@ -391,18 +391,18 @@ under the License.
point="org.eclipse.ui.bindings">
<key
commandId="org.apache.uima.tm.dltk.ui.navigate.open.type"
- contextId="de.uniwue.dltk.ui.textMarkerEditorScope"
+ contextId="org.apache.uima.tm.dltk.ui.textMarkerEditorScope"
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
sequence="M1+M2+T"/>
<key
commandId="org.eclipse.dltk.ui.edit.text.script.format"
- contextId="de.uniwue.dltk.ui.textMarkerEditorScope"
+ contextId="org.apache.uima.tm.dltk.ui.textMarkerEditorScope"
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
sequence="M1+M2+F">
</key>
<key
commandId="org.eclipse.dltk.ui.edit.text.script.format"
- contextId="de.uniwue.dltk.ui.textMarkerEditorScope"
+ contextId="org.apache.uima.tm.dltk.ui.textMarkerEditorScope"
platform="gtk"
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
sequence="ESC CTRL+F">
@@ -446,7 +446,7 @@ under the License.
<visibleWhen>
<with variable="activeContexts">
<iterate operator="or">
- <equals value="de.uniwue.dltk.ui.textMarkerEditorScope" />
+ <equals value="org.apache.uima.tm.dltk.ui.textMarkerEditorScope" />
</iterate>
</with>
</visibleWhen>
@@ -514,7 +514,7 @@ under the License.
</provider>
<provider
class="org.apache.uima.tm.dltk.internal.ui.documentation.TextMarkerPagesDocumentationProvider"
- id="de.uniwue.dltk.textmarke.ui.TextMarkerPagesDocumentationProvider"
+ id="org.apache.uima.tm.dltk.textmarke.ui.TextMarkerPagesDocumentationProvider"
nature="org.apache.uima.tm.dltk.core.nature">
</provider>
<provider
Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.ui/src/main/java/org/apache/uima/tm/dltk/internal/ui/actions/OpenTextMarkerSearchPageAction.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.ui/src/main/java/org/apache/uima/tm/dltk/internal/ui/actions/OpenTextMarkerSearchPageAction.java?rev=1153805&r1=1153804&r2=1153805&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.ui/src/main/java/org/apache/uima/tm/dltk/internal/ui/actions/OpenTextMarkerSearchPageAction.java (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.ui/src/main/java/org/apache/uima/tm/dltk/internal/ui/actions/OpenTextMarkerSearchPageAction.java Thu Aug 4 09:31:37 2011
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
-*/
+ */
package org.apache.uima.tm.dltk.internal.ui.actions;
@@ -29,7 +29,7 @@ import org.eclipse.ui.IWorkbenchWindowAc
public class OpenTextMarkerSearchPageAction implements IWorkbenchWindowActionDelegate {
- private static final String TM_SEARCH_PAGE_ID = "de.uniwue.dltk.ui.TextMarkerSearchPage";
+ private static final String TM_SEARCH_PAGE_ID = "org.apache.uima.tm.dltk.ui.TextMarkerSearchPage";
private IWorkbenchWindow window;
Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.ui/src/main/java/org/apache/uima/tm/dltk/internal/ui/editor/TextMarkerEditor.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.ui/src/main/java/org/apache/uima/tm/dltk/internal/ui/editor/TextMarkerEditor.java?rev=1153805&r1=1153804&r2=1153805&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.ui/src/main/java/org/apache/uima/tm/dltk/internal/ui/editor/TextMarkerEditor.java (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.ui/src/main/java/org/apache/uima/tm/dltk/internal/ui/editor/TextMarkerEditor.java Thu Aug 4 09:31:37 2011
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
-*/
+ */
package org.apache.uima.tm.dltk.internal.ui.editor;
@@ -81,7 +81,6 @@ import org.eclipse.ui.texteditor.IUpdate
import org.eclipse.ui.texteditor.SourceViewerDecorationSupport;
import org.eclipse.ui.texteditor.TextOperationAction;
-
public class TextMarkerEditor extends ScriptEditor {
protected class FormatElementAction extends Action implements IUpdate {
@@ -436,7 +435,7 @@ public class TextMarkerEditor extends Sc
@Override
protected void initializeKeyBindingScopes() {
- setKeyBindingScopes(new String[] { "de.uniwue.dltk.ui.textMarkerEditorScope" }); //$NON-NLS-1$
+ setKeyBindingScopes(new String[] { "org.apache.uima.tm.dltk.ui.textMarkerEditorScope" }); //$NON-NLS-1$
}
@Override
@@ -498,8 +497,7 @@ public class TextMarkerEditor extends Sc
IRegion visibleRegion = sourceViewer.getVisibleRegion();
// http://dev.eclipse.org/bugs/show_bug.cgi?id=34195
visible = (targetOffset >= visibleRegion.getOffset() && targetOffset <= visibleRegion
- .getOffset()
- + visibleRegion.getLength());
+ .getOffset() + visibleRegion.getLength());
}
if (!visible) {
Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.ui/src/main/java/org/apache/uima/tm/dltk/internal/ui/preferences/PreviewFile.txt
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.ui/src/main/java/org/apache/uima/tm/dltk/internal/ui/preferences/PreviewFile.txt?rev=1153805&r1=1153804&r2=1153805&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.ui/src/main/java/org/apache/uima/tm/dltk/internal/ui/preferences/PreviewFile.txt (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.ui/src/main/java/org/apache/uima/tm/dltk/internal/ui/preferences/PreviewFile.txt Thu Aug 4 09:31:37 2011
@@ -1,28 +1,9 @@
-#-------------------------------------------------------------------------------
-# 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 de.uniwue.casetrain;
-
-SCRIPT de.uniwue.casetrain.DashTree;
-SCRIPT de.uniwue.casetrain.DashTreeError;
-SCRIPT de.uniwue.casetrain.BuildTree;
-TYPESYSTEM de.uniwue.casetrain.TerminologyTypeSystem;
+PACKAGE org.apache.uima;
+
+SCRIPT org.apache.uima.DashTree;
+SCRIPT org.apache.uima.DashTreeError;
+SCRIPT org.apache.uima.BuildTree;
+TYPESYSTEM org.apache.uima.TerminologyTypeSystem;
Document{-> CALL(DashTree)};
Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.validator/src/main/java/org/apache/uima/tm/dltk/validator/TextMarkerCheckerUtils.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.validator/src/main/java/org/apache/uima/tm/dltk/validator/TextMarkerCheckerUtils.java?rev=1153805&r1=1153804&r2=1153805&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.validator/src/main/java/org/apache/uima/tm/dltk/validator/TextMarkerCheckerUtils.java (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.validator/src/main/java/org/apache/uima/tm/dltk/validator/TextMarkerCheckerUtils.java Thu Aug 4 09:31:37 2011
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
-*/
+ */
package org.apache.uima.tm.dltk.validator;
@@ -46,7 +46,6 @@ import org.eclipse.dltk.core.IScriptProj
import org.eclipse.dltk.core.ISourceModule;
import org.eclipse.dltk.core.ModelException;
-
/**
* @author Martin Toepfer
*
@@ -117,8 +116,7 @@ public class TextMarkerCheckerUtils {
}
if (elementType == IModelElement.METHOD) {
String nSpace = namespaceStack.empty() ? modelElement.getElementName() : namespaceStack
- .peek()
- + "." + modelElement.getElementName();
+ .peek() + "." + modelElement.getElementName();
namespaceStack.push(nSpace);
imports.addAll(collectElements((IMethod) modelElement, type, namespaceStack));
namespaceStack.pop();
@@ -169,7 +167,7 @@ public class TextMarkerCheckerUtils {
/**
* @param xmlFilePath
- * absolute full path. i.e.: "de.uniwue.myengine" ".xml" will be added.
+ * absolute full path. i.e.: "org.apache.uima.tm.myengine" ".xml" will be added.
* @return file.exists
*/
public static boolean checkEngineImport(String xmlFilePath, IScriptProject project) {
@@ -206,7 +204,7 @@ public class TextMarkerCheckerUtils {
/**
* @param resourceFilePath
- * absolute full path. i.e.: "de.uniwue.TestList.txt"
+ * absolute full path. i.e.: "org.apache.uima.tm.TestList.txt"
* @return file.exists
*/
public static boolean checkRessourceExistence(String resourceFilePath, IScriptProject project) {
@@ -245,7 +243,7 @@ public class TextMarkerCheckerUtils {
/**
* @param xmlFilePath
- * absolute full path. i.e.: "de.uniwue.myengine" ".xml" will be added.
+ * absolute full path. i.e.: "org.apache.uima.tm.myengine" ".xml" will be added.
* @return file.exists
*/
public static IFile getEngine(String xmlFilePath, IScriptProject project) {
Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.validator/src/main/java/org/apache/uima/tm/dltk/validator/TextMarkerEngineAndCallChecker.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.validator/src/main/java/org/apache/uima/tm/dltk/validator/TextMarkerEngineAndCallChecker.java?rev=1153805&r1=1153804&r2=1153805&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.validator/src/main/java/org/apache/uima/tm/dltk/validator/TextMarkerEngineAndCallChecker.java (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.validator/src/main/java/org/apache/uima/tm/dltk/validator/TextMarkerEngineAndCallChecker.java Thu Aug 4 09:31:37 2011
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
-*/
+ */
package org.apache.uima.tm.dltk.validator;
@@ -48,7 +48,6 @@ import org.eclipse.dltk.core.builder.IBu
import org.eclipse.dltk.core.builder.IBuildParticipantExtension;
import org.eclipse.dltk.core.builder.ISourceLineTracker;
-
public class TextMarkerEngineAndCallChecker implements IBuildParticipant,
IBuildParticipantExtension {
@@ -217,7 +216,7 @@ public class TextMarkerEngineAndCallChec
// /**
// * @param filePath
- // * absolute full path. i.e.: "de.uniwue.myengine" ".xml" will be
+ // * absolute full path. i.e.: "org.apache.uima.tm.myengine" ".xml" will be
// * added.
// * @return file.exists
// */
Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.validator/src/main/java/org/apache/uima/tm/dltk/validator/TextMarkerRessourceChecker.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.validator/src/main/java/org/apache/uima/tm/dltk/validator/TextMarkerRessourceChecker.java?rev=1153805&r1=1153804&r2=1153805&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.validator/src/main/java/org/apache/uima/tm/dltk/validator/TextMarkerRessourceChecker.java (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.validator/src/main/java/org/apache/uima/tm/dltk/validator/TextMarkerRessourceChecker.java Thu Aug 4 09:31:37 2011
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
-*/
+ */
package org.apache.uima.tm.dltk.validator;
@@ -48,7 +48,6 @@ import org.eclipse.dltk.core.builder.IBu
import org.eclipse.dltk.core.builder.IBuildParticipantExtension;
import org.eclipse.dltk.core.builder.ISourceLineTracker;
-
public class TextMarkerRessourceChecker implements IBuildParticipant, IBuildParticipantExtension {
/**
@@ -159,7 +158,7 @@ public class TextMarkerRessourceChecker
/**
* @param xmlFilePath
- * absolute full path. i.e.: "de.uniwue.mytypes" ".xml" will be added.
+ * absolute full path. i.e.: "org.apache.uima.tm.mytypes" ".xml" will be added.
* @return
* @throws InvalidXMLException
* @throws IOException
Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.validator/src/main/java/org/apache/uima/tm/dltk/validator/TextMarkerTypeChecker.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.validator/src/main/java/org/apache/uima/tm/dltk/validator/TextMarkerTypeChecker.java?rev=1153805&r1=1153804&r2=1153805&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.validator/src/main/java/org/apache/uima/tm/dltk/validator/TextMarkerTypeChecker.java (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.validator/src/main/java/org/apache/uima/tm/dltk/validator/TextMarkerTypeChecker.java Thu Aug 4 09:31:37 2011
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
-*/
+ */
package org.apache.uima.tm.dltk.validator;
@@ -71,7 +71,6 @@ import org.eclipse.dltk.core.builder.IBu
import org.eclipse.dltk.core.builder.IBuildParticipantExtension;
import org.eclipse.dltk.core.builder.ISourceLineTracker;
-
public class TextMarkerTypeChecker implements IBuildParticipant, IBuildParticipantExtension {
/**
@@ -528,7 +527,7 @@ public class TextMarkerTypeChecker imple
/**
* @param xmlFilePath
- * absolute full path. i.e.: "de.uniwue.mytypes" ".xml" will be added.
+ * absolute full path. i.e.: "org.apache.uima.tm.mytypes" ".xml" will be added.
* @return
* @throws InvalidXMLException
* @throws IOException
Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/src/main/java/org/apache/uima/tm/textmarker/parser/TextMarkerDescriptorParser.g
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/src/main/java/org/apache/uima/tm/textmarker/parser/TextMarkerDescriptorParser.g?rev=1153805&r1=1153804&r2=1153805&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/src/main/java/org/apache/uima/tm/textmarker/parser/TextMarkerDescriptorParser.g (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/src/main/java/org/apache/uima/tm/textmarker/parser/TextMarkerDescriptorParser.g Thu Aug 4 09:31:37 2011
@@ -56,26 +56,26 @@ import org.eclipse.dltk.ast.expressions.
import org.eclipse.dltk.ast.references.VariableReference;
import org.eclipse.dltk.ast.statements.Statement;
-import de.uniwue.dltk.textmarker.core.extensions.TextMarkerExternalFactory;
-import de.uniwue.dltk.textmarker.internal.core.builder.DescriptorManager;
-import de.uniwue.dltk.textmarker.parser.ast.ActionFactory;
-import de.uniwue.dltk.textmarker.parser.ast.ComponentDeclaration;
-import de.uniwue.dltk.textmarker.parser.ast.ComponentReference;
-import de.uniwue.dltk.textmarker.parser.ast.ComposedRuleElement;
-import de.uniwue.dltk.textmarker.parser.ast.ConditionFactory;
-import de.uniwue.dltk.textmarker.parser.ast.ExpressionFactory;
-import de.uniwue.dltk.textmarker.parser.ast.ScriptFactory;
-import de.uniwue.dltk.textmarker.parser.ast.StatementFactory;
-import de.uniwue.dltk.textmarker.parser.ast.TMTypeConstants;
-import de.uniwue.dltk.textmarker.parser.ast.TextMarkerBlock;
-import de.uniwue.dltk.textmarker.parser.ast.TextMarkerExpression;
-import de.uniwue.dltk.textmarker.parser.ast.TextMarkerRule;
-import de.uniwue.dltk.textmarker.parser.ast.TextMarkerRuleElement;
-import de.uniwue.dltk.textmarker.parser.ast.TextMarkerScriptBlock;
-import de.uniwue.dltk.textmarker.parser.ast.actions.TextMarkerAction;
-import de.uniwue.dltk.textmarker.parser.ast.conditions.TextMarkerCondition;
-import de.uniwue.dltk.textmarker.parser.ast.declarations.TextMarkerFeatureDeclaration;
-import de.uniwue.dltk.textmarker.parser.ast.declarations.TextMarkerPackageDeclaration;
+import org.apache.uima.tm.dltk.core.extensions.TextMarkerExternalFactory;
+import org.apache.uima.tm.dltk.internal.core.builder.DescriptorManager;
+import org.apache.uima.tm.dltk.parser.ast.ActionFactory;
+import org.apache.uima.tm.dltk.parser.ast.ComponentDeclaration;
+import org.apache.uima.tm.dltk.parser.ast.ComponentReference;
+import org.apache.uima.tm.dltk.parser.ast.ComposedRuleElement;
+import org.apache.uima.tm.dltk.parser.ast.ConditionFactory;
+import org.apache.uima.tm.dltk.parser.ast.ExpressionFactory;
+import org.apache.uima.tm.dltk.parser.ast.ScriptFactory;
+import org.apache.uima.tm.dltk.parser.ast.StatementFactory;
+import org.apache.uima.tm.dltk.parser.ast.TMTypeConstants;
+import org.apache.uima.tm.dltk.parser.ast.TextMarkerBlock;
+import org.apache.uima.tm.dltk.parser.ast.TextMarkerExpression;
+import org.apache.uima.tm.dltk.parser.ast.TextMarkerRule;
+import org.apache.uima.tm.dltk.parser.ast.TextMarkerRuleElement;
+import org.apache.uima.tm.dltk.parser.ast.TextMarkerScriptBlock;
+import org.apache.uima.tm.dltk.parser.ast.actions.TextMarkerAction;
+import org.apache.uima.tm.dltk.parser.ast.conditions.TextMarkerCondition;
+import org.apache.uima.tm.dltk.parser.ast.declarations.TextMarkerFeatureDeclaration;
+import org.apache.uima.tm.dltk.parser.ast.declarations.TextMarkerPackageDeclaration;
}
@parser::members {
Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.feature/feature.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.feature/feature.xml?rev=1153805&r1=1153804&r2=1153805&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.feature/feature.xml (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.feature/feature.xml Thu Aug 4 09:31:37 2011
@@ -19,7 +19,7 @@ under the License.
-->
<feature
- id="de.uniwue.tm.textmarker.feature"
+ id="org.apache.uima.tm.textmarker.feature"
label="TextMarker Feature"
version="1.0.0.qualifier"
provider-name="University of Würzburg">
@@ -233,158 +233,151 @@ Library.
<import plugin="org.eclipse.search"/>
<import plugin="org.eclipse.core.resources" version="3.4.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui.browser"/>
- <import plugin="de.uniwue.dltk.textmarker.ui" version="1.0.0" match="greaterOrEqual"/>
+ <import plugin="org.apache.uima.tm.dltk.ui" version="1.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.text"/>
</requires>
<plugin
- id="de.uniwue.dltk.textmarker.antlr"
+ id="org.apache.uima.tm.dltk.antlr"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
- id="de.uniwue.dltk.textmarker.core"
+ id="org.apache.uima.tm.dltk.core"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="de.uniwue.dltk.textmarker.debug"
+ id="org.apache.uima.tm.dltk.debug"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="de.uniwue.dltk.textmarker.debug.ui"
+ id="org.apache.uima.tm.dltk.debug.ui"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="de.uniwue.dltk.textmarker.debugger"
+ id="org.apache.uima.tm.dltk.debugger"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="de.uniwue.dltk.textmarker.formatter"
+ id="org.apache.uima.tm.dltk.formatter"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="de.uniwue.dltk.textmarker.launching"
+ id="org.apache.uima.tm.dltk.launching"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="de.uniwue.dltk.textmarker.testing"
+ id="org.apache.uima.tm.dltk.testing"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="de.uniwue.dltk.textmarker.ui"
+ id="org.apache.uima.tm.dltk.ui"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="de.uniwue.dltk.textmarker.validator"
+ id="org.apache.uima.tm.dltk.validator"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="de.uniwue.tm.cas.converter"
+ id="org.apache.uima.tm.cev"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="de.uniwue.tm.cev"
+ id="org.apache.uima.tm.textmarker.cev.extensions"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="de.uniwue.tm.textmarker.cev.extensions"
+ id="org.apache.uima.tm.textmarker.engine"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="de.uniwue.tm.textmarker.engine"
+ id="org.apache.uima.tm.textmarker.testing"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="de.uniwue.tm.textmarker.testing"
+ id="org.apache.uima.tm.textmarker.ui.utils"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="de.uniwue.tm.textmarker.ui.utils"
+ id="org.apache.uima.tm.textruler"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="de.uniwue.tm.textruler"
+ id="org.apache.uima.tm.textruler.lp2"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="de.uniwue.tm.textruler.lp2"
+ id="org.apache.uima.tm.textruler.rapier"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="de.uniwue.tm.textruler.rapier"
+ id="org.apache.uima.tm.textruler.whisk"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="de.uniwue.tm.textruler.whisk"
+ id="org.apache.uima.tm.textruler.wien"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="de.uniwue.tm.textruler.wien"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="de.uniwue.tm.textmarker.query"
+ id="org.apache.uima.tm.textmarker.query"
download-size="0"
install-size="0"
version="0.0.0"
Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.lp2/src/main/java/org/apache/uima/tm/textruler/lp2/BasicLP2.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.lp2/src/main/java/org/apache/uima/tm/textruler/lp2/BasicLP2.java?rev=1153805&r1=1153804&r2=1153805&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.lp2/src/main/java/org/apache/uima/tm/textruler/lp2/BasicLP2.java (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.lp2/src/main/java/org/apache/uima/tm/textruler/lp2/BasicLP2.java Thu Aug 4 09:31:37 2011
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
-*/
+ */
package org.apache.uima.tm.textruler.lp2;
@@ -40,8 +40,8 @@ import org.apache.uima.tm.textruler.core
import org.apache.uima.tm.textruler.core.TextRulerShiftExample;
import org.apache.uima.tm.textruler.core.TextRulerStatisticsCollector;
import org.apache.uima.tm.textruler.core.TextRulerTarget;
-import org.apache.uima.tm.textruler.core.TextRulerToolkit;
import org.apache.uima.tm.textruler.core.TextRulerTarget.MLTargetType;
+import org.apache.uima.tm.textruler.core.TextRulerToolkit;
import org.apache.uima.tm.textruler.extension.TextRulerLearnerDelegate;
import org.apache.uima.util.FileUtils;
@@ -156,7 +156,7 @@ public abstract class BasicLP2 extends T
// r.getCoveringStatistics().getCoveredPositiveExamples())
// {
// TextRulerToolkit.log("\t\te="+ex.getAnnotation().getBegin());
- //
+ //
// }
// }
// }
@@ -281,7 +281,7 @@ public abstract class BasicLP2 extends T
// "NUM{REGEXP(\"12\")} ALL{->MARKONCE(stimeSTART)};");
// System.out.println(resultString);
- resultString = "PACKAGE de.uniwue.ml;\n\nDocument{->FILTERTYPE(SPACE, BREAK, NBSP, MARKUP)};\n";
+ resultString = "PACKAGE org.apache.uima.tm.ml;\n\nDocument{->FILTERTYPE(SPACE, BREAK, NBSP, MARKUP)};\n";
// resultString += "NUM{REGEXP(\"12\")} ALL{->MARKONCE(stimeSTART)};";
FileUtils.saveString2File(resultString, file);
} catch (IOException e) {
@@ -476,8 +476,8 @@ public abstract class BasicLP2 extends T
// exactly the same distance, use the one where the wrong tag
// would be IN the slot filler!
List<TextRulerExample> correctTags = doc.getPositiveExamples();
- List<TextRulerExample> wrongTags = new ArrayList<TextRulerExample>(c
- .getCoveredNegativeExamples());
+ List<TextRulerExample> wrongTags = new ArrayList<TextRulerExample>(
+ c.getCoveredNegativeExamples());
List<TextRulerShiftExample> newExamples = new ArrayList<TextRulerShiftExample>();
for (TextRulerExample wrongTag : wrongTags) {
// test, if there's a corresponding positive example
@@ -530,8 +530,8 @@ public abstract class BasicLP2 extends T
if (theCorrectTag != null) {
TextRulerToolkit.log("FOUND BAD EXAMPLE FOR SHIFTING !!");
- TextRulerShiftExample shiftExample = new TextRulerShiftExample(doc, wrongTag
- .getAnnotation(), theCorrectTag.getAnnotation(), true, target);
+ TextRulerShiftExample shiftExample = new TextRulerShiftExample(doc,
+ wrongTag.getAnnotation(), theCorrectTag.getAnnotation(), true, target);
newExamples.add(shiftExample);
}
}
Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.lp2/src/main/java/org/apache/uima/tm/textruler/lp2/OptimizedLP2.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.lp2/src/main/java/org/apache/uima/tm/textruler/lp2/OptimizedLP2.java?rev=1153805&r1=1153804&r2=1153805&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.lp2/src/main/java/org/apache/uima/tm/textruler/lp2/OptimizedLP2.java (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.lp2/src/main/java/org/apache/uima/tm/textruler/lp2/OptimizedLP2.java Thu Aug 4 09:31:37 2011
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
-*/
+ */
package org.apache.uima.tm.textruler.lp2;
@@ -38,14 +38,13 @@ import org.apache.uima.tm.textruler.core
import org.apache.uima.tm.textruler.core.TextRulerRuleList;
import org.apache.uima.tm.textruler.core.TextRulerStatisticsCollector;
import org.apache.uima.tm.textruler.core.TextRulerTarget;
-import org.apache.uima.tm.textruler.core.TextRulerToolkit;
import org.apache.uima.tm.textruler.core.TextRulerTarget.MLTargetType;
+import org.apache.uima.tm.textruler.core.TextRulerToolkit;
import org.apache.uima.tm.textruler.extension.TextRulerLearnerDelegate;
import org.apache.uima.tm.textruler.lp2.LP2RuleItem.MLLP2ContextConstraint;
import org.apache.uima.tm.textruler.lp2.LP2RuleItem.MLLP2OtherConstraint;
import org.apache.uima.util.FileUtils;
-
public class OptimizedLP2 extends BasicLP2 {
public static final boolean SAVE_DEBUG_INFO_IN_TEMPFOLDER = false;
@@ -95,10 +94,12 @@ public class OptimizedLP2 extends BasicL
rulesToTest.addAll(startRules);
rulesToTest.addAll(ctxStartRules);
- sendStatusUpdateToDelegate("Round " + roundNumber + " - Testing " + rulesToTest.size()
- + " start rules... " + " - uncovered examples: "
- + (examples.size() - coveredExamples.size() + " / " + examples.size()) + " cs: "
- + cachedTestedStartRuleStatistics.size(), TextRulerLearnerState.ML_RUNNING, false);
+ sendStatusUpdateToDelegate(
+ "Round " + roundNumber + " - Testing " + rulesToTest.size() + " start rules... "
+ + " - uncovered examples: "
+ + (examples.size() - coveredExamples.size() + " / " + examples.size())
+ + " cs: " + cachedTestedStartRuleStatistics.size(),
+ TextRulerLearnerState.ML_RUNNING, false);
testStartRulesIfNotCached(rulesToTest);
if (shouldAbort())
return;
@@ -315,8 +316,8 @@ public class OptimizedLP2 extends BasicL
// and calculate intersection of coverings:
TextRulerStatisticsCollector newCovering;
if (currentCovering != null)
- newCovering = getCoveringIntersection(currentCovering, candidateRule
- .getCoveringStatistics());
+ newCovering = getCoveringIntersection(currentCovering,
+ candidateRule.getCoveringStatistics());
else
newCovering = candidateRule.getCoveringStatistics();
@@ -357,9 +358,8 @@ public class OptimizedLP2 extends BasicL
boolean isBestRule = !(tooFewPositives || tooManyErrors);
if (TextRulerToolkit.DEBUG && SAVE_DEBUG_INFO_IN_TEMPFOLDER)
- TextRulerToolkit.appendStringToFile(tempDirectory() + "bestcandidates.tm", newRule
- .getRuleString()
- + "\n");
+ TextRulerToolkit.appendStringToFile(tempDirectory() + "bestcandidates.tm",
+ newRule.getRuleString() + "\n");
if (isBestRule) {
currentBestRules.add(newRule);
@@ -392,9 +392,8 @@ public class OptimizedLP2 extends BasicL
// + " ; "+newCTXRule.getCoveringStatistics());
if (TextRulerToolkit.DEBUG && SAVE_DEBUG_INFO_IN_TEMPFOLDER)
- TextRulerToolkit.appendStringToFile(tempDirectory() + "ctxcandidates.tm", newCTXRule
- .getRuleString()
- + "\n");
+ TextRulerToolkit.appendStringToFile(tempDirectory() + "ctxcandidates.tm",
+ newCTXRule.getRuleString() + "\n");
if (isGoodCTXRule) {
currentContextualRules.add(newCTXRule);
@@ -477,8 +476,8 @@ public class OptimizedLP2 extends BasicL
boolean isLeftBoundary = (target.type == MLTargetType.SINGLE_LEFT_BOUNDARY || target.type == MLTargetType.SINGLE_LEFT_CORRECTION);
int thePosition = isLeftBoundary ? exampleAnnotation.getBegin() : exampleAnnotation.getEnd();
List<AnnotationFS> leftContext = TextRulerToolkit.getAnnotationsBeforePosition(docCas,
- thePosition, windowSize, TextRulerToolkit.getFilterSetWithSlotNames(slotNames,
- filterSet), tokensRootType);
+ thePosition, windowSize,
+ TextRulerToolkit.getFilterSetWithSlotNames(slotNames, filterSet), tokensRootType);
List<AnnotationFS> rightContext;
if (target.type == MLTargetType.SINGLE_LEFT_CORRECTION
@@ -520,7 +519,7 @@ public class OptimizedLP2 extends BasicL
}
// // POS-Tags created by our test hmm tagger.
- // Type posTagsRootType = ts.getType("de.uniwue.ml.ML.postag");
+ // Type posTagsRootType = ts.getType("org.apache.uima.tm.ml.ML.postag");
// if (posTagsRootType != null)
// {
// List<AnnotationFS> posTagAnnotations =
@@ -538,7 +537,7 @@ public class OptimizedLP2 extends BasicL
// }
// TextRulerToolkit.logIfDebug("");
// }
- //
+ //
// TextRulerAnnotation posTagAnnotation = new
// TextRulerAnnotation(posTagAnnotations.get(0),
// example.getDocument());
Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.rapier/src/main/java/org/apache/uima/tm/textruler/rapier/Rapier.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.rapier/src/main/java/org/apache/uima/tm/textruler/rapier/Rapier.java?rev=1153805&r1=1153804&r2=1153805&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.rapier/src/main/java/org/apache/uima/tm/textruler/rapier/Rapier.java (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.rapier/src/main/java/org/apache/uima/tm/textruler/rapier/Rapier.java Thu Aug 4 09:31:37 2011
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
-*/
+ */
package org.apache.uima.tm.textruler.rapier;
@@ -45,7 +45,6 @@ import org.apache.uima.tm.textruler.core
import org.apache.uima.tm.textruler.core.TextRulerWordConstraint;
import org.apache.uima.tm.textruler.extension.TextRulerLearnerDelegate;
-
public class Rapier extends TextRulerBasicLearner {
public final static String COMPRESSION_FAIL_MAX_COUNT_KEY = "compressionFailMaxCount";
@@ -74,7 +73,7 @@ public class Rapier extends TextRulerBas
public final static float STANDARD_NOISE_THREHSOLD = 0.9f;
- public final static String STANDARD_POSTAG_ROOTTYPE = "de.uniwue.ml.ML.postag";
+ public final static String STANDARD_POSTAG_ROOTTYPE = "org.apache.uima.tm.ml.ML.postag";
public final static int STANDARD_MIN_COVERED_POSITIVES = 1;
@@ -115,56 +114,56 @@ public class Rapier extends TextRulerBas
@Override
protected void doRun() {
- for(int i = 0; i < slotNames.length; i++) {
- int compressionFailCount = 0;
-
- // only working for one slot yet !
- currentSlotName = slotNames[i];
- cachedTestedRuleStatistics.clear();
- exampleDocuments.createExamplesForTarget(new TextRulerTarget(currentSlotName, this));
- examples = exampleDocuments.getAllPositiveExamples();
-
- if (shouldAbort())
- return;
-
- slotRules = new TextRulerRuleList();
- ruleList = new RapierRulePriorityQueue(ruleListSize);
-
- TextRulerToolkit.log("--- RAPIER START for Slot " + currentSlotName);
-
- sendStatusUpdateToDelegate("Creating initial rule base...",
- TextRulerLearnerState.ML_INITIALIZING, false);
-
- fillSlotRulesWithMostSpecificRules();
-
- updateCompressionStatusString();
-
- if (TextRulerToolkit.DEBUG) {
- slotRules.saveToRulesFile(getIntermediateRulesFileName(), getTMFileHeaderString());
- }
-
- while (compressionFailCount < compressionFailMaxCount) {
- TextRulerToolkit.log("***** NEW COMPRESSION ROUND; FailCount = " + compressionFailCount);
- if (shouldAbort()) {
- return;
- }
-
- RapierRule bestRule = findNewRule();
- if (bestRule != null
- && (bestRule.getCoveringStatistics().getCoveredPositivesCount() >= minCoveredPositives)
- && (bestRule.noiseValue() >= noiseThreshold) && (!slotRules.contains(bestRule))) {
- addRuleAndRemoveEmpiricallySubsumedRules(bestRule);
- if (TextRulerToolkit.DEBUG)
- slotRules.saveToRulesFile(getIntermediateRulesFileName(), getTMFileHeaderString());
- } else {
- compressionFailCount++;
- }
- }
-
- if (TextRulerToolkit.DEBUG) {
- slotRules.saveToRulesFile(getIntermediateRulesFileName(), getTMFileHeaderString());
-}
- }
+ for (int i = 0; i < slotNames.length; i++) {
+ int compressionFailCount = 0;
+
+ // only working for one slot yet !
+ currentSlotName = slotNames[i];
+ cachedTestedRuleStatistics.clear();
+ exampleDocuments.createExamplesForTarget(new TextRulerTarget(currentSlotName, this));
+ examples = exampleDocuments.getAllPositiveExamples();
+
+ if (shouldAbort())
+ return;
+
+ slotRules = new TextRulerRuleList();
+ ruleList = new RapierRulePriorityQueue(ruleListSize);
+
+ TextRulerToolkit.log("--- RAPIER START for Slot " + currentSlotName);
+
+ sendStatusUpdateToDelegate("Creating initial rule base...",
+ TextRulerLearnerState.ML_INITIALIZING, false);
+
+ fillSlotRulesWithMostSpecificRules();
+
+ updateCompressionStatusString();
+
+ if (TextRulerToolkit.DEBUG) {
+ slotRules.saveToRulesFile(getIntermediateRulesFileName(), getTMFileHeaderString());
+ }
+
+ while (compressionFailCount < compressionFailMaxCount) {
+ TextRulerToolkit.log("***** NEW COMPRESSION ROUND; FailCount = " + compressionFailCount);
+ if (shouldAbort()) {
+ return;
+ }
+
+ RapierRule bestRule = findNewRule();
+ if (bestRule != null
+ && (bestRule.getCoveringStatistics().getCoveredPositivesCount() >= minCoveredPositives)
+ && (bestRule.noiseValue() >= noiseThreshold) && (!slotRules.contains(bestRule))) {
+ addRuleAndRemoveEmpiricallySubsumedRules(bestRule);
+ if (TextRulerToolkit.DEBUG)
+ slotRules.saveToRulesFile(getIntermediateRulesFileName(), getTMFileHeaderString());
+ } else {
+ compressionFailCount++;
+ }
+ }
+
+ if (TextRulerToolkit.DEBUG) {
+ slotRules.saveToRulesFile(getIntermediateRulesFileName(), getTMFileHeaderString());
+ }
+ }
sendStatusUpdateToDelegate("Done", TextRulerLearnerState.ML_DONE, true);
cachedTestedRuleStatistics.clear();
@@ -211,14 +210,14 @@ public class Rapier extends TextRulerBas
Type tokensRootType = ts.getType(TextRulerToolkit.TM_ANY_TYPE_NAME);
// first, get all words/tokens:
- List<AnnotationFS> before = TextRulerToolkit.getAnnotationsBeforePosition(example
- .getDocumentCAS(), slotAnnotation.getBegin(), -1, TextRulerToolkit
- .getFilterSetWithSlotNames(slotNames, filterSet), tokensRootType);
- List<AnnotationFS> after = TextRulerToolkit.getAnnotationsAfterPosition(example
- .getDocumentCAS(), slotAnnotation.getEnd(), -1, TextRulerToolkit
- .getFilterSetWithSlotNames(slotNames, filterSet), tokensRootType);
- List<AnnotationFS> inside = TextRulerToolkit.getAnnotationsWithinBounds(example
- .getDocumentCAS(), slotAnnotation.getBegin(), slotAnnotation.getEnd(),
+ List<AnnotationFS> before = TextRulerToolkit.getAnnotationsBeforePosition(
+ example.getDocumentCAS(), slotAnnotation.getBegin(), -1,
+ TextRulerToolkit.getFilterSetWithSlotNames(slotNames, filterSet), tokensRootType);
+ List<AnnotationFS> after = TextRulerToolkit.getAnnotationsAfterPosition(
+ example.getDocumentCAS(), slotAnnotation.getEnd(), -1,
+ TextRulerToolkit.getFilterSetWithSlotNames(slotNames, filterSet), tokensRootType);
+ List<AnnotationFS> inside = TextRulerToolkit.getAnnotationsWithinBounds(
+ example.getDocumentCAS(), slotAnnotation.getBegin(), slotAnnotation.getEnd(),
TextRulerToolkit.getFilterSetWithSlotNames(slotNames, filterSet), tokensRootType);
// the before annotations have to be reversed:
@@ -317,8 +316,7 @@ public class Rapier extends TextRulerBas
if (uPairCount > uncompressedRules.size())
uPairCount /= 2;
for (int i = 0; i < uPairCount; i++) {
- RapierRule rule1 = uncompressedRules.get(rand
- .nextInt(uncompressedRules.size()));
+ RapierRule rule1 = uncompressedRules.get(rand.nextInt(uncompressedRules.size()));
RapierRule rule2 = null;
while (rule2 == null || rule1 == rule2) {
rule2 = uncompressedRules.get(rand.nextInt(uncompressedRules.size()));
@@ -463,8 +461,8 @@ public class Rapier extends TextRulerBas
List<RapierRule> result = new ArrayList<RapierRule>();
List<TextRulerRulePattern> genList = RapierGeneralizationHelper
- .getGeneralizationsForRuleItemPatterns(rule1.getFillerPattern(), rule2
- .getFillerPattern());
+ .getGeneralizationsForRuleItemPatterns(rule1.getFillerPattern(),
+ rule2.getFillerPattern());
// create rules:
for (TextRulerRulePattern pattern : genList) {
RapierRule newRule = new RapierRule(this, rule1.getTarget());