Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

7 changed files:

Changes:

  • application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/constants/DbMode.java
    ... ... @@ -32,8 +32,8 @@ public enum DbMode {
    32 32 
         USE_LOCAL,
    33 33 
         /** Pour creer une base locale */
    34 34 
         CREATE_LOCAL,
    35 
    -    /** Pour utiliser une base distante */
    36 
    -    USE_REMOTE,
    37 35 
         /** Pour utiliser une base via un serveur web distant */
    38 
    -    USE_SERVER
    36 
    +    USE_SERVER,
    37 
    +    /** Pour utiliser une base distante */
    38 
    +    USE_REMOTE
    39 39 
     }

  • application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/ConfigModel.java
    ... ... @@ -441,7 +441,7 @@ public class ConfigModel extends AdminActionModel {
    441 441 
                 return;
    442 442 
             }
    443 443
    444 
    -        // par default, on tente d'utiliser la base distance
    444 
    +        // par default, on tente d'utiliser le serveur distance
    445 445 
             centralSourceModel.init(ui, null);
    446 446 
             centralSourceModel.setCanCreateLocalService(false);
    447 447 
             boolean canUseLocalSource = uiModel.getOperations().contains(AdminStep.DATA_SYNCHRONIZE)
    ... ... @@ -450,7 +450,7 @@ public class ConfigModel extends AdminActionModel {
    450 450 
             centralSourceModel.setCanUseLocalService(canUseLocalSource);
    451 451 
             centralSourceModel.setCanUseRemoteService(true);
    452 452 
             centralSourceModel.setCanUseServerService(true);
    453 
    -        centralSourceModel.start(USE_REMOTE);
    453 
    +        centralSourceModel.start(USE_SERVER);
    454 454
    455 455 
             if (log.isDebugEnabled()) {
    456 456 
                 centralSourceModel.removePropertyChangeListener(LOG_PROPERTY_CHANGE_LISTENER);

  • application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIHandler.java
    ... ... @@ -123,7 +123,7 @@ public class StorageUIHandler implements UIHandler<StorageUI> {
    123 123 
                         case USE_LOCAL:
    124 124 
                             focusOwner = ui.getCHOOSE_DB_MODE().getUseLocalMode();
    125 125 
                             if (!focusOwner.isEnabled()) {
    126 
    -                            focusOwner = ui.getCHOOSE_DB_MODE().getUseRemoteMode();
    126 
    +                            focusOwner = ui.getCHOOSE_DB_MODE().getUseServerMode();
    127 127 
                             }
    128 128 
                             break;
    129 129 
                         case CREATE_LOCAL:

  • application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java
    ... ... @@ -55,16 +55,6 @@ import fr.ird.observe.services.service.DatabaseNotFoundException;
    55 55 
     import fr.ird.observe.services.service.PingService;
    56 56 
     import fr.ird.observe.services.service.sql.AddSqlScriptProducerRequest;
    57 57 
     import fr.ird.observe.services.service.sql.SqlScriptProducerService;
    58 
    -import org.apache.commons.io.IOUtils;
    59 
    -import org.apache.commons.lang3.StringUtils;
    60 
    -import org.apache.commons.lang3.tuple.Pair;
    61 
    -import org.apache.commons.logging.Log;
    62 
    -import org.apache.commons.logging.LogFactory;
    63 
    -import org.nuiton.jaxx.runtime.JAXXContext;
    64 
    -import org.nuiton.jaxx.runtime.swing.wizard.WizardModel;
    65 
    -import org.nuiton.jaxx.runtime.swing.wizard.WizardUILancher;
    66 
    -import org.nuiton.version.Version;
    67 
    -
    68 58 
     import java.beans.PropertyChangeListener;
    69 59 
     import java.io.File;
    70 60 
     import java.io.FileInputStream;
    ... ... @@ -77,6 +67,16 @@ import java.util.ArrayList;
    77 67 
     import java.util.List;
    78 68 
     import java.util.Objects;
    79 69 
     import java.util.Set;
    70 
    +import org.apache.commons.io.IOUtils;
    71 
    +import org.apache.commons.lang3.StringUtils;
    72 
    +import org.apache.commons.lang3.tuple.Pair;
    73 
    +import org.apache.commons.logging.Log;
    74 
    +import org.apache.commons.logging.LogFactory;
    75 
    +import org.nuiton.jaxx.runtime.JAXXContext;
    76 
    +import org.nuiton.jaxx.runtime.swing.wizard.WizardModel;
    77 
    +import org.nuiton.jaxx.runtime.swing.wizard.WizardUILancher;
    78 
    +import org.nuiton.version.Version;
    79 
    +
    80 80
    81 81 
     import static fr.ird.observe.application.swing.ui.admin.AdminUIModel.LOG_PROPERTY_CHANGE_LISTENER;
    82 82 
     import static org.nuiton.i18n.I18n.t;
    ... ... @@ -161,7 +161,7 @@ public class StorageUIModel extends WizardModel<StorageStep> {
    161 161 
         /**
    162 162 
          * Un drapeau pour savoir si l'utilisateur a demandé une sauvegarde de la
    163 163 
          * base locale.
    164 
    -     *
    164 
    +     * <p>
    165 165 
          * Cette option n'est active uniquement si le drapeau localStorageExist est
    166 166 
          * à true.
    167 167 
          */
    ... ... @@ -571,10 +571,10 @@ public class StorageUIModel extends WizardModel<StorageStep> {
    571 571 
                     mode = null;
    572 572 
                 } else if (isCanCreateLocalService()) {
    573 573 
                     mode = CreationMode.IMPORT_EXTERNAL_DUMP;
    574 
    -            } else if (isCanUseRemoteService()) {
    575 
    -                mode = CreationMode.IMPORT_REMOTE_STORAGE;
    576 574 
                 } else if (isCanUseServerService()) {
    577 575 
                     mode = CreationMode.IMPORT_SERVER_STORAGE;
    576 
    +            } else if (isCanUseRemoteService()) {
    577 
    +                mode = CreationMode.IMPORT_REMOTE_STORAGE;
    578 578 
                 }
    579 579 
             }
    580 580

  • application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ChooseDbModeUI.jaxx
    ... ... @@ -68,8 +68,8 @@ protected String updateCreationModeContent(DbMode mode) {
    68 68 
         <JPanel layout='{new BorderLayout()}' constraints='BorderLayout.NORTH'>
    69 69 
           <JPanel id='dbModeContent' constraints='BorderLayout.NORTH'>
    70 70 
             <JRadioButton id="useLocalMode" styleClass='dbMode'/>
    71 
    -        <JRadioButton id="useRemoteMode" styleClass='dbMode'/>
    72 71 
             <JRadioButton id="useServerMode" styleClass='dbMode'/>
    72 
    +        <JRadioButton id="useRemoteMode" styleClass='dbMode'/>
    73 73 
             <JRadioButton id="createLocalMode" styleClass='dbMode'/>
    74 74 
           </JPanel>
    75 75
    ... ... @@ -79,8 +79,8 @@ protected String updateCreationModeContent(DbMode mode) {
    79 79 
               <JRadioButton id="importInternalDumpMode" styleClass='creationMode'/>
    80 80 
               <JRadioButton id="importExternalDumpMode" styleClass='creationMode'/>
    81 81 
               <JRadioButton id="importLocalStorageMode" styleClass='creationMode'/>
    82 
    -          <JRadioButton id="importRemoteStorageMode" styleClass='creationMode'/>
    83 82 
               <JRadioButton id="importServerStorageMode" styleClass='creationMode'/>
    83 
    +          <JRadioButton id="importRemoteStorageMode" styleClass='creationMode'/>
    84 84 
             </JPanel>
    85 85 
             <JLabel id='noCreateMode' constraints='"noCreateMode"'/>
    86 86

  • application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUI.jaxx
    ... ... @@ -71,45 +71,44 @@
    71 71 
             </row>
    72 72 
           </Table>
    73 73
    74 
    -      <!-- configurer creation base locale et import referentiel depuis base distante  -->
    75 
    -      <Table id='IMPORT_REMOTE_STORAGE' fill="both" constraints='"IMPORT_REMOTE_STORAGE"'>
    74 
    +      <!-- configurer creation base locale et import referentiel depuis un server distant  -->
    75 
    +      <Table id='IMPORT_SERVER_STORAGE' fill="both" constraints='"IMPORT_SERVER_STORAGE"'>
    76 76 
             <row>
    77 77 
               <cell>
    78 
    -            <JLabel text='observe.storage.importRemoteStorage.config'/>
    78 
    +            <JLabel text='observe.storage.importServerStorage.config'/>
    79 79 
               </cell>
    80 80 
             </row>
    81 81 
             <row>
    82 82 
               <cell weighty='1' weightx='1'>
    83 
    -            <JPanel id='IMPORT_REMOTE_STORAGE_content'/>
    83 
    +            <JPanel id='IMPORT_SERVER_STORAGE_content'/>
    84 84 
               </cell>
    85 85 
             </row>
    86 
    -
    87 86 
           </Table>
    88 87
    89 
    -      <!-- configurer creation base locale et import referentiel depuis un server distant  -->
    90 
    -      <Table id='IMPORT_SERVER_STORAGE' fill="both" constraints='"IMPORT_SERVER_STORAGE"'>
    88 
    +      <!-- configurer creation base locale et import referentiel depuis base distante  -->
    89 
    +      <Table id='IMPORT_REMOTE_STORAGE' fill="both" constraints='"IMPORT_REMOTE_STORAGE"'>
    91 90 
             <row>
    92 91 
               <cell>
    93 
    -            <JLabel text='observe.storage.importServerStorage.config'/>
    92 
    +            <JLabel text='observe.storage.importRemoteStorage.config'/>
    94 93 
               </cell>
    95 94 
             </row>
    96 95 
             <row>
    97 96 
               <cell weighty='1' weightx='1'>
    98 
    -            <JPanel id='IMPORT_SERVER_STORAGE_content'/>
    97 
    +            <JPanel id='IMPORT_REMOTE_STORAGE_content'/>
    99 98 
               </cell>
    100 99 
             </row>
    101 100
    102 101 
           </Table>
    103 102
    104 
    -      <!-- configurer connexion a base distante  -->
    105 
    -      <Table id='USE_REMOTE' constraints='"USE_REMOTE"' fill='both'>
    103 
    +      <!-- configurer connexion au server base distante  -->
    104 
    +      <Table id='USE_SERVER' constraints='"USE_SERVER"' fill='both'>
    106 105 
             <row>
    107 106 
               <cell>
    108 107 
                 <JPanel layout="{new BorderLayout()}">
    109 
    -              <JLabel constraints='BorderLayout.WEST' text='observe.storage.useRemoteStorage.config'/>
    110 
    -              <JMenuBar id='remoteMenuBar' constraints='BorderLayout.EAST'>
    111 
    -                <JMenu id='remoteMenu'>
    112 
    -                  <JMenuItem id="saveRemoteConfiguration"/>
    108 
    +              <JLabel constraints='BorderLayout.WEST' text='observe.storage.useServerStorage.config'/>
    109 
    +              <JMenuBar id='serverMenuBar' constraints='BorderLayout.EAST'>
    110 
    +                <JMenu id='serverMenu'>
    111 
    +                  <JMenuItem id="saveServerConfiguration"/>
    113 112 
                       <JSeparator/>
    114 113 
                     </JMenu>
    115 114 
                   </JMenuBar>
    ... ... @@ -118,20 +117,20 @@
    118 117 
             </row>
    119 118 
             <row>
    120 119 
               <cell weighty='1' weightx='1'>
    121 
    -            <JPanel id='USE_REMOTE_content' minimumSize='{new Dimension(20,300)}'/>
    120 
    +            <JPanel id='USE_SERVER_content' minimumSize='{new Dimension(20,300)}'/>
    122 121 
               </cell>
    123 122 
             </row>
    124 123 
           </Table>
    125 124
    126 
    -      <!-- configurer connexion au server base distante  -->
    127 
    -      <Table id='USE_SERVER' constraints='"USE_SERVER"' fill='both'>
    125 
    +      <!-- configurer connexion a base distante  -->
    126 
    +      <Table id='USE_REMOTE' constraints='"USE_REMOTE"' fill='both'>
    128 127 
             <row>
    129 128 
               <cell>
    130 129 
                 <JPanel layout="{new BorderLayout()}">
    131 
    -              <JLabel constraints='BorderLayout.WEST' text='observe.storage.useServerStorage.config'/>
    132 
    -              <JMenuBar id='serverMenuBar' constraints='BorderLayout.EAST'>
    133 
    -                <JMenu id='serverMenu'>
    134 
    -                  <JMenuItem id="saveServerConfiguration"/>
    130 
    +              <JLabel constraints='BorderLayout.WEST' text='observe.storage.useRemoteStorage.config'/>
    131 
    +              <JMenuBar id='remoteMenuBar' constraints='BorderLayout.EAST'>
    132 
    +                <JMenu id='remoteMenu'>
    133 
    +                  <JMenuItem id="saveRemoteConfiguration"/>
    135 134 
                       <JSeparator/>
    136 135 
                     </JMenu>
    137 136 
                   </JMenuBar>
    ... ... @@ -140,7 +139,7 @@
    140 139 
             </row>
    141 140 
             <row>
    142 141 
               <cell weighty='1' weightx='1'>
    143 
    -            <JPanel id='USE_SERVER_content' minimumSize='{new Dimension(20,300)}'/>
    142 
    +            <JPanel id='USE_REMOTE_content' minimumSize='{new Dimension(20,300)}'/>
    144 143 
               </cell>
    145 144 
             </row>
    146 145 
           </Table>

  • pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26 
       <parent>
    27 27 
         <groupId>io.ultreia.maven</groupId>
    28 28 
         <artifactId>pom</artifactId>
    29 
    -    <version>9</version>
    29 
    +    <version>10</version>
    30 30 
       </parent>
    31 31
    32 32 
       <groupId>fr.ird.observe</groupId>
    ... ... @@ -169,11 +169,11 @@
    169 169 
         <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format>
    170 170 
         <buildDate>${maven.build.timestamp}</buildDate>
    171 171
    172 
    -    <mavenVersion>3.3.9</mavenVersion>
    172 
    +    <mavenVersion>3.5.0</mavenVersion>
    173 173
    174 
    -    <gitlabPluginVersion>1.0.7</gitlabPluginVersion>
    175 174 
         <eugenePluginVersion>3.0-alpha-10</eugenePluginVersion>
    176 175 
         <processorPluginVersion>1.3</processorPluginVersion>
    176 
    +    <!-- il faudra attendre la version 1.13 qui corrige des pb -->
    177 177 
         <licensePluginVersion>1.9</licensePluginVersion>
    178 178
    179 179 
         <jaxxVersion>3.0-alpha-6</jaxxVersion>
    ... ... @@ -184,12 +184,13 @@
    184 184 
         <nuitonUtilsVersion>3.0-rc-18</nuitonUtilsVersion>
    185 185 
         <nuitonConverterVersion>1.0</nuitonConverterVersion>
    186 186 
         <nuitonVersionVersion>1.0-rc-2</nuitonVersionVersion>
    187 
    -    <xworkVersion>2.3.31</xworkVersion>
    188 
    -    <hibernateVersion>5.1.3.Final</hibernateVersion>
    189 
    -    <sl4jVersion>1.7.23</sl4jVersion>
    187 
    +    <xworkVersion>2.3.32</xworkVersion>
    188 
    +    <flexmarkVersion>0.18.9</flexmarkVersion>
    189 
    +    <hibernateVersion>5.1.5.Final</hibernateVersion>
    190 
    +    <sl4jVersion>1.7.25</sl4jVersion>
    190 191 
         <swingXVersion>1.6.5-1</swingXVersion>
    191 
    -    <reflectionsVersion>0.9.10</reflectionsVersion>
    192 
    -    <webmotionVersion>2.5.1</webmotionVersion>
    192 
    +    <reflectionsVersion>0.9.11</reflectionsVersion>
    193 
    +    <webmotionVersion>2.5.3</webmotionVersion>
    193 194 
         <httpComponentsVersion>4.5.3</httpComponentsVersion>
    194 195
    195 196 
         <!-- license header configuration -->
    ... ... @@ -571,7 +572,7 @@
    571 572 
           <dependency>
    572 573 
             <groupId>com.zaxxer</groupId>
    573 574 
             <artifactId>HikariCP</artifactId>
    574 
    -        <version>2.6.0</version>
    575 
    +        <version>2.6.1</version>
    575 576 
           </dependency>
    576 577
    577 578 
           <dependency>
    ... ... @@ -623,7 +624,7 @@
    623 624 
           <dependency>
    624 625 
             <groupId>javax.servlet</groupId>
    625 626 
             <artifactId>javax.servlet-api</artifactId>
    626 
    -        <version>4.0.0-b02</version>
    627 
    +        <version>4.0.0-b05</version>
    627 628 
             <scope>provided</scope>
    628 629 
           </dependency>
    629 630
    ... ... @@ -736,12 +737,12 @@
    736 737 
           <dependency>
    737 738 
             <groupId>com.vladsch.flexmark</groupId>
    738 739 
             <artifactId>flexmark</artifactId>
    739 
    -        <version>0.15.4</version>
    740 
    +        <version>${flexmarkVersion}</version>
    740 741 
           </dependency>
    741 742 
           <dependency>
    742 743 
             <groupId>com.vladsch.flexmark</groupId>
    743 744 
             <artifactId>flexmark-util</artifactId>
    744 
    -        <version>0.15.4</version>
    745 
    +        <version>${flexmarkVersion}</version>
    745 746 
           </dependency>
    746 747
    747 748 
           <dependency>

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.