Revision: 11648
http://wonder.svn.sourceforge.net/wonder/?rev=11648&view=rev
Author: mschrag
Date: 2010-10-29 16:30:18 +0000 (Fri, 29 Oct 2010)
Log Message:
-----------
5.2/5.4 stuff ... i think i got all of them
Modified Paths:
--------------
branches/Wonder_2_0_0_Branch/Wonder/Ajax/Ajax/Sources/er/ajax/AjaxFlexibleFileUpload.java
branches/Wonder_2_0_0_Branch/Wonder/Ajax/Ajax/Sources/er/ajax/AjaxGrid.java
branches/Wonder_2_0_0_Branch/Wonder/Ajax/Ajax/Sources/er/ajax/AjaxOption.java
Modified: branches/Wonder_2_0_0_Branch/Wonder/Ajax/Ajax/Sources/er/ajax/AjaxFlexibleFileUpload.java
===================================================================
--- branches/Wonder_2_0_0_Branch/Wonder/Ajax/Ajax/Sources/er/ajax/AjaxFlexibleFileUpload.java 2010-10-29 16:04:03 UTC (rev 11647)
+++ branches/Wonder_2_0_0_Branch/Wonder/Ajax/Ajax/Sources/er/ajax/AjaxFlexibleFileUpload.java 2010-10-29 16:30:18 UTC (rev 11648)
@@ -137,8 +137,8 @@
*
* @return array of required additional AjaxUpload data items (wosid, id).
*/
- protected NSArray<String> _ajaxUploadData() {
- NSMutableArray<String> _data = new NSMutableArray<String>("wosid:'" + this.session().sessionID() + "'");
+ protected NSArray/*<String>*/ _ajaxUploadData() {
+ NSMutableArray/*<String>*/ _data = new NSMutableArray/*<String>*/("wosid:'" + this.session().sessionID() + "'");
_data.addObject("id:'" + id() + "'");
@@ -159,8 +159,8 @@
*
* @return array of AjaxUpload options
*/
- protected NSArray<String> _ajaxUploadOptions() {
- NSMutableArray<String> _options = new NSMutableArray<String>("action:'" + uploadUrl() + "'");
+ protected NSArray/*<String>*/ _ajaxUploadOptions() {
+ NSMutableArray/*<String>*/ _options = new NSMutableArray/*<String>*/("action:'" + uploadUrl() + "'");
// add options
_options.addObject("data:{" + ajaxUploadData() + "}");
@@ -787,4 +787,4 @@
}
return _clearButtonClass;
}
-}
\ No newline at end of file
+}
Modified: branches/Wonder_2_0_0_Branch/Wonder/Ajax/Ajax/Sources/er/ajax/AjaxGrid.java
===================================================================
--- branches/Wonder_2_0_0_Branch/Wonder/Ajax/Ajax/Sources/er/ajax/AjaxGrid.java 2010-10-29 16:04:03 UTC (rev 11647)
+++ branches/Wonder_2_0_0_Branch/Wonder/Ajax/Ajax/Sources/er/ajax/AjaxGrid.java 2010-10-29 16:30:18 UTC (rev 11648)
@@ -853,7 +853,7 @@
* if it is not part of the sort order
*/
public int currentColumnSortIndex() {
- return isCurrentColumnSorted() ? sortOrders().indexOf(currentColumnSortOrder()) + 1 : -1;
+ return isCurrentColumnSorted() ? sortOrders().indexOfObject(currentColumnSortOrder()) + 1 : -1;
}
/**
@@ -1061,4 +1061,4 @@
}
return Boolean.parseBoolean((String)configurationData().objectForKey(CHECK_HASH_CODES));
}
-}
\ No newline at end of file
+}
Modified: branches/Wonder_2_0_0_Branch/Wonder/Ajax/Ajax/Sources/er/ajax/AjaxOption.java
===================================================================
--- branches/Wonder_2_0_0_Branch/Wonder/Ajax/Ajax/Sources/er/ajax/AjaxOption.java 2010-10-29 16:04:03 UTC (rev 11647)
+++ branches/Wonder_2_0_0_Branch/Wonder/Ajax/Ajax/Sources/er/ajax/AjaxOption.java 2010-10-29 16:30:18 UTC (rev 11648)
@@ -114,7 +114,7 @@
}
public static NSMutableDictionary/*<String, String>*/ createAjaxOptionsDictionary(NSArray/*<AjaxOption>*/ ajaxOptions, WOComponent component) {
- NSMutableDictionary<String, String> optionsDictionary = new NSMutableDictionary/*<String, String>*/();
+ NSMutableDictionary/*<String, String>*/ optionsDictionary = new NSMutableDictionary/*<String, String>*/();
/*for (AjaxOption ajaxOption : ajaxOptions) {*/
for (Enumeration optionsEnum = ajaxOptions.objectEnumerator(); optionsEnum.hasMoreElements();) {
AjaxOption ajaxOption = (AjaxOption)optionsEnum.nextElement();
@@ -123,7 +123,7 @@
return optionsDictionary;
}
- public static NSMutableDictionary<String, String> createAjaxOptionsDictionary(NSArray/*<AjaxOption>*/ ajaxOptions, WOComponent component, NSDictionary/*<String, ? extends WOAssociation>*/ associations) {
+ public static NSMutableDictionary/*<String, String>*/ createAjaxOptionsDictionary(NSArray/*<AjaxOption>*/ ajaxOptions, WOComponent component, NSDictionary/*<String, ? extends WOAssociation>*/ associations) {
NSMutableDictionary/*<String, String>*/ optionsDictionary = new NSMutableDictionary/*<String, String>*/();
/*for (AjaxOption ajaxOption : ajaxOptions) {*/
for (Enumeration optionsEnum = ajaxOptions.objectEnumerator(); optionsEnum.hasMoreElements();) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|