[Mc4j-cvs] mc4j/src/org/mc4j/jre15/components MemoryUsageAreaChartComponent.java,1.5,1.6 MemoryUsageComponent.java,1.6,1.7 ThreadsViewComponent.java,1.2,1.3

[Greg H. <gh...@us...>]

Update of /cvsroot/mc4j/mc4j/src/org/mc4j/jre15/components
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8927/src/org/mc4j/jre15/components

Modified Files:
	MemoryUsageAreaChartComponent.java MemoryUsageComponent.java 
	ThreadsViewComponent.java 
Log Message:
Some images, dashboard component tweaks and dashboard updates

Index: MemoryUsageAreaChartComponent.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/jre15/components/MemoryUsageAreaChartComponent.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MemoryUsageAreaChartComponent.java	12 Apr 2006 19:14:04 -0000	1.5
--- MemoryUsageAreaChartComponent.java	17 Apr 2006 12:01:27 -0000	1.6
***************
*** 160,164 ****
      }
  
!     public void setBeanList(List beanList) {
          this.beanList = beanList;
      }
--- 160,164 ----
      }
  
!     public void setBeanList(List<EmsBean> beanList) {
          this.beanList = beanList;
      }

Index: ThreadsViewComponent.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/jre15/components/ThreadsViewComponent.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ThreadsViewComponent.java	12 Apr 2006 19:14:04 -0000	1.2
--- ThreadsViewComponent.java	17 Apr 2006 12:01:27 -0000	1.3
***************
*** 77,83 ****
          table.getColumnExt(3).setPreferredWidth(350);
  
!         table.getColumnExt(4).setVisible(false);  // CPU Total
!         table.getColumnExt(6).setVisible(false);  // User CPU Total
          table.getColumnExt(7).setVisible(false);  // Blocks Total
  
  
--- 77,85 ----
          table.getColumnExt(3).setPreferredWidth(350);
  
!         // Setting them invisible seems to move them (running this backwards to avoid problems)
!         table.getColumnExt(9).setVisible(false);  // Lock
          table.getColumnExt(7).setVisible(false);  // Blocks Total
+         table.getColumnExt(6).setVisible(false);  // User CPU Total
+         table.getColumnExt(4).setVisible(false);  // CPU Total
  
  

Index: MemoryUsageComponent.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/jre15/components/MemoryUsageComponent.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** MemoryUsageComponent.java	17 Apr 2006 03:07:26 -0000	1.6
--- MemoryUsageComponent.java	17 Apr 2006 12:01:27 -0000	1.7
***************
*** 39,77 ****
      public static final String USED = "Used";
  
  
-     protected void createTimeSeries(String name, Object key) {
  
!         super.createTimeSeries(COMMITTED, name + COMMITTED);
!         super.createTimeSeries(INIT, name + INIT);
!         super.createTimeSeries(MAX, name + MAX);
!         super.createTimeSeries(USED, name + USED);
  
  
      }
  
!     public void addObservation() throws Exception { 
  
  
! 8
!         for (EmsAttribute attribute : getAttributes()) {
!             Object value = attribute.refresh(); //this.emsBean.getAttribute(attributeName).refresh();
  
              MemoryUsage usage = MemoryUsage.from((CompositeData) value);
  
              TimeSeries ts;
!             String attributeName = "";
!             ts = getTimeSeries(attributeName + COMMITTED);
              ts.add(new Millisecond(), usage.getCommitted());
  
!             ts = getTimeSeries(attributeName + INIT);
              ts.add(new Millisecond(), usage.getInit());
  
!             ts = getTimeSeries(attributeName + MAX);
              ts.add(new Millisecond(), usage.getMax());
  
!             ts = getTimeSeries(attributeName + USED);
              ts.add(new Millisecond(), usage.getUsed());
  
!         }
      }
  
--- 39,83 ----
      public static final String USED = "Used";
  
+     // Master attribute
+     EmsAttribute attribute;
  
  
!     protected void createTimeSeries() {
! 
!         super.createTimeSeries(COMMITTED, COMMITTED);
!         super.createTimeSeries(INIT, INIT);
!         super.createTimeSeries(MAX, MAX);
!         super.createTimeSeries(USED, USED);
  
  
      }
  
!     public void setAttribute(EmsAttribute attribute) {
!         this.attribute = attribute;
!         createTimeSeries();
!     }
  
  
!     public void addObservation() throws Exception {
! 
! 
!             Object value = this.attribute.refresh();
  
              MemoryUsage usage = MemoryUsage.from((CompositeData) value);
  
              TimeSeries ts;
!             ts = getTimeSeries(COMMITTED);
              ts.add(new Millisecond(), usage.getCommitted());
  
!             ts = getTimeSeries(INIT);
              ts.add(new Millisecond(), usage.getInit());
  
!             ts = getTimeSeries(MAX);
              ts.add(new Millisecond(), usage.getMax());
  
!             ts = getTimeSeries(USED);
              ts.add(new Millisecond(), usage.getUsed());
  
!         
      }