branch develop updated (cfb7ced -> 9264a70)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from cfb7ced Happy new Year commit new 9264a70 use jaxx 3.0-alpha-3 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 9264a703ff97968c930e920fd6eba2c395a4f2f4 Author: Tony CHEMIT <dev@tchemit.fr> Date: Sun Jan 1 18:49:16 2017 +0100 use jaxx 3.0-alpha-3 Summary of changes: application-swing/pom.xml | 12 ++++++++++ .../application/swing/ui/ObserveMainUIModel.java | 13 +++++----- .../ird/observe/application/swing/ui/UIHelper.java | 2 +- .../swing/ui/admin/config/ConfigUI.jaxx | 2 +- .../swing/ui/admin/config/SelectDataUI.jaxx | 2 +- .../ui/admin/synchronize/data/DataSynchroUI.jaxx | 2 +- .../swing/ui/admin/validate/ValidateUIHandler.java | 11 ++++----- .../validate/ValidationMessageTableModel.java | 6 ++--- .../swing/ui/content/ContentUIInitializer.java | 3 +-- .../content/table/ContentTableUIInitializer.java | 7 +++--- .../longline/GearUseFeaturesLonglineUIHandler.java | 9 ++++--- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 9 ++++--- .../tree/ObserveNavigationTreeShowPopupAction.java | 4 ++-- pom.xml | 28 +++++++++++++++------- 14 files changed, 63 insertions(+), 47 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 9264a703ff97968c930e920fd6eba2c395a4f2f4 Author: Tony CHEMIT <dev@tchemit.fr> Date: Sun Jan 1 18:49:16 2017 +0100 use jaxx 3.0-alpha-3 --- application-swing/pom.xml | 12 ++++++++++ .../application/swing/ui/ObserveMainUIModel.java | 13 +++++----- .../ird/observe/application/swing/ui/UIHelper.java | 2 +- .../swing/ui/admin/config/ConfigUI.jaxx | 2 +- .../swing/ui/admin/config/SelectDataUI.jaxx | 2 +- .../ui/admin/synchronize/data/DataSynchroUI.jaxx | 2 +- .../swing/ui/admin/validate/ValidateUIHandler.java | 11 ++++----- .../validate/ValidationMessageTableModel.java | 6 ++--- .../swing/ui/content/ContentUIInitializer.java | 3 +-- .../content/table/ContentTableUIInitializer.java | 7 +++--- .../longline/GearUseFeaturesLonglineUIHandler.java | 9 ++++--- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 9 ++++--- .../tree/ObserveNavigationTreeShowPopupAction.java | 4 ++-- pom.xml | 28 +++++++++++++++------- 14 files changed, 63 insertions(+), 47 deletions(-) diff --git a/application-swing/pom.xml b/application-swing/pom.xml index 20096e6..faec6dd 100644 --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -138,6 +138,18 @@ </dependency> <dependency> <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-runtime-swing-application</artifactId> + </dependency> + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-runtime-swing-session</artifactId> + </dependency> + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-runtime-swing-wizard</artifactId> + </dependency> + <dependency> + <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-validator</artifactId> </dependency> <dependency> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIModel.java index 4299949..be781bd 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIModel.java @@ -26,11 +26,10 @@ import fr.ird.observe.application.swing.ObserveRunner; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.application.swing.db.ObserveSwingDataSource; -import org.nuiton.jaxx.runtime.JAXXObject; -import org.nuiton.jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.beans.AbstractBean; +import org.nuiton.jaxx.runtime.JAXXObject; import javax.swing.Icon; import javax.swing.JComponent; @@ -60,10 +59,10 @@ public class ObserveMainUIModel extends AbstractBean { } }; - private static final Icon DB_LOCAL_ICON = SwingUtil.getUIManagerActionIcon("db-local"); - private static final Icon DB_REMOTE_ICON = SwingUtil.getUIManagerActionIcon("db-remote"); - private static final Icon DB_SERVER_ICON = SwingUtil.getUIManagerActionIcon("db-server"); - private static final Icon DB_NONE_ICON = SwingUtil.getUIManagerActionIcon("db-none"); + private static final Icon DB_LOCAL_ICON = UIHelper.getUIManagerActionIcon("db-local"); + private static final Icon DB_REMOTE_ICON = UIHelper.getUIManagerActionIcon("db-remote"); + private static final Icon DB_SERVER_ICON = UIHelper.getUIManagerActionIcon("db-server"); + private static final Icon DB_NONE_ICON = UIHelper.getUIManagerActionIcon("db-none"); public static final String PROPERTY_FOCUS_ON_NAVIGATION = "focusOnNavigation"; public static final String PROPERTY_MODE = "mode"; @@ -119,7 +118,7 @@ public class ObserveMainUIModel extends AbstractBean { reload(config); }); - addPropertyChangeListener(PROPERTY_MODE, evt-> ObserveRunner.cleanMemory()); + addPropertyChangeListener(PROPERTY_MODE, evt -> ObserveRunner.cleanMemory()); } public void reload(ObserveSwingApplicationConfig config) { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/UIHelper.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/UIHelper.java index 4e50db6..8cf2c35 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/UIHelper.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/UIHelper.java @@ -36,7 +36,7 @@ import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.security.InvalidAuthenticationTokenException; import org.apache.commons.beanutils.PropertyUtils; import org.nuiton.jaxx.runtime.JAXXObject; -import org.nuiton.jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.swing.SwingUtil; import org.nuiton.jaxx.widgets.error.ErrorDialogUI; import org.nuiton.jaxx.runtime.swing.renderer.DecoratorTableCellRenderer; import org.apache.commons.io.FileUtils; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/ConfigUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/ConfigUI.jaxx index e1c5cbc..0233307 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/ConfigUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/ConfigUI.jaxx @@ -34,7 +34,7 @@ fr.ird.observe.application.swing.ui.admin.AdminTabUI fr.ird.observe.application.swing.ui.storage.StorageUIModel - org.nuiton.jaxx.runtime.SwingUtil + org.nuiton.jaxx.runtime.swing.SwingUtil java.awt.Color javax.swing.Icon 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 b325b15..d61a44d 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.tree.selection.SelectionTree fr.ird.observe.application.swing.ui.tree.selection.SelectionTreeHeader - org.nuiton.jaxx.runtime.SwingUtil + org.nuiton.jaxx.runtime.swing.SwingUtil </import> 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 6898a4a..fbeb7a1 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 @@ -30,7 +30,7 @@ fr.ird.observe.application.swing.ui.admin.AdminStep fr.ird.observe.application.swing.ui.tree.selection.SelectionTree fr.ird.observe.application.swing.ui.tree.selection.SelectionTreeHeader - org.nuiton.jaxx.runtime.SwingUtil + org.nuiton.jaxx.runtime.swing.SwingUtil javax.swing.ListSelectionModel diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUIHandler.java index 92e4a78..2c8bfc9 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUIHandler.java @@ -54,14 +54,13 @@ import fr.ird.observe.services.service.actions.validate.ValidateResultForDtoType import fr.ird.observe.services.service.actions.validate.ValidateService; import fr.ird.observe.services.service.actions.validate.ValidationMessage; import fr.ird.observe.services.service.actions.validate.ValidatorDto; -import org.nuiton.jaxx.runtime.SwingUtil; -import org.nuiton.jaxx.runtime.context.JAXXInitialContext; -import org.nuiton.jaxx.runtime.spi.UIHandler; -import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardState; import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; +import org.nuiton.jaxx.runtime.context.JAXXInitialContext; +import org.nuiton.jaxx.runtime.spi.UIHandler; +import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardState; import org.nuiton.validator.NuitonValidatorScope; import javax.swing.DefaultListModel; @@ -110,7 +109,7 @@ public class ValidateUIHandler extends AdminTabUIHandler<ValidateUI> implements messageTable.setDefaultRenderer(Object.class, new ObserveValidationMessageTableRenderer()); messageTable.getRowSorter().setSortKeys( Collections.singletonList(new RowSorter.SortKey(0, SortOrder.ASCENDING))); - SwingUtil.setI18nTableHeaderRenderer( + UIHelper.setI18nTableHeaderRenderer( messageTable, n("observe.actions.validate.validator.scope.header"), n("observe.actions.validate.validator.scope.header.tip"), @@ -118,7 +117,7 @@ public class ValidateUIHandler extends AdminTabUIHandler<ValidateUI> implements n("observe.actions.validate.validator.field.header.tip"), n("observe.actions.validate.validator.message.header"), n("observe.actions.validate.validator.message.header.tip")); - SwingUtil.fixTableColumnWidth(messageTable, 0, 25); + UIHelper.fixTableColumnWidth(messageTable, 0, 25); ValidateEntityListCellRenderer listRenderer = new ValidateEntityListCellRenderer(ui.getStepModel()); ui.getTypeList().setCellRenderer(listRenderer); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidationMessageTableModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidationMessageTableModel.java index 776cb78..1fa2c8e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidationMessageTableModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidationMessageTableModel.java @@ -23,8 +23,8 @@ package fr.ird.observe.application.swing.ui.admin.validate; */ import com.google.common.collect.Lists; +import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.services.service.actions.validate.ValidationMessage; -import org.nuiton.jaxx.runtime.SwingUtil; import org.nuiton.validator.NuitonValidatorScope; import javax.swing.table.AbstractTableModel; @@ -64,13 +64,13 @@ public class ValidationMessageTableModel extends AbstractTableModel { @Override public Class<?> getColumnClass(int columnIndex) { - SwingUtil.ensureColumnIndex(this, columnIndex); + UIHelper.ensureColumnIndex(this, columnIndex); return columnClasses[columnIndex]; } @Override public String getColumnName(int column) { - SwingUtil.ensureColumnIndex(this, column); + UIHelper.ensureColumnIndex(this, column); return columnNames[column]; } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java index cfba9ac..1a25f7f 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java @@ -59,7 +59,6 @@ import org.jdesktop.swingx.JXMonthView; import org.jdesktop.swingx.autocomplete.ComboBoxCellEditor; import org.jdesktop.swingx.autocomplete.ObjectToStringConverter; import org.nuiton.decorator.Decorator; -import org.nuiton.jaxx.runtime.SwingUtil; import org.nuiton.jaxx.runtime.swing.editor.EnumEditor; import org.nuiton.jaxx.runtime.swing.renderer.DecoratorListCellRenderer; import org.nuiton.jaxx.runtime.swing.renderer.EnumEditorRenderer; @@ -197,7 +196,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>> if (!dataToList.isEmpty() && dataToList.get(0) != null) { dataToList.add(0, null); } - SwingUtil.fillComboBox(comboBox, dataToList, null); + UIHelper.fillComboBox(comboBox, dataToList, null); } protected E getBean() { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIInitializer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIInitializer.java index 371fd07..a80c9e0 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIInitializer.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIInitializer.java @@ -31,7 +31,6 @@ import fr.ird.observe.application.swing.ui.util.BooleanEditor; import fr.ird.observe.services.dto.IdDto; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.jaxx.runtime.SwingUtil; import javax.swing.AbstractAction; import javax.swing.AbstractButton; @@ -92,19 +91,19 @@ public class ContentTableUIInitializer<E extends IdDto, D extends IdDto, UI exte if (ui.getBody() != null) { // on supprime le layer de blocage en mode disable - SwingUtil.setLayerUI(ui.getBody(), null); + UIHelper.setLayerUI(ui.getBody(), null); } if (ui.getExtraZone() != null) { // et on le remet sur les zones non clicables de l'ui - SwingUtil.setLayerUI(ui.getExtraZone(), ui.getBlockLayerUI()); + UIHelper.setLayerUI(ui.getExtraZone(), ui.getBlockLayerUI()); } // on ajoute un layer pour bloquer l'édition des entrées si nécessaire - SwingUtil.setLayerUI(ui.getEditor(), ui.getEditorBlockLayerUI()); + UIHelper.setLayerUI(ui.getEditor(), ui.getEditorBlockLayerUI()); // préparation du tableau dans l'ui getHandler().initTableUI(new DefaultTableCellRenderer()); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java index 09e171e..d1b90c4 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java @@ -47,12 +47,11 @@ import fr.ird.observe.services.dto.referential.GearDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.data.longline.TripLonglineGearUseService; import fr.ird.observe.services.service.referential.ReferentialService; -import org.nuiton.jaxx.runtime.SwingUtil; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.runtime.spi.UIHandler; import org.nuiton.jaxx.validator.swing.SwingValidatorMessage; import org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableModel; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.nuiton.validator.NuitonValidatorScope; import javax.swing.JComponent; @@ -348,9 +347,9 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip // Adapt layout to let more place for the editor getUi().getShowForm().remove(1); - getUi().getShowForm().add(SwingUtil.boxComponentWithJxLayer(getUi().getEditor()), new GridBagConstraints(0, 1, 1, 1, 1.0, 0.3, 10, 1, new Insets(0, 0, 0, 0), 0, 0), 1); + getUi().getShowForm().add(UIHelper.boxComponentWithJxLayer(getUi().getEditor()), new GridBagConstraints(0, 1, 1, 1, 1.0, 0.3, 10, 1, new Insets(0, 0, 0, 0), 0, 0), 1); getUi().getEditor().remove(0); - getUi().getEditor().add(SwingUtil.boxComponentWithJxLayer(getUi().getEditorPanel()), new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0, 10, 1, new Insets(0, 0, 0, 0), 0, 0), 0); + getUi().getEditor().add(UIHelper.boxComponentWithJxLayer(getUi().getEditorPanel()), new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0, 10, 1, new Insets(0, 0, 0, 0), 0, 0), 0); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java index 07fe278..a59b819 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java @@ -47,12 +47,11 @@ import fr.ird.observe.services.dto.seine.TripSeineGearUseDto; import fr.ird.observe.services.dto.seine.TripSeineGearUseHelper; import fr.ird.observe.services.service.data.seine.TripSeineGearUseService; import fr.ird.observe.services.service.referential.ReferentialService; -import org.nuiton.jaxx.runtime.SwingUtil; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.runtime.spi.UIHandler; import org.nuiton.jaxx.validator.swing.SwingValidatorMessage; import org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableModel; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.nuiton.validator.NuitonValidatorScope; import javax.swing.JComponent; @@ -347,9 +346,9 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei // Adapt layout to let more place for the editor getUi().getShowForm().remove(1); - getUi().getShowForm().add(SwingUtil.boxComponentWithJxLayer(getUi().getEditor()), new GridBagConstraints(0, 1, 1, 1, 1.0, 0.3, 10, 1, new Insets(0, 0, 0, 0), 0, 0), 1); + getUi().getShowForm().add(UIHelper.boxComponentWithJxLayer(getUi().getEditor()), new GridBagConstraints(0, 1, 1, 1, 1.0, 0.3, 10, 1, new Insets(0, 0, 0, 0), 0, 0), 1); getUi().getEditor().remove(0); - getUi().getEditor().add(SwingUtil.boxComponentWithJxLayer(getUi().getEditorPanel()), new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0, 10, 1, new Insets(0, 0, 0, 0), 0, 0), 0); + getUi().getEditor().add(UIHelper.boxComponentWithJxLayer(getUi().getEditorPanel()), new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0, 10, 1, new Insets(0, 0, 0, 0), 0, 0), 0); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveNavigationTreeShowPopupAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveNavigationTreeShowPopupAction.java index e180fab..905ae4e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveNavigationTreeShowPopupAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveNavigationTreeShowPopupAction.java @@ -27,6 +27,7 @@ import com.google.common.collect.ImmutableMap; import fr.ird.observe.application.swing.ObserveOpenDataManager; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.db.DataContext; +import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.content.ContentUI; import fr.ird.observe.application.swing.ui.content.open.ContentOpenableUI; import fr.ird.observe.application.swing.ui.tree.menu.MoveActivityLonglineNodeMenuPopulator; @@ -44,7 +45,6 @@ import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.TripSeineDto; -import org.nuiton.jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -333,7 +333,7 @@ public class ObserveNavigationTreeShowPopupAction { moveAction.setText(t("observe.navigationMenu.move." + nodeType)); moveAction.setToolTipText(t("observe.navigationMenu.move." + nodeType)); - moveAction.setIcon(SwingUtil.getUIManagerActionIcon("move-" + nodeType)); + moveAction.setIcon(UIHelper.getUIManagerActionIcon("move-" + nodeType)); popup.add(moveAction); moveAction.removeAll(); diff --git a/pom.xml b/pom.xml index d073f6b..a6cf9ff 100644 --- a/pom.xml +++ b/pom.xml @@ -2,8 +2,6 @@ <!-- #%L ObServe - - $HeadURL$ %% Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit %% @@ -160,7 +158,7 @@ <processorPluginVersion>1.3</processorPluginVersion> <topiaVersion>3.2</topiaVersion> - <jaxxVersion>3.0-SNAPSHOT</jaxxVersion> + <jaxxVersion>3.0-alpha-3</jaxxVersion> <nuitonI18nVersion>3.6.2</nuitonI18nVersion> <nuitonValidatorVersion>3.0.1</nuitonValidatorVersion> <nuitonUtilsVersion>3.0-rc-16</nuitonUtilsVersion> @@ -386,12 +384,24 @@ <artifactId>jaxx-runtime</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>javax.help</groupId> - <artifactId>javahelp</artifactId> - </exclusion> - </exclusions> + </dependency> + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-runtime-swing-application</artifactId> + <version>${jaxxVersion}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-runtime-swing-session</artifactId> + <version>${jaxxVersion}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-runtime-swing-wizard</artifactId> + <version>${jaxxVersion}</version> + <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton.jaxx</groupId> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm