Overlord SVN: r1030 - activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client.
by overlord-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2010-03-31 09:19:27 -0400 (Wed, 31 Mar 2010)
New Revision: 1030
Modified:
activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/DefinitionHistoryView.java
Log:
Modified: activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/DefinitionHistoryView.java
===================================================================
--- activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/DefinitionHistoryView.java 2010-03-31 13:10:13 UTC (rev 1029)
+++ activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/DefinitionHistoryView.java 2010-03-31 13:19:27 UTC (rev 1030)
@@ -1,7 +1,6 @@
/* jboss.org */
package org.jboss.bpm.monitor.gui.client;
-import com.allen_sauer.gwt.log.client.Log;
import com.google.gwt.core.client.GWT;
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler;
@@ -141,7 +140,7 @@
chartArea = new CaptionLayoutPanel();
chartArea.setPadding(15);
contents.add(headerPanel, new RowLayoutData("120"));
- contents.add(chartArea, new RowLayoutData("350", true));
+ contents.add(chartArea, new RowLayoutData(true));
// ------------
commentPanel = new CommentPanel(this);
@@ -153,7 +152,7 @@
}
} );
- contents.add(commentPanel, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
+ contents.add(commentPanel, new RowLayoutData("80"));
// ------------
panel.add(contents, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH));
@@ -361,7 +360,6 @@
public void onResize(int width, int height)
{
View view = resizeChartView();
- resizeChartArea(view);
}
});
}
@@ -378,9 +376,12 @@
int[] dim = calcChartDimension();
// Resizing the chart once displayed currently unsupported
- View view = chartPanel.getChart().getView();
+ final View view = chartPanel.getChart().getView();
if(view!=null)
view.resize(dim[0], dim[1]);
+
+ resizeChartArea(view);
+
return view;
}
14 years, 1 month
Overlord SVN: r1029 - activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client.
by overlord-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2010-03-31 09:10:13 -0400 (Wed, 31 Mar 2010)
New Revision: 1029
Modified:
activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/DefinitionHistoryView.java
Log:
one way to calculate chart dimension
Modified: activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/DefinitionHistoryView.java
===================================================================
--- activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/DefinitionHistoryView.java 2010-03-31 11:19:26 UTC (rev 1028)
+++ activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/DefinitionHistoryView.java 2010-03-31 13:10:13 UTC (rev 1029)
@@ -312,11 +312,10 @@
private void initChartPanel(Dataset[] datasets)
{
- int chartWidth = chartArea.getOffsetWidth()/2;
- int chartHeight = (int) (chartWidth / GOLDEN__RATIO);
+ int[] dim = calcChartDimension();
// ------
- chartPanel = Chronoscope.createTimeseriesChart(datasets, chartWidth, chartHeight);
+ chartPanel = Chronoscope.createTimeseriesChart(datasets, dim[0], dim[1]);
// marker
final XYPlot plot = chartPanel.getChart().getPlot();
@@ -367,15 +366,21 @@
});
}
+ private int[] calcChartDimension()
+ {
+ int w = chartArea.getOffsetWidth()/2;
+ int h = (int) (w / GOLDEN__RATIO);
+
+ return new int[] {w, h};
+ }
private View resizeChartView()
{
- int chartWidth = chartArea.getOffsetWidth()/2;
- int chartHeight = (int) (chartWidth / GOLDEN__RATIO);
+ int[] dim = calcChartDimension();
// Resizing the chart once displayed currently unsupported
View view = chartPanel.getChart().getView();
if(view!=null)
- view.resize(chartWidth, chartHeight);
+ view.resize(dim[0], dim[1]);
return view;
}
14 years, 1 month
Overlord SVN: r1028 - in activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui: client and 1 other directories.
by overlord-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2010-03-31 07:19:26 -0400 (Wed, 31 Mar 2010)
New Revision: 1028
Modified:
activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/App.gwt.xml
activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/DefinitionHistoryView.java
activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/comments/CommentPanel.java
Log:
Modified: activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/App.gwt.xml
===================================================================
--- activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/App.gwt.xml 2010-03-31 11:04:39 UTC (rev 1027)
+++ activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/App.gwt.xml 2010-03-31 11:19:26 UTC (rev 1028)
@@ -13,5 +13,6 @@
<stylesheet src="monitor.css"/>
<entry-point class='org.jboss.bpm.monitor.gui.client.MonitorUI'/>
-
+
+ <!--set-property name="hasflash" value="force"/-->
</module>
\ No newline at end of file
Modified: activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/DefinitionHistoryView.java
===================================================================
--- activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/DefinitionHistoryView.java 2010-03-31 11:04:39 UTC (rev 1027)
+++ activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/DefinitionHistoryView.java 2010-03-31 11:19:26 UTC (rev 1028)
@@ -374,7 +374,8 @@
// Resizing the chart once displayed currently unsupported
View view = chartPanel.getChart().getView();
- view.resize(chartWidth, chartHeight);
+ if(view!=null)
+ view.resize(chartWidth, chartHeight);
return view;
}
Modified: activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/comments/CommentPanel.java
===================================================================
--- activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/comments/CommentPanel.java 2010-03-31 11:04:39 UTC (rev 1027)
+++ activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/comments/CommentPanel.java 2010-03-31 11:19:26 UTC (rev 1028)
@@ -39,7 +39,7 @@
commentDeck = new DeckLayoutPanel();
// ----
- editPanel = new LayoutPanel(new BoxLayout(BoxLayout.Orientation.HORIZONTAL));
+ editPanel = new LayoutPanel(new BoxLayout(BoxLayout.Orientation.HORIZONTAL));
textBox = new TextArea();
textBox.setCharacterWidth(50);
textBox.setVisibleLines(2);
14 years, 1 month
Overlord SVN: r1027 - in activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client: comments and 1 other directory.
by overlord-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2010-03-31 07:04:39 -0400 (Wed, 31 Mar 2010)
New Revision: 1027
Modified:
activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/DefinitionHistoryView.java
activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/comments/CommentPanel.java
Log:
Clear comments when reloading process definition
Modified: activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/DefinitionHistoryView.java
===================================================================
--- activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/DefinitionHistoryView.java 2010-03-31 10:55:09 UTC (rev 1026)
+++ activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/DefinitionHistoryView.java 2010-03-31 11:04:39 UTC (rev 1027)
@@ -294,7 +294,11 @@
// if exists remove. I don't know how to update at this point
if(chartPanel!=null)
+ {
chartArea.remove(chartPanel);
+ commentPanel.reset();
+ overlayMapping.clear();
+ }
initChartPanel(dsArray);
Modified: activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/comments/CommentPanel.java
===================================================================
--- activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/comments/CommentPanel.java 2010-03-31 10:55:09 UTC (rev 1026)
+++ activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/comments/CommentPanel.java 2010-03-31 11:04:39 UTC (rev 1027)
@@ -3,6 +3,8 @@
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler;
+import com.google.gwt.user.client.Command;
+import com.google.gwt.user.client.DeferredCommand;
import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.HTML;
import com.google.gwt.user.client.ui.TextArea;
@@ -34,7 +36,7 @@
this.callbackComment = callbackComment;
- commentDeck = new DeckLayoutPanel();
+ commentDeck = new DeckLayoutPanel();
// ----
editPanel = new LayoutPanel(new BoxLayout(BoxLayout.Orientation.HORIZONTAL));
@@ -60,8 +62,8 @@
{
public void onClick(ClickEvent clickEvent)
{
+ callbackComment.onCancelComment(suggestion);
resetEditState();
- callbackComment.onCancelComment(suggestion);
}
});
editPanel.add(cancel);
@@ -136,7 +138,23 @@
{
//suggestion = null;
textBox.setText("");
- this.setCollapsed(true);
+ DeferredCommand.addCommand(new Command()
+ {
+ public void execute()
+ {
+ setCollapsed(true);
+ layout();
+ }
+ });
+
}
+
+ public void reset()
+ {
+ suggestion = null;
+ DefaultListModel<ChartComment> model = (DefaultListModel)comments.getModel();
+ model.clear();
+ textBox.setText("");
+ }
}
14 years, 1 month
Overlord SVN: r1026 - in activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client: comments and 1 other directory.
by overlord-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2010-03-31 06:55:09 -0400 (Wed, 31 Mar 2010)
New Revision: 1026
Added:
activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/comments/
activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/comments/ChartComment.java
activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/comments/CommentEditCallback.java
activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/comments/CommentPanel.java
Modified:
activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/DefinitionHistoryView.java
Log:
More work on commenting
Modified: activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/DefinitionHistoryView.java
===================================================================
--- activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/DefinitionHistoryView.java 2010-03-31 08:51:12 UTC (rev 1025)
+++ activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/DefinitionHistoryView.java 2010-03-31 10:55:09 UTC (rev 1026)
@@ -10,10 +10,14 @@
import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.HTML;
import com.google.gwt.user.client.ui.ListBox;
+import com.google.gwt.user.client.ui.Widget;
import org.gwt.mosaic.ui.client.*;
import org.gwt.mosaic.ui.client.layout.*;
import org.gwt.mosaic.ui.client.util.ResizableWidget;
import org.gwt.mosaic.ui.client.util.ResizableWidgetCollection;
+import org.jboss.bpm.monitor.gui.client.comments.ChartComment;
+import org.jboss.bpm.monitor.gui.client.comments.CommentEditCallback;
+import org.jboss.bpm.monitor.gui.client.comments.CommentPanel;
import org.jboss.errai.bus.client.api.RemoteCallback;
import org.jboss.errai.bus.client.api.base.MessageBuilder;
import org.jboss.errai.workspaces.client.api.ProvisioningCallback;
@@ -21,6 +25,7 @@
import org.jboss.errai.workspaces.client.api.annotations.LoadTool;
import org.timepedia.chronoscope.client.Dataset;
import org.timepedia.chronoscope.client.Datasets;
+import org.timepedia.chronoscope.client.Overlay;
import org.timepedia.chronoscope.client.XYPlot;
import org.timepedia.chronoscope.client.browser.ChartPanel;
import org.timepedia.chronoscope.client.browser.Chronoscope;
@@ -31,17 +36,18 @@
import org.timepedia.chronoscope.client.data.tuple.Tuple2D;
import org.timepedia.chronoscope.client.event.PlotFocusEvent;
import org.timepedia.chronoscope.client.event.PlotFocusHandler;
-import org.timepedia.chronoscope.client.overlays.Marker;
+import org.timepedia.chronoscope.client.overlays.DomainBarMarker;
-import java.util.Date;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* @author: Heiko Braun <hbraun(a)redhat.com>
* @date: Mar 11, 2010
*/
@LoadTool(name="Process Activity", group = "History")
-public class DefinitionHistoryView implements WidgetProvider
+public class DefinitionHistoryView implements WidgetProvider, CommentEditCallback
{
private static final String TIMEPEDIA_FONTBOOK_SERVICE = "http://api.timepedia.org/fr";
@@ -55,6 +61,8 @@
private HTML timespan;
private CaptionLayoutPanel chartArea;
private LayoutPanel timespanPanel;
+ private CommentPanel commentPanel;
+ private Map<Long, Overlay> overlayMapping = new HashMap<Long, Overlay>();
public void provideWidget(ProvisioningCallback callback)
{
@@ -122,7 +130,7 @@
// ------------
- LayoutPanel contents = new LayoutPanel(new RowLayout());
+ final LayoutPanel contents = new LayoutPanel(new RowLayout());
LayoutPanel headerPanel = new LayoutPanel(new ColumnLayout());
headerPanel.add(title, new ColumnLayoutData("50%"));
@@ -135,6 +143,19 @@
contents.add(headerPanel, new RowLayoutData("120"));
contents.add(chartArea, new RowLayoutData("350", true));
+ // ------------
+ commentPanel = new CommentPanel(this);
+ commentPanel.addCollapsedListener(new CollapsedListener() {
+ public void onCollapsedChange(Widget sender)
+ {
+ commentPanel.toogleListView();
+ contents.layout();
+ }
+ } );
+
+ contents.add(commentPanel, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
+
+ // ------------
panel.add(contents, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH));
callback.onSuccess(panel);
}
@@ -231,6 +252,36 @@
rpcService.getDefinitionActivity(procDefID, timespan);
}
+ public void onSaveComment(ChartComment comment)
+ {
+ final XYPlot plot = chartPanel.getChart().getPlot();
+ DomainBarMarker marker = new DomainBarMarker(comment.getDomainValue(), 1.0, comment.getTitle());
+ plot.addOverlay(marker);
+ plot.redraw();
+
+ // keep reference
+ overlayMapping.put(comment.getId(), marker);
+ }
+
+ public void onCancelComment(ChartComment comment)
+ {
+ }
+
+ public void onDeleteComment(ChartComment comment)
+ {
+ Overlay marker = overlayMapping.get(comment.getId());
+ final XYPlot plot = chartPanel.getChart().getPlot();
+ plot.removeOverlay(marker);
+ plot.redraw();
+
+ resizeChartView(); // TODO: Why this?
+ }
+
+ public void onHighlightComment(ChartComment comment)
+ {
+ // TODO: implement highlight
+ }
+
private void renderChart(String jsonData)
{
try
@@ -270,24 +321,10 @@
{
if(event.getFocusDataset()>=0) // zooming
- {
- Log.debug("Focus "+event.getDomain() + "/"+event.getRange());
-
- MessageBox.prompt("Create Marker", "Please enter a title:",
- null, new MessageBox.PromptCallback<String>(){
- public void onResult(String s)
- {
- if(s!=null)
- {
- Marker m = new Marker(
- event.getDomain(),s, 0
- );
-
- plot.addOverlay(m);
- plot.redraw();
- }
- }
- });
+ {
+ ChartComment comment = new ChartComment();
+ comment.setDomainValue(event.getDomain());
+ commentPanel.toogleEditView(comment);
}
}
});
@@ -319,21 +356,26 @@
}
public void onResize(int width, int height)
- {
- int chartWidth = chartArea.getOffsetWidth()/2;
- int chartHeight = (int) (chartWidth / GOLDEN__RATIO);
-
- // Resizing the chart once displayed currently unsupported
- View view = chartPanel.getChart().getView();
- view.resize(chartWidth, chartHeight);
+ {
+ View view = resizeChartView();
resizeChartArea(view);
}
});
}
+ private View resizeChartView()
+ {
+ int chartWidth = chartArea.getOffsetWidth()/2;
+ int chartHeight = (int) (chartWidth / GOLDEN__RATIO);
+
+ // Resizing the chart once displayed currently unsupported
+ View view = chartPanel.getChart().getView();
+ view.resize(chartWidth, chartHeight);
+ return view;
+ }
+
private void resizeChartArea(View view)
- {
- Log.debug(view.getWidth()+ "/"+view.getHeight());
+ {
int resizeTo= Integer.valueOf(view.getHeight()) + 75;
chartArea.setHeight(resizeTo+"px");
chartArea.layout();
Added: activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/comments/ChartComment.java
===================================================================
--- activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/comments/ChartComment.java (rev 0)
+++ activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/comments/ChartComment.java 2010-03-31 10:55:09 UTC (rev 1026)
@@ -0,0 +1,44 @@
+/* jboss.org */
+package org.jboss.bpm.monitor.gui.client.comments;
+
+/**
+ * @author: Heiko Braun <hbraun(a)redhat.com>
+ * @date: Mar 31, 2010
+ */
+public class ChartComment
+{
+ long id = 0;
+
+ double domainValue;
+ String title;
+
+ public long getId()
+ {
+ return id;
+ }
+
+ public void setId(long id)
+ {
+ this.id = id;
+ }
+
+ public double getDomainValue()
+ {
+ return domainValue;
+ }
+
+ public void setDomainValue(double domainValue)
+ {
+ this.domainValue = domainValue;
+ }
+
+ public String getTitle()
+ {
+ return title;
+ }
+
+ public void setTitle(String title)
+ {
+ this.title = title;
+ }
+}
Added: activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/comments/CommentEditCallback.java
===================================================================
--- activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/comments/CommentEditCallback.java (rev 0)
+++ activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/comments/CommentEditCallback.java 2010-03-31 10:55:09 UTC (rev 1026)
@@ -0,0 +1,14 @@
+/* jboss.org */
+package org.jboss.bpm.monitor.gui.client.comments;
+
+/**
+ * @author: Heiko Braun <hbraun(a)redhat.com>
+ * @date: Mar 31, 2010
+ */
+public interface CommentEditCallback
+{
+ void onSaveComment(ChartComment comment);
+ void onCancelComment(ChartComment comment);
+ void onDeleteComment(ChartComment comment);
+ void onHighlightComment(ChartComment comment);
+}
Added: activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/comments/CommentPanel.java
===================================================================
--- activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/comments/CommentPanel.java (rev 0)
+++ activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/comments/CommentPanel.java 2010-03-31 10:55:09 UTC (rev 1026)
@@ -0,0 +1,142 @@
+/* jboss.org */
+package org.jboss.bpm.monitor.gui.client.comments;
+
+import com.google.gwt.event.dom.client.ClickEvent;
+import com.google.gwt.event.dom.client.ClickHandler;
+import com.google.gwt.user.client.ui.Button;
+import com.google.gwt.user.client.ui.HTML;
+import com.google.gwt.user.client.ui.TextArea;
+import org.gwt.mosaic.ui.client.DeckLayoutPanel;
+import org.gwt.mosaic.ui.client.DisclosureLayoutPanel;
+import org.gwt.mosaic.ui.client.ListBox;
+import org.gwt.mosaic.ui.client.layout.BoxLayout;
+import org.gwt.mosaic.ui.client.layout.LayoutPanel;
+import org.gwt.mosaic.ui.client.list.DefaultListModel;
+
+/**
+ * @author: Heiko Braun <hbraun(a)redhat.com>
+ * @date: Mar 31, 2010
+ */
+public class CommentPanel extends DisclosureLayoutPanel
+{
+ private DeckLayoutPanel commentDeck;
+ private LayoutPanel editPanel;
+ private LayoutPanel listPanel;
+ private ListBox<ChartComment> comments;
+ private CommentEditCallback callbackComment;
+
+ private ChartComment suggestion = null;
+ private TextArea textBox;
+
+ public CommentPanel(final CommentEditCallback callbackComment)
+ {
+ super("Comments");
+
+ this.callbackComment = callbackComment;
+
+ commentDeck = new DeckLayoutPanel();
+
+ // ----
+ editPanel = new LayoutPanel(new BoxLayout(BoxLayout.Orientation.HORIZONTAL));
+ textBox = new TextArea();
+ textBox.setCharacterWidth(50);
+ textBox.setVisibleLines(2);
+ editPanel.add(textBox);
+
+ editPanel.add(new Button("Save", new ClickHandler()
+ {
+ public void onClick(ClickEvent clickEvent)
+ {
+ // chart callback
+ suggestion.setTitle(textBox.getText());
+ addComment(suggestion); // TODO: save entity
+ callbackComment.onSaveComment(suggestion);
+ resetEditState();
+ }
+ }));
+
+ HTML cancel = new HTML("cancel");
+ cancel.addClickHandler(new ClickHandler()
+ {
+ public void onClick(ClickEvent clickEvent)
+ {
+ resetEditState();
+ callbackComment.onCancelComment(suggestion);
+ }
+ });
+ editPanel.add(cancel);
+
+ // ----
+ listPanel = new LayoutPanel();
+ comments = new ListBox<ChartComment>(new String[]{"Title", ""});
+ comments.setCellRenderer(new ListBox.CellRenderer<ChartComment>() {
+ public void renderCell(ListBox listBox, int row, int col, final ChartComment item)
+ {
+ switch (col)
+ {
+ case 0:
+ listBox.setText(row, col, item.getTitle());
+ break;
+ case 1:
+ HTML html = new HTML("delete");
+ html.addClickHandler(new ClickHandler()
+ {
+ public void onClick(ClickEvent clickEvent)
+ {
+ callbackComment.onDeleteComment(item);
+ DefaultListModel<ChartComment> model = (DefaultListModel)comments.getModel();
+ model.remove(item);
+ }
+ });
+ listBox.setWidget(row, col, html);
+ break;
+ default:
+ throw new IllegalArgumentException("illegal column");
+ }
+ }
+ });
+ listPanel.add(comments);
+
+
+ commentDeck.add(listPanel);
+ commentDeck.add(editPanel);
+
+ this.add(commentDeck);
+
+ }
+
+ public void toogleListView()
+ {
+ if(this.isCollapsed())
+ setCollapsed(false);
+ commentDeck.showWidget(0);
+ this.layout();
+ }
+
+ public void toogleEditView(ChartComment comment)
+ {
+ if(this.isCollapsed())
+ setCollapsed(false);
+ commentDeck.showWidget(1);
+
+ suggestion = comment;
+ if(comment.getId()!=0)
+ textBox.setText(comment.getTitle());
+ this.layout();
+ }
+
+ private void addComment(ChartComment comment)
+ {
+ DefaultListModel<ChartComment> model = (DefaultListModel)comments.getModel();
+ model.add(comment);
+ comment.setId(model.getSize());
+ }
+
+ private void resetEditState()
+ {
+ //suggestion = null;
+ textBox.setText("");
+ this.setCollapsed(true);
+
+ }
+}
14 years, 1 month
Overlord SVN: r1025 - activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client.
by overlord-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2010-03-31 04:51:12 -0400 (Wed, 31 Mar 2010)
New Revision: 1025
Modified:
activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/DefinitionHistoryView.java
Log:
Implement chart resize handling
Modified: activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/DefinitionHistoryView.java
===================================================================
--- activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/DefinitionHistoryView.java 2010-03-30 16:06:19 UTC (rev 1024)
+++ activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/DefinitionHistoryView.java 2010-03-31 08:51:12 UTC (rev 1025)
@@ -27,6 +27,7 @@
import org.timepedia.chronoscope.client.browser.json.GwtJsonDataset;
import org.timepedia.chronoscope.client.browser.json.JsonDatasetJSO;
import org.timepedia.chronoscope.client.canvas.View;
+import org.timepedia.chronoscope.client.canvas.ViewReadyCallback;
import org.timepedia.chronoscope.client.data.tuple.Tuple2D;
import org.timepedia.chronoscope.client.event.PlotFocusEvent;
import org.timepedia.chronoscope.client.event.PlotFocusHandler;
@@ -91,10 +92,12 @@
title.getElement().setAttribute("style", "font-size:24px; font-weight:BOLD");
// ------------
+
+ BoxLayout boxLayout = new BoxLayout(BoxLayout.Orientation.HORIZONTAL);
+ timespanPanel = new LayoutPanel(boxLayout);
- timespanPanel = new LayoutPanel(new BoxLayout(BoxLayout.Orientation.HORIZONTAL));
timespan = new HTML();
- timespan.getElement().setAttribute("style", "padding-top:2px; color:#ccc;font-size:16px;text-align:left;");
+ timespan.getElement().setAttribute("style", "padding-top:2px; color:#C8C8C8;font-size:16px;text-align:left;");
timespanButton = new ToolButton();
timespanButton.setVisible(false);
timespanButton.setStyle(ToolButton.ToolButtonStyle.MENU);
@@ -120,6 +123,7 @@
// ------------
LayoutPanel contents = new LayoutPanel(new RowLayout());
+
LayoutPanel headerPanel = new LayoutPanel(new ColumnLayout());
headerPanel.add(title, new ColumnLayoutData("50%"));
headerPanel.add(timespanPanel, new ColumnLayoutData("50%"));
@@ -291,6 +295,16 @@
// ------
timespan.setText(datasets[0].getRangeLabel());
+
+ chartPanel.setViewReadyCallback(
+ new ViewReadyCallback() {
+ public void onViewReady(View view)
+ {
+ resizeChartArea(view);
+ }
+ }
+ );
+
chartArea.add(chartPanel);
// ------
@@ -304,17 +318,27 @@
return chartPanel.isAttached();
}
- public void onResize(int width, int height) {
+ public void onResize(int width, int height)
+ {
int chartWidth = chartArea.getOffsetWidth()/2;
int chartHeight = (int) (chartWidth / GOLDEN__RATIO);
// Resizing the chart once displayed currently unsupported
View view = chartPanel.getChart().getView();
view.resize(chartWidth, chartHeight);
+ resizeChartArea(view);
}
});
}
+ private void resizeChartArea(View view)
+ {
+ Log.debug(view.getWidth()+ "/"+view.getHeight());
+ int resizeTo= Integer.valueOf(view.getHeight()) + 75;
+ chartArea.setHeight(resizeTo+"px");
+ chartArea.layout();
+ }
+
private static native JsonDatasetJSO getJson(String varName) /*-{
return $wnd[varName];
}-*/;
14 years, 1 month
Overlord SVN: r1024 - in activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui: public and 1 other directory.
by overlord-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2010-03-30 12:06:19 -0400 (Tue, 30 Mar 2010)
New Revision: 1024
Modified:
activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/DefinitionHistoryView.java
activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/MonitorUI.java
activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/public/monitor.css
Log:
Markers, first cut
Modified: activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/DefinitionHistoryView.java
===================================================================
--- activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/DefinitionHistoryView.java 2010-03-30 15:01:50 UTC (rev 1023)
+++ activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/DefinitionHistoryView.java 2010-03-30 16:06:19 UTC (rev 1024)
@@ -1,6 +1,7 @@
/* jboss.org */
package org.jboss.bpm.monitor.gui.client;
+import com.allen_sauer.gwt.log.client.Log;
import com.google.gwt.core.client.GWT;
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler;
@@ -20,13 +21,18 @@
import org.jboss.errai.workspaces.client.api.annotations.LoadTool;
import org.timepedia.chronoscope.client.Dataset;
import org.timepedia.chronoscope.client.Datasets;
+import org.timepedia.chronoscope.client.XYPlot;
import org.timepedia.chronoscope.client.browser.ChartPanel;
import org.timepedia.chronoscope.client.browser.Chronoscope;
import org.timepedia.chronoscope.client.browser.json.GwtJsonDataset;
import org.timepedia.chronoscope.client.browser.json.JsonDatasetJSO;
import org.timepedia.chronoscope.client.canvas.View;
import org.timepedia.chronoscope.client.data.tuple.Tuple2D;
+import org.timepedia.chronoscope.client.event.PlotFocusEvent;
+import org.timepedia.chronoscope.client.event.PlotFocusHandler;
+import org.timepedia.chronoscope.client.overlays.Marker;
+import java.util.Date;
import java.util.List;
/**
@@ -250,13 +256,45 @@
int chartWidth = chartArea.getOffsetWidth()/2;
int chartHeight = (int) (chartWidth / GOLDEN__RATIO);
- chartPanel = Chronoscope
- .createTimeseriesChart(datasets, chartWidth, chartHeight);
+ // ------
+ chartPanel = Chronoscope.createTimeseriesChart(datasets, chartWidth, chartHeight);
+ // marker
+ final XYPlot plot = chartPanel.getChart().getPlot();
+ plot.addPlotFocusHandler(new PlotFocusHandler(){
+ public void onFocus(final PlotFocusEvent event)
+ {
+
+ if(event.getFocusDataset()>=0) // zooming
+ {
+ Log.debug("Focus "+event.getDomain() + "/"+event.getRange());
+
+ MessageBox.prompt("Create Marker", "Please enter a title:",
+ null, new MessageBox.PromptCallback<String>(){
+ public void onResult(String s)
+ {
+ if(s!=null)
+ {
+ Marker m = new Marker(
+ event.getDomain(),s, 0
+ );
+
+ plot.addOverlay(m);
+ plot.redraw();
+ }
+ }
+ });
+ }
+ }
+ });
+
+ // ------
+
timespan.setText(datasets[0].getRangeLabel());
-
chartArea.add(chartPanel);
+ // ------
+
ResizableWidgetCollection.get().add(new ResizableWidget() {
public Element getElement() {
return chartPanel.getElement();
Modified: activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/MonitorUI.java
===================================================================
--- activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/MonitorUI.java 2010-03-30 15:01:50 UTC (rev 1023)
+++ activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/MonitorUI.java 2010-03-30 16:06:19 UTC (rev 1024)
@@ -48,7 +48,7 @@
ChronoscopeOptions.setErrorReporting(true);
Chronoscope.setMicroformatsEnabled(false);
Chronoscope.setShowCredits(false);
- Chronoscope.initialize();
+ Chronoscope.initialize();
chronoscope = Chronoscope.getInstance();
Modified: activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/public/monitor.css
===================================================================
--- activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/public/monitor.css 2010-03-30 15:01:50 UTC (rev 1023)
+++ activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/public/monitor.css 2010-03-30 16:06:19 UTC (rev 1024)
@@ -6,4 +6,5 @@
-webkit-box-shadow: 3px 3px 3px #ccc;
box-shadow: 3px 3px 3px #ccc;
-}
\ No newline at end of file
+}
+
14 years, 1 month
Overlord SVN: r1023 - in activity-monitor/trunk: model/src/main/java/org/jboss/bpm/monitor/model/metric and 1 other directory.
by overlord-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2010-03-30 11:01:50 -0400 (Tue, 30 Mar 2010)
New Revision: 1023
Modified:
activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/server/ChartDataService.java
activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/metric/Grouping.java
activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/metric/Timespan.java
Log:
Fix date calculations
Modified: activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/server/ChartDataService.java
===================================================================
--- activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/server/ChartDataService.java 2010-03-30 14:41:06 UTC (rev 1022)
+++ activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/server/ChartDataService.java 2010-03-30 15:01:50 UTC (rev 1023)
@@ -44,6 +44,9 @@
switch (timespan.getUnit())
{
+ case HOUR:
+ grouped = Grouping.byHour(events, timespan);
+ break;
case DAY:
grouped = Grouping.byDay(events, timespan);
break;
Modified: activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/metric/Grouping.java
===================================================================
--- activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/metric/Grouping.java 2010-03-30 14:41:06 UTC (rev 1022)
+++ activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/metric/Grouping.java 2010-03-30 15:01:50 UTC (rev 1023)
@@ -55,6 +55,11 @@
return slotCount;
}
+ public static SortedMap<Date, List<Event>> byHour(List<Event> events, Timespan timespan)
+ {
+ return _doSort(events, timespan, Calendar.HOUR_OF_DAY);
+ }
+
public static SortedMap<Date, List<Event>> byDay(List<Event> events, Timespan timespan)
{
return _doSort(events, timespan, Calendar.DAY_OF_YEAR);
Modified: activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/metric/Timespan.java
===================================================================
--- activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/metric/Timespan.java 2010-03-30 14:41:06 UTC (rev 1022)
+++ activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/metric/Timespan.java 2010-03-30 15:01:50 UTC (rev 1023)
@@ -114,13 +114,13 @@
cal.add(Calendar.WEEK_OF_YEAR, -1);
- cal.set(Calendar.DAY_OF_WEEK, 7);
+ cal.set(Calendar.DAY_OF_WEEK, cal.getActualMaximum(Calendar.DAY_OF_WEEK));
cal.set(Calendar.HOUR_OF_DAY, 23);
cal.set(Calendar.MINUTE, 59);
cal.set(Calendar.SECOND, 59);
long t1 = cal.getTimeInMillis();
- cal.set(Calendar.DAY_OF_WEEK, 0);
+ cal.set(Calendar.DAY_OF_WEEK, cal.getActualMinimum(Calendar.DAY_OF_WEEK));
cal.set(Calendar.HOUR_OF_DAY, 0);
cal.set(Calendar.MINUTE, 0);
cal.set(Calendar.SECOND, 0);
@@ -152,7 +152,7 @@
cal.set(Calendar.SECOND, 59);
long t1 = cal.getTimeInMillis();
- cal.set(Calendar.DAY_OF_MONTH, 1);
+ cal.set(Calendar.DAY_OF_MONTH, cal.getActualMinimum(Calendar.DAY_OF_MONTH));
cal.set(Calendar.HOUR_OF_DAY, 0);
cal.set(Calendar.MINUTE, 0);
cal.set(Calendar.SECOND, 0);
14 years, 1 month
Overlord SVN: r1022 - in activity-monitor/trunk: gui/war/src/main/java/org/jboss/bpm/monitor/gui/client and 4 other directories.
by overlord-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2010-03-30 10:41:06 -0400 (Tue, 30 Mar 2010)
New Revision: 1022
Added:
activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/TimespanValues.java
activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/public/monitor.css
Modified:
activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/App.gwt.xml
activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/DebugPanel.java
activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/DefinitionHistoryView.java
activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/server/ChartDataService.java
activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/DefaultBPAFDataSource.java
activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/metric/Grouping.java
activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/metric/Timespan.java
Log:
added timespan selection, first cut
Modified: activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/App.gwt.xml
===================================================================
--- activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/App.gwt.xml 2010-03-30 08:48:19 UTC (rev 1021)
+++ activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/App.gwt.xml 2010-03-30 14:41:06 UTC (rev 1022)
@@ -11,6 +11,7 @@
<inherits name="org.jboss.errai.bus.ErraiBus"/>
<inherits name="org.jboss.errai.workspaces.ErraiWorkspaces" />
+ <stylesheet src="monitor.css"/>
<entry-point class='org.jboss.bpm.monitor.gui.client.MonitorUI'/>
</module>
\ No newline at end of file
Modified: activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/DebugPanel.java
===================================================================
--- activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/DebugPanel.java 2010-03-30 08:48:19 UTC (rev 1021)
+++ activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/DebugPanel.java 2010-03-30 14:41:06 UTC (rev 1022)
@@ -3,11 +3,11 @@
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler;
-import com.google.gwt.gen2.table.event.client.RowSelectionEvent;
-import com.google.gwt.gen2.table.event.client.RowSelectionHandler;
import com.google.gwt.user.client.ui.Button;
import org.gwt.mosaic.ui.client.CaptionLayoutPanel;
import org.gwt.mosaic.ui.client.ListBox;
+import org.gwt.mosaic.ui.client.event.RowSelectionEvent;
+import org.gwt.mosaic.ui.client.event.RowSelectionHandler;
import org.gwt.mosaic.ui.client.layout.BoxLayout;
import org.gwt.mosaic.ui.client.layout.BoxLayoutData;
import org.gwt.mosaic.ui.client.layout.ColumnLayout;
Modified: activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/DefinitionHistoryView.java
===================================================================
--- activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/DefinitionHistoryView.java 2010-03-30 08:48:19 UTC (rev 1021)
+++ activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/DefinitionHistoryView.java 2010-03-30 14:41:06 UTC (rev 1022)
@@ -2,11 +2,17 @@
package org.jboss.bpm.monitor.gui.client;
import com.google.gwt.core.client.GWT;
-import com.google.gwt.event.dom.client.ChangeEvent;
-import com.google.gwt.event.dom.client.ChangeHandler;
+import com.google.gwt.event.dom.client.ClickEvent;
+import com.google.gwt.event.dom.client.ClickHandler;
+import com.google.gwt.user.client.Command;
+import com.google.gwt.user.client.Element;
+import com.google.gwt.user.client.ui.Button;
+import com.google.gwt.user.client.ui.HTML;
import com.google.gwt.user.client.ui.ListBox;
-import org.gwt.mosaic.ui.client.layout.BoxLayout;
-import org.gwt.mosaic.ui.client.layout.LayoutPanel;
+import org.gwt.mosaic.ui.client.*;
+import org.gwt.mosaic.ui.client.layout.*;
+import org.gwt.mosaic.ui.client.util.ResizableWidget;
+import org.gwt.mosaic.ui.client.util.ResizableWidgetCollection;
import org.jboss.errai.bus.client.api.RemoteCallback;
import org.jboss.errai.bus.client.api.base.MessageBuilder;
import org.jboss.errai.workspaces.client.api.ProvisioningCallback;
@@ -18,6 +24,7 @@
import org.timepedia.chronoscope.client.browser.Chronoscope;
import org.timepedia.chronoscope.client.browser.json.GwtJsonDataset;
import org.timepedia.chronoscope.client.browser.json.JsonDatasetJSO;
+import org.timepedia.chronoscope.client.canvas.View;
import org.timepedia.chronoscope.client.data.tuple.Tuple2D;
import java.util.List;
@@ -34,56 +41,154 @@
private static volatile double GOLDEN__RATIO = 1.618;
- private LayoutPanel panel;
- private ListBox listBox;
private ChartPanel chartPanel;
+ private ToolButton menuButton;
+ private ToolButton timespanButton;
+ private HTML title;
+ private HTML timespan;
+ private CaptionLayoutPanel chartArea;
+ private LayoutPanel timespanPanel;
public void provideWidget(ProvisioningCallback callback)
{
- panel = new LayoutPanel(new BoxLayout(BoxLayout.Orientation.VERTICAL));
+
+ LayoutPanel panel = new LayoutPanel(new BoxLayout(BoxLayout.Orientation.VERTICAL));
- listBox = new ListBox();
- panel.add(listBox);
- listBox.addItem("Select a process");
- listBox.addChangeHandler(new ChangeHandler()
+ final ToolBar toolBar = new ToolBar();
+ panel.add(toolBar, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
+
+ // -----
+
+ menuButton = new ToolButton("Open");
+ menuButton.setStyle(ToolButton.ToolButtonStyle.MENU);
+ final Command selectProcessCmd = new Command() {
+ public void execute()
+ {
+ // update if necessary
+ selectDefinition();
+ }
+ };
+
+ PopupMenu menuBtnMenu = new PopupMenu();
+ menuBtnMenu.addItem("ProcessDefintion", selectProcessCmd);
+ menuButton.setMenu(menuBtnMenu);
+ toolBar.add(menuButton);
+
+ // -----
+
+ toolBar.addSeparator();
+ toolBar.add(new ToolButton("Export"));
+
+ // -----
+
+ title = new HTML();
+ title.getElement().setAttribute("style", "font-size:24px; font-weight:BOLD");
+
+ // ------------
+
+ timespanPanel = new LayoutPanel(new BoxLayout(BoxLayout.Orientation.HORIZONTAL));
+ timespan = new HTML();
+ timespan.getElement().setAttribute("style", "padding-top:2px; color:#ccc;font-size:16px;text-align:left;");
+ timespanButton = new ToolButton();
+ timespanButton.setVisible(false);
+ timespanButton.setStyle(ToolButton.ToolButtonStyle.MENU);
+
+ final PopupMenu timeBtnMenu = new PopupMenu();
+
+ for(final String ts : TimespanValues.ALL)
{
- public void onChange(ChangeEvent changeEvent)
+ timeBtnMenu.addItem(ts, new Command()
{
- ChartData rpcService = MessageBuilder.createCall(
- new RemoteCallback<String>()
- {
- public void callback(String response)
- {
- renderChart(response);
- }
- },
- ChartData.class
- );
-
- if(listBox.getSelectedIndex()>0)
+ public void execute()
{
- String processDefinitionID = listBox.getItemText(listBox.getSelectedIndex());
- rpcService.getDefinitionActivity(processDefinitionID, "Last 7 Days");
+ loadGraphData(title.getText(), ts);
}
- }
- });
+ });
+ };
- loadDefinitions();
+ timespanButton.setMenu(timeBtnMenu);
+ timespanPanel.add(timespanButton);
+ timespanPanel.add(timespan, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
+
+ // ------------
+
+ LayoutPanel contents = new LayoutPanel(new RowLayout());
+ LayoutPanel headerPanel = new LayoutPanel(new ColumnLayout());
+ headerPanel.add(title, new ColumnLayoutData("50%"));
+ headerPanel.add(timespanPanel, new ColumnLayoutData("50%"));
+
+ // ------------
+
+ chartArea = new CaptionLayoutPanel();
+ chartArea.setPadding(15);
+ contents.add(headerPanel, new RowLayoutData("120"));
+ contents.add(chartArea, new RowLayoutData("350", true));
+
+ panel.add(contents, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH));
callback.onSuccess(panel);
}
- private void loadDefinitions()
- {
+ private void selectDefinition()
+ {
HistoryRecords rpcService = MessageBuilder.createCall(
new RemoteCallback<List<String>>()
{
public void callback(List<String> response)
{
+ final LayoutPopupPanel popup = new LayoutPopupPanel(false);
+ popup.addStyleName("soa-PopupPanel");
+
+ final ListBox listBox = new ListBox();
+ listBox.addItem("");
+
for(String s : response)
+ {
listBox.addItem(s);
+ }
+
+ // show dialogue
+ LayoutPanel p = new LayoutPanel(new BoxLayout(BoxLayout.Orientation.VERTICAL));
+ p.add(new HTML("Which definition would like to inspect?"));
+ p.add(listBox);
+
+ // -----
+
+ LayoutPanel p2 = new LayoutPanel(new BoxLayout(BoxLayout.Orientation.HORIZONTAL));
+ p2.add(new Button("Done", new ClickHandler() {
+ public void onClick(ClickEvent clickEvent)
+ {
+ if(listBox.getSelectedIndex()>0)
+ {
+ popup.hide();
+ String procDef = listBox.getItemText(listBox.getSelectedIndex());
+ title.setText(procDef);
+ loadGraphData(procDef, TimespanValues.LAST_7_DAYS);
+ }
+ }
+ }));
+
+ // -----
+
+ HTML html = new HTML("Cancel");
+ html.addClickHandler(new ClickHandler(){
+ public void onClick(ClickEvent clickEvent)
+ {
+ popup.hide();
+ }
+ });
+ p2.add(html, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
+ p.add(p2);
+
+ // -----
+
+ popup.setPopupPosition(menuButton.getAbsoluteLeft()-5, menuButton.getAbsoluteTop()+30);
+ popup.setWidget(p);
+ popup.pack();
+ popup.show();
+
}
},
HistoryRecords.class
@@ -93,6 +198,29 @@
}
+ /**
+ * Loads the chronoscope data for a particlar processdefinition
+ * @param procDefID
+ * @param timespan
+ */
+ private void loadGraphData(final String procDefID, final String timespan)
+ {
+ ChartData rpcService = MessageBuilder.createCall(
+ new RemoteCallback<String>()
+ {
+ public void callback(String response)
+ {
+ timespanButton.setVisible(true);
+ renderChart(response);
+ timespanPanel.layout();
+ }
+ },
+ ChartData.class
+ );
+
+ rpcService.getDefinitionActivity(procDefID, timespan);
+ }
+
private void renderChart(String jsonData)
{
try
@@ -105,11 +233,11 @@
// if exists remove. I don't know how to update at this point
if(chartPanel!=null)
- panel.remove(chartPanel);
+ chartArea.remove(chartPanel);
initChartPanel(dsArray);
-
- panel.layout();
+
+ chartArea.layout();
}
catch (Exception e)
{
@@ -119,13 +247,34 @@
private void initChartPanel(Dataset[] datasets)
{
- int chartWidth = 450;
+ int chartWidth = chartArea.getOffsetWidth()/2;
int chartHeight = (int) (chartWidth / GOLDEN__RATIO);
chartPanel = Chronoscope
.createTimeseriesChart(datasets, chartWidth, chartHeight);
+
+ timespan.setText(datasets[0].getRangeLabel());
- panel.add(chartPanel);
+ chartArea.add(chartPanel);
+
+ ResizableWidgetCollection.get().add(new ResizableWidget() {
+ public Element getElement() {
+ return chartPanel.getElement();
+ }
+
+ public boolean isAttached() {
+ return chartPanel.isAttached();
+ }
+
+ public void onResize(int width, int height) {
+ int chartWidth = chartArea.getOffsetWidth()/2;
+ int chartHeight = (int) (chartWidth / GOLDEN__RATIO);
+
+ // Resizing the chart once displayed currently unsupported
+ View view = chartPanel.getChart().getView();
+ view.resize(chartWidth, chartHeight);
+ }
+ });
}
private static native JsonDatasetJSO getJson(String varName) /*-{
Added: activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/TimespanValues.java
===================================================================
--- activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/TimespanValues.java (rev 0)
+++ activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/TimespanValues.java 2010-03-30 14:41:06 UTC (rev 1022)
@@ -0,0 +1,28 @@
+/* jboss.org */
+package org.jboss.bpm.monitor.gui.client;
+
+/**
+ * @author: Heiko Braun <hbraun(a)redhat.com>
+ * @date: Mar 30, 2010
+ */
+public interface TimespanValues
+{
+ public static final String LAST_24_HOURS = "Last 24 Hours";
+ public static final String LAST_DAY = "Last Day";
+ public static final String LAST_7_DAYS = "Last 7 Days";
+ public static final String LAST_WEEK = "Last Week";
+ public static final String LAST_4_WEEKS = "Last 4 Weeks";
+ public static final String LAST_MONTH = "Last Month";
+ public static final String LAST_3_MONTH = "Last 3 Month";
+ public static final String LAST_QUARTER = "Last Quarter";
+ public static final String LAST_12_MONTH = "Last 12 Month";
+ public static final String LAST_YEAR = "Last Year";
+
+ public static String[] ALL = new String[] {
+ LAST_24_HOURS, LAST_DAY,
+ LAST_7_DAYS, LAST_WEEK,
+ LAST_4_WEEKS, LAST_MONTH,
+ LAST_3_MONTH, LAST_QUARTER,
+ LAST_12_MONTH, LAST_YEAR
+ };
+}
Added: activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/public/monitor.css
===================================================================
--- activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/public/monitor.css (rev 0)
+++ activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/public/monitor.css 2010-03-30 14:41:06 UTC (rev 1022)
@@ -0,0 +1,9 @@
+.soa-PopupPanel {
+ border: 1px solid #e3e3e3;
+ padding: 3px;
+ background: white;
+ -moz-box-shadow: 3px 3px 3px #ccc;
+ -webkit-box-shadow: 3px 3px 3px #ccc;
+ box-shadow: 3px 3px 3px #ccc;
+
+}
\ No newline at end of file
Modified: activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/server/ChartDataService.java
===================================================================
--- activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/server/ChartDataService.java 2010-03-30 08:48:19 UTC (rev 1021)
+++ activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/server/ChartDataService.java 2010-03-30 14:41:06 UTC (rev 1022)
@@ -40,13 +40,19 @@
List<Event> events = dataSource.getDefinitionEvents(processDefiniton, timespan);
- SortedMap<Date, List<Event>> grouped;
+ SortedMap<Date, List<Event>> grouped;
switch (timespan.getUnit())
{
case DAY:
grouped = Grouping.byDay(events, timespan);
break;
+ case WEEK:
+ grouped = Grouping.byWeek(events, timespan);
+ break;
+ case MONTH:
+ grouped = Grouping.byMonth(events, timespan);
+ break;
default:
throw new IllegalArgumentException("UNIT not supported: "+timespan.getUnit());
@@ -68,7 +74,7 @@
dataSet.getDomain().add(domainData);
dataSet.getRange().add(rangeData);
dataSet.setAxis("date");
-
+
return dataSet.toJSO();
}
}
Modified: activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/DefaultBPAFDataSource.java
===================================================================
--- activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/DefaultBPAFDataSource.java 2010-03-30 08:48:19 UTC (rev 1021)
+++ activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/DefaultBPAFDataSource.java 2010-03-30 14:41:06 UTC (rev 1022)
@@ -141,6 +141,7 @@
}
});
+ System.out.println(timespan.getTitle() +": "+ result.size());
return result;
}
Modified: activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/metric/Grouping.java
===================================================================
--- activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/metric/Grouping.java 2010-03-30 08:48:19 UTC (rev 1021)
+++ activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/metric/Grouping.java 2010-03-30 14:41:06 UTC (rev 1022)
@@ -14,38 +14,38 @@
*/
public class Grouping
{
- public static SortedMap<Date, List<Event>> byDay(List<Event> events, Timespan timespan)
+ private static SortedMap<Date,List<Event>> _doSort(List<Event> events, Timespan timespan, int calMetric)
{
long s0 = System.currentTimeMillis();
SortedMap<Date, List<Event>> slotCount = new TreeMap<Date, List<Event>>();
- // create daily slots first
+ // create slots first
final Calendar cal = Calendar.getInstance();
cal.setTimeInMillis(timespan.getStart());
while(cal.getTimeInMillis()<timespan.getEnd())
{
slotCount.put(new Date(cal.getTimeInMillis()), new ArrayList<Event>()); // left inclusive
- cal.roll(Calendar.DAY_OF_YEAR, 1);
+ cal.add(calMetric, 1);
}
// sort events according to slots
final Set<Date> startingDates = slotCount.keySet();
- Iterator<Date> it = startingDates.iterator();
- while(it.hasNext())
+ Iterator<Date> leftOffset = startingDates.iterator();
+ while(leftOffset.hasNext())
{
- Date from = it.next();
+ Date from = leftOffset.next();
for(Event e : events)
{
cal.setTime(from);
- cal.roll(Calendar.DAY_OF_YEAR, 1);
+ cal.add(calMetric, 1);
Date to = cal.getTime();
Date actual = new Date(e.getTimestamp());
if(actual.after(from) && actual.before(to))
{
- slotCount.get(from).add(e);
+ slotCount.get(from).add(e);
}
}
@@ -55,4 +55,19 @@
return slotCount;
}
+ public static SortedMap<Date, List<Event>> byDay(List<Event> events, Timespan timespan)
+ {
+ return _doSort(events, timespan, Calendar.DAY_OF_YEAR);
+ }
+
+ public static SortedMap<Date, List<Event>> byWeek(List<Event> events, Timespan timespan)
+ {
+ return _doSort(events, timespan, Calendar.WEEK_OF_YEAR);
+ }
+
+ public static SortedMap<Date, List<Event>> byMonth(List<Event> events, Timespan timespan)
+ {
+ return _doSort(events, timespan, Calendar.MONTH);
+ }
+
}
Modified: activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/metric/Timespan.java
===================================================================
--- activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/metric/Timespan.java 2010-03-30 08:48:19 UTC (rev 1021)
+++ activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/metric/Timespan.java 2010-03-30 14:41:06 UTC (rev 1022)
@@ -73,7 +73,7 @@
Calendar cal = Calendar.getInstance();
long t1 = cal.getTimeInMillis();
- cal.roll(Calendar.DAY_OF_YEAR, -1);
+ cal.add(Calendar.DAY_OF_YEAR, -1);
long t0 = cal.getTimeInMillis();
return new Timespan(t0, t1, UNIT.HOUR, LAST_24_HOURS);
@@ -83,7 +83,7 @@
{
Calendar cal = Calendar.getInstance();
- cal.roll(Calendar.DAY_OF_YEAR, -1);
+ cal.add(Calendar.DAY_OF_YEAR, -1);
cal.set(Calendar.HOUR_OF_DAY, 23);
cal.set(Calendar.MINUTE, 59);
cal.set(Calendar.SECOND, 59);
@@ -102,7 +102,7 @@
Calendar cal = Calendar.getInstance();
long t1 = cal.getTimeInMillis();
- cal.roll(Calendar.DAY_OF_YEAR, -7);
+ cal.add(Calendar.DAY_OF_YEAR, -7);
long t0 = cal.getTimeInMillis();
return new Timespan(t0, t1, UNIT.DAY, LAST_7_DAYS);
@@ -112,7 +112,7 @@
{
Calendar cal = Calendar.getInstance();
- cal.roll(Calendar.WEEK_OF_YEAR, -1);
+ cal.add(Calendar.WEEK_OF_YEAR, -1);
cal.set(Calendar.DAY_OF_WEEK, 7);
cal.set(Calendar.HOUR_OF_DAY, 23);
@@ -134,7 +134,7 @@
Calendar cal = Calendar.getInstance();
long t1 = cal.getTimeInMillis();
- cal.roll(Calendar.WEEK_OF_YEAR, -4);
+ cal.add(Calendar.WEEK_OF_YEAR, -4);
long t0 = cal.getTimeInMillis();
return new Timespan(t0, t1, UNIT.DAY, LAST_4_WEEKS);
@@ -144,7 +144,7 @@
{
Calendar cal = Calendar.getInstance();
- cal.roll(Calendar.MONTH, -1);
+ cal.add(Calendar.MONTH, -1);
cal.set(Calendar.DAY_OF_MONTH, cal.getActualMaximum(Calendar.DAY_OF_MONTH));
cal.set(Calendar.HOUR_OF_DAY, 23);
@@ -167,7 +167,7 @@
Calendar cal = Calendar.getInstance();
long t1 = cal.getTimeInMillis();
- cal.roll(Calendar.MONTH, -3);
+ cal.add(Calendar.MONTH, -3);
long t0 = cal.getTimeInMillis();
return new Timespan(t0, t1, UNIT.WEEK, LAST_3_MONTH);
@@ -194,7 +194,7 @@
cal.set(Calendar.SECOND, 59);
long t1 = cal.getTimeInMillis();
- cal.roll(Calendar.MONTH, -2);
+ cal.add(Calendar.MONTH, -2);
cal.set(Calendar.DAY_OF_MONTH, 1);
cal.set(Calendar.HOUR_OF_DAY, 0);
cal.set(Calendar.MINUTE, 0);
@@ -210,7 +210,7 @@
Calendar cal = Calendar.getInstance();
long t1 = cal.getTimeInMillis();
- cal.roll(Calendar.YEAR, -1);
+ cal.add(Calendar.YEAR, -1);
long t0 = cal.getTimeInMillis();
return new Timespan(t0, t1, UNIT.MONTH, LAST_12_MONTH);
@@ -220,7 +220,7 @@
{
Calendar cal = Calendar.getInstance();
- cal.roll(Calendar.YEAR, -1);
+ cal.add(Calendar.YEAR, -1);
cal.set(Calendar.MONTH, Calendar.DECEMBER);
cal.set(Calendar.DAY_OF_MONTH, cal.getActualMaximum(Calendar.DAY_OF_MONTH));
14 years, 1 month
Overlord SVN: r1021 - bpm-console/tags.
by overlord-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2010-03-30 04:48:19 -0400 (Tue, 30 Mar 2010)
New Revision: 1021
Removed:
bpm-console/tags/bpm-console-2.0.2/
Log:
remove 2.0.2 tag
14 years, 1 month