Revision: 17580
http://sourceforge.net/p/gate/code/17580
Author: markagreenwood
Date: 2014-03-07 18:58:06 +0000 (Fri, 07 Mar 2014)
Log Message:
-----------
there he goes, playing with the generics again
Modified Paths:
--------------
gate/trunk/src/main/gate/corpora/DocumentStaxUtils.java
gate/trunk/src/main/gate/corpora/DocumentXmlUtils.java
gate/trunk/src/main/gate/creole/AbstractProcessingResource.java
gate/trunk/src/main/gate/creole/AbstractResource.java
gate/trunk/src/main/gate/creole/ConditionalSerialController.java
gate/trunk/src/main/gate/creole/SerialController.java
Modified: gate/trunk/src/main/gate/corpora/DocumentStaxUtils.java
===================================================================
--- gate/trunk/src/main/gate/corpora/DocumentStaxUtils.java 2014-03-07
15:47:24 UTC (rev 17579)
+++ gate/trunk/src/main/gate/corpora/DocumentStaxUtils.java 2014-03-07
18:58:06 UTC (rev 17580)
@@ -567,6 +567,7 @@
* @return the name or value represented by this element.
* @throws XMLStreamException
*/
+ @SuppressWarnings({"unchecked", "rawtypes"})
static Object readFeatureNameOrValue(XMLStreamReader xsr)
throws XMLStreamException {
String className = xsr.getAttributeValue(null, "className");
@@ -608,7 +609,7 @@
}
// otherwise, do some fancy reflection
- Class theClass = null;
+ Class<?> theClass = null;
try {
theClass = Class.forName(className, true, Gate.getClassLoader());
}
@@ -618,8 +619,8 @@
}
if(java.util.Collection.class.isAssignableFrom(theClass)) {
- Class itemClass = null;
- Constructor itemConstructor = null;
+ Class<?> itemClass = null;
+ Constructor<?> itemConstructor = null;
Collection featObject = null;
boolean addItemAsString = false;
@@ -647,7 +648,7 @@
itemClass = Class.forName(itemClassName, true,
Gate.getClassLoader());
// Let's detect if itemClass takes a constructor with a String
// as param
- Class[] paramsArray = new Class[1];
+ Class<?>[] paramsArray = new Class[1];
paramsArray[0] = java.lang.String.class;
itemConstructor = itemClass.getConstructor(paramsArray);
}
@@ -690,10 +691,10 @@
// If currentfeatClass is not a Collection and not String, test to
// see if it has a constructor that takes a String as param
- Class[] params = new Class[1];
+ Class<?>[] params = new Class[1];
params[0] = java.lang.String.class;
try {
- Constructor featConstr = theClass.getConstructor(params);
+ Constructor<?> featConstr = theClass.getConstructor(params);
Object[] featConstrParams = new Object[1];
featConstrParams[0] = stringRep.toString();
Object featObject = featConstr.newInstance(featConstrParams);
@@ -1108,7 +1109,7 @@
*/
public static void writeAnnotationSet(AnnotationSet annotations,
XMLStreamWriter xsw, String namespaceURI) throws XMLStreamException {
- writeAnnotationSet((Collection)annotations, annotations.getName(), xsw,
+ writeAnnotationSet((Collection<Annotation>)annotations,
annotations.getName(), xsw,
namespaceURI);
}
@@ -1215,7 +1216,7 @@
public static void writeAnnotationSet(AnnotationSet annotations,
String asName, XMLStreamWriter xsw, String namespaceURI)
throws XMLStreamException {
- writeAnnotationSet((Collection)annotations, asName, xsw, namespaceURI);
+ writeAnnotationSet((Collection<Annotation>)annotations, asName, xsw,
namespaceURI);
}
/**
@@ -1334,8 +1335,6 @@
* </ul>
*
* @param buf the buffer to process
- * @param start TODO
- * @param len TODO
*/
static void replaceXMLIllegalCharacters(char[] buf, int start, int len) {
ArrayCharSequence bufSequence = new ArrayCharSequence(buf, start, len);
@@ -1467,8 +1466,8 @@
return;
}
- Set keySet = features.keySet();
- Iterator keySetIterator = keySet.iterator();
+ Set<Object> keySet = features.keySet();
+ Iterator<Object> keySetIterator = keySet.iterator();
FEATURES:while(keySetIterator.hasNext()) {
Object key = keySetIterator.next();
Object value = features.get(key);
@@ -1510,7 +1509,7 @@
// format
if(key instanceof java.util.Collection) {
StringBuffer keyStrBuff = new StringBuffer();
- Iterator iter = ((Collection)key).iterator();
+ Iterator<?> iter = ((Collection<?>)key).iterator();
if(iter.hasNext()) {
item = iter.next();
if(item == null) continue FEATURES;
@@ -1531,7 +1530,7 @@
// format
if(value instanceof java.util.Collection) {
StringBuffer valueStrBuff = new StringBuffer();
- Iterator iter = ((Collection)value).iterator();
+ Iterator<?> iter = ((Collection<?>)value).iterator();
if(iter.hasNext()) {
item = iter.next();
if(item == null) continue FEATURES;
@@ -1822,7 +1821,7 @@
newLine(xsw);
if(fm != null && fm.size() != 0) {
- for(Map.Entry att : fm.entrySet()) {
+ for(Map.Entry<Object,Object> att : fm.entrySet()) {
if(!"isEmptyAndSpan".equals(att.getKey())) {
xsw.writeCharacters(indentMore);
xsw.writeEmptyElement(XCES_NAMESPACE, "feat");
Modified: gate/trunk/src/main/gate/corpora/DocumentXmlUtils.java
===================================================================
--- gate/trunk/src/main/gate/corpora/DocumentXmlUtils.java 2014-03-07
15:47:24 UTC (rev 17579)
+++ gate/trunk/src/main/gate/corpora/DocumentXmlUtils.java 2014-03-07
18:58:06 UTC (rev 17580)
@@ -121,8 +121,8 @@
public static StringBuffer featuresToXml(FeatureMap aFeatureMap,
Map<String,StringBuffer> normalizedFeatureNames) {
if(aFeatureMap == null) return new StringBuffer();
StringBuffer buffer = new StringBuffer(1024);
- Set keySet = aFeatureMap.keySet();
- Iterator keyIterator = keySet.iterator();
+ Set<Object> keySet = aFeatureMap.keySet();
+ Iterator<Object> keyIterator = keySet.iterator();
while(keyIterator.hasNext()) {
Object key = keyIterator.next();
Object value = aFeatureMap.get(key);
@@ -149,7 +149,7 @@
// If key is collection serialize the collection in a specific format
if(key instanceof java.util.Collection) {
StringBuffer keyStrBuff = new StringBuffer();
- Iterator iter = ((Collection)key).iterator();
+ Iterator<?> iter = ((Collection<?>)key).iterator();
if(iter.hasNext()) {
item = iter.next();
if(item instanceof java.lang.Number)
@@ -166,7 +166,7 @@
// If key is collection serialize the colection in a specific format
if(value instanceof java.util.Collection) {
StringBuffer valueStrBuff = new StringBuffer();
- Iterator iter = ((Collection)value).iterator();
+ Iterator<?> iter = ((Collection<?>)value).iterator();
if(iter.hasNext()) {
item = iter.next();
if(item instanceof java.lang.Number)
Modified: gate/trunk/src/main/gate/creole/AbstractProcessingResource.java
===================================================================
--- gate/trunk/src/main/gate/creole/AbstractProcessingResource.java
2014-03-07 15:47:24 UTC (rev 17579)
+++ gate/trunk/src/main/gate/creole/AbstractProcessingResource.java
2014-03-07 18:58:06 UTC (rev 17580)
@@ -92,7 +92,8 @@
*/
public synchronized void removeStatusListener(StatusListener l) {
if (statusListeners != null && statusListeners.contains(l)) {
- Vector v = (Vector) statusListeners.clone();
+ @SuppressWarnings("unchecked")
+ Vector<StatusListener> v =
(Vector<StatusListener>)statusListeners.clone();
v.removeElement(l);
statusListeners = v;
}
@@ -103,7 +104,8 @@
* this processing resource
*/
public synchronized void addStatusListener(StatusListener l) {
- Vector v = statusListeners == null ? new Vector(2) : (Vector)
statusListeners.clone();
+ @SuppressWarnings("unchecked")
+ Vector<StatusListener> v = statusListeners == null ? new
Vector<StatusListener>(2) : (Vector<StatusListener>)statusListeners.clone();
if (!v.contains(l)) {
v.addElement(l);
statusListeners = v;
@@ -116,10 +118,10 @@
*/
protected void fireStatusChanged(String e) {
if (statusListeners != null) {
- Vector listeners = statusListeners;
+ Vector<StatusListener> listeners = statusListeners;
int count = listeners.size();
for (int i = 0; i < count; i++) {
- ((StatusListener) listeners.elementAt(i)).statusChanged(e);
+ listeners.elementAt(i).statusChanged(e);
}
}
}
@@ -129,7 +131,8 @@
* this processing resource.
*/
public synchronized void addProgressListener(ProgressListener l) {
- Vector v = progressListeners == null ? new Vector(2) : (Vector)
progressListeners.clone();
+ @SuppressWarnings("unchecked")
+ Vector<ProgressListener> v = progressListeners == null ? new
Vector<ProgressListener>(2) :
(Vector<ProgressListener>)progressListeners.clone();
if (!v.contains(l)) {
v.addElement(l);
progressListeners = v;
@@ -142,7 +145,8 @@
*/
public synchronized void removeProgressListener(ProgressListener l) {
if (progressListeners != null && progressListeners.contains(l)) {
- Vector v = (Vector) progressListeners.clone();
+ @SuppressWarnings("unchecked")
+ Vector<ProgressListener> v =
(Vector<ProgressListener>)progressListeners.clone();
v.removeElement(l);
progressListeners = v;
}
@@ -155,10 +159,10 @@
*/
protected void fireProgressChanged(int e) {
if (progressListeners != null) {
- Vector listeners = progressListeners;
+ Vector<ProgressListener> listeners = progressListeners;
int count = listeners.size();
for (int i = 0; i < count; i++) {
- ((ProgressListener) listeners.elementAt(i)).progressChanged(e);
+ listeners.elementAt(i).progressChanged(e);
}
}
}
@@ -169,10 +173,10 @@
*/
protected void fireProcessFinished() {
if (progressListeners != null) {
- Vector listeners = progressListeners;
+ Vector<ProgressListener> listeners = progressListeners;
int count = listeners.size();
for (int i = 0; i < count; i++) {
- ((ProgressListener) listeners.elementAt(i)).processFinished();
+ listeners.elementAt(i).processFinished();
}
}
}
@@ -240,13 +244,13 @@
* The list of {@link gate.event.StatusListener}s registered with this
* resource
*/
- private transient Vector statusListeners;
+ private transient Vector<StatusListener> statusListeners;
/**
* The list of {@link gate.event.ProgressListener}s registered with this
* resource
*/
- private transient Vector progressListeners;
+ private transient Vector<ProgressListener> progressListeners;
protected volatile boolean interrupted = false;
} // class AbstractProcessingResource
Modified: gate/trunk/src/main/gate/creole/AbstractResource.java
===================================================================
--- gate/trunk/src/main/gate/creole/AbstractResource.java 2014-03-07
15:47:24 UTC (rev 17579)
+++ gate/trunk/src/main/gate/creole/AbstractResource.java 2014-03-07
18:58:06 UTC (rev 17580)
@@ -166,15 +166,15 @@
// convert the parameter to the right type eg String -> URL
if(parameterValue != null){
- Class propertyType = prop.getPropertyType();
- Class typeToCreate = propertyType;
+ Class<?> propertyType = prop.getPropertyType();
+ Class<?> typeToCreate = propertyType;
if(Parameter.substituteClasses.containsKey(propertyType)) {
typeToCreate = Parameter.substituteClasses.get(propertyType);
}
- Class paramType = parameterValue.getClass();
+ Class<?> paramType = parameterValue.getClass();
if(!propertyType.isAssignableFrom(paramType)) {
try {
- Constructor mostSpecificConstructor =
+ Constructor<?> mostSpecificConstructor =
Tools.getMostSpecificConstructor(typeToCreate, paramType);
parameterValue = mostSpecificConstructor
.newInstance( new Object[]{parameterValue} );
@@ -187,19 +187,19 @@
get(resource.getClass().getName());
ParameterList pList = rData.getParameterList();
Parameter param = null;
- Iterator disjIter = pList.getInitimeParameters().iterator();
+ Iterator<List<Parameter>> disjIter =
pList.getInitimeParameters().iterator();
while(param == null && disjIter.hasNext()){
- Iterator paramIter = ((List)disjIter.next()).iterator();
+ Iterator<Parameter> paramIter = disjIter.next().iterator();
while(param == null && paramIter.hasNext()){
- Parameter aParam = (Parameter)paramIter.next();
+ Parameter aParam = paramIter.next();
if(aParam.getName().equals(paramaterName)) param = aParam;
}
}
disjIter = pList.getRuntimeParameters().iterator();
while(param == null && disjIter.hasNext()){
- Iterator paramIter = ((List)disjIter.next()).iterator();
+ Iterator<Parameter> paramIter = disjIter.next().iterator();
while(param == null && paramIter.hasNext()){
- Parameter aParam = (Parameter)paramIter.next();
+ Parameter aParam = paramIter.next();
if(aParam.getName().equals(paramaterName)) param = aParam;
}
}
@@ -254,7 +254,7 @@
/**
* Sets the values for more parameters for a resource in one step.
*
- * @param parameters a feature map that has paramete names as keys and
+ * @param parameters a feature map that has parameter names as keys and
* parameter values as values.
*/
public static void setParameterValues(Resource resource,
@@ -271,7 +271,7 @@
);
}
- Iterator parnameIter = parameters.keySet().iterator();
+ Iterator<Object> parnameIter = parameters.keySet().iterator();
while(parnameIter.hasNext()){
String parName = (String)parnameIter.next();
setParameterValue(resource, resBeanInf, parName,
parameters.get(parName));
@@ -286,7 +286,7 @@
* string) to listener (of the type declared by the key).
* @param resource the resource that listeners will be registered to.
*/
- public static void setResourceListeners(Resource resource, Map listeners)
+ public static void setResourceListeners(Resource resource, Map<String, ?
extends Object> listeners)
throws
IntrospectionException, InvocationTargetException,
IllegalAccessException, GateException
@@ -325,7 +325,7 @@
* (as a string) to listener (of the type declared by the key).
* @param resource the resource that listeners will be removed from.
*/
- public static void removeResourceListeners(Resource resource, Map listeners)
+ public static void removeResourceListeners(Resource resource, Map<String, ?
extends Object> listeners)
throws IntrospectionException, InvocationTargetException,
IllegalAccessException, GateException{
@@ -372,18 +372,18 @@
* or of the read accessor for a parameter.
*/
public static boolean checkParameterValues(Resource resource,
- List parameters)
+ List<List<Parameter>> parameters)
throws ResourceInstantiationException{
- Iterator disIter = parameters.iterator();
+ Iterator<List<Parameter>> disIter = parameters.iterator();
while(disIter.hasNext()){
- List disjunction = (List)disIter.next();
- boolean required = !((Parameter)disjunction.get(0)).isOptional();
+ List<Parameter> disjunction = (List<Parameter>)disIter.next();
+ boolean required = !disjunction.get(0).isOptional();
if(required){
//at least one parameter in the disjunction must have a value
boolean valueSet = false;
- Iterator parIter = disjunction.iterator();
+ Iterator<Parameter> parIter = disjunction.iterator();
while(!valueSet && parIter.hasNext()){
- Parameter par = (Parameter)parIter.next();
+ Parameter par = parIter.next();
valueSet = (resource.getParameterValue(par.getName()) != null);
}
if(!valueSet) return false;
Modified: gate/trunk/src/main/gate/creole/ConditionalSerialController.java
===================================================================
--- gate/trunk/src/main/gate/creole/ConditionalSerialController.java
2014-03-07 15:47:24 UTC (rev 17579)
+++ gate/trunk/src/main/gate/creole/ConditionalSerialController.java
2014-03-07 18:58:06 UTC (rev 17580)
@@ -134,7 +134,8 @@
ProcessingResource currentPR = prList.get(componentIndex);
//create the listeners
- FeatureMap listeners = Factory.newFeatureMap();
+ //FeatureMap listeners = Factory.newFeatureMap();
+ Map<String, Object> listeners = new HashMap<String, Object>();
listeners.put("gate.event.StatusListener", sListener);
int componentProgress = 100 / prList.size();
listeners.put("gate.event.ProgressListener",
Modified: gate/trunk/src/main/gate/creole/SerialController.java
===================================================================
--- gate/trunk/src/main/gate/creole/SerialController.java 2014-03-07
15:47:24 UTC (rev 17579)
+++ gate/trunk/src/main/gate/creole/SerialController.java 2014-03-07
18:58:06 UTC (rev 17580)
@@ -201,7 +201,7 @@
prList.get(componentIndex);
// create the listeners
- FeatureMap listeners = Factory.newFeatureMap();
+ Map<String,Object> listeners = new HashMap<String,Object>();
listeners.put("gate.event.StatusListener", sListener);
int componentProgress = 100 / prList.size();
listeners.put("gate.event.ProgressListener", new IntervalProgressListener(
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Subversion Kills Productivity. Get off Subversion & Make the Move to Perforce.
With Perforce, you get hassle-free workflows. Merge that actually works.
Faster operations. Version large binaries. Built-in WAN optimization and the
freedom to use Git, Perforce or both. Make the move to Perforce.
http://pubads.g.doubleclick.net/gampad/clk?id=122218951&iu=/4140/ostg.clktrk
_______________________________________________
GATE-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gate-cvs
