Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe
Commits:
-
7640642c
by Tony CHEMIT at 2018-07-13T13:00:43Z
3 changed files:
- client/src/main/java/fr/ird/observe/client/ui/content/ref/common/LengthLengthParameterUI.jaxx
- client/src/main/java/fr/ird/observe/client/ui/content/ref/common/LengthWeightParameterUI.jaxx
- pom.xml
Changes:
| ... | ... | @@ -161,16 +161,16 @@ |
| 161 | 161 |
|
| 162 | 162 |
<!-- source -->
|
| 163 | 163 |
<row>
|
| 164 |
- <cell columns="2">
|
|
| 164 |
+ <cell columns="2" weighty="1">
|
|
| 165 | 165 |
<BigTextEditor id="sourceField"/>
|
| 166 | 166 |
</cell>
|
| 167 | 167 |
</row>
|
| 168 | 168 |
|
| 169 |
- <row>
|
|
| 170 |
- <cell columns="2" weighty="1">
|
|
| 171 |
- <JLabel styleClass="skipI18n"/>
|
|
| 172 |
- </cell>
|
|
| 173 |
- </row>
|
|
| 169 |
+ <!--<row>-->
|
|
| 170 |
+ <!--<cell columns="2" weighty="1">-->
|
|
| 171 |
+ <!--<JLabel styleClass="skipI18n"/>-->
|
|
| 172 |
+ <!--</cell>-->
|
|
| 173 |
+ <!--</row>-->
|
|
| 174 | 174 |
</Table>
|
| 175 | 175 |
</tab>
|
| 176 | 176 |
|
| ... | ... | @@ -157,14 +157,6 @@ public void decorateUniqueKeyTable(JTable table, TableCellRenderer renderer, JSc |
| 157 | 157 |
onItemStateChanged='getBean().setStatus((ReferenceStatus)status.getSelectedItem())'/>
|
| 158 | 158 |
</cell>
|
| 159 | 159 |
</row>
|
| 160 |
- |
|
| 161 |
- <!-- source -->
|
|
| 162 |
- <row>
|
|
| 163 |
- <cell columns="2">
|
|
| 164 |
- <BigTextEditor id="sourceField"/>
|
|
| 165 |
- </cell>
|
|
| 166 |
- </row>
|
|
| 167 |
- |
|
| 168 | 160 |
<!-- needComment -->
|
| 169 | 161 |
<row>
|
| 170 | 162 |
<cell anchor='east' weightx="1" fill="both" columns="2">
|
| ... | ... | @@ -172,11 +164,19 @@ public void decorateUniqueKeyTable(JTable table, TableCellRenderer renderer, JSc |
| 172 | 164 |
</cell>
|
| 173 | 165 |
</row>
|
| 174 | 166 |
|
| 167 |
+ <!-- source -->
|
|
| 175 | 168 |
<row>
|
| 176 | 169 |
<cell columns="2" weighty="1">
|
| 177 |
- <JLabel styleClass="skipI18n"/>
|
|
| 170 |
+ <BigTextEditor id="sourceField"/>
|
|
| 178 | 171 |
</cell>
|
| 179 | 172 |
</row>
|
| 173 |
+ |
|
| 174 |
+ |
|
| 175 |
+ <!--<row>-->
|
|
| 176 |
+ <!--<cell columns="2" weighty="1">-->
|
|
| 177 |
+ <!--<JLabel styleClass="skipI18n"/>-->
|
|
| 178 |
+ <!--</cell>-->
|
|
| 179 |
+ <!--</row>-->
|
|
| 180 | 180 |
</Table>
|
| 181 | 181 |
</tab>
|
| 182 | 182 |
|
| ... | ... | @@ -152,7 +152,7 @@ |
| 152 | 152 |
<maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format>
|
| 153 | 153 |
<buildDate>${maven.build.timestamp}</buildDate>
|
| 154 | 154 |
|
| 155 |
- <observeToolkitVersion>3.7.2</observeToolkitVersion>
|
|
| 155 |
+ <observeToolkitVersion>3.7.3-SNAPSHOT</observeToolkitVersion>
|
|
| 156 | 156 |
<!--<lib.version.java4all.jaxx>3.0-alpha-31</lib.version.java4all.jaxx>-->
|
| 157 | 157 |
<!--<lib.version.nuiton.topia>3.4.2-SNAPSHOT</lib.version.nuiton.topia>-->
|
| 158 | 158 |
<lib.version.nuiton.validation>3.1</lib.version.nuiton.validation>
|