Revision: 14722
http://gate.svn.sourceforge.net/gate/?rev=14722&view=rev
Author: markagreenwood
Date: 2011-12-10 13:52:51 +0000 (Sat, 10 Dec 2011)
Log Message:
-----------
fixed some more name shadowing issues -- simpler code should be easier to
follow and maintain
Modified Paths:
--------------
gate/trunk/src/gate/creole/AbstractController.java
gate/trunk/src/gate/gui/FeaturesEditor.java
Modified: gate/trunk/src/gate/creole/AbstractController.java
===================================================================
--- gate/trunk/src/gate/creole/AbstractController.java 2011-12-10 13:13:10 UTC
(rev 14721)
+++ gate/trunk/src/gate/creole/AbstractController.java 2011-12-10 13:52:51 UTC
(rev 14722)
@@ -13,17 +13,30 @@
*/
package gate.creole;
-import java.lang.reflect.UndeclaredThrowableException;
-import java.util.*;
-
-import org.apache.log4j.Logger;
-
-import gate.*;
+import gate.Controller;
+import gate.Gate;
+import gate.ProcessingResource;
+import gate.Resource;
import gate.creole.metadata.CreoleResource;
-import gate.event.*;
+import gate.event.ControllerEvent;
+import gate.event.ControllerListener;
+import gate.event.ProgressListener;
+import gate.event.StatusListener;
import gate.util.Benchmark;
import gate.util.Benchmarkable;
+import java.lang.reflect.UndeclaredThrowableException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.Vector;
+
@CreoleResource(icon = "application")
public abstract class AbstractController extends AbstractResource
implements Controller, ProcessingResource, Benchmarkable {
@@ -343,16 +356,6 @@
return badPRs.isEmpty() ? null : badPRs;
}
- /** Sets the name of this resource */
- public void setName(String name) {
- this.name = name;
- }
-
- /** Returns the name of this resource */
- public String getName() {
- return name;
- }
-
public synchronized void removeControllerListener(ControllerListener l) {
if(controllerListeners != null && controllerListeners.contains(l)) {
Vector v = (Vector)controllerListeners.clone();
@@ -371,8 +374,6 @@
}
}
- protected String name;
-
/**
* The list of {@link gate.event.StatusListener}s registered with this
* resource
Modified: gate/trunk/src/gate/gui/FeaturesEditor.java
===================================================================
--- gate/trunk/src/gate/gui/FeaturesEditor.java 2011-12-10 13:13:10 UTC (rev
14721)
+++ gate/trunk/src/gate/gui/FeaturesEditor.java 2011-12-10 13:52:51 UTC (rev
14722)
@@ -170,7 +170,7 @@
XJTable table;
FeaturesTableModel tableModel;
private FeatureBearer resource;
- FeatureMap features;
+ //FeatureMap features;
JTextField newFeatureField;
JTextField newValueField;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Learn Windows Azure Live! Tuesday, Dec 13, 2011
Microsoft is holding a special Learn Windows Azure training event for
developers. It will provide a great way to learn Windows Azure and what it
provides. You can attend the event by watching it streamed LIVE online.
Learn more at http://p.sf.net/sfu/ms-windowsazure
_______________________________________________
GATE-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gate-cvs
