You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by gb...@apache.org on 2010/02/02 22:44:50 UTC
svn commit: r905806 - in /pivot/trunk: core/src/org/apache/pivot/sql/
tutorials/src/org/apache/pivot/tutorials/filebrowsing/
web-server/src/org/apache/pivot/web/server/
wtk-terra/src/org/apache/pivot/wtk/skin/terra/
Author: gbrown
Date: Tue Feb 2 21:44:50 2010
New Revision: 905806
URL: http://svn.apache.org/viewvc?rev=905806&view=rev
Log:
Add support for Date type to ResultList; add support for specifying new file name to FileBrowserSheet.
Modified:
pivot/trunk/core/src/org/apache/pivot/sql/ResultList.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/filebrowsing/FileBrowsing.java
pivot/trunk/web-server/src/org/apache/pivot/web/server/QueryServlet.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.java
Modified: pivot/trunk/core/src/org/apache/pivot/sql/ResultList.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/sql/ResultList.java?rev=905806&r1=905805&r2=905806&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/sql/ResultList.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/sql/ResultList.java Tue Feb 2 21:44:50 2010
@@ -19,6 +19,7 @@
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.Comparator;
+import java.util.Date;
import java.util.NoSuchElementException;
import org.apache.pivot.collections.ArrayList;
@@ -160,6 +161,8 @@
value = resultSet.getDouble(field.columnName);
} else if (field.type == String.class) {
value = resultSet.getString(field.columnName);
+ } else if (field.type == Date.class) {
+ value = resultSet.getDate(field.columnName);
} else {
value = resultSet.getObject(field.columnName);
}
@@ -257,6 +260,7 @@
|| field.type == Float.TYPE
|| field.type == Double.class
|| field.type == Double.TYPE
+ || field.type == Date.class
|| field.type == String.class)) {
throw new IllegalArgumentException(field.type.getName()
+ " is not a supported type.");
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/filebrowsing/FileBrowsing.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/filebrowsing/FileBrowsing.java?rev=905806&r1=905805&r2=905806&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/filebrowsing/FileBrowsing.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/filebrowsing/FileBrowsing.java Tue Feb 2 21:44:50 2010
@@ -58,8 +58,12 @@
Button selection = fileBrowserSheetModeGroup.getSelection();
String mode = (String)selection.getUserData().get("mode");
- final FileBrowserSheet fileBrowserSheet =
- new FileBrowserSheet(FileBrowserSheet.Mode.valueOf(mode.toUpperCase()));
+ FileBrowserSheet.Mode fileBrowserSheetMode = FileBrowserSheet.Mode.valueOf(mode.toUpperCase());
+ final FileBrowserSheet fileBrowserSheet = new FileBrowserSheet(fileBrowserSheetMode);
+
+ if (fileBrowserSheetMode == FileBrowserSheet.Mode.SAVE_AS) {
+ fileBrowserSheet.setSelectedFile(new File(fileBrowserSheet.getRootDirectory(), "New File"));
+ }
fileBrowserSheet.open(window, new SheetCloseListener() {
@Override
Modified: pivot/trunk/web-server/src/org/apache/pivot/web/server/QueryServlet.java
URL: http://svn.apache.org/viewvc/pivot/trunk/web-server/src/org/apache/pivot/web/server/QueryServlet.java?rev=905806&r1=905805&r2=905806&view=diff
==============================================================================
--- pivot/trunk/web-server/src/org/apache/pivot/web/server/QueryServlet.java (original)
+++ pivot/trunk/web-server/src/org/apache/pivot/web/server/QueryServlet.java Tue Feb 2 21:44:50 2010
@@ -77,8 +77,6 @@
serializerTypes.put(JSONSerializer.MIME_TYPE, JSONSerializer.class);
serializerTypes.put(CSVSerializer.MIME_TYPE, CSVSerializer.class);
-
- System.out.println(serializerTypes);
}
/**
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.java?rev=905806&r1=905805&r2=905806&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.java Tue Feb 2 21:44:50 2010
@@ -326,7 +326,21 @@
public void selectedFilesChanged(FileBrowserSheet fileBrowserSheet,
Sequence<File> previousSelectedFiles) {
if (!updatingSelection) {
- fileBrowser.setSelectedFiles(fileBrowserSheet.getSelectedFiles());
+ Sequence<File> selectedFiles = fileBrowserSheet.getSelectedFiles();
+ fileBrowser.setSelectedFiles(selectedFiles);
+
+ if (fileBrowser.getSelectedFiles().getLength() == 0
+ && selectedFiles.getLength() == 1) {
+ // The file does not currently exist; set the file name in the
+ // text input if the parent directory is the same as the root
+ // directory
+ File selectedFile = selectedFiles.get(0);
+
+ File rootDirectory = fileBrowser.getRootDirectory();
+ if (rootDirectory.equals(selectedFile.getParentFile())) {
+ saveAsTextInput.setText(selectedFile.getName());
+ }
+ }
}
}