This is an automated email from the git hooks/post-receive script. New commit to branch feature/4304_synchro_marees in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit ce3b308c4d20e17958964700ffe1f25f308ba127 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 9 16:52:13 2016 +0200 Improve tasks renderer --- .../src/main/filters/observe-ui.properties | 2 ++ .../admin/datasynchro/CopyToLeftDataSynchronizeTask.java | 2 +- .../admin/datasynchro/CopyToRightDataSynchronizeTask.java | 2 +- .../datasynchro/DataSynchronizeTaskListCellRenderer.java | 4 +++- .../ui/admin/datasynchro/DataSynchronizeTaskSupport.java | 11 ++++++++++- .../datasynchro/DeleteFromLeftDataSynchronizeTask.java | 2 +- .../datasynchro/DeleteFromRightDataSynchronizeTask.java | 2 +- .../src/main/resources/icons/action-deleteFromLeft.png | Bin 0 -> 783 bytes .../src/main/resources/icons/action-deleteFromRight.png | Bin 0 -> 783 bytes 9 files changed, 19 insertions(+), 6 deletions(-) diff --git a/observe-application-swing/src/main/filters/observe-ui.properties b/observe-application-swing/src/main/filters/observe-ui.properties index 80408dd..ce7bbde 100644 --- a/observe-application-swing/src/main/filters/observe-ui.properties +++ b/observe-application-swing/src/main/filters/observe-ui.properties @@ -111,6 +111,8 @@ icon.action.db-reload=action-db-reload.png icon.action.db-start-server=action-db-start-server.png icon.action.db-stop-server=action-db-stop-server.png icon.action.delete=action-delete.png +icon.action.deleteFromLeft=action-deleteFromLeft.png +icon.action.deleteFromRight=action-deleteFromRight.png icon.action.exit=action-exit.png icon.action.error=error.png icon.action.fileChooser=action-fileChooser.png diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/datasynchro/CopyToLeftDataSynchronizeTask.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/datasynchro/CopyToLeftDataSynchronizeTask.java index 15cf796..b3478ad 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/datasynchro/CopyToLeftDataSynchronizeTask.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/datasynchro/CopyToLeftDataSynchronizeTask.java @@ -17,7 +17,7 @@ public class CopyToLeftDataSynchronizeTask extends DataSynchronizeTaskSupport { private final boolean tripExistOnLeft; public CopyToLeftDataSynchronizeTask(ReferentialReference<ProgramDto> programReference, DataReference tripReference, boolean tripExistOnLeft) { - super(programReference, tripReference); + super(programReference, tripReference, "copyToLeft"); this.tripExistOnLeft=tripExistOnLeft; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/datasynchro/CopyToRightDataSynchronizeTask.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/datasynchro/CopyToRightDataSynchronizeTask.java index ecb6420..46a9067 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/datasynchro/CopyToRightDataSynchronizeTask.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/datasynchro/CopyToRightDataSynchronizeTask.java @@ -17,7 +17,7 @@ public class CopyToRightDataSynchronizeTask extends DataSynchronizeTaskSupport { private final boolean tripExistOnRight; public CopyToRightDataSynchronizeTask(ReferentialReference<ProgramDto> programReference, DataReference tripReference, boolean tripExistOnRight) { - super(programReference, tripReference); + super(programReference, tripReference, "copyToRight"); this.tripExistOnRight = tripExistOnRight; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/datasynchro/DataSynchronizeTaskListCellRenderer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/datasynchro/DataSynchronizeTaskListCellRenderer.java index ca9fc28..14e77c9 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/datasynchro/DataSynchronizeTaskListCellRenderer.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/datasynchro/DataSynchronizeTaskListCellRenderer.java @@ -18,7 +18,9 @@ public class DataSynchronizeTaskListCellRenderer extends DefaultListCellRenderer public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { DataSynchronizeTaskSupport task = (DataSynchronizeTaskSupport) value; - return super.getListCellRendererComponent(list, task.getLabel(), index, isSelected, cellHasFocus); + super.getListCellRendererComponent(list, task.getLabel(), index, isSelected, cellHasFocus); + setIcon(task.getIcon()); + return this; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/datasynchro/DataSynchronizeTaskSupport.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/datasynchro/DataSynchronizeTaskSupport.java index b60565f..8fda9d5 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/datasynchro/DataSynchronizeTaskSupport.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/datasynchro/DataSynchronizeTaskSupport.java @@ -5,6 +5,9 @@ import fr.ird.observe.application.swing.decoration.DecoratorService; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialReference; +import jaxx.runtime.SwingUtil; + +import javax.swing.Icon; /** * Created on 03/08/16. @@ -16,6 +19,7 @@ public abstract class DataSynchronizeTaskSupport { private final ReferentialReference<ProgramDto> program; private final DataReference trip; + private final Icon icon; public abstract String getLabel(); @@ -27,9 +31,14 @@ public abstract class DataSynchronizeTaskSupport { return trip; } - protected DataSynchronizeTaskSupport(ReferentialReference<ProgramDto> program, DataReference trip) { + public Icon getIcon() { + return icon; + } + + protected DataSynchronizeTaskSupport(ReferentialReference<ProgramDto> program, DataReference trip, String iconName) { this.program = program; this.trip = trip; + this.icon = SwingUtil.createActionIcon(iconName); } protected String decorateProgram() { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/datasynchro/DeleteFromLeftDataSynchronizeTask.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/datasynchro/DeleteFromLeftDataSynchronizeTask.java index d6705fb..02a4b50 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/datasynchro/DeleteFromLeftDataSynchronizeTask.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/datasynchro/DeleteFromLeftDataSynchronizeTask.java @@ -15,7 +15,7 @@ import static org.nuiton.i18n.I18n.t; public class DeleteFromLeftDataSynchronizeTask extends DataSynchronizeTaskSupport { public DeleteFromLeftDataSynchronizeTask(ReferentialReference<ProgramDto> programReference, DataReference tripReference) { - super(programReference, tripReference); + super(programReference, tripReference, "deleteFromLeft"); } @Override diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/datasynchro/DeleteFromRightDataSynchronizeTask.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/datasynchro/DeleteFromRightDataSynchronizeTask.java index b891c9a..214ff4e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/datasynchro/DeleteFromRightDataSynchronizeTask.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/datasynchro/DeleteFromRightDataSynchronizeTask.java @@ -15,7 +15,7 @@ import static org.nuiton.i18n.I18n.t; public class DeleteFromRightDataSynchronizeTask extends DataSynchronizeTaskSupport { public DeleteFromRightDataSynchronizeTask(ReferentialReference<ProgramDto> programReference, DataReference tripReference) { - super(programReference, tripReference); + super(programReference, tripReference, "deleteFromRight"); } @Override diff --git a/observe-application-swing/src/main/resources/icons/action-deleteFromLeft.png b/observe-application-swing/src/main/resources/icons/action-deleteFromLeft.png new file mode 100644 index 0000000..184f762 Binary files /dev/null and b/observe-application-swing/src/main/resources/icons/action-deleteFromLeft.png differ diff --git a/observe-application-swing/src/main/resources/icons/action-deleteFromRight.png b/observe-application-swing/src/main/resources/icons/action-deleteFromRight.png new file mode 100644 index 0000000..184f762 Binary files /dev/null and b/observe-application-swing/src/main/resources/icons/action-deleteFromRight.png differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.