diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/ReportPane.java.todo b/ccm-cms/src/main/java/com/arsdigita/cms/ui/ReportPane.java similarity index 100% rename from ccm-cms/src/main/java/com/arsdigita/cms/ui/ReportPane.java.todo rename to ccm-cms/src/main/java/com/arsdigita/cms/ui/ReportPane.java diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/report/ContentSectionSummaryController.java.todo b/ccm-cms/src/main/java/com/arsdigita/cms/ui/report/ContentSectionSummaryController.java similarity index 100% rename from ccm-cms/src/main/java/com/arsdigita/cms/ui/report/ContentSectionSummaryController.java.todo rename to ccm-cms/src/main/java/com/arsdigita/cms/ui/report/ContentSectionSummaryController.java diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/report/ContentSectionSummaryReportTableModelBuilder.java.todo b/ccm-cms/src/main/java/com/arsdigita/cms/ui/report/ContentSectionSummaryReportTableModelBuilder.java.todo deleted file mode 100644 index 0c1b7a8ac..000000000 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/report/ContentSectionSummaryReportTableModelBuilder.java.todo +++ /dev/null @@ -1,251 +0,0 @@ -/* - * Copyright (C) 2009 Permeance Technologies Pty Ltd. All Rights Reserved. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ -package com.arsdigita.cms.ui.report; - -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -import com.arsdigita.bebop.PageState; -import com.arsdigita.bebop.Table; -import com.arsdigita.bebop.table.AbstractTableModelBuilder; -import com.arsdigita.bebop.table.TableModel; -import com.arsdigita.cms.CMS; -import org.librecms.contentsection.Folder; - -/** - * TableModelBuilder that creates a model for the content section summary - * report. - * - * @author - * thomas-buckel - * @author Jens Pelzetter - */ -public class ContentSectionSummaryReportTableModelBuilder - extends AbstractTableModelBuilder { - - @Override - public TableModel makeModel(final Table table, final PageState state) { - - - Session session = SessionManager.getSession(); - DataQuery query = session.retrieveQuery( - "com.arsdigita.cms.getContentSectionSummary"); - query.setParameter("sectionId", CMS.getContext().getContentSection() - .getID()); - return new CSSRModel(new DataQueryDataCollectionAdapter(query, "folder")); - } - - /** - * Generates a table model by combining a list of top level folder (content - * items) with statistics about content items with in the folder in draft - * and live versions. - */ - private class CSSRModel implements TableModel { - - private final DataCollection m_folders; - - private String m_folderName; - - private BigDecimal m_subfolderCount; - - private ContentTypeStatistics m_currentStatsRow; - - private Iterator m_contentTypeStatIter; - - CSSRModel(DataCollection folders) { - m_folders = folders; - } - - @Override - public final int getColumnCount() { - return 5; - } - - /** - * Combines an 'outer' iterator over the given DataCollection with an - * 'inner' iterator that contains rows for each row of the outer - * collection. {@inheritDoc} - */ - @Override - public final boolean nextRow() { - if ((m_contentTypeStatIter == null) && m_folders.next()) { - m_folderName = (String) m_folders.get("folder"); - m_subfolderCount = (BigDecimal) m_folders.get("subfolderCount"); - Folder draftFolder = new Folder((BigDecimal) m_folders.get( - "folderId")); - - m_contentTypeStatIter = retrieveContentTypeStats(draftFolder); - if (m_contentTypeStatIter.hasNext()) { - m_currentStatsRow = m_contentTypeStatIter.next(); - } else { - // Rather than recursing into nextRow() again, a m_currentStatsRow == null - // is rendered to show one row for the folder but with no content type or values. - m_contentTypeStatIter = null; - m_currentStatsRow = null; - } - return true; - } else if (m_contentTypeStatIter != null) { - if (m_contentTypeStatIter.hasNext()) { - m_currentStatsRow = m_contentTypeStatIter.next(); - } else { - m_contentTypeStatIter = null; - return nextRow(); - } - return true; - } else { - m_folders.close(); - return false; - } - } - - @Override - public final Object getKeyAt(final int column) { - return -1; - } - - @Override - public final Object getElementAt(final int column) { - switch (column) { - case 0: - return m_folderName; - case 1: - return m_subfolderCount.toString(); - case 2: - return (m_currentStatsRow != null) ? m_currentStatsRow - .getContentType() : "N/A"; - case 3: - return (m_currentStatsRow != null) ? m_currentStatsRow - .getDraftCount() : "N/A"; - case 4: - return (m_currentStatsRow != null) ? m_currentStatsRow - .getLiveCount() : "N/A"; - default: - throw new IllegalArgumentException("Illegal column index " - + column); - } - } - - /** - * Retrieve a list of content types used within a folder and for each - * content type the number of draft and live content items of this type. - * - * @param draftFolder Draft folder to retrieve stats for. - * - * @return Iterator over the retrieved statistics. Empty iterator with - * no results where found. - */ - private Iterator retrieveContentTypeStats( - Folder draftFolder) { - - Session session = SessionManager.getSession(); - - // Query the number of content items per content type for drafts - DataQuery query = session.retrieveQuery( - "com.arsdigita.cms.getContentTypeCountPerFolder"); - query.setParameter("folderId", draftFolder.getID()); - DataCollection types = new DataQueryDataCollectionAdapter(query, - "types"); - Map draftContentTypeCounts - = new HashMap(); - try { - while (types.next()) { - draftContentTypeCounts - .put((String) types.get("contentType"), (Long) types - .get("typeCount")); - } - } finally { - types.close(); - } - - // If there's a live version of the folder, query the number of content items per content type for it - // and merge both draft and live numbers - List result - = new ArrayList(); - Folder liveFolder = (Folder) draftFolder.getLiveVersion(); - if (liveFolder != null) { - query = session.retrieveQuery( - "com.arsdigita.cms.getContentTypeCountPerFolder"); - query.setParameter("folderId", liveFolder.getID()); - types = new DataQueryDataCollectionAdapter(query, "types"); - try { - while (types.next()) { - String contentType = (String) types.get("contentType"); - long draftCount = (draftContentTypeCounts.get( - contentType) != null) - ? draftContentTypeCounts - .get(contentType) : 0; - long liveCount = (Long) types.get("typeCount"); - result.add(new ContentTypeStatistics(contentType, - draftCount, - liveCount)); - draftContentTypeCounts.remove(contentType); - } - } finally { - types.close(); - } - } - - // Add all draft stats that haven't been merged - for (Map.Entry draftCount : draftContentTypeCounts - .entrySet()) { - result.add(new ContentTypeStatistics(draftCount.getKey(), - draftCount.getValue(), 0)); - } - - return result.iterator(); - } - - } - - /** - * Value object that holds content type statistics for a folder. - */ - private static class ContentTypeStatistics { - - private final String m_contentType; - - private final long m_draftCount; - - private final long m_liveCount; - - public ContentTypeStatistics(String contentType, long draftCount, - long liveCount) { - m_contentType = contentType; - m_draftCount = draftCount; - m_liveCount = liveCount; - } - - public String getContentType() { - return m_contentType; - } - - public long getDraftCount() { - return m_draftCount; - } - - public long getLiveCount() { - return m_liveCount; - } - - } - -} diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/report/ContentSectionSummaryTable.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/report/ContentSectionSummaryTable.java new file mode 100644 index 000000000..a1c7b27a6 --- /dev/null +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/report/ContentSectionSummaryTable.java @@ -0,0 +1,75 @@ +/* + * Copyright (C) 2009 Permeance Technologies Pty Ltd. All Rights Reserved. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * as published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +package com.arsdigita.cms.ui.report; + +import com.arsdigita.bebop.Label; +import com.arsdigita.bebop.Table; +import com.arsdigita.bebop.table.TableColumn; +import com.arsdigita.bebop.table.TableColumnModel; +import com.arsdigita.globalization.GlobalizedMessage; +import org.librecms.CmsConstants; + +/** + * Table component for content section summary report. + * + * @author + * thomas-buckel + */ +public class ContentSectionSummaryTable extends Table { + + public static final int COL_FOLDER_NAME = 0; + public static final int COL_SUBFOLDER_COUNT = 1; + public static final int COL_CONTENT_TYPE = 2; + public static final int COL_DRAFT_COUNT = 3; + public static final int COL_LIVE_COUNT = 4; + + public ContentSectionSummaryTable() { + super(); + + setModelBuilder(new ContentSectionSummaryTableModelBuilder()); + + final TableColumnModel columnModel = getColumnModel(); + columnModel.add(new TableColumn( + COL_FOLDER_NAME, + new Label(new GlobalizedMessage("cms.ui.reports.css.folder", + CmsConstants.CMS_BUNDLE)))); + columnModel.add(new TableColumn( + COL_SUBFOLDER_COUNT, + new Label(new GlobalizedMessage( + "cms.ui.reports.css.subfolderCount", + CmsConstants.CMS_BUNDLE)))); + columnModel.add(new TableColumn( + COL_CONTENT_TYPE, + new Label( + new GlobalizedMessage("cms.ui.reports.css.contentType", + CmsConstants.CMS_BUNDLE)))); + columnModel.add(new TableColumn( + COL_DRAFT_COUNT, + new Label(new GlobalizedMessage("cms.ui.reports.css.draft", + CmsConstants.CMS_BUNDLE)))); + columnModel.add(new TableColumn( + COL_LIVE_COUNT, + new Label(new GlobalizedMessage("cms.ui.reports.css.live", + CmsConstants.CMS_BUNDLE)))); + + setEmptyView(new Label(new GlobalizedMessage( + "cms.ui.reports.css.emptyResult", + CmsConstants.CMS_BUNDLE))); + } + +} diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/report/ContentSectionSummaryTable.java.todo b/ccm-cms/src/main/java/com/arsdigita/cms/ui/report/ContentSectionSummaryTable.java.todo deleted file mode 100644 index 63b5d7f44..000000000 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/report/ContentSectionSummaryTable.java.todo +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (C) 2009 Permeance Technologies Pty Ltd. All Rights Reserved. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ -package com.arsdigita.cms.ui.report; - -import com.arsdigita.bebop.Label; -import com.arsdigita.bebop.Table; - -/** - * Table component for content section summary report. - * - * @author - * thomas-buckel - */ -public class ContentSectionSummaryTable extends Table { - - public static final int COL_FOLDER_NAME = 0; - public static final int COL_SUBFOLDER_COUNT = 1; - public static final int COL_CONTENT_TYPE = 2; - public static final int COL_DRAFT_COUNT = 3; - public static final int COL_LIVE_COUNT = 4; - - private static final String[] s_fixedReportColumns = new String[]{ - lz("cms.ui.reports.css.folder"), - lz("cms.ui.reports.css.subfolderCount"), - lz("cms.ui.reports.css.contentType"), - lz("cms.ui.reports.css.draft"), - lz("cms.ui.reports.css.live"),}; - - public ContentSectionSummaryTable() { - super(new ContentSectionSummaryReportTableModelBuilder(), - s_fixedReportColumns); - setEmptyView(new Label(lz("cms.ui.reports.css.emptyResult"))); - } - - private static String lz(final String key) { - return (String) GlobalizationUtil.globalize(key).localize(); - } - -} diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/report/ContentSectionSummaryTableModel.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/report/ContentSectionSummaryTableModel.java new file mode 100644 index 000000000..82a36270d --- /dev/null +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/report/ContentSectionSummaryTableModel.java @@ -0,0 +1,82 @@ +/* + * Copyright (C) 2017 LibreCCM Foundation. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301 USA + */ +package com.arsdigita.cms.ui.report; + +import com.arsdigita.bebop.table.RowData; +import com.arsdigita.bebop.table.TableModel; +import java.util.Iterator; +import java.util.List; + +/** + * + * @author Jens Pelzetter + */ +class ContentSectionSummaryTableModel implements TableModel { + + private final Iterator> iterator; + private RowData currentRow; + + protected ContentSectionSummaryTableModel(final List> rows) { + iterator = rows.iterator(); + } + + @Override + public int getColumnCount() { + return 5; + } + + @Override + public boolean nextRow() { + if (iterator.hasNext()) { + currentRow = iterator.next(); + return true; + } else { + return false; + } + } + + @Override + public Object getElementAt(final int columnIndex) { + switch (columnIndex) { + case ContentSectionSummaryTable.COL_FOLDER_NAME: + return currentRow.getColData( + ContentSectionSummaryTable.COL_FOLDER_NAME); + case ContentSectionSummaryTable.COL_SUBFOLDER_COUNT: + return currentRow.getColData( + ContentSectionSummaryTable.COL_SUBFOLDER_COUNT); + case ContentSectionSummaryTable.COL_CONTENT_TYPE: + return currentRow.getColData( + ContentSectionSummaryTable.COL_CONTENT_TYPE); + case ContentSectionSummaryTable.COL_DRAFT_COUNT: + return currentRow.getColData( + ContentSectionSummaryTable.COL_DRAFT_COUNT); + case ContentSectionSummaryTable.COL_LIVE_COUNT: + return currentRow.getColData( + ContentSectionSummaryTable.COL_LIVE_COUNT); + default: + throw new IllegalArgumentException("Invalid column index"); + } + } + + @Override + public Object getKeyAt(final int columnIndex) { + return currentRow.getRowKey(); + } + +} diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/report/ContentSectionSummaryTableModelBuilder.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/report/ContentSectionSummaryTableModelBuilder.java new file mode 100644 index 000000000..92c180cc7 --- /dev/null +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/report/ContentSectionSummaryTableModelBuilder.java @@ -0,0 +1,55 @@ +/* + * Copyright (C) 2009 Permeance Technologies Pty Ltd. All Rights Reserved. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * as published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +package com.arsdigita.cms.ui.report; + +import java.util.List; + +import com.arsdigita.bebop.PageState; +import com.arsdigita.bebop.Table; +import com.arsdigita.bebop.table.AbstractTableModelBuilder; +import com.arsdigita.bebop.table.RowData; +import com.arsdigita.bebop.table.TableModel; +import com.arsdigita.cms.CMS; +import org.libreccm.cdi.utils.CdiUtil; +import org.librecms.contentsection.ContentSection; + +/** + * TableModelBuilder that creates a model for the content section summary + * report. + * + * @author + * thomas-buckel + * @author Jens Pelzetter + */ +class ContentSectionSummaryTableModelBuilder + extends AbstractTableModelBuilder { + + @Override + public TableModel makeModel(final Table table, final PageState state) { + + final ContentSection section = CMS.getContext().getContentSection(); + + final CdiUtil cdiUtil = CdiUtil.createCdiUtil(); + final ContentSectionSummaryController controller = cdiUtil.findBean( + ContentSectionSummaryController.class); + + final List> rows = controller.createReportData(section); + + return new ContentSectionSummaryTableModel(rows); + } +}