[Aplaws-commit] r2484 - in releases/2.0.0/ccm-portalworkspace/src/com/arsdigita/portalworkspace: . ui/admin

[<pb...@fe...>]

Author: pboy
Date: 2013-02-03 09:50:25 +0000 (Sun, 03 Feb 2013)
New Revision: 2484

Modified:
   releases/2.0.0/ccm-portalworkspace/src/com/arsdigita/portalworkspace/Workspace.java
   releases/2.0.0/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/ApplicationPane.java
Log:
Minor fixes portalworkspace (on behalt of JensP)

Modified: releases/2.0.0/ccm-portalworkspace/src/com/arsdigita/portalworkspace/Workspace.java
===================================================================
--- releases/2.0.0/ccm-portalworkspace/src/com/arsdigita/portalworkspace/Workspace.java	2013-02-03 09:43:44 UTC (rev 2483)
+++ releases/2.0.0/ccm-portalworkspace/src/com/arsdigita/portalworkspace/Workspace.java	2013-02-03 09:50:25 UTC (rev 2484)
@@ -575,7 +575,7 @@
         //            .retrieve("com.arsdigita.kernel.Party");
         Filter f = dc.addNotInSubqueryFilter(
                           "id",
-                          "com.arsdigita.london.portal.WorkspaceParticipantIDs");
+                          "com.arsdigita.portalworkspace.WorkspaceParticipantIDs");
         f.set("workspaceID", getID());
         return new PartyCollection(dc);
     }
@@ -594,7 +594,7 @@
      **/
     public Iterator getParticipantInitials() {
         DataQuery query = SessionManager.getSession().retrieveQuery(
-                "com.arsdigita.london.portal.WorkspaceParticipantInitials");
+                "com.arsdigita.portalworkspace.WorkspaceParticipantInitials");
         query.setParameter("workspaceID", getID());
 
         LinkedList result = new LinkedList();
@@ -750,7 +750,7 @@
 
     public WorkspaceCollection getChildWorkspaces() {
         DataQuery query = SessionManager.getSession().retrieveQuery(
-                "com.arsdigita.london.portal.childWorkspacesForApplicationID");
+                "com.arsdigita.portalworkspace.childWorkspacesForApplicationID");
         query.setParameter("applicationID", getID());
 
         DataCollection collection =

Modified: releases/2.0.0/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/ApplicationPane.java
===================================================================
--- releases/2.0.0/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/ApplicationPane.java	2013-02-03 09:43:44 UTC (rev 2483)
+++ releases/2.0.0/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/ApplicationPane.java	2013-02-03 09:50:25 UTC (rev 2484)
@@ -15,7 +15,6 @@
  * 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;
 
 import java.util.HashMap;
@@ -42,15 +41,10 @@
 public class ApplicationPane extends SimpleContainer {
 
     private Map m_edit; // Map of application type -> edit config form
-
     private Map m_create;
-
     private NewApplicationForm m_newApp;
-
     private ApplicationDetails m_appDetails;
-
     private ActionLink m_editLink;
-
     private ApplicationSelectionModel m_app;
 
     /**
@@ -80,6 +74,7 @@
 			public Object initialValue(PageState state) {
 				return m_app.getSelectedObject(state);
 			}
+
 		};
 
 		ApplicationTypeCollection types = ApplicationType
@@ -119,6 +114,7 @@
 	}
 
 	private class ApplicationCreateListener implements ActionListener {
+
 		public void actionPerformed(ActionEvent e) {
 			PageState state = e.getPageState();
 
@@ -131,9 +127,11 @@
 			m_appDetails.setVisible(state, false);
 			m_editLink.setVisible(state, false);
 		}
+
 	}
 
 	private class ApplicationEditListener implements ActionListener {
+
 		public void actionPerformed(ActionEvent e) {
 			PageState state = e.getPageState();
 
@@ -147,9 +145,11 @@
 			m_appDetails.setVisible(state, false);
 			m_editLink.setVisible(state, false);
 		}
+
 	}
 
 	private class ApplicationCompleteCreateListener implements ActionListener {
+
 		private Component m_src;
 
 		public ApplicationCompleteCreateListener(Component src) {
@@ -161,12 +161,16 @@
 
 			ResourceConfigComponent c = (ResourceConfigComponent) m_src;
 			Resource newResource = c.createResource(state);
+            if (newResource != null) {
+
+
 			c.setVisible(state, false);
 
 			// Copy categorization from nav app instance
 			Resource parentResource = newResource.getParentResource();
 			Category.setRootForObject(newResource, Category
 					.getRootForObject(parentResource));
+            }
 
 			m_newApp.setVisible(state, true);
 			m_appDetails.setVisible(state, true);
@@ -174,9 +178,11 @@
 
 			m_app.clearSelection(state);
 		}
+
 	}
 
 	private class ApplicationCompleteEditListener implements ActionListener {
+
 		private Component m_src;
 
 		public ApplicationCompleteEditListener(Component src) {
@@ -196,6 +202,6 @@
 
 			m_app.clearSelection(state);
 		}
+
 	}
-
 }