Revision: 19273
http://sourceforge.net/p/gate/code/19273
Author: markagreenwood
Date: 2016-05-05 08:57:14 +0000 (Thu, 05 May 2016)
Log Message:
-----------
merged in changes from trunk
Modified Paths:
--------------
gate/branches/sawdust2/src/main/gate/creole/AnnotationSchema.java
Property Changed:
----------------
gate/branches/sawdust2/src/main/gate/creole/AnnotationSchema.java
Modified: gate/branches/sawdust2/src/main/gate/creole/AnnotationSchema.java
===================================================================
--- gate/branches/sawdust2/src/main/gate/creole/AnnotationSchema.java
2016-05-05 08:51:53 UTC (rev 19272)
+++ gate/branches/sawdust2/src/main/gate/creole/AnnotationSchema.java
2016-05-05 08:57:14 UTC (rev 19273)
@@ -52,7 +52,7 @@
/** A map between Java types and XSchema */
private static Map<Class<?>, String> java2xSchemaMap;
- /** This sets up two Maps between XSchema types and their coresponding
+ /** This sets up two Maps between XSchema types and their corresponding
* Java types + a DOM xml parser
*/
private static void setUpStaticData()
@@ -290,7 +290,7 @@
if (featureTypeName != null)
// Set it to the corresponding Java type
featureType = xSchema2JavaMap.get(featureTypeName);
-
+
// Get the value of use attribute
featureUse = anAttributeElement.getAttributeValue("use");
if (featureUse == null)
@@ -348,7 +348,8 @@
// Create an add a featureSchema object
FeatureSchema featureSchema = new FeatureSchema(
featureName,
- featureType,
+ //if for some reason we've
ended up with a null type default to String
+ featureType != null ?
featureType : String.class,
featureValue,
featureUse,
featurePermittedValuesSet);
Property changes on:
gate/branches/sawdust2/src/main/gate/creole/AnnotationSchema.java
___________________________________________________________________
Added: svn:mergeinfo
## -0,0 +1,7 ##
+/gate/branches/cl-experiment/src/main/gate/creole/AnnotationSchema.java:15466-15613
+/gate/branches/new-ontology-api/src/main/gate/creole/AnnotationSchema.java:10584-11598
+/gate/branches/release-7.0/src/main/gate/creole/AnnotationSchema.java:15335-15398
+/gate/branches/release-8.1/src/main/gate/creole/AnnotationSchema.java:18736-18747
+/gate/branches/sawdust/src/main/gate/creole/AnnotationSchema.java:17055-17079
+/gate/tags/release-7.0/src/main/gate/creole/AnnotationSchema.java:15399-15407
+/gate/trunk/src/main/gate/creole/AnnotationSchema.java:3-7,19180-19272
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial!
https://ad.doubleclick.net/ddm/clk/302982198;130105516;z
_______________________________________________
GATE-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gate-cvs
