GitLab

at 2017-07-26T13:07:47+02:00

lors de l'ouverture d'une base, l'écran de la liste des marées n'est pas bien décorée (See #797) + reformat code

     public void actionPerformed(ContentUI<?, ?> ui) {

         if (ui instanceof ContentOpenableUI) {

             ((ContentOpenableUI<?, ?>) ui).closeData();

-            getMainUI().getSplitpane2().setDividerLocation(getMainUI().getSplitpane2().getMinimumDividerLocation() +25);

+            getMainUI().getSplitpane2().setDividerLocation(getMainUI().getSplitpane2().getMinimumDividerLocation() + 25);

             return;

         }

 

 

             getLayout().show(getLayoutContent(), constraints);

 

-            getMainUI().getSplitpane2().setDividerLocation(getMainUI().getSplitpane2().getMinimumDividerLocation()+25);

+            getMainUI().getSplitpane2().setDividerLocation(getMainUI().getSplitpane2().getMinimumDividerLocation() + 25);

         }

 

     }

         model.addPropertyChangeListener(ContentListUIModel.PROPERTY_DATA, e -> updateList((List) e.getNewValue()));

     }

 

-    protected void updateList(List<DataReference<C>> data) {

+    private void updateList(List<DataReference<C>> data) {

         BeanListHeader<DataReference<C>> list = ui.getListHeader();

         if (CollectionUtils.isNotEmpty(data)) {

             if (log.isDebugEnabled()) {

                 getUi().getListPane().setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED);

             } else {

 

-getUi().getListPane().setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER);

+                getUi().getListPane().setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER);

             }

         });

 

 

         private final transient NavigationTree treeHelper;

 

-        private final ThreadLocal<NavigationTreeNodeSupport> containerNode = new ThreadLocal<>();

+        private NavigationTreeNodeSupport containerNode;

 

         EntityListCellRenderer(ListCellRenderer<?> delegate, NavigationTree treeHelper) {

             this.delegate = delegate;

         }

 

         public void init() {

-            containerNode.set(treeHelper.getSelectedNode());

+            containerNode =treeHelper.getSelectedNode();

         }

 

         @Override

             // obtain the text from the delegate renderer

             JLabel comp = (JLabel) delegate.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);

 

-            if (value == null || !(value instanceof AbstractReference) || containerNode.get() == null) {

+            if (value == null || !(value instanceof AbstractReference) || containerNode  == null) {

 

                 // rien de plus a faire

                 return comp;

             }

 

             // recuperation du noeud correspondant dans l'arbre

-            NavigationTreeNodeSupport node = treeHelper.getChild(containerNode.get(), ((AbstractReference) value).getId());

+            NavigationTreeNodeSupport node = treeHelper.getChild(containerNode , ((AbstractReference) value).getId());

 

             if (node == null) {

...	...	@@ -125,7 +125,7 @@ public class ContentUIManager {
125	125
126	126	getLayout().show(getLayoutContent(), constraints);
127	127
128		- getMainUI().getSplitpane2().setDividerLocation(getMainUI().getSplitpane2().getMinimumDividerLocation()+25);
	128	+ getMainUI().getSplitpane2().setDividerLocation(getMainUI().getSplitpane2().getMinimumDividerLocation() + 25);
129	129	}
130	130
131	131	}

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

3 changed files:

Changes: