You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2017/04/06 11:33:51 UTC
svn commit: r1790381 - in /myfaces/tobago/trunk/tobago-core/src/main:
java/org/apache/myfaces/tobago/component/
java/org/apache/myfaces/tobago/internal/renderkit/renderer/
java/org/apache/myfaces/tobago/internal/taglib/component/ resources/scss/
Author: lofwyr
Date: Thu Apr 6 11:33:51 2017
New Revision: 1790381
URL: http://svn.apache.org/viewvc?rev=1790381&view=rev
Log:
TOBAGO-1721 Optimize HTML output when two renderer are involved
* renaming *Aternative* to *Inside*
Added:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ButtonInsideInRenderer.java
- copied, changed from r1790379, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ButtonAlternativeInRenderer.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinkInsideCommandRenderer.java
- copied, changed from r1790349, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinkAlternativeCommandRenderer.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinkInsideLinksRenderer.java
- copied, changed from r1790349, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinkAlternativeLinksRenderer.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinksInsideBarRenderer.java
- copied, changed from r1790359, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinksAlternativeBarRenderer.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectBooleanCheckboxInsideCommandRenderer.java
- copied, changed from r1790349, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectBooleanCheckboxAlternativeCommandRenderer.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyCheckboxInsideCommandRenderer.java
- copied, changed from r1790349, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyCheckboxAlternativeCommandRenderer.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneChoiceInsideInRenderer.java
- copied, changed from r1790349, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneChoiceAlternativeInRenderer.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneRadioInsideCommandRenderer.java
- copied, changed from r1790349, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneRadioAlternativeCommandRenderer.java
Removed:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ButtonAlternativeInRenderer.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinkAlternativeCommandRenderer.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinkAlternativeLinksRenderer.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinksAlternativeBarRenderer.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectBooleanCheckboxAlternativeCommandRenderer.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyCheckboxAlternativeCommandRenderer.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneChoiceAlternativeInRenderer.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneRadioAlternativeCommandRenderer.java
Modified:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/RendererTypes.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BarRenderer.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/CommandRendererBase.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/InRenderer.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinksRenderer.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ButtonTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LinkTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LinksTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectBooleanCheckboxTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectManyCheckboxTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectOneChoiceTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectOneRadioTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/resources/scss/_tobago.scss
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/RendererTypes.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/RendererTypes.java?rev=1790381&r1=1790380&r2=1790381&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/RendererTypes.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/RendererTypes.java Thu Apr 6 11:33:51 2017
@@ -27,7 +27,7 @@ public enum RendererTypes {
Bar,
Box,
Button,
- ButtonAlternativeIn,
+ ButtonInsideIn,
Buttons,
Calendar,
Column,
@@ -46,10 +46,10 @@ public enum RendererTypes {
In,
Image,
Link,
- LinkAlternativeCommand,
- LinkAlternativeLinks,
+ LinkInsideCommand,
+ LinkInsideLinks,
Links,
- LinksAlternativeBar,
+ LinksInsideBar,
Label,
Messages,
Object,
@@ -64,15 +64,15 @@ public enum RendererTypes {
Section,
SegmentLayout,
SelectBooleanCheckbox,
- SelectBooleanCheckboxAlternativeCommand,
+ SelectBooleanCheckboxInsideCommand,
SelectManyCheckbox,
- SelectManyCheckboxAlternativeCommand,
+ SelectManyCheckboxInsideCommand,
SelectManyListbox,
SelectManyShuttle,
SelectOneChoice,
- SelectOneChoiceAlternativeIn,
+ SelectOneChoiceInsideIn,
SelectOneRadio,
- SelectOneRadioAlternativeCommand,
+ SelectOneRadioInsideCommand,
SelectOneListbox,
SelectReference,
Separator,
@@ -98,7 +98,7 @@ public enum RendererTypes {
public static final String BAR = "Bar";
public static final String BOX = "Box";
public static final String BUTTON = "Button";
- public static final String BUTTON_ALTERNATIVE_IN = "ButtonAlternativeIn";
+ public static final String BUTTON_INSIDE_IN = "ButtonInsideIn";
public static final String BUTTONS = "Buttons";
public static final String CALENDAR = "Calendar";
public static final String COLUMN = "Column";
@@ -117,10 +117,10 @@ public enum RendererTypes {
public static final String IN = "In";
public static final String IMAGE = "Image";
public static final String LINK = "Link";
- public static final String LINK_ALTERNATIVE_COMMAND = "LinkAlternativeCommand";
- public static final String LINK_ALTERNATIVE_LINKS = "LinkAlternativeLinks";
+ public static final String LINK_INSIDE_COMMAND = "LinkInsideCommand";
+ public static final String LINK_INSIDE_LINKS = "LinkInsideLinks";
public static final String LINKS = "Links";
- public static final String LINKS_ALTERNATIVE_BAR = "LinksAlternativeBar";
+ public static final String LINKS_INSIDE_BAR = "LinksInsideBar";
public static final String LABEL = "Label";
public static final String MESSAGES = "Messages";
public static final String OBJECT = "Object";
@@ -135,15 +135,15 @@ public enum RendererTypes {
public static final String SECTION = "Section";
public static final String SEGMENT_LAYOUT = "SegmentLayout";
public static final String SELECT_BOOLEAN_CHECKBOX = "SelectBooleanCheckbox";
- public static final String SELECT_BOOLEAN_CHECKBOX_ALTERNATIVE_COMMAND = "SelectBooleanCheckboxAlternativeCommand";
+ public static final String SELECT_BOOLEAN_CHECKBOX_INSIDE_COMMAND = "SelectBooleanCheckboxInsideCommand";
public static final String SELECT_MANY_CHECKBOX = "SelectManyCheckbox";
- public static final String SELECT_MANY_CHECKBOX_ALTERNATIVE_COMMAND = "SelectManyCheckboxAlternativeCommand";
+ public static final String SELECT_MANY_CHECKBOX_INSIDE_COMMAND = "SelectManyCheckboxInsideCommand";
public static final String SELECT_MANY_LISTBOX = "SelectManyListbox";
public static final String SELECT_MANY_SHUTTLE = "SelectManyShuttle";
public static final String SELECT_ONE_CHOICE = "SelectOneChoice";
- public static final String SELECT_ONE_CHOICE_ALTERNATIVE_IN = "SelectOneChoiceAlternativeIn";
+ public static final String SELECT_ONE_CHOICE_INSIDE_IN = "SelectOneChoiceInsideIn";
public static final String SELECT_ONE_RADIO = "SelectOneRadio";
- public static final String SELECT_ONE_RADIO_ALTERNATIVE_COMMAND = "SelectOneRadioAlternativeCommand";
+ public static final String SELECT_ONE_RADIO_INSIDE_COMMAND = "SelectOneRadioInsideCommand";
public static final String SELECT_ONE_LISTBOX = "SelectOneListbox";
public static final String SELECT_REFERENCE = "SelectReference";
public static final String SEPARATOR = "Separator";
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BarRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BarRenderer.java?rev=1790381&r1=1790380&r2=1790381&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BarRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BarRenderer.java Thu Apr 6 11:33:51 2017
@@ -91,7 +91,7 @@ public class BarRenderer extends Rendere
if (child instanceof AbstractUIForm) {
setRenderTypes(child);
} else if (child instanceof AbstractUILinks) {
- child.setRendererType(RendererTypes.LINKS_ALTERNATIVE_BAR);
+ child.setRendererType(RendererTypes.LinksInsideBar.name());
}
}
}
Copied: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ButtonInsideInRenderer.java (from r1790379, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ButtonAlternativeInRenderer.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ButtonInsideInRenderer.java?p2=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ButtonInsideInRenderer.java&p1=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ButtonAlternativeInRenderer.java&r1=1790379&r2=1790381&rev=1790381&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ButtonAlternativeInRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ButtonInsideInRenderer.java Thu Apr 6 11:33:51 2017
@@ -26,7 +26,7 @@ import org.apache.myfaces.tobago.renderk
import javax.faces.context.FacesContext;
import java.util.List;
-public class ButtonAlternativeInRenderer extends ButtonRenderer {
+public class ButtonInsideInRenderer extends ButtonRenderer {
@Override
protected void addOuterCssItems(final FacesContext facesContext, final AbstractUICommand command,
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/CommandRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/CommandRendererBase.java?rev=1790381&r1=1790380&r2=1790381&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/CommandRendererBase.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/CommandRendererBase.java Thu Apr 6 11:33:51 2017
@@ -67,7 +67,7 @@ public abstract class CommandRendererBas
final boolean link = command.getLink() != null && !disabled;
final String target = command.getTarget();
final boolean parentOfCommands = command.isParentOfCommands();
- final boolean dropdownSubmenu = this instanceof LinkAlternativeCommandRenderer;
+ final boolean dropdownSubmenu = this instanceof LinkInsideCommandRenderer;
final TobagoResponseWriter writer = getResponseWriter(facesContext);
@@ -164,16 +164,16 @@ public abstract class CommandRendererBas
for (final UIComponent child : component.getChildren()) {
if (!(child instanceof UIParameter) && child.isRendered()) {
if (child instanceof AbstractUILink) {
- child.setRendererType(RendererTypes.LINK_ALTERNATIVE_COMMAND);
+ child.setRendererType(RendererTypes.LinkInsideCommand.name());
child.encodeAll(facesContext);
} else if (child instanceof AbstractUISelectBooleanCheckbox) {
- child.setRendererType(RendererTypes.SELECT_BOOLEAN_CHECKBOX_ALTERNATIVE_COMMAND);
+ child.setRendererType(RendererTypes.SelectBooleanCheckboxInsideCommand.name());
child.encodeAll(facesContext);
} else if (child instanceof AbstractUISelectManyCheckbox) {
- child.setRendererType(RendererTypes.SELECT_MANY_CHECKBOX_ALTERNATIVE_COMMAND);
+ child.setRendererType(RendererTypes.SelectManyCheckboxInsideCommand.name());
child.encodeAll(facesContext);
} else if (child instanceof AbstractUISelectOneRadio) {
- child.setRendererType(RendererTypes.SELECT_ONE_RADIO_ALTERNATIVE_COMMAND);
+ child.setRendererType(RendererTypes.SelectOneRadioInsideCommand.name());
child.encodeAll(facesContext);
} else {
writer.startElement(HtmlElements.DIV);
@@ -198,7 +198,7 @@ public abstract class CommandRendererBas
protected void encodeBeginOuter(final FacesContext facesContext, final AbstractUICommand command) throws IOException {
final String clientId = command.getClientId(facesContext);
final boolean parentOfCommands = command.isParentOfCommands();
- final boolean dropdownSubmenu = this instanceof LinkAlternativeCommandRenderer;
+ final boolean dropdownSubmenu = this instanceof LinkInsideCommandRenderer;
final TobagoResponseWriter writer = getResponseWriter(facesContext);
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/InRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/InRenderer.java?rev=1790381&r1=1790380&r2=1790381&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/InRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/InRenderer.java Thu Apr 6 11:33:51 2017
@@ -158,7 +158,7 @@ public class InRenderer extends MessageL
}
for (UIComponent child : children) {
if (child instanceof AbstractUIButton && ((AbstractUIButton) child).isParentOfCommands()) {
- child.setRendererType(RendererTypes.BUTTON_ALTERNATIVE_IN);
+ child.setRendererType(RendererTypes.ButtonInsideIn.name());
RenderUtils.encode(facesContext, child);
} else {
writer.startElement(HtmlElements.SPAN);
@@ -168,7 +168,7 @@ public class InRenderer extends MessageL
cssItem = BootstrapClass.INPUT_GROUP_BTN;
} else if (child instanceof AbstractUISelectOneChoice) {
cssItem = BootstrapClass.INPUT_GROUP_BTN;
- child.setRendererType(RendererTypes.SELECT_ONE_CHOICE_ALTERNATIVE_IN);
+ child.setRendererType(RendererTypes.SelectOneChoiceInsideIn.name());
} else {
cssItem = BootstrapClass.INPUT_GROUP_ADDON;
}
Copied: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinkInsideCommandRenderer.java (from r1790349, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinkAlternativeCommandRenderer.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinkInsideCommandRenderer.java?p2=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinkInsideCommandRenderer.java&p1=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinkAlternativeCommandRenderer.java&r1=1790349&r2=1790381&rev=1790381&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinkAlternativeCommandRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinkInsideCommandRenderer.java Thu Apr 6 11:33:51 2017
@@ -26,7 +26,7 @@ import org.apache.myfaces.tobago.renderk
import javax.faces.context.FacesContext;
import java.util.List;
-public class LinkAlternativeCommandRenderer extends LinkRenderer {
+public class LinkInsideCommandRenderer extends LinkRenderer {
@Override
protected void addOuterCssItems(
Copied: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinkInsideLinksRenderer.java (from r1790349, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinkAlternativeLinksRenderer.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinkInsideLinksRenderer.java?p2=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinkInsideLinksRenderer.java&p1=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinkAlternativeLinksRenderer.java&r1=1790349&r2=1790381&rev=1790381&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinkAlternativeLinksRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinkInsideLinksRenderer.java Thu Apr 6 11:33:51 2017
@@ -29,7 +29,7 @@ import javax.faces.context.FacesContext;
import java.io.IOException;
import java.util.List;
-public class LinkAlternativeLinksRenderer extends LinkRenderer {
+public class LinkInsideLinksRenderer extends LinkRenderer {
@Override
protected void encodeBeginOuter(final FacesContext facesContext, final AbstractUICommand command) throws IOException {
Copied: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinksInsideBarRenderer.java (from r1790359, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinksAlternativeBarRenderer.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinksInsideBarRenderer.java?p2=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinksInsideBarRenderer.java&p1=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinksAlternativeBarRenderer.java&r1=1790359&r2=1790381&rev=1790381&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinksAlternativeBarRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinksInsideBarRenderer.java Thu Apr 6 11:33:51 2017
@@ -22,7 +22,7 @@ package org.apache.myfaces.tobago.intern
import org.apache.myfaces.tobago.renderkit.css.BootstrapClass;
import org.apache.myfaces.tobago.renderkit.css.CssItem;
-public class LinksAlternativeBarRenderer extends LinksRenderer {
+public class LinksInsideBarRenderer extends LinksRenderer {
@Override
protected CssItem getExtraCssItem() {
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinksRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinksRenderer.java?rev=1790381&r1=1790380&r2=1790381&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinksRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinksRenderer.java Thu Apr 6 11:33:51 2017
@@ -55,7 +55,7 @@ public class LinksRenderer extends Rende
for (UIComponent child : component.getChildren()) {
if (child.isRendered()) {
if (child instanceof AbstractUILink) {
- child.setRendererType(RendererTypes.LINK_ALTERNATIVE_LINKS);
+ child.setRendererType(RendererTypes.LinkInsideLinks.name());
child.encodeAll(facesContext);
} else {
writer.startElement(HtmlElements.LI);
Copied: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectBooleanCheckboxInsideCommandRenderer.java (from r1790349, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectBooleanCheckboxAlternativeCommandRenderer.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectBooleanCheckboxInsideCommandRenderer.java?p2=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectBooleanCheckboxInsideCommandRenderer.java&p1=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectBooleanCheckboxAlternativeCommandRenderer.java&r1=1790349&r2=1790381&rev=1790381&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectBooleanCheckboxAlternativeCommandRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectBooleanCheckboxInsideCommandRenderer.java Thu Apr 6 11:33:51 2017
@@ -28,7 +28,7 @@ import javax.faces.context.FacesContext;
import java.io.IOException;
import java.util.List;
-public class SelectBooleanCheckboxAlternativeCommandRenderer extends SelectBooleanCheckboxRenderer {
+public class SelectBooleanCheckboxInsideCommandRenderer extends SelectBooleanCheckboxRenderer {
@Override
public void encodeBegin(final FacesContext facesContext, final UIComponent component) throws IOException {
Copied: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyCheckboxInsideCommandRenderer.java (from r1790349, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyCheckboxAlternativeCommandRenderer.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyCheckboxInsideCommandRenderer.java?p2=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyCheckboxInsideCommandRenderer.java&p1=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyCheckboxAlternativeCommandRenderer.java&r1=1790349&r2=1790381&rev=1790381&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyCheckboxAlternativeCommandRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyCheckboxInsideCommandRenderer.java Thu Apr 6 11:33:51 2017
@@ -28,7 +28,7 @@ import javax.faces.context.FacesContext;
import java.io.IOException;
import java.util.List;
-public class SelectManyCheckboxAlternativeCommandRenderer extends SelectManyCheckboxRenderer {
+public class SelectManyCheckboxInsideCommandRenderer extends SelectManyCheckboxRenderer {
@Override
public void encodeBegin(final FacesContext facesContext, final UIComponent component) throws IOException {
Copied: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneChoiceInsideInRenderer.java (from r1790349, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneChoiceAlternativeInRenderer.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneChoiceInsideInRenderer.java?p2=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneChoiceInsideInRenderer.java&p1=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneChoiceAlternativeInRenderer.java&r1=1790349&r2=1790381&rev=1790381&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneChoiceAlternativeInRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneChoiceInsideInRenderer.java Thu Apr 6 11:33:51 2017
@@ -23,7 +23,7 @@ import javax.faces.component.UIComponent
import javax.faces.context.FacesContext;
import java.io.IOException;
-public class SelectOneChoiceAlternativeInRenderer extends SelectOneChoiceRenderer {
+public class SelectOneChoiceInsideInRenderer extends SelectOneChoiceRenderer {
@Override
public void encodeBegin(FacesContext facesContext, UIComponent component) throws IOException {
Copied: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneRadioInsideCommandRenderer.java (from r1790349, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneRadioAlternativeCommandRenderer.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneRadioInsideCommandRenderer.java?p2=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneRadioInsideCommandRenderer.java&p1=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneRadioAlternativeCommandRenderer.java&r1=1790349&r2=1790381&rev=1790381&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneRadioAlternativeCommandRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneRadioInsideCommandRenderer.java Thu Apr 6 11:33:51 2017
@@ -28,7 +28,7 @@ import javax.faces.context.FacesContext;
import java.io.IOException;
import java.util.List;
-public class SelectOneRadioAlternativeCommandRenderer extends SelectOneRadioRenderer {
+public class SelectOneRadioInsideCommandRenderer extends SelectOneRadioRenderer {
@Override
public void encodeBegin(final FacesContext facesContext, final UIComponent component) throws IOException {
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ButtonTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ButtonTagDeclaration.java?rev=1790381&r1=1790380&r2=1790381&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ButtonTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ButtonTagDeclaration.java Thu Apr 6 11:33:51 2017
@@ -60,7 +60,7 @@ import javax.faces.component.UICommand;
"org.apache.myfaces.tobago.component.SupportsAccessKey"
},
componentFamily = UICommand.COMPONENT_FAMILY,
- rendererType = {RendererTypes.BUTTON, RendererTypes.BUTTON_ALTERNATIVE_IN},
+ rendererType = {RendererTypes.BUTTON, RendererTypes.BUTTON_INSIDE_IN},
allowedChildComponenents = "NONE",
facets = {
@Facet(
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LinkTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LinkTagDeclaration.java?rev=1790381&r1=1790380&r2=1790381&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LinkTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LinkTagDeclaration.java Thu Apr 6 11:33:51 2017
@@ -57,7 +57,7 @@ import javax.faces.component.UICommand;
uiComponentFacesClass = "javax.faces.component.UICommand",
interfaces = "org.apache.myfaces.tobago.component.SupportsAccessKey",
componentFamily = UICommand.COMPONENT_FAMILY,
- rendererType = {RendererTypes.LINK, RendererTypes.LINK_ALTERNATIVE_COMMAND, RendererTypes.LINK_ALTERNATIVE_LINKS},
+ rendererType = {RendererTypes.LINK, RendererTypes.LINK_INSIDE_COMMAND, RendererTypes.LINK_INSIDE_LINKS},
allowedChildComponenents = "NONE",
facets = {
@Facet(
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LinksTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LinksTagDeclaration.java?rev=1790381&r1=1790380&r2=1790381&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LinksTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LinksTagDeclaration.java Thu Apr 6 11:33:51 2017
@@ -37,6 +37,6 @@ import javax.faces.component.UIPanel;
uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUILinks",
uiComponentFacesClass = "javax.faces.component.UIPanel",
componentFamily = UIPanel.COMPONENT_FAMILY,
- rendererType = {RendererTypes.LINKS, RendererTypes.LINKS_ALTERNATIVE_BAR})
+ rendererType = {RendererTypes.LINKS, RendererTypes.LINKS_INSIDE_BAR})
public interface LinksTagDeclaration extends HasIdBindingAndRendered, IsVisual, HasTip {
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectBooleanCheckboxTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectBooleanCheckboxTagDeclaration.java?rev=1790381&r1=1790380&r2=1790381&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectBooleanCheckboxTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectBooleanCheckboxTagDeclaration.java Thu Apr 6 11:33:51 2017
@@ -57,7 +57,7 @@ import javax.faces.component.UISelectBoo
uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUISelectBooleanCheckbox",
uiComponentFacesClass = "javax.faces.component.UISelectBoolean",
componentFamily = UISelectBoolean.COMPONENT_FAMILY,
- rendererType = {RendererTypes.SELECT_BOOLEAN_CHECKBOX, RendererTypes.SELECT_BOOLEAN_CHECKBOX_ALTERNATIVE_COMMAND},
+ rendererType = {RendererTypes.SELECT_BOOLEAN_CHECKBOX, RendererTypes.SELECT_BOOLEAN_CHECKBOX_INSIDE_COMMAND},
allowedChildComponenents = "NONE",
behaviors = {
@Behavior(
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectManyCheckboxTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectManyCheckboxTagDeclaration.java?rev=1790381&r1=1790380&r2=1790381&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectManyCheckboxTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectManyCheckboxTagDeclaration.java Thu Apr 6 11:33:51 2017
@@ -60,7 +60,7 @@ import javax.faces.component.UISelectMan
uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUISelectManyCheckbox",
uiComponentFacesClass = "javax.faces.component.UISelectMany",
componentFamily = UISelectMany.COMPONENT_FAMILY,
- rendererType = {RendererTypes.SELECT_MANY_CHECKBOX, RendererTypes.SELECT_MANY_CHECKBOX_ALTERNATIVE_COMMAND},
+ rendererType = {RendererTypes.SELECT_MANY_CHECKBOX, RendererTypes.SELECT_MANY_CHECKBOX_INSIDE_COMMAND},
allowedChildComponenents = {
"javax.faces.SelectItem",
"javax.faces.SelectItems"},
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectOneChoiceTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectOneChoiceTagDeclaration.java?rev=1790381&r1=1790380&r2=1790381&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectOneChoiceTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectOneChoiceTagDeclaration.java Thu Apr 6 11:33:51 2017
@@ -58,7 +58,7 @@ import javax.faces.component.UISelectOne
uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUISelectOneChoice",
uiComponentFacesClass = "javax.faces.component.UISelectOne",
componentFamily = UISelectOne.COMPONENT_FAMILY,
- rendererType = {RendererTypes.SELECT_ONE_CHOICE, RendererTypes.SELECT_ONE_CHOICE_ALTERNATIVE_IN},
+ rendererType = {RendererTypes.SELECT_ONE_CHOICE, RendererTypes.SELECT_ONE_CHOICE_INSIDE_IN},
allowedChildComponenents = {
"javax.faces.SelectItem",
"javax.faces.SelectItems"
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectOneRadioTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectOneRadioTagDeclaration.java?rev=1790381&r1=1790380&r2=1790381&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectOneRadioTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectOneRadioTagDeclaration.java Thu Apr 6 11:33:51 2017
@@ -60,7 +60,7 @@ import javax.faces.component.UISelectOne
uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUISelectOneRadio",
uiComponentFacesClass = "javax.faces.component.UISelectOne",
componentFamily = UISelectOne.COMPONENT_FAMILY,
- rendererType = {RendererTypes.SELECT_ONE_RADIO, RendererTypes.SELECT_ONE_RADIO_ALTERNATIVE_COMMAND},
+ rendererType = {RendererTypes.SELECT_ONE_RADIO, RendererTypes.SELECT_ONE_RADIO_INSIDE_COMMAND},
allowedChildComponenents = {
"javax.faces.SelectItem",
"javax.faces.SelectItems"
Modified: myfaces/tobago/trunk/tobago-core/src/main/resources/scss/_tobago.scss
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/resources/scss/_tobago.scss?rev=1790381&r1=1790380&r2=1790381&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/resources/scss/_tobago.scss (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/resources/scss/_tobago.scss Thu Apr 6 11:33:51 2017
@@ -318,7 +318,7 @@ table.tobago-gridLayout > tbody > tr > t
}
button {
- &.tobago-link, &.tobago-linkAlternativeLinks, &.tobago-treeCommand {
+ &.tobago-link, &.tobago-linkInsideLinks, &.tobago-treeCommand {
color: #0275d8;
border-width: 0;
padding: 0;
@@ -328,7 +328,7 @@ button {
}
button {
- &.tobago-link, &.tobago-linkAlternativeLinks, &.tobago-treeCommand {
+ &.tobago-link, &.tobago-linkInsideLinks, &.tobago-treeCommand {
&:focus, &:hover {
color: $link-hover-color;
background-color: transparent;
@@ -446,7 +446,7 @@ a.tobago-messages-button {
display: none;
}
- > .tobago-linkAlternativeCommand {
+ > .tobago-linkInsideCommand {
border-width: 0;
color: $dropdown-link-color;
padding: 0;
@@ -593,7 +593,7 @@ h6 > .fa:first-child {
/* selectBooleanCheckbox ----------------------------------------------- */
-.tobago-selectBooleanCheckbox, .tobago-selectBooleanCheckboxAlternativeCommand {
+.tobago-selectBooleanCheckbox, .tobago-selectBooleanCheckboxInsideCommand {
input {
margin-right: 0.3em;
margin-bottom: 0.4ex;
@@ -613,7 +613,7 @@ h6 > .fa:first-child {
list-style: none;
}
-.tobago-selectManyCheckbox, .tobago-selectManyCheckboxAlternativeCommand {
+.tobago-selectManyCheckbox, .tobago-selectManyCheckboxInsideCommand {
input {
margin-right: 0.3em;
margin-bottom: 0.4ex;
@@ -667,7 +667,7 @@ h6 > .fa:first-child {
list-style: none;
}
-.tobago-selectOneRadio, .tobago-selectOneRadioAlternativeCommand {
+.tobago-selectOneRadio, .tobago-selectOneRadioInsideCommand {
input {
margin-right: 0.3em;
margin-bottom: 0.4ex;
@@ -682,7 +682,7 @@ h6 > .fa:first-child {
/* selectOneChoice ---------------------------------------------------------- */
-.input-group-btn:not(:last-child) > .tobago-selectOneChoiceAlternativeIn { /* before facet */
+.input-group-btn:not(:last-child) > .tobago-selectOneChoiceInsideIn { /* before facet */
width: 100%;
-webkit-appearance: none;
margin-right: -1px;
@@ -690,7 +690,7 @@ h6 > .fa:first-child {
border-bottom-right-radius: 0;
}
-.input-group-btn:not(:first-child) > .tobago-selectOneChoiceAlternativeIn { /* after facet */
+.input-group-btn:not(:first-child) > .tobago-selectOneChoiceInsideIn { /* after facet */
width: 100%;
-webkit-appearance: none;
margin-left: -1px;