svn commit: r1555121 - in /myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension: DateExtensionHandler.java SeparatorExtensionHandler.java TobagoLabelExtensionHandler.java TobagoMenuExtensionHandler.java

[lo...@apache.org]

Author: lofwyr
Date: Fri Jan  3 15:06:50 2014
New Revision: 1555121

URL: http://svn.apache.org/r1555121
Log:
TOBAGO-1316: tx-taglib is broken with new createUniqueId() strategy from MyFaces (Facelets only)

Modified:
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/DateExtensionHandler.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/SeparatorExtensionHandler.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoLabelExtensionHandler.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoMenuExtensionHandler.java

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/DateExtensionHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/DateExtensionHandler.java?rev=1555121&r1=1555120&r2=1555121&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/DateExtensionHandler.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/DateExtensionHandler.java Fri Jan  3 15:06:50 2014
@@ -68,7 +68,7 @@ public class DateExtensionHandler extend
       form.setRendererType(RendererTypes.FORM);
       final String formId = formIdAttribute != null
           ? formIdAttribute.getValue(faceletContext)
-          : "_tx_" + faceletContext.generateUniqueId("form");
+          : panel.getId() + "_tx_form";
       form.setId(formId);
       panel.getChildren().add(form);
 
@@ -77,7 +77,7 @@ public class DateExtensionHandler extend
       picker.setFor("@auto");
       final String pickerId = pickerIdAttribute != null
           ? pickerIdAttribute.getValue(faceletContext)
-          : "_tx_" + faceletContext.generateUniqueId("picker");
+          : panel.getId() + "_tx_picker";
       picker.setId(pickerId);
       if (picker.getAttributes().get(OnComponentCreated.MARKER) == null) {
         picker.getAttributes().put(OnComponentCreated.MARKER, Boolean.TRUE);

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/SeparatorExtensionHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/SeparatorExtensionHandler.java?rev=1555121&r1=1555120&r2=1555121&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/SeparatorExtensionHandler.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/SeparatorExtensionHandler.java Fri Jan  3 15:06:50 2014
@@ -59,7 +59,7 @@ public class SeparatorExtensionHandler e
       final FaceletContext faceletContext, final UIComponent separator, final UIComponent parent) {
     final Application application = faceletContext.getFacesContext().getApplication();
     final UIOutput label = (UIOutput) application.createComponent(UILabel.COMPONENT_TYPE);
-    label.setId("_tx_" + faceletContext.generateUniqueId("label"));
+    label.setId(separator.getId() + "_tx_label");
     label.setRendererType("Label");
     setAttributes(faceletContext, label);
     separator.getFacets().put(Facets.LABEL, label);

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoLabelExtensionHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoLabelExtensionHandler.java?rev=1555121&r1=1555120&r2=1555121&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoLabelExtensionHandler.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoLabelExtensionHandler.java Fri Jan  3 15:06:50 2014
@@ -122,7 +122,7 @@ public abstract class TobagoLabelExtensi
     if (fieldIdAttribute != null) {
       uid = fieldIdAttribute.getValue(faceletContext);
     } else {
-      uid = "_tx_" + faceletContext.generateUniqueId("field");
+      uid = panel.getId() + "_tx_field";
     }
     if (checkForAlreadyCreated(panel, uid)) {
       return;
@@ -142,7 +142,7 @@ public abstract class TobagoLabelExtensi
   }
 
   private void addLabel(final FaceletContext faceletContext, final UIPanel panel, final Application application) {
-    final String uid = "_tx_" + faceletContext.generateUniqueId("label");
+    final String uid = panel.getId() + "_tx_label";
     if (checkForAlreadyCreated(panel, uid)) {
       return;
     }
@@ -218,7 +218,7 @@ public abstract class TobagoLabelExtensi
       gridLayout.setColumns(getColumns("auto"));
     }
     gridLayout.setRows(getRows());
-    gridLayout.setId("_tx_" + faceletContext.generateUniqueId("layout"));
+    gridLayout.setId(panel.getId() + "_tx_layout");
     if (gridLayout instanceof OnComponentCreated) {
       ((OnComponentCreated) gridLayout).onComponentCreated(faceletContext.getFacesContext(), panel);
     }

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoMenuExtensionHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoMenuExtensionHandler.java?rev=1555121&r1=1555120&r2=1555121&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoMenuExtensionHandler.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoMenuExtensionHandler.java Fri Jan  3 15:06:50 2014
@@ -54,7 +54,7 @@ public abstract class TobagoMenuExtensio
 
   public void applyNextHandler(final FaceletContext faceletContext, final UIComponent menuCommand) throws IOException {
     if (ComponentHandler.isNew(menuCommand)) {
-      final UIComponent component = (UIComponent) menuCommand.getFacets().remove(getFacetName());
+      final UIComponent component = menuCommand.getFacets().remove(getFacetName());
       nextHandler.apply(faceletContext, component);
       menuCommand.getFacets().put(getFacetName(), component);
     } else {
@@ -69,7 +69,7 @@ public abstract class TobagoMenuExtensio
     final UIComponent component = application.createComponent(getSubComponentType());
     final String uid = fieldIdAttribute != null
         ? fieldIdAttribute.getValue(faceletContext)
-        : "_tx_" + faceletContext.generateUniqueId("sub");
+        : menuCommand.getId() + "_tx_" + getFacetName();
     component.setId(uid);
     component.setRendererType(getSubRendererType());
     setSubComponentAttributes(faceletContext, component);