[jbpm-commits] JBoss JBPM SVN: r3658 - in projects/gwt-console/trunk: plugin/src/main/java/org/jboss/bpm/console/client and 4 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Fri Jan 16 04:49:14 EST 2009


Author: heiko.braun at jboss.com
Date: 2009-01-16 04:49:14 -0500 (Fri, 16 Jan 2009)
New Revision: 3658

Modified:
   projects/gwt-console/trunk/plugin/src/main/java/org/jboss/bpm/console/client/ApplicationContext.java
   projects/gwt-console/trunk/plugin/src/main/java/org/jboss/bpm/console/client/Editor.java
   projects/gwt-console/trunk/plugin/src/main/java/org/jboss/bpm/console/client/Workspace.java
   projects/gwt-console/trunk/pom.xml
   projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/MainView.java
   projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditor.java
   projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/report/ReportEditor.java
   projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/TaskEditor.java
Log:
Cleanup app context interface

Modified: projects/gwt-console/trunk/plugin/src/main/java/org/jboss/bpm/console/client/ApplicationContext.java
===================================================================
--- projects/gwt-console/trunk/plugin/src/main/java/org/jboss/bpm/console/client/ApplicationContext.java	2009-01-15 21:21:47 UTC (rev 3657)
+++ projects/gwt-console/trunk/plugin/src/main/java/org/jboss/bpm/console/client/ApplicationContext.java	2009-01-16 09:49:14 UTC (rev 3658)
@@ -21,6 +21,8 @@
  */
 package org.jboss.bpm.console.client;
 
+import com.gwtext.client.widgets.Viewport;
+
 /**
  * Provides context information to console compoments and plugins.
  * 
@@ -28,15 +30,14 @@
  */
 public interface ApplicationContext
 {
-  void addEditor(Editor editor);
-
-  boolean hasEditor(String id);
-
-  void showEditor(String id);
-
+  Workspace getWorkpace();
+  
   URLBuilder getUrlBuilder();
 
   void displayMessage(String message, boolean isError);
 
   Authentication getAuthentication();
+
+  ConsoleConfig getConfig();
+ 
 }

Modified: projects/gwt-console/trunk/plugin/src/main/java/org/jboss/bpm/console/client/Editor.java
===================================================================
--- projects/gwt-console/trunk/plugin/src/main/java/org/jboss/bpm/console/client/Editor.java	2009-01-15 21:21:47 UTC (rev 3657)
+++ projects/gwt-console/trunk/plugin/src/main/java/org/jboss/bpm/console/client/Editor.java	2009-01-16 09:49:14 UTC (rev 3658)
@@ -39,7 +39,7 @@
   protected ApplicationContext appContext;
   private TabPanel tabPanel;
 
-  protected Editor(ApplicationContext applicationContext)
+  public Editor(ApplicationContext applicationContext)
   {
     super();
     this.appContext = applicationContext;

Modified: projects/gwt-console/trunk/plugin/src/main/java/org/jboss/bpm/console/client/Workspace.java
===================================================================
--- projects/gwt-console/trunk/plugin/src/main/java/org/jboss/bpm/console/client/Workspace.java	2009-01-15 21:21:47 UTC (rev 3657)
+++ projects/gwt-console/trunk/plugin/src/main/java/org/jboss/bpm/console/client/Workspace.java	2009-01-16 09:49:14 UTC (rev 3658)
@@ -93,7 +93,7 @@
     return b;
   }
 
-  public void showTab(String id)
+  public void showEditor(String id)
   {
     final String tabId = id + ".tab";
     this.setActiveTab(tabId);

Modified: projects/gwt-console/trunk/pom.xml
===================================================================
--- projects/gwt-console/trunk/pom.xml	2009-01-15 21:21:47 UTC (rev 3657)
+++ projects/gwt-console/trunk/pom.xml	2009-01-16 09:49:14 UTC (rev 3658)
@@ -38,7 +38,7 @@
       <module>server</module>
       <module>war</module>
       <module>plugin/</module>
-      <!--module>plugin-example</module-->
+      <module>plugin-example</module>
    </modules>
 
    <dependencyManagement>

Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/MainView.java
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/MainView.java	2009-01-15 21:21:47 UTC (rev 3657)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/MainView.java	2009-01-16 09:49:14 UTC (rev 3658)
@@ -33,8 +33,6 @@
 import org.jboss.bpm.console.client.util.ConsoleLog;
 import org.jboss.bpm.console.client.WorkspaceLauncher;
 
-import java.util.List;
-
 /**
  * The main composite that assembles the gwt console application.
  *
@@ -53,11 +51,6 @@
 
   private ConsoleConfig config;
 
-  public boolean isAttached()
-  {
-    return super.isAttached();    //To change body of overridden methods use File | Settings | File Templates.
-  }
-
   public MainView(Authentication auth, URLBuilder urlBuilder, ConsoleConfig config)
   {
     this.auth = auth;
@@ -67,7 +60,7 @@
     Panel mainPanel = createMainPanel();
     assembleMainApplication(mainPanel);
 
-    viewport = new Viewport(mainPanel);
+    viewport = new Viewport(mainPanel);    
   }
 
   private Panel createMainPanel()
@@ -129,7 +122,7 @@
 
   public void showEditor(String id)
   {
-    workspace.showTab(id);
+    workspace.showEditor(id);
   }
 
   public URLBuilder getUrlBuilder()
@@ -162,4 +155,19 @@
   {
     return auth;
   }
+
+  public ConsoleConfig getConfig()
+  {
+    return config;
+  }
+
+  public Viewport getViewport()
+  {
+    return viewport;
+  }
+
+  public Workspace getWorkpace()
+  {
+    return workspace;
+  }
 }

Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditor.java
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditor.java	2009-01-15 21:21:47 UTC (rev 3657)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditor.java	2009-01-16 09:49:14 UTC (rev 3658)
@@ -49,14 +49,13 @@
   public final static String ID = "org.jboss.bpm.process.ProcessEditor";
 
   private ProcessDefinitionList processDefinitionList;
-  private ApplicationContext mainView;
+  
   private ModelListenerRegistry modelListeners = new ModelListenerRegistry();
 
-  public ProcessEditor(final ApplicationContext view)
+  public ProcessEditor(final ApplicationContext appContext)
   {
-    super(view);
+    super(appContext);
     this.setId(ID);
-    this.mainView = view;
 
     this.setWidth(UIConstants.EDITOR_WIDTH);
 
@@ -73,7 +72,7 @@
     // ----------------------------------
 
     processDefinitionList = new ProcessDefinitionList(
-        modelModificationCallback, "Process Definitions", view
+        modelModificationCallback, "Process Definitions", appContext
     );
 
     // ----------------------------------
@@ -99,7 +98,7 @@
       public void onClick(Button button, EventObject e)
       {
         formPanel.getForm().submit(
-            view.getUrlBuilder().getUploadDefinitionURL(), null,
+            appContext.getUrlBuilder().getUploadDefinitionURL(), null,
             Connection.POST, "Uploading definition ...", false);
       }
     });
@@ -215,13 +214,14 @@
           {
             public void onClick(Node node, EventObject eventObject)
             {
-              if (mainView.hasEditor(ProcessEditor.ID))
+              Workspace workspace = appContext.getWorkpace();
+              if (workspace.hasEditor(ProcessEditor.ID))
               {
-                mainView.showEditor(ProcessEditor.ID);
+                workspace.showEditor(ProcessEditor.ID);
               }
               else
               {
-                mainView.addEditor(new ProcessEditor(mainView));
+                workspace.addEditor(new ProcessEditor(appContext), false);
               }
 
             }

Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/report/ReportEditor.java
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/report/ReportEditor.java	2009-01-15 21:21:47 UTC (rev 3657)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/report/ReportEditor.java	2009-01-16 09:49:14 UTC (rev 3658)
@@ -44,12 +44,11 @@
 public class ReportEditor extends Editor
 {
   public final static String ID = "org.jboss.bpm.metric.ProcessMetricOverview";
-  private ApplicationContext mainView;
 
-  public ReportEditor(final ApplicationContext view)
+  public ReportEditor(final ApplicationContext applicationContext)
   {
-    super(view);
-    this.mainView = view;
+    super(applicationContext);
+
     this.setId(ID);
     this.setPaddings(10);
 
@@ -62,7 +61,7 @@
           public void onRender(Component component)
           {
             
-            final String reportUrl = view.getUrlBuilder().getOverviewReportUrl();
+            final String reportUrl = applicationContext.getUrlBuilder().getOverviewReportUrl();
             ConsoleLog.debug("Report resource:" + reportUrl);
 
             final ComboBox comboBox = buildProcessSelection();
@@ -142,7 +141,7 @@
     if (editor.hasView(viewId))
       editor.showView(viewId);
     else
-      editor.addView(new ProcessReportView(definitionName, mainView), true);
+      editor.addView(new ProcessReportView(definitionName, appContext), true);
   }
 
   private ComboBox buildProcessSelection()
@@ -162,7 +161,7 @@
     reader.setId("processId");
 
     DataProxy dataProxy = new ScriptTagProxy(
-        mainView.getUrlBuilder().getProcessDefinitionsURL(), 1000 * 10);
+        appContext.getUrlBuilder().getProcessDefinitionsURL(), 1000 * 10);
 
     final Store store = new Store(dataProxy, reader, false);
     store.load();
@@ -218,13 +217,14 @@
           {
             public void onClick(Node node, EventObject eventObject)
             {
-              if (mainView.hasEditor(ReportEditor.ID))
+              Workspace workspace = appContext.getWorkpace();
+              if (workspace.hasEditor(ReportEditor.ID))
               {
-                mainView.showEditor(ReportEditor.ID);
+                workspace.showEditor(ReportEditor.ID);
               }
               else
               {
-                mainView.addEditor(new ReportEditor(mainView));
+                workspace.addEditor(new ReportEditor(appContext), false);
               }
 
             }

Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/TaskEditor.java
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/TaskEditor.java	2009-01-15 21:21:47 UTC (rev 3657)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/TaskEditor.java	2009-01-16 09:49:14 UTC (rev 3658)
@@ -48,7 +48,6 @@
 {
 
   public final static String ID = "org.jboss.bpm.task.TaskList";
-  private ApplicationContext mainView;
   private TaskList taskList;
   
   private boolean initialized;
@@ -56,11 +55,10 @@
 
   private ModelListenerRegistry modelListeners = new ModelListenerRegistry();
 
-  public TaskEditor(ApplicationContext mainView)
+  public TaskEditor(ApplicationContext applicationContext)
   {
-    super(mainView);
-    this.setId(ID);
-    this.mainView = mainView;
+    super(applicationContext);
+    this.setId(ID);    
 
     this.setLayout(new ColumnLayout());
     this.setWidth(UIConstants.EDITOR_WIDTH);
@@ -126,7 +124,7 @@
         }
       };
 
-      taskList = new TaskList(modelModificationCallback, "Task overview", mainView);
+      taskList = new TaskList(modelModificationCallback, "Task overview", appContext);
       final RowSelectionModel sm = new RowSelectionModel(true);
       sm.addListener(
           new RowSelectionListenerAdapter()
@@ -144,8 +142,8 @@
 
       // ----------------------------------
 
-      Panel detailsPanel = new TaskDetailsFormPanel(mainView, this);
-      Panel assignmentPanel = new AssignmentFormPanel(mainView, this);
+      Panel detailsPanel = new TaskDetailsFormPanel(appContext, this);
+      Panel assignmentPanel = new AssignmentFormPanel(appContext, this);
 
       modelListeners.addListener((ModelChangeListener) detailsPanel);
       modelListeners.addListener((ModelChangeListener) assignmentPanel);
@@ -217,13 +215,14 @@
           {
             public void onClick(Node node, EventObject eventObject)
             {
-              if (mainView.hasEditor(ID))
+              Workspace workspace = appContext.getWorkpace();
+              if (workspace.hasEditor(ID))
               {
-                mainView.showEditor(ID);
+                workspace.showEditor(ID);
               }
               else
               {
-                mainView.addEditor(new TaskEditor(mainView));
+                workspace.addEditor(new TaskEditor(appContext), false);
               }
 
             }




More information about the jbpm-commits mailing list