Revision: 17586
http://sourceforge.net/p/gate/code/17586
Author: markagreenwood
Date: 2014-03-07 19:55:49 +0000 (Fri, 07 Mar 2014)
Log Message:
-----------
and a few more before dinner
Modified Paths:
--------------
gate/trunk/src/main/gate/creole/ExecutionException.java
gate/trunk/src/main/gate/creole/ExecutionInterruptedException.java
gate/trunk/src/main/gate/creole/Parameter.java
gate/trunk/src/main/gate/creole/ParameterException.java
gate/trunk/src/main/gate/creole/ParameterList.java
Modified: gate/trunk/src/main/gate/creole/ExecutionException.java
===================================================================
--- gate/trunk/src/main/gate/creole/ExecutionException.java 2014-03-07
19:46:09 UTC (rev 17585)
+++ gate/trunk/src/main/gate/creole/ExecutionException.java 2014-03-07
19:55:49 UTC (rev 17586)
@@ -23,6 +23,8 @@
*/
public class ExecutionException extends GateException {
+ private static final long serialVersionUID = -4184224637622988276L;
+
public ExecutionException() {
super();
}
Modified: gate/trunk/src/main/gate/creole/ExecutionInterruptedException.java
===================================================================
--- gate/trunk/src/main/gate/creole/ExecutionInterruptedException.java
2014-03-07 19:46:09 UTC (rev 17585)
+++ gate/trunk/src/main/gate/creole/ExecutionInterruptedException.java
2014-03-07 19:55:49 UTC (rev 17586)
@@ -18,6 +18,9 @@
* as a result of a call to their interrupt() method.
*/
public class ExecutionInterruptedException extends ExecutionException {
+
+ private static final long serialVersionUID = -6341242221676672764L;
+
public ExecutionInterruptedException(String message){
super(message);
}
Modified: gate/trunk/src/main/gate/creole/Parameter.java
===================================================================
--- gate/trunk/src/main/gate/creole/Parameter.java 2014-03-07 19:46:09 UTC
(rev 17585)
+++ gate/trunk/src/main/gate/creole/Parameter.java 2014-03-07 19:55:49 UTC
(rev 17586)
@@ -16,22 +16,36 @@
package gate.creole;
-import java.io.Serializable;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.*;
-
import gate.Factory;
import gate.FeatureMap;
import gate.Gate;
import gate.Resource;
-import gate.util.*;
+import gate.util.GateRuntimeException;
+import gate.util.Strings;
+import java.io.Serializable;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Queue;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.StringTokenizer;
+import java.util.TreeSet;
+
/** Models a resource parameter.
*/
public class Parameter implements Serializable
{
+ private static final long serialVersionUID = 6611664706992065985L;
+
/**
* Constructor
* @param baseUrl the URL to the creole.xml file that defines the resource
@@ -67,7 +81,7 @@
String itemClassName = null;
/** A set of strings representing suffixes for URL params*/
- Set suffixes = null;
+ Set<String> suffixes = null;
/**
* Map giving concrete classes that should be used for a parameter
@@ -81,8 +95,8 @@
*
* <code>k.isAssignableFrom(substituteClasses.get(k))</code>
*/
- static Map<Class, Class> substituteClasses =
- new HashMap<Class, Class>();
+ static Map<Class<?>, Class<?>> substituteClasses =
+ new HashMap<Class<?>, Class<?>>();
static {
substituteClasses.put(Collection.class, ArrayList.class);
@@ -106,6 +120,7 @@
/** Calculate and return the value for this parameter starting from a String
*/
+ @SuppressWarnings("unchecked")
public Object calculateValueFromString(String stringValue)
throws ParameterException {
//if we have no string we can't construct a value
@@ -362,7 +377,7 @@
/** Get the suffixes atached with this param. If it's null then there are
* no suffices attached with it
*/
- public Set getSuffixes(){ return suffixes;}
+ public Set<String> getSuffixes(){ return suffixes;}
/** Is this a run-time parameter? */
boolean runtime = false;
@@ -380,10 +395,10 @@
public boolean isRuntime() { return runtime; }
/** The Class for the parameter type */
- protected Class paramClass;
+ protected Class<?> paramClass;
/** Find the class for this parameter type. */
- protected Class getParameterClass() throws ParameterException
+ protected Class<?> getParameterClass() throws ParameterException
{
// get java builtin classes via class; else look in the register
try {
Modified: gate/trunk/src/main/gate/creole/ParameterException.java
===================================================================
--- gate/trunk/src/main/gate/creole/ParameterException.java 2014-03-07
19:46:09 UTC (rev 17585)
+++ gate/trunk/src/main/gate/creole/ParameterException.java 2014-03-07
19:55:49 UTC (rev 17586)
@@ -22,9 +22,8 @@
*/
public class ParameterException extends GateException {
- /** Debug flag */
- private static final boolean DEBUG = false;
-
+ private static final long serialVersionUID = -7543043652378574393L;
+
public ParameterException() {
super();
}
Modified: gate/trunk/src/main/gate/creole/ParameterList.java
===================================================================
--- gate/trunk/src/main/gate/creole/ParameterList.java 2014-03-07 19:46:09 UTC
(rev 17585)
+++ gate/trunk/src/main/gate/creole/ParameterList.java 2014-03-07 19:55:49 UTC
(rev 17586)
@@ -30,6 +30,8 @@
*/
public class ParameterList implements Serializable
{
+ private static final long serialVersionUID = -2690236156403182440L;
+
/** Debug flag */
private static final boolean DEBUG = false;
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
