Author: smartini
Date: Mon Nov 12 11:30:15 2012
New Revision: 1408247
URL: http://svn.apache.org/viewvc?rev=1408247&view=rev
Log:
PIVOT-880, update the test case, and add an additional constructor in
FileBrowserSheet (like the same in FileBrowser)
Modified:
pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/pivot_880.bxml
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/FileBrowserSheet.java
Modified:
pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/pivot_880.bxml
URL:
http://svn.apache.org/viewvc/pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/pivot_880.bxml?rev=1408247&r1=1408246&r2=1408247&view=diff
==============================================================================
--- pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/pivot_880.bxml
(original)
+++ pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/pivot_880.bxml
Mon Nov 12 11:30:15 2012
@@ -37,15 +37,17 @@ limitations under the License.
System.out.println("bxmlSerializer is " + bxmlSerializer);
function openFileBrowser(root) {
- System.out.println("Opening FileBrowser with the given folder \"" + root +
"\" as root");
+ System.out.println("Opening FileBrowserSheet with the given folder \"" +
root + "\" as root");
var fileBrowser = null;
if (root == undefined || root == null || root.length < 1)
fileBrowser = new FileBrowserSheet();
else {
// fileBrowser = new FileBrowserSheet(FileBrowserSheet.Mode.OPEN,
root); // ok in Java, but not from JavaScript ...
- fileBrowser = new FileBrowserSheet();
- fileBrowser.setRootFolder(root);
+ // fileBrowser = new FileBrowserSheet();
+ // fileBrowser.setRootFolder(root);
+ // using the new constructor in FileBrowserSheet
+ fileBrowser = new FileBrowserSheet(root);
}
fileBrowser.open(window, null);
@@ -62,12 +64,13 @@ function openFileBrowser(root) {
</columns>
<TablePane.Row height="-1">
<FlowPane styles="{padding:2, alignToBaseline:true}">
- <TextInput bxml:id="textInput" text="\\server\share"
textSize="30"/>
+ <TextInput bxml:id="textInput" prompt="Write here the
\\server\share to open" textSize="30"/>
<Label text=" "/>
<PushButton bxml:id="selectFolderButton" buttonData="Open
Folder">
<buttonPressListeners>
function buttonPressed(button) {
- openFileBrowser(textInput.text);
+ if (textInput.text.length() > 0)
+ openFileBrowser(textInput.text);
}
</buttonPressListeners>
</PushButton>
Modified:
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/FileBrowserSheet.java
URL:
http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/FileBrowserSheet.java?rev=1408247&r1=1408246&r2=1408247&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/FileBrowserSheet.java
(original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/FileBrowserSheet.java Mon
Nov 12 11:30:15 2012
@@ -110,6 +110,19 @@ public class FileBrowserSheet extends Sh
/**
* Creates a new FileBrowserSheet
* <p>
+ * Note that this version of the constructor can be used when a custom
root folder has to be set,
+ * and uses the default mode.
+ *
+ * @param rootFolder
+ * The root folder full name.
+ */
+ public FileBrowserSheet(String rootFolder) {
+ this(Mode.OPEN, rootFolder);
+ }
+
+ /**
+ * Creates a new FileBrowserSheet
+ * <p>
* Note that this version of the constructor must be used when a custom
root folder has to be set.
*
* @param mode
