Skip to content

Commit

Permalink
fix for RReport name column
Browse files Browse the repository at this point in the history
  • Loading branch information
skublik committed May 29, 2020
1 parent c3471e9 commit facaf14
Showing 1 changed file with 8 additions and 8 deletions.
Expand Up @@ -37,7 +37,7 @@ public class RReport extends RObject<ReportType> {

private RPolyString nameCopy;
private ROrientationType orientation;
private RExportType exportType;
private RExportType export;
private Boolean parent;
private Boolean useHibernateSession;

Expand Down Expand Up @@ -68,12 +68,12 @@ public void setOrientation(ROrientationType orientation) {

@Enumerated(EnumType.ORDINAL)
@Column(nullable = true)
public RExportType getExportType() {
return exportType;
public RExportType getExport() {
return export;
}

public void setExportType(RExportType export) {
this.exportType = export;
public void setExport(RExportType export) {
this.export = export;
}

@Index(name = "iReportParent")
Expand Down Expand Up @@ -105,7 +105,7 @@ public boolean equals(Object o) {
return false;
if (orientation != null ? !orientation.equals(rReport.orientation) : rReport.orientation != null)
return false;
if (exportType != null ? !exportType.equals(rReport.exportType) : rReport.exportType != null)
if (export != null ? !export.equals(rReport.export) : rReport.export != null)
return false;
if (parent != null ? !parent.equals(rReport.parent) : rReport.parent != null)
return false;
Expand All @@ -119,7 +119,7 @@ public int hashCode() {
int result = super.hashCode();
result = 31 * result + (nameCopy != null ? nameCopy.hashCode() : 0);
result = 31 * result + (orientation != null ? orientation.hashCode() : 0);
result = 31 * result + (exportType != null ? exportType.hashCode() : 0);
result = 31 * result + (export != null ? export.hashCode() : 0);
result = 31 * result + (parent != null ? parent.hashCode() : 0);
result = 31 * result + (useHibernateSession != null ? useHibernateSession.hashCode() : 0);

Expand All @@ -133,7 +133,7 @@ public static void copyFromJAXB(ReportType jaxb, RReport repo, RepositoryContext
copyAssignmentHolderInformationFromJAXB(jaxb, repo, repositoryContext, generatorResult);
ExportConfigurationType exportConfig = jaxb.getExport();
if (exportConfig != null) {
repo.setExportType(RUtil.getRepoEnumValue(exportConfig.getType(), RExportType.class));
repo.setExport(RUtil.getRepoEnumValue(exportConfig.getType(), RExportType.class));
}

repo.setNameCopy(RPolyString.copyFromJAXB(jaxb.getName()));
Expand Down

0 comments on commit facaf14

Please sign in to comment.