This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 55e94f883ec717021ffd76990239d7faaf8ce76c Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 7 09:58:37 2015 +0200 refs #6875 correction de la mise en page du formulaire détail avançon --- .../observe/ui/content/impl/longline/BranchlineUI.jaxx | 15 ++------------- .../impl/longline/LonglineDetailCompositionUI.jaxx | 9 ++++++++- .../longline/LonglineDetailCompositionUIInitializer.java | 6 ++++-- 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUI.jaxx b/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUI.jaxx index 8cdb6c0..c682e7a 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUI.jaxx +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUI.jaxx @@ -76,7 +76,7 @@ public void edit(Branchline branchline) { getHandler().edit(branchline); } <Table insets="0" fill="both" constraints='BorderLayout.CENTER'> <row> - <cell anchor="north"> + <cell anchor="north" weightx="1"> <JTabbedPane id='fishingOperationTabPane'> <tab id='generalTab'> @@ -240,7 +240,7 @@ public void edit(Branchline branchline) { getHandler().edit(branchline); } </cell> </row> <row> - <cell columns="3" weighty="1"> + <cell weighty="1"> <JScrollPane id='comment' onFocusGained='comment2.requestFocus()'> <JTextArea id='comment2'/> </JScrollPane> @@ -248,17 +248,6 @@ public void edit(Branchline branchline) { getHandler().edit(branchline); } </row> </Table> - <Table id="simpleActions" fill='both' weightx='1' insets='0' constraints='BorderLayout.SOUTH'> - <row> - <cell weightx="0.5"> - <JButton id='reset'/> - </cell> - <cell weightx="0.5"> - <JButton id='save'/> - </cell> - </row> - </Table> - </JPanel> </fr.ird.observe.ui.content.ContentUI> diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUI.jaxx b/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUI.jaxx index 829e6b1..12d69af 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUI.jaxx +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUI.jaxx @@ -171,7 +171,14 @@ <tab id='branchlineDetailTab'> <JPanel id="branchlineDetailPanel" layout='{new BorderLayout()}'> - <BranchlineUI id="branchlineDetailUI" constructorParams="ObserveContext.get().getObserveMainUI()"/> + <Table fill="both" constraints='BorderLayout.NORTH'> + <row> + <cell weightx="1" fill="both" weighty="1"> + <BranchlineUI id="branchlineDetailUI" constructorParams="ObserveContext.get().getObserveMainUI()"/> + </cell> + </row> + </Table> + </JPanel> </tab> diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIInitializer.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIInitializer.java index cef72f5..1dec3b2 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIInitializer.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIInitializer.java @@ -39,6 +39,7 @@ import javax.swing.JScrollPane; import javax.swing.JTable; import javax.swing.ListSelectionModel; import javax.swing.table.TableCellRenderer; +import java.awt.Container; import java.io.Serializable; import java.util.Collections; @@ -201,8 +202,9 @@ public class LonglineDetailCompositionUIInitializer extends ContentUIInitializer // init branchlineDetail tab BranchlineUI compositionUI = ui.getBranchlineDetailUI(); compositionUI.init(); - ui.getBranchlineDetailPanel().remove(compositionUI); - ui.getBranchlineDetailPanel().add(compositionUI.getBody()); + Container parent = ui.getBranchlineDetailPanel(); + parent .removeAll(); + parent.add(compositionUI.getBody()); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.