[Mc4j-cvs] mc4j/src/org/mc4j/console/dashboard AttributeFactory.java,1.6,1.7 ConstraintFactory.java,1.5,1.6 Dashboard.java,1.11,1.12 DashboardComponentFactory.java,1.7,1.8 DashboardFactory.java,1.9,1.10 DashboardTopComponent.java,1.12,1.13

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

Update of /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17678/src/org/mc4j/console/dashboard

Modified Files:
	AttributeFactory.java ConstraintFactory.java Dashboard.java 
	DashboardComponentFactory.java DashboardFactory.java 
	DashboardTopComponent.java 
Log Message:
Removed a bunch of extra printouts and such.

Index: DashboardFactory.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard/DashboardFactory.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** DashboardFactory.java	4 Mar 2004 18:04:43 -0000	1.9
--- DashboardFactory.java	2 Apr 2004 03:34:05 -0000	1.10
***************
*** 240,247 ****
          if (borderElement != null) {
              BorderFactory borderFactory = new BorderFactory();
!             Border border = borderFactory.buildBorder(borderElement);
              AttributeFactory.loadAttributes(borderElement, border, context);
!             
!             ((JPanel)component).setBorder(border);
          }
          
--- 240,247 ----
          if (borderElement != null) {
              BorderFactory borderFactory = new BorderFactory();
!             Border border = borderFactory.buildBorder(borderElement, context);
              AttributeFactory.loadAttributes(borderElement, border, context);
! 
!             ((JComponent)component).setBorder(border);
          }
          

Index: AttributeFactory.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard/AttributeFactory.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** AttributeFactory.java	7 Feb 2004 16:10:41 -0000	1.6
--- AttributeFactory.java	2 Apr 2004 03:34:05 -0000	1.7
***************
*** 28,31 ****
--- 28,32 ----
  
  import org.openide.ErrorManager;
+ import org.openide.windows.IOProvider;
  
  import org.mc4j.console.dashboard.context.ContextHelper;
***************
*** 62,66 ****
              Object value = null;
              
!             org.openide.windows.IOProvider.getDefault().getStdOut().println("Introspecting: " + object.getClass().getName() + ", name = " + name + ", value = " + valueString);
  
              PropertyDescriptor desc = BeanUtil.getPropertyDescriptor(name, object.getClass());
--- 63,67 ----
              Object value = null;
              
!             IOProvider.getDefault().getIO("Dashboard debugging",false).getOut().println("Introspecting: " + object.getClass().getName() + ", name = " + name + ", value = " + valueString);
  
              PropertyDescriptor desc = BeanUtil.getPropertyDescriptor(name, object.getClass());
***************
*** 76,82 ****
              } else {
                  try {
!                     //org.openide.windows.IOProvider.getDefault().getStdOut().println("Checking context for value: " + valueString);
                      value = ContextHelper.getValue(valueString, context);
!                     //org.openide.windows.IOProvider.getDefault().getStdOut().println("Got back: " + value);
                  } catch (RuntimeException re) { 
                      ErrorManager.getDefault().notify(re);
--- 77,83 ----
              } else {
                  try {
!                     //IOProvider.getDefault().getIO("Dashboard debugging",false).getOut().println("Checking context for value: " + valueString);
                      value = ContextHelper.getValue(valueString, context);
!                     //IOProvider.getDefault().getIO("Dashboard debugging",false).getOut().println("Got back: " + value);
                  } catch (RuntimeException re) { 
                      ErrorManager.getDefault().notify(re);
***************
*** 98,106 ****
              }
              
!             org.openide.windows.IOProvider.getDefault().getStdOut().println("Setting attribute [" + name + "] = [" + value + "] on object: " + object);
              BeanUtil.setObjectAttribute(object, name, value);
          
          } catch (Exception e) {
!             org.openide.windows.IOProvider.getDefault().getStdOut().println("*** Exception while setting attribute [" + name + "] = [" + valueString + "] on object: " + object);
              
              ErrorManager.getDefault().notify(e);
--- 99,107 ----
              }
              
!             IOProvider.getDefault().getIO("Dashboard debugging",false).getOut().println("Setting attribute [" + name + "] = [" + value + "] on object: " + object);
              BeanUtil.setObjectAttribute(object, name, value);
          
          } catch (Exception e) {
!             IOProvider.getDefault().getIO("Dashboard debugging",false).getOut().println("*** Exception while setting attribute [" + name + "] = [" + valueString + "] on object: " + object);
              
              ErrorManager.getDefault().notify(e);

Index: DashboardComponentFactory.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard/DashboardComponentFactory.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** DashboardComponentFactory.java	4 Mar 2004 17:56:30 -0000	1.7
--- DashboardComponentFactory.java	2 Apr 2004 03:34:05 -0000	1.8
***************
*** 27,30 ****
--- 27,32 ----
  import javax.swing.JScrollPane;
  
+ import org.openide.windows.IOProvider;
+ 
  import org.mc4j.console.util.ExceptionUtility;
  
***************
*** 45,49 ****
      public JComponent build(Element node, Map context) {
          String type = node.getAttribute("type");
!         org.openide.windows.IOProvider.getDefault().getStdOut().println("Instantiating new component: " + type);
          try {
              Class componentType = Class.forName(type);
--- 47,51 ----
      public JComponent build(Element node, Map context) {
          String type = node.getAttribute("type");
!         IOProvider.getDefault().getIO("Dashboard debugging",false).getOut().println("Instantiating new component: " + type);
          try {
              Class componentType = Class.forName(type);

Index: ConstraintFactory.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard/ConstraintFactory.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ConstraintFactory.java	7 Feb 2004 16:10:41 -0000	1.5
--- ConstraintFactory.java	2 Apr 2004 03:34:05 -0000	1.6
***************
*** 46,50 ****
          String type = element.getAttribute(TYPE);
          if (type.equals("java.awt.GridBagConstraints")) {
!             System.out.println("Build grid bag constraint: " + element);
              GridBagConstraints c = new GridBagConstraints();
              
--- 46,50 ----
          String type = element.getAttribute(TYPE);
          if (type.equals("java.awt.GridBagConstraints")) {
!             //System.out.println("Build grid bag constraint: " + element);
              GridBagConstraints c = new GridBagConstraints();
              
***************
*** 114,118 ****
              try {
                  String value = element.getAttribute("direction");
!                 System.out.println("\tConstraint string is: " + value);
                  return BeanUtil.getStaticFieldValue(BorderLayout.class, value);
              } catch (Exception e) {
--- 114,118 ----
              try {
                  String value = element.getAttribute("direction");
!                 //System.out.println("\tConstraint string is: " + value);
                  return BeanUtil.getStaticFieldValue(BorderLayout.class, value);
              } catch (Exception e) {

Index: Dashboard.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard/Dashboard.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Dashboard.java	17 Feb 2004 02:08:05 -0000	1.11
--- Dashboard.java	2 Apr 2004 03:34:05 -0000	1.12
***************
*** 193,197 ****
      public boolean matches(ObjectName name) {
          String cName = name.getCanonicalName();
!         //org.openide.windows.IOProvider.getDefault().getStdOut().println(
          //    "Comparing [" + this.nameFilterString + "] - [" + cName + "]");
  
--- 193,197 ----
      public boolean matches(ObjectName name) {
          String cName = name.getCanonicalName();
!         //IOProvider.getDefault().getIO("Dashboard debugging",false).getOut().println(
          //    "Comparing [" + this.nameFilterString + "] - [" + cName + "]");
  

Index: DashboardTopComponent.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard/DashboardTopComponent.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** DashboardTopComponent.java	19 Feb 2004 19:31:42 -0000	1.12
--- DashboardTopComponent.java	2 Apr 2004 03:34:05 -0000	1.13
***************
*** 30,37 ****
  
  import org.openide.util.actions.SystemAction;
- import org.openide.windows.Mode;
  import org.openide.windows.TopComponent;
- import org.openide.windows.WindowManager;
- import org.openide.windows.Workspace;
  
  
--- 30,34 ----
***************
*** 47,50 ****
--- 44,48 ----
          // For serialization
          putClientProperty("PersistenceType","Never");
+         
      }