Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
03ca7425
by Tony CHEMIT at 2017-07-10T16:48:14+02:00
-
4e0f3a1e
by Tony CHEMIT at 2017-07-10T16:49:04+02:00
-
e6fbec99
by Tony CHEMIT at 2017-07-10T19:38:48+02:00
5 changed files:
- application-swing-configuration/pom.xml
- application-swing-validation/pom.xml
- application-swing/pom.xml
- application-swing/src/test/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionValidatorServiceTest.java
- pom.xml
Changes:
| ... | ... | @@ -91,7 +91,7 @@ |
| 91 | 91 |
<artifactId>nuiton-config</artifactId>
|
| 92 | 92 |
</dependency>
|
| 93 | 93 |
<dependency>
|
| 94 |
- <groupId>org.nuiton.jaxx</groupId>
|
|
| 94 |
+ <groupId>io.ultreia.java4all.jaxx</groupId>
|
|
| 95 | 95 |
<artifactId>jaxx-widgets-gis</artifactId>
|
| 96 | 96 |
</dependency>
|
| 97 | 97 |
|
| ... | ... | @@ -77,7 +77,7 @@ |
| 77 | 77 |
<artifactId>nuiton-decorator</artifactId>
|
| 78 | 78 |
</dependency>
|
| 79 | 79 |
<dependency>
|
| 80 |
- <groupId>org.nuiton.jaxx</groupId>
|
|
| 80 |
+ <groupId>io.ultreia.java4all.jaxx</groupId>
|
|
| 81 | 81 |
<artifactId>jaxx-widgets-gis</artifactId>
|
| 82 | 82 |
</dependency>
|
| 83 | 83 |
|
| ... | ... | @@ -357,63 +357,63 @@ |
| 357 | 357 |
<!-- jaxx dependencies -->
|
| 358 | 358 |
|
| 359 | 359 |
<dependency>
|
| 360 |
- <groupId>org.nuiton.jaxx</groupId>
|
|
| 360 |
+ <groupId>io.ultreia.java4all.jaxx</groupId>
|
|
| 361 | 361 |
<artifactId>jaxx-runtime</artifactId>
|
| 362 | 362 |
</dependency>
|
| 363 | 363 |
<dependency>
|
| 364 |
- <groupId>org.nuiton.jaxx</groupId>
|
|
| 364 |
+ <groupId>io.ultreia.java4all.jaxx</groupId>
|
|
| 365 | 365 |
<artifactId>jaxx-runtime-swing-application</artifactId>
|
| 366 | 366 |
</dependency>
|
| 367 | 367 |
<dependency>
|
| 368 |
- <groupId>org.nuiton.jaxx</groupId>
|
|
| 368 |
+ <groupId>io.ultreia.java4all.jaxx</groupId>
|
|
| 369 | 369 |
<artifactId>jaxx-runtime-swing-session</artifactId>
|
| 370 | 370 |
</dependency>
|
| 371 | 371 |
<dependency>
|
| 372 |
- <groupId>org.nuiton.jaxx</groupId>
|
|
| 372 |
+ <groupId>io.ultreia.java4all.jaxx</groupId>
|
|
| 373 | 373 |
<artifactId>jaxx-runtime-swing-wizard</artifactId>
|
| 374 | 374 |
</dependency>
|
| 375 | 375 |
<dependency>
|
| 376 |
- <groupId>org.nuiton.jaxx</groupId>
|
|
| 376 |
+ <groupId>io.ultreia.java4all.jaxx</groupId>
|
|
| 377 | 377 |
<artifactId>jaxx-validator</artifactId>
|
| 378 | 378 |
</dependency>
|
| 379 | 379 |
<dependency>
|
| 380 |
- <groupId>org.nuiton.jaxx</groupId>
|
|
| 380 |
+ <groupId>io.ultreia.java4all.jaxx</groupId>
|
|
| 381 | 381 |
<artifactId>jaxx-widgets-error</artifactId>
|
| 382 | 382 |
</dependency>
|
| 383 | 383 |
<dependency>
|
| 384 |
- <groupId>org.nuiton.jaxx</groupId>
|
|
| 384 |
+ <groupId>io.ultreia.java4all.jaxx</groupId>
|
|
| 385 | 385 |
<artifactId>jaxx-widgets-hidor</artifactId>
|
| 386 | 386 |
</dependency>
|
| 387 | 387 |
<dependency>
|
| 388 |
- <groupId>org.nuiton.jaxx</groupId>
|
|
| 388 |
+ <groupId>io.ultreia.java4all.jaxx</groupId>
|
|
| 389 | 389 |
<artifactId>jaxx-widgets-gis</artifactId>
|
| 390 | 390 |
</dependency>
|
| 391 | 391 |
<dependency>
|
| 392 |
- <groupId>org.nuiton.jaxx</groupId>
|
|
| 392 |
+ <groupId>io.ultreia.java4all.jaxx</groupId>
|
|
| 393 | 393 |
<artifactId>jaxx-widgets-datetime</artifactId>
|
| 394 | 394 |
</dependency>
|
| 395 | 395 |
<dependency>
|
| 396 |
- <groupId>org.nuiton.jaxx</groupId>
|
|
| 396 |
+ <groupId>io.ultreia.java4all.jaxx</groupId>
|
|
| 397 | 397 |
<artifactId>jaxx-widgets-file</artifactId>
|
| 398 | 398 |
</dependency>
|
| 399 | 399 |
<dependency>
|
| 400 |
- <groupId>org.nuiton.jaxx</groupId>
|
|
| 400 |
+ <groupId>io.ultreia.java4all.jaxx</groupId>
|
|
| 401 | 401 |
<artifactId>jaxx-widgets-status</artifactId>
|
| 402 | 402 |
</dependency>
|
| 403 | 403 |
<dependency>
|
| 404 |
- <groupId>org.nuiton.jaxx</groupId>
|
|
| 404 |
+ <groupId>io.ultreia.java4all.jaxx</groupId>
|
|
| 405 | 405 |
<artifactId>jaxx-widgets-select</artifactId>
|
| 406 | 406 |
</dependency>
|
| 407 | 407 |
<dependency>
|
| 408 |
- <groupId>org.nuiton.jaxx</groupId>
|
|
| 408 |
+ <groupId>io.ultreia.java4all.jaxx</groupId>
|
|
| 409 | 409 |
<artifactId>jaxx-widgets-number</artifactId>
|
| 410 | 410 |
</dependency>
|
| 411 | 411 |
<dependency>
|
| 412 |
- <groupId>org.nuiton.jaxx</groupId>
|
|
| 412 |
+ <groupId>io.ultreia.java4all.jaxx</groupId>
|
|
| 413 | 413 |
<artifactId>jaxx-widgets-about</artifactId>
|
| 414 | 414 |
</dependency>
|
| 415 | 415 |
<dependency>
|
| 416 |
- <groupId>org.nuiton.jaxx</groupId>
|
|
| 416 |
+ <groupId>io.ultreia.java4all.jaxx</groupId>
|
|
| 417 | 417 |
<artifactId>jaxx-widgets-config</artifactId>
|
| 418 | 418 |
</dependency>
|
| 419 | 419 |
|
| ... | ... | @@ -623,7 +623,7 @@ |
| 623 | 623 |
<plugins>
|
| 624 | 624 |
|
| 625 | 625 |
<plugin>
|
| 626 |
- <groupId>org.nuiton.jaxx</groupId>
|
|
| 626 |
+ <groupId>io.ultreia.java4all.jaxx</groupId>
|
|
| 627 | 627 |
<artifactId>jaxx-maven-plugin</artifactId>
|
| 628 | 628 |
<executions>
|
| 629 | 629 |
<execution>
|
| ... | ... | @@ -23,29 +23,30 @@ package fr.ird.observe.application.swing.ui.content.impl.longline; |
| 23 | 23 |
*/
|
| 24 | 24 |
|
| 25 | 25 |
import com.google.common.collect.Iterables;
|
| 26 |
+import fr.ird.observe.application.swing.ObserveResourceManager;
|
|
| 26 | 27 |
import fr.ird.observe.application.swing.ObserveSwingApplicationContext;
|
| 27 | 28 |
import fr.ird.observe.application.swing.configuration.ObserveSwingApplicationConfig;
|
| 28 | 29 |
import fr.ird.observe.services.dto.longline.BasketDto;
|
| 29 | 30 |
import fr.ird.observe.services.dto.longline.BranchlineDto;
|
| 30 | 31 |
import fr.ird.observe.services.dto.longline.SectionDto;
|
| 31 |
-import org.nuiton.jaxx.validator.swing.SwingValidator;
|
|
| 32 |
-import org.nuiton.jaxx.validator.swing.SwingValidatorMessage;
|
|
| 32 |
+import java.io.IOException;
|
|
| 33 |
+import java.util.ArrayList;
|
|
| 34 |
+import java.util.Collections;
|
|
| 35 |
+import java.util.List;
|
|
| 36 |
+import java.util.Locale;
|
|
| 33 | 37 |
import org.apache.commons.logging.Log;
|
| 34 | 38 |
import org.apache.commons.logging.LogFactory;
|
| 35 | 39 |
import org.junit.Assert;
|
| 36 | 40 |
import org.junit.Before;
|
| 37 | 41 |
import org.junit.Test;
|
| 42 |
+import org.nuiton.config.ArgumentsParserException;
|
|
| 38 | 43 |
import org.nuiton.i18n.I18n;
|
| 39 | 44 |
import org.nuiton.i18n.init.ClassPathI18nInitializer;
|
| 45 |
+import org.nuiton.jaxx.validator.swing.SwingValidator;
|
|
| 46 |
+import org.nuiton.jaxx.validator.swing.SwingValidatorMessage;
|
|
| 40 | 47 |
import org.nuiton.validator.NuitonValidatorScope;
|
| 41 | 48 |
import org.nuiton.validator.bean.simple.SimpleBeanValidatorMessage;
|
| 42 | 49 |
|
| 43 |
-import java.io.IOException;
|
|
| 44 |
-import java.util.ArrayList;
|
|
| 45 |
-import java.util.Collections;
|
|
| 46 |
-import java.util.List;
|
|
| 47 |
-import java.util.Locale;
|
|
| 48 |
- |
|
| 49 | 50 |
/**
|
| 50 | 51 |
* Created on 3/18/15.
|
| 51 | 52 |
*
|
| ... | ... | @@ -60,14 +61,18 @@ public class LonglineDetailCompositionValidatorServiceTest { |
| 60 | 61 |
protected LonglineDetailCompositionValidatorService service;
|
| 61 | 62 |
|
| 62 | 63 |
@Before
|
| 63 |
- public void setUp() throws IOException {
|
|
| 64 |
+ public void setUp() throws IOException, ArgumentsParserException {
|
|
| 64 | 65 |
|
| 65 | 66 |
if (ObserveSwingApplicationContext.isInit()) {
|
| 66 | 67 |
|
| 67 | 68 |
ObserveSwingApplicationContext.get().close();
|
| 68 | 69 |
}
|
| 69 | 70 |
|
| 70 |
- ObserveSwingApplicationContext applicationContext = new ObserveSwingApplicationContext(new ObserveSwingApplicationConfig());
|
|
| 71 |
+ ObserveSwingApplicationConfig config = new ObserveSwingApplicationConfig();
|
|
| 72 |
+ |
|
| 73 |
+ config.initConfig(new ObserveResourceManager().getResource(ObserveResourceManager.Resource.application));
|
|
| 74 |
+ |
|
| 75 |
+ ObserveSwingApplicationContext applicationContext = new ObserveSwingApplicationContext(config);
|
|
| 71 | 76 |
|
| 72 | 77 |
SwingValidator<SectionDto> sectionValidator = new SwingValidator<>(SectionDto.class, "ui-update-table", NuitonValidatorScope.values());
|
| 73 | 78 |
SwingValidator<BasketDto> basketValidator = new SwingValidator<>(BasketDto.class, "ui-update-table", NuitonValidatorScope.values());
|
| ... | ... | @@ -173,8 +173,8 @@ |
| 173 | 173 |
<eugenePluginVersion>3.0-alpha-11</eugenePluginVersion>
|
| 174 | 174 |
<processorPluginVersion>1.3</processorPluginVersion>
|
| 175 | 175 |
|
| 176 |
- <jaxxVersion>3.0-alpha-6</jaxxVersion>
|
|
| 177 |
- <nuitonI18nVersion>4.0-alpha-1-SNAPSHOT</nuitonI18nVersion>
|
|
| 176 |
+ <jaxxVersion>3.0-alpha-7</jaxxVersion>
|
|
| 177 |
+ <nuitonI18nVersion>4.0-alpha-1</nuitonI18nVersion>
|
|
| 178 | 178 |
<nuitonConfigVersion>3.2</nuitonConfigVersion>
|
| 179 | 179 |
<topiaVersion>3.2.1</topiaVersion>
|
| 180 | 180 |
<nuitonValidatorVersion>3.1</nuitonValidatorVersion>
|
| ... | ... | @@ -389,11 +389,21 @@ |
| 389 | 389 |
<artifactId>i18n-editor</artifactId>
|
| 390 | 390 |
<version>${nuitonI18nVersion}</version>
|
| 391 | 391 |
<scope>compile</scope>
|
| 392 |
+ <exclusions>
|
|
| 393 |
+ <exclusion>
|
|
| 394 |
+ <groupId>org.nuiton.jaxx</groupId>
|
|
| 395 |
+ <artifactId>jaxx-runtime</artifactId>
|
|
| 396 |
+ </exclusion>
|
|
| 397 |
+ <exclusion>
|
|
| 398 |
+ <groupId>org.nuiton.jaxx</groupId>
|
|
| 399 |
+ <artifactId>jaxx-widgets-file</artifactId>
|
|
| 400 |
+ </exclusion>
|
|
| 401 |
+ </exclusions>
|
|
| 392 | 402 |
</dependency>
|
| 393 | 403 |
|
| 394 | 404 |
<!-- Jaxx -->
|
| 395 | 405 |
<dependency>
|
| 396 |
- <groupId>org.nuiton.jaxx</groupId>
|
|
| 406 |
+ <groupId>io.ultreia.java4all.jaxx</groupId>
|
|
| 397 | 407 |
<artifactId>jaxx-runtime</artifactId>
|
| 398 | 408 |
<version>${jaxxVersion}</version>
|
| 399 | 409 |
<scope>compile</scope>
|
| ... | ... | @@ -405,19 +415,19 @@ |
| 405 | 415 |
</exclusions>
|
| 406 | 416 |
</dependency>
|
| 407 | 417 |
<dependency>
|
| 408 |
- <groupId>org.nuiton.jaxx</groupId>
|
|
| 418 |
+ <groupId>io.ultreia.java4all.jaxx</groupId>
|
|
| 409 | 419 |
<artifactId>jaxx-runtime-swing-application</artifactId>
|
| 410 | 420 |
<version>${jaxxVersion}</version>
|
| 411 | 421 |
<scope>compile</scope>
|
| 412 | 422 |
</dependency>
|
| 413 | 423 |
<dependency>
|
| 414 |
- <groupId>org.nuiton.jaxx</groupId>
|
|
| 424 |
+ <groupId>io.ultreia.java4all.jaxx</groupId>
|
|
| 415 | 425 |
<artifactId>jaxx-runtime-swing-session</artifactId>
|
| 416 | 426 |
<version>${jaxxVersion}</version>
|
| 417 | 427 |
<scope>compile</scope>
|
| 418 | 428 |
</dependency>
|
| 419 | 429 |
<dependency>
|
| 420 |
- <groupId>org.nuiton.jaxx</groupId>
|
|
| 430 |
+ <groupId>io.ultreia.java4all.jaxx</groupId>
|
|
| 421 | 431 |
<artifactId>jaxx-runtime-swing-wizard</artifactId>
|
| 422 | 432 |
<version>${jaxxVersion}</version>
|
| 423 | 433 |
<scope>compile</scope>
|
| ... | ... | @@ -429,7 +439,7 @@ |
| 429 | 439 |
</exclusions>
|
| 430 | 440 |
</dependency>
|
| 431 | 441 |
<dependency>
|
| 432 |
- <groupId>org.nuiton.jaxx</groupId>
|
|
| 442 |
+ <groupId>io.ultreia.java4all.jaxx</groupId>
|
|
| 433 | 443 |
<artifactId>jaxx-validator</artifactId>
|
| 434 | 444 |
<version>${jaxxVersion}</version>
|
| 435 | 445 |
<scope>compile</scope>
|
| ... | ... | @@ -441,7 +451,7 @@ |
| 441 | 451 |
</exclusions>
|
| 442 | 452 |
</dependency>
|
| 443 | 453 |
<dependency>
|
| 444 |
- <groupId>org.nuiton.jaxx</groupId>
|
|
| 454 |
+ <groupId>io.ultreia.java4all.jaxx</groupId>
|
|
| 445 | 455 |
<artifactId>jaxx-widgets-error</artifactId>
|
| 446 | 456 |
<version>${jaxxVersion}</version>
|
| 447 | 457 |
<scope>compile</scope>
|
| ... | ... | @@ -453,7 +463,7 @@ |
| 453 | 463 |
</exclusions>
|
| 454 | 464 |
</dependency>
|
| 455 | 465 |
<dependency>
|
| 456 |
- <groupId>org.nuiton.jaxx</groupId>
|
|
| 466 |
+ <groupId>io.ultreia.java4all.jaxx</groupId>
|
|
| 457 | 467 |
<artifactId>jaxx-widgets-hidor</artifactId>
|
| 458 | 468 |
<version>${jaxxVersion}</version>
|
| 459 | 469 |
<scope>compile</scope>
|
| ... | ... | @@ -465,7 +475,7 @@ |
| 465 | 475 |
</exclusions>
|
| 466 | 476 |
</dependency>
|
| 467 | 477 |
<dependency>
|
| 468 |
- <groupId>org.nuiton.jaxx</groupId>
|
|
| 478 |
+ <groupId>io.ultreia.java4all.jaxx</groupId>
|
|
| 469 | 479 |
<artifactId>jaxx-widgets-gis</artifactId>
|
| 470 | 480 |
<version>${jaxxVersion}</version>
|
| 471 | 481 |
<scope>compile</scope>
|
| ... | ... | @@ -477,7 +487,7 @@ |
| 477 | 487 |
</exclusions>
|
| 478 | 488 |
</dependency>
|
| 479 | 489 |
<dependency>
|
| 480 |
- <groupId>org.nuiton.jaxx</groupId>
|
|
| 490 |
+ <groupId>io.ultreia.java4all.jaxx</groupId>
|
|
| 481 | 491 |
<artifactId>jaxx-widgets-datetime</artifactId>
|
| 482 | 492 |
<version>${jaxxVersion}</version>
|
| 483 | 493 |
<scope>compile</scope>
|
| ... | ... | @@ -489,7 +499,7 @@ |
| 489 | 499 |
</exclusions>
|
| 490 | 500 |
</dependency>
|
| 491 | 501 |
<dependency>
|
| 492 |
- <groupId>org.nuiton.jaxx</groupId>
|
|
| 502 |
+ <groupId>io.ultreia.java4all.jaxx</groupId>
|
|
| 493 | 503 |
<artifactId>jaxx-widgets-select</artifactId>
|
| 494 | 504 |
<version>${jaxxVersion}</version>
|
| 495 | 505 |
<scope>compile</scope>
|
| ... | ... | @@ -501,7 +511,7 @@ |
| 501 | 511 |
</exclusions>
|
| 502 | 512 |
</dependency>
|
| 503 | 513 |
<dependency>
|
| 504 |
- <groupId>org.nuiton.jaxx</groupId>
|
|
| 514 |
+ <groupId>io.ultreia.java4all.jaxx</groupId>
|
|
| 505 | 515 |
<artifactId>jaxx-widgets-about</artifactId>
|
| 506 | 516 |
<version>${jaxxVersion}</version>
|
| 507 | 517 |
<scope>compile</scope>
|
| ... | ... | @@ -513,7 +523,7 @@ |
| 513 | 523 |
</exclusions>
|
| 514 | 524 |
</dependency>
|
| 515 | 525 |
<dependency>
|
| 516 |
- <groupId>org.nuiton.jaxx</groupId>
|
|
| 526 |
+ <groupId>io.ultreia.java4all.jaxx</groupId>
|
|
| 517 | 527 |
<artifactId>jaxx-widgets-number</artifactId>
|
| 518 | 528 |
<version>${jaxxVersion}</version>
|
| 519 | 529 |
<scope>compile</scope>
|
| ... | ... | @@ -525,7 +535,7 @@ |
| 525 | 535 |
</exclusions>
|
| 526 | 536 |
</dependency>
|
| 527 | 537 |
<dependency>
|
| 528 |
- <groupId>org.nuiton.jaxx</groupId>
|
|
| 538 |
+ <groupId>io.ultreia.java4all.jaxx</groupId>
|
|
| 529 | 539 |
<artifactId>jaxx-widgets-file</artifactId>
|
| 530 | 540 |
<version>${jaxxVersion}</version>
|
| 531 | 541 |
<scope>compile</scope>
|
| ... | ... | @@ -537,7 +547,7 @@ |
| 537 | 547 |
</exclusions>
|
| 538 | 548 |
</dependency>
|
| 539 | 549 |
<dependency>
|
| 540 |
- <groupId>org.nuiton.jaxx</groupId>
|
|
| 550 |
+ <groupId>io.ultreia.java4all.jaxx</groupId>
|
|
| 541 | 551 |
<artifactId>jaxx-widgets-status</artifactId>
|
| 542 | 552 |
<version>${jaxxVersion}</version>
|
| 543 | 553 |
<exclusions>
|
| ... | ... | @@ -548,7 +558,7 @@ |
| 548 | 558 |
</exclusions>
|
| 549 | 559 |
</dependency>
|
| 550 | 560 |
<dependency>
|
| 551 |
- <groupId>org.nuiton.jaxx</groupId>
|
|
| 561 |
+ <groupId>io.ultreia.java4all.jaxx</groupId>
|
|
| 552 | 562 |
<artifactId>jaxx-widgets-config</artifactId>
|
| 553 | 563 |
<version>${jaxxVersion}</version>
|
| 554 | 564 |
<scope>compile</scope>
|
| ... | ... | @@ -705,7 +715,8 @@ |
| 705 | 715 |
<dependency>
|
| 706 | 716 |
<groupId>com.esotericsoftware.yamlbeans</groupId>
|
| 707 | 717 |
<artifactId>yamlbeans</artifactId>
|
| 708 |
- <version>1.12</version>
|
|
| 718 |
+ <!--up to version 13 it does not work :(-->
|
|
| 719 |
+ <version>1.08</version>
|
|
| 709 | 720 |
</dependency>
|
| 710 | 721 |
|
| 711 | 722 |
<!-- ne pas mettre à jour cette version est pour tomcat 7-->
|
| ... | ... | @@ -883,7 +894,7 @@ |
| 883 | 894 |
<artifactId>maven-site-plugin</artifactId>
|
| 884 | 895 |
<dependencies>
|
| 885 | 896 |
<dependency>
|
| 886 |
- <groupId>org.nuiton.jaxx</groupId>
|
|
| 897 |
+ <groupId>io.ultreia.java4all.jaxx</groupId>
|
|
| 887 | 898 |
<artifactId>jaxx-widgets-gis</artifactId>
|
| 888 | 899 |
<version>${jaxxVersion}</version>
|
| 889 | 900 |
</dependency>
|
| ... | ... | @@ -949,7 +960,7 @@ |
| 949 | 960 |
</plugin>
|
| 950 | 961 |
|
| 951 | 962 |
<plugin>
|
| 952 |
- <groupId>org.nuiton.jaxx</groupId>
|
|
| 963 |
+ <groupId>io.ultreia.java4all.jaxx</groupId>
|
|
| 953 | 964 |
<artifactId>jaxx-maven-plugin</artifactId>
|
| 954 | 965 |
<version>${jaxxVersion}</version>
|
| 955 | 966 |
</plugin>
|