Changeset 2629

Timestamp:

02/08/10 11:49:53 (2 years ago)

Author:

mswertz

Message:

Bugfix getCustomHtmlHeaders

File:

• molgenis/3.3/src/org/molgenis/framework/ui/SimpleModel.java (modified) (8 diffs)

molgenis/3.3/src/org/molgenis/framework/ui/SimpleModel.java

@@ -85 +85 @@
                 return (UserInterface) this.getRoot();
         }
-        
+
         @Override
         public EmailService getEmailService()
         {
-                return ((UserInterface)this.getRoot()).getEmailService();
-        }
-
-        public FileLink getTempFile()  throws IOException
+                return ((UserInterface) this.getRoot()).getEmailService();
+        }
+
+        public FileLink getTempFile() throws IOException
         {
                 return getRootScreen().getTempFile();
@@ -110 +110 @@
         public String getLabel()
         {
-                if (label == null)
-                        return this.getName();
+                if (label == null) return this.getName();
                 return label;
         }
@@ -158 +157 @@
                 if (getChildren().size() > 0)
                 {
-                        if(getChildren().firstElement() instanceof ScreenModel)
-                                return getChildren().firstElement();
+                        if (getChildren().firstElement() instanceof ScreenModel) return getChildren().firstElement();
                 }
                 return null;
@@ -184 +182 @@
                 {
                         return selected.getName() == view.getName();
-                } else
+                }
+                else
                 {
                         return false;
@@ -207 +206 @@
                 if (menubar.containsKey(menu_name) == false)
                 {
-                        menubar.put(menu_name, new CommandMenu(menu_name, (FormModel)this, menu_name, "", ""));
+                        menubar.put(menu_name, new CommandMenu(menu_name, (FormModel) this, menu_name, "", ""));
                 }
 
                 // put the command in the menu
                 menubar.get(menu_name).addCommand(command);
-                this.logger.debug("added action "+command.getName());
+                this.logger.debug("added action " + command.getName());
         }
 
@@ -219 +218 @@
                 for (CommandMenu menu : menubar.values())
                 {
-                        if (menu.getCommand(commandID) != null)
-                                return menu.getCommand(commandID);
+                        if (menu.getCommand(commandID) != null) return menu.getCommand(commandID);
                 }
                 return null;
@@ -230 +228 @@
         }
 
-
-
         @Override
         public String getViewTemplate()
@@ -237 +233 @@
                 return null;
         }
-        
-        @Override
-        public String getCustomHtmlHeaders() {
-                if(this.getSelected() != null)
+
+        @Override
+        public String getCustomHtmlHeaders()
+        {
+                if (this.getSelected() != null)
+                {
                         return this.getSelected().getCustomHtmlHeaders();
-                return
-                        "";
+                }
+                else
+                {
+                        String result = "";
+                        for(ScreenModel m: this.getChildren())
+                        {
+                                result += m.getCustomHtmlHeaders();
+                        }
+                        return result;
+                }
+
         }
 }