From 3362e6c6c0c77e5765e1b8ee49a86b606617ba62 Mon Sep 17 00:00:00 2001 From: Mikle Date: Tue, 8 Oct 2013 17:02:10 +0400 Subject: [PATCH] Updates for v1.23 release #44 - Incorrect editor appearance in some rare cases fixed WebFileChooserPanel.java orientation change fixes WebFileChooserPanel.java view focus loss on view type change fixed Debug information is now stored within binaries Bytes translation fix --- README.md | 14 +- build/build.xml | 15 +- build/version.properties | 4 +- .../list/WebCheckBoxListCellEditor.java | 6 +- src/com/alee/extended/list/WebFileList.java | 40 +-- .../extended/list/WebFileListCellEditor.java | 31 +- .../list/WebFileListCellRenderer.java | 317 +++++++++++++----- .../laf/combobox/WebComboBoxCellRenderer.java | 2 +- .../laf/filechooser/WebFileChooserPanel.java | 181 +++++----- .../list/editor/AbstractListCellEditor.java | 57 ++-- .../list/editor/DefaultListCellEditor.java | 6 +- src/com/alee/laf/resources/language.xml | 14 +- src/com/alee/laf/resources/version.xml | 2 +- 13 files changed, 422 insertions(+), 267 deletions(-) diff --git a/README.md b/README.md index 55d53620d..9a53038a0 100644 --- a/README.md +++ b/README.md @@ -15,19 +15,19 @@ You can find more information about the library on official site:
http://weblookandfeel.com -Artifacts (v1.22) +Artifacts ---------- You can always find all WebLaF releases in the "releases" section:
https://github.com/mgarin/weblaf/releases Here are the direct links for the latest release: -1. [**weblaf-1.22.jar**](https://github.com/mgarin/weblaf/releases/download/v1.22/weblaf-1.22.jar) - library jar -2. [**weblaf-simple-1.22.jar**](https://github.com/mgarin/weblaf/releases/download/v1.22/weblaf-simple-1.22.jar) - library jar without dependencies -3. [**weblaf-src-1.22.zip**](https://github.com/mgarin/weblaf/releases/download/v1.22/weblaf-src-1.22.zip) - project sources zip -4. [**weblaf-demo-1.22.jar**](https://github.com/mgarin/weblaf/releases/download/v1.22/weblaf-demo-1.22.jar) - executable demo jar -5. [**weblaf-javadoc-1.22.zip**](https://github.com/mgarin/weblaf/releases/download/v1.22/weblaf-javadoc-1.22.zip) - JavaDoc zip -6. [**ninepatch-editor-1.22.jar**](https://github.com/mgarin/weblaf/releases/download/v1.22/ninepatch-editor-1.22.jar) - executable 9-patch editor jar +1. [**weblaf-1.23.jar**](https://github.com/mgarin/weblaf/releases/download/v1.23/weblaf-1.23.jar) - library jar +2. [**weblaf-simple-1.23.jar**](https://github.com/mgarin/weblaf/releases/download/v1.23/weblaf-simple-1.23.jar) - library jar without dependencies +3. [**weblaf-src-1.23.zip**](https://github.com/mgarin/weblaf/releases/download/v1.23/weblaf-src-1.23.zip) - project sources zip +4. [**weblaf-demo-1.23.jar**](https://github.com/mgarin/weblaf/releases/download/v1.23/weblaf-demo-1.23.jar) - executable demo jar +5. [**weblaf-javadoc-1.23.zip**](https://github.com/mgarin/weblaf/releases/download/v1.23/weblaf-javadoc-1.23.zip) - JavaDoc zip +6. [**ninepatch-editor-1.23.jar**](https://github.com/mgarin/weblaf/releases/download/v1.23/ninepatch-editor-1.23.jar) - executable 9-patch editor jar Roadmap diff --git a/build/build.xml b/build/build.xml index bda599ccf..d4aaf6ab3 100644 --- a/build/build.xml +++ b/build/build.xml @@ -30,7 +30,7 @@ - + @@ -233,6 +233,19 @@ + + + + + + + + + + + + + diff --git a/build/version.properties b/build/version.properties index d7193455b..ed07b935b 100644 --- a/build/version.properties +++ b/build/version.properties @@ -1,3 +1,3 @@ -#Tue Oct 01 13:54:49 MSK 2013 -build.number=23 +#Tue Oct 08 16:53:21 MSK 2013 +build.number=24 version.number=1 diff --git a/src/com/alee/extended/list/WebCheckBoxListCellEditor.java b/src/com/alee/extended/list/WebCheckBoxListCellEditor.java index b9ab362b8..a66c456e5 100644 --- a/src/com/alee/extended/list/WebCheckBoxListCellEditor.java +++ b/src/com/alee/extended/list/WebCheckBoxListCellEditor.java @@ -41,7 +41,7 @@ public class WebCheckBoxListCellEditor extends AbstractListCellEditor data ) + public WebFileList ( final List data ) { super ( new FileListModel ( data ) ); initializeDefaultSettings (); @@ -182,7 +182,7 @@ protected ListCellEditor createDefaultCellEditor () * * @param preferredColumnCount new preferred visible column count */ - public void setPreferredColumnCount ( int preferredColumnCount ) + public void setPreferredColumnCount ( final int preferredColumnCount ) { this.preferredColumnCount = preferredColumnCount; } @@ -212,7 +212,7 @@ public int getPreferredRowCount () * * @param preferredRowCount new preferred visible row count */ - public void setPreferredRowCount ( int preferredRowCount ) + public void setPreferredRowCount ( final int preferredRowCount ) { this.preferredRowCount = preferredRowCount; } @@ -232,7 +232,7 @@ public boolean isGenerateThumbnails () * * @param generateThumbnails whether to generate image file thumbnails or not */ - public void setGenerateThumbnails ( boolean generateThumbnails ) + public void setGenerateThumbnails ( final boolean generateThumbnails ) { this.generateThumbnails = generateThumbnails; } @@ -252,7 +252,7 @@ public FileListViewType getFileListViewType () * * @param fileListViewType new file view mode */ - public void setFileListViewType ( FileListViewType fileListViewType ) + public void setFileListViewType ( final FileListViewType fileListViewType ) { this.fileListViewType = fileListViewType; getWebFileListCellRenderer ().updateFilesView (); @@ -273,7 +273,7 @@ public FileFilter getFileFilter () * * @param fileFilter new file filter */ - public void setFileFilter ( FileFilter fileFilter ) + public void setFileFilter ( final FileFilter fileFilter ) { this.fileFilter = fileFilter; reloadFiles (); @@ -304,7 +304,7 @@ public File getDisplayedDirectory () * * @param file new displayed directory */ - public void setDisplayedDirectory ( File file ) + public void setDisplayedDirectory ( final File file ) { // Stop cell editing stopCellEditing (); @@ -358,7 +358,7 @@ public File getSelectedFile () * * @param file file to select */ - public void setSelectedFile ( File file ) + public void setSelectedFile ( final File file ) { setSelectedFile ( file, true ); } @@ -369,7 +369,7 @@ public void setSelectedFile ( File file ) * @param file file to select * @param shouldScroll whether to scroll to selected file or not */ - public void setSelectedFile ( File file, boolean shouldScroll ) + public void setSelectedFile ( final File file, final boolean shouldScroll ) { final FileElement element = getFileListModel ().getElement ( file ); if ( element != null ) @@ -387,7 +387,7 @@ public void setSelectedFile ( File file, boolean shouldScroll ) * * @param files files to select */ - public void setSelectedFiles ( Collection files ) + public void setSelectedFiles ( final Collection files ) { final List elements = new ArrayList ( files.size () ); for ( File file : files ) @@ -427,15 +427,15 @@ public WebScrollPane createScrollView () @Override public Dimension getPreferredSize () { - Dimension ps = super.getPreferredSize (); - Dimension oneCell; + final Dimension ps = super.getPreferredSize (); + final Dimension oneCell; if ( getModel ().getSize () > 0 ) { oneCell = getCellBounds ( 0, 0 ).getSize (); } else { - WebFileListCellRenderer fileListCellRenderer = getWebFileListCellRenderer (); + final WebFileListCellRenderer fileListCellRenderer = getWebFileListCellRenderer (); if ( fileListCellRenderer != null ) { oneCell = fileListCellRenderer.getPreferredSize (); @@ -445,7 +445,7 @@ public Dimension getPreferredSize () oneCell = new Dimension ( 400, 300 ); } } - Insets bi = getInsets (); + final Insets bi = getInsets (); ps.width = oneCell.width * preferredColumnCount + bi.left + bi.right + WebScrollBarUI.LENGTH + 1; ps.height = oneCell.height * preferredRowCount + bi.top + bi.bottom + 1; return ps; @@ -461,10 +461,10 @@ public Dimension getPreferredSize () @Override public Dimension getPreferredSize () { - Dimension ps = super.getPreferredSize (); + final Dimension ps = super.getPreferredSize (); if ( getModel ().getSize () > 0 ) { - Dimension oneCell = getCellBounds ( 0, 0 ).getSize (); + final Dimension oneCell = getCellBounds ( 0, 0 ).getSize (); ps.width = oneCell.width * preferredColumnCount; } return ps; @@ -475,7 +475,7 @@ public Dimension getPreferredSize () * * @param element element to process */ - public void repaint ( FileElement element ) + public void repaint ( final FileElement element ) { repaint ( getFileListModel ().indexOf ( element ) ); } diff --git a/src/com/alee/extended/list/WebFileListCellEditor.java b/src/com/alee/extended/list/WebFileListCellEditor.java index 29913828f..ca48684dc 100644 --- a/src/com/alee/extended/list/WebFileListCellEditor.java +++ b/src/com/alee/extended/list/WebFileListCellEditor.java @@ -40,7 +40,7 @@ public class WebFileListCellEditor extends AbstractListCellEditor= 0 && historyIndex < navigationHistory.size () ) { @@ -663,7 +663,7 @@ protected void createFileTree () fileTreeListener = new TreeSelectionListener () { @Override - public void valueChanged ( TreeSelectionEvent e ) + public void valueChanged ( final TreeSelectionEvent e ) { if ( fileTree.getSelectionCount () > 0 ) { @@ -700,7 +700,7 @@ public boolean isEnabled () } @Override - public void actionPerformed ( ActionEvent e ) + public void actionPerformed ( final ActionEvent e ) { File file = fileList.getSelectedFile (); if ( file.isDirectory () ) @@ -713,11 +713,11 @@ public void actionPerformed ( ActionEvent e ) fileList.addMouseListener ( new MouseAdapter () { @Override - public void mouseClicked ( MouseEvent e ) + public void mouseClicked ( final MouseEvent e ) { if ( SwingUtilities.isLeftMouseButton ( e ) && e.getClickCount () % 2 == 0 && fileList.getSelectedIndex () != -1 ) { - File file = fileList.getSelectedFile (); + final File file = fileList.getSelectedFile (); if ( file.isDirectory () ) { updateCurrentFolder ( file, UpdateSource.list ); @@ -733,7 +733,7 @@ public void mouseClicked ( MouseEvent e ) fileList.addListSelectionListener ( new ListSelectionListener () { @Override - public void valueChanged ( ListSelectionEvent e ) + public void valueChanged ( final ListSelectionEvent e ) { updateSelectedFilesField (); } @@ -742,10 +742,10 @@ public void valueChanged ( ListSelectionEvent e ) fileList.addListEditListener ( new ListEditAdapter () { @Override - public void editFinished ( int index, Object oldValue, Object newValue ) + public void editFinished ( final int index, final Object oldValue, final Object newValue ) { // Saving for futher selection - File file = ( ( FileElement ) newValue ).getFile (); + final File file = ( ( FileElement ) newValue ).getFile (); // Updating current view // This action can be optimized, but that will make a lot of additional actions and most likely cause some troubles @@ -780,7 +780,7 @@ public boolean isEnabled () } @Override - public void actionPerformed ( ActionEvent e ) + public void actionPerformed ( final ActionEvent e ) { File file = fileTable.getSelectedFile (); if ( file.isDirectory () ) @@ -793,11 +793,11 @@ public void actionPerformed ( ActionEvent e ) fileTable.addMouseListener ( new MouseAdapter () { @Override - public void mouseClicked ( MouseEvent e ) + public void mouseClicked ( final MouseEvent e ) { if ( SwingUtilities.isLeftMouseButton ( e ) && e.getClickCount () % 2 == 0 && fileTable.getSelectedRow () != -1 ) { - File file = fileTable.getSelectedFile (); + final File file = fileTable.getSelectedFile (); if ( file.isDirectory () ) { updateCurrentFolder ( file, UpdateSource.table ); @@ -813,7 +813,7 @@ public void mouseClicked ( MouseEvent e ) fileTable.getSelectionModel ().addListSelectionListener ( new ListSelectionListener () { @Override - public void valueChanged ( ListSelectionEvent e ) + public void valueChanged ( final ListSelectionEvent e ) { updateSelectedFilesField (); } @@ -822,7 +822,7 @@ public void valueChanged ( ListSelectionEvent e ) fileTable.getDefaultEditor ( File.class ).addCellEditorListener ( new CellEditorListener () { @Override - public void editingStopped ( ChangeEvent e ) + public void editingStopped ( final ChangeEvent e ) { // Saving for futher selection final File file = fileTable.getSelectedFile (); @@ -836,7 +836,7 @@ public void editingStopped ( ChangeEvent e ) } @Override - public void editingCanceled ( ChangeEvent e ) + public void editingCanceled ( final ChangeEvent e ) { // Do nothing } @@ -877,7 +877,7 @@ protected Component createSouthContent () selectedFilesTextField.addCaretListener ( new CaretListener () { @Override - public void caretUpdate ( CaretEvent e ) + public void caretUpdate ( final CaretEvent e ) { // No need to specify files, they will be calculated when needed updateApproveButtonState ( null ); @@ -886,7 +886,7 @@ public void caretUpdate ( CaretEvent e ) selectedFilesTextField.addActionListener ( new ActionListener () { @Override - public void actionPerformed ( ActionEvent e ) + public void actionPerformed ( final ActionEvent e ) { // Try to approve selection approveButton.doClick ( 0 ); @@ -901,7 +901,7 @@ public void actionPerformed ( ActionEvent e ) fileFilters.addActionListener ( new ActionListener () { @Override - public void actionPerformed ( ActionEvent e ) + public void actionPerformed ( final ActionEvent e ) { setActiveFileFilter ( ( DefaultFileFilter ) fileFilters.getSelectedItem (), false ); } @@ -916,7 +916,7 @@ public void actionPerformed ( ActionEvent e ) approveButton.addActionListener ( new ActionListener () { @Override - public void actionPerformed ( ActionEvent e ) + public void actionPerformed ( final ActionEvent e ) { fireApproveAction ( e ); } @@ -931,7 +931,7 @@ public void actionPerformed ( ActionEvent e ) cancelButton.addActionListener ( new ActionListener () { @Override - public void actionPerformed ( ActionEvent e ) + public void actionPerformed ( final ActionEvent e ) { fireCancelAction ( e ); } @@ -946,7 +946,7 @@ public void actionPerformed ( ActionEvent e ) final PropertyChangeListener pcl = new PropertyChangeListener () { @Override - public void propertyChange ( PropertyChangeEvent evt ) + public void propertyChange ( final PropertyChangeEvent e ) { approveButton.setPreferredSize ( null ); cancelButton.setPreferredSize ( null ); @@ -975,7 +975,7 @@ public FileChooserViewType getViewType () * * @param viewType directory files view type */ - public void setViewType ( FileChooserViewType viewType ) + public void setViewType ( final FileChooserViewType viewType ) { // Flag used to transfer selection between different view components final boolean viewChanged = viewType.getComponentIndex () != this.viewType.getComponentIndex (); @@ -995,6 +995,7 @@ public void setViewType ( FileChooserViewType viewType ) if ( viewChanged ) { fileList.setSelectedFiles ( fileTable.getSelectedFiles () ); + fileList.requestFocusInWindow (); } break; } @@ -1007,6 +1008,7 @@ public void setViewType ( FileChooserViewType viewType ) if ( viewChanged ) { fileList.setSelectedFiles ( fileTable.getSelectedFiles () ); + fileList.requestFocusInWindow (); } break; } @@ -1016,6 +1018,7 @@ public void setViewType ( FileChooserViewType viewType ) if ( viewChanged ) { fileTable.setSelectedFiles ( fileList.getSelectedFiles () ); + fileTable.requestFocusInWindow (); } break; } @@ -1028,7 +1031,7 @@ public void setViewType ( FileChooserViewType viewType ) * * @param folder folder to be opened */ - public void setCurrentFolder ( File folder ) + public void setCurrentFolder ( final File folder ) { updateCurrentFolder ( folder, UpdateSource.other ); } @@ -1039,7 +1042,7 @@ public void setCurrentFolder ( File folder ) * @param file folder to be opened or file to be displayed * @param updateSource update call source */ - protected void updateCurrentFolder ( File file, UpdateSource updateSource ) + protected void updateCurrentFolder ( File file, final UpdateSource updateSource ) { // System.out.println ( "updateCurrentFolder: " + ( file != null ? file.getAbsolutePath () : null ) ); @@ -1154,7 +1157,7 @@ public List getSelectedFiles () * @param allFiles files to filter * @return list of filtered selected files */ - protected List getFilteredSelectedFiles ( List allFiles ) + protected List getFilteredSelectedFiles ( final List allFiles ) { return FileUtils.filterFiles ( allFiles, fileFilter ); } @@ -1187,7 +1190,7 @@ else if ( viewType.getComponentIndex () == 1 ) * * @param file file to select */ - public void setSelectedFile ( File file ) + public void setSelectedFile ( final File file ) { // System.out.println ( "setSelectedFile: " + ( file != null ? file.getAbsolutePath () : null ) ); if ( viewType.getComponentIndex () == 0 ) @@ -1205,7 +1208,7 @@ public void setSelectedFile ( File file ) * * @param files files to select */ - public void setSelectedFiles ( File[] files ) + public void setSelectedFiles ( final File[] files ) { setSelectedFiles ( CollectionUtils.toList ( files ) ); } @@ -1215,7 +1218,7 @@ public void setSelectedFiles ( File[] files ) * * @param files files to select */ - public void setSelectedFiles ( Collection files ) + public void setSelectedFiles ( final Collection files ) { // System.out.println ( "setSelectedFiles: " + ( files != null ? files.size () : null ) ); if ( viewType.getComponentIndex () == 0 ) @@ -1308,7 +1311,7 @@ protected void updateSelectedFilesFieldPanel () * * @param file new current folder */ - protected void updatePath ( File file ) + protected void updatePath ( final File file ) { pathField.removePathFieldListener ( pathFieldListener ); pathField.setSelectedPath ( file ); @@ -1347,7 +1350,7 @@ public void run () * * @param file new current folder */ - protected void updateList ( File file ) + protected void updateList ( final File file ) { fileList.setDisplayedDirectory ( file ); } @@ -1357,7 +1360,7 @@ protected void updateList ( File file ) * * @param file new current folder */ - protected void updateTable ( File file ) + protected void updateTable ( final File file ) { fileTable.setDisplayedDirectory ( file ); } @@ -1376,7 +1379,7 @@ protected void updateFiltersComboBox () * * @param fileFilter file filter to make active */ - public void setActiveFileFilter ( DefaultFileFilter fileFilter ) + public void setActiveFileFilter ( final DefaultFileFilter fileFilter ) { setActiveFileFilter ( fileFilter, true ); } @@ -1388,7 +1391,7 @@ public void setActiveFileFilter ( DefaultFileFilter fileFilter ) * @param fileFilter file filter to make active * @param select whether to select active file filter in combobox or not */ - protected void setActiveFileFilter ( DefaultFileFilter fileFilter, boolean select ) + protected void setActiveFileFilter ( DefaultFileFilter fileFilter, final boolean select ) { // Simply take the first available filter if the specified one is not available if ( !availableFilters.contains ( fileFilter ) ) @@ -1427,7 +1430,7 @@ protected void updateDirectoryFilters () * @param fileFilter filter to process * @return new file filter with additional condition */ - protected GroupedFileFilter applyAndNonHiddenFilter ( DefaultFileFilter fileFilter ) + protected GroupedFileFilter applyAndNonHiddenFilter ( final DefaultFileFilter fileFilter ) { // todo Hidden/nonhidden setting return new GroupedFileFilter ( FilterGroupType.AND, fileFilter, GlobalConstants.NON_HIDDEN_ONLY_FILTER ); @@ -1439,7 +1442,7 @@ protected GroupedFileFilter applyAndNonHiddenFilter ( DefaultFileFilter fileFilt * @param fileFilter filter to process * @return new file filter with additional condition */ - protected GroupedFileFilter applyAndDirectoriesFilter ( DefaultFileFilter fileFilter ) + protected GroupedFileFilter applyAndDirectoriesFilter ( final DefaultFileFilter fileFilter ) { // todo Hidden/nonhidden setting return new GroupedFileFilter ( FilterGroupType.AND, fileFilter, GlobalConstants.NON_HIDDEN_DIRECTORIES_FILTER ); @@ -1451,7 +1454,7 @@ protected GroupedFileFilter applyAndDirectoriesFilter ( DefaultFileFilter fileFi * @param fileFilter filter to process * @return new file filter with additional condition */ - protected GroupedFileFilter applyOrDirectoriesFilter ( DefaultFileFilter fileFilter ) + protected GroupedFileFilter applyOrDirectoriesFilter ( final DefaultFileFilter fileFilter ) { // todo Hidden/nonhidden setting return new GroupedFileFilter ( FilterGroupType.OR, fileFilter, GlobalConstants.NON_HIDDEN_DIRECTORIES_FILTER ); @@ -1495,23 +1498,23 @@ public void editSelectedFileName () */ public void deleteSelectedFiles () { - List files = getAllSelectedFiles (); + final List files = getAllSelectedFiles (); if ( files.isEmpty () ) { return; } - WebPanel all = new WebPanel ( new BorderLayout ( 0, 5 ) ); + final WebPanel all = new WebPanel ( new BorderLayout ( 0, 5 ) ); all.add ( new WebLabel ( LanguageManager.get ( "weblaf.filechooser.delete.confirm.text" ) ), BorderLayout.NORTH ); - WebPanel deleteFilesPanel = new WebPanel ( new VerticalFlowLayout ( VerticalFlowLayout.TOP, 0, 5, true, false ) ); + final WebPanel deleteFilesPanel = new WebPanel ( new VerticalFlowLayout ( VerticalFlowLayout.TOP, 0, 5, true, false ) ); deleteFilesPanel.setMargin ( 3 ); deleteFilesPanel.setBackground ( Color.WHITE ); for ( File file : files ) { deleteFilesPanel.add ( new WebLabel ( file.getName (), FileUtils.getFileIcon ( file ), WebLabel.LEFT ) ); } - WebScrollPane scroll = new WebScrollPane ( deleteFilesPanel ) + final WebScrollPane scroll = new WebScrollPane ( deleteFilesPanel ) { @Override public Dimension getPreferredSize () @@ -1525,7 +1528,7 @@ public Dimension getPreferredSize () all.add ( scroll, BorderLayout.CENTER ); final String title = LanguageManager.get ( "weblaf.filechooser.delete.confirm.title" ); - int confirm = WebOptionPane + final int confirm = WebOptionPane .showConfirmDialog ( WebFileChooserPanel.this, all, title, WebOptionPane.YES_NO_OPTION, WebOptionPane.QUESTION_MESSAGE ); if ( confirm == WebOptionPane.YES_OPTION ) @@ -1550,7 +1553,7 @@ public ActionListener getApproveListener () * * @param approveListener approve button listener */ - public void setApproveListener ( ActionListener approveListener ) + public void setApproveListener ( final ActionListener approveListener ) { this.approveListener = approveListener; } @@ -1570,7 +1573,7 @@ public ActionListener getCancelListener () * * @param cancelListener cancel button listener */ - public void setCancelListener ( ActionListener cancelListener ) + public void setCancelListener ( final ActionListener cancelListener ) { this.cancelListener = cancelListener; } @@ -1580,7 +1583,7 @@ public void setCancelListener ( ActionListener cancelListener ) * * @param e action event */ - protected void fireApproveAction ( ActionEvent e ) + protected void fireApproveAction ( final ActionEvent e ) { if ( approveListener != null ) { @@ -1593,7 +1596,7 @@ protected void fireApproveAction ( ActionEvent e ) * * @param e action event */ - protected void fireCancelAction ( ActionEvent e ) + protected void fireCancelAction ( final ActionEvent e ) { if ( cancelListener != null ) { @@ -1659,7 +1662,7 @@ public void setFileFilter ( final DefaultFileFilter fileFilter ) * * @param fileFilters available file filters */ - public void setFileFilters ( FileFilter[] fileFilters ) + public void setFileFilters ( final FileFilter[] fileFilters ) { setFileFilters ( 0, fileFilters ); } @@ -1670,7 +1673,7 @@ public void setFileFilters ( FileFilter[] fileFilters ) * @param index default filter index * @param fileFilters available file filters */ - public void setFileFilters ( int index, FileFilter[] fileFilters ) + public void setFileFilters ( final int index, final FileFilter[] fileFilters ) { availableFilters = new ArrayList ( fileFilters.length ); for ( FileFilter fileFilter : fileFilters ) @@ -1687,7 +1690,7 @@ public void setFileFilters ( int index, FileFilter[] fileFilters ) * * @param fileFilters available file filters */ - public void setFileFilters ( javax.swing.filechooser.FileFilter[] fileFilters ) + public void setFileFilters ( final javax.swing.filechooser.FileFilter[] fileFilters ) { setFileFilters ( 0, fileFilters ); } @@ -1698,7 +1701,7 @@ public void setFileFilters ( javax.swing.filechooser.FileFilter[] fileFilters ) * @param index default filter index * @param fileFilters available file filters */ - public void setFileFilters ( int index, javax.swing.filechooser.FileFilter[] fileFilters ) + public void setFileFilters ( final int index, final javax.swing.filechooser.FileFilter[] fileFilters ) { availableFilters = new ArrayList ( fileFilters.length ); for ( javax.swing.filechooser.FileFilter filtfileFilter : fileFilters ) @@ -1715,7 +1718,7 @@ public void setFileFilters ( int index, javax.swing.filechooser.FileFilter[] fil * * @param fileFilters available file filters */ - public void setFileFilters ( DefaultFileFilter[] fileFilters ) + public void setFileFilters ( final DefaultFileFilter[] fileFilters ) { setFileFilters ( 0, fileFilters ); } @@ -1726,7 +1729,7 @@ public void setFileFilters ( DefaultFileFilter[] fileFilters ) * @param index default filter index * @param fileFilters available file filters */ - public void setFileFilters ( int index, DefaultFileFilter[] fileFilters ) + public void setFileFilters ( final int index, final DefaultFileFilter[] fileFilters ) { this.availableFilters = Arrays.asList ( fileFilters ); updateFiltersComboBox (); @@ -1739,7 +1742,7 @@ public void setFileFilters ( int index, DefaultFileFilter[] fileFilters ) * * @param fileFilters available file filters */ - public void setFileFilters ( List fileFilters ) + public void setFileFilters ( final List fileFilters ) { setFileFilters ( 0, fileFilters ); } @@ -1750,7 +1753,7 @@ public void setFileFilters ( List fileFilters ) * @param index default filter index * @param fileFilters available file filters */ - public void setFileFilters ( int index, List fileFilters ) + public void setFileFilters ( final int index, final List fileFilters ) { this.availableFilters = CollectionUtils.copy ( fileFilters ); updateFiltersComboBox (); @@ -1772,7 +1775,7 @@ public boolean isShowControlButtons () * * @param showControlButtons whether to display control buttons or not */ - public void setShowControlButtons ( boolean showControlButtons ) + public void setShowControlButtons ( final boolean showControlButtons ) { this.showControlButtons = showControlButtons; updateControls (); @@ -1811,7 +1814,7 @@ public void restoreButtonText () * * @param text approve button text */ - public void setApproveButtonText ( String text ) + public void setApproveButtonText ( final String text ) { if ( text == null ) { @@ -1830,7 +1833,7 @@ public void setApproveButtonText ( String text ) * * @param approveText approve button text type */ - public void setApproveButtonText ( FileApproveText approveText ) + public void setApproveButtonText ( final FileApproveText approveText ) { setApproveButtonLanguage ( approveText.getLanguageKey () ); } @@ -1840,7 +1843,7 @@ public void setApproveButtonText ( FileApproveText approveText ) * * @param key approve button language key */ - public void setApproveButtonLanguage ( String key ) + public void setApproveButtonLanguage ( final String key ) { approveButton.setLanguage ( key ); } @@ -1860,7 +1863,7 @@ public FileChooserType getChooserType () * * @param chooserType new chooser type */ - public void setChooserType ( FileChooserType chooserType ) + public void setChooserType ( final FileChooserType chooserType ) { this.chooserType = chooserType; updateSelectionMode (); @@ -1874,7 +1877,7 @@ public void setChooserType ( FileChooserType chooserType ) * * @param listener new file chooser listener */ - public void addFileChooserListener ( FileChooserListener listener ) + public void addFileChooserListener ( final FileChooserListener listener ) { chooserListeners.add ( listener ); } @@ -1884,7 +1887,7 @@ public void addFileChooserListener ( FileChooserListener listener ) * * @param listener file chooser listener to remove */ - public void removeFileChooserListener ( FileChooserListener listener ) + public void removeFileChooserListener ( final FileChooserListener listener ) { chooserListeners.remove ( listener ); } @@ -1894,9 +1897,9 @@ public void removeFileChooserListener ( FileChooserListener listener ) * * @param newDirectory newly displayed directory */ - protected void fireDirectoryChanged ( File newDirectory ) + protected void fireDirectoryChanged ( final File newDirectory ) { - for ( FileChooserListener listener : CollectionUtils.copy ( chooserListeners ) ) + for ( final FileChooserListener listener : CollectionUtils.copy ( chooserListeners ) ) { listener.directoryChanged ( newDirectory ); } @@ -1907,9 +1910,9 @@ protected void fireDirectoryChanged ( File newDirectory ) * * @param selectedFiles newly selected files */ - protected void fireFileSelectionChanged ( List selectedFiles ) + protected void fireFileSelectionChanged ( final List selectedFiles ) { - for ( FileChooserListener listener : CollectionUtils.copy ( chooserListeners ) ) + for ( final FileChooserListener listener : CollectionUtils.copy ( chooserListeners ) ) { listener.selectionChanged ( selectedFiles ); } @@ -1930,7 +1933,7 @@ public boolean isMultiSelectionEnabled () * * @param multiSelectionEnabled whether multiply files selection is allowed or not */ - public void setMultiSelectionEnabled ( boolean multiSelectionEnabled ) + public void setMultiSelectionEnabled ( final boolean multiSelectionEnabled ) { this.multiSelectionEnabled = multiSelectionEnabled; updateSelectionMode (); @@ -1965,7 +1968,7 @@ public boolean isGenerateThumbnails () * * @param generate whether file thumbnails should be generated or not */ - public void setGenerateThumbnails ( boolean generate ) + public void setGenerateThumbnails ( final boolean generate ) { this.fileList.setGenerateThumbnails ( generate ); } @@ -2026,7 +2029,7 @@ protected class FilesLocateDropHandler extends FileDropHandler * * @param updateSource source of updates */ - public FilesLocateDropHandler ( UpdateSource updateSource ) + public FilesLocateDropHandler ( final UpdateSource updateSource ) { super (); this.updateSource = updateSource; @@ -2036,11 +2039,11 @@ public FilesLocateDropHandler ( UpdateSource updateSource ) * {@inheritDoc} */ @Override - protected boolean filesImported ( List files ) + protected boolean filesImported ( final List files ) { if ( files.size () > 0 ) { - File file = files.get ( 0 ); + final File file = files.get ( 0 ); if ( files.size () == 1 && FileUtils.isDirectory ( file ) ) { updateCurrentFolder ( file, updateSource ); diff --git a/src/com/alee/laf/list/editor/AbstractListCellEditor.java b/src/com/alee/laf/list/editor/AbstractListCellEditor.java index c99ec8b26..3228395a4 100644 --- a/src/com/alee/laf/list/editor/AbstractListCellEditor.java +++ b/src/com/alee/laf/list/editor/AbstractListCellEditor.java @@ -75,7 +75,7 @@ public void install ( final JList list ) editorPositionUpdater = new ComponentAdapter () { @Override - public void componentResized ( ComponentEvent e ) + public void componentResized ( final ComponentEvent e ) { checkEditorBounds (); } @@ -84,7 +84,7 @@ private void checkEditorBounds () { if ( isEditing () ) { - Rectangle newBounds = getEditorBounds ( list, editedCell, oldValue ); + final Rectangle newBounds = getEditorBounds ( list, editedCell, oldValue ); if ( newBounds != null && !newBounds.equals ( editor.getBounds () ) ) { editor.setBounds ( newBounds ); @@ -110,7 +110,7 @@ protected void installStartEditActions ( final JList list ) mouseAdapter = new MouseAdapter () { @Override - public void mouseClicked ( MouseEvent e ) + public void mouseClicked ( final MouseEvent e ) { if ( e.getClickCount () == 2 && SwingUtilities.isLeftMouseButton ( e ) ) { @@ -129,7 +129,7 @@ public void mouseClicked ( MouseEvent e ) keyAdapter = new KeyAdapter () { @Override - public void keyReleased ( KeyEvent e ) + public void keyReleased ( final KeyEvent e ) { if ( Hotkey.F2.isTriggered ( e ) ) { @@ -144,7 +144,7 @@ public void keyReleased ( KeyEvent e ) * {@inheritDoc} */ @Override - public void uninstall ( JList list ) + public void uninstall ( final JList list ) { // Uninstalling edit bounds updater list.removeComponentListener ( editorPositionUpdater ); @@ -158,7 +158,7 @@ public void uninstall ( JList list ) * * @param list list to process */ - protected void uninstallStartEditActions ( JList list ) + protected void uninstallStartEditActions ( final JList list ) { if ( mouseAdapter != null ) { @@ -174,7 +174,7 @@ protected void uninstallStartEditActions ( JList list ) * {@inheritDoc} */ @Override - public boolean isCellEditable ( JList list, int index, T value ) + public boolean isCellEditable ( final JList list, final int index, final T value ) { if ( list instanceof WebList ) { @@ -190,7 +190,7 @@ public boolean isCellEditable ( JList list, int index, T value ) * {@inheritDoc} */ @Override - public E getCellEditor ( final JList list, int index, T value ) + public E getCellEditor ( final JList list, final int index, final T value ) { // Creating editor component editor = createCellEditor ( list, index, value ); @@ -213,13 +213,14 @@ public E getCellEditor ( final JList list, int index, T value ) * * @param list */ - protected void createCellEditorListeners ( final JList list, int index, T value ) + @SuppressWarnings ("UnusedParameters") + protected void createCellEditorListeners ( final JList list, final int index, final T value ) { // Editing stop on focus loss event final FocusAdapter focusAdapter = new FocusAdapter () { @Override - public void focusLost ( FocusEvent e ) + public void focusLost ( final FocusEvent e ) { stopEdit ( list ); } @@ -230,7 +231,7 @@ public void focusLost ( FocusEvent e ) editor.addKeyListener ( new KeyAdapter () { @Override - public void keyReleased ( KeyEvent e ) + public void keyReleased ( final KeyEvent e ) { if ( Hotkey.ENTER.isTriggered ( e ) ) { @@ -256,7 +257,7 @@ else if ( Hotkey.ESCAPE.isTriggered ( e ) ) * {@inheritDoc} */ @Override - public void startEdit ( final JList list, int index ) + public void startEdit ( final JList list, final int index ) { // Checking that selection is not empty if ( index == -1 ) @@ -316,11 +317,11 @@ public boolean stopEdit ( final JList list ) } // Saving selected indices to restore them later - int[] indices = list.getSelectedIndices (); + final int[] indices = list.getSelectedIndices (); // Checking whether value has changed or not - T newValue = getCellEditorValue ( list, editedCell, oldValue ); - boolean changed = updateListModel ( list, editedCell, oldValue, newValue, true ); + final T newValue = getCellEditorValue ( list, editedCell, oldValue ); + final boolean changed = updateListModel ( list, editedCell, oldValue, newValue, true ); // Removing cell editor from the list removeEditor ( list ); @@ -347,7 +348,7 @@ public boolean stopEdit ( final JList list ) * * @param list list to process */ - protected void addEditor ( JList list ) + protected void addEditor ( final JList list ) { list.add ( editor ); list.revalidate (); @@ -359,7 +360,7 @@ protected void addEditor ( JList list ) * * @param list list to process */ - protected void removeEditor ( JList list ) + protected void removeEditor ( final JList list ) { list.remove ( editor ); list.revalidate (); @@ -375,7 +376,7 @@ protected void removeEditor ( JList list ) * @param cellBounds cell bounds * @return list cell editor bounds within the list */ - protected Rectangle getEditorBounds ( JList list, int index, T value, Rectangle cellBounds ) + protected Rectangle getEditorBounds ( final JList list, final int index, final T value, final Rectangle cellBounds ) { return new Rectangle ( 0, 0, cellBounds.width, cellBounds.height ); } @@ -388,12 +389,12 @@ protected Rectangle getEditorBounds ( JList list, int index, T value, Rectangle * @param value cell value * @return cell editor bounds for the cell under the specified index */ - protected Rectangle getEditorBounds ( JList list, int index, T value ) + protected Rectangle getEditorBounds ( final JList list, final int index, final T value ) { - Rectangle cellBounds = list.getCellBounds ( index, index ); + final Rectangle cellBounds = list.getCellBounds ( index, index ); if ( cellBounds != null ) { - Rectangle editorBounds = getEditorBounds ( list, index, value, cellBounds ); + final Rectangle editorBounds = getEditorBounds ( list, index, value, cellBounds ); return new Rectangle ( cellBounds.x + editorBounds.x, cellBounds.y + editorBounds.y, editorBounds.width, editorBounds.height ); } else @@ -406,7 +407,7 @@ protected Rectangle getEditorBounds ( JList list, int index, T value ) * {@inheritDoc} */ @Override - public boolean updateListModel ( JList list, int index, T oldValue, T newValue, boolean updateSelection ) + public boolean updateListModel ( final JList list, final int index, final T oldValue, final T newValue, final boolean updateSelection ) { // Checking if value has changed if ( CompareUtils.equals ( oldValue, newValue ) ) @@ -415,10 +416,10 @@ public boolean updateListModel ( JList list, int index, T oldValue, T newValue, } // Updating list model - ListModel model = list.getModel (); + final ListModel model = list.getModel (); if ( model instanceof DefaultListModel ) { - DefaultListModel defaultListModel = ( DefaultListModel ) model; + final DefaultListModel defaultListModel = ( DefaultListModel ) model; defaultListModel.setElementAt ( newValue, index ); return true; } @@ -445,7 +446,7 @@ public int getSize () } @Override - public Object getElementAt ( int index ) + public Object getElementAt ( final int index ) { return values[ index ]; } @@ -462,7 +463,7 @@ public Object getElementAt ( int index ) * {@inheritDoc} */ @Override - public void editStarted ( JList list, int index ) + public void editStarted ( final JList list, final int index ) { editedCell = index; if ( list instanceof WebList ) @@ -475,7 +476,7 @@ public void editStarted ( JList list, int index ) * {@inheritDoc} */ @Override - public void editStopped ( JList list, int index, T oldValue, T newValue ) + public void editStopped ( final JList list, final int index, final T oldValue, final T newValue ) { editedCell = -1; if ( list instanceof WebList ) @@ -488,7 +489,7 @@ public void editStopped ( JList list, int index, T oldValue, T newValue ) * {@inheritDoc} */ @Override - public void editCancelled ( JList list, int index ) + public void editCancelled ( final JList list, final int index ) { editedCell = -1; if ( list instanceof WebList ) diff --git a/src/com/alee/laf/list/editor/DefaultListCellEditor.java b/src/com/alee/laf/list/editor/DefaultListCellEditor.java index 824f08c07..7e7157da2 100644 --- a/src/com/alee/laf/list/editor/DefaultListCellEditor.java +++ b/src/com/alee/laf/list/editor/DefaultListCellEditor.java @@ -42,9 +42,9 @@ public class DefaultListCellEditor extends AbstractListCellEditor * @return list cell editor created for the cell under specified index */ @Override - protected Component createCellEditor ( JList list, int index, Object value ) + protected Component createCellEditor ( final JList list, final int index, final Object value ) { - WebTextField field = WebTextField.createWebTextField ( true, WebListStyle.selectionRound, WebListStyle.selectionShadeWidth ); + final WebTextField field = WebTextField.createWebTextField ( true, WebListStyle.selectionRound, WebListStyle.selectionShadeWidth ); field.setDrawFocus ( false ); field.setText ( value != null ? value.toString () : "" ); field.selectAll (); @@ -60,7 +60,7 @@ protected Component createCellEditor ( JList list, int index, Object value ) * @return editor value */ @Override - public Object getCellEditorValue ( JList list, int index, Object oldValue ) + public Object getCellEditorValue ( final JList list, final int index, final Object oldValue ) { return ( ( WebTextField ) editor ).getText (); } diff --git a/src/com/alee/laf/resources/language.xml b/src/com/alee/laf/resources/language.xml index 4bee15a6b..74fc1946c 100644 --- a/src/com/alee/laf/resources/language.xml +++ b/src/com/alee/laf/resources/language.xml @@ -266,14 +266,14 @@ - B - Б - B + b + б + b بايت - B - O - B - B + b + o + b + b KB diff --git a/src/com/alee/laf/resources/version.xml b/src/com/alee/laf/resources/version.xml index de6a2cb09..9593dcc32 100644 --- a/src/com/alee/laf/resources/version.xml +++ b/src/com/alee/laf/resources/version.xml @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file