My favorites | Sign in
Project Home Downloads Wiki Issues Source
READ-ONLY: This project has been archived. For more information see this post.
Search
for
  Advanced search   Search tips   Subscriptions

Issue 169 attachment: fix-for-169.patch (33.4 KB)

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
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
Index: src/org/jmesa/view/csv/CsvView.java
===================================================================
--- src/org/jmesa/view/csv/CsvView.java (revision 2276)
+++ src/org/jmesa/view/csv/CsvView.java (working copy)
@@ -19,6 +19,7 @@
import java.util.List;

import org.jmesa.core.CoreContext;
+import org.jmesa.view.AbstractExportView;
import org.jmesa.view.View;
import org.jmesa.view.component.Column;
import org.jmesa.view.component.Table;
@@ -27,23 +28,13 @@
* @since 2.0
* @author Jeff Johnston
*/
-public class CsvView implements View {
- private Table table;
- private CoreContext coreContext;
+public class CsvView extends AbstractExportView implements View {

public CsvView(Table table, CoreContext coreContext) {
- this.table = table;
- this.coreContext = coreContext;
+ super(table,coreContext);
}

- public Table getTable() {
- return table;
- }

- public void setTable(Table table) {
- this.table = table;
- }
-
public byte[] getBytes() {
String render = (String) render();
return render.getBytes();
@@ -52,10 +43,10 @@
public Object render() {
StringBuilder data = new StringBuilder();

- List<Column> columns = table.getRow().getColumns();
+ List<Column> columns = this.getTable().getRow().getColumns();

int rowcount = 0;
- Collection<?> items = coreContext.getPageItems();
+ Collection<?> items = this.getCoreContext().getPageItems();
for (Object item : items) {
rowcount++;

Index: src/org/jmesa/view/csv/CsvViewExporter.java
===================================================================
--- src/org/jmesa/view/csv/CsvViewExporter.java (revision 2276)
+++ src/org/jmesa/view/csv/CsvViewExporter.java (working copy)
@@ -17,7 +17,7 @@

import javax.servlet.http.HttpServletResponse;

-import org.jmesa.util.ExportUtils;
+import org.jmesa.view.AbstractExportView;
import org.jmesa.view.AbstractViewExporter;
import org.jmesa.view.View;

@@ -26,46 +26,37 @@
* @author Jeff Johnston
*/
public class CsvViewExporter extends AbstractViewExporter {
- View view;
- HttpServletResponse response;
- String fileName;
-
- public CsvViewExporter(View view, HttpServletResponse response) {
- this.view = view;
- this.response = response;
- this.fileName = ExportUtils.exportFileName(view, "txt");
+ public CsvViewExporter(AbstractExportView view, HttpServletResponse response) {
+ super(view,response,null);
}

- public CsvViewExporter(View view, String fileName, HttpServletResponse response) {
- this.view = view;
- this.fileName = fileName;
- this.response = response;
+ public CsvViewExporter(AbstractExportView view, String fileName, HttpServletResponse response) {
+ super(view,response,fileName);
}

- public View getView() {
- return view;
- }
-
- public void setView(View view) {
- this.view = view;
- }
-
public void export()
throws Exception {
+ HttpServletResponse response= super.getResponse();
responseHeaders(response);
- String viewData = (String) view.render();
+ String viewData = (String) this.getView().render();
byte[] contents = (viewData).getBytes();
response.getOutputStream().write(contents);
}

+ /* (non-Javadoc)
+ * @see org.jmesa.view.AbstractViewExporter#getContextType()
+ */
@Override
- public void responseHeaders(HttpServletResponse response)
- throws Exception {
- response.setContentType("text/plain");
- fileName = new String(fileName.getBytes(), "UTF-8");
- response.setHeader("Content-Disposition", "attachment;filename=\"" + fileName + "\"");
- response.setHeader("Cache-Control", "must-revalidate, post-check=0, pre-check=0");
- response.setHeader("Pragma", "public");
- response.setDateHeader("Expires", (System.currentTimeMillis() + 1000));
+ public String getContextType() {
+ return "text/plain";
}
+
+ /* (non-Javadoc)
+ * @see org.jmesa.view.AbstractViewExporter#getExtesionName()
+ */
+ @Override
+ public String getExtesionName() {
+ return "txt";
+ }
+
}
Index: src/org/jmesa/view/AbstractViewExporter.java
===================================================================
--- src/org/jmesa/view/AbstractViewExporter.java (revision 2276)
+++ src/org/jmesa/view/AbstractViewExporter.java (working copy)
@@ -15,13 +15,83 @@
*/
package org.jmesa.view;

+import java.nio.charset.Charset;
+import java.util.Locale;
+
import javax.servlet.http.HttpServletResponse;

+import org.jmesa.util.ExportUtils;
+
/**
* @since 2.0
* @author Jeff Johnston
*/
public abstract class AbstractViewExporter implements ViewExporter {
- public abstract void responseHeaders(HttpServletResponse response)
- throws Exception;
+
+ private AbstractExportView view;
+ private HttpServletResponse response;
+ private String fileName;
+
+
+ public AbstractViewExporter(AbstractExportView view, HttpServletResponse response) {
+ this(view,response,null);
+ }
+
+ public AbstractViewExporter(AbstractExportView view, HttpServletResponse response,String fileName) {
+ this.view = view;
+ if(fileName == null){
+ fileName = ExportUtils.exportFileName(view, this.getExtesionName());
+ }
+ this.fileName = fileName;
+ this.response = response;
+ }
+
+ public void responseHeaders(HttpServletResponse response)
+ throws Exception{
+ response.setContentType(this.getContextType());
+ String exportFilenameEncoding = view.getCoreContext().getPreference("export.filenameEncoding");
+ if(exportFilenameEncoding == null ){
+ exportFilenameEncoding = Charset.defaultCharset().name();
+ }
+ String fileName1 = new String(fileName.getBytes(exportFilenameEncoding),"ISO8859_1");
+ response.setHeader("Content-Disposition", "attachment;filename=\"" + fileName1 + "\"");
+ response.setHeader("Cache-Control", "must-revalidate, post-check=0, pre-check=0");
+ response.setHeader("Pragma", "public");
+ response.setDateHeader("Expires", (System.currentTimeMillis() + 1000));
+ }
+
+
+ /**
+ *
+ * @return HttpServletResponse ContextType
+ */
+ public abstract String getContextType();
+
+ /**
+ *
+ * @return Export filename extesion name eg txt,xls,pdf,...
+ */
+ public abstract String getExtesionName();
+
+
+ /**
+ * @return the view
+ */
+ public AbstractExportView getView() {
+ return view;
+ }
+
+ /* (non-Javadoc)
+ * @see org.jmesa.view.ViewExporter#setView(org.jmesa.view.View)
+ */
+ public void setView(View view) {
+ this.view = (AbstractExportView)view;
+ }
+
+ /**
+ * @return the response
+ */
+ protected HttpServletResponse getResponse() {
+ return response;
+ }
}
Index: src/org/jmesa/view/pdfp/PdfPViewExporter.java
===================================================================
--- src/org/jmesa/view/pdfp/PdfPViewExporter.java (revision 2276)
+++ src/org/jmesa/view/pdfp/PdfPViewExporter.java (working copy)
@@ -15,15 +15,17 @@
*/
package org.jmesa.view.pdfp;

-import com.lowagie.text.pdf.PdfWriter;
import java.io.ByteArrayOutputStream;
+
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.jmesa.util.ExportUtils;
+
+import org.jmesa.view.AbstractExportView;
import org.jmesa.view.AbstractViewExporter;
-import org.jmesa.view.View;

+import com.lowagie.text.pdf.PdfWriter;
+
/**
* A PDF view that uses the iText PdfPTable.
*
@@ -31,57 +33,53 @@
* @author Ismail Seyfi
*/
public class PdfPViewExporter extends AbstractViewExporter {
- private View view;
private HttpServletRequest request;
- private HttpServletResponse response;
- private String fileName;

- public PdfPViewExporter(View view, HttpServletRequest request, HttpServletResponse response) {
- this.view = view;
+ public PdfPViewExporter(AbstractExportView view, HttpServletRequest request, HttpServletResponse response) {
+ super(view,response);
this.request = request;
- this.response = response;
- this.fileName = ExportUtils.exportFileName(view, "pdf");
}

- public PdfPViewExporter(View view, String fileName, HttpServletRequest request, HttpServletResponse response) {
- this.view = view;
- this.fileName = fileName;
+ public PdfPViewExporter(AbstractExportView view, HttpServletRequest request, HttpServletResponse response,String fileName) {
+ super(view,response,fileName);
this.request = request;
- this.response = response;
}

- public View getView() {
- return view;
- }

- public void setView(View view) {
- this.view = view;
- }

public void export() throws Exception {
-
com.lowagie.text.Document document = new com.lowagie.text.Document();
ByteArrayOutputStream baos = new ByteArrayOutputStream();

PdfWriter.getInstance(document, baos);
document.open();
- document.add(((PdfPView) view).getTableCaption());
- document.add(((PdfPView) view).render());
+ PdfPView pdfView = (PdfPView)this.getView();
+ document.add( pdfView.getTableCaption());
+ document.add( pdfView.render());
document.close();
-
+ final HttpServletResponse response =this.getResponse();
responseHeaders(response);
ServletOutputStream out = response.getOutputStream();
baos.writeTo(out);
out.flush();
}

+
+ /* (non-Javadoc)
+ * @see org.jmesa.view.AbstractViewExporter#getContextType()
+ */
@Override
- public void responseHeaders(HttpServletResponse response) throws Exception {
- response.setContentType("application/pdf");
- fileName = new String(fileName.getBytes(), "UTF-8");
- response.setHeader("Content-Disposition", "attachment;filename=\"" + fileName + "\"");
- response.setHeader("Cache-Control", "must-revalidate, post-check=0, pre-check=0");
- response.setHeader("Pragma", "public");
- response.setDateHeader("Expires", (System.currentTimeMillis() + 1000));
+ public String getContextType() {
+ return "application/pdf";
}
+
+ /* (non-Javadoc)
+ * @see org.jmesa.view.AbstractViewExporter#getExtesionName()
+ */
+ @Override
+ public String getExtesionName() {
+ return "pdf";
+ }
+
+
}
Index: src/org/jmesa/view/pdfp/PdfPView.java
===================================================================
--- src/org/jmesa/view/pdfp/PdfPView.java (revision 2276)
+++ src/org/jmesa/view/pdfp/PdfPView.java (working copy)
@@ -25,6 +25,7 @@
import java.util.Iterator;
import java.util.List;
import org.jmesa.core.CoreContext;
+import org.jmesa.view.AbstractExportView;
import org.jmesa.view.View;
import static org.jmesa.view.ViewUtils.isRowEven;
import org.jmesa.view.component.Column;
@@ -39,11 +40,9 @@
* @since 2.3.4
* @author Ismail Seyfi
*/
-public class PdfPView implements View {
+public class PdfPView extends AbstractExportView implements View {

- private Table table;
private WebContext webContext;
- private CoreContext coreContext;
private Color evenCellBackgroundColor;
private Color oddCellBackgroundColor;
private Color headerBackgroundColor;
@@ -52,10 +51,8 @@
private String captionAlignment;

public PdfPView(Table table, Toolbar toolbar, WebContext webContext, CoreContext coreContext) {
- this.table = table;
+ super(table,coreContext);
this.webContext = webContext;
- this.coreContext = coreContext;
-
this.evenCellBackgroundColor = new Color(227, 227, 227);
this.oddCellBackgroundColor = new Color(255, 255, 255);
this.headerBackgroundColor = new Color(114, 159, 207);
@@ -64,14 +61,7 @@
this.captionAlignment = "center";
}

- public Table getTable() {
- return table;
- }

- public void setTable(Table table) {
- this.table = table;
- }
-
public byte[] getBytes() {
return null;
}
@@ -100,7 +90,7 @@
}

// build table body
- Collection<?> items = coreContext.getPageItems();
+ Collection<?> items = getPageItems();
int rowcount = 0;
for (Object item : items) {
rowcount++;
Index: src/org/jmesa/view/jexcel/JExcelView.java
===================================================================
--- src/org/jmesa/view/jexcel/JExcelView.java (revision 2276)
+++ src/org/jmesa/view/jexcel/JExcelView.java (working copy)
@@ -34,6 +34,7 @@

import org.apache.commons.lang.StringUtils;
import org.jmesa.core.CoreContext;
+import org.jmesa.view.AbstractExportView;
import org.jmesa.view.View;
import org.jmesa.view.component.Column;
import org.jmesa.view.component.Row;
@@ -44,35 +45,25 @@
* <p>
* Create the JExcel view.
* </p>
- *
+ *
* @since 2.2
* @author Paul Horn
*/
-public class JExcelView implements View {
- private Table table;
- private CoreContext coreContext;
+public class JExcelView extends AbstractExportView implements View {
private OutputStream out;

public JExcelView(Table table, CoreContext coreContext) {
- this.table = table;
- this.coreContext = coreContext;
+ super(table,coreContext);
}

- public Table getTable() {
- return table;
- }

- public void setTable(Table table) {
- this.table = table;
- }
-
public void setOut(OutputStream out) {
this.out = out;
}

/**
* A utility method used to debug views.
- *
+ *
* @return The byte array that represents the JExcel view.
*/
public byte[] getBytes() {
@@ -91,6 +82,7 @@

public Object render() {
try {
+ Table table = this.getTable();
WritableWorkbook workbook = Workbook.createWorkbook(out);
String caption = table.getCaption();
if (StringUtils.isEmpty(caption)) {
@@ -120,7 +112,7 @@

WritableCellFormat rowFmt = new WritableCellFormat(new WritableFont(WritableFont.ARIAL, 10));

- Collection<?> items = coreContext.getPageItems();
+ Collection<?> items = this.getPageItems();
for (Object item : items) {
colidx = 0;
for (Column col : columns) {
Index: src/org/jmesa/view/jexcel/JExcelViewExporter.java
===================================================================
--- src/org/jmesa/view/jexcel/JExcelViewExporter.java (revision 2276)
+++ src/org/jmesa/view/jexcel/JExcelViewExporter.java (working copy)
@@ -19,61 +19,56 @@

import jxl.write.WritableWorkbook;

-import org.jmesa.util.ExportUtils;
+import org.jmesa.view.AbstractExportView;
import org.jmesa.view.AbstractViewExporter;
-import org.jmesa.view.View;

/**
* <p>
* Output the JExcel results out to the response.
* </p>
- *
+ *
* @since 2.2
* @author Paul Horn
*/
public class JExcelViewExporter extends AbstractViewExporter {
- private View view;
- private HttpServletResponse response;
- private String fileName;

- public JExcelViewExporter(View view, HttpServletResponse response) {
- this.view = view;
- this.response = response;
- this.fileName = ExportUtils.exportFileName(view, "xls");
+ public JExcelViewExporter(AbstractExportView view, HttpServletResponse response) {
+ super(view,response);
}

- public JExcelViewExporter(View view, String fileName, HttpServletResponse response) {
- this.view = view;
- this.fileName = fileName;
- this.response = response;
+ public JExcelViewExporter(AbstractExportView view, HttpServletResponse response,String fileName) {
+ super(view,response,fileName);
}

- public View getView() {
- return view;
- }

- public void setView(View view) {
- this.view = view;
- }

- public void export()
+ public void export()
throws Exception {
- ((JExcelView) view).setOut(response.getOutputStream());
+ HttpServletResponse response = this.getResponse();
+ JExcelView view = (JExcelView)this.getView();
+ view.setOut(response.getOutputStream());
WritableWorkbook workbook = (WritableWorkbook) view.render();
responseHeaders(response);
workbook.write();
response.getOutputStream().flush();
workbook.close();
}
-
+
+ /* (non-Javadoc)
+ * @see org.jmesa.view.AbstractViewExporter#getContextType()
+ */
@Override
- public void responseHeaders(HttpServletResponse response)
- throws Exception {
- response.setContentType("application/vnd.ms-excel;charset=UTF-8");
- fileName = new String(fileName.getBytes(), "UTF-8");
- response.setHeader("Content-Disposition", "attachment;filename=\"" + fileName + "\"");
- response.setHeader("Cache-Control", "must-revalidate, post-check=0, pre-check=0");
- response.setHeader("Pragma", "public");
- response.setDateHeader("Expires", (System.currentTimeMillis() + 1000));
+ public String getContextType() {
+ return "application/vnd.ms-excel;charset=UTF-8";
}
+
+ /* (non-Javadoc)
+ * @see org.jmesa.view.AbstractViewExporter#getExtesionName()
+ */
+ @Override
+ public String getExtesionName() {
+ return "xls";
+ }
+
+
}
Index: src/org/jmesa/view/pdf/PdfView.java
===================================================================
--- src/org/jmesa/view/pdf/PdfView.java (revision 2276)
+++ src/org/jmesa/view/pdf/PdfView.java (working copy)
@@ -20,9 +20,9 @@
import java.util.List;
import org.apache.commons.lang.StringEscapeUtils;
import org.jmesa.core.CoreContext;
+import org.jmesa.view.AbstractExportView;
import org.jmesa.view.View;
import org.jmesa.view.component.Column;
-import org.jmesa.view.component.Table;
import org.jmesa.view.editor.CellEditor;
import org.jmesa.view.html.HtmlBuilder;
import org.jmesa.view.html.HtmlSnippets;
@@ -38,21 +38,20 @@

/**
* Use the Flying Saucer API to generate Pdf documents.
- *
+ *
* @since 2.2
* @author Paul Horn
*/
-public class PdfView implements View {
+public class PdfView extends AbstractExportView implements View {

private static Logger logger = LoggerFactory.getLogger(PdfView.class);
- private HtmlTable table;
private HtmlSnippets snippets;
private WebContext webContext;
private String cssLocation;
private String doctype;

public PdfView(HtmlTable table, Toolbar toolbar, WebContext webContext, CoreContext coreContext) {
- this.table = table;
+ super(table,coreContext);
this.webContext = webContext;
this.snippets = new HtmlSnippetsImpl(table, toolbar, coreContext);

@@ -60,14 +59,7 @@
this.doctype = coreContext.getPreference("pdf.doctype");
}

- public HtmlTable getTable() {
- return table;
- }

- public void setTable(Table table) {
- this.table = (HtmlTable) table;
- }
-
/**
* @return The stylesheet to use for this pdf.
*/
@@ -79,11 +71,11 @@
* <p>
* The css to use for this pdf file. Will be relative to the servlet context.
* </p>
- *
+ *
* <p>
* example: /css/jmesa-pdf-landscape.css
* <p>
- *
+ *
* @param cssLocation The path and name of the jmesa css file.
*/
public void setCssLocation(String cssLocation) {
@@ -130,9 +122,9 @@
html.append(snippets.theadEnd());

html.append(snippets.tbodyStart());
-
+
decorateCellEditors();
-
+
html.append(snippets.body());

html.append(snippets.tbodyEnd());
@@ -156,13 +148,14 @@
* Decorate the cellEditors to escape xml values.
*/
protected void decorateCellEditors() {
+ HtmlTable table = (HtmlTable)this.getTable();
HtmlRow row = table.getRow();
List<Column> columns = row.getColumns();
for (Iterator<Column> iter = columns.iterator(); iter.hasNext();) {
HtmlColumn column = (HtmlColumn) iter.next();
HtmlCellRenderer cellRenderer = column.getCellRenderer();
CellEditor cellEditor = cellRenderer.getCellEditor();
-
+
// decorate the cell editors
EscapeXmlCellEditor escapeXmlCellEditor = new EscapeXmlCellEditor();
escapeXmlCellEditor.setCellEditor(cellEditor);
Index: src/org/jmesa/view/pdf/PdfViewExporter.java
===================================================================
--- src/org/jmesa/view/pdf/PdfViewExporter.java (revision 2276)
+++ src/org/jmesa/view/pdf/PdfViewExporter.java (working copy)
@@ -22,7 +22,7 @@
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;

-import org.jmesa.util.ExportUtils;
+import org.jmesa.view.AbstractExportView;
import org.jmesa.view.AbstractViewExporter;
import org.jmesa.view.View;
import org.w3c.dom.Document;
@@ -34,45 +34,39 @@
* @author Paul Horn
*/
public class PdfViewExporter extends AbstractViewExporter {
- private View view;
private HttpServletRequest request;
- private HttpServletResponse response;
- private String fileName;

- public PdfViewExporter(View view, HttpServletRequest request, HttpServletResponse response) {
- this.view = view;
+ public PdfViewExporter(AbstractExportView view,HttpServletRequest request,HttpServletResponse response) {
+ super(view,response);
this.request = request;
- this.response = response;
- this.fileName = ExportUtils.exportFileName(view, "pdf");
- }
+ }

- public PdfViewExporter(View view, String fileName, HttpServletRequest request, HttpServletResponse response) {
- this.view = view;
- this.fileName = fileName;
+ public PdfViewExporter(AbstractExportView view,HttpServletRequest request,HttpServletResponse response, String fileName) {
+ super(view,response,fileName);
this.request = request;
- this.response = response;
}

- public View getView() {
- return this.view;
+ /* (non-Javadoc)
+ * @see org.jmesa.view.AbstractViewExporter#getContextType()
+ */
+ @Override
+ public String getContextType() {
+ return "application/pdf";
}

- public void setView(View view) {
- this.view = view;
- }

+ /* (non-Javadoc)
+ * @see org.jmesa.view.AbstractViewExporter#getExtesionName()
+ */
@Override
- public void responseHeaders(HttpServletResponse response) throws Exception {
- response.setContentType("application/pdf");
- fileName = new String(fileName.getBytes(), "UTF-8");
- response.setHeader("Content-Disposition", "attachment;filename=\"" + fileName + "\"");
- response.setHeader("Cache-Control", "must-revalidate, post-check=0, pre-check=0");
- response.setHeader("Pragma", "public");
- response.setDateHeader("Expires", (System.currentTimeMillis() + 1000));
+ public String getExtesionName() {
+ return "pdf";
}

public void export() throws Exception {
+ View view = this.getView();
byte[] contents = view.getBytes();
+ HttpServletResponse response = this.getResponse();
responseHeaders(response);

System.setProperty("xr.load.xml-reader", "org.ccil.cowan.tagsoup.Parser");
@@ -103,7 +97,8 @@
renderer.layout();
renderer.createPDF(response.getOutputStream());
}
-
+
+
/**
* @return The base url to the web application.
*/
Index: src/org/jmesa/view/excel/ExcelViewExporter.java
===================================================================
--- src/org/jmesa/view/excel/ExcelViewExporter.java (revision 2276)
+++ src/org/jmesa/view/excel/ExcelViewExporter.java (working copy)
@@ -18,9 +18,8 @@
import javax.servlet.http.HttpServletResponse;

import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.jmesa.util.ExportUtils;
+import org.jmesa.view.AbstractExportView;
import org.jmesa.view.AbstractViewExporter;
-import org.jmesa.view.View;

/**
* @since 2.1
@@ -28,45 +27,37 @@
*/
public class ExcelViewExporter extends AbstractViewExporter {

- private View view;
- private HttpServletResponse response;
- private String fileName;
-
- public ExcelViewExporter(View view, HttpServletResponse response) {
- this.view = view;
- this.response = response;
- this.fileName = ExportUtils.exportFileName(view, "xls");
+ public ExcelViewExporter(AbstractExportView view, HttpServletResponse response) {
+ super(view,response);
}

- public ExcelViewExporter(View view, String fileName, HttpServletResponse response) {
- this.view = view;
- this.fileName = fileName;
- this.response = response;
+ public ExcelViewExporter(AbstractExportView view, String fileName, HttpServletResponse response) {
+ super(view,response,fileName);
}

- public View getView() {
- return view;
+ public void export()
+ throws Exception {
+ HttpServletResponse resp = super.getResponse();
+ HSSFWorkbook workbook = (HSSFWorkbook) this.getView().render();
+ responseHeaders(resp);
+ workbook.write(resp.getOutputStream());
}

- public void setView(View view) {
- this.view = view;
+ /* (non-Javadoc)
+ * @see org.jmesa.view.AbstractViewExporter#getContextType()
+ */
+ @Override
+ public String getContextType() {
+ return "application/vnd.ms-excel;charset=UTF-8";
}

- public void export()
- throws Exception {
- HSSFWorkbook workbook = (HSSFWorkbook) view.render();
- responseHeaders(response);
- workbook.write(response.getOutputStream());
- }
-
+ /* (non-Javadoc)
+ * @see org.jmesa.view.AbstractViewExporter#getExtesionName()
+ */
@Override
- public void responseHeaders(HttpServletResponse response)
- throws Exception {
- response.setContentType("application/vnd.ms-excel;charset=UTF-8");
- fileName = new String(fileName.getBytes(), "UTF-8");
- response.setHeader("Content-Disposition", "attachment;filename=\"" + fileName + "\"");
- response.setHeader("Cache-Control", "must-revalidate, post-check=0, pre-check=0");
- response.setHeader("Pragma", "public");
- response.setDateHeader("Expires", (System.currentTimeMillis() + 1000));
+ public String getExtesionName() {
+ return "xls";
}
+
+
}
Index: src/org/jmesa/view/excel/ExcelView.java
===================================================================
--- src/org/jmesa/view/excel/ExcelView.java (revision 2276)
+++ src/org/jmesa/view/excel/ExcelView.java (working copy)
@@ -19,13 +19,13 @@
import java.util.List;

import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.math.NumberUtils;
import org.apache.poi.hssf.usermodel.HSSFCell;
import org.apache.poi.hssf.usermodel.HSSFRichTextString;
import org.apache.poi.hssf.usermodel.HSSFRow;
import org.apache.poi.hssf.usermodel.HSSFSheet;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.jmesa.core.CoreContext;
+import org.jmesa.view.AbstractExportView;
import org.jmesa.view.View;
import org.jmesa.view.component.Column;
import org.jmesa.view.component.Row;
@@ -35,23 +35,12 @@
* @since 2.1
* @author jeff jie
*/
-public class ExcelView implements View {
- private Table table;
- private CoreContext coreContext;
+public class ExcelView extends AbstractExportView implements View {

public ExcelView(Table table, CoreContext coreContext) {
- this.table = table;
- this.coreContext = coreContext;
+ super(table,coreContext);
}

- public Table getTable() {
- return table;
- }
-
- public void setTable(Table table) {
- this.table = table;
- }
-
public byte[] getBytes() {
HSSFWorkbook render = (HSSFWorkbook) render();
return render.getBytes();
@@ -59,6 +48,7 @@

public Object render() {
HSSFWorkbook workbook = new HSSFWorkbook();
+ Table table = this.getTable();
String caption = table.getCaption();
if (StringUtils.isEmpty(caption)) {
caption = "JMesa Export";
@@ -78,7 +68,7 @@
}

// renderer body
- Collection<?> items = coreContext.getPageItems();
+ Collection<?> items = this.getPageItems();
int rowcount = 1;
for (Object item : items) {
HSSFRow r = sheet.createRow(rowcount++);
Index: src/org/jmesa/view/AbstractExportView.java
===================================================================
--- src/org/jmesa/view/AbstractExportView.java (revision 0)
+++ src/org/jmesa/view/AbstractExportView.java (revision 0)
@@ -0,0 +1,55 @@
+package org.jmesa.view;
+
+import java.util.Collection;
+
+import org.jmesa.core.CoreContext;
+import org.jmesa.view.component.Table;
+
+public abstract class AbstractExportView implements View {
+
+ private Table table;
+ private CoreContext coreContext;
+
+ protected AbstractExportView(Table table, CoreContext coreContext) {
+ this.table = table;
+ this.coreContext = coreContext;
+ }
+
+ /**
+ * @return the table
+ */
+ public Table getTable() {
+ return table;
+ }
+
+ /**
+ * @param table
+ * the table to set
+ */
+ public void setTable(Table table) {
+ this.table = table;
+ }
+
+ /**
+ * @return the coreContext
+ */
+ protected CoreContext getCoreContext() {
+ return coreContext;
+ }
+
+ /**
+ * @param coreContext
+ * the coreContext to set
+ */
+ protected void setCoreContext(CoreContext coreContext) {
+ this.coreContext = coreContext;
+ }
+
+ /**
+ * @return
+ * @see org.jmesa.core.Items#getPageItems()
+ */
+ public Collection<?> getPageItems() {
+ return coreContext.getPageItems();
+ }
+}
Index: src/org/jmesa/facade/TableFacadeImpl.java
===================================================================
--- src/org/jmesa/facade/TableFacadeImpl.java (revision 2276)
+++ src/org/jmesa/facade/TableFacadeImpl.java (working copy)
@@ -15,20 +15,18 @@
*/
package org.jmesa.facade;

-import static org.jmesa.limit.LimitConstants.LIMIT_ROWSELECT_MAXROWS;
-import static org.jmesa.facade.TableFacadeUtils.isTableRefreshing;
-
+import static org.jmesa.facade.TableFacadeExceptions.validateColumnPropertiesIsNotNull;
import static org.jmesa.facade.TableFacadeExceptions.validateCoreContextIsNull;
+import static org.jmesa.facade.TableFacadeExceptions.validateItemsIsNotNull;
+import static org.jmesa.facade.TableFacadeExceptions.validateItemsIsNull;
+import static org.jmesa.facade.TableFacadeExceptions.validateLimitIsNull;
+import static org.jmesa.facade.TableFacadeExceptions.validateRowSelectIsNotNull;
import static org.jmesa.facade.TableFacadeExceptions.validateTableIsNull;
+import static org.jmesa.facade.TableFacadeExceptions.validateToolbarIsNull;
import static org.jmesa.facade.TableFacadeExceptions.validateViewIsNull;
-import static org.jmesa.facade.TableFacadeExceptions.validateToolbarIsNull;
-import static org.jmesa.facade.TableFacadeExceptions.validateLimitIsNull;
-import static org.jmesa.facade.TableFacadeExceptions.validateColumnPropertiesIsNotNull;
-import static org.jmesa.facade.TableFacadeExceptions.validateRowSelectIsNotNull;
-import static org.jmesa.facade.TableFacadeExceptions.validateItemsIsNotNull;
-import static org.jmesa.facade.TableFacadeExceptions.validateItemsIsNull;
-
import static org.jmesa.facade.TableFacadeUtils.filterWorksheetItems;
+import static org.jmesa.facade.TableFacadeUtils.isTableRefreshing;
+import static org.jmesa.limit.LimitConstants.LIMIT_ROWSELECT_MAXROWS;

import java.util.Collection;
import java.util.HashMap;
@@ -56,6 +54,7 @@
import org.jmesa.limit.RowSelect;
import org.jmesa.limit.RowSelectImpl;
import org.jmesa.util.SupportUtils;
+import org.jmesa.view.AbstractExportView;
import org.jmesa.view.ExportTableFactory;
import org.jmesa.view.TableFactory;
import org.jmesa.view.View;
@@ -72,10 +71,10 @@
import org.jmesa.view.html.toolbar.Toolbar;
import org.jmesa.view.jexcel.JExcelView;
import org.jmesa.view.jexcel.JExcelViewExporter;
+import org.jmesa.view.pdf.PdfView;
+import org.jmesa.view.pdf.PdfViewExporter;
import org.jmesa.view.pdfp.PdfPView;
import org.jmesa.view.pdfp.PdfPViewExporter;
-import org.jmesa.view.pdf.PdfView;
-import org.jmesa.view.pdf.PdfViewExporter;
import org.jmesa.web.HttpServletRequestWebContext;
import org.jmesa.web.WebContext;
import org.jmesa.worksheet.Worksheet;
@@ -120,7 +119,7 @@
* <p>
* Create the table with the id.
* </p>
- *
+ *
* @param id The unique identifier for this table.
* @param request The servlet request object.
*/
@@ -506,8 +505,9 @@
return null;
}

- protected void renderExport(ExportType exportType, View view) {
+ protected void renderExport(ExportType exportType, View exportView) {
try {
+ AbstractExportView view = (AbstractExportView)exportView;
if (exportType == ExportType.CSV) {
new CsvViewExporter(view, response).export();
} else if (exportType == ExportType.EXCEL) {
Powered by Google Project Hosting