moving context at the level of the entity
This commit is contained in:
parent
1491dd6708
commit
3aa0ea4123
|
@ -26,6 +26,29 @@ public abstract class OafEntity extends Oaf implements Serializable {
|
||||||
*/
|
*/
|
||||||
private List<Measure> measures;
|
private List<Measure> measures;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The Context.
|
||||||
|
*/
|
||||||
|
private List<Context> context;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets context.
|
||||||
|
*
|
||||||
|
* @return the context
|
||||||
|
*/
|
||||||
|
public List<Context> getContext() {
|
||||||
|
return context;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets context.
|
||||||
|
*
|
||||||
|
* @param context the context
|
||||||
|
*/
|
||||||
|
public void setContext(List<Context> context) {
|
||||||
|
this.context = context;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gets measures.
|
* Gets measures.
|
||||||
*
|
*
|
||||||
|
@ -119,6 +142,8 @@ public abstract class OafEntity extends Oaf implements Serializable {
|
||||||
oaiprovenance = e.getOaiprovenance();
|
oaiprovenance = e.getOaiprovenance();
|
||||||
|
|
||||||
measures = mergeLists(measures, e.getMeasures());
|
measures = mergeLists(measures, e.getMeasures());
|
||||||
|
|
||||||
|
context = mergeLists(context, e.getContext());
|
||||||
}
|
}
|
||||||
|
|
||||||
@SafeVarargs
|
@SafeVarargs
|
||||||
|
|
|
@ -130,11 +130,6 @@ public class Result extends OafEntity implements Serializable {
|
||||||
*/
|
*/
|
||||||
private Qualifier bestaccessright;
|
private Qualifier bestaccessright;
|
||||||
|
|
||||||
/**
|
|
||||||
* The Context.
|
|
||||||
*/
|
|
||||||
private List<Context> context;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The External reference.
|
* The External reference.
|
||||||
*/
|
*/
|
||||||
|
@ -508,24 +503,6 @@ public class Result extends OafEntity implements Serializable {
|
||||||
this.bestaccessright = bestaccessright;
|
this.bestaccessright = bestaccessright;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets context.
|
|
||||||
*
|
|
||||||
* @return the context
|
|
||||||
*/
|
|
||||||
public List<Context> getContext() {
|
|
||||||
return context;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Sets context.
|
|
||||||
*
|
|
||||||
* @param context the context
|
|
||||||
*/
|
|
||||||
public void setContext(List<Context> context) {
|
|
||||||
this.context = context;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gets external reference.
|
* Gets external reference.
|
||||||
*
|
*
|
||||||
|
@ -890,8 +867,6 @@ public class Result extends OafEntity implements Serializable {
|
||||||
|
|
||||||
coverage = mergeLists(coverage, r.getCoverage());
|
coverage = mergeLists(coverage, r.getCoverage());
|
||||||
|
|
||||||
context = mergeLists(context, r.getContext());
|
|
||||||
|
|
||||||
externalReference = mergeLists(externalReference, r.getExternalReference());
|
externalReference = mergeLists(externalReference, r.getExternalReference());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue