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 2009/08/18 23:49:21 UTC
svn commit: r805596 - in
/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk: FileBrowser.java
FileBrowserSheet.java ListView.java TableView.java
skin/terra/TerraFileBrowserSkin.java
Author: gbrown
Date: Tue Aug 18 21:49:20 2009
New Revision: 805596
URL: http://svn.apache.org/viewvc?rev=805596&view=rev
Log:
Minor member variable name change; fix minor bug in TerraFileBrowserSkin.
Modified:
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowser.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowserSheet.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ListView.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/TableView.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowser.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowser.java?rev=805596&r1=805595&r2=805596&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowser.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowser.java Tue Aug 18 21:49:20 2009
@@ -72,7 +72,7 @@
}
private Folder selectedFolder;
- private FileList fileSelection = new FileList();
+ private FileList selectedFiles = new FileList();
private boolean multiSelect = false;
private Filter<File> disabledFileFilter = null;
@@ -109,7 +109,7 @@
Folder previousSelectedFolder = this.selectedFolder;
if (previousSelectedFolder != selectedFolder) {
this.selectedFolder = selectedFolder;
- fileSelection.clear();
+ selectedFiles.clear();
fileBrowserListeners.selectedFolderChanged(this, previousSelectedFolder);
}
} else {
@@ -139,7 +139,7 @@
file = new File(selectedFolder, file.getPath());
}
- int index = fileSelection.add(file);
+ int index = selectedFiles.add(file);
if (index != -1) {
fileBrowserListeners.selectedFileAdded(this, file);
}
@@ -161,7 +161,7 @@
throw new IllegalArgumentException();
}
- int index = fileSelection.remove(file);
+ int index = selectedFiles.remove(file);
if (index != -1) {
fileBrowserListeners.selectedFileRemoved(this, file);
}
@@ -180,7 +180,7 @@
throw new IllegalStateException("File browser is not in single-select mode.");
}
- return (fileSelection.getLength() == 0) ? null : fileSelection.get(0);
+ return (selectedFiles.getLength() == 0) ? null : selectedFiles.get(0);
}
/**
@@ -203,7 +203,7 @@
* An immutable list of selected files.
*/
public Sequence<File> getSelectedFiles() {
- return new ImmutableList<File>(fileSelection);
+ return new ImmutableList<File>(selectedFiles);
}
/**
@@ -228,7 +228,7 @@
// Update the selection
Sequence<File> previousSelectedFiles = getSelectedFiles();
- FileList fileSelection = new FileList();
+ FileList fileList = new FileList();
for (int i = 0, n = selectedFiles.getLength(); i < n; i++) {
File file = selectedFiles.get(i);
@@ -244,10 +244,10 @@
file = new File(selectedFolder, file.getPath());
}
- fileSelection.add(file);
+ fileList.add(file);
}
- this.fileSelection = fileSelection;
+ this.selectedFiles = fileList;
// Notify listeners
fileBrowserListeners.selectedFilesChanged(this, previousSelectedFiles);
@@ -278,7 +278,7 @@
public void setMultiSelect(boolean multiSelect) {
if (this.multiSelect != multiSelect) {
// Clear any existing selection
- fileSelection.clear();
+ selectedFiles.clear();
this.multiSelect = multiSelect;
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowserSheet.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowserSheet.java?rev=805596&r1=805595&r2=805596&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowserSheet.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowserSheet.java Tue Aug 18 21:49:20 2009
@@ -64,7 +64,7 @@
private Mode mode;
private Folder selectedFolder;
- private FileList fileSelection = new FileList();
+ private FileList selectedFiles = new FileList();
private Filter<File> disabledFileFilter = null;
private FileBrowserSheetListenerList fileBrowserSheetListeners = new FileBrowserSheetListenerList();
@@ -99,7 +99,7 @@
Folder previousSelectedFolder = this.selectedFolder;
if (previousSelectedFolder != selectedFolder) {
this.selectedFolder = selectedFolder;
- fileSelection.clear();
+ selectedFiles.clear();
fileBrowserSheetListeners.selectedFolderChanged(this, previousSelectedFolder);
}
} else {
@@ -118,7 +118,7 @@
throw new IllegalStateException("File browser is not in single-select mode.");
}
- return (fileSelection.getLength() == 0) ? null : fileSelection.get(0);
+ return (selectedFiles.getLength() == 0) ? null : selectedFiles.get(0);
}
/**
@@ -141,7 +141,7 @@
* An immutable list of selected files.
*/
public Sequence<File> getSelectedFiles() {
- return new ImmutableList<File>(fileSelection);
+ return new ImmutableList<File>(selectedFiles);
}
/**
@@ -166,7 +166,7 @@
// Update the selection
Sequence<File> previousSelectedFiles = getSelectedFiles();
- FileList fileSelection = new FileList();
+ FileList fileList = new FileList();
for (int i = 0, n = selectedFiles.getLength(); i < n; i++) {
File file = selectedFiles.get(i);
@@ -174,10 +174,10 @@
throw new IllegalArgumentException("file is null.");
}
- fileSelection.add(file);
+ fileList.add(file);
}
- this.fileSelection = fileSelection;
+ this.selectedFiles = fileList;
// Notify listeners
fileBrowserSheetListeners.selectedFilesChanged(this, previousSelectedFiles);
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ListView.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ListView.java?rev=805596&r1=805595&r2=805596&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ListView.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ListView.java Tue Aug 18 21:49:20 2009
@@ -248,7 +248,7 @@
private ListListener<Object> listDataListener = new ListListener<Object>() {
public void itemInserted(List<Object> list, int index) {
// Increment selected ranges
- listSelection.insertIndex(index);
+ selectedRanges.insertIndex(index);
int i, n;
@@ -272,7 +272,7 @@
int count = items.getLength();
// Decrement selected ranges
- listSelection.removeIndexes(index, count);
+ selectedRanges.removeIndexes(index, count);
// Remove and decrement checked indexes
int i = ArrayList.binarySearch(checkedIndexes, index);
@@ -306,7 +306,7 @@
public void listCleared(List<Object> list) {
// All items were removed; clear the selection and notify
// listeners
- listSelection.clear();
+ selectedRanges.clear();
checkedIndexes.clear();
listViewItemListeners.itemsCleared(ListView.this);
@@ -315,7 +315,7 @@
public void comparatorChanged(List<Object> list,
Comparator<Object> previousComparator) {
if (list.getComparator() != null) {
- listSelection.clear();
+ selectedRanges.clear();
checkedIndexes.clear();
listViewItemListeners.itemsSorted(ListView.this);
@@ -326,7 +326,7 @@
private ItemRenderer itemRenderer = null;
private ItemEditor itemEditor = null;
- private ListSelection listSelection = new ListSelection();
+ private ListSelection selectedRanges = new ListSelection();
private SelectMode selectMode = SelectMode.SINGLE;
private boolean checkmarksEnabled = false;
@@ -392,7 +392,7 @@
if (previousListData != listData) {
if (previousListData != null) {
// Clear any existing selection
- listSelection.clear();
+ selectedRanges.clear();
checkedIndexes.clear();
((List<Object>)previousListData).getListListeners().remove(listDataListener);
@@ -496,7 +496,7 @@
throw new IllegalStateException("List view is not in single-select mode.");
}
- return (listSelection.getLength() == 0) ? -1 : listSelection.get(0).start;
+ return (selectedRanges.getLength() == 0) ? -1 : selectedRanges.get(0).start;
}
/**
@@ -530,7 +530,7 @@
* Returns the list's current selection.
*/
public Sequence<Span> getSelectedRanges() {
- return new ListSelectionSequence(listSelection);
+ return new ListSelectionSequence(selectedRanges);
}
/**
@@ -569,7 +569,7 @@
}
// Update the selection
- ListSelectionSequence previousSelectedRanges = new ListSelectionSequence(listSelection);
+ ListSelectionSequence previousSelectedRanges = new ListSelectionSequence(this.selectedRanges);
ListSelection listSelection = new ListSelection();
for (int i = 0, n = selectedRanges.getLength(); i < n; i++) {
@@ -586,7 +586,7 @@
listSelection.addRange(range.start, range.end);
}
- this.listSelection = listSelection;
+ this.selectedRanges = listSelection;
// Notify listeners
listViewSelectionListeners.selectedRangesChanged(this, previousSelectedRanges);
@@ -640,7 +640,7 @@
* The first selected index, or <tt>-1</tt> if nothing is selected.
*/
public int getFirstSelectedIndex() {
- return (listSelection.getLength() > 0) ? listSelection.get(0).start : -1;
+ return (selectedRanges.getLength() > 0) ? selectedRanges.get(0).start : -1;
}
/**
@@ -650,8 +650,8 @@
* The last selected index, or <tt>-1</tt> if nothing is selected.
*/
public int getLastSelectedIndex() {
- return (listSelection.getLength() > 0) ?
- listSelection.get(listSelection.getLength() - 1).end : -1;
+ return (selectedRanges.getLength() > 0) ?
+ selectedRanges.get(selectedRanges.getLength() - 1).end : -1;
}
/**
@@ -690,7 +690,7 @@
throw new IndexOutOfBoundsException();
}
- Sequence<Span> addedRanges = listSelection.addRange(start, end);
+ Sequence<Span> addedRanges = selectedRanges.addRange(start, end);
for (int i = 0, n = addedRanges.getLength(); i < n; i++) {
Span addedRange = addedRanges.get(i);
@@ -753,7 +753,7 @@
throw new IndexOutOfBoundsException();
}
- Sequence<Span> removedRanges = listSelection.removeRange(start, end);
+ Sequence<Span> removedRanges = selectedRanges.removeRange(start, end);
for (int i = 0, n = removedRanges.getLength(); i < n; i++) {
Span removedRange = removedRanges.get(i);
@@ -791,9 +791,9 @@
* Clears the selection.
*/
public void clearSelection() {
- if (listSelection.getLength() > 0) {
- Sequence<Span> previousSelectedRanges = new ListSelectionSequence(listSelection);
- listSelection = new ListSelection();
+ if (selectedRanges.getLength() > 0) {
+ Sequence<Span> previousSelectedRanges = new ListSelectionSequence(selectedRanges);
+ selectedRanges = new ListSelection();
listViewSelectionListeners.selectedRangesChanged(this,
previousSelectedRanges);
@@ -814,7 +814,7 @@
throw new IndexOutOfBoundsException();
}
- return (listSelection.containsIndex(index));
+ return (selectedRanges.containsIndex(index));
}
public Object getSelectedItem() {
@@ -845,8 +845,8 @@
public Sequence<?> getSelectedItems() {
ArrayList<Object> items = new ArrayList<Object>();
- for (int i = 0, n = listSelection.getLength(); i < n; i++) {
- Span range = listSelection.get(i);
+ for (int i = 0, n = selectedRanges.getLength(); i < n; i++) {
+ Span range = selectedRanges.get(i);
for (int index = range.start; index <= range.end; index++) {
Object item = listData.get(index);
@@ -901,7 +901,7 @@
if (previousSelectMode != selectMode) {
// Clear any current selection
- listSelection = new ListSelection();
+ selectedRanges = new ListSelection();
// Update the selection mode
this.selectMode = selectMode;
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/TableView.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/TableView.java?rev=805596&r1=805595&r2=805596&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/TableView.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/TableView.java Tue Aug 18 21:49:20 2009
@@ -762,7 +762,7 @@
private ListListener<Object> tableDataListener = new ListListener<Object>() {
public void itemInserted(List<Object> list, int index) {
// Increment selected ranges
- tableSelection.insertIndex(index);
+ selectedRanges.insertIndex(index);
// Notify listeners that items were inserted
tableViewRowListeners.rowInserted(TableView.this, index);
@@ -772,7 +772,7 @@
int count = items.getLength();
// Decrement selected ranges
- tableSelection.removeIndexes(index, count);
+ selectedRanges.removeIndexes(index, count);
// Notify listeners that items were removed
tableViewRowListeners.rowsRemoved(TableView.this, index, count);
@@ -785,7 +785,7 @@
public void listCleared(List<Object> list) {
// All items were removed; clear the selection and notify
// listeners
- tableSelection.clear();
+ selectedRanges.clear();
tableViewRowListeners.rowsCleared(TableView.this);
}
@@ -793,14 +793,14 @@
public void comparatorChanged(List<Object> list,
Comparator<Object> previousComparator) {
if (list.getComparator() != null) {
- tableSelection.clear();
+ selectedRanges.clear();
tableViewRowListeners.rowsSorted(TableView.this);
}
}
};
- private ListSelection tableSelection = new ListSelection();
+ private ListSelection selectedRanges = new ListSelection();
private SelectMode selectMode = SelectMode.SINGLE;
private Filter<?> disabledRowFilter = null;
@@ -944,7 +944,7 @@
throw new IllegalStateException("Table view is not in single-select mode.");
}
- return (tableSelection.getLength() == 0) ? -1 : tableSelection.get(0).start;
+ return (selectedRanges.getLength() == 0) ? -1 : selectedRanges.get(0).start;
}
/**
@@ -978,7 +978,7 @@
* Returns the table's current selection.
*/
public Sequence<Span> getSelectedRanges() {
- return new ListSelectionSequence(tableSelection);
+ return new ListSelectionSequence(selectedRanges);
}
/**
@@ -1017,9 +1017,9 @@
}
// Update the selection
- ListSelectionSequence previousSelectedRanges = new ListSelectionSequence(tableSelection);
+ ListSelectionSequence previousSelectedRanges = new ListSelectionSequence(this.selectedRanges);
- ListSelection tableSelection = new ListSelection();
+ ListSelection listSelection = new ListSelection();
for (int i = 0, n = selectedRanges.getLength(); i < n; i++) {
Span range = selectedRanges.get(i);
@@ -1031,10 +1031,10 @@
throw new IndexOutOfBoundsException();
}
- tableSelection.addRange(range.start, range.end);
+ listSelection.addRange(range.start, range.end);
}
- this.tableSelection = tableSelection;
+ this.selectedRanges = listSelection;
// Notify listeners
tableViewSelectionListeners.selectedRangesChanged(this, previousSelectedRanges);
@@ -1088,7 +1088,7 @@
* The first selected index, or <tt>-1</tt> if nothing is selected.
*/
public int getFirstSelectedIndex() {
- return (tableSelection.getLength() > 0) ? tableSelection.get(0).start : -1;
+ return (selectedRanges.getLength() > 0) ? selectedRanges.get(0).start : -1;
}
/**
@@ -1098,8 +1098,8 @@
* The last selected index, or <tt>-1</tt> if nothing is selected.
*/
public int getLastSelectedIndex() {
- return (tableSelection.getLength() > 0) ?
- tableSelection.get(tableSelection.getLength() - 1).end : -1;
+ return (selectedRanges.getLength() > 0) ?
+ selectedRanges.get(selectedRanges.getLength() - 1).end : -1;
}
/**
@@ -1138,7 +1138,7 @@
throw new IndexOutOfBoundsException();
}
- Sequence<Span> addedRanges = tableSelection.addRange(start, end);
+ Sequence<Span> addedRanges = selectedRanges.addRange(start, end);
for (int i = 0, n = addedRanges.getLength(); i < n; i++) {
Span addedRange = addedRanges.get(i);
@@ -1201,7 +1201,7 @@
throw new IndexOutOfBoundsException();
}
- Sequence<Span> removedRanges = tableSelection.removeRange(start, end);
+ Sequence<Span> removedRanges = selectedRanges.removeRange(start, end);
for (int i = 0, n = removedRanges.getLength(); i < n; i++) {
Span removedRange = removedRanges.get(i);
@@ -1239,9 +1239,9 @@
* Clears the selection.
*/
public void clearSelection() {
- if (tableSelection.getLength() > 0) {
- Sequence<Span> previousSelectedRanges = new ListSelectionSequence(tableSelection);
- tableSelection = new ListSelection();
+ if (selectedRanges.getLength() > 0) {
+ Sequence<Span> previousSelectedRanges = new ListSelectionSequence(selectedRanges);
+ selectedRanges = new ListSelection();
tableViewSelectionListeners.selectedRangesChanged(this,
previousSelectedRanges);
@@ -1262,7 +1262,7 @@
throw new IndexOutOfBoundsException();
}
- return (tableSelection.containsIndex(index));
+ return (selectedRanges.containsIndex(index));
}
public Object getSelectedRow() {
@@ -1279,8 +1279,8 @@
public Sequence<?> getSelectedRows() {
ArrayList<Object> rows = new ArrayList<Object>();
- for (int i = 0, n = tableSelection.getLength(); i < n; i++) {
- Span range = tableSelection.get(i);
+ for (int i = 0, n = selectedRanges.getLength(); i < n; i++) {
+ Span range = selectedRanges.get(i);
for (int index = range.start; index <= range.end; index++) {
Object row = tableData.get(index);
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java?rev=805596&r1=805595&r2=805596&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java Tue Aug 18 21:49:20 2009
@@ -512,8 +512,10 @@
if (index != -1
&& index == this.index
&& fileTableView.isRowSelected(index)) {
- File selectedDirectory = files.get(index);
- fileBrowser.setSelectedFolder(new Folder(selectedDirectory.getPath()));
+ File file = files.get(index);
+ if (file.isDirectory()) {
+ fileBrowser.setSelectedFolder(new Folder(file.getPath()));
+ }
}
}