Author: abelevich
Date: 2010-10-28 15:01:33 -0400 (Thu, 28 Oct 2010)
New Revision: 19743
Modified:
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceInputRendererBase.java
trunk/ui/input/ui/src/main/templates/inplaceInput.template.xml
trunk/ui/input/ui/src/main/templates/inplaceSelect.template.xml
trunk/ui/input/ui/src/test/java/org/richfaces/renderkit/InplaceSelectRendererTest.java
trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTestEdit.xmlunit.xml
trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTestWithControls.xmlunit.xml
trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestEdit.xmlunit.xml
trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestWithControls.xmlunit.xml
Log:
use new method getResourcePath from utils
Modified:
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceInputRendererBase.java
===================================================================
---
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceInputRendererBase.java 2010-10-28
18:59:28 UTC (rev 19742)
+++
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceInputRendererBase.java 2010-10-28
19:01:33 UTC (rev 19743)
@@ -150,8 +150,8 @@
return value;
}
- public String getResourcePath(FacesContext context, String resourceName) {
- return RenderKitUtils.getResourcePath(context, resourceName);
+ public String getResourcePath(FacesContext context, String library, String
resourceName) {
+ return RenderKitUtils.getResourcePath(context, library, resourceName);
}
public String getStateStyleClass(UIComponent component, InplaceState inplaceState) {
Modified: trunk/ui/input/ui/src/main/templates/inplaceInput.template.xml
===================================================================
--- trunk/ui/input/ui/src/main/templates/inplaceInput.template.xml 2010-10-28 18:59:28 UTC
(rev 19742)
+++ trunk/ui/input/ui/src/main/templates/inplaceInput.template.xml 2010-10-28 19:01:33 UTC
(rev 19743)
@@ -66,12 +66,12 @@
<span id="#{clientId}Btn" style="position :
relative">
<input type="image"
id="#{clientId}Okbtn"
- src="#{getResourcePath(facesContext,
'org.richfaces/ico_ok.gif')}"
+ src="#{getResourcePath(facesContext, 'org.richfaces',
'ico_ok.gif')}"
class="rf-ii-btn"
onmousedown="this.className='rf-ii-btn-p'"
onmouseout="this.className='rf-ii-btn'"
onmouseup="this.className='rf-ii-btn'" />
<input type="image"
id="#{clientId}Cancelbtn"
- src="#{getResourcePath(facesContext,'org.richfaces/ico_cancel.gif')}"
+ src="#{getResourcePath(facesContext,'org.richfaces',
'ico_cancel.gif')}"
class="rf-ii-btn"
onmousedown="this.className='rf-ii-btn-press'"
onmouseout="this.className='rf-ii-btn'"
onmouseup="this.className='rf-ii-btn'" />
<br />
Modified: trunk/ui/input/ui/src/main/templates/inplaceSelect.template.xml
===================================================================
--- trunk/ui/input/ui/src/main/templates/inplaceSelect.template.xml 2010-10-28 18:59:28
UTC (rev 19742)
+++ trunk/ui/input/ui/src/main/templates/inplaceSelect.template.xml 2010-10-28 19:01:33
UTC (rev 19743)
@@ -65,11 +65,11 @@
<span id="#{clientId}Btn" style="position :
relative;">
<input type="image" name="#{clientId}Okbtn"
id="#{clientId}Okbtn"
- src="#{getResourcePath(facesContext,
'org.richfaces/ico_ok.gif')}"
+ src="#{getResourcePath(facesContext, 'org.richfaces',
'ico_ok.gif')}"
class="rf-is-btn"
onmousedown="this.className='rf-is-btn-press'"
onmouseout="this.className='rf-is-btn'"
onmouseup="this.className='rf-is-btn'" />
<input name="#{clientId}Okbtn" type="image"
id="#{clientId}Cancelbtn"
- src="#{getResourcePath(facesContext,'org.richfaces/ico_cancel.gif')}"
+ src="#{getResourcePath(facesContext,'org.richfaces',
'ico_cancel.gif')}"
class="rf-is-btn"
onmousedown="this.className='rf-is-btn-press'"
onmouseout="this.className='rf-is-btn'"
onmouseup="this.className='rf-is-btn'" />
<br />
Modified:
trunk/ui/input/ui/src/test/java/org/richfaces/renderkit/InplaceSelectRendererTest.java
===================================================================
---
trunk/ui/input/ui/src/test/java/org/richfaces/renderkit/InplaceSelectRendererTest.java 2010-10-28
18:59:28 UTC (rev 19742)
+++
trunk/ui/input/ui/src/test/java/org/richfaces/renderkit/InplaceSelectRendererTest.java 2010-10-28
19:01:33 UTC (rev 19743)
@@ -21,6 +21,7 @@
* @author abelevich
*
*/
+
public class InplaceSelectRendererTest extends InplaceRendererTestBase {
Modified:
trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTestEdit.xmlunit.xml
===================================================================
---
trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTestEdit.xmlunit.xml 2010-10-28
18:59:28 UTC (rev 19742)
+++
trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTestEdit.xmlunit.xml 2010-10-28
19:01:33 UTC (rev 19743)
@@ -17,12 +17,12 @@
<input class="rf-ii-btn" id="form:inplaceInputEditOkbtn"
onmousedown="this.className='rf-ii-btn-p'"
onmouseout="this.className='rf-ii-btn'"
onmouseup="this.className='rf-ii-btn'"
- src="/javax.faces.resource/org.richfaces/ico_ok.gif.jsf"
+ src="/javax.faces.resource/ico_ok.gif.jsf?ln=org.richfaces"
type="image" />
<input class="rf-ii-btn"
id="form:inplaceInputEditCancelbtn"
onmousedown="this.className='rf-ii-btn-press'"
onmouseout="this.className='rf-ii-btn'"
onmouseup="this.className='rf-ii-btn'"
- src="/javax.faces.resource/org.richfaces/ico_cancel.gif.jsf"
+ src="/javax.faces.resource/ico_cancel.gif.jsf?ln=org.richfaces"
type="image" />
<br />
</span>
Modified:
trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTestWithControls.xmlunit.xml
===================================================================
---
trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTestWithControls.xmlunit.xml 2010-10-28
18:59:28 UTC (rev 19742)
+++
trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTestWithControls.xmlunit.xml 2010-10-28
19:01:33 UTC (rev 19743)
@@ -18,12 +18,12 @@
<input class="rf-ii-btn"
id="form:inplaceInputWithControlsOkbtn"
onmousedown="this.className='rf-ii-btn-p'"
onmouseout="this.className='rf-ii-btn'"
onmouseup="this.className='rf-ii-btn'"
- src="/javax.faces.resource/org.richfaces/ico_ok.gif.jsf"
+ src="/javax.faces.resource/ico_ok.gif.jsf?ln=org.richfaces"
type="image" />
<input class="rf-ii-btn"
id="form:inplaceInputWithControlsCancelbtn"
onmousedown="this.className='rf-ii-btn-press'"
onmouseout="this.className='rf-ii-btn'"
onmouseup="this.className='rf-ii-btn'"
- src="/javax.faces.resource/org.richfaces/ico_cancel.gif.jsf"
+ src="/javax.faces.resource/ico_cancel.gif.jsf?ln=org.richfaces"
type="image" />
<br />
</span>
Modified:
trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestEdit.xmlunit.xml
===================================================================
---
trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestEdit.xmlunit.xml 2010-10-28
18:59:28 UTC (rev 19742)
+++
trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestEdit.xmlunit.xml 2010-10-28
19:01:33 UTC (rev 19743)
@@ -18,8 +18,8 @@
<span class="rf-is-shdw-b">
</span>
<span id="form:inplaceSelectEditBtn" style="position :
relative;">
- <input class="rf-is-btn"
id="form:inplaceSelectEditOkbtn" name="form:inplaceSelectEditOkbtn"
onmousedown="this.className='rf-is-btn-press'"
onmouseout="this.className='rf-is-btn'"
onmouseup="this.className='rf-is-btn'"
src="/javax.faces.resource/org.richfaces/ico_ok.gif.jsf"
type="image"/>
- <input class="rf-is-btn"
id="form:inplaceSelectEditCancelbtn"
name="form:inplaceSelectEditOkbtn"
onmousedown="this.className='rf-is-btn-press'"
onmouseout="this.className='rf-is-btn'"
onmouseup="this.className='rf-is-btn'"
src="/javax.faces.resource/org.richfaces/ico_cancel.gif.jsf"
type="image"/>
+ <input class="rf-is-btn"
id="form:inplaceSelectEditOkbtn" name="form:inplaceSelectEditOkbtn"
onmousedown="this.className='rf-is-btn-press'"
onmouseout="this.className='rf-is-btn'"
onmouseup="this.className='rf-is-btn'"
src="/javax.faces.resource/ico_ok.gif.jsf?ln=org.richfaces"
type="image"/>
+ <input class="rf-is-btn"
id="form:inplaceSelectEditCancelbtn"
name="form:inplaceSelectEditOkbtn"
onmousedown="this.className='rf-is-btn-press'"
onmouseout="this.className='rf-is-btn'"
onmouseup="this.className='rf-is-btn'"
src="/javax.faces.resource/ico_cancel.gif.jsf?ln=org.richfaces"
type="image"/>
<br/>
</span>
</span>
Modified:
trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestWithControls.xmlunit.xml
===================================================================
---
trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestWithControls.xmlunit.xml 2010-10-28
18:59:28 UTC (rev 19742)
+++
trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestWithControls.xmlunit.xml 2010-10-28
19:01:33 UTC (rev 19743)
@@ -18,8 +18,8 @@
<span class="rf-is-shdw-b">
</span>
<span id="form:inplaceSelectWithControlsBtn" style="position
: relative;">
- <input class="rf-is-btn"
id="form:inplaceSelectWithControlsOkbtn"
name="form:inplaceSelectWithControlsOkbtn"
onmousedown="this.className='rf-is-btn-press'"
onmouseout="this.className='rf-is-btn'"
onmouseup="this.className='rf-is-btn'"
src="/javax.faces.resource/org.richfaces/ico_ok.gif.jsf"
type="image"/>
- <input class="rf-is-btn"
id="form:inplaceSelectWithControlsCancelbtn"
name="form:inplaceSelectWithControlsOkbtn"
onmousedown="this.className='rf-is-btn-press'"
onmouseout="this.className='rf-is-btn'"
onmouseup="this.className='rf-is-btn'"
src="/javax.faces.resource/org.richfaces/ico_cancel.gif.jsf"
type="image"/>
+ <input class="rf-is-btn"
id="form:inplaceSelectWithControlsOkbtn"
name="form:inplaceSelectWithControlsOkbtn"
onmousedown="this.className='rf-is-btn-press'"
onmouseout="this.className='rf-is-btn'"
onmouseup="this.className='rf-is-btn'"
src="/javax.faces.resource/ico_ok.gif.jsf?ln=org.richfaces"
type="image"/>
+ <input class="rf-is-btn"
id="form:inplaceSelectWithControlsCancelbtn"
name="form:inplaceSelectWithControlsOkbtn"
onmousedown="this.className='rf-is-btn-press'"
onmouseout="this.className='rf-is-btn'"
onmouseup="this.className='rf-is-btn'"
src="/javax.faces.resource/ico_cancel.gif.jsf?ln=org.richfaces"
type="image"/>
<br/>
</span>
</span>