[Bprocessor-commit] gui/src/net/sourceforge/bprocessor/gui/attrview DescriptionAttribute.java,1.3,1.4 StringAttribute.java,1.8,1.9 GenericPanel.java,1.13,1.14

[Nikolaj B. <nbr...@us...>]

Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/attrview
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25718/src/net/sourceforge/bprocessor/gui/attrview

Modified Files:
	DescriptionAttribute.java StringAttribute.java 
	GenericPanel.java 
Log Message:
Made the description field scrollable, and a few minor fixes

Index: StringAttribute.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/attrview/StringAttribute.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** StringAttribute.java	10 Mar 2006 14:10:30 -0000	1.8
--- StringAttribute.java	13 Mar 2006 11:31:45 -0000	1.9
***************
*** 59,62 ****
--- 59,63 ----
      
      label = createLabel(attribute.getName());
+     
      Box header = Box.createHorizontalBox();
      Box column = Box.createVerticalBox();

Index: GenericPanel.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/attrview/GenericPanel.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** GenericPanel.java	10 Mar 2006 14:10:30 -0000	1.13
--- GenericPanel.java	13 Mar 2006 11:31:45 -0000	1.14
***************
*** 27,38 ****
  import net.sourceforge.bprocessor.model.Attribute;
  import net.sourceforge.bprocessor.model.Camera;
- import net.sourceforge.bprocessor.model.ConstructionSpace;
  import net.sourceforge.bprocessor.model.Description;
  import net.sourceforge.bprocessor.model.Entity;
- import net.sourceforge.bprocessor.model.FunctionalSpace;
  import net.sourceforge.bprocessor.model.Parametric;
  import net.sourceforge.bprocessor.model.Project;
  import net.sourceforge.bprocessor.model.Selection;
- import net.sourceforge.bprocessor.model.Surface;
  
  /**
--- 27,35 ----
***************
*** 112,116 ****
            }
          });
-         //sa.addMouseListener(this);
          where.add(new AttributeRow(sa));
        } else if (a.getValue() instanceof List) {
--- 109,112 ----
***************
*** 144,151 ****
            }
          });
-         //da.addMouseListener(this);
          where.add(new AttributeRow(da));
!       } else if (a.getValue() instanceof Surface || a.getValue() instanceof FunctionalSpace
!           || a.getValue() instanceof ConstructionSpace) {
          // Handles the links
          LinkAttribute la = new LinkAttribute(a);
--- 140,145 ----
            }
          });
          where.add(new AttributeRow(da));
!       } else if (a.getValue() instanceof Entity) {
          // Handles the links
          LinkAttribute la = new LinkAttribute(a);
***************
*** 163,167 ****
            }
          });
-         //da.addMouseListener(this);
          where.add(new AttributeRow(la));
        }  else if (a.getName().equals("Front Material")  || a.getName().equals("Back Material")) {
--- 157,160 ----

Index: DescriptionAttribute.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/attrview/DescriptionAttribute.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DescriptionAttribute.java	10 Mar 2006 14:10:30 -0000	1.3
--- DescriptionAttribute.java	13 Mar 2006 11:31:45 -0000	1.4
***************
*** 22,25 ****
--- 22,26 ----
  import javax.swing.JComponent;
  import javax.swing.JLabel;
+ import javax.swing.JScrollPane;
  import javax.swing.JTextArea;
  
***************
*** 47,50 ****
--- 48,54 ----
    private JTextArea descriptionEditor;
    
+   /** The scrollpane for the description editor */
+   private JScrollPane descriptionArea;
+   
    /** The defualt background color */
    private Color bgcolor;
***************
*** 73,77 ****
      column.add(header);
      column.add(Box.createRigidArea(new Dimension(70, 3)));
!     column.setMaximumSize(new Dimension(60, Short.MAX_VALUE));
      component = Box.createVerticalBox();
      component.add(createValueLabel(attribute.getValue()));
--- 77,81 ----
      column.add(header);
      column.add(Box.createRigidArea(new Dimension(70, 3)));
!     column.setMaximumSize(new Dimension(2000, Short.MAX_VALUE));
      component = Box.createVerticalBox();
      component.add(createValueLabel(attribute.getValue()));
***************
*** 149,152 ****
--- 153,157 ----
      valueLabel.setWrapStyleWord(true);
      valueLabel.setEditable(false);
+     valueLabel.setRows(10);
      if (attribute.isEditable()) {
        valueLabel.setFont(AttributeView.FONT_PLAIN);
***************
*** 154,158 ****
        valueLabel.setFont(AttributeView.FONT_ITALIC);
      }
!     return valueLabel;
    }
    
--- 159,165 ----
        valueLabel.setFont(AttributeView.FONT_ITALIC);
      }
! 
!     JScrollPane scrollArea = new JScrollPane (valueLabel);
!     return scrollArea;
    }
    
***************
*** 187,193 ****
          descriptionEditor = (JTextArea) createValueEditor(attribute.getValue());
          descriptionEditor.setLineWrap(true);
          descriptionEditor.setWrapStyleWord(true);
          descriptionEditor.addFocusListener(this);
!         component.add(descriptionEditor);
          component.revalidate();
        }
--- 194,202 ----
          descriptionEditor = (JTextArea) createValueEditor(attribute.getValue());
          descriptionEditor.setLineWrap(true);
+         descriptionEditor.setRows(10);
          descriptionEditor.setWrapStyleWord(true);
          descriptionEditor.addFocusListener(this);
!         descriptionArea = new JScrollPane (descriptionEditor);
!         component.add(descriptionArea);
          component.revalidate();
        }
***************
*** 205,209 ****
        Object val = attribute.getValue();
        attribute.setValue(new Description(descriptionEditor.getText()));
!       component.remove(descriptionEditor);
        descriptionEditor = null;
        component.add(createValueLabel(attribute.getValue()));
--- 214,218 ----
        Object val = attribute.getValue();
        attribute.setValue(new Description(descriptionEditor.getText()));
!       component.remove(descriptionArea);
        descriptionEditor = null;
        component.add(createValueLabel(attribute.getValue()));