Revision: 17573
http://sourceforge.net/p/gate/code/17573
Author: markagreenwood
Date: 2014-03-07 10:03:27 +0000 (Fri, 07 Mar 2014)
Log Message:
-----------
More generics tidying, those warning counts are really starting to tumble now
Modified Paths:
--------------
gate/trunk/src/main/gate/Controller.java
gate/trunk/src/main/gate/creole/AbstractController.java
gate/trunk/src/main/gate/creole/ConditionalSerialController.java
gate/trunk/src/main/gate/creole/RealtimeCorpusController.java
gate/trunk/src/main/gate/creole/SerialController.java
gate/trunk/src/main/gate/gui/NameBearerHandle.java
Modified: gate/trunk/src/main/gate/Controller.java
===================================================================
--- gate/trunk/src/main/gate/Controller.java 2014-03-07 02:21:20 UTC (rev
17572)
+++ gate/trunk/src/main/gate/Controller.java 2014-03-07 10:03:27 UTC (rev
17573)
@@ -45,7 +45,7 @@
* @throws UnsupportedOperationException if the <tt>setPRs</tt>
* method is not supported by this controller.
*/
- public void setPRs(Collection<ProcessingResource> PRs);
+ public void setPRs(Collection<? extends ProcessingResource> PRs);
/**
* <p>
Modified: gate/trunk/src/main/gate/creole/AbstractController.java
===================================================================
--- gate/trunk/src/main/gate/creole/AbstractController.java 2014-03-07
02:21:20 UTC (rev 17572)
+++ gate/trunk/src/main/gate/creole/AbstractController.java 2014-03-07
10:03:27 UTC (rev 17573)
@@ -41,6 +41,8 @@
public abstract class AbstractController extends AbstractResource
implements Controller, ProcessingResource, Benchmarkable {
+ private static final long serialVersionUID = 6466829205468662382L;
+
/**
* Benchmark ID of this resource.
*/
@@ -49,7 +51,7 @@
/**
* Shared featureMap
*/
- protected Map benchmarkFeatures = new HashMap();
+ protected Map<String,String> benchmarkFeatures = new
HashMap<String,String>();
// executable code
/**
@@ -182,7 +184,7 @@
* controller.
*/
@Override
- public void setPRs(Collection PRs) {
+ public void setPRs(Collection<? extends ProcessingResource> PRs) {
}
/**
@@ -192,9 +194,9 @@
@Override
public synchronized void interrupt() {
interrupted = true;
- Iterator prIter = getPRs().iterator();
+ Iterator<ProcessingResource> prIter = getPRs().iterator();
while(prIter.hasNext()) {
- ((ProcessingResource)prIter.next()).interrupt();
+ prIter.next().interrupt();
}
}
@@ -210,7 +212,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;
}
@@ -221,8 +224,9 @@
* 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;
@@ -237,10 +241,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);
}
}
}
@@ -250,8 +254,9 @@
* this processing resource.
*/
public synchronized void addProgressListener(ProgressListener l) {
- Vector v =
- progressListeners == null ? new Vector(2) : (Vector)progressListeners
+ @SuppressWarnings("unchecked")
+ Vector<ProgressListener> v =
+ progressListeners == null ? new Vector<ProgressListener>(2) :
(Vector<ProgressListener>)progressListeners
.clone();
if(!v.contains(l)) {
v.addElement(l);
@@ -265,7 +270,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;
}
@@ -280,10 +286,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);
}
}
}
@@ -294,10 +300,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();
}
}
}
@@ -348,14 +354,14 @@
* usually caused by the lack of a parameter or of the read
accessor
* for a parameter.
*/
- public List getOffendingPocessingResources()
+ public List<ProcessingResource> getOffendingPocessingResources()
throws ResourceInstantiationException {
// take all the contained PRs
- ArrayList badPRs = new ArrayList(getPRs());
+ List<ProcessingResource> badPRs = new
ArrayList<ProcessingResource>(getPRs());
// remove the ones that no parameters problems
- Iterator prIter = getPRs().iterator();
+ Iterator<ProcessingResource> prIter = getPRs().iterator();
while(prIter.hasNext()) {
- ProcessingResource pr = (ProcessingResource)prIter.next();
+ ProcessingResource pr = prIter.next();
ResourceData rData =
Gate.getCreoleRegister().get(pr.getClass().getName());
if(AbstractResource.checkParameterValues(pr, rData.getParameterList()
@@ -368,15 +374,17 @@
public synchronized void removeControllerListener(ControllerListener l) {
if(controllerListeners != null && controllerListeners.contains(l)) {
- Vector v = (Vector)controllerListeners.clone();
+ @SuppressWarnings("unchecked")
+ Vector<ControllerListener> v =
(Vector<ControllerListener>)controllerListeners.clone();
v.removeElement(l);
controllerListeners = v;
}
}
public synchronized void addControllerListener(ControllerListener l) {
- Vector v =
- controllerListeners == null ? new Vector(2) : (Vector)controllerListeners
+ @SuppressWarnings("unchecked")
+ Vector<ControllerListener> v =
+ controllerListeners == null ? new Vector<ControllerListener>(2) :
(Vector<ControllerListener>)controllerListeners
.clone();
if(!v.contains(l)) {
v.addElement(l);
@@ -388,38 +396,38 @@
* 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;
/**
* The list of {@link gate.event.ControllerListener}s registered with this
* resource
*/
- private transient Vector controllerListeners;
+ private transient Vector<ControllerListener> controllerListeners;
protected boolean interrupted = false;
protected void fireResourceAdded(ControllerEvent e) {
if(controllerListeners != null) {
- Vector listeners = controllerListeners;
+ Vector<ControllerListener> listeners = controllerListeners;
int count = listeners.size();
for(int i = 0; i < count; i++) {
- ((ControllerListener)listeners.elementAt(i)).resourceAdded(e);
+ listeners.elementAt(i).resourceAdded(e);
}
}
}
protected void fireResourceRemoved(ControllerEvent e) {
if(controllerListeners != null) {
- Vector listeners = controllerListeners;
+ Vector<ControllerListener> listeners = controllerListeners;
int count = listeners.size();
for(int i = 0; i < count; i++) {
- ((ControllerListener)listeners.elementAt(i)).resourceRemoved(e);
+ listeners.elementAt(i).resourceRemoved(e);
}
}
}
Modified: gate/trunk/src/main/gate/creole/ConditionalSerialController.java
===================================================================
--- gate/trunk/src/main/gate/creole/ConditionalSerialController.java
2014-03-07 02:21:20 UTC (rev 17572)
+++ gate/trunk/src/main/gate/creole/ConditionalSerialController.java
2014-03-07 10:03:27 UTC (rev 17573)
@@ -37,6 +37,8 @@
public class ConditionalSerialController extends SerialController
implements ConditionalController{
+ private static final long serialVersionUID = -3791943170768459208L;
+
public ConditionalSerialController(){
strategiesList = new ArrayList<RunningStrategy>();
}
@@ -129,8 +131,7 @@
*/
@Override
protected void runComponent(int componentIndex) throws ExecutionException{
- ProcessingResource currentPR = (ProcessingResource)
- prList.get(componentIndex);
+ ProcessingResource currentPR = prList.get(componentIndex);
//create the listeners
FeatureMap listeners = Factory.newFeatureMap();
Modified: gate/trunk/src/main/gate/creole/RealtimeCorpusController.java
===================================================================
--- gate/trunk/src/main/gate/creole/RealtimeCorpusController.java
2014-03-07 02:21:20 UTC (rev 17572)
+++ gate/trunk/src/main/gate/creole/RealtimeCorpusController.java
2014-03-07 10:03:27 UTC (rev 17573)
@@ -19,7 +19,6 @@
import gate.Executable;
import gate.Factory;
import gate.LanguageAnalyser;
-import gate.ProcessingResource;
import gate.Resource;
import gate.creole.metadata.CreoleParameter;
import gate.creole.metadata.CreoleResource;
@@ -52,6 +51,8 @@
helpURL = "http://gate.ac.uk/userguide/sec:creole-model:applications";)
public class RealtimeCorpusController extends SerialAnalyserController {
+ private static final long serialVersionUID = -676170588997880008L;
+
private final static boolean DEBUG = false;
/**
@@ -144,18 +145,17 @@
}
if(DEBUG) {
prof.checkPoint("~Execute PR ["
- + ((ProcessingResource)prList.get(j)).getName() + "]");
- Long timeOfPR = timeMap.get(((ProcessingResource)prList.get(j))
- .getName());
+ + prList.get(j).getName() + "]");
+ Long timeOfPR = timeMap.get(prList.get(j).getName());
if(timeOfPR == null)
- timeMap.put(((ProcessingResource)prList.get(j)).getName(),
+ timeMap.put(prList.get(j).getName(),
new Long(prof.getLastDuration()));
- else timeMap.put(((ProcessingResource)prList.get(j)).getName(),
+ else timeMap.put(prList.get(j).getName(),
new Long(timeOfPR.longValue() + prof.getLastDuration()));
Out.println("Time taken so far by "
- + ((ProcessingResource)prList.get(j)).getName()
+ + prList.get(j).getName()
+ ": "
- +
timeMap.get(((ProcessingResource)prList.get(j)).getName()));
+ + timeMap.get(prList.get(j).getName()));
}
}
}
Modified: gate/trunk/src/main/gate/creole/SerialController.java
===================================================================
--- gate/trunk/src/main/gate/creole/SerialController.java 2014-03-07
02:21:20 UTC (rev 17572)
+++ gate/trunk/src/main/gate/creole/SerialController.java 2014-03-07
10:03:27 UTC (rev 17573)
@@ -36,15 +36,17 @@
CreoleListener,
CustomDuplication {
+ private static final long serialVersionUID = 5865826535505675541L;
+
protected static final Logger log = Logger.getLogger(SerialController.class);
/** Profiler to track PR execute time */
protected Profiler prof;
- protected HashMap timeMap;
- protected HashMap<String, Long> prTimeMap;
+ protected Map<String,Long> timeMap;
+ protected Map<String, Long> prTimeMap;
public SerialController() {
- prList = Collections.synchronizedList(new ArrayList());
+ prList = Collections.synchronizedList(new ArrayList<ProcessingResource>());
sListener = new InternalStatusListener();
prTimeMap = new HashMap<String, Long>();
@@ -52,7 +54,7 @@
prof = new Profiler();
prof.enableGCCalling(false);
prof.printToSystemOut(true);
- timeMap = new HashMap();
+ timeMap = new HashMap<String,Long>();
}
Gate.getCreoleRegister().addCreoleListener(this);
}
@@ -62,7 +64,7 @@
* controller as an unmodifiable list.
*/
@Override
- public Collection getPRs() {
+ public Collection<ProcessingResource> getPRs() {
return Collections.unmodifiableList(prList);
}
@@ -78,11 +80,11 @@
* controller.
*/
@Override
- public void setPRs(Collection prs) {
+ public void setPRs(Collection<? extends ProcessingResource> prs) {
prList.clear();
- Iterator prIter = prs.iterator();
+ Iterator<? extends ProcessingResource> prIter = prs.iterator();
while(prIter.hasNext())
- add((ProcessingResource)prIter.next());
+ add(prIter.next());
}
public void add(int index, ProcessingResource pr) {
@@ -98,7 +100,7 @@
}
public ProcessingResource remove(int index) {
- ProcessingResource aPr = (ProcessingResource)prList.remove(index);
+ ProcessingResource aPr = prList.remove(index);
fireResourceRemoved(new ControllerEvent(this,
ControllerEvent.RESOURCE_REMOVED, aPr));
return aPr;
@@ -113,14 +115,14 @@
}
public ProcessingResource set(int index, ProcessingResource pr) {
- return (ProcessingResource)prList.set(index, pr);
+ return prList.set(index, pr);
}
/**
* Verifies that all PRs have all their required rutime parameters set.
*/
protected void checkParameters() throws ExecutionException {
- List badPRs;
+ List<ProcessingResource> badPRs;
try {
badPRs = getOffendingPocessingResources();
}
@@ -155,17 +157,17 @@
runComponent(i);
if(log.isDebugEnabled()) {
prof.checkPoint("~Execute PR ["
- + ((ProcessingResource)prList.get(i)).getName() + "]");
+ + prList.get(i).getName() + "]");
Long timeOfPR =
- (Long)timeMap.get(((ProcessingResource)prList.get(i)).getName());
+ timeMap.get(prList.get(i).getName());
if(timeOfPR == null)
- timeMap.put(((ProcessingResource)prList.get(i)).getName(), new Long(
+ timeMap.put(prList.get(i).getName(), new Long(
prof.getLastDuration()));
- else timeMap.put(((ProcessingResource)prList.get(i)).getName(),
+ else timeMap.put(prList.get(i).getName(),
new Long(timeOfPR.longValue() + prof.getLastDuration()));
log.debug("Time taken so far by "
- + ((ProcessingResource)prList.get(i)).getName() + ": "
- + timeMap.get(((ProcessingResource)prList.get(i)).getName()));
+ + prList.get(i).getName() + ": "
+ + timeMap.get(prList.get(i).getName()));
}
}
@@ -187,7 +189,7 @@
/**
* Returns the HashMap that lists the total time taken by each PR
*/
- public HashMap<String, Long> getPrTimeMap() {
+ public Map<String, Long> getPrTimeMap() {
return this.prTimeMap;
}
@@ -196,7 +198,7 @@
*/
protected void runComponent(int componentIndex) throws ExecutionException {
ProcessingResource currentPR =
- (ProcessingResource)prList.get(componentIndex);
+ prList.get(componentIndex);
// create the listeners
FeatureMap listeners = Factory.newFeatureMap();
@@ -276,9 +278,9 @@
// Factory.deleteResource((Resource)aPr);
// }
// }
- for(Object aPr : new ArrayList(getPRs())){
+ for(Resource aPr : new ArrayList<Resource>(getPRs())){
if(!prsInOtherControllers.contains(aPr)){
- Factory.deleteResource((Resource)aPr);
+ Factory.deleteResource(aPr);
}
}
}
@@ -312,7 +314,7 @@
}
/** The list of contained PRs */
- protected List prList;
+ protected List<ProcessingResource> prList;
/** A proxy for status events */
protected StatusListener sListener;
@@ -333,17 +335,17 @@
;
// remove links in parameters
for(int i = 0; i < prList.size(); i++) {
- ProcessingResource aPr = (ProcessingResource)prList.get(i);
+ ProcessingResource aPr = prList.get(i);
ResourceData rData =
Gate.getCreoleRegister().get(aPr.getClass().getName());
if(rData != null) {
- Iterator rtParamDisjIter =
+ Iterator<List<Parameter>> rtParamDisjIter =
rData.getParameterList().getRuntimeParameters().iterator();
while(rtParamDisjIter.hasNext()) {
- List aDisjunction = (List)rtParamDisjIter.next();
- Iterator rtParamIter = aDisjunction.iterator();
+ List<Parameter> aDisjunction = rtParamDisjIter.next();
+ Iterator<Parameter> rtParamIter = aDisjunction.iterator();
while(rtParamIter.hasNext()) {
- Parameter aParam = (Parameter)rtParamIter.next();
+ Parameter aParam = rtParamIter.next();
String paramName = aParam.getName();
try {
if(aPr.getParameterValue(paramName) == e.getResource()) {
Modified: gate/trunk/src/main/gate/gui/NameBearerHandle.java
===================================================================
--- gate/trunk/src/main/gate/gui/NameBearerHandle.java 2014-03-07 02:21:20 UTC
(rev 17572)
+++ gate/trunk/src/main/gate/gui/NameBearerHandle.java 2014-03-07 10:03:27 UTC
(rev 17573)
@@ -915,7 +915,8 @@
while(it.hasNext()) {
newController.add((ProcessingResource)it.next());
}
- existingController.setPRs(Collections.emptyList());
+ List<ProcessingResource> empty = Collections.emptyList();
+ existingController.setPRs(empty);
Factory.deleteResource(existingController);
} catch(Exception ex) {
JOptionPane.showMessageDialog(getLargeView(),
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
