commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From morg...@apache.org
Subject cvs commit: jakarta-commons-sandbox/jelly/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt LayoutDataTag.java MenuTag.java
Date Fri, 24 Jan 2003 10:15:32 GMT
morgand     2003/01/24 02:15:32

  Modified:    jelly/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing
                        BorderAlignTag.java ComponentTag.java
               jelly/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt
                        LayoutDataTag.java MenuTag.java
  Log:
  cleaned up some compilation and formatting errors
  
  Revision  Changes    Path
  1.4       +1 -1      jakarta-commons-sandbox/jelly/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/BorderAlignTag.java
  
  Index: BorderAlignTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/jelly/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/BorderAlignTag.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- BorderAlignTag.java	11 Dec 2002 12:40:57 -0000	1.3
  +++ BorderAlignTag.java	24 Jan 2003 10:15:32 -0000	1.4
  @@ -84,7 +84,7 @@
       /**
        * Adds a child component to this parent
        */
  -    public void addChild(Component component, Object constraints) throws Exception {
  +    public void addChild(Component component, Object constraints) throws JellyException
{
           BorderLayoutTag tag = (BorderLayoutTag) findAncestorWithClass( BorderLayoutTag.class
);
           if (tag == null) {
               throw new JellyException( "this tag must be nested within a <tr> tag"
);
  
  
  
  1.12      +8 -13     jakarta-commons-sandbox/jelly/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/ComponentTag.java
  
  Index: ComponentTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/jelly/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/ComponentTag.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- ComponentTag.java	24 Jan 2003 10:04:30 -0000	1.11
  +++ ComponentTag.java	24 Jan 2003 10:15:32 -0000	1.12
  @@ -273,21 +273,16 @@
        * A class may be specified otherwise the Factory will be used.
        */
       protected Object newInstance(Class theClass, Map attributes, XMLOutput output) throws
JellyException {
  -        if (theClass != null ) {
  -            try {
  -              return theClass.newInstance();
  -            } catch (IllegalAccessException e) {
  -                throw new JellyException(e);
  -            } catch (InstantiationException e) {
  -                throw new JellyException(e);
  -            }
  -        }
  -        else {
  -            try {
  +        try {
  +            if (theClass != null ) {
  +                return theClass.newInstance();
  +            } else {
                   return factory.newInstance();
  -            } catch (InstantiationException e) {
  -                throw new JellyException(e);
               }
  +        } catch (IllegalAccessException e) {
  +            throw new JellyException(e);
  +        } catch (InstantiationException e) {
  +            throw new JellyException(e);
           }
       }
       
  
  
  
  1.3       +1 -1      jakarta-commons-sandbox/jelly/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt/LayoutDataTag.java
  
  Index: LayoutDataTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/jelly/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt/LayoutDataTag.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- LayoutDataTag.java	24 Jan 2003 10:04:31 -0000	1.2
  +++ LayoutDataTag.java	24 Jan 2003 10:15:32 -0000	1.3
  @@ -148,7 +148,7 @@
        * @see org.apache.commons.jelly.tags.swt.LayoutTagSupport#convertValue(java.lang.Object,
java.lang.String, java.lang.Object)
        */
       protected Object convertValue(Object bean, String name, Object value)
  -        throws Exception {
  +        throws JellyException {
   
           if (bean instanceof GridData) {
               if (name.endsWith("Alignment") && value instanceof String) {
  
  
  
  1.2       +1 -1      jakarta-commons-sandbox/jelly/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt/MenuTag.java
  
  Index: MenuTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/jelly/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt/MenuTag.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MenuTag.java	6 Jan 2003 16:40:34 -0000	1.1
  +++ MenuTag.java	24 Jan 2003 10:15:32 -0000	1.2
  @@ -130,7 +130,7 @@
        * @see org.apache.commons.jelly.tags.swt.WidgetTag#createWidget(java.lang.Class, org.eclipse.swt.widgets.Widget,
int)
        */
       protected Object createWidget(Class theClass, Widget parent, int style)
  -        throws Exception {
  +        throws JellyException {
   
           if (parent instanceof Decorations) {            
               return super.createWidget(theClass, parent, style);
  
  
  

--
To unsubscribe, e-mail:   <mailto:commons-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:commons-dev-help@jakarta.apache.org>


Mime
View raw message