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 2013/10/05 01:45:53 UTC
svn commit: r1529349 [36/44] - in /pivot/trunk:
charts/src/org/apache/pivot/charts/
charts/src/org/apache/pivot/charts/skin/ core/src/org/apache/pivot/beans/
core/src/org/apache/pivot/collections/
core/src/org/apache/pivot/collections/adapter/ core/src...
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/VFSBrowser.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/VFSBrowser.java?rev=1529349&r1=1529348&r2=1529349&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/VFSBrowser.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/VFSBrowser.java Fri Oct 4 23:45:40 2013
@@ -33,9 +33,9 @@ import org.apache.pivot.util.Filter;
import org.apache.pivot.util.ListenerList;
/**
- * A file browser that uses the Apache Commons VFS (Virtual File System)
- * to be able to browse local and remote file systems, and browse inside
- * of .zip, .tar, etc. archives as well.
+ * A file browser that uses the Apache Commons VFS (Virtual File System) to be
+ * able to browse local and remote file systems, and browse inside of .zip,
+ * .tar, etc. archives as well.
*/
public class VFSBrowser extends Container {
/**
@@ -111,30 +111,22 @@ public class VFSBrowser extends Containe
private FileBrowserListenerList fileBrowserListeners = new FileBrowserListenerList();
/**
- * Creates a new VFSBrowser
- * <p>
- * Note that this version set by default mode to open.
- */
- public VFSBrowser()
- throws FileSystemException
- {
+ * Creates a new VFSBrowser <p> Note that this version set by default mode
+ * to open.
+ */
+ public VFSBrowser() throws FileSystemException {
this(null, USER_HOME);
}
/**
- * Creates a new VFSBrowser
- * <p>
- * Note that this version of the constructor must be used when a custom root folder (that
- * may include a completely different URI scheme) has to be set.
- *
- * @param manager
- * The virtual file system we're going to manage.
- * @param rootFolder
- * The root folder full name.
- */
- public VFSBrowser(FileSystemManager manager, URI rootFolder)
- throws FileSystemException
- {
+ * Creates a new VFSBrowser <p> Note that this version of the constructor
+ * must be used when a custom root folder (that may include a completely
+ * different URI scheme) has to be set.
+ *
+ * @param manager The virtual file system we're going to manage.
+ * @param rootFolder The root folder full name.
+ */
+ public VFSBrowser(FileSystemManager manager, URI rootFolder) throws FileSystemException {
if (rootFolder == null) {
throw new IllegalArgumentException();
}
@@ -156,18 +148,13 @@ public class VFSBrowser extends Containe
}
/**
- * Creates a new VFSBrowser
- * <p>
- * Note that this version of the constructor must be used when a custom root folder has to be set.
- *
- * @param manager
- * The virtual file system we're going to manage.
- * @param rootFolder
- * The root folder full name.
- */
- public VFSBrowser(FileSystemManager manager, String rootFolder)
- throws FileSystemException
- {
+ * Creates a new VFSBrowser <p> Note that this version of the constructor
+ * must be used when a custom root folder has to be set.
+ *
+ * @param manager The virtual file system we're going to manage.
+ * @param rootFolder The root folder full name.
+ */
+ public VFSBrowser(FileSystemManager manager, String rootFolder) throws FileSystemException {
if (rootFolder == null) {
throw new IllegalArgumentException();
}
@@ -190,9 +177,8 @@ public class VFSBrowser extends Containe
/**
* Returns the current file system manager.
- *
- * @return
- * The current file system manager.
+ *
+ * @return The current file system manager.
*/
public FileSystemManager getManager() {
return manager;
@@ -200,36 +186,30 @@ public class VFSBrowser extends Containe
/**
* Returns the current root directory.
- *
- * @return
- * The current root directory.
+ *
+ * @return The current root directory.
*/
public FileObject getRootDirectory() {
return rootDirectory;
}
/**
- * Sets the root directory from a string. Clears any
- * existing file selection.
- *
+ * Sets the root directory from a string. Clears any existing file
+ * selection.
+ *
* @param rootDirectory
*/
- public void setRootDirectory(String rootDirectory)
- throws FileSystemException
- {
+ public void setRootDirectory(String rootDirectory) throws FileSystemException {
setRootDirectory(manager.resolveFile(rootDirectory));
}
/**
* Sets the root directory. Clears any existing file selection.
- *
+ *
* @param rootDirectory
*/
- public void setRootDirectory(FileObject rootDirectory)
- throws FileSystemException
- {
- if (rootDirectory == null
- || rootDirectory.getType() != FileType.FOLDER) {
+ public void setRootDirectory(FileObject rootDirectory) throws FileSystemException {
+ if (rootDirectory == null || rootDirectory.getType() != FileType.FOLDER) {
throw new IllegalArgumentException();
}
@@ -248,22 +228,18 @@ public class VFSBrowser extends Containe
/**
* Adds a file to the file selection.
- *
+ *
* @param file
- *
- * @return
- * <tt>true</tt> if the file was added; <tt>false</tt> if it was already
- * selected.
- */
- public boolean addSelectedFile(FileObject file)
- throws FileSystemException
- {
+ * @return <tt>true</tt> if the file was added; <tt>false</tt> if it was
+ * already selected.
+ */
+ public boolean addSelectedFile(FileObject file) throws FileSystemException {
if (file == null) {
throw new IllegalArgumentException();
}
// TODO: is this a good way to do this?
- //if (file.isAbsolute()) {
+ // if (file.isAbsolute()) {
if (baseFileName != null && baseFileName.isAncestor(file.getName())) {
if (!file.getParent().equals(rootDirectory)) {
throw new IllegalArgumentException();
@@ -282,12 +258,10 @@ public class VFSBrowser extends Containe
/**
* Removes a file from the file selection.
- *
+ *
* @param file
- *
- * @return
- * <tt>true</tt> if the file was removed; <tt>false</tt> if it was not
- * already selected.
+ * @return <tt>true</tt> if the file was removed; <tt>false</tt> if it was
+ * not already selected.
*/
public boolean removeSelectedFile(FileObject file) {
if (file == null) {
@@ -304,9 +278,8 @@ public class VFSBrowser extends Containe
/**
* When in single-select mode, returns the currently selected file.
- *
- * @return
- * The currently selected file.
+ *
+ * @return The currently selected file.
*/
public FileObject getSelectedFile() {
if (multiSelect) {
@@ -318,17 +291,15 @@ public class VFSBrowser extends Containe
/**
* Sets the selection to a single file.
- *
+ *
* @param file
*/
- public void setSelectedFile(FileObject file)
- throws FileSystemException
- {
+ public void setSelectedFile(FileObject file) throws FileSystemException {
if (file == null) {
clearSelection();
} else {
// TODO: adequate replacement for "isAbsolute"?
- //if (file.isAbsolute()) {
+ // if (file.isAbsolute()) {
if (baseFileName != null && baseFileName.isAncestor(file.getName())) {
setRootDirectory(file.getParent());
}
@@ -339,11 +310,11 @@ public class VFSBrowser extends Containe
/**
* Returns the currently selected files.
- *
- * @return
- * An immutable list containing the currently selected files. Note that the returned
- * list is a wrapper around the actual selection, not a copy. Any changes made to the
- * selection state will be reflected in the list, but events will not be fired.
+ *
+ * @return An immutable list containing the currently selected files. Note
+ * that the returned list is a wrapper around the actual selection, not a
+ * copy. Any changes made to the selection state will be reflected in the
+ * list, but events will not be fired.
*/
public ImmutableList<FileObject> getSelectedFiles() {
return new ImmutableList<>(selectedFiles);
@@ -351,22 +322,17 @@ public class VFSBrowser extends Containe
/**
* Sets the selected files.
- *
- * @param selectedFiles
- * The files to select.
- *
- * @return
- * The files that were selected, with duplicates eliminated.
+ *
+ * @param selectedFiles The files to select.
+ * @return The files that were selected, with duplicates eliminated.
*/
public Sequence<FileObject> setSelectedFiles(Sequence<FileObject> selectedFiles)
- throws FileSystemException
- {
+ throws FileSystemException {
if (selectedFiles == null) {
throw new IllegalArgumentException("selectedFiles is null.");
}
- if (!multiSelect
- && selectedFiles.getLength() > 1) {
+ if (!multiSelect && selectedFiles.getLength() > 1) {
throw new IllegalArgumentException("Multi-select is not enabled.");
}
@@ -382,15 +348,15 @@ public class VFSBrowser extends Containe
}
// TODO: is this correct?
- //if (!file.isAbsolute()) {
+ // if (!file.isAbsolute()) {
if (baseFileName == null || !baseFileName.isAncestor(file.getName())) {
file = manager.resolveFile(rootDirectory, file.getName().getBaseName());
}
// TODO: don't do this for now -- revisit later
- //if (!file.getParent().equals(rootDirectory)) {
- // throw new IllegalArgumentException();
- //}
+ // if (!file.getParent().equals(rootDirectory)) {
+ // throw new IllegalArgumentException();
+ // }
fileList.add(file);
}
@@ -406,9 +372,7 @@ public class VFSBrowser extends Containe
/**
* Clears the selection.
*/
- public void clearSelection()
- throws FileSystemException
- {
+ public void clearSelection() throws FileSystemException {
setSelectedFiles(new ArrayList<FileObject>());
}
@@ -425,9 +389,9 @@ public class VFSBrowser extends Containe
/**
* Sets the file browser's multi-select state.
- *
- * @param multiSelect
- * <tt>true</tt> if multi-select is enabled; <tt>false</tt>, otherwise.
+ *
+ * @param multiSelect <tt>true</tt> if multi-select is enabled;
+ * <tt>false</tt>, otherwise.
*/
public void setMultiSelect(boolean multiSelect) {
if (this.multiSelect != multiSelect) {
@@ -442,9 +406,8 @@ public class VFSBrowser extends Containe
/**
* Returns the current file filter.
- *
- * @return
- * The current file filter, or <tt>null</tt> if no filter is set.
+ *
+ * @return The current file filter, or <tt>null</tt> if no filter is set.
*/
public Filter<FileObject> getDisabledFileFilter() {
return disabledFileFilter;
@@ -452,9 +415,9 @@ public class VFSBrowser extends Containe
/**
* Sets the file filter.
- *
- * @param disabledFileFilter
- * The file filter to use, or <tt>null</tt> for no filter.
+ *
+ * @param disabledFileFilter The file filter to use, or <tt>null</tt> for no
+ * filter.
*/
public void setDisabledFileFilter(Filter<FileObject> disabledFileFilter) {
Filter<FileObject> previousDisabledFileFilter = this.disabledFileFilter;
@@ -466,7 +429,7 @@ public class VFSBrowser extends Containe
}
public FileObject getFileAt(int x, int y) {
- VFSBrowser.Skin fileBrowserSkin = (VFSBrowser.Skin)getSkin();
+ VFSBrowser.Skin fileBrowserSkin = (VFSBrowser.Skin) getSkin();
return fileBrowserSkin.getFileAt(x, y);
}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/VFSBrowserListener.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/VFSBrowserListener.java?rev=1529349&r1=1529348&r2=1529349&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/VFSBrowserListener.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/VFSBrowserListener.java Fri Oct 4 23:45:40 2013
@@ -68,9 +68,9 @@ public interface VFSBrowserListener {
}
/**
- * Called when a file browser's FileSystemManager has changed,
- * (such as when a nested VirtualFileSystem is opened).
- *
+ * Called when a file browser's FileSystemManager has changed, (such as when
+ * a nested VirtualFileSystem is opened).
+ *
* @param fileBrowser
* @param previousManager
*/
@@ -78,7 +78,7 @@ public interface VFSBrowserListener {
/**
* Called when a file browser's root directory has changed.
- *
+ *
* @param fileBrowser
* @param previousRootDirectory
*/
@@ -86,7 +86,7 @@ public interface VFSBrowserListener {
/**
* Called when a file has been added to a file browser's selection.
- *
+ *
* @param fileBrowser
* @param file
*/
@@ -94,7 +94,7 @@ public interface VFSBrowserListener {
/**
* Called when a file has been removed from a file browser's selection.
- *
+ *
* @param fileBrowser
* @param file
*/
@@ -102,7 +102,7 @@ public interface VFSBrowserListener {
/**
* Called when a file browser's selection state has been reset.
- *
+ *
* @param fileBrowser
* @param previousSelectedFiles
*/
@@ -111,14 +111,14 @@ public interface VFSBrowserListener {
/**
* Called when a file browser's multi-select flag has changed.
- *
+ *
* @param fileBrowser
*/
public void multiSelectChanged(VFSBrowser fileBrowser);
/**
* Called when a file browser's file filter has changed.
- *
+ *
* @param fileBrowser
* @param previousDisabledFileFilter
*/
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/VFSBrowserSheet.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/VFSBrowserSheet.java?rev=1529349&r1=1529348&r2=1529349&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/VFSBrowserSheet.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/VFSBrowserSheet.java Fri Oct 4 23:45:40 2013
@@ -31,25 +31,21 @@ import org.apache.pivot.util.ListenerLis
/**
* A file browser sheet that uses the Apache Commons VFS (Virtual File System)
- * to be able to browse local and remote file systems, and browse inside
- * of .zip, .tar, etc. archives as well.
+ * to be able to browse local and remote file systems, and browse inside of
+ * .zip, .tar, etc. archives as well.
*/
public class VFSBrowserSheet extends Sheet {
/**
* Enumeration defining supported modes.
*/
public enum Mode {
- OPEN,
- OPEN_MULTIPLE,
- SAVE_AS,
- SAVE_TO
+ OPEN, OPEN_MULTIPLE, SAVE_AS, SAVE_TO
}
private static final String USER_HOME = System.getProperty("user.home");
- private static class FileBrowserSheetListenerList
- extends WTKListenerList<VFSBrowserSheetListener>
- implements VFSBrowserSheetListener {
+ private static class FileBrowserSheetListenerList extends
+ WTKListenerList<VFSBrowserSheetListener> implements VFSBrowserSheetListener {
@Override
public void managerChanged(VFSBrowserSheet fileBrowserSheet,
FileSystemManager previousManager) {
@@ -59,8 +55,7 @@ public class VFSBrowserSheet extends She
}
@Override
- public void modeChanged(VFSBrowserSheet fileBrowserSheet,
- VFSBrowserSheet.Mode previousMode) {
+ public void modeChanged(VFSBrowserSheet fileBrowserSheet, VFSBrowserSheet.Mode previousMode) {
for (VFSBrowserSheetListener listener : this) {
listener.modeChanged(fileBrowserSheet, previousMode);
}
@@ -86,8 +81,7 @@ public class VFSBrowserSheet extends She
public void disabledFileFilterChanged(VFSBrowserSheet fileBrowserSheet,
Filter<FileObject> previousDisabledFileFilter) {
for (VFSBrowserSheetListener listener : this) {
- listener.disabledFileFilterChanged(fileBrowserSheet,
- previousDisabledFileFilter);
+ listener.disabledFileFilterChanged(fileBrowserSheet, previousDisabledFileFilter);
}
}
}
@@ -102,68 +96,48 @@ public class VFSBrowserSheet extends She
private FileBrowserSheetListenerList fileBrowserSheetListeners = new FileBrowserSheetListenerList();
/**
- * Creates a new VFSBrowserSheet
- * <p>
- * Note that this version set by default mode to open and user home as root folder.
+ * Creates a new VFSBrowserSheet <p> Note that this version set by default
+ * mode to open and user home as root folder.
*/
- public VFSBrowserSheet()
- throws FileSystemException
- {
+ public VFSBrowserSheet() throws FileSystemException {
this(Mode.OPEN);
}
/**
- * Creates a new VFSBrowserSheet
- * <p>
- * Note that this version set by default the user home as root folder.
- *
- * @param mode
- * The mode for opening the sheet.
+ * Creates a new VFSBrowserSheet <p> Note that this version set by default
+ * the user home as root folder.
+ *
+ * @param mode The mode for opening the sheet.
* @see Mode
*/
- public VFSBrowserSheet(Mode mode)
- throws FileSystemException
- {
+ public VFSBrowserSheet(Mode mode) throws FileSystemException {
this(mode, USER_HOME);
}
/**
- * Creates a new VFSBrowserSheet
- * <p>
- * Note that this version of the constructor must be used when a custom root folder has to be set.
- *
- * @param mode
- * The mode for opening the sheet.
+ * Creates a new VFSBrowserSheet <p> Note that this version of the
+ * constructor must be used when a custom root folder has to be set.
+ *
+ * @param mode The mode for opening the sheet.
* @see Mode
- *
- * @param rootFolder
- * The root folder full name.
+ * @param rootFolder The root folder full name.
*/
- public VFSBrowserSheet(Mode mode, String rootFolder)
- throws FileSystemException
- {
+ public VFSBrowserSheet(Mode mode, String rootFolder) throws FileSystemException {
this(null, mode, rootFolder);
}
/**
- * Creates a new VFSBrowserSheet
- * <p>
- * Note that this version of the constructor must be used when a custom root folder has to be set.
- *
- * @param manager
- * The VFS FileSystemManager that we will be browsing. If <tt>null</tt> the default (local) will
- * be used.
- *
- * @param mode
- * The mode for opening the sheet.
+ * Creates a new VFSBrowserSheet <p> Note that this version of the
+ * constructor must be used when a custom root folder has to be set.
+ *
+ * @param manager The VFS FileSystemManager that we will be browsing. If
+ * <tt>null</tt> the default (local) will be used.
+ * @param mode The mode for opening the sheet.
* @see Mode
- *
- * @param rootFolder
- * The root folder full name.
+ * @param rootFolder The root folder full name.
*/
public VFSBrowserSheet(FileSystemManager manager, Mode mode, String rootFolder)
- throws FileSystemException
- {
+ throws FileSystemException {
if (mode == null) {
throw new IllegalArgumentException("Mode is null.");
}
@@ -185,9 +159,7 @@ public class VFSBrowserSheet extends She
return manager;
}
- public void setManager(FileSystemManager manager)
- throws FileSystemException
- {
+ public void setManager(FileSystemManager manager) throws FileSystemException {
FileSystemManager previousManager = this.manager;
if (manager == null) {
@@ -231,9 +203,7 @@ public class VFSBrowserSheet extends She
}
// set the root folder but without firing events
- public void setRootFolder(String rootFolder)
- throws FileSystemException
- {
+ public void setRootFolder(String rootFolder) throws FileSystemException {
if (rootFolder == null) {
throw new IllegalArgumentException("Root folder is null.");
}
@@ -250,15 +220,11 @@ public class VFSBrowserSheet extends She
}
- public void setRootDirectory(String rootDirectory)
- throws FileSystemException
- {
+ public void setRootDirectory(String rootDirectory) throws FileSystemException {
setRootDirectory(manager.resolveFile(rootDirectory));
}
- public void setRootDirectory(FileObject rootDirectory)
- throws FileSystemException
- {
+ public void setRootDirectory(FileObject rootDirectory) throws FileSystemException {
if (rootDirectory == null) {
throw new IllegalArgumentException("Root file is null.");
}
@@ -287,9 +253,8 @@ public class VFSBrowserSheet extends She
/**
* When in single-select mode, returns the currently selected file.
- *
- * @return
- * The currently selected file.
+ *
+ * @return The currently selected file.
*/
public FileObject getSelectedFile() {
if (mode == Mode.OPEN_MULTIPLE) {
@@ -301,17 +266,15 @@ public class VFSBrowserSheet extends She
/**
* Sets the selection to a single file.
- *
+ *
* @param file
*/
- public void setSelectedFile(FileObject file)
- throws FileSystemException
- {
+ public void setSelectedFile(FileObject file) throws FileSystemException {
if (file == null) {
clearSelection();
} else {
// TODO: will this work right?
- //if (file.isAbsolute()) {
+ // if (file.isAbsolute()) {
if (baseFileName != null && baseFileName.isAncestor(file.getName())) {
setRootDirectory(file.getParent());
}
@@ -322,11 +285,11 @@ public class VFSBrowserSheet extends She
/**
* Returns the currently selected files.
- *
- * @return
- * An immutable list containing the currently selected files. Note that the returned
- * list is a wrapper around the actual selection, not a copy. Any changes made to the
- * selection state will be reflected in the list, but events will not be fired.
+ *
+ * @return An immutable list containing the currently selected files. Note
+ * that the returned list is a wrapper around the actual selection, not a
+ * copy. Any changes made to the selection state will be reflected in the
+ * list, but events will not be fired.
*/
public ImmutableList<FileObject> getSelectedFiles() {
return new ImmutableList<>(selectedFiles);
@@ -334,22 +297,17 @@ public class VFSBrowserSheet extends She
/**
* Sets the selected files.
- *
- * @param selectedFiles
- * The files to select.
- *
- * @return
- * The files that were selected, with duplicates eliminated.
+ *
+ * @param selectedFiles The files to select.
+ * @return The files that were selected, with duplicates eliminated.
*/
public Sequence<FileObject> setSelectedFiles(Sequence<FileObject> selectedFiles)
- throws FileSystemException
- {
+ throws FileSystemException {
if (selectedFiles == null) {
throw new IllegalArgumentException("selectedFiles is null.");
}
- if (mode != Mode.OPEN_MULTIPLE
- && selectedFiles.getLength() > 1) {
+ if (mode != Mode.OPEN_MULTIPLE && selectedFiles.getLength() > 1) {
throw new IllegalArgumentException("Multi-select is not enabled.");
}
@@ -365,13 +323,14 @@ public class VFSBrowserSheet extends She
}
// TODO: is this correct?
- //if (!file.isAbsolute()) {
+ // if (!file.isAbsolute()) {
if (baseFileName == null || !baseFileName.isAncestor(file.getName())) {
file = manager.resolveFile(rootDirectory, file.getName().getBaseName());
}
if (!file.getParent().equals(rootDirectory)) {
- throw new IllegalArgumentException("Selected file doesn't appear to belong to the current directory.");
+ throw new IllegalArgumentException(
+ "Selected file doesn't appear to belong to the current directory.");
}
fileList.add(file);
@@ -388,9 +347,7 @@ public class VFSBrowserSheet extends She
/**
* Clears the selection.
*/
- public void clearSelection()
- throws FileSystemException
- {
+ public void clearSelection() throws FileSystemException {
setSelectedFiles(new ArrayList<FileObject>());
}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/VFSBrowserSheetListener.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/VFSBrowserSheetListener.java?rev=1529349&r1=1529348&r2=1529349&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/VFSBrowserSheetListener.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/VFSBrowserSheetListener.java Fri Oct 4 23:45:40 2013
@@ -36,8 +36,7 @@ public interface VFSBrowserSheetListener
}
@Override
- public void modeChanged(VFSBrowserSheet fileBrowserSheet,
- VFSBrowserSheet.Mode previousMode) {
+ public void modeChanged(VFSBrowserSheet fileBrowserSheet, VFSBrowserSheet.Mode previousMode) {
// empty block
}
@@ -61,9 +60,9 @@ public interface VFSBrowserSheetListener
}
/**
- * Called when a file browser's file system manager has changed
- * (as when browsing into a new virtual file system).
- *
+ * Called when a file browser's file system manager has changed (as when
+ * browsing into a new virtual file system).
+ *
* @param fileBrowserSheet
* @param previousManager
*/
@@ -71,7 +70,7 @@ public interface VFSBrowserSheetListener
/**
* Called when a file browser sheet's mode has changed.
- *
+ *
* @param fileBrowserSheet
* @param previousMode
*/
@@ -79,7 +78,7 @@ public interface VFSBrowserSheetListener
/**
* Called when a file browser sheet's root directory has changed.
- *
+ *
* @param fileBrowserSheet
* @param previousRootDirectory
*/
@@ -88,7 +87,7 @@ public interface VFSBrowserSheetListener
/**
* Called when a file browser sheet's selection state has been reset.
- *
+ *
* @param fileBrowserSheet
* @param previousSelectedFiles
*/
@@ -97,7 +96,7 @@ public interface VFSBrowserSheetListener
/**
* Called when a file browser sheet's disabled file filter has changed.
- *
+ *
* @param fileBrowserSheet
* @param previousDisabledFileFilter
*/
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Viewport.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Viewport.java?rev=1529349&r1=1529348&r2=1529349&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Viewport.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Viewport.java Fri Oct 4 23:45:40 2013
@@ -23,11 +23,11 @@ import org.apache.pivot.util.ListenerLis
/**
* Abstract base class for viewport components. Viewports provide a windowed
* view on a component (called the "view") that is too large to fit within a
- * given area. They are generally scrollable.
- * <p> Even though this class is a {@link Container}, no components should be
- * added to it via the {@link #add add()} method. The component that gets the
- * windowed (or scrollable) view should be added via the {@link #setView setView()}
- * method (or the "view" property).
+ * given area. They are generally scrollable. <p> Even though this class is a
+ * {@link Container}, no components should be added to it via the {@link #add
+ * add()} method. The component that gets the windowed (or scrollable) view
+ * should be added via the {@link #setView setView()} method (or the "view"
+ * property).
*/
@DefaultProperty("view")
public abstract class Viewport extends Container {
@@ -36,13 +36,14 @@ public abstract class Viewport extends C
*/
public interface Skin {
/**
- * The bounds of the Viewport within the container, for example, in ScrollPaneSkin, this excludes the scrollbars.
+ * The bounds of the Viewport within the container, for example, in
+ * ScrollPaneSkin, this excludes the scrollbars.
*/
public Bounds getViewportBounds();
}
- private static class ViewportListenerList extends WTKListenerList<ViewportListener>
- implements ViewportListener {
+ private static class ViewportListenerList extends WTKListenerList<ViewportListener> implements
+ ViewportListener {
@Override
public void scrollTopChanged(Viewport viewport, int previousScrollTop) {
@@ -112,19 +113,19 @@ public abstract class Viewport extends C
}
/**
- * Returns the (single) component (typically a {@link Container})
- * that we are providing a windowed (or scrollable) view of.
+ * Returns the (single) component (typically a {@link Container}) that we
+ * are providing a windowed (or scrollable) view of.
*/
public Component getView() {
return view;
}
/**
- * Set the single component (typically a {@link Container}) that
- * we will provide a windowed (or scrollable) view of.
+ * Set the single component (typically a {@link Container}) that we will
+ * provide a windowed (or scrollable) view of.
*/
public void setView(Component view) {
- Component previousView = this.view;
+ Component previousView = this.view;
if (view != previousView) {
// Remove any previous view component
@@ -147,13 +148,12 @@ public abstract class Viewport extends C
/**
* Returns the <tt>consumeRepaint</tt> flag, which controls whether the
- * viewport will propagate repaints to its parent or consume them.
- * This flag enables skins to optimize viewport scrolling by blitting the
- * display to reduce the required repaint area.
- *
- * @return
- * <tt>true</tt> if this viewport will consume repaints that bubble up
- * through it; <tt>false</tt> if it will propagate them up like normal.
+ * viewport will propagate repaints to its parent or consume them. This flag
+ * enables skins to optimize viewport scrolling by blitting the display to
+ * reduce the required repaint area.
+ *
+ * @return <tt>true</tt> if this viewport will consume repaints that bubble
+ * up through it; <tt>false</tt> if it will propagate them up like normal.
*/
public boolean isConsumeRepaint() {
return consumeRepaint;
@@ -161,23 +161,23 @@ public abstract class Viewport extends C
/**
* Sets the <tt>consumeRepaint</tt> flag, which controls whether the
- * viewport will propagate repaints to its parent or consume them.
- * This flag enables skins to optimize viewport scrolling by blitting the
- * display to reduce the required repaint area.
- *
- * @param consumeRepaint
- * <tt>true</tt> to consume repaints that bubble up through this viewport;
- * <tt>false</tt> to propagate them up like normal.
+ * viewport will propagate repaints to its parent or consume them. This flag
+ * enables skins to optimize viewport scrolling by blitting the display to
+ * reduce the required repaint area.
+ *
+ * @param consumeRepaint <tt>true</tt> to consume repaints that bubble up
+ * through this viewport; <tt>false</tt> to propagate them up like normal.
*/
public void setConsumeRepaint(boolean consumeRepaint) {
this.consumeRepaint = consumeRepaint;
}
/**
- * The bounds of the Viewport within the container, for example, in ScrollPaneSkin, this excludes the scrollbars.
+ * The bounds of the Viewport within the container, for example, in
+ * ScrollPaneSkin, this excludes the scrollbars.
*/
public Bounds getViewportBounds() {
- Viewport.Skin viewportSkin = (Viewport.Skin)getSkin();
+ Viewport.Skin viewportSkin = (Viewport.Skin) getSkin();
return viewportSkin.getViewportBounds();
}
@@ -189,11 +189,10 @@ public abstract class Viewport extends C
}
/**
- * This method should not be called to remove child components
- * from the Viewport because the viewable child(ren) are set
- * by the {@link #setView} method instead. Any attempt to
- * remove the "view" component with this method will result
- * in an exception.
+ * This method should not be called to remove child components from the
+ * Viewport because the viewable child(ren) are set by the {@link #setView}
+ * method instead. Any attempt to remove the "view" component with this
+ * method will result in an exception.
*/
@Override
public Sequence<Component> remove(int index, int count) {
@@ -213,26 +212,28 @@ public abstract class Viewport extends C
}
/**
- * Tell if the viewport painting mode is optimized (repaint only needed area, default), or repaint all.
- * <p> This is implemented as a workaround for various painting issues on some platforms.
- * So, if you experience problems with the scrolled-in area not being painted properly
- * by default, consider setting this property <tt>true</tt> using the
+ * Tell if the viewport painting mode is optimized (repaint only needed
+ * area, default), or repaint all. <p> This is implemented as a workaround
+ * for various painting issues on some platforms. So, if you experience
+ * problems with the scrolled-in area not being painted properly by default,
+ * consider setting this property <tt>true</tt> using the
* {@link #setRepaintAllViewport setRepaintAllViewport} method.
- *
- * @return <tt>false</tt> if optimized, otherwise <tt>true</tt> (repaint entire viewport)
+ *
+ * @return <tt>false</tt> if optimized, otherwise <tt>true</tt> (repaint
+ * entire viewport)
*/
public boolean isRepaintAllViewport() {
return repaintAllViewport;
}
/**
- * Set the viewport painting mode.
- * <p> This is implemented as a workaround for various painting issues on some platforms.
- * So, if you experience problems with the scrolled-in area not being painted properly
- * by default, consider setting this property <tt>true</tt> (default is <tt>false</tt>).
- *
- * @param repaintAllViewport
- * <tt>false</tt> means optimized (repaint only needed area, default), while <tt>true</tt> means repaint all
+ * Set the viewport painting mode. <p> This is implemented as a workaround
+ * for various painting issues on some platforms. So, if you experience
+ * problems with the scrolled-in area not being painted properly by default,
+ * consider setting this property <tt>true</tt> (default is <tt>false</tt>).
+ *
+ * @param repaintAllViewport <tt>false</tt> means optimized (repaint only
+ * needed area, default), while <tt>true</tt> means repaint all
*/
public void setRepaintAllViewport(boolean repaintAllViewport) {
this.repaintAllViewport = repaintAllViewport;
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/ViewportListener.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/ViewportListener.java?rev=1529349&r1=1529348&r2=1529349&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/ViewportListener.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/ViewportListener.java Fri Oct 4 23:45:40 2013
@@ -42,7 +42,7 @@ public interface ViewportListener {
/**
* Called when a viewport's scroll top has changed.
- *
+ *
* @param scrollPane
* @param previousScrollTop
*/
@@ -50,7 +50,7 @@ public interface ViewportListener {
/**
* Called when a viewport's scroll left has changed.
- *
+ *
* @param scrollPane
* @param previousScrollLeft
*/
@@ -58,7 +58,7 @@ public interface ViewportListener {
/**
* Called when a viewport's view component has changed.
- *
+ *
* @param scrollPane
* @param previousView
*/
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Visual.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Visual.java?rev=1529349&r1=1529348&r2=1529349&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Visual.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Visual.java Fri Oct 4 23:45:40 2013
@@ -19,8 +19,8 @@ package org.apache.pivot.wtk;
import java.awt.Graphics2D;
/**
- * Interface representing a "visual". A visual is an object that can be drawn
- * to the screen or other output device.
+ * Interface representing a "visual". A visual is an object that can be drawn to
+ * the screen or other output device.
*/
public interface Visual {
/**
@@ -35,18 +35,16 @@ public interface Visual {
/**
* Returns the visual's baseline.
- *
- * @return
- * The baseline relative to the origin of the visual, or <tt>-1</tt> if
- * this visual does not have a baseline.
+ *
+ * @return The baseline relative to the origin of the visual, or <tt>-1</tt>
+ * if this visual does not have a baseline.
*/
public int getBaseline();
/**
* Paints the visual.
- *
- * @param graphics
- * The graphics context in which to paint the visual.
+ *
+ * @param graphics The graphics context in which to paint the visual.
*/
public void paint(Graphics2D graphics);
}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Window.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Window.java?rev=1529349&r1=1529348&r2=1529349&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Window.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Window.java Fri Oct 4 23:45:40 2013
@@ -135,8 +135,8 @@ public class Window extends Container {
Action actionLocal = Action.getNamedActions().get(actionID);
if (actionLocal == null) {
- throw new IllegalArgumentException("An action with ID "
- + actionID + " does not exist.");
+ throw new IllegalArgumentException("An action with ID " + actionID
+ + " does not exist.");
}
setAction(actionLocal);
@@ -188,7 +188,7 @@ public class Window extends Container {
int index = indexOf(actionMapping);
if (index >= 0) {
- remove(index, 1);
+ remove(index, 1);
}
return index;
@@ -254,7 +254,7 @@ public class Window extends Container {
int index = indexOf(image);
if (index >= 0) {
- remove(index, 1);
+ remove(index, 1);
}
return index;
@@ -288,8 +288,8 @@ public class Window extends Container {
}
}
- private static class WindowListenerList extends WTKListenerList<WindowListener>
- implements WindowListener {
+ private static class WindowListenerList extends WTKListenerList<WindowListener> implements
+ WindowListener {
@Override
public void titleChanged(Window window, String previousTitle) {
for (WindowListener listener : this) {
@@ -378,7 +378,6 @@ public class Window extends Container {
return vote;
}
-
@Override
public void windowOpenVetoed(Window window, Vote reason) {
for (WindowStateListener listener : this) {
@@ -394,8 +393,8 @@ public class Window extends Container {
}
}
- private static class WindowActionMappingListenerList extends WTKListenerList<WindowActionMappingListener>
- implements WindowActionMappingListener {
+ private static class WindowActionMappingListenerList extends
+ WTKListenerList<WindowActionMappingListener> implements WindowActionMappingListener {
@Override
public void actionMappingAdded(Window window) {
for (WindowActionMappingListener listener : this) {
@@ -404,14 +403,16 @@ public class Window extends Container {
}
@Override
- public void actionMappingsRemoved(Window window, int index, Sequence<Window.ActionMapping> removed) {
+ public void actionMappingsRemoved(Window window, int index,
+ Sequence<Window.ActionMapping> removed) {
for (WindowActionMappingListener listener : this) {
listener.actionMappingsRemoved(window, index, removed);
}
}
@Override
- public void keyStrokeChanged(Window.ActionMapping actionMapping, Keyboard.KeyStroke previousKeyStroke) {
+ public void keyStrokeChanged(Window.ActionMapping actionMapping,
+ Keyboard.KeyStroke previousKeyStroke) {
for (WindowActionMappingListener listener : this) {
listener.keyStrokeChanged(actionMapping, previousKeyStroke);
}
@@ -425,8 +426,7 @@ public class Window extends Container {
}
}
- private static class WindowClassListenerList
- extends WTKListenerList<WindowClassListener>
+ private static class WindowClassListenerList extends WTKListenerList<WindowClassListener>
implements WindowClassListener {
@Override
public void activeWindowChanged(Window previousActiveWindow) {
@@ -474,13 +474,12 @@ public class Window extends Container {
@Override
protected void setParent(Container parent) {
- if (parent != null
- && (!(parent instanceof Display))) {
- throw new IllegalArgumentException("Window parent must be null or display, cannot be " + parent);
+ if (parent != null && (!(parent instanceof Display))) {
+ throw new IllegalArgumentException("Window parent must be null or display, cannot be "
+ + parent);
}
- if (parent == null
- && isActive()) {
+ if (parent == null && isActive()) {
clearActive();
}
@@ -502,16 +501,13 @@ public class Window extends Container {
@Override
public void setVisible(boolean visible) {
- if (visible
- && owner != null
- && !owner.isVisible()) {
+ if (visible && owner != null && !owner.isVisible()) {
throw new IllegalStateException("Owner is not visible.");
}
super.setVisible(visible);
- if (visible
- && isActive()) {
+ if (visible && isActive()) {
clearActive();
}
@@ -524,8 +520,7 @@ public class Window extends Container {
public void setEnabled(boolean enabled) {
super.setEnabled(enabled);
- if (!enabled
- && isActive()) {
+ if (!enabled && isActive()) {
clearActive();
}
}
@@ -549,12 +544,10 @@ public class Window extends Container {
/**
* Tests whether this window is an owning ancestor of a given window. A
* window is not considered an owner of itself.
- *
+ *
* @param window
- *
- * @return
- * <tt>true</tt> if this window is an owning ancestor of the given window;
- * <tt>false</tt>, otherwise.
+ * @return <tt>true</tt> if this window is an owning ancestor of the given
+ * window; <tt>false</tt>, otherwise.
*/
public boolean isOwner(Window window) {
if (window == null) {
@@ -563,8 +556,7 @@ public class Window extends Container {
Window ownerLocal = window.getOwner();
- while (ownerLocal != null
- && ownerLocal != this) {
+ while (ownerLocal != null && ownerLocal != this) {
ownerLocal = ownerLocal.getOwner();
}
@@ -573,9 +565,8 @@ public class Window extends Container {
/**
* Returns this window's open state.
- *
- * @return
- * <tt>true</tt> if the window is open; <tt>false</tt>, otherwise.
+ *
+ * @return <tt>true</tt> if the window is open; <tt>false</tt>, otherwise.
*/
public boolean isOpen() {
return (getParent() != null);
@@ -583,9 +574,9 @@ public class Window extends Container {
/**
* Returns this window's opening state.
- *
- * @return
- * <tt>true</tt> if the window is opening; <tt>false</tt>, otherwise.
+ *
+ * @return <tt>true</tt> if the window is opening; <tt>false</tt>,
+ * otherwise.
*/
public boolean isOpening() {
return opening;
@@ -593,7 +584,7 @@ public class Window extends Container {
/**
* Opens the window.
- *
+ *
* @param display
*/
public final void open(Display display) {
@@ -602,9 +593,9 @@ public class Window extends Container {
/**
* Opens the window.
- *
- * @param ownerArgument
- * The window's owner. The window is opened on the owner's display.
+ *
+ * @param ownerArgument The window's owner. The window is opened on the
+ * owner's display.
*/
public final void open(Window ownerArgument) {
if (ownerArgument == null) {
@@ -615,15 +606,12 @@ public class Window extends Container {
}
/**
- * Opens the window.
- * <p>
- * Note that this method is not a synchronous call, it schedules an event to open the window.
- *
- * @param display
- * The display on which the window will be opened.
- *
- * @param ownerArgument
- * The window's owner, or <tt>null</tt> if the window has no owner.
+ * Opens the window. <p> Note that this method is not a synchronous call, it
+ * schedules an event to open the window.
+ *
+ * @param display The display on which the window will be opened.
+ * @param ownerArgument The window's owner, or <tt>null</tt> if the window
+ * has no owner.
*/
public void open(Display display, Window ownerArgument) {
if (display == null) {
@@ -683,9 +671,8 @@ public class Window extends Container {
/**
* Returns this window's closed state.
- *
- * @return
- * <tt>true</tt> if the window is closed; <tt>false</tt>, otherwise.
+ *
+ * @return <tt>true</tt> if the window is closed; <tt>false</tt>, otherwise.
*/
public boolean isClosed() {
return !isOpen();
@@ -693,17 +680,17 @@ public class Window extends Container {
/**
* Returns this window's closing state.
- *
- * @return
- * <tt>true</tt> if the window is closing; <tt>false</tt>, otherwise.
+ *
+ * @return <tt>true</tt> if the window is closing; <tt>false</tt>,
+ * otherwise.
*/
public boolean isClosing() {
return closing;
}
/**
- * Closes the window and all of its owned windows. If any owned window fails to close,
- * this window will also fail to close.
+ * Closes the window and all of its owned windows. If any owned window fails
+ * to close, this window will also fail to close.
*/
public void close() {
if (!isClosed()) {
@@ -715,12 +702,12 @@ public class Window extends Container {
boolean cancel = false;
for (Window ownedWindow : new ArrayList<>(this.ownedWindows)) {
ownedWindow.close();
- cancel |= !(ownedWindow.isClosing()
- || ownedWindow.isClosed());
+ cancel |= !(ownedWindow.isClosing() || ownedWindow.isClosed());
}
// Close this window only if all owned windows are closing or closed
- // (we allow the owner to close even if an owned window is only reports
+ // (we allow the owner to close even if an owned window is only
+ // reports
// that it is closing, under the assumption that it will ultimately
// close - not doing so would prevent close transitions from running
// in parallel, forcing them to run in series)
@@ -734,7 +721,8 @@ public class Window extends Container {
Display display = getDisplay();
display.remove(this);
- // Clear the owner and remove from the owner's owned window list
+ // Clear the owner and remove from the owner's owned window
+ // list
Window ownerLocal = this.owner;
this.owner = null;
@@ -759,9 +747,8 @@ public class Window extends Container {
/**
* Returns the window's title.
- *
- * @return
- * The pane's title, or <tt>null</tt> if no title is set.
+ *
+ * @return The pane's title, or <tt>null</tt> if no title is set.
*/
public String getTitle() {
return title;
@@ -769,9 +756,8 @@ public class Window extends Container {
/**
* Sets the window's title.
- *
- * @param title
- * The new title, or <tt>null</tt> for no title.
+ *
+ * @param title The new title, or <tt>null</tt> for no title.
*/
public void setTitle(String title) {
String previousTitle = this.title;
@@ -790,14 +776,11 @@ public class Window extends Container {
}
/**
- * Sets the window's icon by URL.
- * <p>
- * If the icon already exists in the application context resource cache,
- * the cached value will be used. Otherwise, the icon will be loaded
- * synchronously and added to the cache.
- *
- * @param iconURL
- * The location of the icon to set.
+ * Sets the window's icon by URL. <p> If the icon already exists in the
+ * application context resource cache, the cached value will be used.
+ * Otherwise, the icon will be loaded synchronously and added to the cache.
+ *
+ * @param iconURL The location of the icon to set.
*/
public void setIcon(URL iconURL) {
if (iconURL == null) {
@@ -813,10 +796,8 @@ public class Window extends Container {
/**
* Sets the window's icon by {@linkplain ClassLoader#getResource(String)
* resource name}.
- *
- * @param iconName
- * The resource name of the icon to set.
- *
+ *
+ * @param iconName The resource name of the icon to set.
* @see #setIcon(URL)
*/
public void setIcon(String iconName) {
@@ -862,15 +843,14 @@ public class Window extends Container {
* Returns the bounds of the window's client area.
*/
public Bounds getClientArea() {
- Window.Skin windowSkin = (Window.Skin)getSkin();
+ Window.Skin windowSkin = (Window.Skin) getSkin();
return windowSkin.getClientArea();
}
/**
* Returns the window's active state.
- *
- * @return
- * <tt>true</tt> if the window is active; <tt>false</tt>; otherwise.
+ *
+ * @return <tt>true</tt> if the window is active; <tt>false</tt>; otherwise.
*/
public boolean isActive() {
return (activeWindow == this);
@@ -878,14 +858,12 @@ public class Window extends Container {
/**
* Requests that this window become the active window.
- *
- * @return
- * <tt>true</tt> if the window became active; <tt>false</tt>, otherwise.
+ *
+ * @return <tt>true</tt> if the window became active; <tt>false</tt>,
+ * otherwise.
*/
public boolean requestActive() {
- if (isOpen()
- && isVisible()
- && isEnabled()) {
+ if (isOpen() && isVisible() && isEnabled()) {
setActiveWindow(this);
}
@@ -894,7 +872,7 @@ public class Window extends Container {
/**
* Called to notify a window that its active state has changed.
- *
+ *
* @param active
* @param obverseWindow
*/
@@ -904,10 +882,9 @@ public class Window extends Container {
/**
* Returns the currently active window.
- *
- * @return
- * The window that is currently active, or <tt>null</tt> if no window
- * is active.
+ *
+ * @return The window that is currently active, or <tt>null</tt> if no
+ * window is active.
*/
public static Window getActiveWindow() {
return activeWindow;
@@ -915,11 +892,10 @@ public class Window extends Container {
/**
* Sets the active window. The window must be activatable, open, and
- * enabled. If the window is not currently visible, it will be made
- * visible.
- *
- * @param activeWindow
- * The window to activate, or <tt>null</tt> to clear the active window.
+ * enabled. If the window is not currently visible, it will be made visible.
+ *
+ * @param activeWindow The window to activate, or <tt>null</tt> to clear the
+ * active window.
*/
private static void setActiveWindow(Window activeWindow) {
Window previousActiveWindow = Window.activeWindow;
@@ -951,8 +927,8 @@ public class Window extends Container {
}
/**
- * Returns the window descendant to which focus will be restored when this window
- * is moved to the front.
+ * Returns the window descendant to which focus will be restored when this
+ * window is moved to the front.
*/
public Component getFocusDescendant() {
return focusDescendant;
@@ -1008,9 +984,9 @@ public class Window extends Container {
/**
* Moves the window to the top of the window stack. All owned windows are
- * subsequently moved to the front, ensuring that this window's owned windows
- * remain on top of it. If the window does not have any owned windows,
- * focus is restored to it.
+ * subsequently moved to the front, ensuring that this window's owned
+ * windows remain on top of it. If the window does not have any owned
+ * windows, focus is restored to it.
*/
public void moveToFront() {
if (!isOpen()) {
@@ -1030,13 +1006,12 @@ public class Window extends Container {
if (ownedWindowCount == 0) {
// Restore focus
- if (isShowing()
- && isEnabled()
- && focusDescendant != null) {
+ if (isShowing() && isEnabled() && focusDescendant != null) {
focusDescendant.requestFocus();
}
} else {
- // Move all open owned windows to the front of this window, preserving the
+ // Move all open owned windows to the front of this window,
+ // preserving the
// current z-order
ArrayList<Integer> ownedWindowIndexes = new ArrayList<>(ownedWindowCount);
@@ -1050,7 +1025,7 @@ public class Window extends Container {
ArrayList<Window> sortedOwnedWindows = new ArrayList<>(ownedWindows.getLength());
for (Integer index : ownedWindowIndexes) {
- sortedOwnedWindows.add((Window)display.get(index));
+ sortedOwnedWindows.add((Window) display.get(index));
}
for (Window ownedWindow : sortedOwnedWindows) {
@@ -1111,14 +1086,12 @@ public class Window extends Container {
}
}
- public void align(Bounds bounds,
- HorizontalAlignment horizontalAlignment,
+ public void align(Bounds bounds, HorizontalAlignment horizontalAlignment,
VerticalAlignment verticalAlignment) {
align(bounds, horizontalAlignment, 0, verticalAlignment, 0);
}
- public void align(Bounds bounds,
- HorizontalAlignment horizontalAlignment, int horizontalOffset,
+ public void align(Bounds bounds, HorizontalAlignment horizontalAlignment, int horizontalOffset,
VerticalAlignment verticalAlignment, int verticalOffset) {
int x = 0;
@@ -1128,14 +1101,11 @@ public class Window extends Container {
if (horizontalAlignment == HorizontalAlignment.LEFT) {
x = bounds.x - size.width;
- }
- else if (horizontalAlignment == HorizontalAlignment.RIGHT) {
+ } else if (horizontalAlignment == HorizontalAlignment.RIGHT) {
x = bounds.x + bounds.width - size.width;
- }
- else if (horizontalAlignment == HorizontalAlignment.CENTER) {
- x = bounds.x + (int)Math.round((double)(bounds.width - size.width) / 2);
- }
- else {
+ } else if (horizontalAlignment == HorizontalAlignment.CENTER) {
+ x = bounds.x + (int) Math.round((double) (bounds.width - size.width) / 2);
+ } else {
throw new IllegalArgumentException("Unsupported horizontal alignment.");
}
@@ -1143,14 +1113,11 @@ public class Window extends Container {
if (verticalAlignment == VerticalAlignment.TOP) {
y = bounds.y - size.height;
- }
- else if (verticalAlignment == VerticalAlignment.BOTTOM) {
+ } else if (verticalAlignment == VerticalAlignment.BOTTOM) {
y = bounds.y + bounds.height;
- }
- else if (verticalAlignment == VerticalAlignment.CENTER) {
- y = bounds.y + (int)Math.round((double)(bounds.height - size.height) / 2);
- }
- else {
+ } else if (verticalAlignment == VerticalAlignment.CENTER) {
+ y = bounds.y + (int) Math.round((double) (bounds.height - size.height) / 2);
+ } else {
throw new IllegalArgumentException("Unsupported vertical alignment.");
}
@@ -1161,20 +1128,19 @@ public class Window extends Container {
@Override
public boolean keyPressed(int keyCode, Keyboard.KeyLocation keyLocation) {
- /* Use keyPressed rather than keyReleased other this sequence:
- * Press Ctrl, Press C, Release Ctrl, Release C
- * will not trigger the Ctrl-C action.
+ /*
+ * Use keyPressed rather than keyReleased other this sequence: Press
+ * Ctrl, Press C, Release Ctrl, Release C will not trigger the Ctrl-C
+ * action.
*/
boolean consumed = super.keyPressed(keyCode, keyLocation);
// Perform any action defined for this keystroke
// in the active window's action dictionary
- Keyboard.KeyStroke keyStroke = new Keyboard.KeyStroke(keyCode,
- Keyboard.getModifiers());
+ Keyboard.KeyStroke keyStroke = new Keyboard.KeyStroke(keyCode, Keyboard.getModifiers());
Action action = actionMap.get(keyStroke);
- if (action != null
- && action.isEnabled()) {
+ if (action != null && action.isEnabled()) {
action.perform(this);
}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/WindowActionMappingListener.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/WindowActionMappingListener.java?rev=1529349&r1=1529348&r2=1529349&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/WindowActionMappingListener.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/WindowActionMappingListener.java Fri Oct 4 23:45:40 2013
@@ -24,31 +24,33 @@ import org.apache.pivot.collections.Sequ
public interface WindowActionMappingListener {
/**
* Called when an action mapping has been added to a window.
- *
+ *
* @param window
*/
public void actionMappingAdded(Window window);
/**
* Called when action mappings have been removed from a window.
- *
+ *
* @param window
* @param index
* @param removed
*/
- public void actionMappingsRemoved(Window window, int index, Sequence<Window.ActionMapping> removed);
+ public void actionMappingsRemoved(Window window, int index,
+ Sequence<Window.ActionMapping> removed);
/**
* Called when an action mapping's keystroke has changed.
- *
+ *
* @param actionMapping
* @param previousKeyStroke
*/
- public void keyStrokeChanged(Window.ActionMapping actionMapping, Keyboard.KeyStroke previousKeyStroke);
+ public void keyStrokeChanged(Window.ActionMapping actionMapping,
+ Keyboard.KeyStroke previousKeyStroke);
/**
* Called when an action mapping's action has changed.
- *
+ *
* @param actionMapping
* @param previousAction
*/
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/WindowClassListener.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/WindowClassListener.java?rev=1529349&r1=1529348&r2=1529349&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/WindowClassListener.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/WindowClassListener.java Fri Oct 4 23:45:40 2013
@@ -22,7 +22,7 @@ package org.apache.pivot.wtk;
public interface WindowClassListener {
/**
* Called when the active window has changed.
- *
+ *
* @param previousActiveWindow
*/
public void activeWindowChanged(Window previousActiveWindow);
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/WindowListener.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/WindowListener.java?rev=1529349&r1=1529348&r2=1529349&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/WindowListener.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/WindowListener.java Fri Oct 4 23:45:40 2013
@@ -65,7 +65,7 @@ public interface WindowListener {
/**
* Called when a window's title has changed.
- *
+ *
* @param window
* @param previousTitle
*/
@@ -73,7 +73,7 @@ public interface WindowListener {
/**
* Called when a window's icon has changed.
- *
+ *
* @param window
* @param addedIcon
*/
@@ -81,7 +81,7 @@ public interface WindowListener {
/**
* Called when a window's icon has changed.
- *
+ *
* @param window
* @param addedIcon
*/
@@ -89,7 +89,7 @@ public interface WindowListener {
/**
* Called when a window's icon has changed.
- *
+ *
* @param window
* @param index
* @param removed
@@ -98,7 +98,7 @@ public interface WindowListener {
/**
* Called when a window's content component has changed.
- *
+ *
* @param window
* @param previousContent
*/
@@ -106,7 +106,7 @@ public interface WindowListener {
/**
* Called when a window's active state has changed.
- *
+ *
* @param window
* @param obverseWindow
*/
@@ -114,7 +114,7 @@ public interface WindowListener {
/**
* Called when a window's maximized state has changed.
- *
+ *
* @param window
*/
public void maximizedChanged(Window window);
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/WindowStateListener.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/WindowStateListener.java?rev=1529349&r1=1529348&r2=1529349&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/WindowStateListener.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/WindowStateListener.java Fri Oct 4 23:45:40 2013
@@ -59,28 +59,28 @@ public interface WindowStateListener {
/**
* Called when a window has opened.
- *
+ *
* @param window
*/
public void windowOpened(Window window);
/**
* Called to preview a window close event.
- *
+ *
* @param window
*/
public Vote previewWindowClose(Window window);
/**
* Called to preview a window open event.
- *
+ *
* @param window
*/
public Vote previewWindowOpen(Window window);
/**
* Called when a window close event has been vetoed.
- *
+ *
* @param window
* @param reason
*/
@@ -88,7 +88,7 @@ public interface WindowStateListener {
/**
* Called when a window open event has been vetoed.
- *
+ *
* @param window
* @param reason
*/
@@ -96,7 +96,7 @@ public interface WindowStateListener {
/**
* Called when a window has closed.
- *
+ *
* @param window
* @param display
* @param owner
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ButtonData.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ButtonData.java?rev=1529349&r1=1529348&r2=1529349&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ButtonData.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ButtonData.java Fri Oct 4 23:45:40 2013
@@ -54,14 +54,11 @@ public class ButtonData {
}
/**
- * Sets the button data's icon by URL.
- * <p>
- * If the icon already exists in the application context resource cache,
- * the cached value will be used. Otherwise, the icon will be loaded
- * synchronously and added to the cache.
- *
- * @param iconURL
- * The location of the icon to set.
+ * Sets the button data's icon by URL. <p> If the icon already exists in the
+ * application context resource cache, the cached value will be used.
+ * Otherwise, the icon will be loaded synchronously and added to the cache.
+ *
+ * @param iconURL The location of the icon to set.
*/
public void setIcon(URL iconURL) {
if (iconURL == null) {
@@ -72,12 +69,10 @@ public class ButtonData {
}
/**
- * Sets the button data's icon by {@linkplain ClassLoader#getResource(String)
- * resource name}.
- *
- * @param iconName
- * The resource name of the icon to set.
- *
+ * Sets the button data's icon by
+ * {@linkplain ClassLoader#getResource(String) resource name}.
+ *
+ * @param iconName The resource name of the icon to set.
* @see #setIcon(URL)
*/
public void setIcon(String iconName) {
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ButtonDataRenderer.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ButtonDataRenderer.java?rev=1529349&r1=1529348&r2=1529349&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ButtonDataRenderer.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ButtonDataRenderer.java Fri Oct 4 23:45:40 2013
@@ -28,7 +28,6 @@ import org.apache.pivot.wtk.Label;
import org.apache.pivot.wtk.VerticalAlignment;
import org.apache.pivot.wtk.media.Image;
-
/**
* Default button data renderer.
*/
@@ -61,10 +60,10 @@ public class ButtonDataRenderer extends
String text = null;
if (data instanceof ButtonData) {
- ButtonData buttonData = (ButtonData)data;
+ ButtonData buttonData = (ButtonData) data;
icon = buttonData.getIcon();
} else if (data instanceof Image) {
- icon = (Image)data;
+ icon = (Image) data;
}
text = toString(data);
@@ -83,10 +82,12 @@ public class ButtonDataRenderer extends
int buttonHeight = button.getHeight();
Insets padding = (Insets) button.getStyles().get("padding");
if (buttonWidth > 0) {
- imageView.setPreferredWidth(Math.max(buttonWidth - (padding.left + padding.right + 2), 0));
+ imageView.setPreferredWidth(Math.max(buttonWidth
+ - (padding.left + padding.right + 2), 0));
}
if (buttonHeight > 0) {
- imageView.setPreferredWidth(Math.max(buttonHeight - (padding.top + padding.bottom + 2), 0));
+ imageView.setPreferredWidth(Math.max(buttonHeight
+ - (padding.top + padding.bottom + 2), 0));
}
}
}
@@ -99,14 +100,14 @@ public class ButtonDataRenderer extends
} else {
label.setVisible(true);
- Font font = (Font)button.getStyles().get("font");
+ Font font = (Font) button.getStyles().get("font");
label.getStyles().put("font", font);
Color color;
if (button.isEnabled()) {
- color = (Color)button.getStyles().get("color");
+ color = (Color) button.getStyles().get("color");
} else {
- color = (Color)button.getStyles().get("disabledColor");
+ color = (Color) button.getStyles().get("disabledColor");
}
label.getStyles().put("color", color);
@@ -138,7 +139,7 @@ public class ButtonDataRenderer extends
}
public boolean getFillIcon() {
- return (Boolean)imageView.getStyles().get("fill");
+ return (Boolean) imageView.getStyles().get("fill");
}
public void setFillIcon(boolean fillIcon) {
@@ -151,7 +152,7 @@ public class ButtonDataRenderer extends
String string = null;
if (data instanceof ButtonData) {
- ButtonData buttonData = (ButtonData)data;
+ ButtonData buttonData = (ButtonData) data;
string = buttonData.getText();
} else if (!(data instanceof Image)) {
if (data != null) {
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/content/CalendarButtonDataRenderer.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/CalendarButtonDataRenderer.java?rev=1529349&r1=1529348&r2=1529349&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/content/CalendarButtonDataRenderer.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/content/CalendarButtonDataRenderer.java Fri Oct 4 23:45:40 2013
@@ -24,7 +24,6 @@ import org.apache.pivot.wtk.Button;
import org.apache.pivot.wtk.CalendarButton;
import org.apache.pivot.wtk.HorizontalAlignment;
-
/**
* Default calendar button data renderer.
*/
@@ -36,14 +35,14 @@ public class CalendarButtonDataRenderer
@Override
public void render(final Object data, final Button button, boolean highlight) {
Object dataMutable = data;
- CalendarButton calendarButton = (CalendarButton)button;
+ CalendarButton calendarButton = (CalendarButton) button;
Locale locale = calendarButton.getLocale();
if (dataMutable == null) {
dataMutable = "";
} else {
if (dataMutable instanceof CalendarDate) {
- CalendarDate date = (CalendarDate)dataMutable;
+ CalendarDate date = (CalendarDate) dataMutable;
DateFormat dateFormat = DateFormat.getDateInstance(DateFormat.MEDIUM, locale);
dataMutable = dateFormat.format(date.toCalendar().getTime());
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/content/CalendarDateSpinnerData.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/CalendarDateSpinnerData.java?rev=1529349&r1=1529348&r2=1529349&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/content/CalendarDateSpinnerData.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/content/CalendarDateSpinnerData.java Fri Oct 4 23:45:40 2013
@@ -29,20 +29,18 @@ import org.apache.pivot.collections.Sequ
import org.apache.pivot.util.CalendarDate;
import org.apache.pivot.util.ListenerList;
-
/**
- * Spinner data model that presents a bounded list of calendar dates.
- * <p>
- * This is a lightweight class that spoofs the actual list data by using an
- * internal calendar instance from which <tt>CalendarDate</tt> instances are
- * created on demand.
+ * Spinner data model that presents a bounded list of calendar dates. <p> This
+ * is a lightweight class that spoofs the actual list data by using an internal
+ * calendar instance from which <tt>CalendarDate</tt> instances are created on
+ * demand.
*/
public class CalendarDateSpinnerData implements List<CalendarDate> {
/**
* Iterator that simply wraps calls to the list. Since the internal list
* data is spoofed, each accessor runs in constant time, so there's no
- * performance hit in making the iterator delegate its implementation to
- * the list.
+ * performance hit in making the iterator delegate its implementation to the
+ * list.
*/
private class DataIterator implements Iterator<CalendarDate> {
private int index = 0;
@@ -73,8 +71,7 @@ public class CalendarDateSpinnerData imp
// Calculated during construction
private transient int length;
- private ListListenerList<CalendarDate> listListeners =
- new ListListenerList<>();
+ private ListListenerList<CalendarDate> listListeners = new ListListenerList<>();
/**
* Creates a new <tt>CalendarDateSpinnerData</tt> bounded from
@@ -87,12 +84,9 @@ public class CalendarDateSpinnerData imp
/**
* Creates a new <tt>CalendarDateSpinnerData</tt> bounded by the specified
* calendar dates (inclusive).
- *
- * @param lowerBound
- * The earliest date to include in this spinner data.
- *
- * @param upperBound
- * The latest date to include in this spinner data.
+ *
+ * @param lowerBound The earliest date to include in this spinner data.
+ * @param upperBound The latest date to include in this spinner data.
*/
public CalendarDateSpinnerData(CalendarDate lowerBound, CalendarDate upperBound) {
if (lowerBound == null) {
@@ -107,8 +101,7 @@ public class CalendarDateSpinnerData imp
throw new IllegalArgumentException("lowerBound is after upperBound.");
}
- calendar = new GregorianCalendar(lowerBound.year, lowerBound.month,
- lowerBound.day + 1);
+ calendar = new GregorianCalendar(lowerBound.year, lowerBound.month, lowerBound.day + 1);
calendar.setTimeZone(TimeZone.getTimeZone("GMT"));
calendarIndex = 0;
@@ -119,9 +112,8 @@ public class CalendarDateSpinnerData imp
upperBoundCalendar.setTimeZone(TimeZone.getTimeZone("GMT"));
long lowerBoundMilliseconds = calendar.getTimeInMillis();
long upperBoundMilliseconds = upperBoundCalendar.getTimeInMillis();
- long indexDiff = (upperBoundMilliseconds - lowerBoundMilliseconds) /
- (1000l * 60 * 60 * 24);
- length = (int)indexDiff + 1;
+ long indexDiff = (upperBoundMilliseconds - lowerBoundMilliseconds) / (1000l * 60 * 60 * 24);
+ length = (int) indexDiff + 1;
}
/**
@@ -166,9 +158,8 @@ public class CalendarDateSpinnerData imp
/**
* Gets the calendar date at the specified index.
- *
- * @param index
- * The index of the calendar date to retrieve.
+ *
+ * @param index The index of the calendar date to retrieve.
*/
@Override
public CalendarDate get(int index) {
@@ -197,7 +188,7 @@ public class CalendarDateSpinnerData imp
long itemMilliseconds = tmpCalendar.getTimeInMillis();
long indexDiff = (itemMilliseconds - currentMilliseconds) / (1000l * 60 * 60 * 24);
- int index = calendarIndex + (int)indexDiff;
+ int index = calendarIndex + (int) indexDiff;
return (index < 0 || index >= length) ? -1 : index;
}
@@ -217,9 +208,8 @@ public class CalendarDateSpinnerData imp
/**
* Gets the number of entries in this list.
- *
- * @return
- * The number of calendar dates in this list.
+ *
+ * @return The number of calendar dates in this list.
*/
@Override
public int getLength() {
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ColorItem.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ColorItem.java?rev=1529349&r1=1529348&r2=1529349&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ColorItem.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ColorItem.java Fri Oct 4 23:45:40 2013
@@ -76,8 +76,7 @@ public class ColorItem {
@Override
public boolean equals(Object o) {
- return (o instanceof ColorItem
- && ((ColorItem)o).color.equals(color));
+ return (o instanceof ColorItem && ((ColorItem) o).color.equals(color));
}
@Override
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/content/LinkButtonDataRenderer.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/LinkButtonDataRenderer.java?rev=1529349&r1=1529348&r2=1529349&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/content/LinkButtonDataRenderer.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/content/LinkButtonDataRenderer.java Fri Oct 4 23:45:40 2013
@@ -63,10 +63,10 @@ public class LinkButtonDataRenderer exte
String text = null;
if (data instanceof ButtonData) {
- ButtonData buttonData = (ButtonData)data;
+ ButtonData buttonData = (ButtonData) data;
icon = buttonData.getIcon();
} else if (data instanceof Image) {
- icon = (Image)data;
+ icon = (Image) data;
}
text = toString(data);
@@ -88,21 +88,20 @@ public class LinkButtonDataRenderer exte
} else {
label.setVisible(true);
- Font font = (Font)button.getStyles().get("font");
+ Font font = (Font) button.getStyles().get("font");
label.getStyles().put("font", font);
Color color;
if (button.isEnabled()) {
- color = (Color)button.getStyles().get("color");
+ color = (Color) button.getStyles().get("color");
} else {
- color = (Color)button.getStyles().get("disabledColor");
+ color = (Color) button.getStyles().get("disabledColor");
}
label.getStyles().put("color", color);
}
- label.getStyles().put("textDecoration", highlighted ?
- TextDecoration.UNDERLINE : null);
+ label.getStyles().put("textDecoration", highlighted ? TextDecoration.UNDERLINE : null);
}
@Override
@@ -110,7 +109,7 @@ public class LinkButtonDataRenderer exte
String string = null;
if (data instanceof ButtonData) {
- ButtonData buttonData = (ButtonData)data;
+ ButtonData buttonData = (ButtonData) data;
string = buttonData.getText();
} else if (!(data instanceof Image)) {
if (data != null) {
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ListButtonColorItemRenderer.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ListButtonColorItemRenderer.java?rev=1529349&r1=1529348&r2=1529349&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ListButtonColorItemRenderer.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ListButtonColorItemRenderer.java Fri Oct 4 23:45:40 2013
@@ -25,10 +25,8 @@ import org.apache.pivot.wtk.ImageView;
/**
* List button renderer for displaying color swatches.
*/
-public class ListButtonColorItemRenderer extends ImageView
- implements Button.DataRenderer {
- private ListViewColorItemRenderer.ColorBadge colorBadge =
- new ListViewColorItemRenderer.ColorBadge();
+public class ListButtonColorItemRenderer extends ImageView implements Button.DataRenderer {
+ private ListViewColorItemRenderer.ColorBadge colorBadge = new ListViewColorItemRenderer.ColorBadge();
public ListButtonColorItemRenderer() {
setImage(colorBadge);
@@ -49,16 +47,16 @@ public class ListButtonColorItemRenderer
if (data == null) {
color = Color.WHITE;
} else if (data instanceof ColorItem) {
- ColorItem colorItem = (ColorItem)data;
+ ColorItem colorItem = (ColorItem) data;
color = colorItem.getColor();
} else if (data instanceof Color) {
- color = (Color)data;
+ color = (Color) data;
} else {
color = GraphicsUtilities.decodeColor(data.toString());
}
- colorBadge.setColor(button.isEnabled() ?
- color : new Color(color.getRed(), color.getGreen(), color.getBlue(), 0x99));
+ colorBadge.setColor(button.isEnabled() ? color : new Color(color.getRed(),
+ color.getGreen(), color.getBlue(), 0x99));
}
@Override
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ListButtonDataRenderer.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ListButtonDataRenderer.java?rev=1529349&r1=1529348&r2=1529349&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ListButtonDataRenderer.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ListButtonDataRenderer.java Fri Oct 4 23:45:40 2013
@@ -20,10 +20,9 @@ import org.apache.pivot.wtk.Button;
import org.apache.pivot.wtk.HorizontalAlignment;
/**
- * Default list button data renderer.
- * <p>
- * TODO Add showIcon property to this class so the size of the button doesn't
- * change when changing selection between items with and without icons.
+ * Default list button data renderer. <p> TODO Add showIcon property to this
+ * class so the size of the button doesn't change when changing selection
+ * between items with and without icons.
*/
public class ListButtonDataRenderer extends ButtonDataRenderer {
public ListButtonDataRenderer() {
@@ -37,7 +36,7 @@ public class ListButtonDataRenderer exte
dataMutable = "";
} else {
if (dataMutable instanceof ListItem) {
- ListItem listItem = (ListItem)dataMutable;
+ ListItem listItem = (ListItem) dataMutable;
dataMutable = new ButtonData(listItem.getIcon(), listItem.getText());
}
}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ListItem.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ListItem.java?rev=1529349&r1=1529348&r2=1529349&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ListItem.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ListItem.java Fri Oct 4 23:45:40 2013
@@ -54,14 +54,11 @@ public class ListItem {
}
/**
- * Sets the list item's icon by URL.
- * <p>
- * If the icon already exists in the application context resource cache,
- * the cached value will be used. Otherwise, the icon will be loaded
- * synchronously and added to the cache.
- *
- * @param iconURL
- * The location of the icon to set.
+ * Sets the list item's icon by URL. <p> If the icon already exists in the
+ * application context resource cache, the cached value will be used.
+ * Otherwise, the icon will be loaded synchronously and added to the cache.
+ *
+ * @param iconURL The location of the icon to set.
*/
public void setIcon(URL iconURL) {
if (iconURL == null) {
@@ -74,10 +71,8 @@ public class ListItem {
/**
* Sets the list item's icon by {@linkplain ClassLoader#getResource(String)
* resource name}.
- *
- * @param iconName
- * The resource name of the icon to set.
- *
+ *
+ * @param iconName The resource name of the icon to set.
* @see #setIcon(URL)
*/
public void setIcon(String iconName) {
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ListViewColorItemRenderer.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ListViewColorItemRenderer.java?rev=1529349&r1=1529348&r2=1529349&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ListViewColorItemRenderer.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ListViewColorItemRenderer.java Fri Oct 4 23:45:40 2013
@@ -81,9 +81,9 @@ public class ListViewColorItemRenderer e
if (item != null) {
ColorItem colorItem;
if (item instanceof ColorItem) {
- colorItem = (ColorItem)item;
+ colorItem = (ColorItem) item;
} else if (item instanceof Color) {
- colorItem = new ColorItem((Color)item);
+ colorItem = new ColorItem((Color) item);
} else {
colorItem = new ColorItem(GraphicsUtilities.decodeColor(item.toString()));
}
@@ -91,8 +91,8 @@ public class ListViewColorItemRenderer e
Color color = colorItem.getColor();
String name = colorItem.getName();
- colorBadge.setColor(listView.isEnabled() ?
- color : new Color(color.getRed(), color.getGreen(), color.getBlue(), 0x99));
+ colorBadge.setColor(listView.isEnabled() ? color : new Color(color.getRed(),
+ color.getGreen(), color.getBlue(), 0x99));
listItem.setText(name);
}