You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by pl...@apache.org on 2005/11/28 20:46:49 UTC
svn commit: r349480 - in
/incubator/tobago/trunk/tobago-example/tobago-example-addressbook/src/main:
java/org/apache/myfaces/tobago/example/addressbook/Controller.java
webapp/editor.jsp
Author: pleff
Date: Mon Nov 28 11:46:30 2005
New Revision: 349480
URL: http://svn.apache.org/viewcvs?rev=349480&view=rev
Log:
removed buggy facet from image upload
Modified:
incubator/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/Controller.java
incubator/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/editor.jsp
Modified: incubator/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/Controller.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/Controller.java?rev=349480&r1=349479&r2=349480&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/Controller.java (original)
+++ incubator/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/Controller.java Mon Nov 28 11:46:30 2005
@@ -136,10 +136,6 @@
this.renderFileUploadPopup = renderFileUploadPopup;
}
- public boolean isRenderPopup() {
- return renderPopup;
- }
-
public String cancelFileUploadPopup() {
setRenderFileUploadPopup(false);
return OUTCOME_EDITOR;
@@ -149,6 +145,10 @@
this.renderPopup = renderPopup;
}
+ public boolean isRenderPopup() {
+ return renderPopup;
+ }
+
public String selectColumns() {
setRenderPopup(true);
return OUTCOME_LIST;
@@ -191,7 +191,8 @@
this.uploadedFile = uploadedFile;
}
- public String renderFileUploadPopup() {
+ public String popupFileUpload() {
+ LOG.error("AHHHHHHH");
setRenderFileUploadPopup(true);
return OUTCOME_EDITOR;
}
Modified: incubator/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/editor.jsp
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/editor.jsp?rev=349480&r1=349479&r2=349480&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/editor.jsp (original)
+++ incubator/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/editor.jsp Mon Nov 28 11:46:30 2005
@@ -89,17 +89,16 @@
<tc:gridLayout rows="160px" columns="120px"/>
</f:facet>
<tc:button image="#{controller.currentAddress.imageFileName}"
- action="#{controller.currentAddress.renderFileUploadPopup}">
- <f:facet name="popup">
- <tc:popup width="300px" height="200px" left="200px"
- top="200px" rendered="#{controller.renderFileUploadPopup}"
- id="popup">
- <tc:file
- value="#{controller.currentAddress.uploadedFile}"/>
- <tc:button action="#{controller.cancelPopup}" label="OK" defaultCommand="true"/>
- <tc:button action="#{controller.cancelPopup}" label="Cancel"/>
- </tc:popup>
- </f:facet>
+ action="#{controller.popupFileUpload}">
+ <%--<f:facet name="popup">--%>
+ <%--<tc:popup width="300px" height="200px" left="200px"--%>
+ <%--top="200px" rendered="#{controller.renderFileUploadPopup}"--%>
+ <%--id="popup-fileUpload">--%>
+ <%--<tc:file value="#{controller.uploadedFile}"/>--%>
+ <%--<%--<tc:button action="#{controller.cancelPopup}" label="OK" defaultCommand="true"/>--%>--%>
+ <%--<%--<tc:button action="#{controller.cancelPopup}" label="Cancel"/>--%>--%>
+ <%--</tc:popup>--%>
+ <%--</f:facet>--%>
</tc:button>
</tc:panel>
</tc:panel>