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 2014/07/11 13:08:21 UTC
svn commit: r1609687 [5/5] - in /myfaces/tobago/branches/tobago-3.0.x:
tobago-core/src/main/java/org/apache/myfaces/tobago/context/
tobago-core/src/test/java/org/apache/myfaces/tobago/context/
tobago-example/tobago-example-demo/src/main/webapp/ tobago-...
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TabGroupRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TabGroupRenderer.java?rev=1609687&r1=1609686&r2=1609687&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TabGroupRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TabGroupRenderer.java Fri Jul 11 11:08:11 2014
@@ -268,7 +268,7 @@ public class TabGroupRenderer extends La
final UICommand previous = (UICommand) application.createComponent(UICommand.COMPONENT_TYPE);
previous.setId(viewRoot.createUniqueId());
previous.setRendererType(null);
- previous.getAttributes().put(Attributes.IMAGE, "image/tabPrev.gif");
+ previous.getAttributes().put(Attributes.IMAGE, "image/tabPrev.png");
previous.setOmit(true); // avoid submit
ComponentUtils.putDataAttribute(previous, "tobago-tabgroup-toolbar-prev", "p");
@@ -276,7 +276,7 @@ public class TabGroupRenderer extends La
final UICommand next = (UICommand) application.createComponent(UICommand.COMPONENT_TYPE);
next.setId(viewRoot.createUniqueId());
next.setRendererType(null);
- next.getAttributes().put(Attributes.IMAGE, "image/tabNext.gif");
+ next.getAttributes().put(Attributes.IMAGE, "image/tabNext.png");
next.setOmit(true); // avoid submit
ComponentUtils.putDataAttribute(next, "tobago-tabgroup-toolbar-next", "n");
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ToolBarRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ToolBarRendererBase.java?rev=1609687&r1=1609686&r2=1609687&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ToolBarRendererBase.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ToolBarRendererBase.java Fri Jul 11 11:08:11 2014
@@ -156,7 +156,7 @@ public abstract class ToolBarRendererBas
image = ((org.apache.myfaces.tobago.model.SelectItem) item).getImage();
}
if (image == null) {
- image = "image/1x1.gif";
+ image = "image/1x1.png";
}
command.getAttributes().put(Attributes.IMAGE, image);
@@ -451,7 +451,7 @@ public abstract class ToolBarRendererBas
final boolean dropDownDisabled
= ComponentUtils.getBooleanAttribute(dropDownMenu, Attributes.DISABLED) || disabled;
final String menuImage = ResourceManagerUtils
- .getImageOrDisabledImageWithPath(facesContext, "image/toolbarButtonMenu.gif", dropDownDisabled);
+ .getImageOrDisabledImageWithPath(facesContext, "image/toolbarButtonMenu.png", dropDownDisabled);
writer.writeAttribute(HtmlAttributes.SRC, menuImage, false);
writer.writeStyleAttribute(openerStyle);
writer.endElement(HtmlElements.IMG);
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TreeIconRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TreeIconRenderer.java?rev=1609687&r1=1609686&r2=1609687&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TreeIconRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TreeIconRenderer.java Fri Jul 11 11:08:11 2014
@@ -41,11 +41,11 @@ import java.io.IOException;
public class TreeIconRenderer extends LayoutComponentRendererBase {
protected static final String OPEN_FOLDER
- = ResourceUtils.createString("image", "treeNode", "icon", "open", ResourceUtils.GIF);
+ = ResourceUtils.createString("image", "treeNode", "icon", "open", ResourceUtils.PNG);
protected static final String CLOSED_FOLDER
- = ResourceUtils.createString("image", "treeNode", "icon", ResourceUtils.GIF);
+ = ResourceUtils.createString("image", "treeNode", "icon", ResourceUtils.PNG);
protected static final String LEAF
- = ResourceUtils.createString("image", "treeNode", "icon", "leaf", ResourceUtils.GIF);
+ = ResourceUtils.createString("image", "treeNode", "icon", "leaf", ResourceUtils.PNG);
@Override
public void encodeBegin(final FacesContext facesContext, final UIComponent component) throws IOException {
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TreeIndentRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TreeIndentRenderer.java?rev=1609687&r1=1609686&r2=1609687&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TreeIndentRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TreeIndentRenderer.java Fri Jul 11 11:08:11 2014
@@ -85,8 +85,8 @@ public class TreeIndentRenderer extends
throws IOException {
final boolean dropFirst = !showRoot || !showRootJunction && (showLines || showIcons);
- final String blank = ResourceManagerUtils.getImageWithPath(facesContext, "image/blank.gif");
- final String perpendicular = ResourceManagerUtils.getImageWithPath(facesContext, "image/I.gif");
+ final String blank = ResourceManagerUtils.getImageWithPath(facesContext, "image/blank.png");
+ final String perpendicular = ResourceManagerUtils.getImageWithPath(facesContext, "image/I.png");
for (int i = dropFirst ? 1 : 0; i < junctions.size() - 1; i++) {
final Boolean junction = junctions.get(i);
@@ -118,34 +118,34 @@ public class TreeIndentRenderer extends
final String close;
if (showLines) {
if (root) {
- open = "Rminus.gif";
- close = "Rplus.gif";
+ open = "Rminus.png";
+ close = "Rplus.png";
} else {
if (hasNextSibling) {
if (folder) {
- open = "Tminus.gif";
- close = "Tplus.gif";
+ open = "Tminus.png";
+ close = "Tplus.png";
} else {
- open = "T.gif";
- close = "T.gif";
+ open = "T.png";
+ close = "T.png";
}
} else {
if (folder) {
- open = "Lminus.gif";
- close = "Lplus.gif";
+ open = "Lminus.png";
+ close = "Lplus.png";
} else {
- open = "L.gif";
- close = "L.gif";
+ open = "L.png";
+ close = "L.png";
}
}
}
} else {
if (folder) {
- open = "minus.gif";
- close = "plus.gif";
+ open = "minus.png";
+ close = "plus.png";
} else {
- open = "blank.gif";
- close = "blank.gif";
+ open = "blank.png";
+ close = "blank.png";
}
}
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TreeMenuNodeRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TreeMenuNodeRenderer.java?rev=1609687&r1=1609686&r2=1609687&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TreeMenuNodeRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TreeMenuNodeRenderer.java Fri Jul 11 11:08:11 2014
@@ -73,7 +73,7 @@ public class TreeMenuNodeRenderer extend
if (!folder && ie6) { // XXX IE6: without this hack, we can't click beside the label text. Why?
- final String src = ResourceManagerUtils.getImageWithPath(facesContext, "image/1x1.gif");
+ final String src = ResourceManagerUtils.getImageWithPath(facesContext, "image/1x1.png");
writer.startElement(HtmlElements.IMG, null);
writer.writeClassAttribute(Classes.create(node, "icon"));
writer.writeAttribute(HtmlAttributes.SRC, src, false);
@@ -104,8 +104,8 @@ public class TreeMenuNodeRenderer extend
private void encodeIcon(
final FacesContext facesContext, final TobagoResponseWriter writer, final boolean expanded, final UITreeNode node)
throws IOException {
- final String srcOpen = ResourceManagerUtils.getImageWithPath(facesContext, "image/treeMenuOpen.gif");
- final String srcClose = ResourceManagerUtils.getImageWithPath(facesContext, "image/treeMenuClose.gif");
+ final String srcOpen = ResourceManagerUtils.getImageWithPath(facesContext, "image/treeMenuOpen.png");
+ final String srcClose = ResourceManagerUtils.getImageWithPath(facesContext, "image/treeMenuClose.png");
final String src = expanded ? srcOpen : srcClose;
writer.startElement(HtmlElements.IMG, null);
writer.writeClassAttribute(Classes.create(node, "toggle"));
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TreeNodeRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TreeNodeRenderer.java?rev=1609687&r1=1609686&r2=1609687&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TreeNodeRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TreeNodeRenderer.java Fri Jul 11 11:08:11 2014
@@ -43,11 +43,11 @@ public class TreeNodeRenderer extends Tr
private static final Logger LOG = LoggerFactory.getLogger(TreeNodeRenderer.class);
protected static final String OPEN_FOLDER
- = ResourceUtils.createString("image", "treeNode", "icon", "open", ResourceUtils.GIF);
+ = ResourceUtils.createString("image", "treeNode", "icon", "open", ResourceUtils.PNG);
protected static final String CLOSED_FOLDER
- = ResourceUtils.createString("image", "treeNode", "icon", ResourceUtils.GIF);
+ = ResourceUtils.createString("image", "treeNode", "icon", ResourceUtils.PNG);
protected static final String LEAF
- = ResourceUtils.createString("image", "treeNode", "icon", "leaf", ResourceUtils.GIF);
+ = ResourceUtils.createString("image", "treeNode", "icon", "leaf", ResourceUtils.PNG);
@Override
public void encodeBegin(final FacesContext facesContext, final UIComponent component) throws IOException {
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/test/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TreeNodeRendererUnitTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/test/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TreeNodeRendererUnitTest.java?rev=1609687&r1=1609686&r2=1609687&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/test/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TreeNodeRendererUnitTest.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/test/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TreeNodeRendererUnitTest.java Fri Jul 11 11:08:11 2014
@@ -26,8 +26,8 @@ public class TreeNodeRendererUnitTest {
@Test
public void testConstants() {
- Assert.assertEquals("image/treeNode-icon-open.gif", TreeNodeRenderer.OPEN_FOLDER);
- Assert.assertEquals("image/treeNode-icon.gif", TreeNodeRenderer.CLOSED_FOLDER);
- Assert.assertEquals("image/treeNode-icon-leaf.gif", TreeNodeRenderer.LEAF);
+ Assert.assertEquals("image/treeNode-icon-open.png", TreeNodeRenderer.OPEN_FOLDER);
+ Assert.assertEquals("image/treeNode-icon.png", TreeNodeRenderer.CLOSED_FOLDER);
+ Assert.assertEquals("image/treeNode-icon-leaf.png", TreeNodeRenderer.LEAF);
}
}