JBoss Rich Faces SVN: r8091 - Reports and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: tkuprevich
Date: 2008-04-23 06:32:01 -0400 (Wed, 23 Apr 2008)
New Revision: 8091
Modified:
trunk/test-applications/qa/Test Reports/DailyReportTemplate.xls
Log:
Modified: trunk/test-applications/qa/Test Reports/DailyReportTemplate.xls
===================================================================
(Binary files differ)
16 years, 8 months
JBoss Rich Faces SVN: r8090 - trunk/framework/impl/src/main/java/org/ajax4jsf/request.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-04-23 05:45:39 -0400 (Wed, 23 Apr 2008)
New Revision: 8090
Modified:
trunk/framework/impl/src/main/java/org/ajax4jsf/request/MultipartRequest.java
Log:
RF-3055
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/request/MultipartRequest.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/request/MultipartRequest.java 2008-04-23 09:18:01 UTC (rev 8089)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/request/MultipartRequest.java 2008-04-23 09:45:39 UTC (rev 8090)
@@ -14,6 +14,7 @@
import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.regex.Matcher;
@@ -174,6 +175,19 @@
}
return tempFile;
}
+
+ public void deleteFile() {
+ try {
+ if (fOut != null) {
+ fOut.close();
+ if (tempFile != null) {
+ tempFile.delete();
+ }
+ }
+ } catch (Exception e) {
+ throw new FileUploadException("Could not delete temporary file");
+ }
+ }
@Override
public void appendData(byte[] data, int start, int length)
@@ -293,6 +307,18 @@
}
return fileName;
}
+
+ public void cancel() {
+ if (parameters != null) {
+ Iterator<Param> it = parameters.values().iterator();
+ while (it.hasNext()) {
+ Param p = it.next();
+ if (p instanceof FileParam) {
+ ((FileParam)p).deleteFile();
+ }
+ }
+ }
+ }
public boolean parseRequest() {
byte[] boundaryMarker = getBoundaryMarker(request.getContentType());
@@ -430,18 +456,14 @@
pos = 0;
fillProgressInfo();
} else {
- if (file != null) {
- file.delete();
- }
+ cancel();
return false;
}
}
return true;
} else {
- if (file != null) {
- file.delete();
- }
+ cancel();
return false;
}
} catch (IOException ex) {
16 years, 8 months
JBoss Rich Faces SVN: r8089 - trunk/framework/api/src/main/java/org/richfaces/model.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-04-23 05:18:01 -0400 (Wed, 23 Apr 2008)
New Revision: 8089
Modified:
trunk/framework/api/src/main/java/org/richfaces/model/UploadItem.java
Log:
RF-3167
Modified: trunk/framework/api/src/main/java/org/richfaces/model/UploadItem.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/model/UploadItem.java 2008-04-23 06:56:14 UTC (rev 8088)
+++ trunk/framework/api/src/main/java/org/richfaces/model/UploadItem.java 2008-04-23 09:18:01 UTC (rev 8089)
@@ -66,7 +66,7 @@
* Otherwise null value will be returned by this method.
* @return the file
*/
- public File getFile() throws Exception {
+ public File getFile() {
return file;
}
@@ -76,7 +76,7 @@
* @return the bytes
* @throws Exception
*/
- public byte[] getData() throws Exception {
+ public byte[] getData() {
return bytes;
}
16 years, 8 months
JBoss Rich Faces SVN: r8088 - trunk/ui/combobox/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: vmolotkov
Date: 2008-04-23 02:56:14 -0400 (Wed, 23 Apr 2008)
New Revision: 8088
Modified:
trunk/ui/combobox/src/main/config/component/combobox.xml
Log:
http://jira.jboss.com/jira/browse/RF-3183
Modified: trunk/ui/combobox/src/main/config/component/combobox.xml
===================================================================
--- trunk/ui/combobox/src/main/config/component/combobox.xml 2008-04-23 06:27:02 UTC (rev 8087)
+++ trunk/ui/combobox/src/main/config/component/combobox.xml 2008-04-23 06:56:14 UTC (rev 8088)
@@ -79,7 +79,7 @@
<property>
<name>tabindex</name>
- <classname>int</classname>
+ <classname>java.lang.String</classname>
</property>
<property>
<name>listWidth</name>
16 years, 8 months
JBoss Rich Faces SVN: r8087 - in trunk/ui/combobox/src/main: templates and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: vmolotkov
Date: 2008-04-23 02:27:02 -0400 (Wed, 23 Apr 2008)
New Revision: 8087
Modified:
trunk/ui/combobox/src/main/config/component/combobox.xml
trunk/ui/combobox/src/main/templates/combobox.jspx
Log:
http://jira.jboss.com/jira/browse/RF-3183
Modified: trunk/ui/combobox/src/main/config/component/combobox.xml
===================================================================
--- trunk/ui/combobox/src/main/config/component/combobox.xml 2008-04-23 01:18:47 UTC (rev 8086)
+++ trunk/ui/combobox/src/main/config/component/combobox.xml 2008-04-23 06:27:02 UTC (rev 8087)
@@ -78,6 +78,10 @@
</property>
<property>
+ <name>tabindex</name>
+ <classname>int</classname>
+ </property>
+ <property>
<name>listWidth</name>
<classname>java.lang.String</classname>
<description>Defines width of file popup list</description>
Modified: trunk/ui/combobox/src/main/templates/combobox.jspx
===================================================================
--- trunk/ui/combobox/src/main/templates/combobox.jspx 2008-04-23 01:18:47 UTC (rev 8086)
+++ trunk/ui/combobox/src/main/templates/combobox.jspx 2008-04-23 06:27:02 UTC (rev 8087)
@@ -198,8 +198,6 @@
}
variables.setVariable("buttonIconInactive", buttonIconInactive);
variables.setVariable("enableManualInput", !component.isEnableManualInput());
-
-
]]>
</jsp:scriptlet>
<f:resource var="spacer" name="images/spacer.gif"/>
@@ -218,6 +216,7 @@
onblur="#{component.attributes['onblur']}"
style="width:#{correction}; #{inputStyle}"
autocomplete="off"
+ tabindex="#{component.attributes['tabindex']}"
/>
<input id="#{clientId}comboBoxButtonBG"
readonly="true"
16 years, 8 months
JBoss Rich Faces SVN: r8086 - in branches/3.1.x/ui/calendar/src/main: java/org/richfaces/component and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-04-22 21:18:47 -0400 (Tue, 22 Apr 2008)
New Revision: 8086
Modified:
branches/3.1.x/ui/calendar/src/main/config/component/calendar.xml
branches/3.1.x/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java
Log:
http://jira.jboss.com/jira/browse/RF-3122
Modified: branches/3.1.x/ui/calendar/src/main/config/component/calendar.xml
===================================================================
--- branches/3.1.x/ui/calendar/src/main/config/component/calendar.xml 2008-04-23 01:17:56 UTC (rev 8085)
+++ branches/3.1.x/ui/calendar/src/main/config/component/calendar.xml 2008-04-23 01:18:47 UTC (rev 8086)
@@ -559,7 +559,7 @@
<name>firstWeekDay</name>
<classname>int</classname>
<description>Gets what the first day of the week is; e.g., SUNDAY in the U.S., MONDAY in France.</description>
- <defaultvalue>getDefaultFirstWeekDay()</defaultvalue>
+
</property>
<property>
<name>minDaysInFirstWeek</name>
@@ -570,7 +570,7 @@
day of the first month of a year, this method returns 1. If the
minimal days required must be a full week, this method returns 7.
</description>
- <defaultvalue>getDefaultMinDaysInFirstWeek()</defaultvalue>
+
</property>
<property>
<name>showHeader</name>
Modified: branches/3.1.x/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java
===================================================================
--- branches/3.1.x/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java 2008-04-23 01:17:56 UTC (rev 8085)
+++ branches/3.1.x/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java 2008-04-23 01:18:47 UTC (rev 8086)
@@ -68,7 +68,7 @@
* firstWeekDay
* Gets what the first day of the week is; e.g., SUNDAY in the U.S., MONDAY in France.
*/
- private int _firstWeekDay = getDefaultFirstWeekDay();
+ private int _firstWeekDay = 0;
/**
* Flag indicated what firstWeekDay is set.
*/
@@ -81,7 +81,7 @@
day of the first month of a year, this method returns 1. If the
minimal days required must be a full week, this method returns 7.
*/
- private int _minDaysInFirstWeek = getDefaultMinDaysInFirstWeek();
+ private int _minDaysInFirstWeek = 0;
/**
* Flag indicated what minDaysInFirstWeek is set.
*/
16 years, 8 months
JBoss Rich Faces SVN: r8085 - in trunk/ui/calendar/src/main: java/org/richfaces/component and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-04-22 21:17:56 -0400 (Tue, 22 Apr 2008)
New Revision: 8085
Modified:
trunk/ui/calendar/src/main/config/component/calendar.xml
trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java
Log:
http://jira.jboss.com/jira/browse/RF-3122
Modified: trunk/ui/calendar/src/main/config/component/calendar.xml
===================================================================
--- trunk/ui/calendar/src/main/config/component/calendar.xml 2008-04-22 23:42:59 UTC (rev 8084)
+++ trunk/ui/calendar/src/main/config/component/calendar.xml 2008-04-23 01:17:56 UTC (rev 8085)
@@ -596,7 +596,6 @@
<name>firstWeekDay</name>
<classname>int</classname>
<description>Gets what the first day of the week is; e.g., SUNDAY in the U.S., MONDAY in France. Default value is "getDefaultFirstWeekDay()".</description>
- <defaultvalue>getDefaultFirstWeekDay()</defaultvalue>
</property>
<property>
<name>minDaysInFirstWeek</name>
@@ -607,7 +606,6 @@
day of the first month of a year, this method returns 1. If the
minimal days required must be a full week, this method returns 7. Default value is "getDefaultMinDaysInFirstWeek()".
</description>
- <defaultvalue>getDefaultMinDaysInFirstWeek()</defaultvalue>
</property>
</component>
Modified: trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java
===================================================================
--- trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java 2008-04-22 23:42:59 UTC (rev 8084)
+++ trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java 2008-04-23 01:17:56 UTC (rev 8085)
@@ -21,6 +21,9 @@
package org.richfaces.component;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
@@ -57,16 +60,35 @@
import org.richfaces.model.CalendarDataModelItem;
import org.richfaces.renderkit.CalendarRendererBase;
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-
/**
* JSF component class
*
*/
public abstract class UICalendar extends UIInput implements AjaxComponent {
+ /**
+ * firstWeekDay
+ * Gets what the first day of the week is; e.g., SUNDAY in the U.S., MONDAY in France.
+ */
+ private int _firstWeekDay = 0;
+ /**
+ * Flag indicated what firstWeekDay is set.
+ */
+ private boolean _firstWeekDaySet = false;
+
+ /**
+ * minDaysInFirstWeek
+ * Gets what the minimal days required in the first week of the year
+ are; e.g., if the first week is defined as one that contains the first
+ day of the first month of a year, this method returns 1. If the
+ minimal days required must be a full week, this method returns 7.
+ */
+ private int _minDaysInFirstWeek = 0;
+ /**
+ * Flag indicated what minDaysInFirstWeek is set.
+ */
+ private boolean _minDaysInFirstWeekSet = false;
+
public static final String COMPONENT_TYPE = "org.richfaces.Calendar";
private static final String COMPONENT_FAMILY = "org.richfaces.Calendar";
@@ -234,13 +256,7 @@
public abstract void setShowApplyButton(boolean showApplyButton);
- public abstract int getFirstWeekDay();
- public abstract void setFirstWeekDay(int firstWeekDay);
- public abstract int getMinDaysInFirstWeek();
- public abstract void setMinDaysInFirstWeek(int minDaysInFirstWeek);
-
-
// TODO onclick add users onclick
// currentDate processing -------------------------------------------------
@@ -739,4 +755,95 @@
protected int getDefaultMinDaysInFirstWeek() {
return getCalendar().getMinimalDaysInFirstWeek();
}
+ /**
+ * Gets what the minimal days required in the first week of the year
+ are; e.g., if the first week is defined as one that contains the first
+ day of the first month of a year, this method returns 1. If the
+ minimal days required must be a full week, this method returns 7.
+ * Setter for minDaysInFirstWeek
+ * @param minDaysInFirstWeek - new value
+ */
+ public void setMinDaysInFirstWeek( int __minDaysInFirstWeek ){
+ this._minDaysInFirstWeek = __minDaysInFirstWeek;
+ this._minDaysInFirstWeekSet = true;
+ }
+
+
+ /**
+ * Gets what the minimal days required in the first week of the year
+ are; e.g., if the first week is defined as one that contains the first
+ day of the first month of a year, this method returns 1. If the
+ minimal days required must be a full week, this method returns 7.
+ * Getter for minDaysInFirstWeek
+ * @return minDaysInFirstWeek value from local variable or value bindings
+ */
+ public int getMinDaysInFirstWeek( ){
+ if(this._minDaysInFirstWeekSet){
+ return this._minDaysInFirstWeek;
+ }
+ ValueBinding vb = getValueBinding("minDaysInFirstWeek");
+ if (vb != null) {
+ Integer value = (Integer) vb.getValue(getFacesContext());
+ if (null == value) {
+ return getDefaultMinDaysInFirstWeek();
+ }
+ return (value.intValue());
+ } else {
+ return getDefaultMinDaysInFirstWeek();
+ }
+ }
+ /**
+ * Gets what the first day of the week is; e.g., SUNDAY in the U.S., MONDAY in France.
+ * Setter for firstWeekDay
+ * @param firstWeekDay - new value
+ */
+ public void setFirstWeekDay( int __firstWeekDay ){
+ this._firstWeekDay = __firstWeekDay;
+ this._firstWeekDaySet = true;
+ }
+
+
+ /**
+ * Gets what the first day of the week is; e.g., SUNDAY in the U.S., MONDAY in France.
+ * Getter for firstWeekDay
+ * @return firstWeekDay value from local variable or value bindings
+ */
+ public int getFirstWeekDay( ){
+ if(this._firstWeekDaySet){
+ return this._firstWeekDay;
+ }
+ ValueBinding vb = getValueBinding("firstWeekDay");
+ if (vb != null) {
+ Integer value = (Integer) vb.getValue(getFacesContext());
+ if (null == value) {
+ return getDefaultFirstWeekDay();
+ }
+ return (value.intValue());
+ } else {
+ return getDefaultFirstWeekDay();
+ }
+ }
+
+ public Object saveState(FacesContext context) {
+ return new Object [] {
+ super.saveState(context),
+
+ new Integer(_firstWeekDay),
+ new Boolean(_firstWeekDaySet),
+
+ new Integer(_minDaysInFirstWeek),
+ new Boolean(_minDaysInFirstWeekSet)
+ };
+ }
+
+ public void restoreState(FacesContext context, Object state) {
+ Object[] states = (Object[]) state;
+ super.restoreState(context, states[0]);
+
+ _firstWeekDay = ((Integer)states[1]).intValue();
+ _firstWeekDaySet = ((Boolean)states[2]).booleanValue();
+
+ _minDaysInFirstWeek = ((Integer)states[3]).intValue();
+ _minDaysInFirstWeekSet = ((Boolean)states[4]).booleanValue();
+ }
}
16 years, 8 months
JBoss Rich Faces SVN: r8084 - trunk/ui/simpleTogglePanel/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-04-22 19:42:59 -0400 (Tue, 22 Apr 2008)
New Revision: 8084
Modified:
trunk/ui/simpleTogglePanel/src/main/resources/org/richfaces/renderkit/html/scripts/simpleTogglePanel.js
Log:
http://jira.jboss.com/jira/browse/RF-3140
Modified: trunk/ui/simpleTogglePanel/src/main/resources/org/richfaces/renderkit/html/scripts/simpleTogglePanel.js
===================================================================
--- trunk/ui/simpleTogglePanel/src/main/resources/org/richfaces/renderkit/html/scripts/simpleTogglePanel.js 2008-04-22 22:39:25 UTC (rev 8083)
+++ trunk/ui/simpleTogglePanel/src/main/resources/org/richfaces/renderkit/html/scripts/simpleTogglePanel.js 2008-04-22 23:42:59 UTC (rev 8084)
@@ -113,12 +113,14 @@
if(!parentForm || !parentForm.appendChild /* findForm returns surrogate form object */) return;
var thePanel = this.panels.get(clientId);
+ var element = $(clientId);
+
if (thePanel.status == "true") {
- if (thePanel.invokeEvent("collapse",event,"true",fInput)) {
+ if (thePanel.invokeEvent("collapse",event,"true",element)) {
thePanel.status="false";
}
} else {
- if (thePanel.invokeEvent("expand",event,"false",fInput)) {
+ if (thePanel.invokeEvent("expand",event,"false",element)) {
thePanel.status="true";
}
}
16 years, 8 months
JBoss Rich Faces SVN: r8083 - in trunk/ui/modal-panel/src/main: templates/org/richfaces and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-04-22 18:39:25 -0400 (Tue, 22 Apr 2008)
New Revision: 8083
Modified:
trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/css/modalPanel.xcss
trunk/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx
Log:
http://jira.jboss.com/jira/browse/RF-2277
Modified: trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/css/modalPanel.xcss
===================================================================
--- trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/css/modalPanel.xcss 2008-04-22 21:27:39 UTC (rev 8082)
+++ trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/css/modalPanel.xcss 2008-04-22 22:39:25 UTC (rev 8083)
@@ -50,10 +50,17 @@
z-index: 5;
}
- .dr-mpnl-pnl-a {
+ .dr-mpnl-pnl-button {
outline-style: none;
position: absolute;
- left: -32000px;
+ border: 10px solid red;
+ position: absolute;
+ clip: rect(0px 0px 1px 1px);
+ height: 10px;
+ width: 10px;
+ left: 0px;
+ top: 0px;
+ z-index: -300;
}
.rich-mpnl-controls {
Modified: trunk/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx
===================================================================
--- trunk/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx 2008-04-22 21:27:39 UTC (rev 8082)
+++ trunk/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx 2008-04-22 22:39:25 UTC (rev 8083)
@@ -50,7 +50,7 @@
onmouseover="#{component.attributes['onmaskmouseover']}"
onmouseout="#{component.attributes['onmaskmouseout']}">
- <a href="#" class="dr-mpnl-pnl-a" id="#{clientId}FirstHref">_</a>
+ <button class="dr-mpnl-pnl-button" id="#{clientId}FirstHref"></button>
</div>
<div id="#{clientId}CDiv" class="dr-mpnl-panel rich-mpnl_panel" >
@@ -151,7 +151,7 @@
<div class="dr-mpnl-mask-div rich-mpnl-mask-div" id="#{clientId}CursorDiv"
style="filter: alpha(opacity=1); z-index: -200">
- <a href="#" class="dr-mpnl-pnl-a" id="#{clientId}LastHref">_</a>
+ <button class="dr-mpnl-pnl-button" id="#{clientId}LastHref"></button>
</div>
<script type="text/javascript">
16 years, 8 months
JBoss Rich Faces SVN: r8081 - trunk/ui/combobox/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: sergeyhalipov
Date: 2008-04-22 14:44:03 -0400 (Tue, 22 Apr 2008)
New Revision: 8081
Modified:
trunk/ui/combobox/src/main/config/component/combobox.xml
Log:
http://jira.jboss.com/jira/browse/RF-3172
Modified: trunk/ui/combobox/src/main/config/component/combobox.xml
===================================================================
--- trunk/ui/combobox/src/main/config/component/combobox.xml 2008-04-22 18:28:57 UTC (rev 8080)
+++ trunk/ui/combobox/src/main/config/component/combobox.xml 2008-04-22 18:44:03 UTC (rev 8081)
@@ -287,6 +287,10 @@
<property hidden="true" existintag="false" exist="false" >
<name>valid</name>
<classname>boolean</classname>
+ </property>
+ <property hidden="true" existintag="false" exist="false" >
+ <name>alt</name>
+ <classname>java.lang.String</classname>
</property>
</properties>
</component>
16 years, 8 months