Author: echatellier Date: 2010-04-16 17:46:56 +0200 (Fri, 16 Apr 2010) New Revision: 2730 Log: Misc code reformat Modified: trunk/src/main/java/org/chorem/jtimer/ui/report/tree/CheckBoxTreeCellEditor.java trunk/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksTable.java trunk/src/main/java/org/chorem/jtimer/ui/treetable/dnd/TimerTaskTransferHandler.java trunk/src/main/java/org/chorem/jtimer/ui/widget/DurationEditor.java trunk/src/main/java/org/chorem/jtimer/ui/widget/JPopupTrayIcon.java Modified: trunk/src/main/java/org/chorem/jtimer/ui/report/tree/CheckBoxTreeCellEditor.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/report/tree/CheckBoxTreeCellEditor.java 2010-04-16 15:46:40 UTC (rev 2729) +++ trunk/src/main/java/org/chorem/jtimer/ui/report/tree/CheckBoxTreeCellEditor.java 2010-04-16 15:46:56 UTC (rev 2730) @@ -59,7 +59,7 @@ /** {@link CellEditorListener}s */ protected Collection<CellEditorListener> cellEditorListeners; - + /** * Constructor. * @@ -183,8 +183,7 @@ TreePath subTreePath = treePath.pathByAddingChild(project); updateChildreen(subTreePath, select); } - } - else { + } else { for (TimerTask subtask : lastPathComponent.getSubTasks()) { TreePath subTreePath = treePath.pathByAddingChild(subtask); updateChildreen(subTreePath, select); Modified: trunk/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java 2010-04-16 15:46:40 UTC (rev 2729) +++ trunk/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java 2010-04-16 15:46:56 UTC (rev 2730) @@ -55,40 +55,41 @@ */ public class RunTaskJob extends Task<Void, Long> { - /** log */ + /** Class logger. */ private static Log log = LogFactory.getLog(RunTaskJob.class); - /** Parent app reference */ + /** Parent app referenc. */ protected JTimer parentApp; - /** The task to manage */ + /** The task to manage. */ protected TimerTask managedTask; - /** Data manager */ + /** Data manager. */ protected TimerDataManager dataManager; - /** System information (idle...) */ + /** System information (idle...). */ protected SystemInfo systemInfo; - /** The today total task time at start time */ + /** The today total task time at start time. */ protected long taskTimingBeforeStartInMs; - /** Calendar instance when timing start */ + /** Calendar instance when timing start. */ protected Calendar taskStartCalendar; /** Already thrown alert. */ protected Collection<TimerAlert> alreadyTrownAlerts; /** - * Offset to adjust time. Include : - Task idle time (task was running but - * time not counted) - Manual user incremented time + * Offset to adjust time. Include : + * - Task idle time (task was running but time not counted) + * - Manual user incremented time */ protected long offsetTimeInMs; - /** Last publish time to detect hibernate */ + /** Last publish time to detect hibernate. */ protected long lastPublishTimestamp; - /** Want to stop flag */ + /** Want to stop flag. */ protected Boolean bWantToStop; /** @@ -395,9 +396,9 @@ /** * Display alert message without breaking UI. * - * @param task - * @param alertType - * @param alertDuration + * @param task task + * @param alertType alert type + * @param alertDuration alert duration */ protected void displayAlert(final TimerTask task, final Type alertType, final long alertDuration) { Modified: trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksTable.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksTable.java 2010-04-16 15:46:40 UTC (rev 2729) +++ trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksTable.java 2010-04-16 15:46:56 UTC (rev 2730) @@ -49,17 +49,17 @@ */ public class ProjectsAndTasksTable extends JXTreeTable { - /** Version UID */ + /** serialVersionUID. */ private static final long serialVersionUID = -6909972377431117193L; - /** Table model */ + /** Table model. */ protected ProjectsAndTasksModel treeTableModel; - /** Table renderer */ + /** Table renderer. */ protected ProjectsAndTasksCellRenderer treeCellRenderer; /** - * Constructor + * Constructor. * * @param application application * @param core timer core @@ -104,7 +104,7 @@ /** * Change show closed task property. * - * @param closed + * @param closed new closed state * * @see ProjectsAndTasksModel#setShowClosed(boolean) */ Modified: trunk/src/main/java/org/chorem/jtimer/ui/treetable/dnd/TimerTaskTransferHandler.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/treetable/dnd/TimerTaskTransferHandler.java 2010-04-16 15:46:40 UTC (rev 2729) +++ trunk/src/main/java/org/chorem/jtimer/ui/treetable/dnd/TimerTaskTransferHandler.java 2010-04-16 15:46:56 UTC (rev 2730) @@ -60,7 +60,7 @@ /** I18n resources map */ protected ResourceMap resourceMap; - + /** Data manager. */ protected TimerDataManager dataManager; @@ -70,9 +70,10 @@ * @param application * @param dataManager data manager */ - public TimerTaskTransferHandler(Application application, TimerDataManager dataManager) { + public TimerTaskTransferHandler(Application application, + TimerDataManager dataManager) { this.dataManager = dataManager; - + // init resources map ApplicationContext ctxt = application.getContext(); ResourceManager mgr = ctxt.getResourceManager(); @@ -110,21 +111,22 @@ List<TimerTask> movedTasks = (List<TimerTask>) myObject; // can't move task to itself - boolean validMove = !TimerTaskHelper.collectionContainsTask(movedTasks, destinationTask); + boolean validMove = !TimerTaskHelper + .collectionContainsTask(movedTasks, destinationTask); if (validMove) { String title = resourceMap.getString("move.task.title"); String message; if (movedTasks.size() == 1) { - message = resourceMap.getString("move.task.message", movedTasks.get(0).getName(), destinationTask.getName()); + message = resourceMap.getString("move.task.message", + movedTasks.get(0).getName(), destinationTask.getName()); + } else { + message = resourceMap.getString("move.tasks.message", + movedTasks.size(), destinationTask.getName()); } - else { - message = resourceMap.getString("move.tasks.message", movedTasks.size(), destinationTask.getName()); - } int answer = JOptionPane.showConfirmDialog(component, - message, title, - JOptionPane.YES_NO_OPTION, + message, title, JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); - + if (answer == JOptionPane.YES_OPTION) { confirmImport = true; } @@ -171,7 +173,7 @@ if (log.isDebugEnabled()) { log.debug("Transfert done"); } - + if (type == TransferHandler.MOVE) { try { @@ -187,14 +189,17 @@ try { dataManager.moveTask(destinationTask, movedTasks); - } - catch(DataViolationException e) { - String title = resourceMap.getString("action.invalidActionTitle"); - String message = resourceMap.getString(e.getExceptionKey()); + } catch (DataViolationException e) { + String title = resourceMap + .getString("action.invalidActionTitle"); + String message = resourceMap.getString(e + .getExceptionKey()); if (StringUtils.isEmpty(message)) { - message = resourceMap.getString("action.missingErrorMessage", e.getExceptionKey()); + message = resourceMap.getString( + "action.missingErrorMessage", e.getExceptionKey()); } - JOptionPane.showMessageDialog(cp, message, title, JOptionPane.ERROR_MESSAGE); + JOptionPane.showMessageDialog(cp, message, title, + JOptionPane.ERROR_MESSAGE); } } } catch (IOException e) { Modified: trunk/src/main/java/org/chorem/jtimer/ui/widget/DurationEditor.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/widget/DurationEditor.java 2010-04-16 15:46:40 UTC (rev 2729) +++ trunk/src/main/java/org/chorem/jtimer/ui/widget/DurationEditor.java 2010-04-16 15:46:56 UTC (rev 2730) @@ -45,25 +45,25 @@ /** Hour spinner. */ protected JSpinner hourSpinner; - + /** Minute spinner. */ protected JSpinner minuteSpinner; - + /** Second spinner. */ protected JSpinner secondSpinner; - + /** Hour spinner model. */ protected SpinnerNumberModel hourSpinnerModel; - + /** Minute spinner model. */ protected SpinnerNumberModel minuteSpinnerModel; - + /** Second spinner model. */ protected SpinnerNumberModel secondSpinnerModel; - + /** Duration. */ protected long duration; - + /** * Constructor. * @@ -84,19 +84,19 @@ hourSpinnerModel = new SpinnerNumberModel(0, 0, maxHourValue, 1); hourSpinner = new JSpinner(hourSpinnerModel); add(hourSpinner); - + add(new JLabel(":")); - + minuteSpinnerModel = new SpinnerNumberModel(0, -1, 60, 1); minuteSpinner = new JSpinner(minuteSpinnerModel); add(minuteSpinner); - + add(new JLabel(":")); - + secondSpinnerModel = new SpinnerNumberModel(0, -1, 60, 1); secondSpinner = new JSpinner(secondSpinnerModel); add(secondSpinner); - + hourSpinnerModel.addChangeListener(this); minuteSpinnerModel.addChangeListener(this); secondSpinnerModel.addChangeListener(this); @@ -107,7 +107,7 @@ */ @Override public void stateChanged(ChangeEvent e) { - + // clic on minute spinner if (e.getSource() == minuteSpinnerModel) { int value = minuteSpinnerModel.getNumber().intValue(); @@ -116,21 +116,21 @@ if (hourSpinnerModel.getNextValue() != null) { minuteSpinnerModel.setValue(value - 60); hourSpinnerModel.setValue(hourSpinnerModel.getNextValue()); - } - else { + } else { minuteSpinnerModel.setValue(value - 1); } - // down + // down } else if (value < 0) { if (hourSpinnerModel.getPreviousValue() != null) { minuteSpinnerModel.setValue(value + 60); - hourSpinnerModel.setValue(hourSpinnerModel.getPreviousValue()); + hourSpinnerModel.setValue(hourSpinnerModel + .getPreviousValue()); } else { minuteSpinnerModel.setValue(value + 1); } } } - + // clic on seconds spinner else if (e.getSource() == secondSpinnerModel) { int value = secondSpinnerModel.getNumber().intValue(); @@ -138,23 +138,24 @@ if (value >= 60) { if (minuteSpinnerModel.getNextValue() != null) { secondSpinnerModel.setValue(value - 60); - minuteSpinnerModel.setValue(minuteSpinnerModel.getNextValue()); - } - else { + minuteSpinnerModel.setValue(minuteSpinnerModel + .getNextValue()); + } else { secondSpinnerModel.setValue(value - 1); } - // down + // down } else if (value < 0) { - if (hourSpinnerModel.getNumber().intValue() > 0 || - minuteSpinnerModel.getNumber().intValue() > 0) { + if (hourSpinnerModel.getNumber().intValue() > 0 + || minuteSpinnerModel.getNumber().intValue() > 0) { secondSpinnerModel.setValue(value + 60); - minuteSpinnerModel.setValue(minuteSpinnerModel.getPreviousValue()); + minuteSpinnerModel.setValue(minuteSpinnerModel + .getPreviousValue()); } else { secondSpinnerModel.setValue(value + 1); } } } - + long oldDuration = duration; duration = getDuration(); firePropertyChange("duration", oldDuration, duration); @@ -173,7 +174,7 @@ modelDuration += minuteSpinnerModel.getNumber().longValue() * 60; // add seconds modelDuration += secondSpinnerModel.getNumber().longValue(); - + return modelDuration; } @@ -186,16 +187,16 @@ this.duration = duration; long localDuration = duration; - hourSpinnerModel.setValue((int)(localDuration / 3600)); - + hourSpinnerModel.setValue((int) (localDuration / 3600)); + // reste de la division par 3600 localDuration %= 3600; - - minuteSpinnerModel.setValue((int)(localDuration / 60l)); - + + minuteSpinnerModel.setValue((int) (localDuration / 60l)); + // reste de la division par 60 localDuration %= 60; - - secondSpinnerModel.setValue((int)localDuration); + + secondSpinnerModel.setValue((int) localDuration); } } Modified: trunk/src/main/java/org/chorem/jtimer/ui/widget/JPopupTrayIcon.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/widget/JPopupTrayIcon.java 2010-04-16 15:46:40 UTC (rev 2729) +++ trunk/src/main/java/org/chorem/jtimer/ui/widget/JPopupTrayIcon.java 2010-04-16 15:46:56 UTC (rev 2730) @@ -53,7 +53,7 @@ private Window window; - private final static boolean IS_WINDOWS = System.getProperty("os.name") + private static final boolean IS_WINDOWS = System.getProperty("os.name") .toLowerCase().contains("windows"); public JPopupTrayIcon(Image image, String tooltip, JPopupMenu popup) {