Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
8d235c0b
by Tony CHEMIT at 2017-07-10T14:19:28+02:00
14 changed files:
- application-swing-configuration/pom.xml
- application-swing-decoration/pom.xml
- application-swing-validation/pom.xml
- application-swing/pom.xml
- application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddFloatingObjectReferenceUIAction.java
- application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/EditFloatingObjectReferenceUIAction.java
- application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/RemoveFloatingObjectReferenceUIAction.java
- application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/TranslateAction.java
- application-swing/src/main/java/fr/ird/observe/application/swing/ui/dcprefs/FloatingObjectReferencesUI.jaxx
- application-web-configuration/pom.xml
- pom.xml
- services-topia/pom.xml
- services-validation/pom.xml
- services/pom.xml
Changes:
| ... | ... | @@ -84,7 +84,7 @@ |
| 84 | 84 |
</dependency>
|
| 85 | 85 |
<dependency>
|
| 86 | 86 |
<groupId>io.ultreia.java4all.i18n</groupId>
|
| 87 |
- <artifactId>nuiton-i18n</artifactId>
|
|
| 87 |
+ <artifactId>i18n-api</artifactId>
|
|
| 88 | 88 |
</dependency>
|
| 89 | 89 |
<dependency>
|
| 90 | 90 |
<groupId>org.nuiton</groupId>
|
| ... | ... | @@ -71,7 +71,7 @@ |
| 71 | 71 |
|
| 72 | 72 |
<dependency>
|
| 73 | 73 |
<groupId>io.ultreia.java4all.i18n</groupId>
|
| 74 |
- <artifactId>nuiton-i18n</artifactId>
|
|
| 74 |
+ <artifactId>i18n-api</artifactId>
|
|
| 75 | 75 |
</dependency>
|
| 76 | 76 |
<dependency>
|
| 77 | 77 |
<groupId>org.nuiton</groupId>
|
| ... | ... | @@ -66,7 +66,7 @@ |
| 66 | 66 |
<!-- Nuiton -->
|
| 67 | 67 |
<dependency>
|
| 68 | 68 |
<groupId>io.ultreia.java4all.i18n</groupId>
|
| 69 |
- <artifactId>nuiton-i18n</artifactId>
|
|
| 69 |
+ <artifactId>i18n-api</artifactId>
|
|
| 70 | 70 |
</dependency>
|
| 71 | 71 |
<dependency>
|
| 72 | 72 |
<groupId>org.nuiton</groupId>
|
| ... | ... | @@ -461,7 +461,7 @@ |
| 461 | 461 |
</dependency>
|
| 462 | 462 |
<dependency>
|
| 463 | 463 |
<groupId>io.ultreia.java4all.i18n</groupId>
|
| 464 |
- <artifactId>nuiton-i18n</artifactId>
|
|
| 464 |
+ <artifactId>i18n-api</artifactId>
|
|
| 465 | 465 |
</dependency>
|
| 466 | 466 |
<dependency>
|
| 467 | 467 |
<groupId>io.ultreia.java4all.i18n</groupId>
|
| ... | ... | @@ -713,14 +713,14 @@ |
| 713 | 713 |
<configuration>
|
| 714 | 714 |
<templateExtension>ftl</templateExtension>
|
| 715 | 715 |
<templateList>
|
| 716 |
- <template>ftl/about</template>
|
|
| 717 |
- <template>ftl/connexionTestResult</template>
|
|
| 718 |
- <template>ftl/dataSourceConnectionReport</template>
|
|
| 719 |
- <template>ftl/dataSourceInformation</template>
|
|
| 720 |
- <template>ftl/dataSourcePolicy</template>
|
|
| 721 |
- <template>ftl/dataSourceSelectModeResume</template>
|
|
| 722 |
- <template>ftl/initStorage</template>
|
|
| 723 |
- <template>ftl/storageModelDataSourceConfiguration</template>
|
|
| 716 |
+ <template>about</template>
|
|
| 717 |
+ <template>connexionTestResult</template>
|
|
| 718 |
+ <template>dataSourceConnectionReport</template>
|
|
| 719 |
+ <template>dataSourceInformation</template>
|
|
| 720 |
+ <template>dataSourcePolicy</template>
|
|
| 721 |
+ <template>dataSourceSelectModeResume</template>
|
|
| 722 |
+ <template>initStorage</template>
|
|
| 723 |
+ <template>storageModelDataSourceConfiguration</template>
|
|
| 724 | 724 |
</templateList>
|
| 725 | 725 |
</configuration>
|
| 726 | 726 |
</execution>
|
| ... | ... | @@ -89,4 +89,4 @@ public class AddFloatingObjectReferenceUIAction extends AbstractContentUIAction |
| 89 | 89 |
u.getModel().setReference(reference);
|
| 90 | 90 |
|
| 91 | 91 |
}
|
| 92 |
-}
|
|
| \ No newline at end of file | ||
| 92 |
+}
|
| ... | ... | @@ -79,4 +79,4 @@ public class EditFloatingObjectReferenceUIAction extends AbstractContentUIAction |
| 79 | 79 |
floatingObjectReferencesManager.update(reference);
|
| 80 | 80 |
u.getModel().setReference(reference);
|
| 81 | 81 |
}
|
| 82 |
-}
|
|
| \ No newline at end of file | ||
| 82 |
+}
|
| ... | ... | @@ -73,4 +73,4 @@ public class RemoveFloatingObjectReferenceUIAction extends AbstractContentUIActi |
| 73 | 73 |
}
|
| 74 | 74 |
});
|
| 75 | 75 |
}
|
| 76 |
-}
|
|
| \ No newline at end of file | ||
| 76 |
+}
|
| 1 | 1 |
package fr.ird.observe.application.swing.ui.actions.menu.config;
|
| 2 | 2 |
|
| 3 |
+/*-
|
|
| 4 |
+ * #%L
|
|
| 5 |
+ * ObServe :: Application Swing
|
|
| 6 |
+ * %%
|
|
| 7 |
+ * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io
|
|
| 8 |
+ * %%
|
|
| 9 |
+ * This program is free software: you can redistribute it and/or modify
|
|
| 10 |
+ * it under the terms of the GNU General Public License as
|
|
| 11 |
+ * published by the Free Software Foundation, either version 3 of the
|
|
| 12 |
+ * License, or (at your option) any later version.
|
|
| 13 |
+ *
|
|
| 14 |
+ * This program is distributed in the hope that it will be useful,
|
|
| 15 |
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
| 16 |
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
| 17 |
+ * GNU General Public License for more details.
|
|
| 18 |
+ *
|
|
| 19 |
+ * You should have received a copy of the GNU General Public
|
|
| 20 |
+ * License along with this program. If not, see
|
|
| 21 |
+ * <http://www.gnu.org/licenses/gpl-3.0.html>.
|
|
| 22 |
+ * #L%
|
|
| 23 |
+ */
|
|
| 24 |
+ |
|
| 3 | 25 |
import fr.ird.observe.application.swing.ObserveSwingTechnicalException;
|
| 4 | 26 |
import fr.ird.observe.application.swing.ui.ObserveMainUI;
|
| 5 | 27 |
import fr.ird.observe.application.swing.ui.actions.AbstractUIAction;
|
| ... | ... | @@ -42,9 +64,8 @@ public class TranslateAction extends AbstractUIAction { |
| 42 | 64 |
Objects.requireNonNull(bundles);
|
| 43 | 65 |
try {
|
| 44 | 66 |
ProjectUI projectUI = new ProjectUI(getMainUI(), new Project(bundles));
|
| 45 |
- projectUI.getTemplatesFilter().doClick();
|
|
| 46 |
- projectUI.getTranslationsFilter().doClick();
|
|
| 47 |
- } catch (InterruptedException | IOException e) {
|
|
| 67 |
+ projectUI.toggleFilter();
|
|
| 68 |
+ } catch (IOException e) {
|
|
| 48 | 69 |
throw new ObserveSwingTechnicalException("can't open i18n editor", e);
|
| 49 | 70 |
}
|
| 50 | 71 |
}
|
| ... | ... | @@ -8,12 +8,10 @@ |
| 8 | 8 |
it under the terms of the GNU General Public License as
|
| 9 | 9 |
published by the Free Software Foundation, either version 3 of the
|
| 10 | 10 |
License, or (at your option) any later version.
|
| 11 |
- |
|
| 12 | 11 |
This program is distributed in the hope that it will be useful,
|
| 13 | 12 |
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
| 14 | 13 |
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
| 15 | 14 |
GNU General Public License for more details.
|
| 16 |
- |
|
| 17 | 15 |
You should have received a copy of the GNU General Public
|
| 18 | 16 |
License along with this program. If not, see
|
| 19 | 17 |
<http://www.gnu.org/licenses/gpl-3.0.html>.
|
| ... | ... | @@ -80,7 +80,7 @@ |
| 80 | 80 |
</dependency>
|
| 81 | 81 |
<dependency>
|
| 82 | 82 |
<groupId>io.ultreia.java4all.i18n</groupId>
|
| 83 |
- <artifactId>nuiton-i18n</artifactId>
|
|
| 83 |
+ <artifactId>i18n-api</artifactId>
|
|
| 84 | 84 |
</dependency>
|
| 85 | 85 |
<dependency>
|
| 86 | 86 |
<groupId>org.nuiton</groupId>
|
| ... | ... | @@ -176,7 +176,7 @@ |
| 176 | 176 |
<licensePluginVersion>1.9</licensePluginVersion>
|
| 177 | 177 |
|
| 178 | 178 |
<jaxxVersion>3.0-alpha-6</jaxxVersion>
|
| 179 |
- <nuitonI18nVersion>3.7-SNAPSHOT</nuitonI18nVersion>
|
|
| 179 |
+ <nuitonI18nVersion>4.0-alpha-1-SNAPSHOT</nuitonI18nVersion>
|
|
| 180 | 180 |
<nuitonConfigVersion>3.2</nuitonConfigVersion>
|
| 181 | 181 |
<topiaVersion>3.2.1</topiaVersion>
|
| 182 | 182 |
<nuitonValidatorVersion>3.1</nuitonValidatorVersion>
|
| ... | ... | @@ -310,6 +310,10 @@ |
| 310 | 310 |
<groupId>org.apache.commons</groupId>
|
| 311 | 311 |
<artifactId>commons-vfs2</artifactId>
|
| 312 | 312 |
</exclusion>
|
| 313 |
+ <exclusion>
|
|
| 314 |
+ <groupId>org.nuiton.i18n</groupId>
|
|
| 315 |
+ <artifactId>nuiton-i18n</artifactId>
|
|
| 316 |
+ </exclusion>
|
|
| 313 | 317 |
</exclusions>
|
| 314 | 318 |
</dependency>
|
| 315 | 319 |
<dependency>
|
| ... | ... | @@ -349,6 +353,10 @@ |
| 349 | 353 |
<scope>compile</scope>
|
| 350 | 354 |
<exclusions>
|
| 351 | 355 |
<exclusion>
|
| 356 |
+ <groupId>org.nuiton.i18n</groupId>
|
|
| 357 |
+ <artifactId>nuiton-i18n</artifactId>
|
|
| 358 |
+ </exclusion>
|
|
| 359 |
+ <exclusion>
|
|
| 352 | 360 |
<groupId>javassist</groupId>
|
| 353 | 361 |
<artifactId>javassist</artifactId>
|
| 354 | 362 |
</exclusion>
|
| ... | ... | @@ -373,7 +381,7 @@ |
| 373 | 381 |
</dependency>
|
| 374 | 382 |
<dependency>
|
| 375 | 383 |
<groupId>io.ultreia.java4all.i18n</groupId>
|
| 376 |
- <artifactId>nuiton-i18n</artifactId>
|
|
| 384 |
+ <artifactId>i18n-api</artifactId>
|
|
| 377 | 385 |
<version>${nuitonI18nVersion}</version>
|
| 378 | 386 |
<scope>compile</scope>
|
| 379 | 387 |
</dependency>
|
| ... | ... | @@ -390,6 +398,12 @@ |
| 390 | 398 |
<artifactId>jaxx-runtime</artifactId>
|
| 391 | 399 |
<version>${jaxxVersion}</version>
|
| 392 | 400 |
<scope>compile</scope>
|
| 401 |
+ <exclusions>
|
|
| 402 |
+ <exclusion>
|
|
| 403 |
+ <groupId>org.nuiton.i18n</groupId>
|
|
| 404 |
+ <artifactId>nuiton-i18n</artifactId>
|
|
| 405 |
+ </exclusion>
|
|
| 406 |
+ </exclusions>
|
|
| 393 | 407 |
</dependency>
|
| 394 | 408 |
<dependency>
|
| 395 | 409 |
<groupId>org.nuiton.jaxx</groupId>
|
| ... | ... | @@ -408,71 +422,143 @@ |
| 408 | 422 |
<artifactId>jaxx-runtime-swing-wizard</artifactId>
|
| 409 | 423 |
<version>${jaxxVersion}</version>
|
| 410 | 424 |
<scope>compile</scope>
|
| 425 |
+ <exclusions>
|
|
| 426 |
+ <exclusion>
|
|
| 427 |
+ <groupId>org.nuiton.i18n</groupId>
|
|
| 428 |
+ <artifactId>nuiton-i18n</artifactId>
|
|
| 429 |
+ </exclusion>
|
|
| 430 |
+ </exclusions>
|
|
| 411 | 431 |
</dependency>
|
| 412 | 432 |
<dependency>
|
| 413 | 433 |
<groupId>org.nuiton.jaxx</groupId>
|
| 414 | 434 |
<artifactId>jaxx-validator</artifactId>
|
| 415 | 435 |
<version>${jaxxVersion}</version>
|
| 416 | 436 |
<scope>compile</scope>
|
| 437 |
+ <exclusions>
|
|
| 438 |
+ <exclusion>
|
|
| 439 |
+ <groupId>org.nuiton.i18n</groupId>
|
|
| 440 |
+ <artifactId>nuiton-i18n</artifactId>
|
|
| 441 |
+ </exclusion>
|
|
| 442 |
+ </exclusions>
|
|
| 417 | 443 |
</dependency>
|
| 418 | 444 |
<dependency>
|
| 419 | 445 |
<groupId>org.nuiton.jaxx</groupId>
|
| 420 | 446 |
<artifactId>jaxx-widgets-error</artifactId>
|
| 421 | 447 |
<version>${jaxxVersion}</version>
|
| 422 | 448 |
<scope>compile</scope>
|
| 449 |
+ <exclusions>
|
|
| 450 |
+ <exclusion>
|
|
| 451 |
+ <groupId>org.nuiton.i18n</groupId>
|
|
| 452 |
+ <artifactId>nuiton-i18n</artifactId>
|
|
| 453 |
+ </exclusion>
|
|
| 454 |
+ </exclusions>
|
|
| 423 | 455 |
</dependency>
|
| 424 | 456 |
<dependency>
|
| 425 | 457 |
<groupId>org.nuiton.jaxx</groupId>
|
| 426 | 458 |
<artifactId>jaxx-widgets-hidor</artifactId>
|
| 427 | 459 |
<version>${jaxxVersion}</version>
|
| 428 | 460 |
<scope>compile</scope>
|
| 461 |
+ <exclusions>
|
|
| 462 |
+ <exclusion>
|
|
| 463 |
+ <groupId>org.nuiton.i18n</groupId>
|
|
| 464 |
+ <artifactId>nuiton-i18n</artifactId>
|
|
| 465 |
+ </exclusion>
|
|
| 466 |
+ </exclusions>
|
|
| 429 | 467 |
</dependency>
|
| 430 | 468 |
<dependency>
|
| 431 | 469 |
<groupId>org.nuiton.jaxx</groupId>
|
| 432 | 470 |
<artifactId>jaxx-widgets-gis</artifactId>
|
| 433 | 471 |
<version>${jaxxVersion}</version>
|
| 434 | 472 |
<scope>compile</scope>
|
| 473 |
+ <exclusions>
|
|
| 474 |
+ <exclusion>
|
|
| 475 |
+ <groupId>org.nuiton.i18n</groupId>
|
|
| 476 |
+ <artifactId>nuiton-i18n</artifactId>
|
|
| 477 |
+ </exclusion>
|
|
| 478 |
+ </exclusions>
|
|
| 435 | 479 |
</dependency>
|
| 436 | 480 |
<dependency>
|
| 437 | 481 |
<groupId>org.nuiton.jaxx</groupId>
|
| 438 | 482 |
<artifactId>jaxx-widgets-datetime</artifactId>
|
| 439 | 483 |
<version>${jaxxVersion}</version>
|
| 440 | 484 |
<scope>compile</scope>
|
| 485 |
+ <exclusions>
|
|
| 486 |
+ <exclusion>
|
|
| 487 |
+ <groupId>org.nuiton.i18n</groupId>
|
|
| 488 |
+ <artifactId>nuiton-i18n</artifactId>
|
|
| 489 |
+ </exclusion>
|
|
| 490 |
+ </exclusions>
|
|
| 441 | 491 |
</dependency>
|
| 442 | 492 |
<dependency>
|
| 443 | 493 |
<groupId>org.nuiton.jaxx</groupId>
|
| 444 | 494 |
<artifactId>jaxx-widgets-select</artifactId>
|
| 445 | 495 |
<version>${jaxxVersion}</version>
|
| 446 | 496 |
<scope>compile</scope>
|
| 497 |
+ <exclusions>
|
|
| 498 |
+ <exclusion>
|
|
| 499 |
+ <groupId>org.nuiton.i18n</groupId>
|
|
| 500 |
+ <artifactId>nuiton-i18n</artifactId>
|
|
| 501 |
+ </exclusion>
|
|
| 502 |
+ </exclusions>
|
|
| 447 | 503 |
</dependency>
|
| 448 | 504 |
<dependency>
|
| 449 | 505 |
<groupId>org.nuiton.jaxx</groupId>
|
| 450 | 506 |
<artifactId>jaxx-widgets-about</artifactId>
|
| 451 | 507 |
<version>${jaxxVersion}</version>
|
| 452 | 508 |
<scope>compile</scope>
|
| 509 |
+ <exclusions>
|
|
| 510 |
+ <exclusion>
|
|
| 511 |
+ <groupId>org.nuiton.i18n</groupId>
|
|
| 512 |
+ <artifactId>nuiton-i18n</artifactId>
|
|
| 513 |
+ </exclusion>
|
|
| 514 |
+ </exclusions>
|
|
| 453 | 515 |
</dependency>
|
| 454 | 516 |
<dependency>
|
| 455 | 517 |
<groupId>org.nuiton.jaxx</groupId>
|
| 456 | 518 |
<artifactId>jaxx-widgets-number</artifactId>
|
| 457 | 519 |
<version>${jaxxVersion}</version>
|
| 458 | 520 |
<scope>compile</scope>
|
| 521 |
+ <exclusions>
|
|
| 522 |
+ <exclusion>
|
|
| 523 |
+ <groupId>org.nuiton.i18n</groupId>
|
|
| 524 |
+ <artifactId>nuiton-i18n</artifactId>
|
|
| 525 |
+ </exclusion>
|
|
| 526 |
+ </exclusions>
|
|
| 459 | 527 |
</dependency>
|
| 460 | 528 |
<dependency>
|
| 461 | 529 |
<groupId>org.nuiton.jaxx</groupId>
|
| 462 | 530 |
<artifactId>jaxx-widgets-file</artifactId>
|
| 463 | 531 |
<version>${jaxxVersion}</version>
|
| 464 | 532 |
<scope>compile</scope>
|
| 533 |
+ <exclusions>
|
|
| 534 |
+ <exclusion>
|
|
| 535 |
+ <groupId>org.nuiton.i18n</groupId>
|
|
| 536 |
+ <artifactId>nuiton-i18n</artifactId>
|
|
| 537 |
+ </exclusion>
|
|
| 538 |
+ </exclusions>
|
|
| 465 | 539 |
</dependency>
|
| 466 | 540 |
<dependency>
|
| 467 | 541 |
<groupId>org.nuiton.jaxx</groupId>
|
| 468 | 542 |
<artifactId>jaxx-widgets-status</artifactId>
|
| 469 | 543 |
<version>${jaxxVersion}</version>
|
| 544 |
+ <exclusions>
|
|
| 545 |
+ <exclusion>
|
|
| 546 |
+ <groupId>org.nuiton.i18n</groupId>
|
|
| 547 |
+ <artifactId>nuiton-i18n</artifactId>
|
|
| 548 |
+ </exclusion>
|
|
| 549 |
+ </exclusions>
|
|
| 470 | 550 |
</dependency>
|
| 471 | 551 |
<dependency>
|
| 472 | 552 |
<groupId>org.nuiton.jaxx</groupId>
|
| 473 | 553 |
<artifactId>jaxx-widgets-config</artifactId>
|
| 474 | 554 |
<version>${jaxxVersion}</version>
|
| 475 | 555 |
<scope>compile</scope>
|
| 556 |
+ <exclusions>
|
|
| 557 |
+ <exclusion>
|
|
| 558 |
+ <groupId>org.nuiton.i18n</groupId>
|
|
| 559 |
+ <artifactId>nuiton-i18n</artifactId>
|
|
| 560 |
+ </exclusion>
|
|
| 561 |
+ </exclusions>
|
|
| 476 | 562 |
</dependency>
|
| 477 | 563 |
|
| 478 | 564 |
<!--swingX -->
|
| ... | ... | @@ -106,7 +106,7 @@ |
| 106 | 106 |
</dependency>
|
| 107 | 107 |
<dependency>
|
| 108 | 108 |
<groupId>io.ultreia.java4all.i18n</groupId>
|
| 109 |
- <artifactId>nuiton-i18n</artifactId>
|
|
| 109 |
+ <artifactId>i18n-api</artifactId>
|
|
| 110 | 110 |
</dependency>
|
| 111 | 111 |
<dependency>
|
| 112 | 112 |
<groupId>org.nuiton</groupId>
|
| ... | ... | @@ -79,7 +79,7 @@ |
| 79 | 79 |
</dependency>
|
| 80 | 80 |
<dependency>
|
| 81 | 81 |
<groupId>io.ultreia.java4all.i18n</groupId>
|
| 82 |
- <artifactId>nuiton-i18n</artifactId>
|
|
| 82 |
+ <artifactId>i18n-api</artifactId>
|
|
| 83 | 83 |
</dependency>
|
| 84 | 84 |
<dependency>
|
| 85 | 85 |
<groupId>org.nuiton.topia</groupId>
|
| ... | ... | @@ -152,6 +152,11 @@ |
| 152 | 152 |
<artifactId>persistence</artifactId>
|
| 153 | 153 |
<version>${project.version}</version>
|
| 154 | 154 |
</dependency>
|
| 155 |
+ <dependency>
|
|
| 156 |
+ <groupId>io.ultreia.java4all.i18n</groupId>
|
|
| 157 |
+ <artifactId>i18n-api</artifactId>
|
|
| 158 |
+ <version>${nuitonI18nVersion}</version>
|
|
| 159 |
+ </dependency>
|
|
| 155 | 160 |
</dependencies>
|
| 156 | 161 |
</plugin>
|
| 157 | 162 |
|
| ... | ... | @@ -59,7 +59,7 @@ |
| 59 | 59 |
</dependency>
|
| 60 | 60 |
<dependency>
|
| 61 | 61 |
<groupId>io.ultreia.java4all.i18n</groupId>
|
| 62 |
- <artifactId>nuiton-i18n</artifactId>
|
|
| 62 |
+ <artifactId>i18n-api</artifactId>
|
|
| 63 | 63 |
</dependency>
|
| 64 | 64 |
|
| 65 | 65 |
<!-- commons dependencies -->
|