You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by jk...@apache.org on 2007/03/25 04:55:04 UTC
svn commit: r522149 - in /tapestry/tapestry4/trunk: ./ tapestry-annotations/
tapestry-contrib/ tapestry-examples/TimeTracker/
tapestry-examples/Workbench/ tapestry-framework/
tapestry-framework/src/js/tapestry/form/ tapestry-portlet/
Author: jkuhnert
Date: Sat Mar 24 19:54:59 2007
New Revision: 522149
URL: http://svn.apache.org/viewvc?view=rev&rev=522149
Log:
Js formatting looked a little funky towards the bottom.
Modified:
tapestry/tapestry4/trunk/tapestry-annotations/tapestry-annotations.iml
tapestry/tapestry4/trunk/tapestry-contrib/tapestry-contrib.iml
tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/TimeTracker.iml
tapestry/tapestry4/trunk/tapestry-examples/Workbench/Workbench.iml
tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/form/validation.js
tapestry/tapestry4/trunk/tapestry-framework/tapestry-framework.iml
tapestry/tapestry4/trunk/tapestry-portlet/tapestry-portlet.iml
tapestry/tapestry4/trunk/tapestry.iml
tapestry/tapestry4/trunk/tapestry.ipr
tapestry/tapestry4/trunk/tapestry.iws
Modified: tapestry/tapestry4/trunk/tapestry-annotations/tapestry-annotations.iml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-annotations/tapestry-annotations.iml?view=diff&rev=522149&r1=522148&r2=522149
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-annotations/tapestry-annotations.iml (original)
+++ tapestry/tapestry4/trunk/tapestry-annotations/tapestry-annotations.iml Sat Mar 24 19:54:59 2007
@@ -11,7 +11,8 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="tapestry" />
+ <orderEntry type="module" module-name="tapestry" exported="" />
+ <orderEntry type="module" module-name="tapestry-framework" exported="" />
<orderEntry type="module-library" exported="">
<library name="Maven Dependency: backport-util-concurrent:backport-util-concurrent:jar:2.2:compile">
<CLASSES>
@@ -258,7 +259,6 @@
</SOURCES>
</library>
</orderEntry>
- <orderEntry type="module" module-name="tapestry-framework" />
<orderEntryProperties />
</component>
</module>
Modified: tapestry/tapestry4/trunk/tapestry-contrib/tapestry-contrib.iml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-contrib/tapestry-contrib.iml?view=diff&rev=522149&r1=522148&r2=522149
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-contrib/tapestry-contrib.iml (original)
+++ tapestry/tapestry4/trunk/tapestry-contrib/tapestry-contrib.iml Sat Mar 24 19:54:59 2007
@@ -12,6 +12,7 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="tapestry" />
+ <orderEntry type="module" module-name="tapestry-framework" />
<orderEntry type="module-library" exported="">
<library name="Maven Dependency: backport-util-concurrent:backport-util-concurrent:jar:2.2:compile">
<CLASSES>
@@ -267,7 +268,6 @@
</SOURCES>
</library>
</orderEntry>
- <orderEntry type="module" module-name="tapestry-framework" />
<orderEntryProperties />
</component>
</module>
Modified: tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/TimeTracker.iml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/TimeTracker.iml?view=diff&rev=522149&r1=522148&r2=522149
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/TimeTracker.iml (original)
+++ tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/TimeTracker.iml Sat Mar 24 19:54:59 2007
@@ -14,6 +14,9 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="tapestry" />
+ <orderEntry type="module" module-name="tapestry-annotations" />
+ <orderEntry type="module" module-name="tapestry-contrib" />
+ <orderEntry type="module" module-name="tapestry-framework" />
<orderEntry type="module-library">
<library>
<CLASSES>
@@ -337,9 +340,6 @@
</SOURCES>
</library>
</orderEntry>
- <orderEntry type="module" module-name="tapestry-annotations" />
- <orderEntry type="module" module-name="tapestry-contrib" />
- <orderEntry type="module" module-name="tapestry-framework" />
<orderEntryProperties />
</component>
<component name="WebModuleBuildComponent">
@@ -470,10 +470,6 @@
<attribute name="method" value="1" />
<attribute name="URI" value="/WEB-INF/lib/jboss-j2ee-4.0.2.jar" />
</containerElement>
- <containerElement type="library" name="Maven Dependency: jboss:jboss-j2ee:jar:4.0.2:provided" level="module">
- <attribute name="method" value="1" />
- <attribute name="URI" value="/WEB-INF/lib/jboss-j2ee-4.0.2.jar" />
- </containerElement>
<containerElement type="library" name="Maven Dependency: jcharts:jcharts:jar:0.6.0:compile" level="module">
<attribute name="method" value="0" />
<attribute name="URI" value="/WEB-INF/lib/jcharts-0.6.0.jar" />
@@ -490,10 +486,6 @@
<attribute name="method" value="1" />
<attribute name="URI" value="/WEB-INF/lib/junit-3.8.1.jar" />
</containerElement>
- <containerElement type="library" name="Maven Dependency: junit:junit:jar:3.8.1:provided" level="module">
- <attribute name="method" value="1" />
- <attribute name="URI" value="/WEB-INF/lib/junit-3.8.1.jar" />
- </containerElement>
<containerElement type="library" name="Maven Dependency: junit:junit:jar:3.8.1:test" level="module">
<attribute name="method" value="0" />
<attribute name="URI" value="/WEB-INF/lib/junit-3.8.1.jar" />
@@ -502,16 +494,8 @@
<attribute name="method" value="1" />
<attribute name="URI" value="/WEB-INF/lib/log4j-1.2.8.jar" />
</containerElement>
- <containerElement type="library" name="Maven Dependency: log4j:log4j:jar:1.2.8:test" level="module">
- <attribute name="method" value="1" />
- <attribute name="URI" value="/WEB-INF/lib/log4j-1.2.8.jar" />
- </containerElement>
<containerElement type="library" name="Maven Dependency: log4j:log4j:jar:1.2.9:compile" level="module">
<attribute name="method" value="0" />
- <attribute name="URI" value="/WEB-INF/lib/log4j-1.2.9.jar" />
- </containerElement>
- <containerElement type="library" name="Maven Dependency: log4j:log4j:jar:1.2.9:test" level="module">
- <attribute name="method" value="1" />
<attribute name="URI" value="/WEB-INF/lib/log4j-1.2.9.jar" />
</containerElement>
<containerElement type="library" name="Maven Dependency: log4j:log4j:jar:1.2.9:test" level="module">
Modified: tapestry/tapestry4/trunk/tapestry-examples/Workbench/Workbench.iml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/Workbench/Workbench.iml?view=diff&rev=522149&r1=522148&r2=522149
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-examples/Workbench/Workbench.iml (original)
+++ tapestry/tapestry4/trunk/tapestry-examples/Workbench/Workbench.iml Sat Mar 24 19:54:59 2007
@@ -16,6 +16,9 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="tapestry" />
+ <orderEntry type="module" module-name="tapestry-annotations" />
+ <orderEntry type="module" module-name="tapestry-contrib" />
+ <orderEntry type="module" module-name="tapestry-framework" />
<orderEntry type="module-library">
<library>
<CLASSES>
@@ -249,9 +252,6 @@
</SOURCES>
</library>
</orderEntry>
- <orderEntry type="module" module-name="tapestry-annotations" />
- <orderEntry type="module" module-name="tapestry-contrib" />
- <orderEntry type="module" module-name="tapestry-framework" />
<orderEntryProperties />
</component>
<component name="WebModuleBuildComponent">
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/form/validation.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/form/validation.js?view=diff&rev=522149&r1=522148&r2=522149
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/form/validation.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/form/validation.js Sat Mar 24 19:54:59 2007
@@ -6,111 +6,111 @@
dojo.require("tapestry.widget.AlertDialog");
tapestry.form.validation={
-
+
missingClass:"fieldMissing", // default css class that will be applied to fields missing a value
invalidClass:"fieldInvalid", // default css class applied to fields with invalid data
-
+
dialogName:"tapestry:AlertDialog",
-
+
/**
* Main entry point for running form validation. The
- * props object passed in contains a number of fields that
+ * props object passed in contains a number of fields that
* are managed by tapestry.form:
- *
+ *
* props = {
* validateForm:[true|false] // whether to run validation at all
* profiles:[profile1, profile2] // set of dojo.validate.check() style profiles
* // that may have been registered with form
* }
- *
+ *
* The individual profiles will contain any of the data described by the dojo documentation
* for dojo.validate.check(). In addition to that, each profile will also have a corresponding
* string message to display if the specified condition has been met. For example, if you have
* specified that a select field named "select1" was required your profile would look something
* like:
- *
+ *
* profile = {
* "required":["select1"], // normal dojo.validate.check data
* "select1":{ // tapestry field/error type specific data
* "required":"You must select a value for select1."
* }
* }
- *
+ *
* It is intended for you to call dojo.validate.check(form, profile) for each profile
* stored in the "profiles" field, as well as deciding how to display errors / warnings.
- *
+ *
* @return Boolean indicating if form submission should continue. If false the form
- * will ~not~ be submitted.
+ * will ~not~ be submitted.
*/
validateForm:function(form, props){
if (typeof form == "undefined") {return false;}
if (typeof props == "undefined") {return true;} // form exists but no profile? just submit I guess..
if (!props.validateForm) {return true;}
-
+
try {
this.clearValidationDecorations(form, props);
-
+
for (var i=0; i < props.profiles.length; i++) {
var results=dojo.validate.check(form, props.profiles[i]);
-
+
if (!this.processResults(form, results, props.profiles[i])) {
this.summarizeErrors(form, results, props.profiles[i]);
return false;
}
}
- } catch (e) {
- // since so many dynamic function calls may happen in here it's best that we
+ } catch (e) {
+ // since so many dynamic function calls may happen in here it's best that we
// catch all of them and log them or else peoples forms might still get submitted
// and they'd never be able to figure out what was wrong
dojo.log.exception("Error validating", e, true);
return false;
}
-
+
return true;
},
-
+
/**
- * Called for each registered profile on a form after
- * dojo.validate.check() has been called. This function is
+ * Called for each registered profile on a form after
+ * dojo.validate.check() has been called. This function is
* expected to do UI related notifications of fields in error.
- *
+ *
* @param form The form that was validated.
* @param results The result of calling dojo.validate.check(form,profile)
- * @param profile The original profile used to validate form, also holds
+ * @param profile The original profile used to validate form, also holds
* validation error messages to be used for each field.
- *
- * @return Boolean, if false form should not be submitted and all validation
+ *
+ * @return Boolean, if false form should not be submitted and all validation
* should be stopped. If true validation will continue and eventually
* form will be submitted.
*/
processResults:function(form, results, profile){
- if (results.isSuccessful()) { return true; }
-
+ if (results.isSuccessful()) { return true; }
+
var formValid=true;
if (results.hasMissing()) {
var missing=results.getMissing();
for (var i=0; i < missing.length; i++) {
this.handleMissingField(missing[i], profile);
}
-
+
formValid=false;
}
-
+
if (results.hasInvalid()) {
var invalid=results.getInvalid();
for (var i=0; i < invalid.length; i++) {
this.handleInvalidField(invalid[i], profile);
}
-
+
formValid=false;
}
-
+
return formValid; // if got past successful everything is invalid
},
-
+
/**
* Default field decorator for missing fields.
- *
+ *
* @param field The field element that was missing data.
* @param profile The form validation profile.
*/
@@ -118,15 +118,15 @@
field=dojo.byId(field);
if (dj_undef("type", field)) {return;}
dojo.html.removeClass(field, this.invalidClass);
-
+
if (!dojo.html.hasClass(field, this.missingClass)){
dojo.html.prependClass(field, this.missingClass);
}
},
-
+
/**
* Default field decorator for invalid fields.
- *
+ *
* @param field The field element that had invalid data.
* @param profile The form validation profile.
*/
@@ -134,41 +134,41 @@
field=dojo.byId(field);
if (dj_undef("type", field)) {return;}
dojo.html.removeClass(field, this.missingClass);
-
+
if (!dojo.html.hasClass(field, this.invalidClass)){
dojo.html.prependClass(field, this.invalidClass);
}
},
-
+
/**
- * Clears out previous css classes set on fields
+ * Clears out previous css classes set on fields
* in error.
*/
clearValidationDecorations:function(form, props){
for (var i=0; i< form.elements.length; i++) {
if (dj_undef("type", form.elements[i]) || typeof form.elements[i].type == "undefined"
- || form.elements[i].type == "submit"
+ || form.elements[i].type == "submit"
|| form.elements[i].type == "hidden") { continue; }
-
+
dojo.html.removeClass(form.elements[i], this.missingClass);
dojo.html.removeClass(form.elements[i], this.invalidClass);
}
},
-
+
/**
- * Optionally allows an alert dialog/dhtml dialog/etc to
+ * Optionally allows an alert dialog/dhtml dialog/etc to
* be displayed to user to alert them to the invalid state
- * of their form if validation errors have occurred.
- *
+ * of their form if validation errors have occurred.
+ *
* @param form The form being validated.
* @param results Returned value of dojo.validate.check(form, profile)
- * @param profile Validation profile definition
+ * @param profile Validation profile definition
*/
summarizeErrors:function(form, results, profile){
var merrs=[];
var ierrs=[];
tapestry.form.currentFocus=null;
-
+
if (results.hasMissing()){
var fields=results.getMissing();
for (var i=0; i<fields.length; i++){
@@ -199,7 +199,7 @@
}
}
}
-
+
var msg="";
if (merrs.length > 0) {
msg+='<ul class="missingList">';
@@ -215,55 +215,57 @@
}
msg+="</ul>";
}
-
+
var ad=dojo.widget.byId("validationDialog");
if (ad) {
ad.setMessage(msg);
ad.show();
return;
}
-
+
var node=document.createElement("span");
document.body.appendChild(node);
- var dialog=dojo.widget.createWidget(this.dialogName,
+ var dialog=dojo.widget.createWidget(this.dialogName,
{
widgetId:"validationDialog",
message:msg
}, node);
dialog.show();
},
-
+
/**
- * Validates that the input value matches the given
+ * Validates that the input value matches the given
* regexp pattern.
- *
+ *
* @param value The string value to be evaluated.
* @param pattern The regexp pattern used to match against value.
*/
isValidPattern:function(value, pattern){
if (typeof value != "string" || typeof pattern != "string") { return false; }
-
+
var re = new RegExp(pattern);
return re.test(value);
},
-
+
isPalleteSelected:function(elem){
if (elem.length > 0) { return true; }
return false;
},
- /**
- * Validates that the input value is equal with the value of the given input control.
- */
- isEqual:function(value, other) {
- var otherValue = dojo.byId(other).value;
- return value == otherValue;
- },
-
- /**
- * Validates that the input value is not equal with the value of the given input control.
- */
- isNotEqual:function(value, other) {
- return !tapestry.form.validation.isEqual(value, other);
- }
+ /**
+ * Validates that the input value is equal with the value of the given input control.
+ */
+ isEqual:function(value, other)
+ {
+ var otherValue = dojo.byId(other).value;
+ return value == otherValue;
+ },
+
+ /**
+ * Validates that the input value is not equal with the value of the given input control.
+ */
+ isNotEqual:function(value, other)
+ {
+ return !tapestry.form.validation.isEqual(value, other);
+ }
}
Modified: tapestry/tapestry4/trunk/tapestry-framework/tapestry-framework.iml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/tapestry-framework.iml?view=diff&rev=522149&r1=522148&r2=522149
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/tapestry-framework.iml (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/tapestry-framework.iml Sat Mar 24 19:54:59 2007
@@ -327,14 +327,14 @@
</SOURCES>
</library>
</orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="Maven Dependency: org.openqa.selenium.server:selenium-server:jar:0.9.1-SNAPSHOT:test">
+ <orderEntry type="module-library">
+ <library name="Maven Dependency: org.openqa.selenium.server:selenium-server:jar:standalone:0.9.1-SNAPSHOT:test">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/openqa/selenium/server/selenium-server/0.9.1-SNAPSHOT/selenium-server-0.9.1-SNAPSHOT.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/openqa/selenium/server/selenium-server/0.9.1-SNAPSHOT/selenium-server-0.9.1-SNAPSHOT-standalone.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/openqa/selenium/server/selenium-server/0.9.1-SNAPSHOT/selenium-server-0.9.1-SNAPSHOT-sources.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/openqa/selenium/server/selenium-server/0.9.1-SNAPSHOT/selenium-server-0.9.1-SNAPSHOT-standalone-sources.jar!/" />
</SOURCES>
</library>
</orderEntry>
Modified: tapestry/tapestry4/trunk/tapestry-portlet/tapestry-portlet.iml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-portlet/tapestry-portlet.iml?view=diff&rev=522149&r1=522148&r2=522149
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-portlet/tapestry-portlet.iml (original)
+++ tapestry/tapestry4/trunk/tapestry-portlet/tapestry-portlet.iml Sat Mar 24 19:54:59 2007
@@ -13,6 +13,7 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="tapestry" />
+ <orderEntry type="module" module-name="tapestry-framework" />
<orderEntry type="module-library">
<library name="Maven Dependency: backport-util-concurrent:backport-util-concurrent:jar:2.2:compile">
<CLASSES>
@@ -277,7 +278,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module" module-name="tapestry-framework" />
<orderEntryProperties />
</component>
</module>
Modified: tapestry/tapestry4/trunk/tapestry.iml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry.iml?view=diff&rev=522149&r1=522148&r2=522149
==============================================================================
--- tapestry/tapestry4/trunk/tapestry.iml (original)
+++ tapestry/tapestry4/trunk/tapestry.iml Sat Mar 24 19:54:59 2007
@@ -45,6 +45,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="tapestry-annotations" exported="" />
<orderEntry type="module-library" exported="">
<library name="Maven Dependency: ant:ant:jar:1.6.5:test">
<CLASSES>
@@ -422,13 +423,13 @@
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="Maven Dependency: org.openqa.selenium.server:selenium-server:jar:0.9.1-SNAPSHOT:test">
+ <library name="Maven Dependency: org.openqa.selenium.server:selenium-server:jar:standalone:0.9.1-SNAPSHOT:test">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../.m2/repository/org/openqa/selenium/server/selenium-server/0.9.1-SNAPSHOT/selenium-server-0.9.1-SNAPSHOT.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../.m2/repository/org/openqa/selenium/server/selenium-server/0.9.1-SNAPSHOT/selenium-server-0.9.1-SNAPSHOT-standalone.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/../../.m2/repository/org/openqa/selenium/server/selenium-server/0.9.1-SNAPSHOT/selenium-server-0.9.1-SNAPSHOT-sources.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../.m2/repository/org/openqa/selenium/server/selenium-server/0.9.1-SNAPSHOT/selenium-server-0.9.1-SNAPSHOT-standalone-sources.jar!/" />
</SOURCES>
</library>
</orderEntry>
Modified: tapestry/tapestry4/trunk/tapestry.ipr
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry.ipr?view=diff&rev=522149&r1=522148&r2=522149
==============================================================================
--- tapestry/tapestry4/trunk/tapestry.ipr (original)
+++ tapestry/tapestry4/trunk/tapestry.ipr Sat Mar 24 19:54:59 2007
@@ -13,11 +13,12 @@
<component name="CodeStyleSettingsManager">
<option name="PER_PROJECT_SETTINGS">
<value>
+ <option name="METHOD_BRACE_STYLE" value="2" />
<option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
<option name="ALIGN_MULTILINE_PARENTHESIZED_EXPRESSION" value="true" />
</value>
</option>
- <option name="USE_PER_PROJECT_SETTINGS" value="false" />
+ <option name="USE_PER_PROJECT_SETTINGS" value="true" />
</component>
<component name="CompilerConfiguration">
<option name="DEFAULT_COMPILER" value="Javac" />
@@ -175,6 +176,7 @@
<value>
<collection type="java.util.TreeSet">
<entry type="java.lang.String" value="tapestry" />
+ <entry type="java.lang.String" value="tapestry-annotations" />
</collection>
</value>
<key type="java.lang.String" value="TimeTracker" />
@@ -183,9 +185,18 @@
<value>
<collection type="java.util.TreeSet">
<entry type="java.lang.String" value="tapestry" />
+ <entry type="java.lang.String" value="tapestry-annotations" />
</collection>
</value>
<key type="java.lang.String" value="Workbench" />
+ </entry>
+ <entry>
+ <value>
+ <collection type="java.util.TreeSet">
+ <entry type="java.lang.String" value="tapestry-annotations" />
+ </collection>
+ </value>
+ <key type="java.lang.String" value="tapestry" />
</entry>
<entry>
<value>
Modified: tapestry/tapestry4/trunk/tapestry.iws
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry.iws?view=diff&rev=522149&r1=522148&r2=522149
==============================================================================
--- tapestry/tapestry4/trunk/tapestry.iws (original)
+++ tapestry/tapestry4/trunk/tapestry.iws Sat Mar 24 19:54:59 2007
@@ -18,16 +18,14 @@
<component name="ChangeListManager">
<list default="true" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry.iws" afterPath="$PROJECT_DIR$/tapestry.iws" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/AbstractComponent.java" afterPath="$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/AbstractComponent.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/form/translator/DateTranslator.java" afterPath="$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/form/translator/DateTranslator.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry-annotations/tapestry-annotations.iml" afterPath="$PROJECT_DIR$/tapestry-annotations/tapestry-annotations.iml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry-contrib/tapestry-contrib.iml" afterPath="$PROJECT_DIR$/tapestry-contrib/tapestry-contrib.iml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry-framework/tapestry-framework.iml" afterPath="$PROJECT_DIR$/tapestry-framework/tapestry-framework.iml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry.ipr" afterPath="$PROJECT_DIR$/tapestry.ipr" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry-framework/src/js/tapestry/form/validation.js" afterPath="$PROJECT_DIR$/tapestry-framework/src/js/tapestry/form/validation.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry-examples/TimeTracker/TimeTracker.iml" afterPath="$PROJECT_DIR$/tapestry-examples/TimeTracker/TimeTracker.iml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry-examples/Workbench/Workbench.iml" afterPath="$PROJECT_DIR$/tapestry-examples/Workbench/Workbench.iml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/dojo/form/DropdownDatePicker.java" afterPath="$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/dojo/form/DropdownDatePicker.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry-framework/src/test/org/apache/tapestry/dojo/form/TestDropdownTimePicker.java" afterPath="$PROJECT_DIR$/tapestry-framework/src/test/org/apache/tapestry/dojo/form/TestDropdownTimePicker.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/form/translator/FormatTranslator.java" afterPath="$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/form/translator/FormatTranslator.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry-contrib/tapestry-contrib.iml" afterPath="$PROJECT_DIR$/tapestry-contrib/tapestry-contrib.iml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/dojo/form/DropdownTimePicker.java" afterPath="$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/dojo/form/DropdownTimePicker.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry.iml" afterPath="$PROJECT_DIR$/tapestry.iml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry-portlet/tapestry-portlet.iml" afterPath="$PROJECT_DIR$/tapestry-portlet/tapestry-portlet.iml" />
</list>
</component>
@@ -151,7 +149,17 @@
</subPane>
</component>
<component name="FileEditorManager">
- <leaf />
+ <leaf>
+ <file leaf-file-name="validation.js" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/tapestry-framework/src/js/tapestry/form/validation.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="170" column="0" selection-start="5737" selection-end="5737" vertical-scroll-proportion="0.16950597">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ </leaf>
</component>
<component name="FindManager">
<FindUsagesManager>
@@ -224,7 +232,7 @@
<showLibraryContents />
<hideEmptyPackages />
<abbreviatePackageNames />
- <showStructure Favorites="false" ProjectPane="false" Scope="false" PackagesPane="false" />
+ <showStructure PackagesPane="false" ProjectPane="false" Scope="false" Favorites="false" />
<autoscrollToSource />
<autoscrollFromSource />
<sortByType />
@@ -235,20 +243,112 @@
<property name="TEMP_MODULE_EXPLODED_DIR_FOR_Workbench" value="/tmp/webExplodedDir16585tmp" />
<property name="GoToClass.toSaveIncludeLibraries" value="false" />
<property name="TEMP_MODULE_EXPLODED_DIR_FOR_TimeTracker" value="/tmp/webExplodedDir16584tmp" />
- <property name="RunManagerConfig.showSettingsBeforeRunnig" value="false" />
<property name="RunManagerConfig.compileBeforeRunning" value="true" />
+ <property name="RunManagerConfig.showSettingsBeforeRunnig" value="false" />
<property name="MemberChooser.sorted" value="false" />
<property name="MemberChooser.showClasses" value="true" />
<property name="GoToClass.includeLibraries" value="false" />
- <property name="GoToClass.includeJavaFiles" value="false" />
<property name="Web Module Deployment Descriptor Default Version" value="2.3" />
+ <property name="GoToClass.includeJavaFiles" value="false" />
<property name="MemberChooser.copyJavadoc" value="false" />
</component>
<component name="ReadonlyStatusHandler">
<option name="SHOW_DIALOG" value="true" />
</component>
<component name="RecentsManager" />
- <component name="RestoreUpdateTree" />
+ <component name="RestoreUpdateTree">
+ <UpdateInfo date="3/24/07 9:51 PM" ActionInfo="_Update">
+ <UpdatedFiles>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Updated from server" />
+ <option name="myStatusName" value="Changed on server" />
+ <option name="mySupportsDeletion" value="false" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="CHANGED_ON_SERVER" />
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Updated" />
+ <option name="myStatusName" value="Changed" />
+ <option name="mySupportsDeletion" value="false" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="UPDATED" />
+ <PATH>$PROJECT_DIR$/tapestry-examples/TimeTracker/src/java/org/apache/tapestry/timetracker/page/TaskEntryPage.java</PATH>
+ <PATH>$PROJECT_DIR$/tapestry-examples/TimeTracker/src/context/Home.html</PATH>
+ <PATH>$PROJECT_DIR$/tapestry-framework/src/js/tapestry/form/validation.js</PATH>
+ </FILE-GROUP>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Created" />
+ <option name="myStatusName" value="Created" />
+ <option name="mySupportsDeletion" value="false" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="CREATED" />
+ </FILE-GROUP>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Deleted" />
+ <option name="myStatusName" value="Deleted" />
+ <option name="mySupportsDeletion" value="false" />
+ <option name="myCanBeAbsent" value="true" />
+ <option name="myId" value="REMOVED_FROM_REPOSITORY" />
+ </FILE-GROUP>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Restored" />
+ <option name="myStatusName" value="Will be restored" />
+ <option name="mySupportsDeletion" value="false" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="RESTORED" />
+ </FILE-GROUP>
+ </FILE-GROUP>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Modified" />
+ <option name="myStatusName" value="Modified" />
+ <option name="mySupportsDeletion" value="false" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="MODIFIED" />
+ </FILE-GROUP>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Skipped" />
+ <option name="myStatusName" value="Skipped" />
+ <option name="mySupportsDeletion" value="false" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="SKIPPED" />
+ </FILE-GROUP>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Merged with conflicts" />
+ <option name="myStatusName" value="Will be merged with conflicts" />
+ <option name="mySupportsDeletion" value="false" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="MERGED_WITH_CONFLICTS" />
+ </FILE-GROUP>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Merged" />
+ <option name="myStatusName" value="Will be merged" />
+ <option name="mySupportsDeletion" value="false" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="MERGED" />
+ </FILE-GROUP>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Not in repository" />
+ <option name="myStatusName" value="Not in repository" />
+ <option name="mySupportsDeletion" value="true" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="UNKNOWN" />
+ </FILE-GROUP>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Locally added" />
+ <option name="myStatusName" value="Locally added" />
+ <option name="mySupportsDeletion" value="false" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="LOCALLY_ADDED" />
+ </FILE-GROUP>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Locally removed" />
+ <option name="myStatusName" value="Locally removed" />
+ <option name="mySupportsDeletion" value="false" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="LOCALLY_REMOVED" />
+ </FILE-GROUP>
+ </UpdatedFiles>
+ </UpdateInfo>
+ </component>
<component name="RunManager" selected="TestNG.TestDropdownTimePicker">
<tempConfiguration default="false" name="TestDropdownTimePicker" type="TestNG" factoryName="TestNG" enabled="false" merge="false">
<module name="tapestry-framework" />
@@ -276,22 +376,17 @@
<option name="Make" value="true" />
</method>
</tempConfiguration>
- <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false">
+ <configuration default="true" type="Applet" factoryName="Applet">
+ <module name="" />
<option name="MAIN_CLASS_NAME" />
+ <option name="HTML_FILE_NAME" />
+ <option name="HTML_USED" value="false" />
+ <option name="WIDTH" value="400" />
+ <option name="HEIGHT" value="300" />
+ <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
<option name="VM_PARAMETERS" />
- <option name="PROGRAM_PARAMETERS" />
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
- <option name="ENABLE_SWING_INSPECTOR" value="false" />
- <module name="" />
- </configuration>
- <configuration default="true" type="Remote" factoryName="Remote">
- <option name="USE_SOCKET_TRANSPORT" value="true" />
- <option name="SERVER_MODE" value="false" />
- <option name="SHMEM_ADDRESS" value="javadebug" />
- <option name="HOST" value="localhost" />
- <option name="PORT" value="5005" />
</configuration>
<configuration default="true" type="TestNG" factoryName="TestNG" enabled="false" merge="false">
<module name="" />
@@ -317,6 +412,13 @@
<option name="Make" value="true" />
</method>
</configuration>
+ <configuration default="true" type="Remote" factoryName="Remote">
+ <option name="USE_SOCKET_TRANSPORT" value="true" />
+ <option name="SERVER_MODE" value="false" />
+ <option name="SHMEM_ADDRESS" value="javadebug" />
+ <option name="HOST" value="localhost" />
+ <option name="PORT" value="5005" />
+ </configuration>
<configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false">
<module name="" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
@@ -333,17 +435,15 @@
<value defaultName="wholeProject" />
</option>
</configuration>
- <configuration default="true" type="Applet" factoryName="Applet">
- <module name="" />
+ <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false">
<option name="MAIN_CLASS_NAME" />
- <option name="HTML_FILE_NAME" />
- <option name="HTML_USED" value="false" />
- <option name="WIDTH" value="400" />
- <option name="HEIGHT" value="300" />
- <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
<option name="VM_PARAMETERS" />
+ <option name="PROGRAM_PARAMETERS" />
+ <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
+ <option name="ENABLE_SWING_INSPECTOR" value="false" />
+ <module name="" />
</configuration>
<configuration name="<template>" type="WebApp" default="true" selected="false">
<Host>localhost</Host>
@@ -416,7 +516,7 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="116" y="135" width="2112" height="1362" extended-state="0" />
+ <frame x="84" y="159" width="2112" height="1362" extended-state="0" />
<editor active="false" />
<layout>
<window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
@@ -435,7 +535,7 @@
<window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
<window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
<window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
- <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.21957156" order="0" />
+ <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.22005843" order="0" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="2" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="6" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25892118" order="2" />
@@ -460,7 +560,7 @@
<option name="PERFORM_COMMIT_IN_BACKGROUND" value="false" />
<option name="PUT_FOCUS_INTO_COMMENT" value="false" />
<option name="FORCE_NON_EMPTY_COMMENT" value="false" />
- <option name="LAST_COMMIT_MESSAGE" value="Fixes TAPESTRY-1378. The dropdown Date/Time pickers had specific java.util.Date bindings that made it impossible to use any other date objects (like Joda ). Refactored these components and the associated DateTranslator to make it possible to substitute the less well liked Date object with something else.." />
+ <option name="LAST_COMMIT_MESSAGE" value="Js formatting looked a little funky towards the bottom." />
<option name="SAVE_LAST_COMMIT_MESSAGE" value="true" />
<option name="CHECKIN_DIALOG_SPLITTER_PROPORTION" value="0.8" />
<option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="true" />
@@ -473,7 +573,6 @@
<option name="UPDATE_GROUP_BY_PACKAGES" value="false" />
<option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
<option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
- <MESSAGE value="Cleaned up shared idea properties." />
<MESSAGE value="Minor code cleanup, removal of old .cvsignore properties." />
<MESSAGE value="Fixes for TAPESTRY-838. Exposed listener method name targeted for invocation in IActionListener / ListenerInvoker." />
<MESSAGE value="Minor code cleanup. Fixed Palette documentation by removing funky character causing td definitions." />
@@ -483,6 +582,7 @@
<MESSAGE value="Fixes TAPESTRY-996. RequestLocaleManager was being extremely picky about incoming locale requests matching filtered locales if the filtered list didn't contain exact matches when the original filter list has country/language specific listings only." />
<MESSAGE value="Minor coide cleanups. Removed unused / deprecated for 4.1 interface." />
<MESSAGE value="Fixes TAPESTRY-1378. The dropdown Date/Time pickers had specific java.util.Date bindings that made it impossible to use any other date objects (like Joda ). Refactored these components and the associated DateTranslator to make it possible to substitute the less well liked Date object with something else.." />
+ <MESSAGE value="Js formatting looked a little funky towards the bottom." />
</component>
<component name="antWorkspaceConfiguration">
<option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
@@ -499,13 +599,6 @@
<option name="myLastEditedConfigurable" value="Project Default" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/form/TranslatedField.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="25" column="15" selection-start="806" selection-end="806" vertical-scroll-proportion="0.1660988">
- <folding />
- </state>
- </provider>
- </entry>
<entry file="jar:///usr/local/jdk1.6.0/src.zip!/java/text/Format.java">
<provider selected="true" editor-type-id="text-editor">
<state line="160" column="33" selection-start="6506" selection-end="6506" vertical-scroll-proportion="0.33304942">
@@ -600,6 +693,13 @@
<entry file="file://$PROJECT_DIR$/tapestry-examples/TimeTracker/src/java/org/apache/tapestry/timetracker/servlet/ConfigurationServlet.java">
<provider selected="true" editor-type-id="text-editor">
<state line="27" column="4" selection-start="1010" selection-end="1010" vertical-scroll-proportion="0.14054514">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/tapestry-framework/src/js/tapestry/form/validation.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="170" column="0" selection-start="5737" selection-end="5737" vertical-scroll-proportion="0.16950597">
<folding />
</state>
</provider>