[Observe-commits] 06/21: introduce renderer package

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit de88bd529d8501d259896c86a384c2f646486e03 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 26 14:33:10 2016 +0200 introduce renderer package --- .../main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jaxx | 2 +- .../observe/application/swing/ui/actions/shared/GoDownUIAction.java | 2 +- .../observe/application/swing/ui/actions/shared/GoUpUIAction.java | 2 +- .../ird/observe/application/swing/ui/admin/config/SelectDataUI.jaxx | 2 +- .../admin/synchronize/data/DataSynchroSelectionTreeCellRenderer.java | 2 +- .../application/swing/ui/admin/synchronize/data/DataSynchroUI.jaxx | 2 +- .../ird/observe/application/swing/ui/content/ContentUIHandler.java | 2 +- .../application/swing/ui/content/list/ContentListUIHandler.java | 2 +- .../ird/observe/application/swing/ui/storage/tabs/SelectDataUI.jaxx | 2 +- .../application/swing/ui/tree/DataSelectionTreeSelectionModel.java | 1 + .../fr/ird/observe/application/swing/ui/tree/ObserveTreeHelper.java | 1 + .../ui/tree/{ => renderer}/AbstractObserveTreeCellRenderer.java | 5 +++-- .../swing/ui/tree/{ => renderer}/DataSelectionTreeCellRenderer.java | 2 +- .../swing/ui/tree/{ => renderer}/NavigationTreeCellRenderer.java | 2 +- 14 files changed, 16 insertions(+), 13 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jaxx index 93b669b..3d3adfd 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jaxx @@ -45,7 +45,7 @@ fr.ird.observe.application.swing.ui.actions.ShowStorageInfoAction fr.ird.observe.application.swing.ui.content.ContentUIManager fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper - fr.ird.observe.application.swing.ui.tree.NavigationTreeCellRenderer + fr.ird.observe.application.swing.ui.tree.renderer.NavigationTreeCellRenderer fr.ird.observe.application.swing.ui.util.tree.BeanTreeHeader jaxx.runtime.swing.CardLayout2 diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/GoDownUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/GoDownUIAction.java index 26aa472..6852337 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/GoDownUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/GoDownUIAction.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.swing.ui.actions.shared; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.content.ObserveContentUI; -import fr.ird.observe.application.swing.ui.tree.AbstractObserveTreeCellRenderer; +import fr.ird.observe.application.swing.ui.tree.renderer.AbstractObserveTreeCellRenderer; import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/GoUpUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/GoUpUIAction.java index bc967e3..4f73e86 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/GoUpUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/GoUpUIAction.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.swing.ui.actions.shared; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.content.ObserveContentUI; -import fr.ird.observe.application.swing.ui.tree.AbstractObserveTreeCellRenderer; +import fr.ird.observe.application.swing.ui.tree.renderer.AbstractObserveTreeCellRenderer; import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/SelectDataUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/SelectDataUI.jaxx index 4d65cdc..e762290 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/SelectDataUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/SelectDataUI.jaxx @@ -31,7 +31,7 @@ fr.ird.observe.application.swing.ui.admin.AdminUI fr.ird.observe.application.swing.ui.admin.AdminStep fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper - fr.ird.observe.application.swing.ui.tree.DataSelectionTreeCellRenderer + fr.ird.observe.application.swing.ui.tree.renderer.DataSelectionTreeCellRenderer fr.ird.observe.application.swing.ui.tree.DataSelectionTreeSelectionModel fr.ird.observe.application.swing.ui.storage.tabs.DataSelectionModel diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroSelectionTreeCellRenderer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroSelectionTreeCellRenderer.java index b7c62aa..09c60f2 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroSelectionTreeCellRenderer.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroSelectionTreeCellRenderer.java @@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.data; import com.google.common.collect.ImmutableSet; import fr.ird.observe.application.swing.ui.UIHelper; -import fr.ird.observe.application.swing.ui.tree.DataSelectionTreeCellRenderer; +import fr.ird.observe.application.swing.ui.tree.renderer.DataSelectionTreeCellRenderer; import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.node.ReferentialReferenceNodeSupport; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUI.jaxx index 86eb01f..1327803 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUI.jaxx @@ -29,7 +29,7 @@ fr.ird.observe.application.swing.ui.admin.AdminUI fr.ird.observe.application.swing.ui.admin.AdminStep fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper - fr.ird.observe.application.swing.ui.tree.DataSelectionTreeCellRenderer + fr.ird.observe.application.swing.ui.tree.renderer.DataSelectionTreeCellRenderer fr.ird.observe.application.swing.ui.tree.DataSelectionTreeSelectionModel fr.ird.observe.application.swing.ui.storage.tabs.DataSelectionModel fr.ird.observe.application.swing.ui.util.tree.BeanTreeHeader diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java index 15e7120..624f997 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java @@ -37,7 +37,7 @@ import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferen import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.actions.shared.AbstractUIAction; import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; -import fr.ird.observe.application.swing.ui.tree.AbstractObserveTreeCellRenderer; +import fr.ird.observe.application.swing.ui.tree.renderer.AbstractObserveTreeCellRenderer; import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import fr.ird.observe.application.swing.ui.util.SpringUtilities; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIHandler.java index f3e2911..1593a80 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIHandler.java @@ -26,7 +26,7 @@ import fr.ird.observe.application.swing.db.constants.DataContextType; import fr.ird.observe.application.swing.ui.actions.shared.SelectNodeUIAction; import fr.ird.observe.application.swing.ui.content.ContentMode; import fr.ird.observe.application.swing.ui.content.ContentUIHandler; -import fr.ird.observe.application.swing.ui.tree.AbstractObserveTreeCellRenderer; +import fr.ird.observe.application.swing.ui.tree.renderer.AbstractObserveTreeCellRenderer; import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import fr.ird.observe.services.dto.AbstractReference; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/SelectDataUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/SelectDataUI.jaxx index 9ddfb80..2a6abec 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/SelectDataUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/SelectDataUI.jaxx @@ -30,7 +30,7 @@ fr.ird.observe.application.swing.db.ObserveSwingDataSource fr.ird.observe.application.swing.ui.storage.StorageStep fr.ird.observe.application.swing.ui.tree.DataSelectionTreeSelectionModel - fr.ird.observe.application.swing.ui.tree.DataSelectionTreeCellRenderer + fr.ird.observe.application.swing.ui.tree.renderer.DataSelectionTreeCellRenderer fr.ird.observe.application.swing.ui.util.tree.BeanTreeHeader </import> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/DataSelectionTreeSelectionModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/DataSelectionTreeSelectionModel.java index f558b0e..17c3ec7 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/DataSelectionTreeSelectionModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/DataSelectionTreeSelectionModel.java @@ -24,6 +24,7 @@ package fr.ird.observe.application.swing.ui.tree; import com.google.common.collect.Sets; import fr.ird.observe.application.swing.ui.tree.node.AbstrctReferenceNodeSupport; import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.renderer.AbstractObserveTreeCellRenderer; import fr.ird.observe.services.dto.AbstractReference; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveTreeHelper.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveTreeHelper.java index ede5dd3..5adfc9b 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveTreeHelper.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveTreeHelper.java @@ -38,6 +38,7 @@ import fr.ird.observe.application.swing.ui.tree.loadors.RootNodeChildLoador; import fr.ird.observe.application.swing.ui.tree.loadors.RoutesNodeChildLoador; import fr.ird.observe.application.swing.ui.tree.node.AbstrctReferenceNodeSupport; import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.renderer.AbstractObserveTreeCellRenderer; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.constants.ReferentialLocale; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/AbstractObserveTreeCellRenderer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/renderer/AbstractObserveTreeCellRenderer.java similarity index 98% rename from application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/AbstractObserveTreeCellRenderer.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/renderer/AbstractObserveTreeCellRenderer.java index aa0ceb2..ea51ba6 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/AbstractObserveTreeCellRenderer.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/renderer/AbstractObserveTreeCellRenderer.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.application.swing.ui.tree; +package fr.ird.observe.application.swing.ui.tree.renderer; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.db.DataContext; @@ -33,6 +33,7 @@ import fr.ird.observe.application.swing.ui.content.open.impl.longline.TripLongli import fr.ird.observe.application.swing.ui.content.open.impl.seine.ActivitySeineUI; import fr.ird.observe.application.swing.ui.content.open.impl.seine.RouteUI; import fr.ird.observe.application.swing.ui.content.open.impl.seine.TripSeineUI; +import fr.ird.observe.application.swing.ui.tree.ObserveDataProvider; import fr.ird.observe.application.swing.ui.tree.node.DataReferenceNodeSupport; import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.node.ReferentialReferenceNodeSupport; @@ -404,7 +405,7 @@ public abstract class AbstractObserveTreeCellRenderer extends AbstractNavTreeCel * @return the cast {@link ObserveNode}, or {@code null} if * value is null. */ - static ObserveNode getNode(Object value) { + public static ObserveNode getNode(Object value) { ObserveNode node = null; if (value instanceof ObserveNode) { node = (ObserveNode) value; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/DataSelectionTreeCellRenderer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/renderer/DataSelectionTreeCellRenderer.java similarity index 98% rename from application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/DataSelectionTreeCellRenderer.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/renderer/DataSelectionTreeCellRenderer.java index e04bb61..ba9f8f2 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/DataSelectionTreeCellRenderer.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/renderer/DataSelectionTreeCellRenderer.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.application.swing.ui.tree; +package fr.ird.observe.application.swing.ui.tree.renderer; import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.node.TripSeineNode; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/NavigationTreeCellRenderer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/renderer/NavigationTreeCellRenderer.java similarity index 98% rename from application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/NavigationTreeCellRenderer.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/renderer/NavigationTreeCellRenderer.java index b79d4af..a8d38a4 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/NavigationTreeCellRenderer.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/renderer/NavigationTreeCellRenderer.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.application.swing.ui.tree; +package fr.ird.observe.application.swing.ui.tree.renderer; import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.