Revision: 17542
http://sourceforge.net/p/gate/code/17542
Author: markagreenwood
Date: 2014-03-05 10:36:35 +0000 (Wed, 05 Mar 2014)
Log Message:
-----------
more generics stuff
Modified Paths:
--------------
gate/trunk/src/main/gate/Annotation.java
gate/trunk/src/main/gate/annotation/AnnotationImpl.java
Modified: gate/trunk/src/main/gate/Annotation.java
===================================================================
--- gate/trunk/src/main/gate/Annotation.java 2014-03-05 02:21:29 UTC (rev
17541)
+++ gate/trunk/src/main/gate/Annotation.java 2014-03-05 10:36:35 UTC (rev
17542)
@@ -56,7 +56,7 @@
* @return <code>true</code> if aAnnot is compatible with <b>this</b> and
* <code>false</code> otherwise.
*/
- public boolean isCompatible(Annotation anAnnot, Set aFeatureNamesSet);
+ public boolean isCompatible(Annotation anAnnot, Set<? extends Object>
aFeatureNamesSet);
/** This method verifies if two annotation and are partially compatible.
* Partially compatible means that they overlap and the FeatureMap of
@@ -79,7 +79,7 @@
* @return <code>true</code> if <b>this</b> is partially compatible with
* aAnnot and <code>false</code> otherwise.
*/
- public boolean isPartiallyCompatible(Annotation anAnnot,Set
aFeatureNamesSet);
+ public boolean isPartiallyCompatible(Annotation anAnnot,Set<? extends
Object> aFeatureNamesSet);
/** Two Annotation are coestensive if their offsets are the same.
* @param anAnnot A Gate annotation.
Modified: gate/trunk/src/main/gate/annotation/AnnotationImpl.java
===================================================================
--- gate/trunk/src/main/gate/annotation/AnnotationImpl.java 2014-03-05
02:21:29 UTC (rev 17541)
+++ gate/trunk/src/main/gate/annotation/AnnotationImpl.java 2014-03-05
10:36:35 UTC (rev 17542)
@@ -30,7 +30,7 @@
*
*/
public class AnnotationImpl extends AbstractFeatureBearer
- implements Annotation, FeatureBearer, Comparable {
+ implements Annotation, FeatureBearer {
/** Debug flag
*/
@@ -236,7 +236,7 @@
* <code>false</code> otherwise.
*/
@Override
- public boolean isCompatible(Annotation anAnnot, Set aFeatureNamesSet){
+ public boolean isCompatible(Annotation anAnnot, Set<? extends Object>
aFeatureNamesSet){
// If the set is null then isCompatible(Annotation) will decide.
if (aFeatureNamesSet == null) return isCompatible(anAnnot);
if (anAnnot == null) return false;
@@ -281,7 +281,7 @@
* aAnnot and <code>false</code> otherwise.
*/
@Override
- public boolean isPartiallyCompatible(Annotation anAnnot,Set
aFeatureNamesSet){
+ public boolean isPartiallyCompatible(Annotation anAnnot,Set<? extends
Object> aFeatureNamesSet){
if (aFeatureNamesSet == null) return isPartiallyCompatible(anAnnot);
if (anAnnot == null) return false;
if (overlaps(anAnnot)){
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
