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 2016/11/26 12:09:17 UTC
svn commit: r1771473 - in /myfaces/tobago/trunk:
tobago-core/src/main/java/org/apache/myfaces/tobago/context/
tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/
tobago-core/src/main/java/org/apache/myfaces/tobago/internal/...
Author: lofwyr
Date: Sat Nov 26 12:09:16 2016
New Revision: 1771473
URL: http://svn.apache.org/viewvc?rev=1771473&view=rev
Log:
TOBAGO-1636: End of theme-dependent resource selection (ResourceManager)
Removed:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerUtils.java
Modified:
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/PageRenderer.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneRadioRenderer.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TabGroupRenderer.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HtmlRendererUtils.java
myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/NumberSliderRenderer.java
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=1771473&r1=1771472&r2=1771473&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 Sat Nov 26 12:09:16 2016
@@ -135,28 +135,6 @@ public abstract class CommandRendererBas
writer.writeAttribute(DataAttributes.DEFAULT, form.getClientId(facesContext), false);
}
-/*
-// image
-
- String image = command instanceof AbstractUILink ? ((AbstractUILink) command).getImage() : null;
- if (image != null) {
- if (ResourceManagerUtils.isAbsoluteResource(image)) {
- // absolute Path to image : nothing to do
- } else {
- image = HtmlRendererUtils.getImageWithPath(facesContext, image, disabled);
- }
- HtmlRendererUtils.encodeIconWithLabel(writer, facesContext, image, label, disabled);
- }
-
-// label
- if (label.getLabel() != null) {
- if (image != null) {
- writer.write(" "); // separator: e.g.
- }
- HtmlRendererUtils.writeLabelWithAccessKey(writer, label);
- }
-*/
-
final String image = ComponentUtils.getStringAttribute(command, Attributes.image);
HtmlRendererUtils.encodeIconWithLabel(writer, facesContext, image, label, disabled);
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/PageRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/PageRenderer.java?rev=1771473&r1=1771472&r2=1771473&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/PageRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/PageRenderer.java Sat Nov 26 12:09:16 2016
@@ -166,11 +166,11 @@ public class PageRenderer extends Render
// style files
for (final String styleFile : theme.getStyleResources(productionMode)) {
- writeStyle(facesContext, writer, styleFile);
+ writeStyle(writer, styleFile);
}
for (final String styleFile : FacesContextUtils.getStyleFiles(facesContext)) {
- writeStyle(facesContext, writer, styleFile);
+ writeStyle(writer, styleFile);
}
if (!productionMode) {
@@ -307,11 +307,9 @@ public class PageRenderer extends Render
}
}
- private void writeStyle(final FacesContext facesContext, final TobagoResponseWriter writer, final String styleFile)
+ private void writeStyle(final TobagoResponseWriter writer, final String styleFile)
throws IOException {
-// XXX RM
final List<String> styles = Collections.singletonList(styleFile);
-// final List<String> styles = ResourceManagerUtils.getStyles(facesContext, styleFile);
for (final String styleString : styles) {
if (styleString.length() > 0) {
writer.startElement(HtmlElements.LINK);
@@ -424,13 +422,8 @@ public class PageRenderer extends Render
private void encodeScript(final FacesContext facesContext, final TobagoResponseWriter writer, final String script)
throws IOException {
final List<String> list;
-// XXX RM
-// if (ResourceManagerUtils.isAbsoluteResource(script)) {
- list = new ArrayList<String>();
- list.add(script);
-// } else {
-// list = ResourceManagerUtils.getScripts(facesContext, script);
-// }
+ list = new ArrayList<String>();
+ list.add(script);
for (final String src : list) {
if (StringUtils.isNotBlank(src)) {
writer.startElement(HtmlElements.SCRIPT);
@@ -443,40 +436,6 @@ public class PageRenderer extends Render
}
}
- /* TODO: this may be written in to a HTML5 data-attribute and be logged to the console
- private void errorMessageForDebugging(final String id, final FacesMessage message, final ResponseWriter writer)
- throws IOException {
- writer.startElement(HtmlElements.DIV, null);
- writer.writeAttribute(HtmlAttributes.style, "color: red", null);
- writer.write("[");
- writer.write(id != null ? id : "null");
- writer.write("]");
- writer.write("[");
- writer.write(message.getSummary() == null ? "null" : message.getSummary());
- writer.write("/");
- writer.write(message.getDetail() == null ? "null" : message.getDetail());
- writer.write("]");
- writer.endElement(HtmlElements.DIV);
- writer.startElement(HtmlElements.BR, null);
- writer.endElement(HtmlElements.BR);
- }
-
- private String errorMessageForDebugging(final String id, final FacesMessage message) {
- final StringBuilder sb = new StringBuilder("LOG.info(\"FacesMessage: [");
- sb.append(id != null ? id : "null");
- sb.append("][");
- sb.append(message.getSummary() == null ? "null" : escape(message.getSummary()));
- sb.append("/");
- sb.append(message.getDetail() == null ? "null" : escape(message.getDetail()));
- sb.append("]\");");
- return sb.toString();
- }
-
- private String escape(final String s) {
- return StringUtils.replace(StringUtils.replace(s, "\\", "\\\\"), "\"", "\\\"");
- }
-*/
-
private String getMethod(final UIPage page) {
return ComponentUtils.getStringAttribute(page, Attributes.method, "post");
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneRadioRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneRadioRenderer.java?rev=1771473&r1=1771472&r2=1771473&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneRadioRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneRadioRenderer.java Sat Nov 26 12:09:16 2016
@@ -100,11 +100,8 @@ public class SelectOneRadioRenderer exte
org.apache.myfaces.tobago.model.SelectItem tobagoItem = (org.apache.myfaces.tobago.model.SelectItem) item;
final String image = tobagoItem.getImage();
if (image != null) {
- final String imageToRender
- = image;
-// XXX RM = ResourceManagerUtils.getImageOrDisabledImageWithPath(facesContext, image, item.isDisabled());
writer.startElement(HtmlElements.IMG);
- writer.writeAttribute(HtmlAttributes.SRC, imageToRender, true);
+ writer.writeAttribute(HtmlAttributes.SRC, image, true);
writer.writeAttribute(HtmlAttributes.ALT, "", false);
writer.endElement(HtmlElements.IMG);
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TabGroupRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TabGroupRenderer.java?rev=1771473&r1=1771472&r2=1771473&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TabGroupRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TabGroupRenderer.java Sat Nov 26 12:09:16 2016
@@ -270,12 +270,6 @@ public class TabGroupRenderer extends Re
String image = tab.getImage();
// tab.getImage() resolves to empty string if el-expression resolves to null
if (image != null && !image.isEmpty()) {
-// XXX RM
- // if (ResourceManagerUtils.isAbsoluteResource(image)) {
- // absolute Path to image : nothing to do
-// } else {
-// image = ResourceManagerUtils.getImageOrDisabledImageWithPath(facesContext, image, disabled);
-// }
writer.startElement(HtmlElements.IMG);
writer.writeAttribute(HtmlAttributes.SRC, image, true);
// TBD writer.writeClassAttribute(Classes.create(tab, (label.getLabel() != null? "image-right-margin" : "image")));
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HtmlRendererUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HtmlRendererUtils.java?rev=1771473&r1=1771472&r2=1771473&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HtmlRendererUtils.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HtmlRendererUtils.java Sat Nov 26 12:09:16 2016
@@ -110,12 +110,6 @@ public final class HtmlRendererUtils {
if (image.startsWith("fa-")) {
writer.writeIcon(null, FontAwesomeIconEncoder.generateClass(image)); // todo: should not be static
} else {
- // XXX RM
-// if (ResourceManagerUtils.isAbsoluteResource(image)) {
- // absolute Path to image: nothing to do
-// } else {
-// image = getImageWithPath(facesContext, image, disabled);
-// }
writer.startElement(HtmlElements.IMG);
writer.writeAttribute(HtmlAttributes.SRC, image, true);
writer.writeAttribute(HtmlAttributes.ALT, "", false);
@@ -130,18 +124,6 @@ public final class HtmlRendererUtils {
}
}
- // XXX RM
-/*
- public static String getImageWithPath(final FacesContext facesContext, final String image, final boolean disabled) {
- final int indexOfExtension = ResourceManagerUtils.indexOfExtension(image);
- if (indexOfExtension == -1) {
- return ResourceManagerUtils.getImageOrDisabledImage(facesContext, image, disabled);
- } else {
- return ResourceManagerUtils.getImageOrDisabledImageWithPath(facesContext, image, disabled);
- }
- }
-*/
-
/**
* @deprecated since 3.0.0, use {@link org.apache.myfaces.tobago.renderkit.RendererBase#getResponseWriter}
*/
@@ -245,11 +227,7 @@ public final class HtmlRendererUtils {
final String image = ((org.apache.myfaces.tobago.model.SelectItem) item).getImage();
if (image != null) {
final Style style = new Style();
- style.setBackgroundImage("url('"
-// XXX RM
- + image
-// + ResourceManagerUtils.getImageOrDisabledImageWithPath(facesContext, image, item.isDisabled())
- + "')");
+ style.setBackgroundImage("url('" + image + "')");
writer.writeStyleAttribute(style);
}
}
Modified: myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/NumberSliderRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/NumberSliderRenderer.java?rev=1771473&r1=1771472&r2=1771473&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/NumberSliderRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/NumberSliderRenderer.java Sat Nov 26 12:09:16 2016
@@ -40,8 +40,6 @@ import java.util.Map;
public class NumberSliderRenderer extends RendererBase {
- private static final String SLIDER_WIDTH_PERCENT = "sliderWidthPercent";
-
@Override
public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
@@ -142,7 +140,7 @@ public class NumberSliderRenderer extend
handleStyle.setHeight(Measure.valueOf(6));
writer.writeStyleAttribute(handleStyle); // todo: why not do that via the class?
writer.startElement(HtmlElements.IMG);
- writer.writeAttribute(HtmlAttributes.SRC, getAbsoluteImagePath(facesContext, "image/sliderTriangle"), true);
+ writer.writeAttribute(HtmlAttributes.SRC, facesContext.getExternalContext().getRequestContextPath(), true);
writer.endElement(HtmlElements.IMG);
writer.endElement(HtmlElements.DIV);
writer.endElement(HtmlElements.DIV);
@@ -170,11 +168,6 @@ public class NumberSliderRenderer extend
}
}
- private String getAbsoluteImagePath(final FacesContext facesContext, final String relativeImagePath) {
- return facesContext.getExternalContext().getRequestContextPath()/*
- + ResourceManagerUtils.getImage(facesContext, relativeImagePath)*/;
- }
-
private String getIdForInputField(final FacesContext context, final UIComponent component) {
final String id = component.getClientId(context);
return id + ComponentUtils.SUB_SEPARATOR + "input";