branch develop updated (8946a1d -> 3832e63)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from 8946a1d fixes #6904: Mauvais disposition sur l'écran des activités senne Merge branch 'feature/6904' into develop new dcf8ebd passage sous git et utilisation de codelutinpom new 55e94f8 refs #6875 correction de la mise en page du formulaire détail avançon new 3832e63 fixes #6875: Mise en page du formulaireComposition détaillée/Détail avançon Merge branch 'feature/6875' into develop The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 3832e63eec6571f4ce44fdf2832de796b863a600 Merge: 8946a1d 55e94f8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 7 09:58:45 2015 +0200 fixes #6875: Mise en page du formulaireComposition détaillée/Détail avançon Merge branch 'feature/6875' into develop 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 commit dcf8ebd6b7cfe9941a1aa925cff70d5e27921fc3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 7 08:54:59 2015 +0200 passage sous git et utilisation de codelutinpom Summary of changes: observe-business/pom.xml | 60 +----------- observe-entities/pom.xml | 108 +-------------------- observe-swing/pom.xml | 3 +- .../ui/content/impl/longline/BranchlineUI.jaxx | 15 +-- .../impl/longline/LonglineDetailCompositionUI.jaxx | 9 +- .../LonglineDetailCompositionUIInitializer.java | 6 +- observe-validation/pom.xml | 4 +- 7 files changed, 21 insertions(+), 184 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
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 dcf8ebd6b7cfe9941a1aa925cff70d5e27921fc3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 7 08:54:59 2015 +0200 passage sous git et utilisation de codelutinpom --- observe-business/pom.xml | 60 +------------------------ observe-entities/pom.xml | 108 +-------------------------------------------- observe-swing/pom.xml | 3 +- observe-validation/pom.xml | 4 +- 4 files changed, 7 insertions(+), 168 deletions(-) diff --git a/observe-business/pom.xml b/observe-business/pom.xml index 2237acd..35b6653 100644 --- a/observe-business/pom.xml +++ b/observe-business/pom.xml @@ -24,9 +24,7 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> -<!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> + <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> @@ -231,12 +229,6 @@ <build> <resources> <resource> - <directory>${maven.gen.dir}/resources</directory> - <includes> - <include>objectmodel/*.properties</include> - </includes> - </resource> - <resource> <directory>src/main/resources</directory> <includes> <include>**/*</include> @@ -261,59 +253,9 @@ <plugins> - <!--plugin> - <groupId>org.nuiton.eugene</groupId> - <artifactId>eugene-maven-plugin</artifactId> - <configuration> - <defaultPackage>fr.ird.observe</defaultPackage> - <fullPackagePath>fr.ird.observe</fullPackagePath> - </configuration> - <executions> - <execution> - <phase>generate-sources</phase> - <id>generate-persistence</id> - <configuration> - <inputs> - <input>zargo:src/main/xmi:observe-common.zargo</input> - <input>zargo:src/main/xmi:observe-seine.zargo</input> - <input>zargo:src/main/xmi:observe-longline.zargo</input> - </inputs> - <templates> - org.nuiton.topia.generator.TopiaMetaTransformer, - org.nuiton.topia.generator.BinderHelperTransformer - </templates> - </configuration> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-persistence</artifactId> - <version>${topiaVersion}</version> - <scope>compile</scope> - </dependency> - </dependencies> - </plugin--> - <plugin> <groupId>org.nuiton.i18n</groupId> <artifactId>i18n-maven-plugin</artifactId> - <!--configuration> - <entries> - <entry> - <basedir>${maven.gen.dir}/java/</basedir> - <includes> - <param>**/*Abstract.java</param> - </includes> - <excludes> - <param>**/*DAOAbstract.java</param> - </excludes> - </entry> - </entries> - </configuration--> <executions> <execution> <goals> diff --git a/observe-entities/pom.xml b/observe-entities/pom.xml index 6340a40..c27538b 100644 --- a/observe-entities/pom.xml +++ b/observe-entities/pom.xml @@ -115,7 +115,7 @@ <build> <resources> <resource> - <directory>${maven.gen.dir}/resources</directory> + <directory>${project.build.directory}/generated-sources/resources/</directory> <includes> <include>objectmodel/*.properties</include> </includes> @@ -189,7 +189,7 @@ <configuration> <entries> <entry> - <basedir>${maven.gen.dir}/java/</basedir> + <basedir>${project.build.directory}/generated-sources/java/</basedir> <includes> <param>**/*Abstract.java</param> </includes> @@ -224,108 +224,4 @@ </plugins> </build> - <profiles> - - <profile> - <id>run-replication-its</id> - <build> - <defaultGoal>integration-test</defaultGoal> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <executions> - <execution> - <id>integration-report-tests</id> - <phase>integration-test</phase> - <goals> - <goal>test</goal> - </goals> - <configuration> - <includes> - <include>**/replication/*IT.java</include> - </includes> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - - <profile> - <id>run-migration-its</id> - <build> - <defaultGoal>integration-test</defaultGoal> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <executions> - <execution> - <id>integration-report-tests</id> - <phase>integration-test</phase> - <goals> - <goal>test</goal> - </goals> - <configuration> - <includes> - <include>**/migration/**/*IT.java</include> - </includes> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - - <profile> - <id>run-its</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> - <defaultGoal>integration-test</defaultGoal> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <executions> - <execution> - <id>integration-tests</id> - <phase>integration-test</phase> - <goals> - <goal>test</goal> - </goals> - <configuration> - <includes> - <include>**/*IT.java</include> - </includes> - <excludes> - <exclude>**/RestoreEmptyPGIT.java</exclude> - <exclude>**/report/**/*IT.java</exclude> - </excludes> - </configuration> - </execution> - - <execution> - <id>after-integration-tests</id> - <phase>post-integration-test</phase> - <goals> - <goal>test</goal> - </goals> - <configuration> - <includes> - <include>**/RestoreEmptyPGIT.java</include> - </includes> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - - </profiles> </project> diff --git a/observe-swing/pom.xml b/observe-swing/pom.xml index a2c1526..bc4d9ab 100644 --- a/observe-swing/pom.xml +++ b/observe-swing/pom.xml @@ -287,6 +287,7 @@ <useUniqueVersions>false</useUniqueVersions> <addClasspath>true</addClasspath> <classpathPrefix>./lib/</classpathPrefix> + <mainClass>${maven.jar.main.class}</mainClass> </manifest> </archive> </configuration> @@ -321,7 +322,7 @@ <configuration> <entries> <entry> - <basedir>${maven.gen.dir}/java/</basedir> + <basedir>${project.build.directory}/generated-sources/java/</basedir> </entry> </entries> </configuration> diff --git a/observe-validation/pom.xml b/observe-validation/pom.xml index 37887d0..375c1fb 100644 --- a/observe-validation/pom.xml +++ b/observe-validation/pom.xml @@ -116,7 +116,7 @@ <resources> <resource> - <directory>${maven.src.dir}/main/resources</directory> + <directory>${project.basedir}/src/main/resources</directory> <includes> <include>**/*</include> </includes> @@ -132,7 +132,7 @@ <entries> <entry> <specificGoal>parserValidation</specificGoal> - <basedir>${maven.src.dir}/main/resources/</basedir> + <basedir>${project.basedir}/src/main/resources/</basedir> <includes> <param>**/**-validation.xml</param> </includes> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
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>.
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 3832e63eec6571f4ce44fdf2832de796b863a600 Merge: 8946a1d 55e94f8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 7 09:58:45 2015 +0200 fixes #6875: Mise en page du formulaireComposition détaillée/Détail avançon Merge branch 'feature/6875' into develop observe-business/pom.xml | 60 +----------- observe-entities/pom.xml | 108 +-------------------- observe-swing/pom.xml | 3 +- .../ui/content/impl/longline/BranchlineUI.jaxx | 15 +-- .../impl/longline/LonglineDetailCompositionUI.jaxx | 9 +- .../LonglineDetailCompositionUIInitializer.java | 6 +- observe-validation/pom.xml | 4 +- 7 files changed, 21 insertions(+), 184 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm