Skip to content

Commit 5196dcf

Browse files
AB-xdevAB-xdev
authored
Merge pull request #80 from xdev-software/codestyle
Improve codestyle
2 parents 781c88d + 740c164 commit 5196dcf

File tree

879 files changed

+54719
-76681
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

879 files changed

+54719
-76681
lines changed

‎.config/checkstyle/suppressions.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
44
"https://checkstyle.org/dtds/suppressions_1_2.dtd">
55
<suppressions>
6-
<!-- Upstream code format is catastrophic -->
7-
<!-- To fix it complete project must be rewritten which is too time-consuming -->
8-
<suppress checks=".*" files="software[\\/]xdev[\\/]dynamicreports[\\/]"/>
6+
<suppress checks="FileLength"
7+
files="TemplateTransform.java"
8+
lines="1"/>
99
</suppressions>

‎.idea/saveactions_settings.xml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# 1.2.0
2+
* Removed all auto-generated JavaDoc comments to de-bloat
3+
* Delete a bunch of deprecated code
4+
* Changed source to use XDEV CodeStyle
5+
16
# 1.1.2
27
* Updated dependencies
38
* Now using ``jasperreports`` 6.21+

‎dynamicreports-core-for-grid-exporter/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,11 @@
314314
<rulesets>
315315
<ruleset>../.config/pmd/ruleset.xml</ruleset>
316316
</rulesets>
317+
<excludes>
318+
<!-- Exclude everything as upstream is catastrophic -->
319+
<!-- To fix it complete project must be rewritten which is too time-consuming -->
320+
<exclude>software/xdev/dynamicreports/**</exclude>
321+
</excludes>
317322
</configuration>
318323
<dependencies>
319324
<dependency>

‎dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/DRDesignBand.java

Lines changed: 84 additions & 124 deletions
Original file line numberDiff line numberDiff line change
@@ -21,131 +21,91 @@
2121
import software.xdev.dynamicreports.design.base.component.DRDesignList;
2222
import software.xdev.dynamicreports.design.definition.DRIDesignBand;
2323
import software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression;
24-
import software.xdev.dynamicreports.report.constant.Constants;
2524
import software.xdev.dynamicreports.report.constant.SplitType;
2625

27-
/**
28-
* <p>DRDesignBand class.</p>
29-
*
30-
* @author Ricardo Mariaca
31-
*
32-
*/
33-
public class DRDesignBand implements DRIDesignBand {
34-
private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
35-
36-
private String name;
37-
private SplitType splitType;
38-
private DRDesignList list;
39-
private DRDesignComponent bandComponent;
40-
private Integer height;
41-
private DRIDesignExpression printWhenExpression;
42-
43-
/**
44-
* <p>Constructor for DRDesignBand.</p>
45-
*
46-
* @param name a {@link java.lang.String} object.
47-
*/
48-
public DRDesignBand(String name) {
49-
this.name = name;
50-
}
51-
52-
/** {@inheritDoc} */
53-
@Override
54-
public String getName() {
55-
return name;
56-
}
57-
58-
/** {@inheritDoc} */
59-
@Override
60-
public SplitType getSplitType() {
61-
return splitType;
62-
}
63-
64-
/**
65-
* <p>Setter for the field <code>splitType</code>.</p>
66-
*
67-
* @param splitType a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
68-
*/
69-
public void setSplitType(SplitType splitType) {
70-
this.splitType = splitType;
71-
}
72-
73-
/** {@inheritDoc} */
74-
@Override
75-
public DRDesignList getList() {
76-
return list;
77-
}
78-
79-
/**
80-
* <p>Setter for the field <code>list</code>.</p>
81-
*
82-
* @param list a {@link software.xdev.dynamicreports.design.base.component.DRDesignList} object.
83-
*/
84-
public void setList(DRDesignList list) {
85-
this.list = list;
86-
}
87-
88-
/**
89-
* <p>addComponent.</p>
90-
*
91-
* @param component a {@link software.xdev.dynamicreports.design.base.component.DRDesignComponent} object.
92-
*/
93-
public void addComponent(DRDesignComponent component) {
94-
list.addComponent(component);
95-
}
96-
97-
/**
98-
* <p>addComponent.</p>
99-
*
100-
* @param index a int.
101-
* @param component a {@link software.xdev.dynamicreports.design.base.component.DRDesignComponent} object.
102-
*/
103-
public void addComponent(int index, DRDesignComponent component) {
104-
list.addComponent(index, component);
105-
}
106-
107-
/** {@inheritDoc} */
108-
@Override
109-
public DRDesignComponent getBandComponent() {
110-
return bandComponent;
111-
}
112-
113-
/**
114-
* <p>Setter for the field <code>bandComponent</code>.</p>
115-
*
116-
* @param component a {@link software.xdev.dynamicreports.design.base.component.DRDesignComponent} object.
117-
*/
118-
public void setBandComponent(DRDesignComponent component) {
119-
this.bandComponent = component;
120-
}
121-
122-
/** {@inheritDoc} */
123-
@Override
124-
public Integer getHeight() {
125-
return height;
126-
}
127-
128-
/**
129-
* <p>Setter for the field <code>height</code>.</p>
130-
*
131-
* @param height a {@link java.lang.Integer} object.
132-
*/
133-
public void setHeight(Integer height) {
134-
this.height = height;
135-
}
136-
137-
/** {@inheritDoc} */
138-
@Override
139-
public DRIDesignExpression getPrintWhenExpression() {
140-
return printWhenExpression;
141-
}
14226

143-
/**
144-
* <p>Setter for the field <code>printWhenExpression</code>.</p>
145-
*
146-
* @param printWhenExpression a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
147-
*/
148-
public void setPrintWhenExpression(DRIDesignExpression printWhenExpression) {
149-
this.printWhenExpression = printWhenExpression;
150-
}
27+
public class DRDesignBand implements DRIDesignBand
28+
{
29+
private final String name;
30+
private SplitType splitType;
31+
private DRDesignList list;
32+
private DRDesignComponent bandComponent;
33+
private Integer height;
34+
private DRIDesignExpression printWhenExpression;
35+
36+
public DRDesignBand(final String name)
37+
{
38+
this.name = name;
39+
}
40+
41+
@Override
42+
public String getName()
43+
{
44+
return this.name;
45+
}
46+
47+
@Override
48+
public SplitType getSplitType()
49+
{
50+
return this.splitType;
51+
}
52+
53+
public void setSplitType(final SplitType splitType)
54+
{
55+
this.splitType = splitType;
56+
}
57+
58+
@Override
59+
public DRDesignList getList()
60+
{
61+
return this.list;
62+
}
63+
64+
public void setList(final DRDesignList list)
65+
{
66+
this.list = list;
67+
}
68+
69+
public void addComponent(final DRDesignComponent component)
70+
{
71+
this.list.addComponent(component);
72+
}
73+
74+
public void addComponent(final int index, final DRDesignComponent component)
75+
{
76+
this.list.addComponent(index, component);
77+
}
78+
79+
@Override
80+
public DRDesignComponent getBandComponent()
81+
{
82+
return this.bandComponent;
83+
}
84+
85+
public void setBandComponent(final DRDesignComponent component)
86+
{
87+
this.bandComponent = component;
88+
}
89+
90+
@Override
91+
public Integer getHeight()
92+
{
93+
return this.height;
94+
}
95+
96+
public void setHeight(final Integer height)
97+
{
98+
this.height = height;
99+
}
100+
101+
@Override
102+
public DRIDesignExpression getPrintWhenExpression()
103+
{
104+
return this.printWhenExpression;
105+
}
106+
107+
public void setPrintWhenExpression(final DRIDesignExpression printWhenExpression)
108+
{
109+
this.printWhenExpression = printWhenExpression;
110+
}
151111
}

0 commit comments

Comments
 (0)