- GroupAdministrationTab und ApplicationsAdministrationTab sind jetzt von SimpleContainer und nicht mehr von BoxPanel abgeleitet.

- Verschiendener Kleinkram (Formatierungen)


git-svn-id: https://svn.libreccm.org/ccm/trunk@2294 8810af33-2d31-482b-a856-94f89814c4df

ccm-core/src/com/arsdigita/ui/admin/ApplicationManagers.java

@@ -67,4 +67,8 @@ public class ApplicationManagers {
         return Collections.unmodifiableMap(appManagers);
     }
     
+    protected ApplicationManager<?> getApplicationManager(final String appClassName) {
+        return appManagers.get(appClassName);
+    }
+    
 }

ccm-core/src/com/arsdigita/ui/admin/ApplicationsAdministrationTab.java

@@ -20,13 +20,13 @@ package com.arsdigita.ui.admin;
 
 import com.arsdigita.bebop.BoxPanel;
 import com.arsdigita.bebop.Form;
-import com.arsdigita.bebop.Label;
 import com.arsdigita.bebop.Page;
 import com.arsdigita.bebop.PageState;
 import com.arsdigita.bebop.SimpleContainer;
 import com.arsdigita.bebop.Tree;
 import com.arsdigita.bebop.event.ChangeEvent;
 import com.arsdigita.bebop.event.ChangeListener;
+import com.arsdigita.ui.admin.applications.ApplicationInstanceAwareContainer;
 import com.arsdigita.ui.admin.applications.ApplicationInstancePane;
 import com.arsdigita.ui.admin.applications.ApplicationManager;
 import com.arsdigita.ui.admin.applications.BaseApplicationPane;
@@ -46,11 +46,12 @@ import java.util.Map;
  * @author pb
  * @author Jens Pelzetter
  */
-public class ApplicationsAdministrationTab extends BoxPanel implements AdminConstants {
+public class ApplicationsAdministrationTab extends SimpleContainer implements AdminConstants {
 
     private final Tree applicationTree;
     private final Map<String, BaseApplicationPane> appPanes = new HashMap<String, BaseApplicationPane>();
     private final Map<String, ApplicationInstancePane> instancePanes = new HashMap<String, ApplicationInstancePane>();
+    private final BoxPanel appPanel;
 
     /**
      * Constructor
@@ -90,7 +91,8 @@ public class ApplicationsAdministrationTab extends BoxPanel implements AdminCons
             }
         }
 
-        final BoxPanel appPanel = new BoxPanel();
+        //final BoxPanel 
+        appPanel = new BoxPanel();
         appPanel.setClassAttr("main");
         for (Map.Entry<String, BaseApplicationPane> entry : appPanes.entrySet()) {
             appPanel.add(entry.getValue());
@@ -227,6 +229,7 @@ public class ApplicationsAdministrationTab extends BoxPanel implements AdminCons
             //Nothing
         }
 
+        @Override
         public void stateChanged(final ChangeEvent event) {
             final PageState state = event.getPageState();
 
@@ -259,5 +262,6 @@ public class ApplicationsAdministrationTab extends BoxPanel implements AdminCons
                 }
             }
         }
+
     }
 }

ccm-core/src/com/arsdigita/ui/admin/GroupAdministrationTab.java

@@ -56,7 +56,7 @@ import org.apache.log4j.Logger;
  * @author David Dao
  *
  */
-class GroupAdministrationTab extends BoxPanel implements AdminConstants, ChangeListener {
+class GroupAdministrationTab extends SimpleContainer implements AdminConstants, ChangeListener {
 
     private static final Logger LOGGER = Logger.getLogger(GroupAdministrationTab.class);
     private final Tree groupTree;

ccm-core/src/com/arsdigita/ui/admin/applications/ApplicationInstancePropertySheetModel.java

@@ -45,11 +45,13 @@ public class ApplicationInstancePropertySheetModel implements PropertySheetModel
         this.application = application;
     }
 
+    @Override
     public boolean nextRow() {
         currentIndex++;
         return currentIndex < INST_DESC;
     }
 
+    @Override
     public String getLabel() {
         switch (currentIndex) {
             case INST_TITLE:
@@ -69,6 +71,7 @@ public class ApplicationInstancePropertySheetModel implements PropertySheetModel
         }
     }
 
+    @Override
     public GlobalizedMessage getGlobalizedLabel() {
         switch (currentIndex) {
             case INST_TITLE:
@@ -85,6 +88,7 @@ public class ApplicationInstancePropertySheetModel implements PropertySheetModel
         }
     }
 
+    @Override
     public String getValue() {
         switch (currentIndex) {
             case INST_TITLE:

ccm-core/src/com/arsdigita/ui/admin/applications/tree/ApplicationTreeModel.java

@@ -41,10 +41,12 @@ public class ApplicationTreeModel implements TreeModel {
         //Nothing        
     }
     
+    @Override
     public TreeNode getRoot(final PageState state) {        
         return new RootTreeNode();
     }
 
+    @Override
     public boolean hasChildren(final TreeNode node, final PageState state) {
         if (node instanceof RootTreeNode) {
             return true;
@@ -68,6 +70,7 @@ public class ApplicationTreeModel implements TreeModel {
         }
     }
 
+    @Override
     public Iterator getChildren(final TreeNode node, final PageState state) {
         if (node instanceof RootTreeNode) {
             final ApplicationTypeCollection appTypes = ApplicationType.retrieveAllApplicationTypes();                        

ccm-core/src/com/arsdigita/ui/admin/applications/tree/ApplicationTreeModelBuilder.java

@@ -34,6 +34,7 @@ import com.arsdigita.util.LockableImpl;
  */
 public class ApplicationTreeModelBuilder extends LockableImpl implements TreeModelBuilder {
 
+    @Override
     public TreeModel makeModel(final Tree tree, final PageState state) {        
         tree.expand("-1", state);
         return new ApplicationTreeModel();

ccm-core/src/com/arsdigita/ui/login/Login.java

@@ -77,7 +77,7 @@ public class Login extends Application {
     /**
      * Getter to retrieve the base database object type name
      *
-     * @return base data aoject type as String
+     * @return base data a object type as String
      */
     @Override
     protected String getBaseDataObjectType() {

ccm-core/src/com/arsdigita/ui/login/LoginServlet.java

@@ -182,10 +182,11 @@ public class LoginServlet extends BebopApplicationServlet {
 
 
         Page workspace = checkForPageSubClass();
-        if (workspace == null) 
+        if (workspace == null) {
             workspace = buildSimplePage("login.workspacePage.title",
                                         new UserInfo(),
                                         "workspace");
+        }
         put(UI.getWorkspaceURL(), workspace);  // usually navigation/ or portal/
         disableClientCaching(UI.getWorkspaceURL());
 

ccm-core/src/com/arsdigita/ui/permissions/Permissions.java

@@ -52,7 +52,7 @@ public class Permissions extends Application {
     /**
      * Getter to retrieve the base database object type name
      *
-     * @return base data aoject type as String
+     * @return base data a object type as String
      */
     @Override
     protected String getBaseDataObjectType() {

ccm-core/src/com/arsdigita/ui/permissions/PermissionsServlet.java

@@ -114,6 +114,7 @@ public class PermissionsServlet extends BaseApplicationServlet
      * Central service method, checks for required permission, determines the
      * requested page and passes the page object to PresentationManager.
      */
+    @Override
     public final void doService(HttpServletRequest sreq,
                                 HttpServletResponse sresp,
                                 Application app)