gCubeSystem
/
tabular-data-gwt-service
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Updated Licence 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service@115364 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2015-06-12 15:47:14 +00:00
parent 16521b2c37
commit 546414f62f
3 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java
View File

@ -8479,7 +8479,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
LicenceData licenceData; LicenceData licenceData;
for (int i = 0; i < licencesArray.length; i++) { for (int i = 0; i < licencesArray.length; i++) {
licence = licencesArray[i]; licence = licencesArray[i];
licenceData = new LicenceData(i, licence.toString()); licenceData = new LicenceData(i, licence.toString(),licence.getName());
licences.add(licenceData); licences.add(licenceData);
} }

33
src/main/java/org/gcube/portlets/user/td/gwtservice/shared/licenses/LicenceData.java
View File

@ -11,19 +11,21 @@ import java.io.Serializable;
public class LicenceData implements Serializable { public class LicenceData implements Serializable {
private static final long serialVersionUID = -1489720811451521606L; private static final long serialVersionUID = -1489720811451521606L;
protected int id; // For insert in table only private int id; // For insert in table only
protected String licence; // licence private String licenceId;
private String licenceName;
public LicenceData(){ public LicenceData(){
super(); super();
} }
public LicenceData(int id, String licence) { public LicenceData(int id, String licenceId, String licenceName) {
super(); super();
this.id = id; this.id = id;
this.licence = licence; this.licenceId = licenceId;
this.licenceName=licenceName;
} }
public int getId() { public int getId() {
return id; return id;
} }
@ -32,17 +34,28 @@ public class LicenceData implements Serializable {
this.id = id; this.id = id;
} }
public String getLicence() { public String getLicenceId() {
return licence; return licenceId;
} }
public void setLicence(String licence) { public void setLicenceId(String licenceId) {
this.licence = licence; this.licenceId = licenceId;
}
public String getLicenceName() {
return licenceName;
}
public void setLicenceName(String licenceName) {
this.licenceName = licenceName;
} }
@Override @Override
public String toString() { public String toString() {
return "LicenceData [id=" + id + ", licence=" + licence + "]"; return "LicenceData [id=" + id + ", licenceId=" + licenceId
+ ", licenceName=" + licenceName + "]";
} }
} }

3
src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/TabResource.java
View File

@ -36,7 +36,8 @@ public class TabResource implements Serializable {
} }
public TabResource(String id, String name, String description, public TabResource(String id, String name, String description,
String agency, String date, String right, String validFrom, String validUntilTo, String licence, TRId trId) { String agency, String date, String right, String validFrom, String validUntilTo,
String licence, TRId trId) {
this.id = id; this.id = id;
this.name = name; this.name = name;
this.description = description; this.description = description;