You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2006/09/25 00:57:39 UTC
svn commit: r449520 - in /myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context: MarkupConfigImpl.java ThemeImpl.java

Author: bommel
Date: Sun Sep 24 15:57:38 2006
New Revision: 449520

URL: http://svn.apache.org/viewvc?view=rev&rev=449520
Log:
TOBAGO-119 support customizing of markup

Modified:
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/MarkupConfigImpl.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/ThemeImpl.java

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/MarkupConfigImpl.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/MarkupConfigImpl.java?view=diff&rev=449520&r1=449519&r2=449520
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/MarkupConfigImpl.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/MarkupConfigImpl.java Sun Sep 24 15:57:38 2006
@@ -34,6 +34,16 @@
 
   private Map<String,RendererMarkup> renderer = new HashMap<String,RendererMarkup>();
 
+  private boolean merged = false;
+
+  public boolean isMerged() {
+    return merged;
+  }
+
+  public void setMerged(boolean merged) {
+    this.merged = merged;
+  }
+
   Collection<RendererMarkup>  getRendererMarkups() {
     return renderer.values();
   }

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/ThemeImpl.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/ThemeImpl.java?view=diff&rev=449520&r1=449519&r2=449520
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/ThemeImpl.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/ThemeImpl.java Sun Sep 24 15:57:38 2006
@@ -111,19 +111,22 @@
     if (markupConfig == null) {
       markupConfig = new MarkupConfigImpl();
     }
-    ThemeImpl fallback  = this.getFallback();
-    if (fallback != null) {
-      fallback.resolveMarkupConfig();
-      MarkupConfigImpl fallbackMarkupConfig = fallback.getMarkupConfigImpl();
-      if (fallbackMarkupConfig != null) {
-        markupConfig.merge(fallbackMarkupConfig);
+    if (!markupConfig.isMerged()) {
+      ThemeImpl fallback  = getFallback();
+      if (fallback != null) {
+        fallback.resolveMarkupConfig();
+        MarkupConfigImpl fallbackMarkupConfig = fallback.getMarkupConfigImpl();
+        if (fallbackMarkupConfig != null) {
+          markupConfig.merge(fallbackMarkupConfig);
+          if (LOG.isDebugEnabled()) {
+            LOG.debug("merge markupconfig from " + fallback.getName() + " for " + getName());
+          }
+        }
       }
+      markupConfig.setMerged(true);
       if (LOG.isDebugEnabled()) {
-        LOG.debug("merge markupconfig from " + fallback.getName() + " for " + getName());
+        LOG.debug(getName() + " " +markupConfig);
       }
-    }
-    if (LOG.isDebugEnabled()) {
-      LOG.debug(getName() + " " +markupConfig);
     }
   }