[jbpm-commits] JBoss JBPM SVN: r4553 - in projects/gwt-console/branches/hbraun: plugin-example/src/main/java/org/jboss/bpm/console/client/mapsplugin and 4 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Wed Apr 15 04:10:23 EDT 2009
Author: heiko.braun at jboss.com
Date: 2009-04-15 04:10:22 -0400 (Wed, 15 Apr 2009)
New Revision: 4553
Modified:
projects/gwt-console/branches/hbraun/plugin-api/src/main/java/org/jboss/bpm/console/client/MenuSection.java
projects/gwt-console/branches/hbraun/plugin-api/src/main/java/org/jboss/bpm/console/client/Workspace.java
projects/gwt-console/branches/hbraun/plugin-example/src/main/java/org/jboss/bpm/console/client/mapsplugin/MapsNavigationTree.java
projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/Header.java
projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/MainView.java
projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditor.java
projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/report/ReportEditor.java
projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/task/TaskEditor.java
Log:
Use DeckPanels for displaying editors
Modified: projects/gwt-console/branches/hbraun/plugin-api/src/main/java/org/jboss/bpm/console/client/MenuSection.java
===================================================================
--- projects/gwt-console/branches/hbraun/plugin-api/src/main/java/org/jboss/bpm/console/client/MenuSection.java 2009-04-14 17:34:47 UTC (rev 4552)
+++ projects/gwt-console/branches/hbraun/plugin-api/src/main/java/org/jboss/bpm/console/client/MenuSection.java 2009-04-15 08:10:22 UTC (rev 4553)
@@ -21,8 +21,8 @@
*/
package org.jboss.bpm.console.client;
+import com.google.gwt.user.client.ui.Tree;
import org.gwt.mosaic.ui.client.layout.LayoutPanel;
-import com.google.gwt.widgetideas.client.FastTree;
/**
@@ -36,7 +36,7 @@
private String menuTitle;
private String iconClass;
- public MenuSection(String title, String iconClass, FastTree tree)
+ public MenuSection(String title, String iconClass, Tree tree)
{
super();
Modified: projects/gwt-console/branches/hbraun/plugin-api/src/main/java/org/jboss/bpm/console/client/Workspace.java
===================================================================
--- projects/gwt-console/branches/hbraun/plugin-api/src/main/java/org/jboss/bpm/console/client/Workspace.java 2009-04-14 17:34:47 UTC (rev 4552)
+++ projects/gwt-console/branches/hbraun/plugin-api/src/main/java/org/jboss/bpm/console/client/Workspace.java 2009-04-15 08:10:22 UTC (rev 4553)
@@ -21,15 +21,15 @@
*/
package org.jboss.bpm.console.client;
-import org.gwt.mosaic.ui.client.TabLayoutPanel;
+import org.gwt.mosaic.ui.client.DeckLayoutPanel;
import org.gwt.mosaic.ui.client.layout.LayoutPanel;
/**
- * Maintains {@link org.jboss.bpm.console.client.Workspace}'s
+ * Maintains {@link Editor}'s
*
* @author Heiko.Braun <heiko.braun at jboss.com>
*/
-public class Workspace extends TabLayoutPanel
+public class Workspace extends DeckLayoutPanel
{
protected ApplicationContext view;
private Menu menu;
@@ -42,11 +42,11 @@
}
- private LayoutPanel createTab(Editor editor, boolean closeable)
+ private EditorDeck createDeck(Editor editor)
{
- LayoutPanel tab = new LayoutPanel();
- tab.setTitle(editor.getTitle());
- return tab;
+ EditorDeck deck = new EditorDeck(editor);
+ deck.add(editor);
+ return deck;
}
public void addEditor(Editor editor, boolean closeable)
@@ -54,33 +54,51 @@
// Menu
menu.addSection(editor.provideMenuSection());
- // Editor pane
- LayoutPanel tab = createTab(editor, closeable);
- tab.add(editor);
- this.add(tab, editor.getTitle());
+ // Editor deck
+ EditorDeck deck = createDeck(editor);
+ deck.index = this.getWidgetCount();
+ this.add(deck);
}
public boolean hasEditor(String id)
{
- boolean b = false;
- /*final String tabId = id + ".tab";
+ return findEditor(id)!=null;
+ }
- Component[] tabs = this.getItems();
- for (int i = 0; i < tabs.length; i++)
+ public void showEditor(String id)
+ {
+ EditorDeck deck = findEditor(id);
+ if(null==deck)
+ throw new IllegalArgumentException("No such editor: " +id);
+ this.showWidget(deck.index);
+ }
+
+ private EditorDeck findEditor(String id)
+ {
+ EditorDeck match = null;
+ for(int i=0; i<this.getWidgetCount(); i++)
{
- Component tab = tabs[i];
- if (tab.getId().equals(tabId))
+ EditorDeck deck = (EditorDeck) this.getWidget(i);
+ if(id.equals( deck.editor.getEditorId()))
{
- b = true;
+ match = deck;
break;
}
- } */
+ }
+
+ return match;
+ }
- return b;
+ private class EditorDeck extends LayoutPanel
+ {
+ Editor editor;
+ int index;
+
+ public EditorDeck(Editor editor)
+ {
+ super();
+ this.editor = editor;
+ }
+
}
-
- public void showEditor(String id)
- {
- this.selectTab(0);
- }
}
Modified: projects/gwt-console/branches/hbraun/plugin-example/src/main/java/org/jboss/bpm/console/client/mapsplugin/MapsNavigationTree.java
===================================================================
--- projects/gwt-console/branches/hbraun/plugin-example/src/main/java/org/jboss/bpm/console/client/mapsplugin/MapsNavigationTree.java 2009-04-14 17:34:47 UTC (rev 4552)
+++ projects/gwt-console/branches/hbraun/plugin-example/src/main/java/org/jboss/bpm/console/client/mapsplugin/MapsNavigationTree.java 2009-04-15 08:10:22 UTC (rev 4553)
@@ -21,16 +21,11 @@
*/
package org.jboss.bpm.console.client.mapsplugin;
-import com.gwtext.client.widgets.tree.TreePanel;
-import com.gwtext.client.widgets.tree.TreeNode;
-import com.gwtext.client.widgets.tree.event.TreeNodeListenerAdapter;
-import com.gwtext.client.data.Node;
-import com.gwtext.client.core.EventObject;
-import com.google.gwt.widgetideas.client.FastTree;
-import com.google.gwt.widgetideas.client.FastTreeItem;
+import com.google.gwt.user.client.ui.Tree;
+import com.google.gwt.user.client.ui.TreeItem;
import org.jboss.bpm.console.client.ApplicationContext;
-class MapsNavigationTree extends FastTree
+class MapsNavigationTree extends Tree
{
@@ -42,12 +37,11 @@
public MapsNavigationTree(final ApplicationContext appContext)
{
- FastTreeItem root = this.addItem("Maps plugin menu");
+ TreeItem root = new TreeItem("Maps plugin menu");
- FastTreeItem navEntry = root.addItem("Open maps");
+ TreeItem navEntry = new TreeItem("Open maps");
+ root.addItem(navEntry);
- //navEntry.;
-
/*
new TreeNodeListenerAdapter()
@@ -66,6 +60,8 @@
}
}
).
- */
+ */
+
+ addItem(root);
}
}
Modified: projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/Header.java
===================================================================
--- projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/Header.java 2009-04-14 17:34:47 UTC (rev 4552)
+++ projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/Header.java 2009-04-15 08:10:22 UTC (rev 4553)
@@ -22,9 +22,6 @@
package org.jboss.bpm.console.client;
import com.google.gwt.user.client.ui.*;
-import org.gwt.mosaic.ui.client.layout.BoxLayout;
-import org.gwt.mosaic.ui.client.layout.LayoutPanel;
-import org.gwt.mosaic.ui.client.layout.BoxLayoutData;
import java.util.List;
@@ -37,7 +34,7 @@
public final static String ID = "org.jboss.bpm.headerPanel";
- public Header(ApplicationContext appContext)
+ public Header(ApplicationContext appContext, String username, List<String> roles)
{
super();
this.setHorizontalAlignment(HasHorizontalAlignment.ALIGN_RIGHT);
@@ -46,9 +43,10 @@
this.appContext = appContext;
+ createUserInfo(username, roles);
}
- public void setUserInfo(String username, List<String> roles)
+ private void createUserInfo(String username, List<String> roles)
{
HorizontalPanel p = new HorizontalPanel();
p.setVerticalAlignment(HasVerticalAlignment.ALIGN_BOTTOM);
Modified: projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/MainView.java
===================================================================
--- projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/MainView.java 2009-04-14 17:34:47 UTC (rev 4552)
+++ projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/MainView.java 2009-04-15 08:10:22 UTC (rev 4553)
@@ -22,7 +22,6 @@
package org.jboss.bpm.console.client;
import com.google.gwt.core.client.GWT;
-import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.HTML;
import com.google.gwt.user.client.ui.RootPanel;
@@ -59,9 +58,6 @@
Viewport viewport = new Viewport();
- /*Panel mainPanel = createMainPanel();
- assembleMainApplication(mainPanel);*/
-
LayoutPanel layout = createLayout();
viewport.add(layout);
@@ -72,14 +68,8 @@
{
final LayoutPanel layoutPanel = new LayoutPanel(new BorderLayout());
- final Button b2 = new Button("Button 2");
- final Button b3 = new Button("Button 3");
- final Button b4 = new Button("Button 4");
- final Button b5 = new Button("Button 5");
-
// header
- header = new Header(this);
- header.setUserInfo(auth.getUsername(), auth.getRolesAssigned());
+ header = new Header(this, auth.getUsername(), auth.getRolesAssigned());
layoutPanel.add(header, new BorderLayoutData(Region.NORTH, 50));
// menu
@@ -87,17 +77,23 @@
layoutPanel.add(menu, new BorderLayoutData(Region.WEST, 200));
// workspace
- workspace = new Workspace(menu);
- WorkspaceLauncher launcher = GWT.create(WorkspaceLauncher.class);
- launcher.launch(this, workspace);
+ workspace = createWorkspace(layoutPanel);
layoutPanel.add(workspace, new BorderLayoutData(Region.CENTER, false));
-
+
//layoutPanel.add(b2, new BorderLayoutData(Region.SOUTH, 10, 200));
//layoutPanel.add(b3, new BorderLayoutData(Region.EAST, 10, 200));
return layoutPanel;
}
+ private Workspace createWorkspace(LayoutPanel layoutPanel)
+ {
+ Workspace workspace = new Workspace(menu);
+ WorkspaceLauncher launcher = GWT.create(WorkspaceLauncher.class);
+ launcher.launch(this, workspace);
+ return workspace;
+ }
+
/*private Panel createMainPanel()
{
Panel mainPanel = new Panel();
Modified: projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditor.java
===================================================================
--- projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditor.java 2009-04-14 17:34:47 UTC (rev 4552)
+++ projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditor.java 2009-04-15 08:10:22 UTC (rev 4553)
@@ -22,8 +22,9 @@
package org.jboss.bpm.console.client.process;
import com.google.gwt.core.client.GWT;
-import com.google.gwt.widgetideas.client.FastTree;
-import com.google.gwt.widgetideas.client.FastTreeItem;
+import com.google.gwt.user.client.ui.Tree;
+import com.google.gwt.user.client.ui.TreeItem;
+import com.google.gwt.user.client.ui.TreeListener;
import com.gwtext.client.core.Connection;
import com.gwtext.client.core.EventObject;
import com.gwtext.client.widgets.Button;
@@ -34,10 +35,7 @@
import com.gwtext.client.widgets.form.FormPanel;
import com.gwtext.client.widgets.form.TextField;
import com.gwtext.client.widgets.form.event.FormListenerAdapter;
-import org.jboss.bpm.console.client.ApplicationContext;
-import org.jboss.bpm.console.client.Editor;
-import org.jboss.bpm.console.client.MenuSection;
-import org.jboss.bpm.console.client.UIConstants;
+import org.jboss.bpm.console.client.*;
import org.jboss.bpm.console.client.util.ConsoleLog;
import org.jboss.bpm.console.client.util.ModelListenerRegistry;
import org.jboss.bpm.console.client.util.ModelModificationCallback;
@@ -50,7 +48,7 @@
public final static String ID = "org.jboss.bpm.process.ProcessEditor";
private ProcessDefinitionList processDefinitionList;
-
+
private ModelListenerRegistry modelListeners = new ModelListenerRegistry();
public ProcessEditor(final ApplicationContext appContext)
@@ -144,7 +142,7 @@
outerFormPanel.add(formPanel);
this.add(processDefinitionList);
- this.add(outerFormPanel);
+ this.add(outerFormPanel);
}
@@ -166,7 +164,7 @@
public MenuSection provideMenuSection()
{
- return new MenuSection("Process Management", "bpm-process-icon", new ProcessTree());
+ return new MenuSection("Process Management", "bpm-process-icon", new ProcessTree());
}
public ProcessDefinitionList getProcessDefinitionList()
@@ -180,7 +178,7 @@
modelListeners.fireResetEvent();
}
- class ProcessTree extends FastTree
+ class ProcessTree extends Tree
{
public ProcessTree()
@@ -189,32 +187,27 @@
super();
super.setTitle("Processes");
- FastTreeItem root = addItem("Process Definitions");
+ TreeItem root = addItem("Process Definitions");
+ TreeItem definitions = root.addItem("View definitions");
- FastTreeItem definitions = root.addItem("View definitions");
- /*definitions.addListener(
- new TreeNodeListenerAdapter()
+ addTreeListener(
+ new TreeListener()
{
- public void onClick(Node node, EventObject eventObject)
+ public void onTreeItemSelected(TreeItem treeItem)
{
- Workspace workspace = appContext.getWorkpace();
- if (workspace.hasEditor(ProcessEditor.ID))
+ if("View definitions".equals(treeItem.getText()))
{
+ Workspace workspace = appContext.getWorkpace();
workspace.showEditor(ProcessEditor.ID);
}
- else
- {
- workspace.addEditor(new ProcessEditor(appContext), false);
- }
+ }
+ public void onTreeItemStateChanged(TreeItem treeItem)
+ {
+
}
}
);
- */
-
- //TreeNode upload = new TreeNode("Upload new definitions");
- //upload.setExpanded(true);
}
}
-
}
Modified: projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/report/ReportEditor.java
===================================================================
--- projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/report/ReportEditor.java 2009-04-14 17:34:47 UTC (rev 4552)
+++ projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/report/ReportEditor.java 2009-04-15 08:10:22 UTC (rev 4553)
@@ -21,8 +21,7 @@
*/
package org.jboss.bpm.console.client.report;
-import com.google.gwt.widgetideas.client.FastTree;
-import com.google.gwt.widgetideas.client.FastTreeItem;
+import com.google.gwt.user.client.ui.TreeItem;
import com.gwtext.client.core.EventObject;
import com.gwtext.client.data.*;
import com.gwtext.client.widgets.*;
@@ -187,7 +186,7 @@
return new MenuSection("Metrics and Stats", "bpm-metric-icon", new MetricTree());
}
- class MetricTree extends FastTree
+ class MetricTree extends com.google.gwt.user.client.ui.Tree
{
public MetricTree()
@@ -195,9 +194,10 @@
super();
- FastTreeItem root = addItem("Process Metrics");
+ TreeItem root = new TreeItem("Process Metrics");
- FastTreeItem overview = root.addItem("Process workload");
+ TreeItem overview = new TreeItem("Process workload");
+ root.addItem(overview);
/*overview.addListener(
new TreeNodeListenerAdapter()
@@ -216,7 +216,9 @@
}
}
- );*/
+ );*/
+
+
}
}
}
Modified: projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/task/TaskEditor.java
===================================================================
--- projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/task/TaskEditor.java 2009-04-14 17:34:47 UTC (rev 4552)
+++ projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/task/TaskEditor.java 2009-04-15 08:10:22 UTC (rev 4553)
@@ -21,8 +21,9 @@
*/
package org.jboss.bpm.console.client.task;
-import com.google.gwt.widgetideas.client.FastTree;
-import com.google.gwt.widgetideas.client.FastTreeItem;
+import com.google.gwt.user.client.ui.Tree;
+import com.google.gwt.user.client.ui.TreeItem;
+import com.google.gwt.user.client.ui.TreeListener;
import com.gwtext.client.data.Record;
import com.gwtext.client.widgets.Component;
import com.gwtext.client.widgets.PaddedPanel;
@@ -32,10 +33,7 @@
import com.gwtext.client.widgets.grid.RowSelectionModel;
import com.gwtext.client.widgets.grid.event.RowSelectionListenerAdapter;
import com.gwtext.client.widgets.layout.ColumnLayout;
-import org.jboss.bpm.console.client.ApplicationContext;
-import org.jboss.bpm.console.client.Editor;
-import org.jboss.bpm.console.client.MenuSection;
-import org.jboss.bpm.console.client.UIConstants;
+import org.jboss.bpm.console.client.*;
import org.jboss.bpm.console.client.model.TaskRef;
import org.jboss.bpm.console.client.util.ModelChangeListener;
import org.jboss.bpm.console.client.util.ModelListenerRegistry;
@@ -49,7 +47,7 @@
public final static String ID = "org.jboss.bpm.task.TaskList";
private TaskList taskList;
-
+
private boolean initialized;
private TabPanel tabPanel;
@@ -58,10 +56,10 @@
public TaskEditor(ApplicationContext applicationContext)
{
super(applicationContext);
- this.setId(ID);
+ this.setId(ID);
this.setLayout(new ColumnLayout());
- this.setWidth(UIConstants.EDITOR_WIDTH);
+ this.setWidth(UIConstants.EDITOR_WIDTH);
this.addListener(
new PanelListenerAdapter()
@@ -157,9 +155,9 @@
this.add(tabPadding);
// -------
-
+
doLayout();
-
+
initialized = true;
}
@@ -187,35 +185,34 @@
resetEditor();
}
- class TaskTree extends FastTree
+ class TaskTree extends Tree
{
public TaskTree()
{
super();
- FastTreeItem root = addItem("Your tasks");
+ TreeItem root = addItem("Your tasks");
+ TreeItem overview = root.addItem("Overview");
- FastTreeItem overview = root.addItem("Overview");
- /*overview.addListener(
- new TreeNodeListenerAdapter()
+ addTreeListener(
+ new TreeListener()
{
- public void onClick(Node node, EventObject eventObject)
+ public void onTreeItemSelected(TreeItem treeItem)
{
- Workspace workspace = appContext.getWorkpace();
- if (workspace.hasEditor(ID))
+ if("Overview".equals(treeItem.getText()))
{
- workspace.showEditor(ID);
+ Workspace workspace = appContext.getWorkpace();
+ workspace.showEditor(TaskEditor.ID);
}
- else
- {
- workspace.addEditor(new TaskEditor(appContext), false);
- }
+ }
+ public void onTreeItemStateChanged(TreeItem treeItem)
+ {
+
}
}
- );*/
-
+ );
}
}
}
More information about the jbpm-commits
mailing list