[jbpm-commits] JBoss JBPM SVN: r1823 - in jbpm3/trunk/modules/gwt-console/war: src/main/java/org/jboss/bpm/console/client and 5 other directories.

Author: heiko.braun(a)jboss.com Date: 2008-08-05 09:12:10 -0400 (Tue, 05 Aug 2008) New Revision: 1823 Added: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionListEditor.java jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessImageView.java jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceListEditor.java jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/BareEditorView.java jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/images/processSample.jpg Removed: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessListEditor.java jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/GWT-default.css Modified: jbpm3/trunk/modules/gwt-console/war/pom.xml jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/Application.java jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/ConsoleView.java jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/EditorPanel.java jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/HeaderPanel.java jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/model/MockProcessDefinitionDAO.java jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/model/MockProcessInstanceDAO.java jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionList.java jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceEditor.java jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceList.java jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/EditorView.java jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/Application.html jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/console.css Log: Switch editor views by component id. Make sure specific views are only created once and reused (set focus) Modified: jbpm3/trunk/modules/gwt-console/war/pom.xml =================================================================== --- jbpm3/trunk/modules/gwt-console/war/pom.xml 2008-08-05 10:38:38 UTC (rev 1822) +++ jbpm3/trunk/modules/gwt-console/war/pom.xml 2008-08-05 13:12:10 UTC (rev 1823) @@ -52,11 +52,18 @@ <style>DETAILED</style> <generateGettersAndSetters>true</generateGettersAndSetters> <noServer>false</noServer> - <extraJvmArgs>-Dgwt.coverage.enable=true</extraJvmArgs> + <extraJvmArgs>-Dgwt.coverage.enable=true -Xmx256M -Xms256M</extraJvmArgs> </configuration> <executions> <execution> + <id>compile</id> + <phase>process-classes</phase> <goals> + <goal>compile</goal> + </goals> + </execution> + <execution> + <goals> <!-- autoconfig gwt (download and unzip GWT itself) *note* you can also use manual config, if you already have GWT installed Modified: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/Application.java =================================================================== --- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/Application.java 2008-08-05 10:38:38 UTC (rev 1822) +++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/Application.java 2008-08-05 13:12:10 UTC (rev 1823) @@ -1,13 +1,6 @@ package org.jboss.bpm.console.client; import com.google.gwt.core.client.EntryPoint; -import com.gwtext.client.widgets.layout.BorderLayoutData; -import com.gwtext.client.widgets.layout.FitLayout; -import com.gwtext.client.widgets.layout.BorderLayout; -import com.gwtext.client.widgets.Panel; -import com.gwtext.client.widgets.Viewport; -import com.gwtext.client.core.RegionPosition; -import com.gwtext.client.core.Margins; /** * Entry point classes define <code>onModuleLoad()</code>. Modified: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/ConsoleView.java =================================================================== --- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/ConsoleView.java 2008-08-05 10:38:38 UTC (rev 1822) +++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/ConsoleView.java 2008-08-05 13:12:10 UTC (rev 1823) @@ -23,15 +23,14 @@ import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.HTML; +import com.gwtext.client.core.Margins; import com.gwtext.client.core.RegionPosition; -import com.gwtext.client.core.Margins; import com.gwtext.client.widgets.Panel; import com.gwtext.client.widgets.Viewport; import com.gwtext.client.widgets.layout.BorderLayout; import com.gwtext.client.widgets.layout.BorderLayoutData; import com.gwtext.client.widgets.layout.FitLayout; -import org.jboss.bpm.console.client.model.DAOFactory; -import org.jboss.bpm.console.client.process.ProcessListEditor; +import org.jboss.bpm.console.client.process.ProcessDefinitionListEditor; import org.jboss.bpm.console.client.widgets.EditorView; /** @@ -52,7 +51,7 @@ { mainPanel.setBorder(false); mainPanel.setPaddings(15); - mainPanel.setLayout(new FitLayout()); + mainPanel.setLayout(new FitLayout()); initWidget( mainPanel ); @@ -78,24 +77,31 @@ editorPanel = new EditorPanel(); borderPanel.add(editorPanel, new BorderLayoutData(RegionPosition.CENTER)); - setupEditors(); + // ------------------------------------------ + + editorPanel.addEditor( new ProcessDefinitionListEditor(this), false ); // ------------------------------------------ mainPanel.add(borderPanel); Viewport viewport = new Viewport(mainPanel); } - - private void setupEditors() - { - editorPanel.addEditor( new ProcessListEditor(this), false ); - } public void addEditorView(EditorView editorView) { editorPanel.addEditor(editorView, true); } + public boolean hasEditorView(String id) + { + return editorPanel.hasEditor(id); + } + + public void showEditor(String id) + { + editorPanel.showTab(id); + } + public void setError(String error) { status.setText(error); Modified: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/EditorPanel.java =================================================================== --- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/EditorPanel.java 2008-08-05 10:38:38 UTC (rev 1822) +++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/EditorPanel.java 2008-08-05 13:12:10 UTC (rev 1823) @@ -21,10 +21,10 @@ */ package org.jboss.bpm.console.client; +import com.gwtext.client.widgets.Component; import com.gwtext.client.widgets.Panel; import com.gwtext.client.widgets.TabPanel; import com.gwtext.client.widgets.layout.FitLayout; - import org.jboss.bpm.console.client.widgets.EditorView; /** @@ -41,26 +41,56 @@ this.setResizeTabs(true); this.setMinTabWidth(115); this.setTabWidth(135); - this.setEnableTabScroll(true); - this.setWidth("100%"); - this.setHeight("100%"); + this.setEnableTabScroll(true); this.setActiveTab(0); } - private Panel addTab(String title, boolean closeable) { - Panel tab = new Panel(); + private Panel addTab(EditorView editorView, boolean closeable) { + Panel tab = new WrapperPanel(editorView.getId()+".tab"); tab.setAutoScroll(true); - tab.setTitle(title); + tab.setTitle(editorView.getTitle()); tab.setClosable(closeable); - tab.setLayout(new FitLayout()); + tab.setLayout(new FitLayout()); this.add(tab); return tab; } public void addEditor(EditorView editorView, boolean closeable) { - Panel tab = addTab(editorView.getTitle(), closeable); + Panel tab = addTab(editorView, closeable); tab.add(editorView); this.setActiveTab(tab.getId()); } + + public boolean hasEditor(String id) + { + boolean b = false; + Component[] tabs = this.getItems(); + for(int i=0; i<tabs.length; i++) + { + Component tab = tabs[i]; + if(tab.getId().equals(id)) + { + b=true; + break; + } + } + + return b; + } + + public void showTab(String id) + { + this.setActiveTab(id); + } + + class WrapperPanel extends Panel + { + + public WrapperPanel(String id) + { + super(); + setId(id); + } + } } Modified: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/HeaderPanel.java =================================================================== --- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/HeaderPanel.java 2008-08-05 10:38:38 UTC (rev 1822) +++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/HeaderPanel.java 2008-08-05 13:12:10 UTC (rev 1823) @@ -21,13 +21,9 @@ */ package org.jboss.bpm.console.client; -import com.google.gwt.user.client.ui.Composite; -import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.Label; import com.gwtext.client.widgets.Panel; -import com.gwtext.client.widgets.layout.BorderLayoutData; import com.gwtext.client.widgets.layout.VerticalLayout; -import com.gwtext.client.core.RegionPosition; /** * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; Modified: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/model/MockProcessDefinitionDAO.java =================================================================== --- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/model/MockProcessDefinitionDAO.java 2008-08-05 10:38:38 UTC (rev 1822) +++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/model/MockProcessDefinitionDAO.java 2008-08-05 13:12:10 UTC (rev 1823) @@ -21,8 +21,8 @@ */ package org.jboss.bpm.console.client.model; +import java.util.ArrayList; import java.util.List; -import java.util.ArrayList; /** * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; Modified: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/model/MockProcessInstanceDAO.java =================================================================== --- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/model/MockProcessInstanceDAO.java 2008-08-05 10:38:38 UTC (rev 1822) +++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/model/MockProcessInstanceDAO.java 2008-08-05 13:12:10 UTC (rev 1823) @@ -21,9 +21,9 @@ */ package org.jboss.bpm.console.client.model; -import java.util.List; import java.util.ArrayList; import java.util.Date; +import java.util.List; /** * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; Modified: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionList.java =================================================================== --- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionList.java 2008-08-05 10:38:38 UTC (rev 1822) +++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionList.java 2008-08-05 13:12:10 UTC (rev 1823) @@ -28,8 +28,8 @@ import com.gwtext.client.widgets.grid.ColumnModel; import org.jboss.bpm.console.client.ConsoleView; import org.jboss.bpm.console.client.model.DAOFactory; +import org.jboss.bpm.console.client.model.ProcessDefinition; import org.jboss.bpm.console.client.model.ProcessDefinitionDAO; -import org.jboss.bpm.console.client.model.ProcessDefinition; import org.jboss.bpm.console.client.widgets.ListView; import java.util.HashMap; @@ -87,11 +87,12 @@ protected void onExamine(final Integer row) { ProcessDefinition proc = (ProcessDefinition)row2ProcessMap.get(row); - ProcessInstanceList list = new ProcessInstanceList( - proc, "Process Instances", view - ); - - view.addEditorView( new ProcessInstanceEditor( list )); + String editorId = ProcessInstanceEditor.ID+"."+proc.getName()+".tab"; + + if(view.hasEditorView(editorId)) + view.showEditor(editorId); + else + view.addEditorView( new ProcessInstanceListEditor(proc, view) ); } protected void onDelete(final Integer row) Added: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionListEditor.java =================================================================== --- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionListEditor.java (rev 0) +++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionListEditor.java 2008-08-05 13:12:10 UTC (rev 1823) @@ -0,0 +1,59 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.console.client.process; + +import org.jboss.bpm.console.client.ConsoleView; +import org.jboss.bpm.console.client.widgets.EditorView; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; + */ +public class ProcessDefinitionListEditor extends EditorView +{ + public final static String ID = "org.jboss.bpm.process.ProcessList"; + + private ProcessDefinitionList processDefinitions; + + private ConsoleView view; + + public ProcessDefinitionListEditor(ConsoleView view) + { + super(); + this.setId(ID); + + this.view = view; + + processDefinitions = new ProcessDefinitionList("Process Definitions", view); + this.add(processDefinitions); + } + + + public String getEditorId() + { + return ID; + } + + public String getTitle() + { + return "Processes"; + } +} Property changes on: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionListEditor.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessImageView.java =================================================================== --- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessImageView.java (rev 0) +++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessImageView.java 2008-08-05 13:12:10 UTC (rev 1823) @@ -0,0 +1,50 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.console.client.process; + +import com.google.gwt.user.client.ui.Image; +import com.gwtext.client.widgets.Panel; +import org.jboss.bpm.console.client.model.ProcessInstance; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; + */ +public class ProcessImageView extends Panel +{ + + private ProcessInstance parent; + + public ProcessImageView(ProcessInstance parent) + { + super(); + this.parent = parent; + + final Image image = new Image("images/processSample.jpg"); + image.setStyleName("bpm-ProcessImage"); + + this.setHeader(false); + this.setBorder(false); + + this.add(image); + + } +} Property changes on: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessImageView.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceEditor.java =================================================================== --- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceEditor.java 2008-08-05 10:38:38 UTC (rev 1822) +++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceEditor.java 2008-08-05 13:12:10 UTC (rev 1823) @@ -21,34 +21,57 @@ */ package org.jboss.bpm.console.client.process; +import com.gwtext.client.widgets.Panel; +import com.gwtext.client.widgets.layout.HorizontalLayout; +import org.jboss.bpm.console.client.ConsoleView; import org.jboss.bpm.console.client.model.ProcessDefinition; +import org.jboss.bpm.console.client.model.ProcessInstance; import org.jboss.bpm.console.client.widgets.EditorView; /** * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; + * + * @see ProcessInstanceList#onExamine(Integer) */ public class ProcessInstanceEditor extends EditorView { + public final static String ID = "org.jboss.bpm.process.ProcessInstance"; - public final static String ID = "org.jboss.bpm.process.ProcessInstanceList"; + private ProcessDefinition processDefinition; + + private ProcessInstance processInstance; - private ProcessDefinition parent; - - public ProcessInstanceEditor(ProcessInstanceList instanceList) + private ConsoleView view; + + public ProcessInstanceEditor(ProcessDefinition proc, ProcessInstance instance, ConsoleView view) { super(); - parent = instanceList.getProcessDefinition(); - this.add( instanceList ); + this.setId(ProcessInstanceEditor.ID+"."+instance.getId()); + + this.processDefinition = proc; + this.processInstance = instance; + this.view = view; + + this.setPaddings(15); + this.setWidth(800); + + this.setBorder(false); + this.setHeader(false); + + this.setLayout( new HorizontalLayout(10) ); + + this.add( new Panel("A", 220, 250) ); + this.add( new Panel("B", 200, 150) ); + } - - public String getId() + public String getEditorId() { return ID; } public String getTitle() { - return parent.getName(); + return processDefinition.getName() + " #"+processInstance.getId(); } } Modified: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceList.java =================================================================== --- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceList.java 2008-08-05 10:38:38 UTC (rev 1822) +++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceList.java 2008-08-05 13:12:10 UTC (rev 1823) @@ -21,17 +21,20 @@ */ package org.jboss.bpm.console.client.process; -import org.jboss.bpm.console.client.widgets.ListView; -import org.jboss.bpm.console.client.ConsoleView; -import org.jboss.bpm.console.client.model.*; import com.gwtext.client.data.*; +import com.gwtext.client.widgets.grid.ColumnConfig; import com.gwtext.client.widgets.grid.ColumnModel; -import com.gwtext.client.widgets.grid.ColumnConfig; +import org.jboss.bpm.console.client.ConsoleView; +import org.jboss.bpm.console.client.model.DAOFactory; +import org.jboss.bpm.console.client.model.ProcessDefinition; +import org.jboss.bpm.console.client.model.ProcessInstance; +import org.jboss.bpm.console.client.model.ProcessInstanceDAO; +import org.jboss.bpm.console.client.widgets.ListView; +import java.util.HashMap; +import java.util.Iterator; import java.util.List; -import java.util.Iterator; import java.util.Map; -import java.util.HashMap; /** * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; @@ -87,51 +90,52 @@ ProcessDefinition getProcessDefinition() { - return parent; + return parent; } protected final Store createStore(RecordDef recordDef) - { - MemoryProxy proxy = new MemoryProxy( getData() ); - ArrayReader reader = new ArrayReader(recordDef); - Store store = new Store(proxy, reader); - return store; - } + { + MemoryProxy proxy = new MemoryProxy( getData() ); + ArrayReader reader = new ArrayReader(recordDef); + Store store = new Store(proxy, reader); + return store; + } - protected Object[][] getData() - { - ProcessInstanceDAO dao = DAOFactory.createProcessInstanceDAO(); - List processDefs = dao.getInstanceByProcessDefinitionId(parent.getId()); + protected Object[][] getData() + { + ProcessInstanceDAO dao = DAOFactory.createProcessInstanceDAO(); + List processDefs = dao.getInstanceByProcessDefinitionId(parent.getId()); - Object[][] records = new Object[processDefs.size()][]; + Object[][] records = new Object[processDefs.size()][]; - Iterator it = processDefs.iterator(); - int row = 0; - while(it.hasNext()) - { - ProcessInstance pd = (ProcessInstance)it.next(); - records[row] = new Object[5]; - records[row][0] = new Long(pd.getId()); - records[row][1] = pd.getKey(); - records[row][2] = pd.getStatus(); - records[row][3] = pd.getStartDate(); - records[row][4] = pd.getEndDate(); + Iterator it = processDefs.iterator(); + int row = 0; + while(it.hasNext()) + { + ProcessInstance pd = (ProcessInstance)it.next(); + records[row] = new Object[5]; + records[row][0] = new Long(pd.getId()); + records[row][1] = pd.getKey(); + records[row][2] = pd.getStatus(); + records[row][3] = pd.getStartDate(); + records[row][4] = pd.getEndDate(); - row2InstanceMap.put(new Integer(row), pd); + row2InstanceMap.put(new Integer(row), pd); - row++; - } + row++; + } - return records; - } + return records; + } - - - - protected void onExamine(final Integer row) { - + ProcessInstance instance = (ProcessInstance)row2InstanceMap.get(row); + String id = ProcessInstanceEditor.ID+"."+instance.getId()+".tab"; + if(view.hasEditorView(id)) + view.showEditor(id); + else + view.addEditorView( new ProcessInstanceEditor(parent, instance, view) ); } protected void onDelete(final Integer row) Added: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceListEditor.java =================================================================== --- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceListEditor.java (rev 0) +++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceListEditor.java 2008-08-05 13:12:10 UTC (rev 1823) @@ -0,0 +1,62 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.console.client.process; + +import org.jboss.bpm.console.client.ConsoleView; +import org.jboss.bpm.console.client.model.ProcessDefinition; +import org.jboss.bpm.console.client.widgets.EditorView; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; + * + * @see org.jboss.bpm.console.client.process.ProcessDefinitionList#onExamine(Integer) + */ +public class ProcessInstanceListEditor extends EditorView +{ + + public final static String ID = "org.jboss.bpm.process.ProcessInstanceList"; + + private ProcessDefinition parent; + + public ProcessInstanceListEditor(ProcessDefinition proc, ConsoleView view) + { + super(); + this.setId(ProcessInstanceEditor.ID+"."+proc.getName()); + + parent = proc; + ProcessInstanceList list = new ProcessInstanceList( + proc, "Process Instances", view + ); + this.add( list ); + } + + + public String getEditorId() + { + return ID; + } + + public String getTitle() + { + return parent.getName(); + } +} Property changes on: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceListEditor.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessListEditor.java =================================================================== --- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessListEditor.java 2008-08-05 10:38:38 UTC (rev 1822) +++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessListEditor.java 2008-08-05 13:12:10 UTC (rev 1823) @@ -1,57 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.bpm.console.client.process; - -import org.jboss.bpm.console.client.ConsoleView; -import org.jboss.bpm.console.client.widgets.EditorView; - -/** - * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; - */ -public class ProcessListEditor extends EditorView -{ - public final static String ID = "org.jboss.bpm.process.ProcessList"; - - private ProcessDefinitionList processDefinitions; - - private ConsoleView view; - - public ProcessListEditor(ConsoleView view) - { - super(); - this.view = view; - - processDefinitions = new ProcessDefinitionList("Process Definitions", view); - this.add(processDefinitions); - } - - - public String getId() - { - return ID; - } - - public String getTitle() - { - return "Processes"; - } -} Added: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/BareEditorView.java =================================================================== --- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/BareEditorView.java (rev 0) +++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/BareEditorView.java 2008-08-05 13:12:10 UTC (rev 1823) @@ -0,0 +1,48 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.console.client.widgets; + +import com.gwtext.client.widgets.Component; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; + */ +public class BareEditorView extends EditorView +{ + + private Component comp; + + public BareEditorView(Component comp) + { + this.add(comp); + } + + public String getEditorId() + { + return super.getId(); + } + + public String getTitle() + { + return ""; + } +} Property changes on: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/BareEditorView.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/EditorView.java =================================================================== --- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/EditorView.java 2008-08-05 10:38:38 UTC (rev 1822) +++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/EditorView.java 2008-08-05 13:12:10 UTC (rev 1823) @@ -28,6 +28,6 @@ */ public abstract class EditorView extends Panel { - public abstract String getId(); + public abstract String getEditorId(); public abstract String getTitle(); } Modified: jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/Application.html =================================================================== --- jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/Application.html 2008-08-05 10:38:38 UTC (rev 1822) +++ jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/Application.html 2008-08-05 13:12:10 UTC (rev 1823) @@ -9,7 +9,6 @@ <script language='javascript' src='org.jboss.bpm.console.Application.nocache.js'></script> <link rel="stylesheet" href="console.css" type="text/css"> - <link rel="stylesheet" href="GWT-default.css" type="text/css"> </head> <!-- --> Deleted: jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/GWT-default.css =================================================================== --- jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/GWT-default.css 2008-08-05 10:38:38 UTC (rev 1822) +++ jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/GWT-default.css 2008-08-05 13:12:10 UTC (rev 1823) @@ -1,595 +0,0 @@ -/** - * Applied to the entire page. - */ -body { - color: black; - font-family: Helvetica, Arial, sans-serif; - font-size: 10pt; - line-height: 12pt; - margin: 0px; - border: 0px; - padding: 0px; - overflow: visible; - background: #E1E7F2 url(images/bg_gradient.gif) repeat-x; - direction: ltr; -} - -table { - font-size: 100%; -} - -a, a:visited, a:hover { - color: #0000AA; -} - -/** - * Applied to buttons. - */ -.gwt-Button { - width: 10em; -} - -.gwt-Button:active { -} - -.gwt-Button[disabled] { - color: #888; -} - -/** - * Applied to the checkbox and text next to the checkbox. - */ -.gwt-CheckBox { -} - -.gwt-CheckBox-disabled { - color: #888; -} - -/** - * Applied to the dialog box. - */ -.gwt-DialogBox { - border: 1px solid #bbbbbb; -} - -.gwt-DialogBox .Caption { - background: #e3e8f3 url(images/bg_headergradient.gif) repeat-x; - padding: 4px 4px 4px 8px; - cursor: default; - border-bottom: 1px solid #bbbbbb; -} - -.gwt-DialogBox .Content { - background: white; -} - -.gwt-DialogBox .Content table { - filter: alpha(opacity=100); /* Fixes rendering issues in IE7 */ -} - -/** - * Applied to the disclosure panel, which shows or hides content when the user - * toggles the header. - */ -.gwt-DisclosurePanel { -} - -.gwt-DisclosurePanel a { - text-decoration: none; /* Remove underline from header */ -} - -.gwt-DisclosurePanel-open { -} - -.gwt-DisclosurePanel-closed { -} - -.gwt-DisclosurePanel .header { -} - -.gwt-DisclosurePanel .content { - border-left: 3px solid #e8eef7; - padding: 4px 0px 4px 8px; - margin-left: 6px; -} - -/** - * Applied to the File Upload. - */ -.gwt-FileUpload { -} - -/** - * Applied to the Frame widget, which is an iframe wrapper. - */ -.gwt-Frame { -} - -/** - * Applied to split panels. - */ -.gwt-HorizontalSplitPanel { - border: 4px solid #E1E7F2; -} - -.gwt-HorizontalSplitPanel .hsplitter { - cursor: move; - background-color: #E1E7F2; - border-right: 1px solid #BBBBBB; - border-left: 1px solid #BBBBBB; -} - -.gwt-VerticalSplitPanel { - border: 4px solid #E1E7F2; -} - -.gwt-VerticalSplitPanel .vsplitter { - cursor: move; - background-color: #E1E7F2; - border-top: 1px solid #BBBBBB; - border-bottom: 1px solid #BBBBBB; -} - -/** - * Applied to all HTML label elements. - */ -.gwt-HTML { -} - -/** - * Applied to all Hyperlinks. - */ -.gwt-Hyperlink { -} - -/** - * Applied to all Images - */ -.gwt-Image { -} - -/** - * Applied to all Label elements. - */ -.gwt-Label { -} - -/** - * Applied to list boxes. - */ -.gwt-ListBox { -} - -/** - * Applied to the menu bar. - */ -.gwt-MenuBar { - cursor: default; - border: 1px solid #BBBBBB; -} - -.gwt-MenuBar .gwt-MenuItem { - cursor: default; -} - -.gwt-MenuBar .gwt-MenuItem-selected { - background: #E0EDFE; -} - -.gwt-MenuBar-horizontal { - background: #e3e8f3 url(images/bg_headergradient.gif) repeat-x; -} - -.gwt-MenuBar-horizontal .gwt-MenuItem { - padding: 0px 10px; - vertical-align: bottom; - color: #666666; - font-weight: bold; -} - -.gwt-MenuBar-vertical { - background-color: white; - margin-top: 2px; - margin-left: 2px; -} - -.gwt-MenuBar-vertical .gwt-MenuItem { - padding: 4px 20px 4px 8px; -} - -/** - * Applied to the password input box. - */ -.gwt-PasswordTextBox { - padding: 2px; -} -.gwt-PasswordTextBox-readonly { - color: #888; -} - -/** - * Applied to the push button, a customizable button that can be pressed - * and released. - */ -.gwt-PushButton-up { - padding: 2px; - background-color: #efebe7; - border: 2px solid #faf9f7; - border-right: 2px solid #848280; - border-bottom: 2px solid #848280; - cursor: pointer; - cursor: hand; -} - -.gwt-PushButton-up-hovering { - padding: 2px; - background-color: #efebe7; - border: 2px solid #faf9f7; - border-right: 2px solid #848280; - border-bottom: 2px solid #848280; - cursor: pointer; - cursor: hand; -} - -.gwt-PushButton-up-disabled { - padding: 2px; - background-color: #efebe7; - border: 2px solid #e7e4e0; - border-right: 2px solid #625b54; - border-bottom: 2px solid #625b54; - cursor: default; - opacity: 0.5; -} - -.gwt-PushButton-up-disabled .gwt-Image { - filter: alpha(opacity=30); -} - -.gwt-PushButton-down { - padding: 2px 1px 2px 3px; - background-color: #efebe7; - border: 2px solid #848280; - border-right: 2px solid #faf9f7; - border-bottom: 2px solid #faf9f7; - cursor: pointer; - cursor: hand; -} - -.gwt-PushButton-down-hovering { - padding: 2px 1px 2px 3px; - background-color: #efebe7; - border: 2px solid #848280; - border-right: 2px solid #faf9f7; - border-bottom: 2px solid #faf9f7; - cursor: pointer; - cursor: hand; -} - -.gwt-PushButton-down-disabled { - padding: 2px 1px 2px 3px; - background-color: #efebe7; - border: 2px solid #e7e4e0; - border-right: 2px solid #625b54; - border-bottom: 2px solid #625b54; - cursor: default; - opacity: 0.5; -} - -.gwt-PushButton-down-disabled .gwt-Image { - filter: alpha(opacity=30); -} - -/** - * Applied to radio buttons and the text next to them. - */ -.gwt-RadioButton { - padding: 4px 4px 3px 3px; -} - -.gwt-RadioButton-disabled { - color: #888; -} - -/** - * Applied to the Rich Text Area. - */ -.gwt-RichTextArea { -} - -.hasRichTextToolbar { - border: 0px; -} - -.gwt-RichTextToolbar { - background: #e3e8f3 url(images/bg_headergradient.gif) repeat-x; - border-bottom: 1px solid #BBBBBB; - padding: 3px; - margin: 0px; -} - -.gwt-RichTextToolbar .gwt-PushButton-up { - padding: 0px 1px 0px 0px; - margin-right: 4px; - margin-bottom: 4px; - border-width: 1px; -} - -.gwt-RichTextToolbar .gwt-PushButton-up-hovering { - margin-right: 4px; - margin-bottom: 4px; - padding: 0px 1px 0px 0px; - border-width: 1px; -} - -.gwt-RichTextToolbar .gwt-PushButton-down { - margin-right: 4px; - margin-bottom: 4px; - padding: 0px 0px 0px 1px; - border-width: 1px; -} - -.gwt-RichTextToolbar .gwt-PushButton-down-hovering { - margin-right: 4px; - margin-bottom: 4px; - padding: 0px 0px 0px 1px; - border-width: 1px; -} - -.gwt-RichTextToolbar .gwt-ToggleButton-up { - margin-right: 4px; - margin-bottom: 4px; - padding: 0px 1px 0px 0px; - border-width: 1px; -} - -.gwt-RichTextToolbar .gwt-ToggleButton-up-hovering { - margin-right: 4px; - margin-bottom: 4px; - padding: 0px 1px 0px 0px; - border-width: 1px; -} - -.gwt-RichTextToolbar .gwt-ToggleButton-down { - margin-right: 4px; - margin-bottom: 4px; - padding: 0px 0px 0px 1px; - border-width: 1px; -} - -.gwt-RichTextToolbar .gwt-ToggleButton-down-hovering { - margin-right: 4px; - margin-bottom: 4px; - padding: 0px 0px 0px 1px; - border-width: 1px; -} - -/** - * Applied to the stack panel, a vertical menu widget that reveals one - * category at a time. - */ -.gwt-StackPanel { - border-spacing: 0px; - border: 1px solid #666666; -} - -.gwt-StackPanel .gwt-StackPanelItem { - font-weight: bold; - font-size: 1.3em; - background: #e3e8f3 url(images/bg_headergradient.gif) repeat-x; - color: #666666; - border: 1px solid #e3e8f3; - padding: 5px 3px 5px 10px; - cursor: pointer; - cursor: hand; -} - -.gwt-StackPanel .gwt-StackPanelItem-selected { - color: black; - cursor: default; -} - -.gwt-StackPanel .gwt-StackPanelContent { - padding: 2px 2px 10px 5px; -} - -/** - * Applied to the suggest box. - */ -.gwt-SuggestBox { - padding: 2px; -} - -.gwt-SuggestBoxPopup { - background: #E0ECFF; - margin-left: 2px; - padding: 2px; - background: #eaeff6 url(images/bg_suggestgradient.gif) repeat-x; - border: 1px solid #bbbbbb; -} - -.gwt-SuggestBoxPopup .item { - padding: 2px 6px; - color: #424242; - cursor: default; -} - -.gwt-SuggestBoxPopup .item-selected { - background-color: #E0EDFE; - background: #eaeff6 url(images/bg_listgradient.gif) repeat-x; -} - -/** - * Applied to the tab panel. The tab panel provides CSS access to - * the tab bar element and the table cell that wraps the tab bar element, - * which allows for rounded edges via the sliding window method. - */ -.gwt-TabBar { -} - -.gwt-TabBar .gwt-TabBarFirst { - width: 5px; /* first tab distance from the left */ -} - -.gwt-TabBar .gwt-TabBarRest { -} - -.gwt-TabBar .gwt-TabBarItem { - padding: 3px 4px 2px 4px; - cursor: pointer; - cursor: hand; - color: #666666; - font-weight: bold; - background: white url(images/tab.gif) no-repeat right top; - margin-left: 6px; /* Size of right image, used for sliding window */ - padding-right: 10px; /* +6px to balance margin-left */ - text-align: center; -} - -.gwt-TabBar .gwt-TabBarItem-wrapper { - padding: 0px; - background: white url(images/tab.gif) no-repeat left top; - border-left: 5px solid white; /* Spacing between tabs */ -} - -.gwt-TabBar .gwt-TabBarItem-selected { - cursor: default; - color: black; - background: white url(images/tab.gif) no-repeat right -100px; -} - -.gwt-TabBar .gwt-TabBarItem-wrapper-selected { - background: white url(images/tab.gif) no-repeat left -100px; -} - -.gwt-TabPanel { -} - -.gwt-TabPanelBottom { - border-color: #BBBBBB; - border-style: solid; - border-width: 3px 2px 5px; - width: 100%; -} - -/** - * Applied to general text areas. - */ -.gwt-TextArea { - padding: 2px; -} - -.gwt-TextArea-readonly { - color: #888; -} - -/** - * Applied to text boxes. - */ -.gwt-TextBox { - padding: 2px; -} - -.gwt-TextBox-readonly { - color: #888; -} - -/** - * Applied to toggle buttons, a customizable button that can be toggled - * between two states (similar to a checkbox). - */ -.gwt-ToggleButton-up { - padding: 2px; - background-color: #efebe7; - border: 2px solid #faf9f7; - border-right: 2px solid #848280; - border-bottom: 2px solid #848280; - cursor: pointer; - cursor: hand; -} - -.gwt-ToggleButton-up-hovering { - padding: 2px; - background-color: #efebe7; - border: 2px solid #faf9f7; - border-right: 2px solid #848280; - border-bottom: 2px solid #848280; - cursor: pointer; - cursor: hand; -} - -.gwt-ToggleButton-up-disabled { - padding: 2px; - background-color: #efebe7; - border: 2px solid #e7e4e0; - border-right: 2px solid #625b54; - border-bottom: 2px solid #625b54; - cursor: default; - opacity: 0.5; -} - -.gwt-ToggleButton-up-disabled .gwt-Image { - filter: alpha(opacity=30); -} - -.gwt-ToggleButton-down { - padding: 2px 1px 2px 3px; - background-color: #f5f5f5; - border: 2px solid #848280; - border-right: 2px solid #faf9f7; - border-bottom: 2px solid #faf9f7; - cursor: pointer; - cursor: hand; -} - -.gwt-ToggleButton-down-hovering { - padding: 2px 1px 2px 3px; - background-color: #f5f5f5; - border: 2px solid #848280; - border-right: 2px solid #faf9f7; - border-bottom: 2px solid #faf9f7; - cursor: pointer; - cursor: hand; -} - -.gwt-ToggleButton-down-disabled { - padding: 2px 1px 2px 3px; - background-color: #efebe7; - border: 2px solid #e7e4e0; - border-right: 2px solid #625b54; - border-bottom: 2px solid #625b54; - cursor: default; - opacity: 0.5; -} - -.gwt-ToggleButton-down-disabled .gwt-Image { - filter: alpha(opacity=30); -} - -/** - * Applied to the Tree. - */ -.gwt-Tree { - background: white; -} - -.gwt-Tree .gwt-TreeItem-wrapper { - margin: 0px 0px 0px 20px; // Indentation -} - -.gwt-Tree .gwt-TreeItem { - padding: 0px; - margin: 0px; - border: 1px solid white; - white-space: nowrap; - cursor: hand; - cursor: pointer; -} - -.gwt-Tree .gwt-TreeItem-hovering { -} - -.gwt-Tree .gwt-TreeItem-selected { - background: #93c2f1 url(images/bg_listgradient.gif) repeat-x; - border: 1px dotted #888; -} Modified: jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/console.css =================================================================== --- jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/console.css 2008-08-05 10:38:38 UTC (rev 1822) +++ jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/console.css 2008-08-05 13:12:10 UTC (rev 1823) @@ -34,4 +34,18 @@ .bpm-EditorHeader { -} \ No newline at end of file +} + +.bpm-ProcessImage { + border: 0px; +} + +.div { + border: 1px dashed red; +} + +.bpm-SplitPanel { + border: 1px dashed green; + vertical-align: top; + position:relative; top:5px; left:5px; +} Added: jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/images/processSample.jpg =================================================================== (Binary files differ) Property changes on: jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/images/processSample.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream