[overlord-commits] Overlord SVN: r949 - in bpm-console/trunk/gui/war/src/main/java/org: jboss/bpm/console/client/process and 2 other directories.

overlord-commits at lists.jboss.org overlord-commits at lists.jboss.org
Thu Feb 4 05:18:18 EST 2010


Author: heiko.braun at jboss.com
Date: 2010-02-04 05:18:17 -0500 (Thu, 04 Feb 2010)
New Revision: 949

Added:
   bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/public/blank.html
Modified:
   bpm-console/trunk/gui/war/src/main/java/org/gwt/mosaic/ui/client/layout/MosaicPanel.java
   bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java
   bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderReportAction.java
   bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportFrame.java
   bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportLaunchPadView.java
   bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportParameterForm.java
   bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java
   bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/public/console.css
Log:
Cleanup Report tool

Modified: bpm-console/trunk/gui/war/src/main/java/org/gwt/mosaic/ui/client/layout/MosaicPanel.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/gwt/mosaic/ui/client/layout/MosaicPanel.java	2010-02-02 14:57:28 UTC (rev 948)
+++ bpm-console/trunk/gui/war/src/main/java/org/gwt/mosaic/ui/client/layout/MosaicPanel.java	2010-02-04 10:18:17 UTC (rev 949)
@@ -48,4 +48,5 @@
   {
     super(layout);    
   }
+    
 }

Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java	2010-02-02 14:57:28 UTC (rev 948)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java	2010-02-04 10:18:17 UTC (rev 949)
@@ -21,6 +21,8 @@
  */
 package org.jboss.bpm.console.client.process;
 
+import com.google.gwt.event.dom.client.ChangeEvent;
+import com.google.gwt.event.dom.client.ChangeHandler;
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.event.dom.client.ClickHandler;
 import com.google.gwt.gen2.table.event.client.RowSelectionEvent;
@@ -155,8 +157,10 @@
       dropBox.addItem("Active");
       dropBox.addItem("Suspended");
 
-      dropBox.addChangeListener(new ChangeListener() {
-        public void onChange(Widget sender) {
+      dropBox.addChangeHandler(new ChangeHandler() {
+
+        public void onChange(ChangeEvent changeEvent)
+        {          
           switch (dropBox.getSelectedIndex())
           {
             case 0:

Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderReportAction.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderReportAction.java	2010-02-02 14:57:28 UTC (rev 948)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderReportAction.java	2010-02-04 10:18:17 UTC (rev 949)
@@ -58,8 +58,11 @@
     RequestBuilder builder = new RequestBuilder(RequestBuilder.POST, url);
 
     ConsoleLog.debug(RequestBuilder.POST+": " + url);
-    final ReportView view = (ReportView)controller.getView(ReportView.ID);
+    final ReportLaunchPadView view = (ReportLaunchPadView)controller.getView(ReportLaunchPadView.ID);
 
+    view.reset();
+    view.setLoading(true);
+
     try
     {
       controller.handleEvent( LoadingStatusAction.ON );
@@ -100,7 +103,7 @@
               finally
               {
                 controller.handleEvent( LoadingStatusAction.OFF );
-                //view.setLoading(false);
+                view.setLoading(false);
               }
             }
           }
@@ -131,7 +134,7 @@
       // Couldn't connect to server
       controller.handleEvent( LoadingStatusAction.OFF );
       handleError(controller, url, e);
-      //view.setLoading(false);
+      view.setLoading(false);
     }
   }
 

Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportFrame.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportFrame.java	2010-02-02 14:57:28 UTC (rev 948)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportFrame.java	2010-02-04 10:18:17 UTC (rev 949)
@@ -33,47 +33,25 @@
  *  
  * @author Heiko.Braun <heiko.braun at jboss.com>
  */
-public class ReportFrame extends MosaicPanel implements LazyPanel
+public class ReportFrame extends MosaicPanel
 {
 
   private Frame frame;
-  private String url;
-  private boolean isInitialized;
 
-  public ReportFrame(String url)
+  public ReportFrame()
   {
     super();    
     setPadding(0);
-    this.url = url;
     
     // report frame
     frame = new Frame();
-    DOM.setStyleAttribute(frame.getElement(), "border", "none");
+    DOM.setStyleAttribute(frame.getElement(), "border", "1px solid #E8E8E8");
     DOM.setStyleAttribute(frame.getElement(), "backgroundColor", "#ffffff");
-    this.add(frame);
+    this.add(frame);    
   }
 
-  public String getUrl()
+  public void setFrameUrl(String url)
   {
-    return url;
-  }
-
-  public boolean isInitialized()
-  {
-    return isInitialized;
-  }
-                                                   
-  public void initialize()
-  {
-    if(!isInitialized)
-    {
-      setFrameUrl(url);
-      isInitialized = true;
-    }
-  }
-
-  private void setFrameUrl(String url)
-  {
     // https://jira.jboss.org/jira/browse/JBPM-2244
     frame.getElement().setId(
         String.valueOf( new Date().getTime())

Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportLaunchPadView.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportLaunchPadView.java	2010-02-02 14:57:28 UTC (rev 948)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportLaunchPadView.java	2010-02-04 10:18:17 UTC (rev 949)
@@ -22,22 +22,20 @@
 package org.jboss.bpm.console.client.report;
 
 import com.google.gwt.core.client.GWT;
-import com.google.gwt.event.dom.client.ClickEvent;
-import com.google.gwt.event.dom.client.ClickHandler;
-import com.google.gwt.user.client.ui.AbstractImagePrototype;
-import com.google.gwt.user.client.ui.Button;
+import com.google.gwt.event.dom.client.ChangeEvent;
+import com.google.gwt.event.dom.client.ChangeHandler;
 import com.google.gwt.user.client.ui.HTML;
 import com.mvc4g.client.Controller;
 import com.mvc4g.client.Event;
 import com.mvc4g.client.ViewInterface;
+import org.gwt.mosaic.ui.client.CaptionLayoutPanel;
 import org.gwt.mosaic.ui.client.layout.BoxLayout;
 import org.gwt.mosaic.ui.client.layout.BoxLayoutData;
 import org.gwt.mosaic.ui.client.layout.MosaicPanel;
 import org.jboss.bpm.console.client.ApplicationContext;
 import org.jboss.bpm.console.client.URLBuilder;
-import org.jboss.bpm.console.client.common.IconHeader;
-import org.jboss.bpm.console.client.common.WidgetWindowPanel;
-import org.jboss.bpm.console.client.icons.ConsoleIconBundle;
+import org.jboss.bpm.console.client.common.DataDriven;
+import org.jboss.bpm.console.client.common.LoadingOverlay;
 import org.jboss.bpm.report.model.ReportReference;
 import org.jboss.errai.workspaces.client.Registry;
 
@@ -51,109 +49,137 @@
  * that need to be retrieved from the server module.
  *
  * @see org.jboss.bpm.console.client.report.UpdateReportConfigAction
- * 
+ *
  * @author Heiko.Braun <heiko.braun at jboss.com>
  */
-class ReportLaunchPadView extends MosaicPanel implements ViewInterface
+class ReportLaunchPadView extends MosaicPanel implements ViewInterface, DataDriven
 {
   public final static String ID = ReportLaunchPadView.class.getName();
 
   private Controller controller;
 
-  private WidgetWindowPanel window;
-  private MosaicPanel inner;
+  private MosaicPanel inputPanel;
 
+  private com.google.gwt.user.client.ui.ListBox dropBox;
+
+  List<ReportReference> reportTemplates;
+  private HTML description;
+  private ReportFrame reportFrame;
+
   public ReportLaunchPadView()
   {
     super(new BoxLayout(BoxLayout.Orientation.VERTICAL));
+    this.setPadding(5);
+
+    CaptionLayoutPanel header = new CaptionLayoutPanel("Report configuration");
+    header.setStyleName("bpm-detail-panel");
     
-    this.setPadding(10);
-    HTML html = new HTML("The following reports are available.<br/> " +
-        "Please note that rendering may take a while.");
+    header.setLayout(new BoxLayout(BoxLayout.Orientation.HORIZONTAL));    
 
-    inner = new MosaicPanel(new BoxLayout(BoxLayout.Orientation.VERTICAL));
+    MosaicPanel templatePanel = new MosaicPanel(new BoxLayout(BoxLayout.Orientation.VERTICAL));    
+    description = new HTML();
 
-    this.add(html, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
-    this.add(inner, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH));
+    dropBox = new com.google.gwt.user.client.ui.ListBox(false);  
+    dropBox.addChangeHandler(new ChangeHandler() {
 
-  }
+      public void onChange(ChangeEvent changeEvent)
+      {
+        final ReportReference reportRef = getCurrentSelection();
+        description.setText(reportRef.getDescription());
+        createInput(reportRef, inputPanel);
+        ReportLaunchPadView.this.layout();
+      }
+    });
 
-  public void update(List<ReportReference> reports)
-  {
-    ConsoleIconBundle icons = GWT.create(ConsoleIconBundle.class);
-    inner.clear();
+    templatePanel.add(dropBox, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
+    templatePanel.add(description, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH));
+    // ----
 
-    for(final ReportReference reportRef : reports)
-    {
-      final boolean hasParameters = reportRef.getParameterMetaData().size()>0;
+    inputPanel = new MosaicPanel();
+    
+    // ---
+    
+    header.add(templatePanel, new BoxLayoutData("250 px", "100 px"));
+    header.add(inputPanel, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH));
 
-      // a single report description
-      MosaicPanel row = new MosaicPanel(new BoxLayout(BoxLayout.Orientation.HORIZONTAL));
+    // --
 
-      MosaicPanel desc = new MosaicPanel(new BoxLayout(BoxLayout.Orientation.VERTICAL));
-      desc.setPadding(0);
-      IconHeader header = new IconHeader(
-          AbstractImagePrototype.create(icons.reportInstanceIcon()), 
-          reportRef.getTitle()
-      );
-      desc.add(header);
+    reportFrame = new ReportFrame();
 
-      desc.add(new HTML(reportRef.getTitle()));
-      
-      String description = reportRef.getDescription()!=null ? reportRef.getDescription() : "";
-      desc.add(new HTML(description));
-      row.add(desc, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
+    this.add(header, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
+    this.add(reportFrame, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH));
 
-      // render button
-      row.add(new Button("Render",
-          new ClickHandler()
-          {
-            public void onClick(ClickEvent clickEvent)
-            {
-              if(hasParameters)
-              {
-                ReportParameterForm form =
-                    new ReportParameterForm(reportRef,
-                        new ReportParamCallback()
-                        {
+  }
 
-                          public void onSumbit(Map<String, String> paramValues)
-                          {
+  private void createInput(final ReportReference reportRef, MosaicPanel inputPanel)
+  {
+    inputPanel.clear();
 
-                            String url = URLBuilder.getInstance().getReportURL(reportRef.getReportFileName());
-
-                            RenderDispatchEvent eventPayload = new RenderDispatchEvent(reportRef.getTitle(), url);
-                            eventPayload.setParameters(fieldValues2PostParams(paramValues));
-                            controller.handleEvent( new Event(RenderReportAction.ID, eventPayload));
-
-                            window.close();
-                          }
-                        });
-
-                window = new WidgetWindowPanel("Report Parameter", form);
-              }
-              else
+    final ReportParameterForm form =
+        new ReportParameterForm(reportRef,
+            new ReportParamCallback()
+            {
+              public void onSumbit(Map<String, String> paramValues)
               {
                 String url = URLBuilder.getInstance().getReportURL(reportRef.getReportFileName());
-                controller.handleEvent(
-                    new Event(RenderReportAction.ID,
-                        new RenderDispatchEvent(reportRef.getTitle(), url)
-                    )
-                );
+                RenderDispatchEvent eventPayload = new RenderDispatchEvent(reportRef.getTitle(), url);
+                eventPayload.setParameters(fieldValues2PostParams(paramValues));
+                controller.handleEvent( new Event(RenderReportAction.ID, eventPayload));
               }
-            }
-          })          
-      );
+            });
 
+    inputPanel.add(form);
+  }
 
-      inner.add(row, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
+  private ReportReference getCurrentSelection()
+  {
+    String template = dropBox.getItemText(dropBox.getSelectedIndex());
+    for(ReportReference r : reportTemplates)
+    {
+      if(r.getTitle().equals(template))
+        return r;
+    }
+    
+    return null;
+  }
 
+  public void update(List<ReportReference> reports)
+  {
+    reportTemplates = reports;
+
+    for(ReportReference report : reports)
+    {
+      dropBox.addItem(report.getTitle()); 
     }
 
-    this.invalidate();
+    dropBox.setSelectedIndex(0);
     Registry.get(ApplicationContext.class).refreshView();
   }
 
+  public void displayReport(String title, String dispatchUrl)
+  {    
+    reportFrame.setFrameUrl(dispatchUrl);    
+  }
+
+  public void reset()
+  {
+    String url = GWT.getModuleBaseURL() + "blank.html";
+    System.out.println("** Blank URL: " + url);
+    displayReport("", url);
+  }
+
+  public void update(Object... data)
+  {
+    String title = (String)data[0];
+    String url = (String)data[1];
+    displayReport(title, url);
+  }
+
+  public void setLoading(boolean isLoading)
+  {
+    LoadingOverlay.on(reportFrame, isLoading);
+  }
+
   private static String fieldValues2PostParams(Map<String,String> values)
   {
     StringBuffer sb = new StringBuffer();

Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportParameterForm.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportParameterForm.java	2010-02-02 14:57:28 UTC (rev 948)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportParameterForm.java	2010-02-04 10:18:17 UTC (rev 949)
@@ -21,11 +21,12 @@
  */
 package org.jboss.bpm.console.client.report;
 
+import com.google.gwt.event.dom.client.ClickEvent;
+import com.google.gwt.event.dom.client.ClickHandler;
 import com.google.gwt.user.client.ui.*;
-import org.gwt.mosaic.ui.client.layout.BoxLayout;
-import org.gwt.mosaic.ui.client.layout.BoxLayoutData;
+import org.gwt.mosaic.ui.client.layout.GridLayout;
+import org.gwt.mosaic.ui.client.layout.GridLayoutData;
 import org.gwt.mosaic.ui.client.layout.MosaicPanel;
-import org.jboss.bpm.console.client.common.HeaderLabel;
 import org.jboss.bpm.report.model.ReportParameter;
 import org.jboss.bpm.report.model.ReportReference;
 
@@ -36,47 +37,56 @@
 
 /**
  * Report parameter input.
- * 
+ *
  * @author Heiko.Braun <heiko.braun at jboss.com>
  */
 public class ReportParameterForm extends MosaicPanel
 {
-  private ReportReference reportReference;
-  private ReportParamCallback callback;
   private List<InputField> fields = new ArrayList<InputField>();
-  
+
   public ReportParameterForm(ReportReference reportReference, ReportParamCallback callback)
   {
-    this.reportReference = reportReference;
-    this.callback = callback;
-    
-    Widget form = createForm(reportReference);
-    this.add(form);
+    this.add(getFormPanel(reportReference, callback));
   }
 
-  private Widget createForm(final ReportReference reportRef)
+  private Widget getFormPanel(final ReportReference reportRef, final ReportParamCallback callback)
   {
-    MosaicPanel p = new MosaicPanel(new BoxLayout(BoxLayout.Orientation.VERTICAL));
-    HeaderLabel label = new HeaderLabel(reportRef.getTitle(), true);
-    p.add(label, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
+    MosaicPanel p = new MosaicPanel();
+    p.setPadding(5);
+    p.add(createForm(reportRef, callback));    
+    return p;
+  }
 
-    String description = reportRef.getDescription()!=null ? reportRef.getDescription() : "";
-    p.add(new HTML("<blockquote>"+description+"</blockquote>"));
+  private MosaicPanel createForm(ReportReference reportRef, final ReportParamCallback callback)
+  {
+    boolean hasParameters = reportRef.getParameterMetaData().size()>0;
+    int numRows = hasParameters ?
+        reportRef.getParameterMetaData().size() + 1 : 2;
 
-    Grid grid = new Grid(reportRef.getParameterMetaData().size(),2);
-    grid.setCellPadding(5);
+    MosaicPanel form = new MosaicPanel(new GridLayout(2, numRows));
 
-    int row = 0;
+    final Button createBtn = new Button("Create Report",
+        new ClickHandler()
+        {
+          public void onClick(ClickEvent clickEvent)
+          {
+            Map<String, String> values = new HashMap<String, String>();
+            for (InputField field : fields)
+              values.put(field.id, field.getValue());
+
+            callback.onSumbit(values);
+          }
+        });
+
+
     for(final ReportParameter reportParam : reportRef.getParameterMetaData())
     {
       String promptText = reportParam.getPromptText() != null ? reportParam.getPromptText() : reportParam.getName();
       String helpText = reportParam.getHelptext() != null ? reportParam.getHelptext() : "";
 
-      grid.setWidget(row,0, new HTML("<b>"+promptText+"</b><br/>"+helpText));
-      
       final TextBox textBox = new TextBox();
 
-      // retain access to values
+      // retain reference to values
       final InputField field = new InputField()
       {
         String getValue()
@@ -85,41 +95,37 @@
         }
 
         {
-        widget = textBox;
-        id = reportParam.getName();
-               
-      }};
+          widget = textBox;
+          id = reportParam.getName();
+
+        }
+      };
+
       fields.add(field);
 
-      grid.setWidget(row,1, textBox);
-      grid.getRowFormatter().setVerticalAlign(row, HasVerticalAlignment.ALIGN_BOTTOM);
+      form.add(new HTML("<b>"+promptText+"</b><br/>"+helpText));           
+      form.add(textBox);
+    }
 
-      row++;
+    // fallback
+    if(!hasParameters)
+    {
+      form.add(new HTML("This report doesn't require any paramters.")
+      , new GridLayoutData(2,1, HasHorizontalAlignment.ALIGN_CENTER, HasVerticalAlignment.ALIGN_TOP));
     }
 
-    p.add(grid);
-    p.add(new Button("Submit",
-        new ClickListener()
-        {
-          public void onClick(Widget widget)
-          {
-            Map<String, String> values = new HashMap<String,String>();
-            for(InputField field : fields)
-              values.put(field.id, field.getValue());   
+    // submit
+    form.add(new HTML(""));
+    form.add(createBtn, new GridLayoutData(HasHorizontalAlignment.ALIGN_RIGHT, HasVerticalAlignment.ALIGN_BOTTOM));
 
-            callback.onSumbit(values);
-          }
-        })
-    );
-
-    return p;
+    return form;
   }
 
-  class InputField
+  private class InputField
   {
     Widget widget;
     String id;
-        
+
     String getValue()
     {
       throw new IllegalArgumentException("Override this method");

Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java	2010-02-02 14:57:28 UTC (rev 948)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java	2010-02-04 10:18:17 UTC (rev 949)
@@ -21,20 +21,14 @@
  */
 package org.jboss.bpm.console.client.report;
 
-import com.google.gwt.core.client.GWT;
-import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.Timer;
-import com.google.gwt.user.client.ui.*;
+import com.google.gwt.user.client.ui.Widget;
 import com.mvc4g.client.Controller;
 import com.mvc4g.client.Event;
 import com.mvc4g.client.ViewInterface;
-import org.gwt.mosaic.ui.client.Caption;
-import org.gwt.mosaic.ui.client.DeckLayoutPanel;
-import org.gwt.mosaic.ui.client.ImageButton;
+import org.gwt.mosaic.ui.client.layout.FillLayout;
 import org.gwt.mosaic.ui.client.layout.MosaicPanel;
-import org.jboss.bpm.console.client.common.AbstractView;
 import org.jboss.bpm.console.client.common.WidgetWindowPanel;
-import org.jboss.bpm.console.client.icons.ConsoleIconBundle;
 import org.jboss.bpm.console.client.search.UpdateSearchDefinitionsAction;
 import org.jboss.bpm.report.model.ReportReference;
 import org.jboss.errai.common.client.framework.WSComponent;
@@ -46,26 +40,24 @@
 /**
  * @author Heiko.Braun <heiko.braun at jboss.com>
  */
- at LoadTool(name = "Available Reports", group = "Reporting", icon="reportIcon")
+ at LoadTool(name = "Report Templates", group = "Reporting", icon="reportIcon")
 public class ReportView implements ViewInterface, WSComponent
 {
   public final static String ID = ReportView.class.getName();
 
   private Controller controller;
-  private boolean isInitialized;
-  private DeckLayoutPanel deck;
+  private boolean isInitialized; 
   private ReportLaunchPadView coverpanel;
 
-  MosaicPanel panel;
+  private MosaicPanel panel;
 
-  @Override
   public Widget getWidget()
   {
-    panel = new MosaicPanel();
+    panel = new MosaicPanel(new FillLayout());
+    panel.setPadding(0);
     controller = Registry.get(Controller.class);
 
     initialize();
-    panel.add(deck);
 
     controller.addView(ReportView.ID, this);
     controller.addAction(UpdateReportConfigAction.ID, new UpdateReportConfigAction());
@@ -81,7 +73,7 @@
       }
     };
 
-    t.schedule(50);
+    t.schedule(500);
 
     return panel;
   }
@@ -95,18 +87,9 @@
   {
     if(!isInitialized)
     {
-      // layout
-      deck = new DeckLayoutPanel();
-
-      // loading
-      MosaicPanel loadingPanel = new MosaicPanel();
-      loadingPanel.add(new Label("Loading..."));
-      loadingPanel.setVisible(false);
-      deck.add(loadingPanel);
-
       // cover
       coverpanel = new ReportLaunchPadView();
-      deck.add(coverpanel);
+      panel.add(coverpanel);
 
       // views and actions      
       controller.addView(ReportLaunchPadView.ID, coverpanel);
@@ -114,8 +97,6 @@
       controller.addAction(UpdateSearchDefinitionsAction.ID, new UpdateSearchDefinitionsAction());
       controller.addAction(RenderReportAction.ID, new RenderReportAction());
 
-      deck.showWidget(0);
-
       this.isInitialized = true;
     }
   }
@@ -128,14 +109,13 @@
   public void configure(List<ReportReference> reports)
   {
     // update coverview
-    coverpanel.update(reports);
-    deck.showWidget(1);
+    coverpanel.update(reports);    
   }
 
   public void displayReport(String title, String dispatchUrl)
   {
-    ReportFrame reportFrame = new ReportFrame(dispatchUrl);
-    reportFrame.initialize();
+    ReportFrame reportFrame = new ReportFrame();
+    reportFrame.setFrameUrl(dispatchUrl);
     new WidgetWindowPanel(title, reportFrame, true);
   }
 }

Added: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/public/blank.html
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/public/blank.html	                        (rev 0)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/public/blank.html	2010-02-04 10:18:17 UTC (rev 949)
@@ -0,0 +1,5 @@
+<html>
+<body background="#ffffff">
+
+</body>
+</html>
\ No newline at end of file

Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/public/console.css
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/public/console.css	2010-02-02 14:57:28 UTC (rev 948)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/public/console.css	2010-02-04 10:18:17 UTC (rev 949)
@@ -380,4 +380,4 @@
     height: 25px;
     margin:0px;
     padding:0px;
-}
\ No newline at end of file
+}



More information about the overlord-commits mailing list