Skip to content

Improve codestyle #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions .config/checkstyle/suppressions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
"https://checkstyle.org/dtds/suppressions_1_2.dtd">
<suppressions>
<!-- Upstream code format is catastrophic -->
<!-- To fix it complete project must be rewritten which is too time-consuming -->
<suppress checks=".*" files="software[\\/]xdev[\\/]dynamicreports[\\/]"/>
<suppress checks="FileLength"
files="TemplateTransform.java"
lines="1"/>
</suppressions>
1 change: 1 addition & 0 deletions .idea/saveactions_settings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# 1.2.0
* Removed all auto-generated JavaDoc comments to de-bloat
* Delete a bunch of deprecated code
* Changed source to use XDEV CodeStyle

# 1.1.2
* Updated dependencies
* Now using ``jasperreports`` 6.21+
Expand Down
5 changes: 5 additions & 0 deletions dynamicreports-core-for-grid-exporter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,11 @@
<rulesets>
<ruleset>../.config/pmd/ruleset.xml</ruleset>
</rulesets>
<excludes>
<!-- Exclude everything as upstream is catastrophic -->
<!-- To fix it complete project must be rewritten which is too time-consuming -->
<exclude>software/xdev/dynamicreports/**</exclude>
</excludes>
</configuration>
<dependencies>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,131 +21,91 @@
import software.xdev.dynamicreports.design.base.component.DRDesignList;
import software.xdev.dynamicreports.design.definition.DRIDesignBand;
import software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression;
import software.xdev.dynamicreports.report.constant.Constants;
import software.xdev.dynamicreports.report.constant.SplitType;

/**
* <p>DRDesignBand class.</p>
*
* @author Ricardo Mariaca
*
*/
public class DRDesignBand implements DRIDesignBand {
private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;

private String name;
private SplitType splitType;
private DRDesignList list;
private DRDesignComponent bandComponent;
private Integer height;
private DRIDesignExpression printWhenExpression;

/**
* <p>Constructor for DRDesignBand.</p>
*
* @param name a {@link java.lang.String} object.
*/
public DRDesignBand(String name) {
this.name = name;
}

/** {@inheritDoc} */
@Override
public String getName() {
return name;
}

/** {@inheritDoc} */
@Override
public SplitType getSplitType() {
return splitType;
}

/**
* <p>Setter for the field <code>splitType</code>.</p>
*
* @param splitType a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
*/
public void setSplitType(SplitType splitType) {
this.splitType = splitType;
}

/** {@inheritDoc} */
@Override
public DRDesignList getList() {
return list;
}

/**
* <p>Setter for the field <code>list</code>.</p>
*
* @param list a {@link software.xdev.dynamicreports.design.base.component.DRDesignList} object.
*/
public void setList(DRDesignList list) {
this.list = list;
}

/**
* <p>addComponent.</p>
*
* @param component a {@link software.xdev.dynamicreports.design.base.component.DRDesignComponent} object.
*/
public void addComponent(DRDesignComponent component) {
list.addComponent(component);
}

/**
* <p>addComponent.</p>
*
* @param index a int.
* @param component a {@link software.xdev.dynamicreports.design.base.component.DRDesignComponent} object.
*/
public void addComponent(int index, DRDesignComponent component) {
list.addComponent(index, component);
}

/** {@inheritDoc} */
@Override
public DRDesignComponent getBandComponent() {
return bandComponent;
}

/**
* <p>Setter for the field <code>bandComponent</code>.</p>
*
* @param component a {@link software.xdev.dynamicreports.design.base.component.DRDesignComponent} object.
*/
public void setBandComponent(DRDesignComponent component) {
this.bandComponent = component;
}

/** {@inheritDoc} */
@Override
public Integer getHeight() {
return height;
}

/**
* <p>Setter for the field <code>height</code>.</p>
*
* @param height a {@link java.lang.Integer} object.
*/
public void setHeight(Integer height) {
this.height = height;
}

/** {@inheritDoc} */
@Override
public DRIDesignExpression getPrintWhenExpression() {
return printWhenExpression;
}

/**
* <p>Setter for the field <code>printWhenExpression</code>.</p>
*
* @param printWhenExpression a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
*/
public void setPrintWhenExpression(DRIDesignExpression printWhenExpression) {
this.printWhenExpression = printWhenExpression;
}
public class DRDesignBand implements DRIDesignBand
{
private final String name;
private SplitType splitType;
private DRDesignList list;
private DRDesignComponent bandComponent;
private Integer height;
private DRIDesignExpression printWhenExpression;

public DRDesignBand(final String name)
{
this.name = name;
}

@Override
public String getName()
{
return this.name;
}

@Override
public SplitType getSplitType()
{
return this.splitType;
}

public void setSplitType(final SplitType splitType)
{
this.splitType = splitType;
}

@Override
public DRDesignList getList()
{
return this.list;
}

public void setList(final DRDesignList list)
{
this.list = list;
}

public void addComponent(final DRDesignComponent component)
{
this.list.addComponent(component);
}

public void addComponent(final int index, final DRDesignComponent component)
{
this.list.addComponent(index, component);
}

@Override
public DRDesignComponent getBandComponent()
{
return this.bandComponent;
}

public void setBandComponent(final DRDesignComponent component)
{
this.bandComponent = component;
}

@Override
public Integer getHeight()
{
return this.height;
}

public void setHeight(final Integer height)
{
this.height = height;
}

@Override
public DRIDesignExpression getPrintWhenExpression()
{
return this.printWhenExpression;
}

public void setPrintWhenExpression(final DRIDesignExpression printWhenExpression)
{
this.printWhenExpression = printWhenExpression;
}
}
Loading