[Jaxx-commits] 03/05: refs #3468 Impact JLayer API changes

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jaxx. See http://git.nuiton.org/jaxx.git commit 5797dd87b0f9322093a44475b1019399545eebe7 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 13 09:03:44 2015 +0200 refs #3468 Impact JLayer API changes --- .../swing/action/ApplicationActionUIHandler.java | 4 +- .../jaxx/application/swing/tab/CustomTab.java | 2 +- jaxx-demo/pom.xml | 5 -- .../java/org/nuiton/jaxx/demo/DemoUIHandler.java | 2 +- .../demo/component/jaxx/BoxedDecoratorDemo.css | 36 +++++----- .../demo/component/jaxx/BoxedDecoratorDemo.jaxx | 78 ++++---------------- .../component/jaxx/BoxedDecoratorDemoHandler.java | 84 ++++++++++++++++++++++ .../jaxx/demo/feature/nav/NavDemoHandler.java | 2 +- .../java/org/nuiton/jaxx/plugin/Bug1404Test.java | 8 +-- .../java/org/nuiton/jaxx/plugin/DecoratorTest.java | 2 +- .../jaxx/widgets/config/ConfigCategoryUI.jaxx | 2 +- .../widgets/config/model/MyDelegateConfigTest.java | 2 +- .../config/model/MyInheritedConfigTest.java | 2 +- .../jaxx/runtime/swing/AboutPanelHandler.java | 2 +- .../org/nuiton/jaxx/runtime/swing/HidorButton.jaxx | 2 +- .../jaxx/runtime/swing/JSearchTextField.java | 2 +- .../table/filter/FilterTableHeaderRenderer.java | 2 +- .../swing/table/filter/TableFilterColumnPopup.java | 2 +- 18 files changed, 134 insertions(+), 105 deletions(-) diff --git a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/ApplicationActionUIHandler.java b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/ApplicationActionUIHandler.java index 636473a..12c94a2 100644 --- a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/ApplicationActionUIHandler.java +++ b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/ApplicationActionUIHandler.java @@ -28,7 +28,7 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; import org.nuiton.jaxx.application.swing.AbstractApplicationUIHandler; import org.nuiton.jaxx.application.type.ApplicationProgressionModel; -import org.nuiton.jaxx.swing.extra.JXLayers; +import org.nuiton.jaxx.runtime.api.swing.JLayers; import javax.swing.JComponent; import java.awt.Component; @@ -182,7 +182,7 @@ public class ApplicationActionUIHandler extends AbstractApplicationUIHandler<App initUI(this.ui); // installation layer de blocage en mode busy - JXLayers.setLayerUI(this.ui.getRootPanel(), this.ui.getBusyBlockLayerUI()); + JLayers.setLayerUI(this.ui.getRootPanel(), this.ui.getBusyBlockLayerUI()); this.ui.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); } diff --git a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/tab/CustomTab.java b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/tab/CustomTab.java index 29fab3a..ef3c85c 100644 --- a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/tab/CustomTab.java +++ b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/tab/CustomTab.java @@ -24,7 +24,7 @@ package org.nuiton.jaxx.application.swing.tab; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.jaxx.swing.extra.Icons; +import org.nuiton.jaxx.runtime.api.swing.Icons; import org.nuiton.util.beans.BeanUtil; import javax.swing.AbstractButton; diff --git a/jaxx-demo/pom.xml b/jaxx-demo/pom.xml index 7b1f80c..8227962 100644 --- a/jaxx-demo/pom.xml +++ b/jaxx-demo/pom.xml @@ -181,11 +181,6 @@ </dependency> <dependency> - <groupId>org.swinglabs</groupId> - <artifactId>jxlayer</artifactId> - </dependency> - - <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoUIHandler.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoUIHandler.java index 6e0b292..84ba28e 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoUIHandler.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoUIHandler.java @@ -38,7 +38,7 @@ import org.nuiton.jaxx.runtime.api.spi.UIHandler; import org.nuiton.jaxx.runtime.swing.AboutPanel; import org.nuiton.jaxx.runtime.swing.ErrorDialogUI; import org.nuiton.jaxx.runtime.swing.log.JAXXLog4jUI; -import org.nuiton.jaxx.swing.extra.Icons; +import org.nuiton.jaxx.runtime.api.swing.Icons; import org.nuiton.jaxx.swing.extra.JTrees; import org.nuiton.jaxx.swing.extra.list.renderer.DecoratorProviderListCellRenderer; diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/BoxedDecoratorDemo.css b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/BoxedDecoratorDemo.css index 0737794..e1c5f04 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/BoxedDecoratorDemo.css +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/BoxedDecoratorDemo.css @@ -20,41 +20,45 @@ * #L% */ #layerUI { - blockIcon:{Icons.createImageIcon("action-block.png")}; - acceptIcon:{Icons.createImageIcon("action-accept.png")}; - useIcon:true; - blockingColor:{new Color(50,50,50)}; + blockIcon: {Icons.createImageIcon("action-block.png")}; + acceptIcon: {Icons.createImageIcon("action-accept.png")}; + useIcon: true; + blockingColor: {Color.RED}; } #layerUI2 { - blockIcon:{Icons.createImageIcon("action-block.png")}; - acceptIcon:{Icons.createImageIcon("action-accept.png")}; + blockIcon: {Icons.createImageIcon("action-block.png")}; + acceptIcon: {Icons.createImageIcon("action-accept.png")}; +} + +#toggle { + text: {toggle.isSelected() ? "Active layer" : "No layer"}; } #buttonPane { - layout:{new GridLayout(0,2)}; + layout: {new GridLayout(0,2)}; } #buttonA { - text:"button A"; - _clickedText:{"button A was clicked"}; + text: "button A"; + _clickedText: {"button A was clicked"}; } #buttonB { - text:"button B"; - _clickedText:{"button B was clicked"}; + text: "button B"; + _clickedText: {"button B was clicked"}; } #buttonC { - text:"button C (full block)"; - _clickedText:{"button C was clicked"}; + text: "button C (full block)"; + _clickedText: {"button C was clicked"}; } #buttonD { - text:"button D (full block 2)"; - _clickedText:{"button D was clicked"}; + text: "button D (full block 2)"; + _clickedText: {"button D was clicked"}; } #messages { - model:{new DefaultListModel()}; + model: {new DefaultListModel()}; } diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/BoxedDecoratorDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/BoxedDecoratorDemo.jaxx index a2f678a..00a0e3b 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/BoxedDecoratorDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/BoxedDecoratorDemo.jaxx @@ -24,93 +24,39 @@ <org.nuiton.jaxx.demo.DemoPanel layout='{new BorderLayout()}'> <import> - org.nuiton.jaxx.runtime.SwingUtil org.nuiton.jaxx.swing.extra.layer.BlockingLayerUI org.nuiton.jaxx.swing.extra.layer.BlockingLayerUI2 - org.nuiton.jaxx.swing.extra.Icons - org.nuiton.jaxx.swing.extra.JXLayers + org.nuiton.jaxx.runtime.api.swing.Icons + org.nuiton.jaxx.runtime.api.swing.JLayers + + javax.swing.DefaultListModel java.awt.Color java.awt.event.ActionEvent - javax.swing.AbstractAction - javax.swing.DefaultListModel - javax.swing.JComponent </import> - <BlockingLayerUI id='layerUI' - acceptAction='{new AbstractAction() { - private static final long serialVersionUID = 1L; - @Override - public void actionPerformed(ActionEvent e) { - accept(e, "from icon of layer"); - } - }}'/> - <BlockingLayerUI2 id='layerUI2' - acceptAction='{new AbstractAction() { - private static final long serialVersionUID = 1L; - @Override - public void actionPerformed(ActionEvent e) { - accept(e, "from icon of layer"); - } - }}'/> - <script><![CDATA[ - -void $afterCompleteSetup() { - for (JComponent boxed : JXLayers.getLayeredComponents(this)) { - if (boxed == buttonD) { - JXLayers.setLayerUI(boxed, layerUI2); - continue; - } - - BlockingLayerUI ui = layerUI.clone(); - if (boxed == buttonC) { - ui.setBlock(true); - } - JXLayers.setLayerUI(boxed, ui); - } -} - -public void setLayer(boolean active) { - for (JComponent boxed : JXLayers.getLayeredComponents(this)) { - if (boxed == buttonD) { - continue; - } - BlockingLayerUI ui = (BlockingLayerUI) JXLayers.getLayer(boxed).getUI(); - if (boxed == buttonC) { - ui.setBlock(active); - } - ui.setUseIcon(active); - } -} + <BlockingLayerUI id='layerUI'/> + <BlockingLayerUI2 id='layerUI2'/> -protected void accept(ActionEvent e, String suffix) { - JButton source = (JButton) e.getSource(); - String clickedMessage = (String) source.getClientProperty("clickedText"); - String msg = "'" + source.getText() + "' clicked - " + suffix + " : " + clickedMessage; - ((DefaultListModel)messages.getModel()).addElement(msg); -}]]> - </script> <Table fill='both' weightx='1' constraints='BorderLayout.CENTER'> <row> <cell> - <JCheckBox id='toggle' selected='true' - text='{toggle.isSelected() ? "Active layer" : "No layer"}' - onActionPerformed='setLayer(toggle.isSelected());'/> + <JCheckBox id='toggle' + onActionPerformed='handler.setLayer(toggle.isSelected())'/> </cell> </row> <row> <cell weighty='0.5'> <JPanel id='buttonPane'> <JButton id='buttonA' decorator='boxed' - _clickedText='"button A was clicked"' - onActionPerformed='accept(event, "from button (no layer)")'/> + onActionPerformed='handler.accept(event, "from button (no layer)")'/> <JButton id='buttonB' decorator='boxed' - onActionPerformed='accept(event, "from button (no layer)")'/> + onActionPerformed='handler.accept(event, "from button (no layer)")'/> <JButton id='buttonC' decorator='boxed' - onActionPerformed='accept(event, "from button (no layer)");'/> + onActionPerformed='handler.accept(event, "from button (no layer)")'/> <JButton id='buttonD' decorator='boxed' - onActionPerformed='accept(event, "from button (no layer)");'/> + onActionPerformed='handler.accept(event, "from button (no layer)")'/> </JPanel> </cell> </row> diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/BoxedDecoratorDemoHandler.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/BoxedDecoratorDemoHandler.java new file mode 100644 index 0000000..acc769b --- /dev/null +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/BoxedDecoratorDemoHandler.java @@ -0,0 +1,84 @@ +package org.nuiton.jaxx.demo.component.jaxx; + +import org.nuiton.jaxx.runtime.api.spi.UIHandler; +import org.nuiton.jaxx.runtime.api.swing.JLayers; +import org.nuiton.jaxx.swing.extra.layer.BlockingLayerUI; + +import javax.swing.AbstractAction; +import javax.swing.DefaultListModel; +import javax.swing.JButton; +import javax.swing.JLayer; +import java.awt.Component; +import java.awt.event.ActionEvent; + +/** + * Created on 4/13/15. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 3.0 + */ +public class BoxedDecoratorDemoHandler implements UIHandler<BoxedDecoratorDemo> { + + private BoxedDecoratorDemo ui; + + @Override + public void beforeInit(BoxedDecoratorDemo ui) { + } + + @Override + public void afterInit(BoxedDecoratorDemo ui) { + this.ui = ui; + + ui.layerUI.setAcceptAction(new LayerAcceptAction()); + ui.layerUI2.setAcceptAction(new LayerAcceptAction()); + + for (Component boxed : JLayers.getLayeredComponents(ui)) { + if (boxed == ui.buttonD) { + JLayers.setLayerUI(boxed, ui.layerUI2); + continue; + } + + BlockingLayerUI layerUI = ui.layerUI.clone(); + if (boxed == ui.buttonC) { + layerUI.setBlock(true); + } + JLayers.setLayerUI(boxed, layerUI); + } + + + + ui.toggle.setSelected(true); + + } + + + public void setLayer(boolean active) { + for (Component boxed : JLayers.getLayeredComponents(ui)) { + if (boxed == ui.buttonD) { + continue; + } + JLayer<?> layer = JLayers.getLayer(boxed); + BlockingLayerUI layerUI = (BlockingLayerUI) layer.getUI(); + if (boxed == ui.buttonC) { + layerUI.setBlock(active); + } + layerUI.setUseIcon(active); + } + } + + protected void accept(ActionEvent e, String suffix) { + JButton source = (JButton) e.getSource(); + String clickedMessage = (String) source.getClientProperty("clickedText"); + String msg = "'" + source.getText() + "' clicked - " + suffix + " : " + clickedMessage; + ((DefaultListModel) ui.messages.getModel()).addElement(msg); + } + + private class LayerAcceptAction extends AbstractAction { + + @Override + public void actionPerformed(ActionEvent e) { + accept(e, "from icon of layer"); + } + } + +} diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/NavDemoHandler.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/NavDemoHandler.java index 3fc58b2..ff7dc6a 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/NavDemoHandler.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/NavDemoHandler.java @@ -43,7 +43,7 @@ import org.nuiton.jaxx.runtime.api.context.JAXXContext; import org.nuiton.jaxx.runtime.api.spi.UIHandler; import org.nuiton.jaxx.runtime.swing.ErrorDialogUI; import org.nuiton.jaxx.runtime.swing.nav.NavNode; -import org.nuiton.jaxx.swing.extra.Icons; +import org.nuiton.jaxx.runtime.api.swing.Icons; import org.nuiton.jaxx.swing.extra.JTrees; import org.nuiton.jaxx.swing.extra.layout.CardLayout2; diff --git a/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/Bug1404Test.java b/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/Bug1404Test.java index fdb0c96..7c0ba76 100644 --- a/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/Bug1404Test.java +++ b/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/Bug1404Test.java @@ -40,9 +40,9 @@ public class Bug1404Test extends JaxxBaseTest { String[] files = mojo.files; - checkPattern(mojo, "import org.nuiton.jaxx.swing.extra.JXLayers;", true, files[0]); - checkPattern(mojo, "import org.nuiton.jaxx.swing.extra.JXLayers;", false, files[1], files[2]); - checkPattern(mojo, "import org.nuiton.jaxx.swing.extra.Icons;", true, files[2]); - checkPattern(mojo, "import org.nuiton.jaxx.swing.extra.Icons;", false, files[0], files[1]); + checkPattern(mojo, "import org.nuiton.jaxx.runtime.api.swing.JLayers;", true, files[0]); + checkPattern(mojo, "import org.nuiton.jaxx.runtime.api.swing.JLayers;", false, files[1], files[2]); + checkPattern(mojo, "import org.nuiton.jaxx.runtime.api.swing.Icons;", true, files[2]); + checkPattern(mojo, "import org.nuiton.jaxx.runtime.api.swing.Icons;", false, files[0], files[1]); } } diff --git a/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/DecoratorTest.java b/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/DecoratorTest.java index 92cb4ad..a7bb1c7 100644 --- a/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/DecoratorTest.java +++ b/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/DecoratorTest.java @@ -31,7 +31,7 @@ public class DecoratorTest extends JaxxBaseTest { GenerateMojo mojo = getMojo(); mojo.execute(); assertNumberJaxxFiles(1); - checkPattern(mojo, "add(JXLayers.boxComponentWithJxLayer(boxedButton))", true); + checkPattern(mojo, "add(JLayers.boxComponentWithJLayer(boxedButton))", true); } } diff --git a/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigCategoryUI.jaxx b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigCategoryUI.jaxx index f887d14..2ae6c66 100644 --- a/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigCategoryUI.jaxx +++ b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigCategoryUI.jaxx @@ -30,7 +30,7 @@ org.nuiton.jaxx.widgets.config.model.ConfigUIModel org.jdesktop.swingx.JXTable - org.nuiton.jaxx.swing.extra.Icons + org.nuiton.jaxx.runtime.api.swing.Icons </import> <ConfigCategoryUIHandler id='handler' constructorParams='this'/> diff --git a/jaxx-widgets-config/src/test/java/org/nuiton/jaxx/widgets/config/model/MyDelegateConfigTest.java b/jaxx-widgets-config/src/test/java/org/nuiton/jaxx/widgets/config/model/MyDelegateConfigTest.java index 7d54407..c938196 100644 --- a/jaxx-widgets-config/src/test/java/org/nuiton/jaxx/widgets/config/model/MyDelegateConfigTest.java +++ b/jaxx-widgets-config/src/test/java/org/nuiton/jaxx/widgets/config/model/MyDelegateConfigTest.java @@ -26,7 +26,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.nuiton.config.ApplicationConfig; -import org.nuiton.jaxx.swing.extra.Icons; +import org.nuiton.jaxx.runtime.api.swing.Icons; import javax.swing.DefaultCellEditor; import javax.swing.ImageIcon; diff --git a/jaxx-widgets-config/src/test/java/org/nuiton/jaxx/widgets/config/model/MyInheritedConfigTest.java b/jaxx-widgets-config/src/test/java/org/nuiton/jaxx/widgets/config/model/MyInheritedConfigTest.java index a7c753c..b7dd4cd 100644 --- a/jaxx-widgets-config/src/test/java/org/nuiton/jaxx/widgets/config/model/MyInheritedConfigTest.java +++ b/jaxx-widgets-config/src/test/java/org/nuiton/jaxx/widgets/config/model/MyInheritedConfigTest.java @@ -26,7 +26,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.nuiton.config.ApplicationConfig; -import org.nuiton.jaxx.swing.extra.Icons; +import org.nuiton.jaxx.runtime.api.swing.Icons; import javax.swing.DefaultCellEditor; import javax.swing.ImageIcon; diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/AboutPanelHandler.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/AboutPanelHandler.java index 672a892..f032c6c 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/AboutPanelHandler.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/AboutPanelHandler.java @@ -24,7 +24,7 @@ package org.nuiton.jaxx.runtime.swing; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.jaxx.swing.extra.Icons; +import org.nuiton.jaxx.runtime.api.swing.Icons; import org.nuiton.jaxx.swing.extra.PropertyChangeListeners; import org.nuiton.jaxx.swing.extra.Swings; import org.nuiton.util.Resource; diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/HidorButton.jaxx b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/HidorButton.jaxx index 0411789..c3b088d 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/HidorButton.jaxx +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/HidorButton.jaxx @@ -31,7 +31,7 @@ javax.swing.Icon javax.swing.JComponent - org.nuiton.jaxx.swing.extra.Icons + org.nuiton.jaxx.runtime.api.swing.Icons static org.nuiton.i18n.I18n.t </import> diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/JSearchTextField.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/JSearchTextField.java index 173e20a..d6199d5 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/JSearchTextField.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/JSearchTextField.java @@ -31,7 +31,7 @@ */ package org.nuiton.jaxx.runtime.swing; -import org.nuiton.jaxx.swing.extra.Icons; +import org.nuiton.jaxx.runtime.api.swing.Icons; import javax.swing.ImageIcon; import javax.swing.JTextField; diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/FilterTableHeaderRenderer.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/FilterTableHeaderRenderer.java index 8a1301b..4601d03 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/FilterTableHeaderRenderer.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/FilterTableHeaderRenderer.java @@ -33,7 +33,7 @@ package org.nuiton.jaxx.runtime.swing.table.filter; import org.nuiton.jaxx.runtime.swing.CompoundIcon; -import org.nuiton.jaxx.swing.extra.Icons; +import org.nuiton.jaxx.runtime.api.swing.Icons; import javax.swing.Icon; import javax.swing.ImageIcon; diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableFilterColumnPopup.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableFilterColumnPopup.java index 099a097..7e3fd1e 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableFilterColumnPopup.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableFilterColumnPopup.java @@ -41,7 +41,7 @@ import org.nuiton.jaxx.runtime.swing.list.filter.DefaultFilterableCheckListModel import org.nuiton.jaxx.runtime.swing.list.filter.FilterableActionCheckListModel; import org.nuiton.jaxx.runtime.swing.list.filter.FilterableCheckList; import org.nuiton.jaxx.runtime.swing.list.filter.FilterableCheckListModel; -import org.nuiton.jaxx.swing.extra.Icons; +import org.nuiton.jaxx.runtime.api.swing.Icons; import javax.swing.AbstractAction; import javax.swing.Action; -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.