GitLab

at 2018-04-08T09:48:52Z

Simplificiation du layout de content

   <ClientDataContext id='dataContext' initializer='ObserveSwingApplicationContext.get().getDataContext()'/>

-  <CardLayout2 id='contentLayout'/>

-

   <CardLayout2Ext id='bodyLayout' constructorParams='this, "body"'/>

   <ObserveBlockingLayerUI id='busyBlockLayerUI'/>

         <!-- right up : content -->

-        <JPanel id="content">

-          <JPanel id="emptySelection" constraints='"emptySelection"' layout="{new BorderLayout()}">

+        <JPanel id="content" layout="{new BorderLayout()}">

+          <JPanel id="emptySelection" layout="{new BorderLayout()}" constraints="BorderLayout.CENTER">

             <JLabel id="emptySelectionLabel" constraints="BorderLayout.CENTER"/>

           </JPanel>

         </JPanel>

   resizeWeight: 0.80;

 }

-#contentLayout {

-  useOnlyVisibleComponentDimension: true;

-}

-

 #navigationView {

   title: "observe.view.navigation";

 }

 import javax.swing.border.LineBorder;

 import javax.swing.event.TreeSelectionEvent;

 import javax.swing.tree.TreePath;

-import java.awt.Component;

 import java.awt.Container;

 import java.awt.Cursor;

 import java.awt.event.KeyEvent;

     /** Logger */

     private static final Log log = LogFactory.getLog(ObserveMainUIInitializer.class);

-    private static final String EMPTY_SELECTION = "emptySelection";

-

     private final ObserveMainUI ui;

     private Border focusBorder;

     private Border noFocusBorder;

         }

         if (ui.getNavigationUI().getTree().isSelectionEmpty()) {

             log.debug("No selection, show empty panel...");

-

-            boolean foundEmptySelection = false;

-            for (Component component : ui.getContent().getComponents()) {

-                if (component.getName().equals(EMPTY_SELECTION)) {

-                    foundEmptySelection = true;

-                }

-            }

-            if (!foundEmptySelection) {

-                ui.getContent().add(ui.getEmptySelection(), EMPTY_SELECTION);

-            }

-            ui.getContentLayout().show(ui.getContent(), EMPTY_SELECTION);

+            ui.getContentUIManager().removeSelectedContentUI();

             return;

         }

         TreePath path = event.getPath();

         NavigationTreeNodeSupport node = (NavigationTreeNodeSupport) path.getLastPathComponent();

-        ContentUIManager manager = ui.getContentUIManager();

         // obtain the ui type to show

+        @SuppressWarnings("unchecked")

         Class<? extends ContentUI<?, ?>> uiClass = node.getContentClass();

         if (log.isDebugEnabled()) {

             log.debug("new selected path = " + node + ", ui = " + uiClass);

     public void cleanNavigationUI(ProgressModel progressModel) {

         // reset content uis

-        ui.getContentLayout().reset(ui.getContent());

+        ui.getContentUIManager().removeSelectedContentUI();

         progressModel.incrementsCurrentStep();

         // clean messages

  * %%

  * This program is free software: you can redistribute it and/or modify

  * it under the terms of the GNU General Public License as

- * published by the Free Software Foundation, either version 3 of the 

+ * published by the Free Software Foundation, either version 3 of the

  * License, or (at your option) any later version.

- * 

+ *

  * This program is distributed in the hope that it will be useful,

  * but WITHOUT ANY WARRANTY; without even the implied warranty of

  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  * GNU General Public License for more details.

- * 

- * You should have received a copy of the GNU General Public 

+ *

+ * You should have received a copy of the GNU General Public

  * License along with this program.  If not, see

  * <http://www.gnu.org/licenses/gpl-3.0.html>.

  * #L%

 import fr.ird.observe.client.ui.ObserveMainUI;

 import fr.ird.observe.client.ui.util.UIHelper;

 import fr.ird.observe.dto.AbstractObserveDto;

-import java.awt.Component;

-import java.lang.reflect.Constructor;

-import javax.swing.JPanel;

 import org.apache.commons.logging.Log;

 import org.apache.commons.logging.LogFactory;

 import org.nuiton.jaxx.runtime.JAXXContext;

 import org.nuiton.jaxx.runtime.context.JAXXInitialContext;

-import org.nuiton.jaxx.runtime.swing.CardLayout2;

+

+import javax.swing.JPanel;

+import java.awt.BorderLayout;

+import java.awt.Component;

+import java.lang.reflect.Constructor;

 /**

  * Manager des ecrans d'editions

     /** Logger */

     private static final Log log = LogFactory.getLog(ContentUIManager.class);

-    public <U extends ContentUI<?, ?>> U getContent(Class<U> uiClass) {

-

-        CardLayout2 layout = getLayout();

+    public <U extends ContentUI<?, ?>> U getContent() {

         JPanel layoutContent = getLayoutContent();

-        String constraints = uiClass.getName();

-

-        if (!layout.contains(constraints)) {

-

-            // pas trouvé

+        Component currentContent = layoutContent.getComponent(0);

+        if (!(currentContent instanceof ContentUI)) {

             return null;

         }

-

-        @SuppressWarnings("unchecked") U content = (U) layout.getComponent(layoutContent, constraints);

-

+        @SuppressWarnings("unchecked") U content = (U) currentContent;

         if (log.isDebugEnabled()) {

-            log.debug("Will use existing content [" + constraints + "] : " + content.getClass().getName());

+            log.debug(String.format("Will use existing content: %s", content.getClass().getName()));

         }

         return content;

     }

     public <U extends ContentUI<?, ?>> U createContent(Class<U> uiClass) {

-        String constraints = uiClass.getName();

-

         U result;

         try {

             Constructor<U> constructor = uiClass.getConstructor(JAXXContext.class);

         try {

             // ajout du content dans son parent

-            getLayoutContent().add(result, constraints);

+            getLayoutContent().removeAll();

+            getLayoutContent().add(result, BorderLayout.CENTER);

             if (log.isDebugEnabled()) {

-                log.debug("Add new content [" + constraints + "] : " + result.getClass().getName());

+                log.debug(String.format("Add new content: %s", result.getClass().getName()));

             }

             getMainUI().getModel().attachFocusOnBody(result);

         } catch (Exception e) {

             UIHelper.handlingError(e);

         } finally {

-

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

+            getLayoutContent().removeAll();

+            getLayoutContent().add(content, BorderLayout.CENTER);

             getMainUI().getHandler().updateContentSize();

             content.opened();

     }

     public void close() {

-        getLayout().reset(getLayoutContent());

+        getLayoutContent().removeAll();

+        getLayoutContent().add(getMainUI().getEmptySelection(), BorderLayout.CENTER);

     }

     public ContentUI<?, ?> getSelectedContentUI() {

     }

     public void removeSelectedContentUI() {

-

         ContentUI<?, ?> selectedContentUI = getSelectedContentUI();

         if (selectedContentUI != null) {

-            getLayout().removeLayoutComponent(selectedContentUI, selectedContentUI.getClass().getName());

-            getLayoutContent().remove(selectedContentUI);

+            getLayoutContent().removeAll();

             selectedContentUI.destroy();

         }

+        getLayoutContent().add(getMainUI().getEmptySelection(), BorderLayout.CENTER);

     }

     public void restartEdit() {

         return getMainUI().getContent();

     }

-    private CardLayout2 getLayout() {

-        return getMainUI().getContentLayout();

-    }

+//    private CardLayout2 getLayout() {

+//        return getMainUI().getContentLayout();

+//    }

     private ObserveMainUI getMainUI() {

         return ObserveSwingApplicationContext.get().getMainUI();

     }

     private ContentUI<?, ?> getSelectedContentUI(ObserveMainUI ui) {

-

         if (ui == null) {

             // no ui, so no modification

             return null;

         }

-

         ContentUI<?, ?> result = null;

-        CardLayout2 layout = ui.getContentLayout();

         JPanel container = ui.getContent();

-        Component currentContent = layout.getVisibleComponent(container);

+        Component currentContent = container.getComponent(0);

         if (currentContent instanceof ContentUI<?, ?>) {

             result = (ContentUI<?, ?>) currentContent;

         }

   actionIcon:generate;

   toolTipText:"observe.tree.action.configure.tip";

 }

+

+#tree {

+  font-size:11;

+}

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

Commits:

5 changed files:

Changes: