From 2a121e0affb82244a88f3cb1df0924258ea596ad Mon Sep 17 00:00:00 2001 From: pb Date: Sun, 10 Feb 2013 16:55:01 +0000 Subject: [PATCH] Removed just another bunch of unused code. git-svn-id: https://svn.libreccm.org/ccm/trunk@2066 8810af33-2d31-482b-a856-94f89814c4df --- .../unsupported/admin-ui}/AddGrantForm.java | 0 .../admin-ui}/ErrorMessageDisplay.java | 0 .../unsupported/admin-ui}/Grant.java | 0 .../unsupported/admin-ui}/GrantsTable.java | 0 .../unsupported/admin-ui}/Icons.java | 0 .../admin-ui}/ParticipantBrowsePane.java | 0 .../admin-ui}/ParticipantDisplay.java | 0 .../admin-ui}/ParticipantEdit.java | 0 .../admin-ui}/ParticipantListModel.java | 0 .../admin-ui}/ParticipantModel.java | 0 .../admin-ui}/PartyPermissionEdit.java | 0 .../unsupported/admin-ui}/PeoplePane.java | 15 ++++ .../admin-ui}/PrivilegeSingleSelect.java | 0 .../admin-ui}/WorkspacePermissionsPane.java | 1 + .../unsupported/admin-ui}/edit.jsp | 0 .../unsupported}/ui/ColorPicker.java | 0 .../ApplicationSelectionModel.java | 38 +++++----- .../portalworkspace/ui/PortalHelper.java | 2 +- .../ui/WorkspaceComponent.java | 4 ++ .../portalworkspace/ui/admin/AdminPane.java | 11 ++- .../ui/admin/CategoryComponent.java | 1 + .../ui/admin/CategoryTable.java | 1 + .../ui/admin/DeleteApplicationComponent.java | 1 + .../ui/admin/WorkspaceConfigFormSection.java | 11 +++ .../ApplicationDetails.java | 47 +++++++----- .../{admin => sitemap}/ApplicationList.java | 11 +-- .../{admin => sitemap}/ApplicationPane.java | 3 +- .../NewApplicationForm.java | 72 +++++++++++-------- .../ui/{admin => sitemap}/SiteMapPane.java | 3 +- 29 files changed, 144 insertions(+), 77 deletions(-) rename ccm-portalworkspace/{src/com/arsdigita/portalworkspace/ui/admin => doc/unsupported/admin-ui}/AddGrantForm.java (100%) rename ccm-portalworkspace/{src/com/arsdigita/portalworkspace/ui/admin => doc/unsupported/admin-ui}/ErrorMessageDisplay.java (100%) rename ccm-portalworkspace/{src/com/arsdigita/portalworkspace/ui/admin => doc/unsupported/admin-ui}/Grant.java (100%) rename ccm-portalworkspace/{src/com/arsdigita/portalworkspace/ui/admin => doc/unsupported/admin-ui}/GrantsTable.java (100%) rename ccm-portalworkspace/{src/com/arsdigita/portalworkspace/ui => doc/unsupported/admin-ui}/Icons.java (100%) rename ccm-portalworkspace/{src/com/arsdigita/portalworkspace/ui => doc/unsupported/admin-ui}/ParticipantBrowsePane.java (100%) rename ccm-portalworkspace/{src/com/arsdigita/portalworkspace/ui => doc/unsupported/admin-ui}/ParticipantDisplay.java (100%) rename ccm-portalworkspace/{src/com/arsdigita/portalworkspace/ui => doc/unsupported/admin-ui}/ParticipantEdit.java (100%) rename ccm-portalworkspace/{src/com/arsdigita/portalworkspace/ui => doc/unsupported/admin-ui}/ParticipantListModel.java (100%) rename ccm-portalworkspace/{src/com/arsdigita/portalworkspace/ui => doc/unsupported/admin-ui}/ParticipantModel.java (100%) rename ccm-portalworkspace/{src/com/arsdigita/portalworkspace/ui/admin => doc/unsupported/admin-ui}/PartyPermissionEdit.java (100%) rename ccm-portalworkspace/{src/com/arsdigita/portalworkspace/ui/admin => doc/unsupported/admin-ui}/PeoplePane.java (97%) rename ccm-portalworkspace/{src/com/arsdigita/portalworkspace/ui/admin => doc/unsupported/admin-ui}/PrivilegeSingleSelect.java (100%) rename ccm-portalworkspace/{src/com/arsdigita/portalworkspace/ui/admin => doc/unsupported/admin-ui}/WorkspacePermissionsPane.java (97%) rename ccm-portalworkspace/{web/templates/ccm-portalworkspace/admin => doc/unsupported/admin-ui}/edit.jsp (100%) rename ccm-portalworkspace/{src/com/arsdigita/portalworkspace => doc/unsupported}/ui/ColorPicker.java (100%) rename ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/{admin => }/ApplicationSelectionModel.java (83%) rename ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/{admin => sitemap}/ApplicationDetails.java (58%) rename ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/{admin => sitemap}/ApplicationList.java (96%) rename ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/{admin => sitemap}/ApplicationPane.java (98%) rename ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/{admin => sitemap}/NewApplicationForm.java (51%) rename ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/{admin => sitemap}/SiteMapPane.java (95%) diff --git a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/AddGrantForm.java b/ccm-portalworkspace/doc/unsupported/admin-ui/AddGrantForm.java similarity index 100% rename from ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/AddGrantForm.java rename to ccm-portalworkspace/doc/unsupported/admin-ui/AddGrantForm.java diff --git a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/ErrorMessageDisplay.java b/ccm-portalworkspace/doc/unsupported/admin-ui/ErrorMessageDisplay.java similarity index 100% rename from ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/ErrorMessageDisplay.java rename to ccm-portalworkspace/doc/unsupported/admin-ui/ErrorMessageDisplay.java diff --git a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/Grant.java b/ccm-portalworkspace/doc/unsupported/admin-ui/Grant.java similarity index 100% rename from ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/Grant.java rename to ccm-portalworkspace/doc/unsupported/admin-ui/Grant.java diff --git a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/GrantsTable.java b/ccm-portalworkspace/doc/unsupported/admin-ui/GrantsTable.java similarity index 100% rename from ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/GrantsTable.java rename to ccm-portalworkspace/doc/unsupported/admin-ui/GrantsTable.java diff --git a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/Icons.java b/ccm-portalworkspace/doc/unsupported/admin-ui/Icons.java similarity index 100% rename from ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/Icons.java rename to ccm-portalworkspace/doc/unsupported/admin-ui/Icons.java diff --git a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/ParticipantBrowsePane.java b/ccm-portalworkspace/doc/unsupported/admin-ui/ParticipantBrowsePane.java similarity index 100% rename from ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/ParticipantBrowsePane.java rename to ccm-portalworkspace/doc/unsupported/admin-ui/ParticipantBrowsePane.java diff --git a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/ParticipantDisplay.java b/ccm-portalworkspace/doc/unsupported/admin-ui/ParticipantDisplay.java similarity index 100% rename from ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/ParticipantDisplay.java rename to ccm-portalworkspace/doc/unsupported/admin-ui/ParticipantDisplay.java diff --git a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/ParticipantEdit.java b/ccm-portalworkspace/doc/unsupported/admin-ui/ParticipantEdit.java similarity index 100% rename from ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/ParticipantEdit.java rename to ccm-portalworkspace/doc/unsupported/admin-ui/ParticipantEdit.java diff --git a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/ParticipantListModel.java b/ccm-portalworkspace/doc/unsupported/admin-ui/ParticipantListModel.java similarity index 100% rename from ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/ParticipantListModel.java rename to ccm-portalworkspace/doc/unsupported/admin-ui/ParticipantListModel.java diff --git a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/ParticipantModel.java b/ccm-portalworkspace/doc/unsupported/admin-ui/ParticipantModel.java similarity index 100% rename from ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/ParticipantModel.java rename to ccm-portalworkspace/doc/unsupported/admin-ui/ParticipantModel.java diff --git a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/PartyPermissionEdit.java b/ccm-portalworkspace/doc/unsupported/admin-ui/PartyPermissionEdit.java similarity index 100% rename from ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/PartyPermissionEdit.java rename to ccm-portalworkspace/doc/unsupported/admin-ui/PartyPermissionEdit.java diff --git a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/PeoplePane.java b/ccm-portalworkspace/doc/unsupported/admin-ui/PeoplePane.java similarity index 97% rename from ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/PeoplePane.java rename to ccm-portalworkspace/doc/unsupported/admin-ui/PeoplePane.java index f7e5e7d51..67bbbafd4 100755 --- a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/PeoplePane.java +++ b/ccm-portalworkspace/doc/unsupported/admin-ui/PeoplePane.java @@ -78,6 +78,15 @@ import java.util.ArrayList; import org.apache.log4j.Category; + +// Entry Point for jsp, currently: /template/ccm-portalworkspace/admin/edit.jsp +// Does nothing but display some title. +// No other java code relies on this class. +// +// No documentation available what this class really does or is intended to do. +// Code refers to roles which are not part or portalworkspace. Probably an +// unfinished import from portalserver. + /** * PeoplePane. * @@ -92,11 +101,17 @@ public class PeoplePane extends SimpleContainer { private RequestLocal m_workspaceRL; private StringParameter m_action; + /** + * Default Constructor. + */ public PeoplePane() { setTag("portal:admin"); setNamespace(WorkspacePage.PORTAL_XML_NS); } + /** + * + */ public void init(StringParameter sp) { m_workspaceRL = new RequestLocal() { diff --git a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/PrivilegeSingleSelect.java b/ccm-portalworkspace/doc/unsupported/admin-ui/PrivilegeSingleSelect.java similarity index 100% rename from ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/PrivilegeSingleSelect.java rename to ccm-portalworkspace/doc/unsupported/admin-ui/PrivilegeSingleSelect.java diff --git a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/WorkspacePermissionsPane.java b/ccm-portalworkspace/doc/unsupported/admin-ui/WorkspacePermissionsPane.java similarity index 97% rename from ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/WorkspacePermissionsPane.java rename to ccm-portalworkspace/doc/unsupported/admin-ui/WorkspacePermissionsPane.java index c755b3ed5..448c787cc 100755 --- a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/WorkspacePermissionsPane.java +++ b/ccm-portalworkspace/doc/unsupported/admin-ui/WorkspacePermissionsPane.java @@ -15,6 +15,7 @@ package com.arsdigita.portalworkspace.ui.admin; +import com.arsdigita.portalworkspace.ui.ApplicationSelectionModel; import org.apache.log4j.Logger; import com.arsdigita.bebop.Page; diff --git a/ccm-portalworkspace/web/templates/ccm-portalworkspace/admin/edit.jsp b/ccm-portalworkspace/doc/unsupported/admin-ui/edit.jsp similarity index 100% rename from ccm-portalworkspace/web/templates/ccm-portalworkspace/admin/edit.jsp rename to ccm-portalworkspace/doc/unsupported/admin-ui/edit.jsp diff --git a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/ColorPicker.java b/ccm-portalworkspace/doc/unsupported/ui/ColorPicker.java similarity index 100% rename from ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/ColorPicker.java rename to ccm-portalworkspace/doc/unsupported/ui/ColorPicker.java diff --git a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/ApplicationSelectionModel.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/ApplicationSelectionModel.java similarity index 83% rename from ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/ApplicationSelectionModel.java rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/ApplicationSelectionModel.java index 3f4138046..8ef14bcef 100755 --- a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/ApplicationSelectionModel.java +++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/ApplicationSelectionModel.java @@ -13,7 +13,7 @@ * */ -package com.arsdigita.portalworkspace.ui.admin; +package com.arsdigita.portalworkspace.ui; import org.apache.log4j.Logger; @@ -28,16 +28,18 @@ import com.arsdigita.web.Web; /** * This selection model adds an (optional?) default value which will be * returned when nothing is selected. + * + * Used by packages admin and sitemap */ public class ApplicationSelectionModel extends ACSObjectSelectionModel { - public static final String DEFAULT_PARAM_NAME = "app_id"; + public static final String DEFAULT_PARAM_NAME = "app_id"; - private boolean m_hasDefaultValue; + private boolean m_hasDefaultValue; /** Creates a s_logging category with name = full name of class */ - private static final Logger s_log = Logger - .getLogger(ApplicationSelectionModel.class); + private static final Logger s_log = Logger + .getLogger(ApplicationSelectionModel.class); /** * Constructor @@ -129,7 +131,7 @@ public class ApplicationSelectionModel extends ACSObjectSelectionModel { } return super.getSelectedObject(state); - } + } /** * @@ -138,24 +140,24 @@ public class ApplicationSelectionModel extends ACSObjectSelectionModel { */ @Override public Object getSelectedKey(PageState state) { - if (m_hasDefaultValue && !super.isSelected(state)) { - return getDefaultApplication(); - } - return super.getSelectedKey(state); - } + if (m_hasDefaultValue && !super.isSelected(state)) { + return getDefaultApplication(); + } + return super.getSelectedKey(state); + } - /** Utility methods */ - public Application getSelectedApplication(PageState state) { - return (Application) getSelectedObject(state); - } + /** Utility methods */ + public Application getSelectedApplication(PageState state) { + return (Application) getSelectedObject(state); + } - /** + /** * Utility method * * @param state * @param Application */ public void setSelectedApplication(PageState state, Application Application) { - setSelectedObject(state, Application); - } + setSelectedObject(state, Application); + } } diff --git a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/PortalHelper.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/PortalHelper.java index 11d30f34d..5ab072312 100755 --- a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/PortalHelper.java +++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/PortalHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001 ArsDigita Corporation. All Rights Reserved. + * Copyright (C) 2001-2004 Red Hat Inc. 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 diff --git a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/WorkspaceComponent.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/WorkspaceComponent.java index adc747a66..d9dbc5dcb 100755 --- a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/WorkspaceComponent.java +++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/WorkspaceComponent.java @@ -44,7 +44,11 @@ import com.arsdigita.web.URL; import com.arsdigita.xml.Element; /** + * Purpose?. * + * As of version 6.6 not really used. References from UserWorkspace, + * DefaultWorkspace, and PackageWorkspace, none of those referenced anymore + * (all are meant as JSP entry points, but not used from any JSP.) * */ public class WorkspaceComponent extends SimpleContainer { diff --git a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/AdminPane.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/AdminPane.java index ba7bd2172..e3dc9b8b0 100755 --- a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/AdminPane.java +++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/AdminPane.java @@ -21,6 +21,7 @@ import com.arsdigita.bebop.SimpleContainer; import com.arsdigita.kernel.Group; import com.arsdigita.kernel.Kernel; import com.arsdigita.kernel.Role; +import com.arsdigita.portalworkspace.ui.ApplicationSelectionModel; import com.arsdigita.portalworkspace.Workspace; import com.arsdigita.portalworkspace.WorkspacePage; @@ -29,8 +30,14 @@ import org.apache.log4j.Logger; /** + * Entry page for PortalWorkspace administration. * - * @author + * Invocation by (web)/templates/ccm-portalworkspace/admin/index.jsp + * + * Provides a list of participants (administrators and members) and functionaliy + * to add and remove members, provides a way to assign a category for use as an + * index page in navigation, and provides a link to delete this portal instance + * at all. */ public class AdminPane extends SimpleContainer { @@ -53,7 +60,7 @@ public class AdminPane extends SimpleContainer { m_app = new ApplicationSelectionModel("application", true); - /* Add component to select a Navigatgion Category for this portal */ + /* Add component to select a Navigation Category for this portal */ m_catComponent = new CategoryComponent(m_app); m_catComponent.setIdAttr("categoryComponent"); add(m_catComponent); diff --git a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/CategoryComponent.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/CategoryComponent.java index bc4c5a236..69c7bdf64 100755 --- a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/CategoryComponent.java +++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/CategoryComponent.java @@ -18,6 +18,7 @@ package com.arsdigita.portalworkspace.ui.admin; +import com.arsdigita.portalworkspace.ui.ApplicationSelectionModel; import org.apache.log4j.Logger; import com.arsdigita.bebop.Label; diff --git a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/CategoryTable.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/CategoryTable.java index 186a9a092..70f7b4408 100755 --- a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/CategoryTable.java +++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/CategoryTable.java @@ -15,6 +15,7 @@ package com.arsdigita.portalworkspace.ui.admin; +import com.arsdigita.portalworkspace.ui.ApplicationSelectionModel; import java.math.BigDecimal; import org.apache.log4j.Logger; diff --git a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/DeleteApplicationComponent.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/DeleteApplicationComponent.java index acf1ead19..963b9dcd0 100755 --- a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/DeleteApplicationComponent.java +++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/DeleteApplicationComponent.java @@ -1,5 +1,6 @@ package com.arsdigita.portalworkspace.ui.admin; +import com.arsdigita.portalworkspace.ui.ApplicationSelectionModel; import org.apache.log4j.Logger; import com.arsdigita.bebop.ActionLink; diff --git a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/WorkspaceConfigFormSection.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/WorkspaceConfigFormSection.java index ecef29591..43da09e53 100755 --- a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/WorkspaceConfigFormSection.java +++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/WorkspaceConfigFormSection.java @@ -41,6 +41,17 @@ import com.arsdigita.util.UncheckedWrapperException; import com.arsdigita.web.Application; import com.arsdigita.web.ui.ApplicationConfigFormSection; + +// Referenced in Initializer. +// No other referebce found. +// TODO: What happens if omitted? +// (2013-02-10pb) + + +/** + * + * + */ public class WorkspaceConfigFormSection extends ApplicationConfigFormSection { private SingleSelect m_layout; diff --git a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/ApplicationDetails.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/sitemap/ApplicationDetails.java similarity index 58% rename from ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/ApplicationDetails.java rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/sitemap/ApplicationDetails.java index 610df1446..3b20a4cdb 100755 --- a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/ApplicationDetails.java +++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/sitemap/ApplicationDetails.java @@ -16,28 +16,36 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.portalworkspace.ui.admin; - -import org.apache.log4j.Logger; +package com.arsdigita.portalworkspace.ui.sitemap; import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.SimpleContainer; import com.arsdigita.domain.DomainObjectXMLRenderer; import com.arsdigita.portalworkspace.WorkspacePage; +import com.arsdigita.portalworkspace.ui.ApplicationSelectionModel; import com.arsdigita.web.Application; import com.arsdigita.xml.Element; +import org.apache.log4j.Logger; + +/** + * + * + */ public class ApplicationDetails extends SimpleContainer { - private static final Logger s_log = Logger.getLogger(ApplicationList.class); + private static final Logger s_log = Logger.getLogger(ApplicationList.class); - private ApplicationSelectionModel m_app; + private ApplicationSelectionModel m_app; - public ApplicationDetails(ApplicationSelectionModel app) { - super("portal:applicationDetails", WorkspacePage.PORTAL_XML_NS); - - m_app = app; - } + /** + * Constructor + * @param app + */ + public ApplicationDetails(ApplicationSelectionModel app) { + super("portal:applicationDetails", WorkspacePage.PORTAL_XML_NS); + m_app = app; + } /** * @@ -45,17 +53,18 @@ public class ApplicationDetails extends SimpleContainer { * @param parent */ @Override - public void generateXML(PageState state, Element parent) { - Element content = generateParent(parent); + public void generateXML(PageState state, Element parent) { - Application app = (Application) m_app.getSelectedObject(state); + Element content = generateParent(parent); - DomainObjectXMLRenderer xr = new DomainObjectXMLRenderer(content); - xr.setWrapRoot(false); - xr.setWrapAttributes(true); - xr.setWrapObjects(false); + Application app = (Application) m_app.getSelectedObject(state); - xr.walk(app, ApplicationDetails.class.getName()); - } + DomainObjectXMLRenderer xr = new DomainObjectXMLRenderer(content); + xr.setWrapRoot(false); + xr.setWrapAttributes(true); + xr.setWrapObjects(false); + + xr.walk(app, ApplicationDetails.class.getName()); + } } diff --git a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/ApplicationList.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/sitemap/ApplicationList.java similarity index 96% rename from ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/ApplicationList.java rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/sitemap/ApplicationList.java index 09141b413..164a1d5b4 100755 --- a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/ApplicationList.java +++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/sitemap/ApplicationList.java @@ -16,23 +16,24 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.portalworkspace.ui.admin; - -import java.io.IOException; - -import org.apache.log4j.Logger; +package com.arsdigita.portalworkspace.ui.sitemap; import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.SimpleContainer; import com.arsdigita.domain.DomainObjectFactory; import com.arsdigita.domain.DomainObjectXMLRenderer; import com.arsdigita.persistence.OID; +import com.arsdigita.portalworkspace.ui.ApplicationSelectionModel; import com.arsdigita.portalworkspace.WorkspacePage; import com.arsdigita.util.UncheckedWrapperException; import com.arsdigita.web.Application; import com.arsdigita.web.ApplicationCollection; import com.arsdigita.xml.Element; +import java.io.IOException; + +import org.apache.log4j.Logger; + /** * * diff --git a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/ApplicationPane.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/sitemap/ApplicationPane.java similarity index 98% rename from ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/ApplicationPane.java rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/sitemap/ApplicationPane.java index 5f933ed37..4f10c6f89 100755 --- a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/ApplicationPane.java +++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/sitemap/ApplicationPane.java @@ -15,7 +15,7 @@ * 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.portalworkspace.ui.admin; +package com.arsdigita.portalworkspace.ui.sitemap; import java.util.HashMap; import java.util.Iterator; @@ -34,6 +34,7 @@ import com.arsdigita.kernel.Resource; import com.arsdigita.kernel.ui.ResourceConfigComponent; import com.arsdigita.persistence.OID; import com.arsdigita.portalworkspace.WorkspacePage; +import com.arsdigita.portalworkspace.ui.ApplicationSelectionModel; import com.arsdigita.web.Application; import com.arsdigita.web.ApplicationType; import com.arsdigita.web.ApplicationTypeCollection; diff --git a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/NewApplicationForm.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/sitemap/NewApplicationForm.java similarity index 51% rename from ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/NewApplicationForm.java rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/sitemap/NewApplicationForm.java index da3495b0e..7c3480d01 100755 --- a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/NewApplicationForm.java +++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/sitemap/NewApplicationForm.java @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.portalworkspace.ui.admin; +package com.arsdigita.portalworkspace.ui.sitemap; import com.arsdigita.bebop.Form; import com.arsdigita.bebop.FormProcessException; @@ -35,41 +35,53 @@ import com.arsdigita.toolbox.ui.OIDParameter; import com.arsdigita.web.ApplicationType; import com.arsdigita.web.ApplicationTypeCollection; +/** + * + */ public class NewApplicationForm extends Form { - private SingleSelect m_app; + private SingleSelect m_app; - public NewApplicationForm() { - super("newApp", new SimpleContainer("portal:newApplication", - WorkspacePage.PORTAL_XML_NS)); + /** + * Constructor. + */ + public NewApplicationForm() { - m_app = new SingleSelect(new OIDParameter("app")); - ApplicationTypeCollection types = ApplicationType - .retrieveAllApplicationTypes(); - types.addFilter("not(lower(title) like 'admin')"); - types.addOrder("title"); - m_app.addOption(new Option(null, "-- select application --")); - while (types.next()) { - ApplicationType type = types.getApplicationType(); - m_app.addOption(new Option(type.getOID().toString(), type - .getTitle())); - } - m_app.addValidationListener(new NotNullValidationListener()); - add(m_app); + super("newApp", new SimpleContainer("portal:newApplication", + WorkspacePage.PORTAL_XML_NS)); - add(new Submit("Create")); + m_app = new SingleSelect(new OIDParameter("app")); + ApplicationTypeCollection types = ApplicationType + .retrieveAllApplicationTypes(); + types.addFilter("not(lower(title) like 'admin')"); + types.addOrder("title"); + m_app.addOption(new Option(null, "-- select application --")); + while (types.next()) { + ApplicationType type = types.getApplicationType(); + m_app.addOption(new Option(type.getOID().toString(), type + .getTitle())); + } + m_app.addValidationListener(new NotNullValidationListener()); + add(m_app); - addProcessListener(new FormProcessListener() { - public void process(FormSectionEvent ev) - throws FormProcessException { + add(new Submit("Create")); - fireCompletionEvent(ev.getPageState()); - } - }); - } + addProcessListener(new FormProcessListener() { + public void process(FormSectionEvent ev) + throws FormProcessException { - public ApplicationType getApplicationType(PageState state) { - OID app = (OID) m_app.getValue(state); - return (ApplicationType) DomainObjectFactory.newInstance(app); - } + fireCompletionEvent(ev.getPageState()); + } + }); + } + + /** + * + * @param state + * @return + */ + public ApplicationType getApplicationType(PageState state) { + OID app = (OID) m_app.getValue(state); + return (ApplicationType) DomainObjectFactory.newInstance(app); + } } diff --git a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/SiteMapPane.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/sitemap/SiteMapPane.java similarity index 95% rename from ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/SiteMapPane.java rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/sitemap/SiteMapPane.java index 04729254c..930173045 100755 --- a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/SiteMapPane.java +++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/sitemap/SiteMapPane.java @@ -16,8 +16,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.portalworkspace.ui.admin; +package com.arsdigita.portalworkspace.ui.sitemap; +import com.arsdigita.portalworkspace.ui.ApplicationSelectionModel; import com.arsdigita.bebop.Page; import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.SimpleContainer;