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

[Christian Bauer]

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

  Modified:    examples/wiki/src/main/org/jboss/seam/wiki/core/ui 
                        WikiFormattedTextHandler.java
  Log:
  Fixed bug in plugin preferences system, @RaiseEvent is not inherited in action subclasses
  
  Revision  Changes    Path
  1.15      +13 -6     jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/WikiFormattedTextHandler.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: WikiFormattedTextHandler.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/WikiFormattedTextHandler.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -b -r1.14 -r1.15
  --- WikiFormattedTextHandler.java	24 Sep 2007 08:23:20 -0000	1.14
  +++ WikiFormattedTextHandler.java	14 Nov 2007 10:19:42 -0000	1.15
  @@ -20,6 +20,8 @@
   import javax.faces.component.UIComponent;
   
   import org.jboss.seam.Component;
  +import org.jboss.seam.log.Logging;
  +import org.jboss.seam.log.Log;
   import org.jboss.seam.faces.ResourceLoader;
   import org.jboss.seam.contexts.Contexts;
   import org.jboss.seam.ui.component.UILoadStyle;
  @@ -43,6 +45,8 @@
    */
   public class WikiFormattedTextHandler extends MetaTagHandler {
   
  +    Log log = Logging.getLog(WikiFormattedTextHandler.class);
  +
       private static final String MARK = "org.jboss.seam.wiki.core.ui.WikiFormattedTextHandler";
   
       public static final String REGEX_MACRO =
  @@ -230,17 +234,20 @@
           String pluginPreferenceName = macroName + "Preferences";
           Boolean showPluginPreferences = (Boolean) Contexts.getPageContext().get("showPluginPreferences");
           Object existingEditor = Contexts.getConversationContext().get(pluginPreferenceName + "Editor");
  +
           if (showPluginPreferences != null && showPluginPreferences && existingEditor == null) {
  -            PluginPreferenceEditor pluginPreferenceEditor = new PluginPreferenceEditor(
  -                    pluginPreferenceName);
  -            PluginPreferenceEditor.FlushObserver observer = (PluginPreferenceEditor.FlushObserver) Component
  -                    .getInstance("pluginPreferenceEditorFlushObserver");
  +
  +            PluginPreferenceEditor pluginPreferenceEditor = new PluginPreferenceEditor(pluginPreferenceName);
  +            PluginPreferenceEditor.FlushObserver observer =
  +                    (PluginPreferenceEditor.FlushObserver) Component.getInstance("pluginPreferenceEditorFlushObserver");
  +
               if (pluginPreferenceEditor.getPreferenceValues().size() > 0) {
  -                Contexts.getConversationContext().set(pluginPreferenceName + "Editor",
  -                        pluginPreferenceEditor);
  +                log.debug("Creating plugin preference editor for: " + pluginPreferenceName);
  +                Contexts.getConversationContext().set(pluginPreferenceName + "Editor", pluginPreferenceEditor);
                   observer.addPluginPreferenceEditor(pluginPreferenceEditor);
               }
           } else if (showPluginPreferences == null || !showPluginPreferences) {
  +            log.debug("Disabling plugin preference editor for: " + pluginPreferenceName);
               Contexts.getConversationContext().set(pluginPreferenceName + "Editor", null);
           }