Revision: 15049
http://gate.svn.sourceforge.net/gate/?rev=15049&view=rev
Author: markagreenwood
Date: 2012-01-14 22:31:36 +0000 (Sat, 14 Jan 2012)
Log Message:
-----------
some code cleanup
Modified Paths:
--------------
gate/trunk/src/gate/annotation/AnnotationSetImpl.java
gate/trunk/src/gate/gui/MainFrame.java
gate/trunk/src/gate/gui/PRViewer.java
gate/trunk/src/gate/util/CorpusBenchmarkTool.java
Modified: gate/trunk/src/gate/annotation/AnnotationSetImpl.java
===================================================================
--- gate/trunk/src/gate/annotation/AnnotationSetImpl.java 2012-01-14
22:13:05 UTC (rev 15048)
+++ gate/trunk/src/gate/annotation/AnnotationSetImpl.java 2012-01-14
22:31:36 UTC (rev 15049)
@@ -402,7 +402,6 @@
if (nextNode==null) return emptyAnnotationSet;
annotationsToAdd = getAnnotsByStartNode(nextNode.getId());
}
- if(annotationsToAdd == null) return emptyAnnotationSet;
return new ImmutableAnnotationSetImpl(doc, annotationsToAdd);
}
Modified: gate/trunk/src/gate/gui/MainFrame.java
===================================================================
--- gate/trunk/src/gate/gui/MainFrame.java 2012-01-14 22:13:05 UTC (rev
15048)
+++ gate/trunk/src/gate/gui/MainFrame.java 2012-01-14 22:31:36 UTC (rev
15049)
@@ -1579,8 +1579,8 @@
}
});
- Gate.listeners.put("gate.event.StatusListener", MainFrame.this);
- Gate.listeners.put("gate.event.ProgressListener", MainFrame.this);
+ Gate.getListeners().put("gate.event.StatusListener", MainFrame.this);
+ Gate.getListeners().put("gate.event.ProgressListener", MainFrame.this);
if(Gate.runningOnMac()) {
// mac-specific initialisation
initMacListeners();
Modified: gate/trunk/src/gate/gui/PRViewer.java
===================================================================
--- gate/trunk/src/gate/gui/PRViewer.java 2012-01-14 22:13:05 UTC (rev
15048)
+++ gate/trunk/src/gate/gui/PRViewer.java 2012-01-14 22:31:36 UTC (rev
15049)
@@ -112,18 +112,16 @@
" is not a " +
Resource.class.getName() + "!");
}
- if(target != null){
- Resource pr = (Resource)target;
- ResourceData rData = (ResourceData)Gate.getCreoleRegister().
- get(pr.getClass().getName());
- if(rData != null){
- editor.init(pr, rData.getParameterList().getInitimeParameters());
- }else{
- editor.init(pr, null);
- }
- }else{
- editor.init(null, null);
+
+ Resource pr = (Resource)target;
+ ResourceData rData =
+ (ResourceData)Gate.getCreoleRegister().get(pr.getClass().getName());
+ if(rData != null) {
+ editor.init(pr, rData.getParameterList().getInitimeParameters());
+ } else {
+ editor.init(pr, null);
}
+
editor.removeCreoleListenerLink();
}
Modified: gate/trunk/src/gate/util/CorpusBenchmarkTool.java
===================================================================
--- gate/trunk/src/gate/util/CorpusBenchmarkTool.java 2012-01-14 22:13:05 UTC
(rev 15048)
+++ gate/trunk/src/gate/util/CorpusBenchmarkTool.java 2012-01-14 22:31:36 UTC
(rev 15049)
@@ -471,8 +471,7 @@
);
doc.setName(files[i].getName());
- if (doc == null)
- continue;
+
processDocument(doc);
final LanguageResource lr = sds.adopt(doc, null);
sds.sync(lr);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
RSA(R) Conference 2012
Mar 27 - Feb 2
Save $400 by Jan. 27
Register now!
http://p.sf.net/sfu/rsa-sfdev2dev2
_______________________________________________
GATE-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gate-cvs
