From 18414f374a4ff6222812fd6da13104b95c0432ae Mon Sep 17 00:00:00 2001 From: pb Date: Sat, 26 Jan 2013 12:34:36 +0000 Subject: [PATCH] =?UTF-8?q?Bereinigen=20Code,=20beseitigen=20Bez=C3=BCge?= =?UTF-8?q?=20auf=20SiteNode/Package/PackageType=20und=20weiteren=20old=20?= =?UTF-8?q?style=20application=20code.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.libreccm.org/ccm/trunk@2051 8810af33-2d31-482b-a856-94f89814c4df --- .../simplesurvey/SimpleSurveyUtil.java | 55 +++--- .../com/arsdigita/simplesurvey/Survey.java | 10 +- .../ui/admin/AdminSurveyTable.java | 85 +++++---- .../simplesurvey/ui/admin/PropertiesForm.java | 180 +++++++++++------- 4 files changed, 196 insertions(+), 134 deletions(-) diff --git a/ccm-simplesurvey/src/com/arsdigita/simplesurvey/SimpleSurveyUtil.java b/ccm-simplesurvey/src/com/arsdigita/simplesurvey/SimpleSurveyUtil.java index 7ee9441fc..5ccb2e528 100755 --- a/ccm-simplesurvey/src/com/arsdigita/simplesurvey/SimpleSurveyUtil.java +++ b/ccm-simplesurvey/src/com/arsdigita/simplesurvey/SimpleSurveyUtil.java @@ -21,8 +21,8 @@ package com.arsdigita.simplesurvey; import com.arsdigita.bebop.PageState; -import com.arsdigita.kernel.PackageInstance; -import com.arsdigita.kernel.SiteNode; +// import com.arsdigita.kernel.PackageInstance; +// import com.arsdigita.kernel.SiteNode; import com.arsdigita.kernel.Kernel; import com.arsdigita.kernel.User; @@ -30,9 +30,8 @@ import com.arsdigita.kernel.User; import com.arsdigita.kernel.permissions.PermissionDescriptor; import com.arsdigita.kernel.permissions.PermissionService; import com.arsdigita.kernel.permissions.PrivilegeDescriptor; - - -import javax.servlet.http.HttpServletRequest; +import com.arsdigita.web.Application; +// import com.arsdigita.web.Web; /** @@ -51,35 +50,35 @@ public class SimpleSurveyUtil { * @param request * @return */ - public static SiteNode getSiteNode(HttpServletRequest request) { +// public static SiteNode getSiteNode(HttpServletRequest request) { - SiteNode siteNode; - try { - siteNode = SiteNode.getSiteNode(request.getRequestURI().toString(), true); - } catch (com.arsdigita.domain.DataObjectNotFoundException e) { - throw new com.arsdigita.util.UncheckedWrapperException(e); - } +// SiteNode siteNode; +// try { +// siteNode = SiteNode.getSiteNode(request.getRequestURI().toString(), true); +// } catch (com.arsdigita.domain.DataObjectNotFoundException e) { +// throw new com.arsdigita.util.UncheckedWrapperException(e); +// } - return siteNode; - } +// return siteNode; +// } /** * * @param pageState * @return */ - public static SiteNode getSiteNode(PageState pageState) { - return getSiteNode(pageState.getRequest()); - } +// public static SiteNode getSiteNode(PageState pageState) { +// return getSiteNode(pageState.getRequest()); +// } /** * * @param pageState * @return */ - public static PackageInstance getPackageInstance(PageState pageState) { - return getSiteNode(pageState).getPackageInstance(); - } +// public static PackageInstance getPackageInstance(PageState pageState) { +// return getSiteNode(pageState).getPackageInstance(); +// } /** * @@ -87,15 +86,27 @@ public class SimpleSurveyUtil { * @return */ public static boolean isUserAdmin(PageState pageState) { + boolean admin_p = false; User user = (User)Kernel.getContext().getParty(); - SiteNode siteNode = SimpleSurveyUtil.getSiteNode(pageState); + // DEPRECATED! SiteNode is old style application an no longer used. + // Can not provide any useful information as no applicagtion is created + // as a SiteNode anymore. + // SiteNode siteNode = SimpleSurveyUtil.getSiteNode(pageState); + // PermissionDescriptor admin = new PermissionDescriptor + // (PrivilegeDescriptor.ADMIN, + // siteNode, + // user); + + // TODO: Replacement code not tested yet (both alternatives)! + // Application app = Web.getContext().getApplication(); + Application app = (Application)Kernel.getContext().getResource(); PermissionDescriptor admin = new PermissionDescriptor (PrivilegeDescriptor.ADMIN, - siteNode, + app, user); if (PermissionService.checkPermission(admin)) { diff --git a/ccm-simplesurvey/src/com/arsdigita/simplesurvey/Survey.java b/ccm-simplesurvey/src/com/arsdigita/simplesurvey/Survey.java index 32ff3b0c1..d12d41d4d 100755 --- a/ccm-simplesurvey/src/com/arsdigita/simplesurvey/Survey.java +++ b/ccm-simplesurvey/src/com/arsdigita/simplesurvey/Survey.java @@ -34,7 +34,7 @@ import com.arsdigita.formbuilder.PersistentForm; import com.arsdigita.kernel.ACSObject; import com.arsdigita.kernel.User; -import com.arsdigita.kernel.PackageInstance; +// import com.arsdigita.kernel.PackageInstance; import java.util.Date; @@ -196,10 +196,10 @@ public class Survey extends ACSObject { getEndDate().compareTo(currentDate) > 0; } - public void setPackageInstance(PackageInstance packageInstance) { - - set(PACKAGE_INSTANCE, packageInstance); - } +// Mo longer useful. PackageInstance is old style app no longer used. +// public void setPackageInstance(PackageInstance packageInstance) { +// set(PACKAGE_INSTANCE, packageInstance); +// } /* * Retrieves most recent survey that isn't completed diff --git a/ccm-simplesurvey/src/com/arsdigita/simplesurvey/ui/admin/AdminSurveyTable.java b/ccm-simplesurvey/src/com/arsdigita/simplesurvey/ui/admin/AdminSurveyTable.java index 81a41271b..e10775739 100755 --- a/ccm-simplesurvey/src/com/arsdigita/simplesurvey/ui/admin/AdminSurveyTable.java +++ b/ccm-simplesurvey/src/com/arsdigita/simplesurvey/ui/admin/AdminSurveyTable.java @@ -23,31 +23,24 @@ import com.arsdigita.simplesurvey.util.GlobalizationUtil ; // Every item in the Table will have links +import com.arsdigita.bebop.Component; import com.arsdigita.bebop.ControlLink; import com.arsdigita.bebop.Label; - +import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.Table; import com.arsdigita.bebop.table.TableModelBuilder; import com.arsdigita.bebop.table.TableModel; import com.arsdigita.bebop.table.TableCellRenderer; - -import com.arsdigita.simplesurvey.SimpleSurveyUtil; - +import com.arsdigita.formbuilder.PersistentForm; import com.arsdigita.kernel.ACSObject; -import com.arsdigita.kernel.PackageInstance; - -import com.arsdigita.bebop.Component; - +// import com.arsdigita.simplesurvey.SimpleSurveyUtil; import com.arsdigita.simplesurvey.Survey; import com.arsdigita.simplesurvey.SurveyCollection; -import com.arsdigita.formbuilder.PersistentForm; +import com.arsdigita.util.LockableImpl; import org.apache.log4j.Logger; -import com.arsdigita.bebop.PageState; -import com.arsdigita.util.LockableImpl; - /** * Tables all Simple Surveys in the system. * @@ -71,38 +64,64 @@ public class AdminSurveyTable extends Table { public static final int COL_DELETE = 7; + /** + * Constructor. + * + * @param surveyClass + */ public AdminSurveyTable(Class surveyClass) { + super(new AdminSurveyTableModelBuilder(surveyClass), - new String[] {"", "", "", "", "", "","", ""}); - - m_surveyClass = surveyClass; + new String[] {"", "", "", "", "", "","", ""}); + m_surveyClass = surveyClass; setDefaultCellRenderer(new AdminSurveyTableCellRenderer()); } - private static class AdminSurveyTableModelBuilder extends LockableImpl - implements TableModelBuilder { - - private Class m_surveyClass; - - public AdminSurveyTableModelBuilder(Class surveyClass) { - m_surveyClass = surveyClass; - } + /** + * + */ + private static class AdminSurveyTableModelBuilder + extends LockableImpl + implements TableModelBuilder { - public TableModel makeModel(Table l, PageState pageState) { - PackageInstance pack = SimpleSurveyUtil.getPackageInstance(pageState); - SurveyCollection surveys = - Survey.retrieveAll(); + private Class m_surveyClass; + + /** + * + * @param surveyClass + */ + public AdminSurveyTableModelBuilder(Class surveyClass) { + m_surveyClass = surveyClass; + } + + /** + * + * @param l + * @param pageState + * @return + */ + public TableModel makeModel(Table l, PageState pageState) { + + // PackageInstance no loger provides useful information. + // Obviously not really used here. + // NOT TESTED yet! + // PackageInstance pack = SimpleSurveyUtil.getPackageInstance(pageState); + + SurveyCollection surveys = Survey.retrieveAll(); - surveys.addEqualsFilter(ACSObject.DEFAULT_DOMAIN_CLASS, - m_surveyClass.getName()); - - return new AdminSurveyTableModel(surveys); - } + surveys.addEqualsFilter(ACSObject.DEFAULT_DOMAIN_CLASS, + m_surveyClass.getName()); + return new AdminSurveyTableModel(surveys); + } } + /** + * + */ private static class AdminSurveyTableCellRenderer implements TableCellRenderer { - public Component getComponent(Table table, PageState state, Object value, + + public Component getComponent(Table table, PageState state, Object value, boolean isSelected, Object key, int row, int column) { Survey survey = (Survey)value; diff --git a/ccm-simplesurvey/src/com/arsdigita/simplesurvey/ui/admin/PropertiesForm.java b/ccm-simplesurvey/src/com/arsdigita/simplesurvey/ui/admin/PropertiesForm.java index f3299a7e0..a9dbebc6c 100755 --- a/ccm-simplesurvey/src/com/arsdigita/simplesurvey/ui/admin/PropertiesForm.java +++ b/ccm-simplesurvey/src/com/arsdigita/simplesurvey/ui/admin/PropertiesForm.java @@ -19,12 +19,10 @@ package com.arsdigita.simplesurvey.ui.admin; -import com.arsdigita.simplesurvey.util.GlobalizationUtil ; import com.arsdigita.bebop.event.FormSectionEvent; import com.arsdigita.bebop.event.FormProcessListener; import com.arsdigita.bebop.event.FormInitListener; - import com.arsdigita.bebop.parameters.NotWhiteSpaceValidationListener; import com.arsdigita.bebop.Form; import com.arsdigita.bebop.FormProcessException; @@ -42,13 +40,18 @@ import com.arsdigita.formbuilder.PersistentForm; import com.arsdigita.simplesurvey.Survey; import com.arsdigita.simplesurvey.Poll; -import com.arsdigita.simplesurvey.SimpleSurveyUtil; +// import com.arsdigita.simplesurvey.SimpleSurveyUtil; import com.arsdigita.simplesurvey.ui.SurveySelectionModel; +import com.arsdigita.simplesurvey.util.GlobalizationUtil ; import java.util.Calendar; import java.util.GregorianCalendar; -import java.lang.Boolean; + +/** + * + * + */ public class PropertiesForm extends Form { private SurveySelectionModel m_survey; @@ -117,82 +120,111 @@ public class PropertiesForm extends Form { } - private class SurveyInitListener implements FormInitListener { - public void init(FormSectionEvent e) - throws FormProcessException { - PageState state = e.getPageState(); - - if (m_survey.isSelected(state)) { - Survey survey = m_survey.getSelectedSurvey(state); - PersistentForm form = survey.getForm(); - - m_surveyName.setValue(state, form.getAdminName()); - m_description.setValue(state, form.getDescription()); - m_startDate.setValue(state, survey.getStartDate()); - m_endDate.setValue(state, survey.getEndDate()); - m_quizType.setValue(state, survey.getQuizType()); - if ( survey.responsesArePublic() ) { - m_responsesPublic.setValue(state, "true"); - } else { - m_responsesPublic.setValue(state,"false"); - } - } else { - m_surveyName.setValue(state, ""); - m_description.setValue(state, ""); - Calendar startCalendar = new GregorianCalendar(); - startCalendar.add(Calendar.DATE, 0); - java.util.Date startDate = startCalendar.getTime(); - Calendar endCalendar = new GregorianCalendar(); - endCalendar.add(Calendar.DATE, 15); - java.util.Date endDate = endCalendar.getTime(); - - m_startDate.setValue(state, startDate); - m_endDate.setValue(state, endDate); - m_responsesPublic.setValue(state, "true"); - m_quizType.setValue(state, "knowledge_test"); - } - } + + /** + * + */ + private class SurveyInitListener implements FormInitListener { + + /** + * + * @param e + * @throws FormProcessException + */ + public void init(FormSectionEvent e) throws FormProcessException { + + PageState state = e.getPageState(); + + if (m_survey.isSelected(state)) { + + Survey survey = m_survey.getSelectedSurvey(state); + PersistentForm form = survey.getForm(); + m_surveyName.setValue(state, form.getAdminName()); + m_description.setValue(state, form.getDescription()); + m_startDate.setValue(state, survey.getStartDate()); + m_endDate.setValue(state, survey.getEndDate()); + m_quizType.setValue(state, survey.getQuizType()); + if ( survey.responsesArePublic() ) { + m_responsesPublic.setValue(state, "true"); + } else { + m_responsesPublic.setValue(state,"false"); + } + + } else { + + m_surveyName.setValue(state, ""); + m_description.setValue(state, ""); + Calendar startCalendar = new GregorianCalendar(); + startCalendar.add(Calendar.DATE, 0); + java.util.Date startDate = startCalendar.getTime(); + Calendar endCalendar = new GregorianCalendar(); + endCalendar.add(Calendar.DATE, 15); + java.util.Date endDate = endCalendar.getTime(); + + m_startDate.setValue(state, startDate); + m_endDate.setValue(state, endDate); + m_responsesPublic.setValue(state, "true"); + m_quizType.setValue(state, "knowledge_test"); + } + } } - private class PropertiesFormProcessListener implements FormProcessListener { - public void process(FormSectionEvent e) - throws FormProcessException { - PageState state = e.getPageState(); - - Survey survey; - PersistentForm form; - - if (m_survey.isSelected(state)) { - survey = m_survey.getSelectedSurvey(state); - form = survey.getForm(); - } else { - survey = m_type.equals(Survey.class) ? new Survey() : new Poll(); - survey.setPackageInstance(SimpleSurveyUtil.getPackageInstance(state)); - form = new PersistentForm(); - survey.setForm(form); - } - - form.setAdminName((String)m_surveyName.getValue(state)); - form.setHTMLName(getHTMLName((String)m_surveyName.getValue(state))); - form.setDescription((String)m_description.getValue(state)); - form.save(); - - survey.setStartDate((java.util.Date)m_startDate.getValue(state)); - survey.setEndDate((java.util.Date)m_endDate.getValue(state)); - survey.setResponsesPublic(new Boolean((String) m_responsesPublic.getValue(state))); - survey.setQuizType((String) m_quizType.getValue(state)); - survey.save(); - } - private String getHTMLName(String surveyName) { + + /** + * + */ + private class PropertiesFormProcessListener implements FormProcessListener { + + /** + * + * @param e + * @throws FormProcessException + */ + public void process(FormSectionEvent e) throws FormProcessException { + + PageState state = e.getPageState(); + + Survey survey; + PersistentForm form; - String htmlName = surveyName.trim().toLowerCase(); + if (m_survey.isSelected(state)) { + survey = m_survey.getSelectedSurvey(state); + form = survey.getForm(); + } else { + survey = m_type.equals(Survey.class) ? new Survey() : new Poll(); + + // PackageInstance is old style application, no longer used. + // survey.setPackageInstance(SimpleSurveyUtil.getPackageInstance(state)); + + form = new PersistentForm(); + survey.setForm(form); + } - htmlName = htmlName.replace(' ', '_'); - - return htmlName; - } + form.setAdminName((String)m_surveyName.getValue(state)); + form.setHTMLName(getHTMLName((String)m_surveyName.getValue(state))); + form.setDescription((String)m_description.getValue(state)); + form.save(); + + survey.setStartDate((java.util.Date)m_startDate.getValue(state)); + survey.setEndDate((java.util.Date)m_endDate.getValue(state)); + survey.setResponsesPublic(new Boolean((String) m_responsesPublic.getValue(state))); + survey.setQuizType((String) m_quizType.getValue(state)); + survey.save(); + } + + /** + * + * @param surveyName + * @return + */ + private String getHTMLName(String surveyName) { + String htmlName = surveyName.trim().toLowerCase(); + htmlName = htmlName.replace(' ', '_'); + + return htmlName; + } } }