This is an automated email from the git hooks/post-receive script. New commit to branch feature/8429 in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 075741290c35eccc303e0c8dd487eb369225f582 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Nov 10 12:12:03 2016 +0100 clean code + ne plus étendre l'arbre automatiquement --- .../observe/application/swing/ui/ObserveMainUIHandler.java | 13 ++----------- .../swing/ui/tree/NavigationTreeSelectionModel.java | 3 +-- .../application/swing/ui/tree/ObserveTreeHelper.java | 13 ++----------- 3 files changed, 5 insertions(+), 24 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIHandler.java index f57b911..78fa0bc 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIHandler.java @@ -409,15 +409,6 @@ public class ObserveMainUIHandler { return false; } - public boolean rejectMode(ObserveUIMode mode, ObserveUIMode... modes) { - for (ObserveUIMode m : modes) { - if (m.equals(mode)) { - return false; - } - } - return true; - } - public boolean acceptLocale(Locale l, String expected) { return l != null && l.toString().equals(expected); } @@ -429,7 +420,7 @@ public class ObserveMainUIHandler { return ObserveSwingApplicationContext.get().getMainUI(); } - protected void $afterCompleteSetup(final ObserveMainUI ui) { + protected void $afterCompleteSetup(ObserveMainUI ui) { // bad binding, force value ui.getStopH2WebServer().setEnabled(false); @@ -473,7 +464,7 @@ public class ObserveMainUIHandler { } }; - ui.getTreeHelper().setUI(ui.getNavigation(), true, true, listener, veteobableTreeWillExpand); + ui.getTreeHelper().setUI(ui.getNavigation(), false, false, listener, veteobableTreeWillExpand); SwingValidatorUtil.installUI(ui.getErrorTable(), new ObserveValidatorMessageTableRenderer()); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/NavigationTreeSelectionModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/NavigationTreeSelectionModel.java index a2322e6..92cca8e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/NavigationTreeSelectionModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/NavigationTreeSelectionModel.java @@ -38,8 +38,7 @@ import javax.swing.tree.TreePath; public class NavigationTreeSelectionModel extends DefaultTreeSelectionModel { /** Logger */ - static private final Log log = - LogFactory.getLog(NavigationTreeSelectionModel.class); + static private final Log log = LogFactory.getLog(NavigationTreeSelectionModel.class); private static final long serialVersionUID = 1L; 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 2d4204a..e2e103a 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 @@ -117,16 +117,14 @@ public class ObserveTreeHelper extends NavTreeHelper<ObserveNode> { return null; } TreeCellRenderer r = t.getCellRenderer(); - return (AbstractObserveTreeCellRenderer) - (r instanceof AbstractObserveTreeCellRenderer ? r : null); + return (AbstractObserveTreeCellRenderer) (r instanceof AbstractObserveTreeCellRenderer ? r : null); } public TreeModel createEmptyModel() { setDataSource(null); - ObserveNode node = - new ObserveNode(n("observe.message.db.none.loaded"), false); + ObserveNode node = new ObserveNode(n("observe.message.db.none.loaded"), false); return createModel(node); } @@ -577,13 +575,6 @@ public class ObserveTreeHelper extends NavTreeHelper<ObserveNode> { @Override protected ObserveDataProvider getDataProvider() { - // if (provider == null) { -// ObserveSwingDataSource source = ObserveSwingApplicationContext.get().getDataSourcesManager().getMainDataSource(); -// if (source != null) { -// provider = new ObserveDataProvider(source); -// setDataProvider(provider); -// } -// } return (ObserveDataProvider) super.getDataProvider(); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.