Author: heiko.braun(a)jboss.com Date: 2008-12-08 06:54:47 -0500 (Mon, 08 Dec 2008) New Revision: 3265 Added: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/ProcessReportEditor.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/ReportOverviewEditor.java Removed: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/DefinitionMetricEditor.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/DefinitionMetricView.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/InstanceMetricView.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/MetricOverview.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/MetricOverviewEditor.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/ProcessMetricEditor.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/DAOFactory.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/HelpDAO.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/MetricsDAO.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/ProcessDefinitionDAO.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/ProcessInstanceDAO.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/internal/ 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/Menu.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionListEditor.java Log: Remove lagacy stuff 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 2008-12-08 11:43:08 UTC (rev 3264) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/MainView.java 2008-12-08 11:54:47 UTC (rev 3265) @@ -37,7 +37,7 @@ import com.gwtext.client.widgets.layout.BorderLayoutData; import com.gwtext.client.widgets.layout.FitLayout; import com.gwtext.client.widgets.layout.VerticalLayout; -import org.jboss.bpm.console.client.metric.MetricOverviewEditor; +import org.jboss.bpm.console.client.metric.ReportOverviewEditor; import org.jboss.bpm.console.client.process.ProcessDefinitionListEditor; import org.jboss.bpm.console.client.task.TaskListEditor; import org.jboss.bpm.console.client.util.ConsoleLog; @@ -135,7 +135,7 @@ // TODO: these don't initialze correctly when ordered differently or launched form Menu workspace.addEditor( new ProcessDefinitionListEditor(this), false ); workspace.addEditor( new TaskListEditor(this), false ); - workspace.addEditor( new MetricOverviewEditor(this), false); + workspace.addEditor( new ReportOverviewEditor(this), false); // ------------------------------------------ Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/Menu.java =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/Menu.java 2008-12-08 11:43:08 UTC (rev 3264) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/Menu.java 2008-12-08 11:54:47 UTC (rev 3265) @@ -28,7 +28,7 @@ import com.gwtext.client.widgets.tree.TreeNode; import com.gwtext.client.widgets.tree.TreePanel; import com.gwtext.client.widgets.tree.event.TreeNodeListenerAdapter; -import org.jboss.bpm.console.client.metric.MetricOverviewEditor; +import org.jboss.bpm.console.client.metric.ReportOverviewEditor; import org.jboss.bpm.console.client.process.ProcessDefinitionListEditor; import org.jboss.bpm.console.client.task.TaskListEditor; @@ -127,13 +127,13 @@ { public void onClick(Node node, EventObject eventObject) { - if(view.hasEditor(MetricOverviewEditor.ID)) + if(view.hasEditor(ReportOverviewEditor.ID)) { - view.showEditor(MetricOverviewEditor.ID); + view.showEditor(ReportOverviewEditor.ID); } else { - view.addEditor( new MetricOverviewEditor(view) ); + view.addEditor( new ReportOverviewEditor(view) ); } } Deleted: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/DefinitionMetricEditor.java =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/DefinitionMetricEditor.java 2008-12-08 11:43:08 UTC (rev 3264) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/DefinitionMetricEditor.java 2008-12-08 11:54:47 UTC (rev 3265) @@ -1,114 +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.metric; - -import org.jboss.bpm.console.client.Editor; -import org.jboss.bpm.console.client.UIConstants; -import org.jboss.bpm.console.client.widgets.TeaserPanel; -import org.jboss.bpm.console.client.widgets.HelpPanel; -import org.jboss.bpm.console.client.model.ProcessDefinitionRef; -import org.jboss.bpm.console.client.MainView; -import org.jboss.bpm.console.client.process.ProcessInstanceEditor; -import org.jboss.bpm.console.client.process.ProcessInstanceListEditor; -import com.gwtext.client.widgets.layout.ColumnLayout; -import com.gwtext.client.widgets.layout.ColumnLayoutData; -import com.gwtext.client.widgets.Panel; -import com.gwtext.client.widgets.Toolbar; -import com.gwtext.client.widgets.ToolbarButton; -import com.gwtext.client.widgets.Button; -import com.gwtext.client.widgets.event.ButtonListenerAdapter; -import com.gwtext.client.core.EventObject; - -/** - * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; - */ -public class DefinitionMetricEditor extends Editor -{ - - private ProcessDefinitionRef parent; - private MainView view; - private Panel teaserPanel; - - public DefinitionMetricEditor(final MainView view, final ProcessDefinitionRef proc) - { - super(); - this.view = view; - this.parent = proc; - - this.setId(MetricOverviewEditor.ID+"."+proc.getName()); - - // ----------------------------------------------- - - this.setLayout( new ColumnLayout() ); - this.setWidth(UIConstants.EDITOR_WIDTH); - - // ----------------------------------------------- - - teaserPanel = new TeaserPanel(); - - HelpPanel instancePanel = new HelpPanel(UIConstants.TEASER_PANEL_WIDTH, 180, "Process instances"); - instancePanel.setIconCls("bpm-process-icon"); - - instancePanel.setContent( - "You can manage running instances through the process management editor." - ); - - Toolbar bottomToolbar = new Toolbar(); - bottomToolbar.addFill(); - bottomToolbar.addButton( - new ToolbarButton("View instances", new ButtonListenerAdapter() { - public void onClick(Button button, EventObject e) - { - String editorId = ProcessInstanceEditor.ID+"."+proc.getName(); - - if(view.hasEditor(editorId)) - view.showEditor(editorId); - else - view.addEditor( new ProcessInstanceListEditor(proc, view) ); - } - }) - ); - - instancePanel.setBottomToolbar(bottomToolbar); - teaserPanel.add(instancePanel); - - // ----------------------------------------------- - - this.add( new DefinitionMetricView(view, proc), new ColumnLayoutData(0.7)); - this.add( teaserPanel, new ColumnLayoutData(0.3)); - } - - public String getEditorId() - { - return getId(); - } - - public String getTitle() - { - return parent.getName() + " metrics"; - } - - public String getIconCSS() - { - return "bpm-metric-icon"; - } -} Deleted: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/DefinitionMetricView.java =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/DefinitionMetricView.java 2008-12-08 11:43:08 UTC (rev 3264) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/DefinitionMetricView.java 2008-12-08 11:54:47 UTC (rev 3265) @@ -1,164 +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.metric; - -import com.gwtext.client.widgets.Panel; -import com.gwtext.client.widgets.form.FieldSet; -import com.gwtext.client.widgets.form.FormPanel; -import com.gwtext.client.widgets.form.TextField; -import com.gwtext.client.core.Position; -import org.jboss.bpm.console.client.MainView; -import org.jboss.bpm.console.client.UIConstants; -import org.jboss.bpm.console.client.model.DAOFactory; -import org.jboss.bpm.console.client.model.ProcessDefinitionRef; -import org.jboss.bpm.console.client.model.ProcessInstancePerformance; -import org.jboss.bpm.console.client.widgets.LineChart; - -import java.util.Iterator; -import java.util.Map; - -/** - * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; - */ -public class DefinitionMetricView extends Panel -{ - private ProcessDefinitionRef parent; - - private MainView view; - - public DefinitionMetricView(MainView view, ProcessDefinitionRef parent) - { - super(); - this.view = view; - this.parent = parent; - - this.setHeader(false); - this.setBorder(false); - - // ---------------------------------------- - - ProcessInstancePerformance perf = - DAOFactory.createMetricsDAO().getProcessInstancePerformance(parent.getProcessId()); - - LineChart chart = new LineChart( - parent.getName() + " performance", 380, 260, perf.getInstanceMetrics(), "Instance", "t" - ); - - double[] fixture = deriveFixture(perf); - - Panel chartPanel = new Panel(); - chartPanel.setPaddings(10); - chartPanel.setHeader(false); - chartPanel.setBorder(false); - chartPanel.setWidth(UIConstants.EDITOR_WIDTH); - chartPanel.add(chart); - - // ---------------------------------------- - - Panel panel = new Panel(); - panel.setBorder(false); - panel.setFrame(false); - panel.setPaddings(10); - - //create the form - FormPanel formPanel = new FormPanel(); - formPanel.setLabelAlign(Position.LEFT); - formPanel.setWidth(UIConstants.EDITOR_PANEL_WIDTH); - formPanel.setHeader(false); - formPanel.setFrame(false); - formPanel.setPaddings(5, 5, 5, 0); - formPanel.setLabelWidth(120); - - //create first collapsible fieldset with checkbox - FieldSet fieldSet = new FieldSet(); - fieldSet.setCheckboxToggle(false); - fieldSet.setTitle("Process metrics"); - fieldSet.setCollapsed(false); - fieldSet.setAutoHeight(true); - fieldSet.setBorder(false); - - //add fields to the User FieldSet - TextField name = new TextField("Process Definition Name", "name", 210); - name.setAllowBlank(false); - name.setValue( parent.getName() ); - fieldSet.add(name); - - TextField execs = new TextField("Number of executions", "numexec", 210); - execs.setAllowBlank(false); - execs.setValue( perf.getInstanceMetrics().size() +"" ); - fieldSet.add(execs); - - TextField average = new TextField("Average execution time", "average", 210); - average.setValue(""+fixture[0]); - fieldSet.add(average); - - TextField max = new TextField("Min execution time", "min", 210); - max.setValue(""+ fixture[1]); - fieldSet.add(max); - - TextField min = new TextField("Max execution time", "max", 210); - min.setValue("" + fixture[2]); - fieldSet.add(min); - - formPanel.add(fieldSet); - - panel.add(formPanel); - - - // ---------------------------------------- - this.add(chartPanel); - this.add(panel); - - // gchart hack - chart.update(); - - } - - private double[] deriveFixture(ProcessInstancePerformance perf) - { - double avg = -1; - double min= -1; - double max = -1; - double sum = -1; - - Map metrics = perf.getInstanceMetrics(); - Iterator keys = metrics.keySet().iterator(); - - while(keys.hasNext()) - { - Long k = (Long)keys.next(); - Double v = (Double)metrics.get(k); - - if(min==-1) min = v.longValue(); - - if(v.longValue()>max) max = v.longValue(); - else if(v.longValue()<=min) min = v.longValue(); - - sum += v.longValue(); - - } - - avg = Math.floor( sum/metrics.size()); - - return new double[] {avg, min, max}; - } -} Deleted: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/InstanceMetricView.java =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/InstanceMetricView.java 2008-12-08 11:43:08 UTC (rev 3264) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/InstanceMetricView.java 2008-12-08 11:54:47 UTC (rev 3265) @@ -1,29 +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.metric; - -/** - * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; - */ -public class InstanceMetricView -{ -} Deleted: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/MetricOverview.java =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/MetricOverview.java 2008-12-08 11:43:08 UTC (rev 3264) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/MetricOverview.java 2008-12-08 11:54:47 UTC (rev 3265) @@ -1,98 +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.metric; - -import com.google.gwt.http.client.*; -import com.google.gwt.user.client.ui.HTMLPanel; -import com.gwtext.client.widgets.Panel; -import com.gwtext.client.widgets.layout.ColumnLayout; -import org.jboss.bpm.console.client.MainView; -import org.jboss.bpm.console.client.UIConstants; -import org.jboss.bpm.console.client.util.ConsoleLog; - -/** - * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; - */ -public class MetricOverview extends Panel -{ - private final MainView view; - private Panel container; - - public MetricOverview(final MainView view) - { - super(); - this.view = view; - - this.setHeader(false); - this.setBorder(false); - this.setTitle("Default report"); - - container = new Panel(); - container.setBorder(false); - container.setFrame(false); - container.setHeader(false); - - // ------------ - - RequestBuilder rb = new RequestBuilder(RequestBuilder.GET, - view.getUrlBuilder().getOverviewReportUrl() - ); - try - { - rb.sendRequest(null, - new RequestCallback() { - - public void onResponseReceived(Request request, Response response) - { - // parse roles - if(response.getStatusCode()!=200) - { - ConsoleLog.error("Failed to get report: " + response.getStatusText()); - } - else - { - container.clear(); - container.add(new HTMLPanel(response.getText())); - container.doLayout(); - } - } - - public void onError(Request request, Throwable t) - { - ConsoleLog.error("Failed to get report",t); - } - }); - } - - catch (RequestException e1) - { - // Couldn't connect to server - throw new RuntimeException("Unknown error upon getting report", e1); - } - - - this.setLayout( new ColumnLayout() ); - this.setWidth(UIConstants.EDITOR_WIDTH); - - } - -} Deleted: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/MetricOverviewEditor.java =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/MetricOverviewEditor.java 2008-12-08 11:43:08 UTC (rev 3264) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/MetricOverviewEditor.java 2008-12-08 11:54:47 UTC (rev 3265) @@ -1,185 +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.metric; - -import com.gwtext.client.core.EventObject; -import com.gwtext.client.data.*; -import com.gwtext.client.widgets.Button; -import com.gwtext.client.widgets.Component; -import com.gwtext.client.widgets.Panel; -import com.gwtext.client.widgets.MessageBox; -import com.gwtext.client.widgets.event.ButtonListenerAdapter; -import com.gwtext.client.widgets.event.PanelListenerAdapter; -import com.gwtext.client.widgets.form.ComboBox; -import com.gwtext.client.widgets.form.Label; -import com.gwtext.client.widgets.layout.HorizontalLayout; -import com.gwtext.client.widgets.layout.VerticalLayout; -import com.gwtext.client.widgets.menu.Separator; -import org.jboss.bpm.console.client.Editor; -import org.jboss.bpm.console.client.MainView; -import org.jboss.bpm.console.client.util.ConsoleLog; - -/** - * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; - */ -public class MetricOverviewEditor extends Editor -{ - public final static String ID = "org.jboss.bpm.metric.ProcessMetricOverview"; - private MainView view; - - public MetricOverviewEditor(final MainView view) - { - super(); - this.view = view; - this.setId(ID); - this.setPaddings(10); - - // ------------------------------------- - this.setLayout(new VerticalLayout(10) ); - - this.addListener( - new PanelListenerAdapter() - { - - public void onRender(Component component) - { - - Panel panel = new Panel("Metric overview"); - panel.setPaddings(10); - - final String reportUrl= view.getUrlBuilder().getOverviewReportUrl(); - ConsoleLog.debug("Report resource:" + reportUrl); - - final ComboBox comboBox = buildProcessSelection(); - - final BirtPanel birtPanel = new BirtPanel(); - birtPanel.setUrl(reportUrl); - - // -- - - Button refreshBtn = new Button("Refresh", new ButtonListenerAdapter() - { - - public void onClick(Button button, EventObject eventObject) - { - birtPanel.setUrl(reportUrl); - } - }); - - Button viewBtn = new Button("Examine", new ButtonListenerAdapter() - { - - public void onClick(Button button, EventObject eventObject) - { - String rawValue = comboBox.getRawValue(); - if(rawValue==null || rawValue.equals("")) - MessageBox.alert("Please enter a process definition name!"); - else - onExamine(rawValue); - } - }); - - // -- - - Panel toolsPanel = new Panel(); - toolsPanel.setLayout( new HorizontalLayout(10) ); - Label label = new Label("Process definition"); - label.setStyleName("bpm-label"); - toolsPanel.add(label); - toolsPanel.add(comboBox); - toolsPanel.add( viewBtn ); - toolsPanel.add( new Separator() ); - toolsPanel.add( refreshBtn ); - - panel.add(toolsPanel); - panel.add(birtPanel); - - add(panel); - } - } - ); - } - - - private void onExamine(String definitionName) - { - String editorId = ProcessMetricEditor.createWidgetID(definitionName); - - if(view.hasEditor(editorId)) - view.showEditor(editorId); - else - view.addEditor( new ProcessMetricEditor(definitionName, view) ); - } - - private ComboBox buildProcessSelection() - { - - final RecordDef recordDef = new RecordDef( - new FieldDef[]{ - new IntegerFieldDef("processId"), - new StringFieldDef("name"), - new StringFieldDef("version") - } - ); - - final JsonReader reader = new JsonReader(recordDef); - reader.setRoot("definitions"); - reader.setTotalProperty("totalCount"); - reader.setId("processId"); - - DataProxy dataProxy = new ScriptTagProxy( - view.getUrlBuilder().getProcessDefinitionsURL(), 1000*10); - - final Store store = new Store(dataProxy, reader, false); - store.load(); - - ComboBox cb = new ComboBox(); - cb.setMinChars(1); - cb.setFieldLabel("Process definition"); - cb.setStore(store); - cb.setDisplayField("name"); - cb.setMode(ComboBox.LOCAL); - cb.setTriggerAction(ComboBox.ALL); - cb.setEmptyText("Please enter a name"); - cb.setLoadingText("Searching..."); - cb.setTypeAhead(true); - cb.setSelectOnFocus(true); - cb.setWidth(180); - - return cb; - } - - public String getEditorId() - { - return ID; - } - - public String getTitle() - { - return "Metrics and Stats"; - } - - public String getIconCSS() - { - return "bpm-metric-icon"; - } -} Deleted: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/ProcessMetricEditor.java =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/ProcessMetricEditor.java 2008-12-08 11:43:08 UTC (rev 3264) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/ProcessMetricEditor.java 2008-12-08 11:54:47 UTC (rev 3265) @@ -1,180 +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.metric; - -import org.jboss.bpm.console.client.MainView; -import org.jboss.bpm.console.client.Editor; -import org.jboss.bpm.console.client.UIConstants; -import org.jboss.bpm.console.client.util.ConsoleLog; -import com.gwtext.client.widgets.layout.VerticalLayout; -import com.gwtext.client.widgets.layout.HorizontalLayout; -import com.gwtext.client.widgets.event.PanelListenerAdapter; -import com.gwtext.client.widgets.event.ButtonListenerAdapter; -import com.gwtext.client.widgets.Component; -import com.gwtext.client.widgets.Button; -import com.gwtext.client.widgets.MessageBox; -import com.gwtext.client.widgets.Panel; -import com.gwtext.client.widgets.menu.Separator; -import com.gwtext.client.widgets.form.ComboBox; -import com.gwtext.client.widgets.form.Label; -import com.gwtext.client.core.EventObject; -import com.gwtext.client.data.*; - -/** - * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; - */ -public class ProcessMetricEditor extends Editor -{ - public final static String ID = "org.jboss.bpm.metric.ProcessMetric"; - private String definitionName; - private MainView view; - - public ProcessMetricEditor(final String definitionName, final MainView view) - { - this.definitionName = definitionName; - this.view = view; - this.setId( ProcessMetricEditor.createWidgetID(definitionName) ); - - this.setPaddings(10); - - // ------------------------------------- - this.setLayout(new VerticalLayout(10) ); - - this.addListener( - new PanelListenerAdapter() - { - - public void onRender(Component component) - { - - final String reportUrl= view.getUrlBuilder().getDefinitionReportUrl(definitionName); - ConsoleLog.debug("Report resource:" + reportUrl); - - final ComboBox comboBox = buildInstanceSelection(); - - final BirtPanel birtPanel = new BirtPanel(); - birtPanel.setUrl(reportUrl); - - // -- - - Button refreshBtn = new Button("Refresh", new ButtonListenerAdapter() - { - - public void onClick(Button button, EventObject eventObject) - { - birtPanel.setUrl(reportUrl); - } - }); - - Button viewBtn = new Button("Examine", new ButtonListenerAdapter() - { - - public void onClick(Button button, EventObject eventObject) - { - String rawValue = comboBox.getRawValue(); - if(rawValue==null || rawValue.equals("")) - MessageBox.alert("Please enter a process instance ID!"); - else - MessageBox.alert("Not implemented"); - } - }); - - // -- - - Panel p = new Panel(); - p.setLayout( new HorizontalLayout(10) ); - Label label = new Label("Instance ID"); - label.setStyleName("bpm-label"); - p.add(label); - p.add(comboBox); - p.add( viewBtn ); - p.add( new Separator() ); - p.add( refreshBtn ); - - add(p); - add(birtPanel); - } - } - ); - } - - private ComboBox buildInstanceSelection() - { - - final RecordDef recordDef = new RecordDef( - new FieldDef[]{ - new IntegerFieldDef("instanceId"), - new IntegerFieldDef("parentId"), - new StringFieldDef("key"), - new StringFieldDef("state"), - new DateFieldDef("startDate", UIConstants.DATE_FORMAT), - new DateFieldDef("endDate", UIConstants.DATE_FORMAT), - new BooleanFieldDef("suspended") - } - ); - - final JsonReader reader = new JsonReader(recordDef); - reader.setRoot("instances"); - reader.setTotalProperty("totalCount"); - reader.setId("instanceId"); - - DataProxy dataProxy = new ScriptTagProxy( - view.getUrlBuilder().getProcessDefinitionsURL(), 1000*10); - - final Store store = new Store(dataProxy, reader, false); - store.load(); - - ComboBox cb = new ComboBox(); - cb.setMinChars(1); - cb.setFieldLabel("Instance ID"); - cb.setStore(store); - cb.setDisplayField("ID"); - cb.setMode(ComboBox.LOCAL); - cb.setTriggerAction(ComboBox.ALL); - cb.setEmptyText("Please enter an ID"); - cb.setLoadingText("Searching..."); - cb.setTypeAhead(true); - cb.setSelectOnFocus(true); - cb.setWidth(180); - - return cb; - } - public String getEditorId() - { - return createWidgetID(definitionName); - } - - public String getTitle() - { - return definitionName +" Metrics"; - } - - public String getIconCSS() - { - return "bpm-metric-icon"; - } - - public static String createWidgetID(String definitionName) - { - return ID+"."+definitionName; - } -} Copied: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/ProcessReportEditor.java (from rev 3262, projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/ProcessMetricEditor.java) =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/ProcessReportEditor.java (rev 0) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/ProcessReportEditor.java 2008-12-08 11:54:47 UTC (rev 3265) @@ -0,0 +1,180 @@ +/* + * 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.metric; + +import org.jboss.bpm.console.client.MainView; +import org.jboss.bpm.console.client.Editor; +import org.jboss.bpm.console.client.UIConstants; +import org.jboss.bpm.console.client.util.ConsoleLog; +import com.gwtext.client.widgets.layout.VerticalLayout; +import com.gwtext.client.widgets.layout.HorizontalLayout; +import com.gwtext.client.widgets.event.PanelListenerAdapter; +import com.gwtext.client.widgets.event.ButtonListenerAdapter; +import com.gwtext.client.widgets.Component; +import com.gwtext.client.widgets.Button; +import com.gwtext.client.widgets.MessageBox; +import com.gwtext.client.widgets.Panel; +import com.gwtext.client.widgets.menu.Separator; +import com.gwtext.client.widgets.form.ComboBox; +import com.gwtext.client.widgets.form.Label; +import com.gwtext.client.core.EventObject; +import com.gwtext.client.data.*; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; + */ +public class ProcessReportEditor extends Editor +{ + public final static String ID = "org.jboss.bpm.metric.ProcessMetric"; + private String definitionName; + private MainView view; + + public ProcessReportEditor(final String definitionName, final MainView view) + { + this.definitionName = definitionName; + this.view = view; + this.setId( createWidgetID(definitionName) ); + + this.setPaddings(10); + + // ------------------------------------- + this.setLayout(new VerticalLayout(10) ); + + this.addListener( + new PanelListenerAdapter() + { + + public void onRender(Component component) + { + + final String reportUrl= view.getUrlBuilder().getDefinitionReportUrl(definitionName); + ConsoleLog.debug("Report resource:" + reportUrl); + + final ComboBox comboBox = buildInstanceSelection(); + + final BirtPanel birtPanel = new BirtPanel(); + birtPanel.setUrl(reportUrl); + + // -- + + Button refreshBtn = new Button("Refresh", new ButtonListenerAdapter() + { + + public void onClick(Button button, EventObject eventObject) + { + birtPanel.setUrl(reportUrl); + } + }); + + Button viewBtn = new Button("Examine", new ButtonListenerAdapter() + { + + public void onClick(Button button, EventObject eventObject) + { + String rawValue = comboBox.getRawValue(); + if(rawValue==null || rawValue.equals("")) + MessageBox.alert("Please enter a process instance ID!"); + else + MessageBox.alert("Not implemented"); + } + }); + + // -- + + Panel p = new Panel(); + p.setLayout( new HorizontalLayout(10) ); + Label label = new Label("Instance ID"); + label.setStyleName("bpm-label"); + p.add(label); + p.add(comboBox); + p.add( viewBtn ); + p.add( new Separator() ); + p.add( refreshBtn ); + + add(p); + add(birtPanel); + } + } + ); + } + + private ComboBox buildInstanceSelection() + { + + final RecordDef recordDef = new RecordDef( + new FieldDef[]{ + new IntegerFieldDef("instanceId"), + new IntegerFieldDef("parentId"), + new StringFieldDef("key"), + new StringFieldDef("state"), + new DateFieldDef("startDate", UIConstants.DATE_FORMAT), + new DateFieldDef("endDate", UIConstants.DATE_FORMAT), + new BooleanFieldDef("suspended") + } + ); + + final JsonReader reader = new JsonReader(recordDef); + reader.setRoot("instances"); + reader.setTotalProperty("totalCount"); + reader.setId("instanceId"); + + DataProxy dataProxy = new ScriptTagProxy( + view.getUrlBuilder().getProcessDefinitionsURL(), 1000*10); + + final Store store = new Store(dataProxy, reader, false); + store.load(); + + ComboBox cb = new ComboBox(); + cb.setMinChars(1); + cb.setFieldLabel("Instance ID"); + cb.setStore(store); + cb.setDisplayField("ID"); + cb.setMode(ComboBox.LOCAL); + cb.setTriggerAction(ComboBox.ALL); + cb.setEmptyText("Please enter an ID"); + cb.setLoadingText("Searching..."); + cb.setTypeAhead(true); + cb.setSelectOnFocus(true); + cb.setWidth(180); + + return cb; + } + public String getEditorId() + { + return createWidgetID(definitionName); + } + + public String getTitle() + { + return definitionName +" Metrics"; + } + + public String getIconCSS() + { + return "bpm-metric-icon"; + } + + public static String createWidgetID(String definitionName) + { + return ID+"."+definitionName; + } +} Copied: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/ReportOverviewEditor.java (from rev 3262, projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/MetricOverviewEditor.java) =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/ReportOverviewEditor.java (rev 0) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/ReportOverviewEditor.java 2008-12-08 11:54:47 UTC (rev 3265) @@ -0,0 +1,185 @@ +/* + * 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.metric; + +import com.gwtext.client.core.EventObject; +import com.gwtext.client.data.*; +import com.gwtext.client.widgets.Button; +import com.gwtext.client.widgets.Component; +import com.gwtext.client.widgets.Panel; +import com.gwtext.client.widgets.MessageBox; +import com.gwtext.client.widgets.event.ButtonListenerAdapter; +import com.gwtext.client.widgets.event.PanelListenerAdapter; +import com.gwtext.client.widgets.form.ComboBox; +import com.gwtext.client.widgets.form.Label; +import com.gwtext.client.widgets.layout.HorizontalLayout; +import com.gwtext.client.widgets.layout.VerticalLayout; +import com.gwtext.client.widgets.menu.Separator; +import org.jboss.bpm.console.client.Editor; +import org.jboss.bpm.console.client.MainView; +import org.jboss.bpm.console.client.util.ConsoleLog; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; + */ +public class ReportOverviewEditor extends Editor +{ + public final static String ID = "org.jboss.bpm.metric.ProcessMetricOverview"; + private MainView view; + + public ReportOverviewEditor(final MainView view) + { + super(); + this.view = view; + this.setId(ID); + this.setPaddings(10); + + // ------------------------------------- + this.setLayout(new VerticalLayout(10) ); + + this.addListener( + new PanelListenerAdapter() + { + + public void onRender(Component component) + { + + Panel panel = new Panel("Metric overview"); + panel.setPaddings(10); + + final String reportUrl= view.getUrlBuilder().getOverviewReportUrl(); + ConsoleLog.debug("Report resource:" + reportUrl); + + final ComboBox comboBox = buildProcessSelection(); + + final BirtPanel birtPanel = new BirtPanel(); + birtPanel.setUrl(reportUrl); + + // -- + + Button refreshBtn = new Button("Refresh", new ButtonListenerAdapter() + { + + public void onClick(Button button, EventObject eventObject) + { + birtPanel.setUrl(reportUrl); + } + }); + + Button viewBtn = new Button("Examine", new ButtonListenerAdapter() + { + + public void onClick(Button button, EventObject eventObject) + { + String rawValue = comboBox.getRawValue(); + if(rawValue==null || rawValue.equals("")) + MessageBox.alert("Please enter a process definition name!"); + else + onExamine(rawValue); + } + }); + + // -- + + Panel toolsPanel = new Panel(); + toolsPanel.setLayout( new HorizontalLayout(10) ); + Label label = new Label("Process definition"); + label.setStyleName("bpm-label"); + toolsPanel.add(label); + toolsPanel.add(comboBox); + toolsPanel.add( viewBtn ); + toolsPanel.add( new Separator() ); + toolsPanel.add( refreshBtn ); + + panel.add(toolsPanel); + panel.add(birtPanel); + + add(panel); + } + } + ); + } + + + private void onExamine(String definitionName) + { + String editorId = ProcessReportEditor.createWidgetID(definitionName); + + if(view.hasEditor(editorId)) + view.showEditor(editorId); + else + view.addEditor( new ProcessReportEditor(definitionName, view) ); + } + + private ComboBox buildProcessSelection() + { + + final RecordDef recordDef = new RecordDef( + new FieldDef[]{ + new IntegerFieldDef("processId"), + new StringFieldDef("name"), + new StringFieldDef("version") + } + ); + + final JsonReader reader = new JsonReader(recordDef); + reader.setRoot("definitions"); + reader.setTotalProperty("totalCount"); + reader.setId("processId"); + + DataProxy dataProxy = new ScriptTagProxy( + view.getUrlBuilder().getProcessDefinitionsURL(), 1000*10); + + final Store store = new Store(dataProxy, reader, false); + store.load(); + + ComboBox cb = new ComboBox(); + cb.setMinChars(1); + cb.setFieldLabel("Process definition"); + cb.setStore(store); + cb.setDisplayField("name"); + cb.setMode(ComboBox.LOCAL); + cb.setTriggerAction(ComboBox.ALL); + cb.setEmptyText("Please enter a name"); + cb.setLoadingText("Searching..."); + cb.setTypeAhead(true); + cb.setSelectOnFocus(true); + cb.setWidth(180); + + return cb; + } + + public String getEditorId() + { + return ID; + } + + public String getTitle() + { + return "Metrics and Stats"; + } + + public String getIconCSS() + { + return "bpm-metric-icon"; + } +} Property changes on: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/ReportOverviewEditor.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/DAOFactory.java =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/DAOFactory.java 2008-12-08 11:43:08 UTC (rev 3264) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/DAOFactory.java 2008-12-08 11:54:47 UTC (rev 3265) @@ -1,54 +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.model; - -import org.jboss.bpm.console.client.model.internal.MockHelpDAO; -import org.jboss.bpm.console.client.model.internal.MockProcessDefinitionDAO; -import org.jboss.bpm.console.client.model.internal.MockMetricsDAO; -import org.jboss.bpm.console.client.model.internal.MockProcessInstanceDAO; - -/** - * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; - */ -@Deprecated -public class DAOFactory -{ - public static ProcessDefinitionDAO createProcessDefinitionDAO() - { - return new MockProcessDefinitionDAO(); - } - - public static ProcessInstanceDAO createProcessInstanceDAO() - { - return new MockProcessInstanceDAO(); - } - - public static HelpDAO createHelpDAO() - { - return new MockHelpDAO(); - } - - public static MetricsDAO createMetricsDAO() - { - return new MockMetricsDAO(); - } -} Deleted: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/HelpDAO.java =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/HelpDAO.java 2008-12-08 11:43:08 UTC (rev 3264) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/HelpDAO.java 2008-12-08 11:54:47 UTC (rev 3265) @@ -1,33 +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.model; - -/** - * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; - */ -public interface HelpDAO -{ - public final static int REF_PROCESS_DEFINITIONS = 100; - public final static int REF_PROCESS_METRIC = 200; - - String getHelpByReference(int ref); -} Deleted: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/MetricsDAO.java =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/MetricsDAO.java 2008-12-08 11:43:08 UTC (rev 3264) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/MetricsDAO.java 2008-12-08 11:54:47 UTC (rev 3265) @@ -1,31 +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.model; - -/** - * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; - */ -public interface MetricsDAO -{ - - ProcessInstancePerformance getProcessInstancePerformance(long processId); -} Deleted: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/ProcessDefinitionDAO.java =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/ProcessDefinitionDAO.java 2008-12-08 11:43:08 UTC (rev 3264) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/ProcessDefinitionDAO.java 2008-12-08 11:54:47 UTC (rev 3265) @@ -1,35 +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.model; - -import java.util.List; - -/** - * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; - */ -@Deprecated -public interface ProcessDefinitionDAO -{ - List getAllProcessDefinitions(); - - ProcessDefinitionRef getProcessDefinitionById(long id); -} Deleted: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/ProcessInstanceDAO.java =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/ProcessInstanceDAO.java 2008-12-08 11:43:08 UTC (rev 3264) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/ProcessInstanceDAO.java 2008-12-08 11:54:47 UTC (rev 3265) @@ -1,33 +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.model; - -import java.util.List; - -/** - * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; - */ -@Deprecated -public interface ProcessInstanceDAO -{ - List getInstanceByProcessDefinitionId(long id); -} Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionListEditor.java =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionListEditor.java 2008-12-08 11:43:08 UTC (rev 3264) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionListEditor.java 2008-12-08 11:54:47 UTC (rev 3265) @@ -37,8 +37,6 @@ import org.jboss.bpm.console.client.Editor; import org.jboss.bpm.console.client.MainView; import org.jboss.bpm.console.client.UIConstants; -import org.jboss.bpm.console.client.model.DAOFactory; -import org.jboss.bpm.console.client.model.HelpDAO; import org.jboss.bpm.console.client.util.ConsoleLog; import org.jboss.bpm.console.client.widgets.HelpPanel; import org.jboss.bpm.console.client.util.ModelListenerRegistry; @@ -161,7 +159,7 @@ // ---------------------------------- HelpPanel help = new HelpPanel(UIConstants.TEASER_PANEL_WIDTH, 180, "About process definitions"); - help.setContent( DAOFactory.createHelpDAO().getHelpByReference(HelpDAO.REF_PROCESS_DEFINITIONS)); + help.setContent( ""); // ----------------------------------