Added Catalogue Bean
git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portal/ws-synchronized-module-library@164836 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
e1b2459864
commit
c1816bf269
|
@ -59,7 +59,7 @@ public class ThCatalogueBean implements Serializable, Comparable<ThCatalogueBean
|
||||||
/**
|
/**
|
||||||
* @return the isDefault
|
* @return the isDefault
|
||||||
*/
|
*/
|
||||||
public Boolean getIsDefault() {
|
public Boolean isDefault() {
|
||||||
|
|
||||||
return isDefault;
|
return isDefault;
|
||||||
}
|
}
|
||||||
|
@ -91,6 +91,21 @@ public class ThCatalogueBean implements Serializable, Comparable<ThCatalogueBean
|
||||||
this.isDefault = isDefault;
|
this.isDefault = isDefault;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/* (non-Javadoc)
|
||||||
|
* @see java.lang.Comparable#compareTo(java.lang.Object)
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public int compareTo(ThCatalogueBean o) {
|
||||||
|
|
||||||
|
if(o==null)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
return this.getName().compareTo(o.getName());
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/* (non-Javadoc)
|
/* (non-Javadoc)
|
||||||
* @see java.lang.Object#toString()
|
* @see java.lang.Object#toString()
|
||||||
*/
|
*/
|
||||||
|
@ -108,20 +123,5 @@ public class ThCatalogueBean implements Serializable, Comparable<ThCatalogueBean
|
||||||
return builder.toString();
|
return builder.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* (non-Javadoc)
|
|
||||||
* @see java.lang.Comparable#compareTo(java.lang.Object)
|
|
||||||
*/
|
|
||||||
@Override
|
|
||||||
public int compareTo(ThCatalogueBean o) {
|
|
||||||
|
|
||||||
if(o==null)
|
|
||||||
return -1;
|
|
||||||
|
|
||||||
return this.getName().compareTo(o.getName());
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -410,11 +410,14 @@ public class WorkspaceThreddsSynchronize implements WorkspaceThreddsSynchronized
|
||||||
if(token==null || token.isEmpty())
|
if(token==null || token.isEmpty())
|
||||||
throw new Exception("Invalid parameter token null or empty");
|
throw new Exception("Invalid parameter token null or empty");
|
||||||
|
|
||||||
logger.debug("Get Available Catalogues by token: "+token.substring(0, token.length()-5)+"XXXXX");
|
String printToken = token.substring(0, token.length()-5)+"XXXXX";
|
||||||
|
logger.debug("Get Available Catalogues by token: "+printToken);
|
||||||
Set<CatalogBean> ctlgs = engine.getAvailableCatalogsByToken(token);
|
Set<CatalogBean> ctlgs = engine.getAvailableCatalogsByToken(token);
|
||||||
|
|
||||||
if(ctlgs==null || ctlgs.size()==0)
|
if(ctlgs==null || ctlgs.size()==0){
|
||||||
|
logger.debug("No Catalogue available for token: "+printToken +" returning empty list");
|
||||||
return new ArrayList<ThCatalogueBean>(1);
|
return new ArrayList<ThCatalogueBean>(1);
|
||||||
|
}
|
||||||
|
|
||||||
List<ThCatalogueBean> listCtlgs = new ArrayList<ThCatalogueBean>(ctlgs.size());
|
List<ThCatalogueBean> listCtlgs = new ArrayList<ThCatalogueBean>(ctlgs.size());
|
||||||
for(CatalogBean bean: ctlgs){
|
for(CatalogBean bean: ctlgs){
|
||||||
|
|
Loading…
Reference in New Issue