Revision: 17871
http://sourceforge.net/p/gate/code/17871
Author: markagreenwood
Date: 2014-04-18 10:38:57 +0000 (Fri, 18 Apr 2014)
Log Message:
-----------
more rawtype fixes
Modified Paths:
--------------
gate/trunk/src/main/gate/creole/Parameter.java
gate/trunk/src/main/gate/creole/tokeniser/FSMState.java
gate/trunk/src/main/gate/util/AnnotationMerging.java
Modified: gate/trunk/src/main/gate/creole/Parameter.java
===================================================================
--- gate/trunk/src/main/gate/creole/Parameter.java 2014-04-18 10:05:47 UTC
(rev 17870)
+++ gate/trunk/src/main/gate/creole/Parameter.java 2014-04-18 10:38:57 UTC
(rev 17871)
@@ -143,7 +143,7 @@
// Create an collection object belonging to paramClass
Collection<?> colection = null;
try{
- colection = paramClass.asSubclass(Collection.class).getConstructor(new
Class[]{}).
+ colection = paramClass.asSubclass(Collection.class).getConstructor(new
Class<?>[]{}).
newInstance(new Object[]{});
} catch(Exception ex){
throw new ParameterException("Could not construct an object of type "
@@ -181,7 +181,7 @@
String itemStringValue = strTokenizer.nextToken();
Object itemValue = null;
try{
- itemValue = itemClass.getConstructor(new Class[]{String.class}).
+ itemValue = itemClass.getConstructor(new Class<?>[]{String.class}).
newInstance(new Object[]{itemStringValue});
}catch(Exception e){
throw new ParameterException("Could not create an object of " +
@@ -206,7 +206,7 @@
}
else {
try{
- fm = paramClass.asSubclass(FeatureMap.class).getConstructor(new
Class[]{}).
+ fm = paramClass.asSubclass(FeatureMap.class).getConstructor(new
Class<?>[]{}).
newInstance(new Object[]{});
} catch(Exception ex){
throw new ParameterException("Could not construct an object of
type "
@@ -291,7 +291,7 @@
// e.g. for URLs
try{
if(!paramClass.isAssignableFrom(String.class)){
- value = paramClass.getConstructor(new Class[]{String.class}).
+ value = paramClass.getConstructor(new Class<?>[]{String.class}).
newInstance(new Object[]{stringValue});
}
}catch(Exception e){
Modified: gate/trunk/src/main/gate/creole/tokeniser/FSMState.java
===================================================================
--- gate/trunk/src/main/gate/creole/tokeniser/FSMState.java 2014-04-18
10:05:47 UTC (rev 17870)
+++ gate/trunk/src/main/gate/creole/tokeniser/FSMState.java 2014-04-18
10:38:57 UTC (rev 17871)
@@ -126,7 +126,7 @@
* (the ids used internally by the tokeniser for the Unicode types) to sets
* of states.
*/
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({"unchecked","rawtypes"})
Set<FSMState>[] transitionFunction = new Set[SimpleTokeniser.maxTypeId + 1];
/** The RHS string value from which the annotation associated to
Modified: gate/trunk/src/main/gate/util/AnnotationMerging.java
===================================================================
--- gate/trunk/src/main/gate/util/AnnotationMerging.java 2014-04-18
10:05:47 UTC (rev 17870)
+++ gate/trunk/src/main/gate/util/AnnotationMerging.java 2014-04-18
10:38:57 UTC (rev 17871)
@@ -44,7 +44,7 @@
HashMap<Annotation, String> mergeAnns, int numMinK, boolean
isTheSameInstances) {
int numA = annsArr.length;
// First copy the annotatioin sets into a temp array
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({"unchecked","rawtypes"})
Set<Annotation>[] annsArrTemp = new Set[numA];
for(int i = 0; i < numA; ++i) {
if(annsArr[i] != null) {
@@ -118,7 +118,7 @@
}
// First copy the annotatioin sets into a temp array
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({"unchecked","rawtypes"})
Set<Annotation>[] annsArrTemp = new Set[numA];
for(int i = 0; i < numA; ++i) {
if(annsArr[i] != null) {
@@ -212,7 +212,7 @@
HashMap<Annotation, String> mergeAnns, boolean isTheSameInstances) {
int numA = annsArr.length;
// First copy the annotatioin sets into a temp array
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({"unchecked","rawtypes"})
Set<Annotation>[] annsArrTemp = new Set[numA];
for(int i = 0; i < numA; ++i) {
if(annsArr[i] != null) {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their
applications. Written by three acclaimed leaders in the field,
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/NeoTech
_______________________________________________
GATE-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gate-cvs
