Menu
▾
▴
[dcm4che-commits] SF.net SVN: dcm4che:[15702] weasis/weasis_framework/trunk
|
From: <nr...@us...> - 2011-07-23 21:02:54
|
Revision: 15702
http://dcm4che.svn.sourceforge.net/dcm4che/?rev=15702&view=rev
Author: nroduit
Date: 2011-07-23 21:02:43 +0000 (Sat, 23 Jul 2011)
Log Message:
-----------
Checks that the order of modifiers. The correct order is : public, protected, private, abstract, static, final, transient, volatile, synchronized, native, strictfp. Remove redundant modifiers
Modified Paths:
--------------
weasis/weasis_framework/trunk/weasis-base/weasis-base-explorer/src/main/java/org/weasis/base/explorer/DefaultExplorer.java
weasis/weasis_framework/trunk/weasis-base/weasis-base-explorer/src/main/java/org/weasis/base/explorer/DiskFileList.java
weasis/weasis_framework/trunk/weasis-base/weasis-base-explorer/src/main/java/org/weasis/base/explorer/DiskObject.java
weasis/weasis_framework/trunk/weasis-base/weasis-base-explorer/src/main/java/org/weasis/base/explorer/JIExplorerContext.java
weasis/weasis_framework/trunk/weasis-base/weasis-base-explorer/src/main/java/org/weasis/base/explorer/JIFileModel.java
weasis/weasis_framework/trunk/weasis-base/weasis-base-explorer/src/main/java/org/weasis/base/explorer/JIListModel.java
weasis/weasis_framework/trunk/weasis-base/weasis-base-explorer/src/main/java/org/weasis/base/explorer/JIObservable.java
weasis/weasis_framework/trunk/weasis-base/weasis-base-explorer/src/main/java/org/weasis/base/explorer/JIThumbnailCache.java
weasis/weasis_framework/trunk/weasis-base/weasis-base-explorer/src/main/java/org/weasis/base/explorer/JIThumbnailList.java
weasis/weasis_framework/trunk/weasis-base/weasis-base-explorer/src/main/java/org/weasis/base/explorer/JIThumbnailListPane.java
weasis/weasis_framework/trunk/weasis-base/weasis-base-explorer/src/main/java/org/weasis/base/explorer/JIUtility.java
weasis/weasis_framework/trunk/weasis-base/weasis-base-explorer/src/main/java/org/weasis/base/explorer/OrderedFileList.java
weasis/weasis_framework/trunk/weasis-base/weasis-base-explorer/src/main/java/org/weasis/base/explorer/ThumbnailIcon.java
weasis/weasis_framework/trunk/weasis-base/weasis-base-explorer/src/main/java/org/weasis/base/explorer/ThumbnailRenderer.java
weasis/weasis_framework/trunk/weasis-base/weasis-base-explorer/src/main/java/org/weasis/base/explorer/ToggleSelectionModel.java
weasis/weasis_framework/trunk/weasis-base/weasis-base-explorer/src/main/java/org/weasis/base/explorer/internal/Activator.java
weasis/weasis_framework/trunk/weasis-base/weasis-base-ui/src/main/java/org/weasis/base/ui/WeasisApp.java
weasis/weasis_framework/trunk/weasis-base/weasis-base-ui/src/main/java/org/weasis/base/ui/gui/WeasisWin.java
weasis/weasis_framework/trunk/weasis-base/weasis-base-ui/src/main/java/org/weasis/base/ui/internal/Activator.java
weasis/weasis_framework/trunk/weasis-base/weasis-base-viewer2d/src/main/java/org/weasis/base/viewer2d/EventManager.java
weasis/weasis_framework/trunk/weasis-base/weasis-base-viewer2d/src/main/java/org/weasis/base/viewer2d/InfoLayer.java
weasis/weasis_framework/trunk/weasis-base/weasis-base-viewer2d/src/main/java/org/weasis/base/viewer2d/ViewerFactory.java
weasis/weasis_framework/trunk/weasis-base/weasis-base-viewer2d/src/main/java/org/weasis/base/viewer2d/dockable/DisplayTool.java
weasis/weasis_framework/trunk/weasis-base/weasis-base-viewer2d/src/main/java/org/weasis/base/viewer2d/dockable/DrawTool.java
weasis/weasis_framework/trunk/weasis-base/weasis-base-viewer2d/src/main/java/org/weasis/base/viewer2d/dockable/ImageTool.java
weasis/weasis_framework/trunk/weasis-base/weasis-base-viewer2d/src/main/java/org/weasis/base/viewer2d/internal/Activator.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/command/Util.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/explorer/DataExplorerView.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/explorer/model/DataExplorerModel.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/explorer/model/TreeModel.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/gui/Image2DViewer.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/gui/ImageOperation.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/gui/PreferencesPageFactory.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/gui/model/ViewModel.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/gui/task/CircularProgressBar.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/gui/task/InterruptionListener.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/gui/util/AbstractItemDialogPage.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/gui/util/AbstractProperties.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/gui/util/ActionState.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/gui/util/AnimatedIconStatic.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/gui/util/ComboBoxModelAdapter.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/gui/util/FileFormatFilter.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/gui/util/GUIEntry.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/gui/util/GhostGlassPane.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/gui/util/JMVUtils.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/gui/util/JWInterruptionListener.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/gui/util/PageProps.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/gui/util/PickerOwner.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/image/FilterOperation.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/image/FlipOperation.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/image/ImageOperationAction.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/image/PseudoColorOperation.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/image/RotationOperation.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/image/WindowLevelOperation.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/image/ZoomOperation.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/image/combineTwoImagesOperation.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/image/op/ByteLut.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/image/op/ByteLutCollection.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/image/op/ExtremaRangeLimitOpImage.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/image/util/BasicHist.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/image/util/ImageFiler.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/image/util/ImageLayer.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/image/util/KernelData.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/image/util/Unit.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/media/data/Codec.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/media/data/MediaElement.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/media/data/MediaReader.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/media/data/MediaSeries.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/media/data/MediaSeriesGroup.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/media/data/Series.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/media/data/SeriesImporter.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/media/data/TagW.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/media/data/Thumbnail.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/service/BundleTools.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/util/FileUtil.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/util/FontTools.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-ui/src/main/java/org/weasis/core/ui/docking/DockableTool.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-ui/src/main/java/org/weasis/core/ui/docking/UIManager.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-ui/src/main/java/org/weasis/core/ui/editor/SeriesViewer.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-ui/src/main/java/org/weasis/core/ui/editor/SeriesViewerFactory.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-ui/src/main/java/org/weasis/core/ui/editor/SeriesViewerListener.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-ui/src/main/java/org/weasis/core/ui/editor/image/AnnotationsLayer.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-ui/src/main/java/org/weasis/core/ui/editor/image/MouseActions.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-ui/src/main/java/org/weasis/core/ui/editor/image/SynchView.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-ui/src/main/java/org/weasis/core/ui/editor/image/ViewerToolBar.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-ui/src/main/java/org/weasis/core/ui/editor/image/dockable/MeasureTool.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-ui/src/main/java/org/weasis/core/ui/editor/image/dockable/MiniTool.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-ui/src/main/java/org/weasis/core/ui/graphic/AbstractDragGraphic.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-ui/src/main/java/org/weasis/core/ui/graphic/AbstractDragGraphicArea.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-ui/src/main/java/org/weasis/core/ui/graphic/AngleToolGraphic.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-ui/src/main/java/org/weasis/core/ui/graphic/CobbAngleToolGraphic.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-ui/src/main/java/org/weasis/core/ui/graphic/Contour.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-ui/src/main/java/org/weasis/core/ui/graphic/DragSequence.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-ui/src/main/java/org/weasis/core/ui/graphic/EllipseGraphic.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-ui/src/main/java/org/weasis/core/ui/graphic/FourPointsAngleToolGraphic.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-ui/src/main/java/org/weasis/core/ui/graphic/Graphic.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-ui/src/main/java/org/weasis/core/ui/graphic/LineGraphic.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-ui/src/main/java/org/weasis/core/ui/graphic/Measure1DAnalyse.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-ui/src/main/java/org/weasis/core/ui/graphic/Measure2DAnalyse.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-ui/src/main/java/org/weasis/core/ui/graphic/OpenAngleToolGraphic.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-ui/src/main/java/org/weasis/core/ui/graphic/ParallelLineGraphic.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-ui/src/main/java/org/weasis/core/ui/graphic/PerpendicularLineGraphic.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-ui/src/main/java/org/weasis/core/ui/graphic/PolygonGraphic.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-ui/src/main/java/org/weasis/core/ui/graphic/RectangleGraphic.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-ui/src/main/java/org/weasis/core/ui/graphic/RenderedImageLayer.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-ui/src/main/java/org/weasis/core/ui/graphic/ThreePointsCircleGraphic.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-ui/src/main/java/org/weasis/core/ui/graphic/model/DefaultViewModel.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-ui/src/main/java/org/weasis/core/ui/graphic/model/GraphicsListener.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-ui/src/main/java/org/weasis/core/ui/graphic/model/Layer.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-ui/src/main/java/org/weasis/core/ui/graphic/model/Tools.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-ui/src/main/java/org/weasis/core/ui/util/PaintLabel.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-ui/src/main/java/org/weasis/core/ui/util/ToolBarContainer.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-ui/src/main/java/org/weasis/core/ui/util/ViewSetting.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-ui/src/main/java/org/weasis/core/ui/util/WtoolBar.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-ui/src/main/java/org/weasis/core/ui/util/ZoomSetting.java
weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-codec/src/main/java/org/weasis/dicom/codec/DicomCodec.java
weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-codec/src/main/java/org/weasis/dicom/codec/DicomMediaIO.java
weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-codec/src/main/java/org/weasis/dicom/codec/FileExtractor.java
weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-codec/src/main/java/org/weasis/dicom/codec/OverlayUtils.java
weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-codec/src/main/java/org/weasis/dicom/codec/SortSeriesStack.java
weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-codec/src/main/java/org/weasis/dicom/codec/display/CornerInfoData.java
weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-codec/src/main/java/org/weasis/dicom/codec/display/OverlayOperation.java
weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-codec/src/main/java/org/weasis/dicom/codec/display/PresetWindowLevel.java
weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-codec/src/main/java/org/weasis/dicom/codec/geometry/ImageOrientation.java
weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-codec/src/main/java/org/weasis/dicom/codec/geometry/LocalizerPoster.java
weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-codec/src/main/java/org/weasis/dicom/codec/internal/Activator.java
weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-explorer/src/main/java/org/weasis/dicom/explorer/DicomExplorer.java
weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-explorer/src/main/java/org/weasis/dicom/explorer/DicomModel.java
weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-explorer/src/main/java/org/weasis/dicom/explorer/ExportDicom.java
weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-explorer/src/main/java/org/weasis/dicom/explorer/ImportDicom.java
weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-explorer/src/main/java/org/weasis/dicom/explorer/MimeSystemAppFactory.java
weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-explorer/src/main/java/org/weasis/dicom/explorer/SeriesSelectionModel.java
weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-explorer/src/main/java/org/weasis/dicom/explorer/internal/Activator.java
weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-explorer/src/main/java/org/weasis/dicom/explorer/pref/ModalityPrefView.java
weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-explorer/src/main/java/org/weasis/dicom/explorer/wado/DownloadPriority.java
weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-explorer/src/main/java/org/weasis/dicom/explorer/wado/LoadRemoteDicomManifest.java
weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-explorer/src/main/java/org/weasis/dicom/explorer/wado/LoadSeries.java
weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-viewer2d/src/main/java/org/weasis/dicom/viewer2d/EventManager.java
weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-viewer2d/src/main/java/org/weasis/dicom/viewer2d/InfoLayer.java
weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-viewer2d/src/main/java/org/weasis/dicom/viewer2d/View2dFactory.java
weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-viewer2d/src/main/java/org/weasis/dicom/viewer2d/dockable/DisplayTool.java
weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-viewer2d/src/main/java/org/weasis/dicom/viewer2d/dockable/ImageTool.java
weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-viewer2d/src/main/java/org/weasis/dicom/viewer2d/internal/Activator.java
weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-viewer2d/src/main/resources/config/layoutModel.xml
weasis/weasis_framework/trunk/weasis-launcher/src/main/java/org/weasis/launcher/FileUtil.java
weasis/weasis_framework/trunk/weasis-launcher/src/main/java/org/weasis/launcher/LookAndFeels.java
weasis/weasis_framework/trunk/weasis-launcher/src/main/java/org/weasis/launcher/WeasisLauncher.java
Modified: weasis/weasis_framework/trunk/weasis-base/weasis-base-explorer/src/main/java/org/weasis/base/explorer/DefaultExplorer.java
===================================================================
--- weasis/weasis_framework/trunk/weasis-base/weasis-base-explorer/src/main/java/org/weasis/base/explorer/DefaultExplorer.java 2011-07-22 13:30:30 UTC (rev 15701)
+++ weasis/weasis_framework/trunk/weasis-base/weasis-base-explorer/src/main/java/org/weasis/base/explorer/DefaultExplorer.java 2011-07-23 21:02:43 UTC (rev 15702)
@@ -44,16 +44,16 @@
public class DefaultExplorer extends PluginTool implements DataExplorerView {
- private final static JIExplorerContext treeContext = new JIExplorerContext();
+ private static final JIExplorerContext treeContext = new JIExplorerContext();
/**
*
*/
private static final long serialVersionUID = 2844546991944685813L;
- public final static String BUTTON_NAME = "Explorer";
- public final static String NAME = "Media Explorer";
- public final static String P_LAST_DIR = "last.dir";
- private final static String PREFERENCE_NODE = "view";
+ public static final String BUTTON_NAME = "Explorer";
+ public static final String NAME = "Media Explorer";
+ public static final String P_LAST_DIR = "last.dir";
+ private static final String PREFERENCE_NODE = "view";
protected FileTreeModel model;
@@ -159,10 +159,10 @@
*/
private static final long serialVersionUID = 2975977946216576290L;
+ @Override
public void actionPerformed(final ActionEvent e) {
- if (DefaultExplorer.this.clickedPath == null) {
+ if (DefaultExplorer.this.clickedPath == null)
return;
- }
if (tree.isExpanded(DefaultExplorer.this.clickedPath)) {
tree.collapsePath(DefaultExplorer.this.clickedPath);
} else {
@@ -181,6 +181,7 @@
*/
private static final long serialVersionUID = 1118192487617852891L;
+ @Override
public void actionPerformed(final ActionEvent e) {
repaint();
refresh();
@@ -195,19 +196,17 @@
public TreeNode getSelectedNode() {
final TreePath path = tree.getSelectionPath();
- if (path != null) {
+ if (path != null)
return (TreeNode) path.getLastPathComponent();
- } else {
+ else
return null;
- }
}
public File getCurrentDir() {
final TreePath path = tree.getSelectionPath();
- if (path != null) {
+ if (path != null)
return ((TreeNode) path.getLastPathComponent()).getFile();
- }
return null;
}
@@ -255,9 +254,8 @@
if (oneChild instanceof TreeNode) {
final File file = (File) ((TreeNode) oneChild).getUserObject();
- if (file.equals(selectedSubDir)) {
+ if (file.equals(selectedSubDir))
return (TreeNode) oneChild;
- }
}
}
return null;
@@ -287,9 +285,8 @@
break;
}
}
- } else if (!dirPath.startsWith(parentFile.getAbsolutePath())) {
+ } else if (!dirPath.startsWith(parentFile.getAbsolutePath()))
return null;
- }
final Iterator<String> iter = parsePath(dir).iterator();
@@ -319,18 +316,17 @@
}
}
- if (pathNotFound) {
+ if (pathNotFound)
// log.info("findNodeForDir NULL");
return null;
- } else {
+ else
// log.info("findNodeForDir " + parentNode);
return parentNode;
- }
}
return null;
}
- public final static List<String> parsePath(final File selectedDir) {
+ public static final List<String> parsePath(final File selectedDir) {
// First parse the given directory path into separate path names/fields.
final List<String> paths = new ArrayList<String>();
final String selectedAbsPath = selectedDir.getAbsolutePath();
@@ -389,9 +385,8 @@
final int x = e.getX();
final int y = e.getY();
final TreePath path = tree.getPathForLocation(x, y);
- if (path == null) {
+ if (path == null)
return;
- }
DefaultExplorer.this.popup.removeAll();
if (tree.isExpanded(path)) {
@@ -441,7 +436,7 @@
}
}
- private final void jTreeDiskValueChanged(final TreeSelectionEvent e) {
+ private void jTreeDiskValueChanged(final TreeSelectionEvent e) {
final TreeNode selectedTreeNode = (TreeNode) getTreeNode(e.getPath());
@@ -473,10 +468,9 @@
public final void expandPaths(final File selectedDir) {
final TreeNode node = findNodeForDir(selectedDir);
- if (node == null) {
+ if (node == null)
// log.debug("expandPaths NULL ");
return;
- }
final Vector<TreeNode> vec = new Vector<TreeNode>(1);
vec.add(node);
@@ -494,7 +488,8 @@
final class JITreeDiskWillExpandAdapter implements javax.swing.event.TreeWillExpandListener {
- public final void treeWillExpand(final TreeExpansionEvent e) throws ExpandVetoException {
+ @Override
+ public void treeWillExpand(final TreeExpansionEvent e) throws ExpandVetoException {
final TreePath path = e.getPath();
final TreeNode selectedNode = (TreeNode) path.getLastPathComponent();
@@ -504,19 +499,22 @@
}
}
- public final void treeWillCollapse(final TreeExpansionEvent e) {
+ @Override
+ public void treeWillCollapse(final TreeExpansionEvent e) {
}
}
final class JITreeDiskExpansionAdapter implements javax.swing.event.TreeExpansionListener {
- public final void treeExpanded(final TreeExpansionEvent e) {
+ @Override
+ public void treeExpanded(final TreeExpansionEvent e) {
final Thread runner = new Thread() {
@Override
public void run() {
Runnable runnable = new Runnable() {
+ @Override
public void run() {
TreePath path = DefaultExplorer.this.tree.getSelectionPath();
if (path != null) {
@@ -530,19 +528,22 @@
runner.start();
}
- public final void treeCollapsed(final TreeExpansionEvent e) {
+ @Override
+ public void treeCollapsed(final TreeExpansionEvent e) {
}
}
final class JITreeDiskSelectionAdapter implements javax.swing.event.TreeSelectionListener {
- public final void valueChanged(final TreeSelectionEvent e) {
+ @Override
+ public void valueChanged(final TreeSelectionEvent e) {
final Thread runner = new Thread() {
@Override
public void run() {
Runnable runnable = new Runnable() {
+ @Override
public void run() {
jTreeDiskValueChanged(e);
}
@@ -561,6 +562,7 @@
public void run() {
Runnable runnable = new Runnable() {
+ @Override
public void run() {
expandPaths(dObj.getFile());
}
Modified: weasis/weasis_framework/trunk/weasis-base/weasis-base-explorer/src/main/java/org/weasis/base/explorer/DiskFileList.java
===================================================================
--- weasis/weasis_framework/trunk/weasis-base/weasis-base-explorer/src/main/java/org/weasis/base/explorer/DiskFileList.java 2011-07-22 13:30:30 UTC (rev 15701)
+++ weasis/weasis_framework/trunk/weasis-base/weasis-base-explorer/src/main/java/org/weasis/base/explorer/DiskFileList.java 2011-07-23 21:02:43 UTC (rev 15702)
@@ -4,8 +4,8 @@
public interface DiskFileList extends JIObservable {
- public JIFileModel getFileListModel();
+ JIFileModel getFileListModel();
- public void loadDirectory(File dir);
+ void loadDirectory(File dir);
}
Modified: weasis/weasis_framework/trunk/weasis-base/weasis-base-explorer/src/main/java/org/weasis/base/explorer/DiskObject.java
===================================================================
--- weasis/weasis_framework/trunk/weasis-base/weasis-base-explorer/src/main/java/org/weasis/base/explorer/DiskObject.java 2011-07-22 13:30:30 UTC (rev 15701)
+++ weasis/weasis_framework/trunk/weasis-base/weasis-base-explorer/src/main/java/org/weasis/base/explorer/DiskObject.java 2011-07-23 21:02:43 UTC (rev 15702)
@@ -82,64 +82,58 @@
}
public String getMimeType() {
- if (getSuffix().equals("jpg") || getSuffix().equals("jpeg")) {
+ if (getSuffix().equals("jpg") || getSuffix().equals("jpeg"))
return MIMETYPE_JPEG;
- }
- if (getSuffix().equals("gif")) {
+ if (getSuffix().equals("gif"))
return MIMETYPE_GIF;
- }
- if (getSuffix().equals("png")) {
+ if (getSuffix().equals("png"))
return MIMETYPE_PNG;
- }
- if (getSuffix().equals("tiff") || getSuffix().equals("tif")) {
+ if (getSuffix().equals("tiff") || getSuffix().equals("tif"))
return MIMETYPE_TIFF;
- }
return null;
}
- public final String getShortDate() {
+ public String getShortDate() {
final Format formatter = new SimpleDateFormat("dd/MM/yy hh:mm a");
return formatter.format(new java.util.Date(this.lastModified));
}
- public final String getDim() {
- if ((this.width > 0) && (this.height > 0)) {
+ public String getDim() {
+ if ((this.width > 0) && (this.height > 0))
return this.width + " x " + this.height;
- }
return "";
}
- public final Dimension getDimension() {
+ public Dimension getDimension() {
return new Dimension(this.width, this.height);
}
- public final String getSize() {
+ public String getSize() {
return JIUtility.length2KB(this.length);
}
@Override
- public final String toString() {
+ public String toString() {
return this.name;
}
public File getFile() {
- if (absolutePath != null) {
+ if (absolutePath != null)
return new File(absolutePath);
- } else {
+ else
return new File(path);
- }
}
+ @Override
public int compare(final DiskObject a, final DiskObject b) {
return a.getFile().compareTo(b.getFile());
}
@Override
public boolean equals(final Object obj) {
- if (obj instanceof DiskObject) {
+ if (obj instanceof DiskObject)
return (compare(this, (DiskObject) obj) == 0) ? true : false;
- }
return false;
}
@@ -150,7 +144,7 @@
/**
* @return the suffix
*/
- public synchronized final String getSuffix() {
+ public synchronized String getSuffix() {
if (this.suffix == null) {
this.suffix = JIUtility.suffix(this.name);
}
@@ -160,29 +154,27 @@
public boolean validate() throws FileNotFoundException, IOException {
if (!this.validated) {
- if (!getFile().exists()) {
+ if (!getFile().exists())
throw new FileNotFoundException(getFile().getAbsolutePath());
- }
- if (!getFile().canRead()) {
+ if (!getFile().canRead())
throw new IOException("Cannot read " + getFile().getAbsolutePath());
- }
}
return (this.validated = true);
}
- public synchronized final int getOrientationValue() {
+ public synchronized int getOrientationValue() {
return this.orientation;
}
- public synchronized final void setOrientation(final int orientation) {
+ public synchronized void setOrientation(final int orientation) {
this.orientation = orientation;
}
/**
* @return the uid
*/
- public synchronized final String getUid() {
+ public synchronized String getUid() {
if ((this.uid == null) || (this.uid.trim().length() < 2)) {
// this.uid = JIThumbnailService.getInstance().getImageID(this);
}
Modified: weasis/weasis_framework/trunk/weasis-base/weasis-base-explorer/src/main/java/org/weasis/base/explorer/JIExplorerContext.java
===================================================================
--- weasis/weasis_framework/trunk/weasis-base/weasis-base-explorer/src/main/java/org/weasis/base/explorer/JIExplorerContext.java 2011-07-22 13:30:30 UTC (rev 15701)
+++ weasis/weasis_framework/trunk/weasis-base/weasis-base-explorer/src/main/java/org/weasis/base/explorer/JIExplorerContext.java 2011-07-23 21:02:43 UTC (rev 15702)
@@ -35,7 +35,7 @@
/**
* @return the selsectedDirNodes
*/
- public synchronized final Vector<TreeNode> getSelectedDirNodes() {
+ public final synchronized Vector<TreeNode> getSelectedDirNodes() {
return this.selectedDirNodes;
}
@@ -43,7 +43,7 @@
* @param selectedDirNodes
* the selectedDirNodes to set
*/
- public synchronized final void setSelectedDirNodes(final Vector<TreeNode> selectedDirNodes,
+ public final synchronized void setSelectedDirNodes(final Vector<TreeNode> selectedDirNodes,
final TreeNode lastSelectedDirNodes) {
this.selectedDirNodes = selectedDirNodes;
this.lastSelectedDirNodesIndex = this.selectedDirNodes.indexOf(lastSelectedDirNodes);
@@ -55,7 +55,7 @@
* @param lastSelectedDirNodesIndex
* the lastSelectedDirNodesIndex to set
*/
- public synchronized final void setSelectedDirNodes(final Vector<TreeNode> selectedDirNodes,
+ public final synchronized void setSelectedDirNodes(final Vector<TreeNode> selectedDirNodes,
final int lastSelectedDirNodesIndex) {
this.selectedDirNodes = selectedDirNodes;
this.lastSelectedDirNodesIndex = lastSelectedDirNodesIndex;
@@ -64,7 +64,7 @@
/**
* @return the selsectedDiskObjects
*/
- public synchronized final MediaElement[] getSelectedDiskObjects() {
+ public final synchronized MediaElement[] getSelectedDiskObjects() {
return this.selectedDiskObjects;
}
@@ -74,7 +74,7 @@
* @param lastSelectedDiskObject
* the lastSelectedDiskObjectIndex to set
*/
- public synchronized final void setSelectedDiskObjects(final MediaElement[] selsectedDiskObjects,
+ public final synchronized void setSelectedDiskObjects(final MediaElement[] selsectedDiskObjects,
final MediaElement lastSelectedDiskObject) {
// log.debug("setSelectedDiskObjects - " + selsectedDiskObjects);
this.selectedDiskObjects = selsectedDiskObjects;
@@ -94,7 +94,7 @@
* @param lastSelectedDiskObject
* the lastSelectedDiskObjectIndex to set
*/
- public synchronized final void setSelectedDiskObjects(final MediaElement[] selsectedDiskObjects,
+ public final synchronized void setSelectedDiskObjects(final MediaElement[] selsectedDiskObjects,
final int lastSelectedDiskObjectIndex) {
// log.debug("setSelectedDiskObjects - " + selsectedDiskObjects);
this.selectedDiskObjects = selsectedDiskObjects;
@@ -104,7 +104,7 @@
/**
* @return the includeCatNodes
*/
- public synchronized final boolean isIncludeCatNodes() {
+ public final synchronized boolean isIncludeCatNodes() {
return this.includeCatNodes;
}
@@ -112,14 +112,14 @@
* @param includeCatNodes
* the includeCatNodes to set
*/
- public synchronized final void setIncludeCatNodes(final boolean includeCatNodes) {
+ public final synchronized void setIncludeCatNodes(final boolean includeCatNodes) {
this.includeCatNodes = includeCatNodes;
}
/**
* @return the includeDateNodes
*/
- public synchronized final boolean isIncludeDateNodes() {
+ public final synchronized boolean isIncludeDateNodes() {
return this.includeDateNodes;
}
@@ -127,14 +127,14 @@
* @param includeDateNodes
* the includeDateNodes to set
*/
- public synchronized final void setIncludeDateNodes(final boolean includeDateNodes) {
+ public final synchronized void setIncludeDateNodes(final boolean includeDateNodes) {
this.includeDateNodes = includeDateNodes;
}
/**
* @return the includeDirNodes
*/
- public synchronized final boolean isIncludeDirNodes() {
+ public final synchronized boolean isIncludeDirNodes() {
return this.includeDirNodes;
}
@@ -142,14 +142,14 @@
* @param includeDirNodes
* the includeDirNodes to set
*/
- public synchronized final void setIncludeDirNodes(final boolean includeDirNodes) {
+ public final synchronized void setIncludeDirNodes(final boolean includeDirNodes) {
this.includeDirNodes = includeDirNodes;
}
/**
* @return the includeKeyWords
*/
- public synchronized final boolean isIncludeKeyWords() {
+ public final synchronized boolean isIncludeKeyWords() {
return this.includeKeyWords;
}
@@ -157,14 +157,14 @@
* @param includeKeyWords
* the includeKeyWords to set
*/
- public synchronized final void setIncludeKeyWords(final boolean includeKeyWords) {
+ public final synchronized void setIncludeKeyWords(final boolean includeKeyWords) {
this.includeKeyWords = includeKeyWords;
}
/**
* @return the state
*/
- public synchronized final int getState() {
+ public final synchronized int getState() {
return this.state;
}
@@ -172,7 +172,7 @@
* @param state
* the state to set
*/
- public synchronized final void setState(final int state) {
+ public final synchronized void setState(final int state) {
this.state = state;
clearListObjects();
}
@@ -180,7 +180,7 @@
/**
* @return the includeDiskObjects
*/
- public synchronized final boolean isIncludeDiskObjects() {
+ public final synchronized boolean isIncludeDiskObjects() {
return this.includeDiskObjects;
}
@@ -188,35 +188,35 @@
* @param includeDiskObjects
* the includeDiskObjects to set
*/
- public synchronized final void setIncludeDiskObjects(final boolean includeDiskObjects) {
+ public final synchronized void setIncludeDiskObjects(final boolean includeDiskObjects) {
this.includeDiskObjects = includeDiskObjects;
}
/**
* @return the lastSelectedDirNodesIndex
*/
- public synchronized final int getLastSelectedDirNodesIndex() {
+ public final synchronized int getLastSelectedDirNodesIndex() {
return this.lastSelectedDirNodesIndex > -1 ? this.lastSelectedDirNodesIndex : 0;
}
/**
* @return the lastSelectedDiskObjectIndex
*/
- public synchronized final int getLastSelectedDiskObjectIndex() {
+ public final synchronized int getLastSelectedDiskObjectIndex() {
return this.lastSelectedDiskObjectIndex > -1 ? this.lastSelectedDiskObjectIndex : 0;
}
/**
* @return the lastSelectedKeyWordsIndex
*/
- public synchronized final int getLastSelectedKeyWordsIndex() {
+ public final synchronized int getLastSelectedKeyWordsIndex() {
return this.lastSelectedKeyWordsIndex > -1 ? this.lastSelectedKeyWordsIndex : 0;
}
/**
* @return the imageCnt
*/
- public synchronized final int getImageCnt() {
+ public final synchronized int getImageCnt() {
return this.imageCnt;
}
@@ -224,14 +224,14 @@
* @param imageCnt
* the imageCnt to set
*/
- public synchronized final void setImageCnt(final int imageCnt) {
+ public final synchronized void setImageCnt(final int imageCnt) {
this.imageCnt = imageCnt;
}
/**
* @return the statusBarProgressTaskRunning
*/
- public synchronized final boolean isStatusBarProgressTaskRunning() {
+ public final synchronized boolean isStatusBarProgressTaskRunning() {
return this.statusBarProgressTaskRunning;
}
@@ -239,19 +239,18 @@
* @param statusBarProgressTaskRunning
* the statusBarProgressTaskRunning to set
*/
- public synchronized final void setStatusBarProgressTaskRunning(final boolean statusBarProgressTaskRunning) {
+ public final synchronized void setStatusBarProgressTaskRunning(final boolean statusBarProgressTaskRunning) {
this.statusBarProgressTaskRunning = statusBarProgressTaskRunning;
}
- public synchronized final MediaElement getLastSelectedDiskObj() {
+ public final synchronized MediaElement getLastSelectedDiskObj() {
if ((this.lastSelectedDiskObjectIndex > -1) && (this.selectedDiskObjects != null)
- && (this.selectedDiskObjects.length > this.lastSelectedDiskObjectIndex)) {
+ && (this.selectedDiskObjects.length > this.lastSelectedDiskObjectIndex))
return this.selectedDiskObjects[this.lastSelectedDiskObjectIndex];
- }
return null;
}
- public synchronized final void clearListObjects() {
+ public final synchronized void clearListObjects() {
// log.debug("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!clearListObjects!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
this.selectedDiskObjects = null;
this.lastSelectedDiskObjectIndex = -1;
Modified: weasis/weasis_framework/trunk/weasis-base/weasis-base-explorer/src/main/java/org/weasis/base/explorer/JIFileModel.java
===================================================================
--- weasis/weasis_framework/trunk/weasis-base/weasis-base-explorer/src/main/java/org/weasis/base/explorer/JIFileModel.java 2011-07-22 13:30:30 UTC (rev 15701)
+++ weasis/weasis_framework/trunk/weasis-base/weasis-base-explorer/src/main/java/org/weasis/base/explorer/JIFileModel.java 2011-07-23 21:02:43 UTC (rev 15702)
@@ -1,15 +1,15 @@
package org.weasis.base.explorer;
-public interface JIFileModel {
+interface JIFileModel {
- public void setData();
+ void setData();
- public void reload();
+ void reload();
- public JIExplorerContext getReloadContext();
+ JIExplorerContext getReloadContext();
- public void setReloadContext(JIExplorerContext reloadContext);
+ void setReloadContext(JIExplorerContext reloadContext);
- public OrderedFileList getDiskObjectList();
+ OrderedFileList getDiskObjectList();
}
Modified: weasis/weasis_framework/trunk/weasis-base/weasis-base-explorer/src/main/java/org/weasis/base/explorer/JIListModel.java
===================================================================
--- weasis/weasis_framework/trunk/weasis-base/weasis-base-explorer/src/main/java/org/weasis/base/explorer/JIListModel.java 2011-07-22 13:30:30 UTC (rev 15701)
+++ weasis/weasis_framework/trunk/weasis-base/weasis-base-explorer/src/main/java/org/weasis/base/explorer/JIListModel.java 2011-07-23 21:02:43 UTC (rev 15702)
@@ -179,7 +179,7 @@
/**
* @return the reloadContext
*/
- public synchronized final JIExplorerContext getReloadContext() {
+ public final synchronized JIExplorerContext getReloadContext() {
return this.reloadContext;
}
@@ -187,14 +187,14 @@
* @param reloadContext
* the reloadContext to set
*/
- public synchronized final void setReloadContext(final JIExplorerContext reloadContext) {
+ public final synchronized void setReloadContext(final JIExplorerContext reloadContext) {
this.reloadContext = reloadContext;
}
/**
* @return the loading
*/
- public synchronized final boolean isLoading() {
+ public final synchronized boolean isLoading() {
return this.loading;
}
Modified: weasis/weasis_framework/trunk/weasis-base/weasis-base-explorer/src/main/java/org/weasis/base/explorer/JIObservable.java
===================================================================
--- weasis/weasis_framework/trunk/weasis-base/weasis-base-explorer/src/main/java/org/weasis/base/explorer/JIObservable.java 2011-07-22 13:30:30 UTC (rev 15701)
+++ weasis/weasis_framework/trunk/weasis-base/weasis-base-explorer/src/main/java/org/weasis/base/explorer/JIObservable.java 2011-07-23 21:02:43 UTC (rev 15702)
@@ -1,12 +1,12 @@
package org.weasis.base.explorer;
-public interface JIObservable {
+interface JIObservable {
- public static final String SECTION_CHANGED = "SECTION_CHANGED";
- public static final String DIRECTORY_SIZE = "DIRECTORY_SIZE";
+ String SECTION_CHANGED = "SECTION_CHANGED";
+ String DIRECTORY_SIZE = "DIRECTORY_SIZE";
- public void notifyObservers(Object arg);
+ void notifyObservers(Object arg);
- public boolean hasChanged();
+ boolean hasChanged();
}
Modified: weasis/weasis_framework/trunk/weasis-base/weasis-base-explorer/src/main/java/org/weasis/base/explorer/JIThumbnailCache.java
===================================================================
--- weasis/weasis_framework/trunk/weasis-base/weasis-base-explorer/src/main/java/org/weasis/base/explorer/JIThumbnailCache.java 2011-07-22 13:30:30 UTC (rev 15701)
+++ weasis/weasis_framework/trunk/weasis-base/weasis-base-explorer/src/main/java/org/weasis/base/explorer/JIThumbnailCache.java 2011-07-23 21:02:43 UTC (rev 15702)
@@ -22,7 +22,7 @@
private static JIThumbnailCache instance;
// Set only one concurrent thread, because of the imageio issue with native library
// (https://jai-imageio-core.dev.java.net/issues/show_bug.cgi?id=126)
- private final static ExecutorService qExecutor = Executors.newFixedThreadPool(1);
+ private static final ExecutorService qExecutor = Executors.newFixedThreadPool(1);
private final Map<String, ThumbnailIcon> cachedThumbnails;
@@ -52,21 +52,16 @@
return instance;
}
- public synchronized final void invalidate() {
+ public synchronized void invalidate() {
this.cachedThumbnails.clear();
}
- public final Icon getThumbnailFor(final ImageElement diskObject, final JIThumbnailList list, final int index) {
+ public Icon getThumbnailFor(final ImageElement diskObject, final JIThumbnailList list, final int index) {
try {
final ThumbnailIcon jiIcon = this.cachedThumbnails.get(diskObject.getFile().getPath());
- if (jiIcon != null) {
+ if (jiIcon != null)
return jiIcon;
- }
- // final BufferedImage bImage = JIThumbnailService.getInstance().getThumbnail(diskObject);
- // if (bImage != null) {
- // return JIUtility.scaleIcon(bImage);
- // }
} catch (final Exception e) {
// log.debug(e);
@@ -77,10 +72,9 @@
return null;
}
- private final void loadThumbnail(final ImageElement diskObject, final JIThumbnailList thumbnailList, final int index) {
- if ((index > thumbnailList.getLastVisibleIndex()) || (index < thumbnailList.getFirstVisibleIndex())) {
+ private void loadThumbnail(final ImageElement diskObject, final JIThumbnailList thumbnailList, final int index) {
+ if ((index > thumbnailList.getLastVisibleIndex()) || (index < thumbnailList.getFirstVisibleIndex()))
return;
- }
try {
// ///////////////////////////////////////////////////////////////////////
JIThumbnailCache.qExecutor.execute(new Runnable() {
@@ -89,9 +83,8 @@
public void run() {
// final BufferedImage tIcon = JIUtility.createThumbnailRetry(diskObject);
RenderedImage img = ImageToolkit.getDefaultRenderedImage(diskObject, diskObject.getImage());
- if (img == null) {
+ if (img == null)
return;
- }
final double scale =
Math.min((double) ThumbnailRenderer.ICON_DIM.height / (double) img.getHeight(),
(double) ThumbnailRenderer.ICON_DIM.width / (double) img.getWidth());
Modified: weasis/weasis_framework/trunk/weasis-base/weasis-base-explorer/src/main/java/org/weasis/base/explorer/JIThumbnailList.java
===================================================================
--- weasis/weasis_framework/trunk/weasis-base/weasis-base-explorer/src/main/java/org/weasis/base/explorer/JIThumbnailList.java 2011-07-22 13:30:30 UTC (rev 15701)
+++ weasis/weasis_framework/trunk/weasis-base/weasis-base-explorer/src/main/java/org/weasis/base/explorer/JIThumbnailList.java 2011-07-23 21:02:43 UTC (rev 15702)
@@ -34,7 +34,7 @@
import org.weasis.core.ui.editor.SeriesViewerFactory;
import org.weasis.core.ui.editor.image.ViewerPlugin;
-final public class JIThumbnailList extends JList implements JIObservable {
+public final class JIThumbnailList extends JList implements JIObservable {
public static final Dimension ICON_DIM = new Dimension(150, 150);
private static final NumberFormat intGroupFormat = NumberFormat.getIntegerInstance();
@@ -116,7 +116,7 @@
JIThumbnailCache.getInstance().invalidate();
}
- public final JIListModel getThumbnailListModel() {
+ public JIListModel getThumbnailListModel() {
return (JIListModel) getModel();
}
@@ -124,18 +124,17 @@
// this.listCellEditor = new JIListCellEditor(this);
// }
- public final Frame getFrame() {
+ public Frame getFrame() {
return null;
}
- public final JViewport getViewPort() {
+ public JViewport getViewPort() {
return this.viewport.getViewport();
}
- public final boolean isEditing() {
- if (this.editingIndex > -1) {
+ public boolean isEditing() {
+ if (this.editingIndex > -1)
return true;
- }
return false;
}
@@ -145,7 +144,7 @@
// of the JScrollBar to a fixed value. You wouldn't get the nice
// aligned scrolling, but it should work.
@Override
- public final int getScrollableUnitIncrement(final Rectangle visibleRect, final int orientation, final int direction) {
+ public int getScrollableUnitIncrement(final Rectangle visibleRect, final int orientation, final int direction) {
int row;
if ((orientation == SwingConstants.VERTICAL) && (direction < 0) && ((row = getFirstVisibleIndex()) != -1)) {
final Rectangle r = getCellBounds(row, row);
@@ -155,9 +154,8 @@
final int prevIndex = locationToIndex(loc);
final Rectangle prevR = getCellBounds(prevIndex, prevIndex);
- if ((prevR == null) || (prevR.y >= r.y)) {
+ if ((prevR == null) || (prevR.y >= r.y))
return 0;
- }
return prevR.height;
}
}
@@ -165,29 +163,27 @@
}
@Override
- public final String getToolTipText(final MouseEvent evt) {
+ public String getToolTipText(final MouseEvent evt) {
// if (!JIPreferences.getInstance().isThumbnailToolTips()) {
// return null;
// }
// Get item index
final int index = locationToIndex(evt.getPoint());
- if (index < 0) {
+ if (index < 0)
return "";
- }
// Get item
final Object item = getModel().getElementAt(index);
- if (((MediaElement) item).getName() == null) {
+ if (((MediaElement) item).getName() == null)
return null;
- }
return "<html>" + ((MediaElement) item).getName() + "<br> Size: "
+ intGroupFormat.format(((MediaElement) item).getLength() / 1024L) + " KB<br>" + "Date: "
+ new Date(((MediaElement) item).getLastModified()).toString() + "</html>";
}
- public final void reset() {
+ public void reset() {
setFixedCellHeight(ICON_DIM.height);
setFixedCellWidth(ICON_DIM.width);
setLayoutOrientation(HORIZONTAL_WRAP);
@@ -199,7 +195,7 @@
ensureIndexIsVisible(0);
}
- public final void openSelection() {
+ public void openSelection() {
final int index = getSelectedIndex();
final OrderedFileList imageList = ((JIListModel) getModel()).getDiskObjectList();
imageList.setCurrentIndex(index);
@@ -207,7 +203,7 @@
// new JIViewer(imageList);
}
- public final void nextPage(final KeyEvent e) {
+ public void nextPage(final KeyEvent e) {
final int lastIndex = getLastVisibleIndex();
if (getLayoutOrientation() != JList.HORIZONTAL_WRAP) {
@@ -231,7 +227,7 @@
}
}
- public final void lastPage(final KeyEvent e) {
+ public void lastPage(final KeyEvent e) {
final int lastIndex = getLastVisibleIndex();
if (getLayoutOrientation() != JList.HORIZONTAL_WRAP) {
@@ -253,7 +249,7 @@
}
}
- public final void jiThumbnail_keyPressed(final KeyEvent e) {
+ public void jiThumbnail_keyPressed(final KeyEvent e) {
switch (e.getKeyCode()) {
case KeyEvent.VK_PAGE_DOWN:
nextPage(e);
@@ -268,7 +264,7 @@
}
}
- private final void openMedia(SeriesViewerFactory factory, MediaElement media) {
+ private void openMedia(SeriesViewerFactory factory, MediaElement media) {
// TODO should be the SeriesViewer type
ViewerPlugin view = (ViewerPlugin) factory.createSeriesViewer(null);
@@ -304,24 +300,21 @@
}
}
- private final void initOpenWith() {
+ private void initOpenWith() {
// Open With
this.jMenuItemOpenWith.removeAll();
this.jMenuItemOpenWith.setText("Open With");
final int index = getSelectedIndex();
- if (index == -1) {
+ if (index == -1)
return;
- }
final OrderedFileList imageList = ((JIListModel) getModel()).getDiskObjectList();
imageList.setCurrentIndex(index);
final MediaElement media = imageList.get(index);
- if (media == null) {
+ if (media == null)
return;
- }
- // final int selectedIndex = series.getMedias().indexOf(imageList.get(index));
final String mimeType = media.getMimeType();
@@ -332,6 +325,7 @@
final JMenuItem item4 = new JMenuItem(factory.getUIName(), factory.getIcon());
item4.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent e) {
openMedia(factory, media);
}
@@ -342,7 +336,7 @@
}
}
- private final void initActions() {
+ private void initActions() {
// Open
this.jMenuItemOpen.setText("Open");
@@ -353,6 +347,7 @@
*/
private static final long serialVersionUID = 7770033253414532608L;
+ @Override
public void actionPerformed(final ActionEvent e) {
final Thread runner = new Thread() {
@@ -360,19 +355,17 @@
public void run() {
Runnable runnable = new Runnable() {
+ @Override
public void run() {
final int index = getSelectedIndex();
- if (index < 0) {
+ if (index < 0)
return;
- }
final OrderedFileList imageList = ((JIListModel) getModel()).getDiskObjectList();
imageList.setCurrentIndex(index);
final MediaElement media = imageList.get(index);
- if (media == null) {
+ if (media == null)
return;
- }
- // final int selectedIndex = series.getMedias().indexOf(imageList.get(index));
final String mimeType = media.getMimeType();
@@ -404,6 +397,7 @@
*/
private static final long serialVersionUID = -7251048462021844506L;
+ @Override
public void actionPerformed(final ActionEvent e) {
final Thread runner = new Thread() {
@@ -411,6 +405,7 @@
public void run() {
Runnable runnable = new Runnable() {
+ @Override
public void run() {
JIThumbnailList.this.getThumbnailListModel().reload();
}
@@ -441,15 +436,14 @@
final Object obj = super.getSelectedValue();
int cnt = 0;
for (final Object o : objs) {
- if (o.equals(obj)) {
+ if (o.equals(obj))
return cnt;
- }
cnt++;
}
return cnt - 1;
}
- protected final void listValueChanged(final ListSelectionEvent e) {
+ protected void listValueChanged(final ListSelectionEvent e) {
if (this.lastSelectedDiskObject == null) {
this.lastSelectedDiskObject = (MediaElement) getModel().getElementAt(e.getLastIndex());
}
@@ -462,7 +456,7 @@
clearChanged();
}
- public final void listMouseClicked(final MouseEvent e) {
+ public void listMouseClicked(final MouseEvent e) {
final int index = this.locationToIndex(e.getPoint());
if (getSelectionModel().isSelectedIndex(index)) {
@@ -486,10 +480,8 @@
imageList.setCurrentIndex(indexSel);
final MediaElement media = imageList.get(indexSel);
- if (media == null) {
+ if (media == null)
return;
- }
- // final int selectedIndex = series.getMedias().indexOf(imageList.get(index));
final String mimeType = media.getMimeType();
synchronized (UIManager.SERIES_VIEWER_FACTORIES) {
@@ -506,7 +498,7 @@
}
}
- public final void listMouseEvent(final MouseEvent e) {
+ public void listMouseEvent(final MouseEvent e) {
if (SwingUtilities.isRightMouseButton(e)) {
try {
final Object obj = getSelectedValue();
@@ -563,7 +555,7 @@
}
@Override
- public final void mouseClicked(final MouseEvent e) {
+ public void mouseClicked(final MouseEvent e) {
// listMouseClicked(e);
}
@@ -602,12 +594,12 @@
* @see java.util.Observable#hasChanged()
* @see java.util.Observer#update(java.util.Observable, java.lang.Object)
*/
+ @Override
public void notifyObservers(final Object arg) {
synchronized (this) {
- if (!this.changed) {
+ if (!this.changed)
return;
- }
clearChanged();
}
@@ -648,6 +640,7 @@
* @see java.util.Observable#clearChanged()
* @see java.util.Observable#setChanged()
*/
+ @Override
public synchronized boolean hasChanged() {
return this.changed;
}
@@ -660,7 +653,7 @@
/** key event handlers */
@Override
- public final void keyPressed(final KeyEvent e) {
+ public void keyPressed(final KeyEvent e) {
if (e.getKeyCode() == KeyEvent.VK_SHIFT) {
JIThumbnailList.this.selectionModel.setShiftKey(true);
}
@@ -673,6 +666,7 @@
public void run() {
Runnable runnable = new Runnable() {
+ @Override
public void run() {
JIThumbnailList.this.jiThumbnail_keyPressed(e);
}
@@ -684,7 +678,7 @@
}
@Override
- public final void keyReleased(final KeyEvent e) {
+ public void keyReleased(final KeyEvent e) {
JIThumbnailList.this.selectionModel.setShiftKey(false);
JIThumbnailList.this.selectionModel.setCntrlKey(false);
}
Modified: weasis/weasis_framework/trunk/weasis-base/weasis-base-explorer/src/main/java/org/weasis/base/explorer/JIThumbnailListPane.java
===================================================================
--- weasis/weasis_framework/trunk/weasis-base/weasis-base-explorer/src/main/java/org/weasis/base/explorer/JIThumbnailListPane.java 2011-07-22 13:30:30 UTC (rev 15701)
+++ weasis/weasis_framework/trunk/weasis-base/weasis-base-explorer/src/main/java/org/weasis/base/explorer/JIThumbnailListPane.java 2011-07-23 21:02:43 UTC (rev 15702)
@@ -55,6 +55,7 @@
this(model, null);
}
+ @Override
public void loadDirectory(final File dir) {
try {
getRootPane().setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
@@ -62,6 +63,7 @@
}
this.pool.execute(new Runnable() {
+ @Override
public void run() {
((JIListModel) JIThumbnailListPane.this.list.getModel()).setData();
@@ -80,14 +82,17 @@
this.list.notifyObservers(null)...
[truncated message content] |
