cvs commit: jakarta-slide/src/share/org/apache/slide/macro MacroImpl.java

[juergen]

juergen     01/09/01 08:08:17

  Modified:    src/share/org/apache/slide/macro MacroImpl.java
  Log:
  do not pack a deleteMacroExcept into a copyMacroExcept.
  
  Revision  Changes    Path
  1.20      +7 -4      jakarta-slide/src/share/org/apache/slide/macro/MacroImpl.java
  
  Index: MacroImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/macro/MacroImpl.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- MacroImpl.java    2001/08/30 14:41:02     1.19
  +++ MacroImpl.java    2001/09/01 15:08:17     1.20
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-slide/src/share/org/apache/slide/macro/MacroImpl.java,v 1.19 
2001/08/30 14:41:02 juergen Exp $
  - * $Revision: 1.19 $
  - * $Date: 2001/08/30 14:41:02 $
  + * $Header: 
/home/cvs/jakarta-slide/src/share/org/apache/slide/macro/MacroImpl.java,v 1.20 
2001/09/01 15:08:17 juergen Exp $
  + * $Revision: 1.20 $
  + * $Date: 2001/09/01 15:08:17 $
    *
    * ====================================================================
    *
  @@ -77,7 +77,7 @@
    * Macro helper class.
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Remy Maucherat</a>
  - * @version $Revision: 1.19 $
  + * @version $Revision: 1.20 $
    */
   public final class MacroImpl implements Macro {
       
  @@ -194,6 +194,8 @@
                   delete(token, destinationUri);
               } catch(ObjectNotFoundException e) {
                   // Silent catch, the target doesn't exist
  +            } catch(DeleteMacroException s) {
  +                throw s;
               } catch(SlideException s) {
                   CopyMacroException e = new CopyMacroException("Copy failed");
                   e.addException(s);
  @@ -483,6 +485,7 @@
       }
       
   }
  +