User: juhalindfors
Date: 01/04/16 14:55:19
Modified: src/org/jboss/admin/monitor GraphView.java MonitorFrame.java
MonitorPane.java MonitorResourceConstants.java
StatsView.java
Log:
initial cache monitoring + a bunch of other stuff
Revision Changes Path
1.3 +20 -7 admin/src/org/jboss/admin/monitor/GraphView.java
Index: GraphView.java
===================================================================
RCS file: /cvsroot/jboss/admin/src/org/jboss/admin/monitor/GraphView.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GraphView.java 2001/02/18 20:37:31 1.2
+++ GraphView.java 2001/04/16 21:55:19 1.3
@@ -73,7 +73,8 @@
if (graphRenderer == null)
return;
- remove((Component)renderer);
+ //remove((Component)renderer);
+ removeAll();
this.renderer = graphRenderer;
@@ -94,19 +95,31 @@
return;
model.removeGraphModelListener(renderer);
-// remove((Component)renderer);
- setGraphRenderer(renderer);
this.model = graphModel;
-
-// add(renderer.getGraphRendererObject(this), BorderLayout.CENTER);
model.addGraphModelListener(renderer);
-
- revalidate();
+
+ setGraphRenderer(renderer);
}
public GraphModel getModel() {
return model;
+ }
+
+ public double getVerticalMax() {
+ return getModel().getVerticalMax();
+ }
+
+ public double getVerticalMin() {
+ return getModel().getVerticalMin();
+ }
+
+ public double getHorizontalMax() {
+ return getModel().getHorizontalMax();
+ }
+
+ public double getHorizontalMin() {
+ return getModel().getHorizontalMin();
}
}
1.3 +19 -6 admin/src/org/jboss/admin/monitor/MonitorFrame.java
Index: MonitorFrame.java
===================================================================
RCS file: /cvsroot/jboss/admin/src/org/jboss/admin/monitor/MonitorFrame.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MonitorFrame.java 2001/02/18 20:37:31 1.2
+++ MonitorFrame.java 2001/04/16 21:55:19 1.3
@@ -28,8 +28,11 @@
import org.jboss.admin.dataholder.InvocationEntry;
import org.jboss.admin.dataholder.BeanCacheEntry;
import org.jboss.admin.MetricsConnector;
+import org.jboss.admin.monitor.graph.GraphModel;
import org.jboss.admin.monitor.graph.DefaultGraphModel;
import org.jboss.admin.monitor.tree.MethodTreeNode;
+import org.jboss.admin.monitor.tree.BeanCacheTreeNode;
+import org.jboss.admin.monitor.event.GraphModelListener;
import org.jboss.monitor.MetricsConstants;
import org.gjt.lindfors.util.LocalizationSupport;
@@ -125,6 +128,7 @@
*************************************************************************
*/
+ // [TODO] get rid of this and create a locale singleton
public LocalizationSupport getLanguagePackage() {
return lang;
}
@@ -152,21 +156,30 @@
if (node.isLeaf() && (node instanceof MethodTreeNode)) {
- // ATM all leaves are methodnode instances
MethodTreeNode methodNode = (MethodTreeNode)node;
monitor.setGraphModel(methodNode.getGraphModel());
monitor.repaint();
}
+
+ else if (node.isLeaf() && (node instanceof BeanCacheTreeNode)) {
+
+ BeanCacheTreeNode cacheNode = (BeanCacheTreeNode)node;
+ monitor.setGraphModel(cacheNode.getGraphModel());
+ monitor.setStatsView((GraphModelListener)cacheNode.getStatsView());
+ monitor.repaint();
+ }
// right just display empty stats for all branches
// will do "summary" displays later
else {
- monitor.setGraphModel(new DefaultGraphModel());
+ monitor.setGraphModel(emptyGraphModel);
monitor.repaint();
}
}
+ private GraphModel emptyGraphModel = new DefaultGraphModel();
+
/*
*************************************************************************
*
@@ -219,9 +232,9 @@
private class ConnectorThread implements Runnable, MessageListener {
- final static String TOPIC = "topic/metrics";
- final static String SELECTOR =
- "JMSType = 'Invocation' OR JMSType = 'BeanCache'";
+ final String TOPIC = "topic/metrics";
+ final String SELECTOR = null;
+ //"JMSType = 'Invocation' OR JMSType = 'BeanCache'";
public void run() {
// connect to JMS
@@ -252,7 +265,7 @@
* application tree for further processing.
*/
public void onMessage(final Message msg) {
-
+
SwingUtilities.invokeLater(new Runnable() {
// adding invocation entries updates GUI, hence not thread safe
1.2 +45 -5 admin/src/org/jboss/admin/monitor/MonitorPane.java
Index: MonitorPane.java
===================================================================
RCS file: /cvsroot/jboss/admin/src/org/jboss/admin/monitor/MonitorPane.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MonitorPane.java 2001/02/18 20:37:31 1.1
+++ MonitorPane.java 2001/04/16 21:55:19 1.2
@@ -2,7 +2,9 @@
// standard imports
import java.awt.GridLayout;
+import java.util.Locale;
import javax.swing.JPanel;
+import javax.swing.JComponent;
import javax.swing.border.BevelBorder;
import javax.swing.border.EtchedBorder;
import javax.swing.border.EmptyBorder;
@@ -11,17 +13,26 @@
// non-standard class dependencies
import org.jboss.admin.monitor.graph.GraphModel;
+import org.jboss.admin.monitor.event.GraphModelListener;
+import org.gjt.lindfors.util.LocalizationSupport;
/**
* ...
*
* @author <a href="mailto:[EMAIL PROTECTED]">Juha Lindfors</a>
*/
-public class MonitorPane extends JPanel {
+public class MonitorPane extends JPanel implements MonitorResourceConstants {
private GraphView graph = null;
- private StatsView stats = null;
+ private GraphModelListener stats = null;
+ /**
+ * Support class for localization. Used for loading language resource bundles
+ * and retrieving localized info. <p>
+ *
+ * Initialized in the constructor.
+ */
+ private transient LocalizationSupport lang = null;
/*
*************************************************************************
@@ -33,6 +44,11 @@
public MonitorPane() {
super(new GridLayout(0, 1, 0, 10));
+
+ // load the language bundle
+ // [TODO] fix this to use thelocale singleton
+ this.lang = new LocalizationSupport(LANG_PKG, Locale.getDefault());
+
init();
}
@@ -48,6 +64,19 @@
graph.setModel(model);
}
+ public void setStatsView(GraphModelListener listener) {
+
+ JComponent comp = (JComponent)listener;
+
+ remove((JComponent)stats);
+ graph.getModel().removeGraphModelListener(stats);
+
+ decorateStats(comp);
+ stats = listener;
+
+ graph.getModel().addGraphModelListener(listener);
+ add(comp);
+ }
/*
*************************************************************************
*
@@ -62,7 +91,7 @@
// according to to the node selected in the application tree.
graph = new GraphView();
stats = new StatsView();
- //graph.addModelListener(stats);
+ graph.getModel().addGraphModelListener(stats);
EtchedBorder graphLines = new EtchedBorder();
TitledBorder graphTitle = new TitledBorder(graphLines, " Graph View ");
@@ -73,11 +102,22 @@
TitledBorder statsBorder = new TitledBorder(statsLines, " Statistics ");
graph.setBorder(graphBorder);
- stats.setBorder(statsBorder);
+ ((JComponent)stats).setBorder(statsBorder);
setBorder(new EmptyBorder(10, 10, 10, 10));
add(graph);
- add(stats);
+ add((JComponent)stats);
}
+
+ private void decorateStats(JComponent comp) {
+ decorateStats(comp, " Statistics ");
+ }
+
+ private void decorateStats(JComponent comp, String title) {
+ EtchedBorder statsLines = new EtchedBorder();
+ TitledBorder statsBorder = new TitledBorder(statsLines, title);
+
+ comp.setBorder(statsBorder);
+ }
}
1.3 +5 -1 admin/src/org/jboss/admin/monitor/MonitorResourceConstants.java
Index: MonitorResourceConstants.java
===================================================================
RCS file:
/cvsroot/jboss/admin/src/org/jboss/admin/monitor/MonitorResourceConstants.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MonitorResourceConstants.java 2001/02/18 20:37:31 1.2
+++ MonitorResourceConstants.java 2001/04/16 21:55:19 1.3
@@ -67,8 +67,12 @@
final static String AVG_INVOCATION_TIME = "stats.invocation.avg_time";
/** Resource bundle key for Stats view entry. */
final static String TOTAL_INVOCATION_COUNT = "stats.invocation.total";
-
+ /** Resource bundle key for Bean Cache stats view entry. */
+ final static String CACHE_SIZE = "stats.cache.size";
+ /** Resource bundle key for Bean Cache stats view entry. */
+ final static String CACHE_CAPACITY = "stats.cache.capacity";
+ final static String BEANCACHE_STATS_BORDER = "border.cache.stats";
final static String INVOCATION_GRAPH_BORDER = "border.invocation.graph";
1.3 +6 -0 admin/src/org/jboss/admin/monitor/StatsView.java
Index: StatsView.java
===================================================================
RCS file: /cvsroot/jboss/admin/src/org/jboss/admin/monitor/StatsView.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StatsView.java 2001/02/18 20:37:31 1.2
+++ StatsView.java 2001/04/16 21:55:19 1.3
@@ -88,6 +88,12 @@
repaint();
}
+
+ public void limitChanged(GraphModelEvent evt) {
+
+ // [TODO] graph listener adapter
+ }
+
/*
*************************************************************************
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
