You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by sm...@apache.org on 2012/05/09 16:42:53 UTC
svn commit: r1336232 - in /pivot/trunk:
wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java
wtk/src/org/apache/pivot/wtk/FileBrowserSheet.java
Author: smartini
Date: Wed May 9 14:42:52 2012
New Revision: 1336232
URL: http://svn.apache.org/viewvc?rev=1336232&view=rev
Log:
PIVOT-832, a little refactoring
Modified:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowserSheet.java
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java?rev=1336232&r1=1336231&r2=1336232&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java Wed May 9 14:42:52 2012
@@ -78,6 +78,9 @@ import org.apache.pivot.wtk.skin.FileBro
* Terra file browser skin.
*/
public class TerraFileBrowserSkin extends FileBrowserSkin {
+
+ public static final File HOME_DIRECTORY = new File(System.getProperty("user.home"));
+
/**
* Abstract renderer for displaying file system contents.
*/
@@ -92,15 +95,11 @@ public class TerraFileBrowserSkin extend
public static final Image HOME_FOLDER_IMAGE;
public static final Image FILE_IMAGE;
- public static final File HOME_DIRECTORY;
-
static {
try {
FOLDER_IMAGE = Image.load(FileRenderer.class.getResource("folder.png"));
HOME_FOLDER_IMAGE = Image.load(FileRenderer.class.getResource("folder_home.png"));
FILE_IMAGE = Image.load(FileRenderer.class.getResource("page_white.png"));
-
- HOME_DIRECTORY = new File(System.getProperty("user.home"));
} catch (TaskExecutionException exception) {
throw new RuntimeException(exception);
}
@@ -647,7 +646,7 @@ public class TerraFileBrowserSkin extend
goHomeButton.getButtonPressListeners().add(new ButtonPressListener() {
@Override
public void buttonPressed(Button button) {
- fileBrowser.setRootDirectory(new File(System.getProperty("user.home")));
+ fileBrowser.setRootDirectory(HOME_DIRECTORY);
}
});
@@ -964,8 +963,7 @@ public class TerraFileBrowserSkin extend
goUpButton.setEnabled(pathListButton.isEnabled());
- File homeDirectory = new File(System.getProperty("user.home"));
- goHomeButton.setEnabled(!rootDirectory.equals(homeDirectory));
+ goHomeButton.setEnabled(!rootDirectory.equals(HOME_DIRECTORY));
searchTextInput.setText("");
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowserSheet.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowserSheet.java?rev=1336232&r1=1336231&r2=1336232&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowserSheet.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowserSheet.java Wed May 9 14:42:52 2012
@@ -160,7 +160,7 @@ public class FileBrowserSheet extends Sh
*/
public File getSelectedFile() {
if (mode == Mode.OPEN_MULTIPLE) {
- throw new IllegalStateException("File browser is not in single-select mode.");
+ throw new IllegalStateException("File browser sheet is not in single-select mode.");
}
return (selectedFiles.getLength() == 0) ? null : selectedFiles.get(0);