Skip to content

Commit 5f7a8ce

Browse files
AB-xdevAB-xdev
authored
Merge pull request #9 from xdev-software/develop
1.0.2
2 parents 5eb9248 + 2aa9e47 commit 5f7a8ce

File tree

3 files changed

+53
-115
lines changed

3 files changed

+53
-115
lines changed

‎CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# 1.0.2
2+
* Removed unused Jasperreports dependencies
3+
14
# 1.0.1
25
* Removed unused resources
36

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

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,18 @@
9090
<groupId>net.sf.jasperreports</groupId>
9191
<artifactId>jasperreports</artifactId>
9292
<version>6.20.5</version>
93+
<exclusions>
94+
<!-- Compiler is not needed -->
95+
<exclusion>
96+
<groupId>org.eclipse.jdt</groupId>
97+
<artifactId>ecj</artifactId>
98+
</exclusion>
99+
<!-- Charts are not needed -->
100+
<exclusion>
101+
<groupId>org.jfree</groupId>
102+
<artifactId>*</artifactId>
103+
</exclusion>
104+
</exclusions>
93105
</dependency>
94106
<!-- Use for validation and minor shorthand methods -->
95107
<dependency>
@@ -101,7 +113,7 @@
101113
<dependency>
102114
<groupId>org.junit.jupiter</groupId>
103115
<artifactId>junit-jupiter</artifactId>
104-
<version>5.9.2</version>
116+
<version>5.9.3</version>
105117
<scope>test</scope>
106118
</dependency>
107119
</dependencies>
@@ -183,7 +195,7 @@
183195

184196
<plugin>
185197
<artifactId>maven-surefire-plugin</artifactId>
186-
<version>3.0.0-M9</version>
198+
<version>3.1.2</version>
187199
</plugin>
188200
</plugins>
189201
</build>

‎dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/ConstantTransform.java

Lines changed: 36 additions & 113 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,45 @@
2020
import java.util.List;
2121

2222
import org.apache.commons.lang3.EnumUtils;
23-
import org.jfree.data.time.Day;
24-
import org.jfree.data.time.Hour;
25-
import org.jfree.data.time.Millisecond;
26-
import org.jfree.data.time.Minute;
27-
import org.jfree.data.time.Month;
28-
import org.jfree.data.time.Quarter;
29-
import org.jfree.data.time.Second;
30-
import org.jfree.data.time.Week;
31-
import org.jfree.data.time.Year;
3223

3324
import com.lowagie.text.pdf.PdfWriter;
3425

26+
import net.sf.jasperreports.crosstabs.type.CrosstabPercentageEnum;
27+
import net.sf.jasperreports.crosstabs.type.CrosstabTotalPositionEnum;
28+
import net.sf.jasperreports.engine.analytics.dataset.BucketOrder;
29+
import net.sf.jasperreports.engine.export.type.ImageAnchorTypeEnum;
30+
import net.sf.jasperreports.engine.type.BreakTypeEnum;
31+
import net.sf.jasperreports.engine.type.CalculationEnum;
32+
import net.sf.jasperreports.engine.type.DatasetResetTypeEnum;
33+
import net.sf.jasperreports.engine.type.EvaluationTimeEnum;
34+
import net.sf.jasperreports.engine.type.FooterPositionEnum;
35+
import net.sf.jasperreports.engine.type.HorizontalImageAlignEnum;
36+
import net.sf.jasperreports.engine.type.HorizontalTextAlignEnum;
37+
import net.sf.jasperreports.engine.type.HyperlinkTargetEnum;
38+
import net.sf.jasperreports.engine.type.HyperlinkTypeEnum;
39+
import net.sf.jasperreports.engine.type.LineDirectionEnum;
40+
import net.sf.jasperreports.engine.type.LineSpacingEnum;
41+
import net.sf.jasperreports.engine.type.LineStyleEnum;
42+
import net.sf.jasperreports.engine.type.OrientationEnum;
43+
import net.sf.jasperreports.engine.type.PositionTypeEnum;
44+
import net.sf.jasperreports.engine.type.PrintOrderEnum;
45+
import net.sf.jasperreports.engine.type.ResetTypeEnum;
46+
import net.sf.jasperreports.engine.type.RotationEnum;
47+
import net.sf.jasperreports.engine.type.RunDirectionEnum;
48+
import net.sf.jasperreports.engine.type.ScaleImageEnum;
49+
import net.sf.jasperreports.engine.type.SortOrderEnum;
50+
import net.sf.jasperreports.engine.type.SplitTypeEnum;
51+
import net.sf.jasperreports.engine.type.StretchTypeEnum;
52+
import net.sf.jasperreports.engine.type.TabStopAlignEnum;
53+
import net.sf.jasperreports.engine.type.TextAdjustEnum;
54+
import net.sf.jasperreports.engine.type.VerticalImageAlignEnum;
55+
import net.sf.jasperreports.engine.type.VerticalTextAlignEnum;
56+
import net.sf.jasperreports.engine.type.WhenNoDataTypeEnum;
57+
import net.sf.jasperreports.engine.type.WhenResourceMissingTypeEnum;
58+
import net.sf.jasperreports.export.type.HtmlSizeUnitEnum;
59+
import net.sf.jasperreports.export.type.PdfPrintScalingEnum;
60+
import net.sf.jasperreports.export.type.PdfVersionEnum;
61+
import net.sf.jasperreports.export.type.PdfaConformanceEnum;
3562
import software.xdev.dynamicreports.design.constant.EvaluationTime;
3663
import software.xdev.dynamicreports.design.constant.ResetType;
3764
import software.xdev.dynamicreports.jasper.constant.PdfPermission;
@@ -59,54 +86,16 @@
5986
import software.xdev.dynamicreports.report.constant.PageOrientation;
6087
import software.xdev.dynamicreports.report.constant.PdfPrintScaling;
6188
import software.xdev.dynamicreports.report.constant.PdfaConformance;
62-
import software.xdev.dynamicreports.report.constant.RectangleAnchor;
6389
import software.xdev.dynamicreports.report.constant.Rotation;
6490
import software.xdev.dynamicreports.report.constant.RunDirection;
6591
import software.xdev.dynamicreports.report.constant.SplitType;
6692
import software.xdev.dynamicreports.report.constant.StretchType;
6793
import software.xdev.dynamicreports.report.constant.TabStopAlignment;
6894
import software.xdev.dynamicreports.report.constant.TextAdjust;
69-
import software.xdev.dynamicreports.report.constant.TimePeriod;
7095
import software.xdev.dynamicreports.report.constant.VerticalImageAlignment;
7196
import software.xdev.dynamicreports.report.constant.VerticalTextAlignment;
7297
import software.xdev.dynamicreports.report.constant.WhenNoDataType;
7398
import software.xdev.dynamicreports.report.constant.WhenResourceMissingType;
74-
import net.sf.jasperreports.crosstabs.type.CrosstabPercentageEnum;
75-
import net.sf.jasperreports.crosstabs.type.CrosstabTotalPositionEnum;
76-
import net.sf.jasperreports.engine.analytics.dataset.BucketOrder;
77-
import net.sf.jasperreports.engine.export.type.ImageAnchorTypeEnum;
78-
import net.sf.jasperreports.engine.type.BreakTypeEnum;
79-
import net.sf.jasperreports.engine.type.CalculationEnum;
80-
import net.sf.jasperreports.engine.type.DatasetResetTypeEnum;
81-
import net.sf.jasperreports.engine.type.EvaluationTimeEnum;
82-
import net.sf.jasperreports.engine.type.FooterPositionEnum;
83-
import net.sf.jasperreports.engine.type.HorizontalImageAlignEnum;
84-
import net.sf.jasperreports.engine.type.HorizontalTextAlignEnum;
85-
import net.sf.jasperreports.engine.type.HyperlinkTargetEnum;
86-
import net.sf.jasperreports.engine.type.HyperlinkTypeEnum;
87-
import net.sf.jasperreports.engine.type.LineDirectionEnum;
88-
import net.sf.jasperreports.engine.type.LineSpacingEnum;
89-
import net.sf.jasperreports.engine.type.LineStyleEnum;
90-
import net.sf.jasperreports.engine.type.OrientationEnum;
91-
import net.sf.jasperreports.engine.type.PositionTypeEnum;
92-
import net.sf.jasperreports.engine.type.PrintOrderEnum;
93-
import net.sf.jasperreports.engine.type.ResetTypeEnum;
94-
import net.sf.jasperreports.engine.type.RotationEnum;
95-
import net.sf.jasperreports.engine.type.RunDirectionEnum;
96-
import net.sf.jasperreports.engine.type.ScaleImageEnum;
97-
import net.sf.jasperreports.engine.type.SortOrderEnum;
98-
import net.sf.jasperreports.engine.type.SplitTypeEnum;
99-
import net.sf.jasperreports.engine.type.StretchTypeEnum;
100-
import net.sf.jasperreports.engine.type.TabStopAlignEnum;
101-
import net.sf.jasperreports.engine.type.TextAdjustEnum;
102-
import net.sf.jasperreports.engine.type.VerticalImageAlignEnum;
103-
import net.sf.jasperreports.engine.type.VerticalTextAlignEnum;
104-
import net.sf.jasperreports.engine.type.WhenNoDataTypeEnum;
105-
import net.sf.jasperreports.engine.type.WhenResourceMissingTypeEnum;
106-
import net.sf.jasperreports.export.type.HtmlSizeUnitEnum;
107-
import net.sf.jasperreports.export.type.PdfPrintScalingEnum;
108-
import net.sf.jasperreports.export.type.PdfVersionEnum;
109-
import net.sf.jasperreports.export.type.PdfaConformanceEnum;
11099

111100

112101
/**
@@ -583,39 +572,6 @@ protected static SplitTypeEnum splitType(final SplitType splitType)
583572
}
584573
}
585574

586-
/**
587-
* <p>timePeriodType.</p>
588-
*
589-
* @param timePeriodType a {@link software.xdev.dynamicreports.report.constant.TimePeriod} object.
590-
* @return a {@link java.lang.Class} object.
591-
*/
592-
protected static Class<?> timePeriodType(final TimePeriod timePeriodType)
593-
{
594-
switch(timePeriodType)
595-
{
596-
case YEAR:
597-
return Year.class;
598-
case QUARTER:
599-
return Quarter.class;
600-
case MONTH:
601-
return Month.class;
602-
case WEEK:
603-
return Week.class;
604-
case DAY:
605-
return Day.class;
606-
case HOUR:
607-
return Hour.class;
608-
case MINUTE:
609-
return Minute.class;
610-
case SECOND:
611-
return Second.class;
612-
case MILLISECOND:
613-
return Millisecond.class;
614-
default:
615-
throw new JasperDesignException("Time period type " + timePeriodType.name() + " not supported");
616-
}
617-
}
618-
619575
/**
620576
* <p>calculation.</p>
621577
*
@@ -1185,39 +1141,6 @@ protected static PrintOrderEnum printOrder(final Orientation printOrder)
11851141
}
11861142
}
11871143

1188-
/**
1189-
* <p>rectangleAnchor.</p>
1190-
*
1191-
* @param rectangleAnchor a {@link software.xdev.dynamicreports.report.constant.RectangleAnchor} object.
1192-
* @return a {@link org.jfree.ui.RectangleAnchor} object.
1193-
*/
1194-
public static org.jfree.ui.RectangleAnchor rectangleAnchor(final RectangleAnchor rectangleAnchor)
1195-
{
1196-
switch(rectangleAnchor)
1197-
{
1198-
case CENTER:
1199-
return org.jfree.ui.RectangleAnchor.CENTER;
1200-
case TOP:
1201-
return org.jfree.ui.RectangleAnchor.TOP;
1202-
case TOP_LEFT:
1203-
return org.jfree.ui.RectangleAnchor.TOP_LEFT;
1204-
case TOP_RIGHT:
1205-
return org.jfree.ui.RectangleAnchor.TOP_RIGHT;
1206-
case BOTTOM:
1207-
return org.jfree.ui.RectangleAnchor.BOTTOM;
1208-
case BOTTOM_LEFT:
1209-
return org.jfree.ui.RectangleAnchor.BOTTOM_LEFT;
1210-
case BOTTOM_RIGHT:
1211-
return org.jfree.ui.RectangleAnchor.BOTTOM_RIGHT;
1212-
case LEFT:
1213-
return org.jfree.ui.RectangleAnchor.LEFT;
1214-
case RIGHT:
1215-
return org.jfree.ui.RectangleAnchor.RIGHT;
1216-
default:
1217-
throw new JasperDesignException("RectangleAnchor " + rectangleAnchor.name() + " not supported");
1218-
}
1219-
}
1220-
12211144
/**
12221145
* <p>textAdjust.</p>
12231146
*

0 commit comments

Comments
 (0)