-
Notifications
You must be signed in to change notification settings - Fork 1
/
patch.diff
522 lines (498 loc) · 20.9 KB
/
patch.diff
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
diff --git a/entirej-reports-jasper/src/org/entirej/report/jasper/builder/EJReportJasperReportBuilder.java b/entirej-reports-jasper/src/org/entirej/report/jasper/builder/EJReportJasperReportBuilder.java
index 680f1d1..6ebf69a 100644
--- a/entirej-reports-jasper/src/org/entirej/report/jasper/builder/EJReportJasperReportBuilder.java
+++ b/entirej-reports-jasper/src/org/entirej/report/jasper/builder/EJReportJasperReportBuilder.java
@@ -77,9 +77,9 @@ import org.entirej.framework.report.enumerations.EJReportScreenAlignment;
import org.entirej.framework.report.enumerations.EJReportScreenItemType;
import org.entirej.framework.report.enumerations.EJReportScreenSection;
import org.entirej.framework.report.enumerations.EJReportScreenType;
-import org.entirej.framework.report.enumerations.EJReportVAPattern;
import org.entirej.framework.report.interfaces.EJReportProperties;
import org.entirej.framework.report.properties.EJCoreReportRuntimeProperties;
+import org.entirej.framework.report.properties.EJCoreReportScreenItemProperties;
import org.entirej.framework.report.properties.EJCoreReportScreenItemProperties.Date.DateFormats;
import org.entirej.framework.report.properties.EJCoreReportScreenItemProperties.Line.LineDirection;
import org.entirej.framework.report.properties.EJCoreReportScreenItemProperties.Number.NumberFormats;
@@ -835,7 +835,7 @@ public class EJReportJasperReportBuilder
private void processItemStyle(EJReportScreenItem item, JRDesignElement element, EJReportScreenSection section) throws JRException
{
- if (element instanceof JRDesignTextField)
+ if (item.getType() == EJReportScreenItemType.TEXT)
{
JRDesignTextField textField = (JRDesignTextField) element;
@@ -869,6 +869,7 @@ public class EJReportJasperReportBuilder
private JRDesignStyle createScreenItemBaseStyle(JRDesignStyle style, String item, EJReportScreenSection section) throws JRException
{
+
// style.setMarkup("styled");
// style.setMode(ModeEnum.OPAQUE);
@@ -878,14 +879,16 @@ public class EJReportJasperReportBuilder
for (EJReportVisualAttributeProperties properties : visualAttributes)
{
if (properties.isUsedAsDynamicVA())
+
{
addDynamicStyle = true;
}
- if (properties.isUsedAsDynamicVA() && hasDynamicVAToStyle(properties))
+ if (properties.isUsedAsDynamicVA())
+
{
JRDesignConditionalStyle conditionalStyle = new JRDesignConditionalStyle();
conditionalStyle.setConditionExpression(createItemVAExpression(item, properties.getName(), section));
- vaToStyleAligment(properties, conditionalStyle);
+ vaToStyle(properties, conditionalStyle);
style.addConditionalStyle(conditionalStyle);
}
@@ -1257,7 +1260,41 @@ public class EJReportJasperReportBuilder
style.setMarkup("styled");
}
- vaToStyleAligment(va, style);
+ switch (va.getHAlignment())
+ {
+ case LEFT:
+ style.setHorizontalAlignment(HorizontalAlignEnum.LEFT);
+ break;
+ case RIGHT:
+ style.setHorizontalAlignment(HorizontalAlignEnum.RIGHT);
+ break;
+ case CENTER:
+ style.setHorizontalAlignment(HorizontalAlignEnum.CENTER);
+ break;
+ case JUSTIFIED:
+ style.setHorizontalAlignment(HorizontalAlignEnum.JUSTIFIED);
+ break;
+
+ default:
+ break;
+ }
+ switch (va.getVAlignment())
+ {
+ case TOP:
+ style.setVerticalAlignment(VerticalAlignEnum.TOP);
+ break;
+ case BOTTOM:
+ style.setVerticalAlignment(VerticalAlignEnum.BOTTOM);
+ break;
+ case CENTER:
+ style.setVerticalAlignment(VerticalAlignEnum.MIDDLE);
+ case JUSTIFIED:
+ style.setVerticalAlignment(VerticalAlignEnum.JUSTIFIED);
+ break;
+
+ default:
+ break;
+ }
EJReportFontStyle fontStyle = va.getFontStyle();
switch (fontStyle)
@@ -1359,6 +1396,7 @@ public class EJReportJasperReportBuilder
}
}
+
private void vaToStyleAligment(EJReportVisualAttributeProperties va, JRBaseStyle style)
{
switch (va.getHAlignment())
@@ -1398,16 +1436,7 @@ public class EJReportJasperReportBuilder
}
}
- private boolean hasDynamicVAToStyle(EJReportVisualAttributeProperties va)
- {
-
- if (va.getHAlignment() != EJReportScreenAlignment.NONE)
- return true;
- if (va.getVAlignment() != EJReportScreenAlignment.NONE)
- return true;
-
- return false;
- }
+
private void crateValueRefField(EJReportScreenItem item) throws JRException
{
@@ -1516,16 +1545,16 @@ public class EJReportJasperReportBuilder
switch (localeFormat)
{
case CURRENCY:
- text.setPattern(((java.text.DecimalFormat) java.text.NumberFormat.getCurrencyInstance(defaultLocale)).toPattern());
+ itemStyle.setPattern(((java.text.DecimalFormat) java.text.NumberFormat.getCurrencyInstance(defaultLocale)).toPattern());
break;
case PERCENT:
- text.setPattern(((java.text.DecimalFormat) java.text.NumberFormat.getPercentInstance(defaultLocale)).toPattern());
+ itemStyle.setPattern(((java.text.DecimalFormat) java.text.NumberFormat.getPercentInstance(defaultLocale)).toPattern());
break;
case INTEGER:
- text.setPattern(((java.text.DecimalFormat) java.text.NumberFormat.getIntegerInstance(defaultLocale)).toPattern());
+ itemStyle.setPattern(((java.text.DecimalFormat) java.text.NumberFormat.getIntegerInstance(defaultLocale)).toPattern());
break;
case NUMBER:
- text.setPattern(((java.text.DecimalFormat) java.text.NumberFormat.getNumberInstance(defaultLocale)).toPattern());
+ itemStyle.setPattern(((java.text.DecimalFormat) java.text.NumberFormat.getNumberInstance(defaultLocale)).toPattern());
break;
default:
@@ -1599,7 +1628,7 @@ public class EJReportJasperReportBuilder
}
if (dateFormat != null)
{
- text.setPattern(dateFormat.toPattern());
+ itemStyle.setPattern(dateFormat.toPattern());
}
}
}
diff --git a/entirej-reports-jasper/src/org/entirej/report/jasper/data/EJReportBlockDataSource.java b/entirej-reports-jasper/src/org/entirej/report/jasper/data/EJReportBlockDataSource.java
index ad6cafe..a19da58 100644
--- a/entirej-reports-jasper/src/org/entirej/report/jasper/data/EJReportBlockDataSource.java
+++ b/entirej-reports-jasper/src/org/entirej/report/jasper/data/EJReportBlockDataSource.java
@@ -19,13 +19,8 @@
package org.entirej.report.jasper.data;
-import java.awt.Color;
import java.io.Serializable;
import java.math.BigDecimal;
-import java.text.DateFormat;
-import java.text.DecimalFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
@@ -37,10 +32,8 @@ import net.sf.jasperreports.engine.JRField;
import org.entirej.framework.report.EJReportBlock;
import org.entirej.framework.report.EJReportRecord;
import org.entirej.framework.report.data.EJReportDataScreenItem;
-import org.entirej.framework.report.enumerations.EJReportFontStyle;
-import org.entirej.framework.report.enumerations.EJReportFontWeight;
import org.entirej.framework.report.enumerations.EJReportScreenSection;
-import org.entirej.framework.report.properties.EJCoreReportVisualAttributeProperties;
+import org.entirej.framework.report.enumerations.EJReportVAPattern;
import org.entirej.framework.report.properties.EJReportVisualAttributeProperties;
public class EJReportBlockDataSource implements JRDataSource, Serializable, EJReportBlockItemVAContext, EJReportActionContext
@@ -182,6 +175,7 @@ public class EJReportBlockDataSource implements JRDataSource, Serializable, EJRe
// }
return visualAttribute != null && visualAttribute.getName().equals(vaName);
+
}
public boolean isActive(String item, String section)
@@ -228,9 +222,10 @@ public class EJReportBlockDataSource implements JRDataSource, Serializable, EJRe
@Override
public Object getVABaseValue(Object value, String item, String section)
{
- if (value != null)
+ if (value instanceof String)
{
-
+
+
EJReportDataScreenItem reportItem = getReportScreenItem(item, EJReportScreenSection.valueOf(section));
if (reportItem == null)
@@ -238,139 +233,33 @@ public class EJReportBlockDataSource implements JRDataSource, Serializable, EJRe
EJReportVisualAttributeProperties visualAttribute = reportItem.getVisualAttribute();
if (visualAttribute == null)
return value;
-
- // handle formats
-
+ EJReportVAPattern localePattern = visualAttribute.getLocalePattern();
+ switch (localePattern)
{
-
- if (visualAttribute.getManualPattern() != null && !visualAttribute.getManualPattern().isEmpty())
- {
- String pattern = (visualAttribute.getManualPattern());
- if (value instanceof Number)
+ case CURRENCY:
+ case NUMBER:
+ case INTEGER:
+ case PERCENT:
+ try
{
- DecimalFormat myFormatter = new DecimalFormat(pattern);
- value = myFormatter.format((Number) value);
- }
- if (value instanceof Date)
- {
- SimpleDateFormat myFormatter = new SimpleDateFormat(pattern);
- value = myFormatter.format((Date) value);
- }
- }
- else
- {
- SimpleDateFormat dateFormat = null;
- switch (visualAttribute.getLocalePattern())
- {
- case CURRENCY:
- value = toNumber(value);
- if (value instanceof Number)
- {
- value = java.text.NumberFormat.getCurrencyInstance(defaultLocale).format((Number) value);
- }
-
- break;
- case PERCENT:
- value = toNumber(value);
- if (value instanceof Number)
- {
- value = java.text.NumberFormat.getPercentInstance(defaultLocale).format((Number) value);
- }
-
- break;
- case INTEGER:
- value = toNumber(value);
- if (value instanceof Number)
- {
- value = java.text.NumberFormat.getIntegerInstance(defaultLocale).format((Number) value);
- }
- break;
- case NUMBER:
- value = toNumber(value);
- if (value instanceof Number)
- {
- value = java.text.NumberFormat.getNumberInstance(defaultLocale).format((Number) value);
- }
- break;
-
- case DATE_FULL:
- dateFormat = (SimpleDateFormat) (DateFormat.getDateInstance(DateFormat.FULL, defaultLocale));
- break;
- case DATE_LONG:
- dateFormat = (SimpleDateFormat) (DateFormat.getDateInstance(DateFormat.LONG, defaultLocale));
- break;
- case DATE_MEDIUM:
- dateFormat = (SimpleDateFormat) (DateFormat.getDateInstance(DateFormat.MEDIUM, defaultLocale));
- break;
- case DATE_SHORT:
- dateFormat = (SimpleDateFormat) (DateFormat.getDateInstance(DateFormat.SHORT, defaultLocale));
- break;
- case DATE_TIME_FULL:
- dateFormat = (SimpleDateFormat) (DateFormat.getDateTimeInstance(DateFormat.FULL, DateFormat.FULL, defaultLocale));
- break;
- case DATE_TIME_LONG:
- dateFormat = (SimpleDateFormat) (DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.LONG, defaultLocale));
- break;
- case DATE_TIME_MEDIUM:
- dateFormat = (SimpleDateFormat) (DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.MEDIUM, defaultLocale));
- break;
- case DATE_TIME_SHORT:
- dateFormat = (SimpleDateFormat) (DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT, defaultLocale));
- break;
-
- case TIME_FULL:
- dateFormat = (SimpleDateFormat) (DateFormat.getTimeInstance(DateFormat.FULL, defaultLocale));
- break;
- case TIME_LONG:
- dateFormat = (SimpleDateFormat) (DateFormat.getTimeInstance(DateFormat.LONG, defaultLocale));
- break;
- case TIME_MEDIUM:
- dateFormat = (SimpleDateFormat) (DateFormat.getTimeInstance(DateFormat.MEDIUM, defaultLocale));
- break;
- case TIME_SHORT:
- dateFormat = (SimpleDateFormat) (DateFormat.getTimeInstance(DateFormat.SHORT, defaultLocale));
- break;
-
- default:
- break;
- }
- if (dateFormat != null && value instanceof Date)
+
+ return new BigDecimal((String) value);
+ }
+ catch (NumberFormatException e)
{
- value = dateFormat.format(value);
+ // ignore
}
- }
+ default:
+ break;
}
-
- return toStyleText(value.toString(), visualAttribute);
-
- // EJReportVAPattern localePattern =
- // visualAttribute.getLocalePattern();
- // switch (localePattern)
- // {
- // case CURRENCY:
- // case NUMBER:
- // case INTEGER:
- // case PERCENT:
- // try
- // {
- //
- // return new BigDecimal((String) value);
- // }
- // catch (NumberFormatException e)
- // {
- // // ignore
- // }
- //
- // default:
- // break;
- // }
}
return value;
}
+
private Object toNumber(Object value)
{
if (value instanceof String)
@@ -388,150 +277,8 @@ public class EJReportBlockDataSource implements JRDataSource, Serializable, EJRe
return value;
}
- String toStyleText(String text, EJReportVisualAttributeProperties va)
- {
- StringBuilder builder = new StringBuilder();
- boolean useStyle = false;
- builder.append("<style ");
- // va base styles
-
- // isBold="true"
-
- Color backgroundColor = va.getBackgroundColor();
- if (backgroundColor != null)
- {
- useStyle = true;
- builder.append(" backcolor=\"").append(toHex(backgroundColor.getRed(), backgroundColor.getGreen(), backgroundColor.getBlue())).append("\"");
+
- }
- Color foregroundColor = va.getForegroundColor();
- if (foregroundColor != null)
- {
- useStyle = true;
- builder.append(" forecolor=\"").append(toHex(foregroundColor.getRed(), foregroundColor.getGreen(), foregroundColor.getBlue())).append("\"");
- }
-
- String fontName = va.getFontName();
- if (!EJCoreReportVisualAttributeProperties.UNSPECIFIED.equals(fontName))
- {
- useStyle = true;
- builder.append(" fontName=\"").append(fontName).append("\"");
- builder.append(" isPdfEmbedded=\"true\"");
- }
-
- float fontSize = va.getFontSize();
- if (fontSize != -1)
- {
- useStyle = true;
- builder.append(" size=\"").append(fontSize).append("\"");
- }
-
- EJReportFontStyle fontStyle = va.getFontStyle();
- switch (fontStyle)
- {
- case Italic:
- useStyle = true;
- builder.append(" isItalic=\"true\"");
- break;
- case Underline:
- useStyle = true;
- builder.append(" isUnderline=\"true\"");
- break;
- case StrikeThrough:
- useStyle = true;
- builder.append(" isStrikeThrough=\"true\"");
- break;
-
- default:
- break;
- }
-
- EJReportFontWeight fontWeight = va.getFontWeight();
-
- switch (fontWeight)
- {
- case Bold:
- useStyle = true;
- builder.append(" isBold=\"true\"");
- builder.append(" pdfFontName=\"Helvetica-Bold\"");
- break;
- default:
- break;
- }
-
- if (!useStyle)
- return escape(text);
-
- builder.append(">").append(escape(text)).append("</style>");
-
- return builder.toString();
- }
-
- public static String toHex(int r, int g, int b)
- {
- return "#" + toBrowserHexValue(r) + toBrowserHexValue(g) + toBrowserHexValue(b);
- }
-
- public String escape(String str)
- {
- StringBuilder buf = new StringBuilder(str.length() * 2);
- int i;
- for (i = 0; i < str.length(); ++i)
- {
- char ch = str.charAt(i);
-
- String entityName = null;
- switch (ch)
- {
- case 38:
- entityName = "amp";
- break;
- case 34:
- entityName = "quot";
- break;
- case 60:
- entityName = "lt";
- break;
- case 62:
- entityName = "gt";
- break;
- case 39:
- entityName = "apos";
- break;
- }
- if (entityName == null)
- {
- if (ch > 0x7F)
- {
- int intValue = ch;
- buf.append("&#");
- buf.append(intValue);
- buf.append(';');
- }
- else
- {
- buf.append(ch);
- }
- }
- else
- {
- buf.append('&');
- buf.append(entityName);
- buf.append(';');
- }
- }
- return buf.toString();
- }
-
- private static String toBrowserHexValue(int number)
- {
- StringBuilder builder = new StringBuilder(Integer.toHexString(number & 0xff));
- while (builder.length() < 2)
- {
- builder.append("0");
- }
- return builder.toString().toUpperCase();
- }
private EJReportDataScreenItem getReportScreenItem(String item, EJReportScreenSection section)
{
@@ -572,10 +319,10 @@ public class EJReportBlockDataSource implements JRDataSource, Serializable, EJRe
{
String key = section + screenItem;
Boolean b = svCache.get(key);
- if (b == null)
+ if(b==null)
{
- b = block.getReport().getActionController().canShowScreenItem(block.getReport(), blockName, screenItem, EJReportScreenSection.valueOf(section));
- svCache.put(key, b);
+ b= block.getReport().getActionController().canShowScreenItem(block.getReport(), blockName, screenItem, EJReportScreenSection.valueOf(section));
+ svCache.put(key, b);
}
return b;
}