Revision: 18703
http://sourceforge.net/p/gate/code/18703
Author: markagreenwood
Date: 2015-05-21 17:13:36 +0000 (Thu, 21 May 2015)
Log Message:
-----------
drastic simplification of the code by switching to use the normal Java regex
support
Modified Paths:
--------------
gate/trunk/plugins/Gazetteer_Ontology_Based/.classpath
gate/trunk/plugins/Gazetteer_Ontology_Based/build.xml
gate/trunk/plugins/Gazetteer_Ontology_Based/creole.xml
gate/trunk/plugins/Gazetteer_Ontology_Based/src/gate/clone/ql/CATConstants.java
gate/trunk/plugins/Gazetteer_Ontology_Based/src/gate/clone/ql/OntoRootGaz.java
Removed Paths:
-------------
gate/trunk/plugins/Gazetteer_Ontology_Based/lib/
gate/trunk/plugins/Gazetteer_Ontology_Based/src/gate/clone/ql/regex/
Modified: gate/trunk/plugins/Gazetteer_Ontology_Based/.classpath
===================================================================
--- gate/trunk/plugins/Gazetteer_Ontology_Based/.classpath 2015-05-21
15:36:20 UTC (rev 18702)
+++ gate/trunk/plugins/Gazetteer_Ontology_Based/.classpath 2015-05-21
17:13:36 UTC (rev 18703)
@@ -3,6 +3,5 @@
<classpathentry kind="src" path="src"/>
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry combineaccessrules="false" exported="true" kind="src"
path="/GATE"/>
- <classpathentry exported="true" kind="lib" path="lib/oro-2.0.8.jar"/>
<classpathentry kind="output" path="build"/>
</classpath>
Modified: gate/trunk/plugins/Gazetteer_Ontology_Based/build.xml
===================================================================
--- gate/trunk/plugins/Gazetteer_Ontology_Based/build.xml 2015-05-21
15:36:20 UTC (rev 18702)
+++ gate/trunk/plugins/Gazetteer_Ontology_Based/build.xml 2015-05-21
17:13:36 UTC (rev 18703)
@@ -9,7 +9,6 @@
<!-- set global properties for this build -->
<property name="src" location="src"/>
- <property name="lib" location="lib"/>
<property name="jar.location" location="obg.jar" />
<property name="build" location="build" />
<property name="gate.home" location="../.." />
@@ -25,9 +24,6 @@
<include name="**/*.jar" />
<include name="**/*.zip" />
</fileset>
- <fileset dir="${lib}">
- <include name="**/*.jar" />
- </fileset>
</path>
@@ -63,7 +59,7 @@
<sourcepath>
<pathelement location="${src}" />
</sourcepath>
- <link href="http://docs.oracle.com/javase/6/docs/api/"; />
+ <link href="http://docs.oracle.com/javase/7/docs/api/"; />
<link href="http://gate.ac.uk/gate/doc/javadoc/"; />
</javadoc>
</target>
Modified: gate/trunk/plugins/Gazetteer_Ontology_Based/creole.xml
===================================================================
--- gate/trunk/plugins/Gazetteer_Ontology_Based/creole.xml 2015-05-21
15:36:20 UTC (rev 18702)
+++ gate/trunk/plugins/Gazetteer_Ontology_Based/creole.xml 2015-05-21
17:13:36 UTC (rev 18703)
@@ -2,5 +2,4 @@
<!-- creole.xml for Ontology_Based_Gazetteer plugin -->
<CREOLE-DIRECTORY>
<JAR SCAN="true">obg.jar</JAR>
- <JAR>lib/oro-2.0.8.jar</JAR>
</CREOLE-DIRECTORY>
Modified:
gate/trunk/plugins/Gazetteer_Ontology_Based/src/gate/clone/ql/CATConstants.java
===================================================================
---
gate/trunk/plugins/Gazetteer_Ontology_Based/src/gate/clone/ql/CATConstants.java
2015-05-21 15:36:20 UTC (rev 18702)
+++
gate/trunk/plugins/Gazetteer_Ontology_Based/src/gate/clone/ql/CATConstants.java
2015-05-21 17:13:36 UTC (rev 18703)
@@ -61,6 +61,6 @@
/** separator used during formatting of results */
public static String NEW_LINE = "\n";
- public static String REGEX_CAMEL_CASE = "[a-z][A-Z]";
+ public static String REGEX_CAMEL_CASE = "([a-z])([A-Z])";
}
Modified:
gate/trunk/plugins/Gazetteer_Ontology_Based/src/gate/clone/ql/OntoRootGaz.java
===================================================================
---
gate/trunk/plugins/Gazetteer_Ontology_Based/src/gate/clone/ql/OntoRootGaz.java
2015-05-21 15:36:20 UTC (rev 18702)
+++
gate/trunk/plugins/Gazetteer_Ontology_Based/src/gate/clone/ql/OntoRootGaz.java
2015-05-21 17:13:36 UTC (rev 18703)
@@ -19,7 +19,6 @@
import gate.Gate;
import gate.Resource;
import gate.Utils;
-import gate.clone.ql.regex.ExpressionFinder;
import gate.creole.ANNIEConstants;
import gate.creole.ExecutionException;
import gate.creole.POSTagger;
@@ -50,6 +49,7 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.regex.Pattern;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -628,6 +628,7 @@
*/
private List<Lookup> runRootFinderApplication(List<Lookup> lookups)
throws ResourceInstantiationException {
+ Pattern p = java.util.regex.Pattern.compile(CATConstants.REGEX_CAMEL_CASE);
List<Lookup> lookupsToBeReturned = new ArrayList<Lookup>();
for(Lookup lookup : lookups) {
String list = lookup.list;
@@ -639,10 +640,15 @@
additionalList.add(aLookup);
}
// if text is camel cased add space between words
- if(separateCamelCasedWords && list.indexOf(" ") < 0) {
- String separatedCamelCase =
- ExpressionFinder.findAndSeparateCamelCases(list,
- CATConstants.REGEX_CAMEL_CASE, " ");
+ if(separateCamelCasedWords) {
+ java.util.regex.Matcher m = p.matcher(list);
+ StringBuffer sb = new StringBuffer();
+ while (m.find()) {
+ m.appendReplacement(sb, "$1 $2");
+ }
+ m.appendTail(sb);
+ String separatedCamelCase = sb.toString();
+
if(list != null && (!list.equals(separatedCamelCase))) {
Lookup aLookup = new Lookup(separatedCamelCase, "", null, null);
aLookup.features = lookup.features;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
One dashboard for servers and applications across Physical-Virtual-Cloud
Widest out-of-the-box monitoring support with 50+ applications
Performance metrics, stats and reports that give you Actionable Insights
Deep dive visibility with transaction tracing using APM Insight.
http://ad.doubleclick.net/ddm/clk/290420510;117567292;y
_______________________________________________
GATE-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gate-cvs
