[jboss-cvs] jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action ...

[Christian Bauer]

  User: cbauer  
  Date: 07/11/14 05:19:44

  Modified:    examples/wiki/src/main/org/jboss/seam/wiki/core/action 
                        NodeHome.java
  Log:
  Fixed bug in plugin preferences system, @RaiseEvent is not inherited in action subclasses
  
  Revision  Changes    Path
  1.28      +17 -7     jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/NodeHome.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: NodeHome.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/NodeHome.java,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -b -r1.27 -r1.28
  --- NodeHome.java	9 Nov 2007 15:08:26 -0000	1.27
  +++ NodeHome.java	14 Nov 2007 10:19:44 -0000	1.28
  @@ -19,9 +19,9 @@
   import org.jboss.seam.wiki.util.WikiUtil;
   import org.jboss.seam.wiki.preferences.PreferenceProvider;
   import org.jboss.seam.annotations.In;
  -import org.jboss.seam.annotations.RaiseEvent;
   import org.jboss.seam.annotations.security.Restrict;
   import org.jboss.seam.Component;
  +import org.jboss.seam.core.Events;
   import org.jboss.seam.contexts.Contexts;
   import org.jboss.seam.security.AuthorizationException;
   import org.jboss.seam.security.Identity;
  @@ -162,7 +162,6 @@
       /* -------------------------- Custom CUD ------------------------------ */
   
       @Override
  -    @RaiseEvent("PreferenceEditor.flushAll")
       public String persist() {
           checkPersistPermissions();
   
  @@ -191,11 +190,14 @@
   
           if (!beforePersist()) return null;
   
  -        return super.persist();
  +        String outcome = super.persist();
  +        if (outcome != null) {
  +            Events.instance().raiseEvent("PreferenceEditor.flushAll");
  +        }
  +        return outcome;
       }
   
       @Override
  -    @RaiseEvent({"PreferenceEditor.flushAll", "Nodes.menuStructureModified"})
       public String update() {
           checkUpdatePermissions();
   
  @@ -212,11 +214,15 @@
   
           if (!beforeUpdate()) return null;
   
  -        return super.update();
  +        String outcome = super.update();
  +        if (outcome != null) {
  +            Events.instance().raiseEvent("PreferenceEditor.flushAll");
  +            Events.instance().raiseEvent("Nodes.menuStructureModified");
  +        }
  +        return outcome;
       }
   
       @Override
  -    @RaiseEvent("Nodes.menuStructureModified")
       public String remove() {
           checkRemovePermissions();
   
  @@ -231,7 +237,11 @@
           PreferenceProvider provider = (PreferenceProvider) Component.getInstance("preferenceProvider");
           provider.deleteInstancePreferences(getInstance());
   
  -        return super.remove();
  +        String outcome = super.remove();
  +        if (outcome != null) {
  +            Events.instance().raiseEvent("Nodes.menuStructureModified");
  +        }
  +        return outcome;
       }
   
       protected boolean isValidModel() {