Author: echatellier Date: 2009-11-16 10:19:51 +0100 (Mon, 16 Nov 2009) New Revision: 2693 Modified: trunk/src/main/java/org/chorem/jtimer/ui/treetable/dnd/TimerTaskTranferable.java trunk/src/main/java/org/chorem/jtimer/ui/treetable/dnd/TimerTaskTransferHandler.java trunk/src/main/resources/org/chorem/jtimer/ui/treetable/dnd/resources/TimerTaskTransferHandler.properties trunk/src/main/resources/org/chorem/jtimer/ui/treetable/dnd/resources/TimerTaskTransferHandler_fr.properties Log: Display specific message if only one task is moved Modified: trunk/src/main/java/org/chorem/jtimer/ui/treetable/dnd/TimerTaskTranferable.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/treetable/dnd/TimerTaskTranferable.java 2009-11-16 09:17:41 UTC (rev 2692) +++ trunk/src/main/java/org/chorem/jtimer/ui/treetable/dnd/TimerTaskTranferable.java 2009-11-16 09:19:51 UTC (rev 2693) @@ -22,7 +22,7 @@ import java.awt.datatransfer.Transferable; import java.awt.datatransfer.UnsupportedFlavorException; import java.io.IOException; -import java.util.Collection; +import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -49,14 +49,14 @@ protected static DataFlavor myData; /** Tasks to transfer. Chosen implementation must be serializable. */ - protected Collection<TimerTask> tasksToTransfer; + protected List<TimerTask> tasksToTransfer; /** * Constructor. * * @param tasks task to transfer */ - public TimerTaskTranferable(Collection<TimerTask> tasks) { + public TimerTaskTranferable(List<TimerTask> tasks) { // save task this.tasksToTransfer = tasks; @@ -78,7 +78,7 @@ public Object getTransferData(DataFlavor flavor) throws UnsupportedFlavorException, IOException { - Collection<TimerTask> tasks = null; + List<TimerTask> tasks = null; if (flavor == null) { throw new IOException("flavor is null"); 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 2009-11-16 09:17:41 UTC (rev 2692) +++ trunk/src/main/java/org/chorem/jtimer/ui/treetable/dnd/TimerTaskTransferHandler.java 2009-11-16 09:19:51 UTC (rev 2693) @@ -22,7 +22,6 @@ import java.awt.datatransfer.Transferable; import java.awt.datatransfer.UnsupportedFlavorException; import java.io.IOException; -import java.util.Collection; import java.util.LinkedList; import java.util.List; @@ -108,13 +107,19 @@ TimerTask destinationTask = selectedTasks.get(0); Object myObject = transferable .getTransferData(TimerTaskTranferable.myData); - Collection<TimerTask> movedTasks = (Collection<TimerTask>) myObject; + List<TimerTask> movedTasks = (List<TimerTask>) myObject; // can't move task to itself boolean validMove = !TimerTaskHelper.collectionContainsTask(movedTasks, destinationTask); if (validMove) { - String title = resourceMap.getString("move.confirmation.title"); - String message = resourceMap.getString("move.confirmation.message", movedTasks.size(), destinationTask.getName()); + 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()); + } + else { + message = resourceMap.getString("move.tasks.message", movedTasks.size(), destinationTask.getName()); + } int answer = JOptionPane.showConfirmDialog(component, message, title, JOptionPane.YES_NO_OPTION, @@ -154,7 +159,7 @@ // only task can be moved ! List<TimerTask> selectedTasks = treeTable.getSelectedTasks(); if (selectedTasks != null && !selectedTasks.isEmpty()) { - Collection<TimerTask> tasks = new LinkedList<TimerTask>(selectedTasks); + List<TimerTask> tasks = new LinkedList<TimerTask>(selectedTasks); transferable = new TimerTaskTranferable(tasks); } @@ -178,7 +183,7 @@ TimerTask destinationTask = selectedTasks.get(0); Object myObject = transferable .getTransferData(TimerTaskTranferable.myData); - Collection<TimerTask> movedTasks = (Collection<TimerTask>) myObject; + List<TimerTask> movedTasks = (List<TimerTask>) myObject; try { dataManager.moveTask(destinationTask, movedTasks); Modified: trunk/src/main/resources/org/chorem/jtimer/ui/treetable/dnd/resources/TimerTaskTransferHandler.properties =================================================================== --- trunk/src/main/resources/org/chorem/jtimer/ui/treetable/dnd/resources/TimerTaskTransferHandler.properties 2009-11-16 09:17:41 UTC (rev 2692) +++ trunk/src/main/resources/org/chorem/jtimer/ui/treetable/dnd/resources/TimerTaskTransferHandler.properties 2009-11-16 09:19:51 UTC (rev 2693) @@ -1,6 +1,7 @@ #�Move UI i18n -move.confirmation.title=Move task -move.confirmation.message=Do you want to move %d task(s)\nto '%s' ? +move.task.title=Move task +move.task.confirmation.message=Do you want to move task '%s'\nto '%s' ? +move.tasks.confirmation.message=Do you want to move %d tasks\nto '%s' ? #�error action.invalidActionTitle=Can't do action Modified: trunk/src/main/resources/org/chorem/jtimer/ui/treetable/dnd/resources/TimerTaskTransferHandler_fr.properties =================================================================== --- trunk/src/main/resources/org/chorem/jtimer/ui/treetable/dnd/resources/TimerTaskTransferHandler_fr.properties 2009-11-16 09:17:41 UTC (rev 2692) +++ trunk/src/main/resources/org/chorem/jtimer/ui/treetable/dnd/resources/TimerTaskTransferHandler_fr.properties 2009-11-16 09:19:51 UTC (rev 2693) @@ -1,6 +1,7 @@ #�Move UI i18n -move.confirmation.title=D\u00E9placement de la t\u00E2che -move.confirmation.message=\u00CAtes vous s\u00FBr de vouloir d\u00E9placer %d t\u00E2che(s)\nvers '%s' ? +move.task.title=D\u00E9placement de la t\u00E2che +move.task.message=\u00CAtes vous s\u00FBr de vouloir d\u00E9placer la t\u00E2che '%s'\nvers '%s' ? +move.tasks.message=\u00CAtes vous s\u00FBr de vouloir d\u00E9placer %d t\u00E2ches\nvers '%s' ? #�error action.invalidActionTitle=Impossible d'effectuer cette action