Skip to content

Commit eb3fbf5

Browse files
SilverYoChaSilverYoCha
committed
Bug #9681 :
- on portlet, browse bar is no more clickable - displaying 'null' when the data is really null - ignoring case and accent on text comparison into a table when using AbstractComplexComparator - fixing a wrong initialization of a ContributionIdentifier introduces on Sonar feedback action (:beer) - fixing portlet links - adjusting a lot of stuffs and errors about UI management
1 parent 0b031d7 commit eb3fbf5

File tree

24 files changed

+499
-313
lines changed

24 files changed

+499
-313
lines changed

‎gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/MediaLogicalComparator.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ public class MediaLogicalComparator extends AbstractComplexComparator<Media> {
4545
* @param logicalOrderBy
4646
*/
4747
private MediaLogicalComparator(final List<QUERY_ORDER_BY> logicalOrderBy) {
48+
super();
4849
this.logicalOrderBy = logicalOrderBy;
4950
}
5051

‎jdbcConnector/jdbcConnector-configuration/src/main/config/properties/org/silverpeas/jdbcConnector/multilang/jdbcConnector.properties

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -24,34 +24,33 @@
2424
erreurParametresConnectionIncorrects = param\u00e8tres de connexion incorrects
2525
erreurChampsTropLong = champ trop long
2626
erreurChampsNonEntier = champ entier requis
27-
erreurRequeteVide = la requ\u00E8te ne peut \u00EAtre vide
27+
erreurRequeteVide = la requ\u00e8te ne peut \u00eatre vide
2828
erreurJDBCUrlIncorrecte = La chaine de connexion est incorrecte
2929
erreurModifTable = Impossible de modifier la table
30-
erreurParam = Les param\u00E8tres de connexions \u00E0 la base ne sont pas corrects
30+
erreurParam = Les param\u00e8tres de connexions \u00e0 la base ne sont pas corrects
3131

3232
titreExecution = Consultation
33-
titreParametrageRequete = Saisie de la requ\u00E8te
34-
titreParametrageConnection = Param\u00E8trage de la connexion
35-
titrePopup = Requ\u00E8te simplifi\u00E9e
33+
titreParametrageRequete = Saisie de la requ\u00e8te
34+
titreParametrageConnection = Param\u00e8trage de la connexion
35+
titrePopup = Requ\u00e8te simplifi\u00e9e
3636

37-
popupSelection1 = S\u00E9lectionnez une table
38-
popupSelection2 = S\u00E9lectionnez une(des) colonne(s)
39-
popupSelection3 = Ajouter un crit\u00E8re
37+
popupSelection1 = S\u00e9lectionnez une table
38+
popupSelection2 = S\u00e9lectionnez une(des) colonne(s)
39+
popupSelection3 = Ajouter un crit\u00e8re
4040
popupChamp1 = Table
4141
popupChamp2 = Colonnes
4242
popupAvailableColumns = Colonnes
43-
popupSelected = S\u00E9lectionn\u00E9es
43+
popupSelected = S\u00e9lectionn\u00e9es
4444

4545

4646
tabbedPaneConsultation = Consultation
47-
tabbedPaneRequete = Requ\u00E8te
48-
tabbedPaneParametresJDBC = Param\u00E8tres JDBC
47+
tabbedPaneRequete=Requ\u00eate
48+
tabbedPaneParametresJDBC = Param\u00e8tres JDBC
4949

50-
operationPaneRequete = Saisir une requ\u00E8te simplifi\u00E9e
51-
operationPaneRequete_Delete = Supprimer la requ\u00E8te
52-
53-
54-
champRequete = Requ\u00E8te
50+
operationPaneRequete = Saisir une requ\u00e8te simplifi\u00e9e
51+
operationPaneRequete_Delete = Supprimer la requ\u00e8te
52+
champRequete=Requ\u00eate
53+
champRequeteEnErreur=Requ\u00eate en erreur
5554
champUrlJDBC = URL
5655
champNomDriver = Driver JDBC
5756
champIdentifiant = Identifiant
@@ -68,27 +67,29 @@ boutonFermer = Fermer
6867
boutonOk = Ok
6968

7069
windowTitleMain = Connecteur JDBC
71-
windowTitleParametrageRequete = Connecteur JDBC - param\u00E8trage de la requ\u00E8te
70+
windowTitleParametrageRequete = Connecteur JDBC - param\u00e8trage de la requ\u00e8te
7271
windowTitleParametrageConnection = ___/ Silverpeas&#153; - Collaborative Portal Organizer \_________________________________________
7372
windowTitleError = Erreur
7473

7574
champValeur = valeur
7675
comboTous = Tous
7776

7877
arrayPaneColonne = Colonne
79-
arrayPaneCritere = Crit\u00E8re
78+
arrayPaneCritere = Crit\u00e8re
8079
arrayPaneValeur = Valeur
8180
arrayPaneSuppression = Suppression
8281

8382
contient = Contient
84-
dataSourceField=Source de donn\u00E9es
85-
parametresConnectionIncorrects=mauvais param\u00E8tres de connexions
86-
erreurRequeteIncorrect=La requ\u00E8te SQL est incorrecte
87-
critereSupprimes=Les crit\u00E8res ont \u00E9t\u00E9 enlev\u00E9s
88-
sqlRequestExecutionFailure=L'ex\u00E9cution de la requ\u00E8te SQL a \u00E9chou\u00E9
89-
reloadRequest=Rafra\u00EEchir
90-
selectSome=S\u00E9lectionner des colonnes
91-
unselectSome=D\u00E9selectionner des colonnes
92-
selectAll=S\u00E9lectionner toutes les colonnes
93-
unselectAll=D\u00E9selectionner toutes les colonnes
94-
addCriterion=Ajouter le crit\u00E8re
83+
dataSourceField=Source de donn\u00e9es
84+
parametresConnectionIncorrects=mauvais param\u00e8tres de connexions
85+
erreurRequeteIncorrect=La requ\u00e8te SQL est incorrecte
86+
critereSupprimes=Les crit\u00e8res ont \u00e9t\u00e9 enlev\u00e9s
87+
sqlRequestExecutionFailure=L'ex\u00e9cution de la requ\u00e8te SQL a \u00e9chou\u00e9
88+
reloadRequest=Rafra\u00eechir
89+
selectSome=S\u00e9lectionner des colonnes
90+
unselectSome=D\u00e9selectionner des colonnes
91+
selectAll=S\u00e9lectionner toutes les colonnes
92+
unselectAll=D\u00e9selectionner toutes les colonnes
93+
addCriterion=Ajouter le crit\u00e8re
94+
95+
filter.value.info= Taper <b>@null@</b> pour chercher les valeurs nulles.<br/>Taper <b>@empty@</b> pour chercher les valeurs vides.

‎jdbcConnector/jdbcConnector-configuration/src/main/config/properties/org/silverpeas/jdbcConnector/multilang/jdbcConnector_de.properties

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ operationPaneRequete_Delete = Die SQL Abfrage l\u00f6schen
5353

5454

5555
champRequete = SQL Abfrage
56+
champRequeteEnErreur=SQL Abfrage fehlerhaft
5657
champUrlJDBC = URL
5758
champNomDriver = JDBC-Treiber
5859
champIdentifiant = Identifikator
@@ -86,10 +87,12 @@ dataSourceField=Datenquelle
8687
parametresConnectionIncorrects=schlechte Verbindungseinstellungen
8788
erreurRequeteIncorrect=die SQL-Abfrage ist falsch
8889
critereSupprimes=Die Kriterien wurden entfernt
89-
sqlRequestExecutionFailure=Die Ausf\u00FChrung der SQL-Anfrage ist fehlgeschlagen
90+
sqlRequestExecutionFailure=Die Ausf\u00fchrung der SQL-Anfrage ist fehlgeschlagen
9091
reloadRequest=Aufladen
91-
selectSome=W\u00E4hle einige Spalten aus
92+
selectSome=W\u00e4hle einige Spalten aus
9293
unselectSome=Heben Sie die Auswahl einige Spalten auf
93-
selectAll=W\u00E4hlen Sie alle Spalten aus
94+
selectAll=W\u00e4hlen Sie alle Spalten aus
9495
unselectAll=Heben Sie die Auswahl aller Spalten auf
95-
addCriterion=F\u00FCge das Kriterium hinzu
96+
addCriterion=F\u00fcge das Kriterium hinzu
97+
98+
filter.value.info=Fill <b>@null@</b> to search for null values.<br/>Fill <b>@empty@</b> to search for empty values.

‎jdbcConnector/jdbcConnector-configuration/src/main/config/properties/org/silverpeas/jdbcConnector/multilang/jdbcConnector_en.properties

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ operationPaneRequete_Delete = Delete
5252

5353

5454
champRequete = Inquiry
55+
champRequeteEnErreur=Inquiry in error
5556
champUrlJDBC = URL
5657
champNomDriver = JDBC Driver
5758
champIdentifiant = Login
@@ -92,4 +93,6 @@ selectSome=Select some colomns
9293
unselectSome=Unselect some columns
9394
selectAll=Select all the columns
9495
unselectAll=Unselect all the columns
95-
addCriterion=Add the criterion
96+
addCriterion=Add the criterion
97+
98+
filter.value.info=Fill <b>@null@</b> to search for null values.<br/>Fill <b>@empty@</b> to search for empty values.

‎jdbcConnector/jdbcConnector-configuration/src/main/config/properties/org/silverpeas/jdbcConnector/multilang/jdbcConnector_fr.properties

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -21,37 +21,36 @@
2121
# You should have received a copy of the GNU Affero General Public License
2222
# along with this program. If not, see <http://www.gnu.org/licenses/>.
2323
#
24-
erreurParametresConnectionIncorrects = param\u00E8tres de connexion incorrects
24+
erreurParametresConnectionIncorrects = param\u00e8tres de connexion incorrects
2525
erreurChampsTropLong = champ trop long
2626
erreurChampsNonEntier = champ entier requis
27-
erreurRequeteVide = la requ\u00E8te ne peut \u00EAtre vide
27+
erreurRequeteVide = la requ\u00e8te ne peut \u00eatre vide
2828
erreurJDBCUrlIncorrecte = La chaine de connexion est incorrecte
2929
erreurModifTable = Impossible de modifier la table
30-
erreurParam = Les param\u00E8tres de connexions \u00E0 la base ne sont pas corrects
30+
erreurParam = Les param\u00e8tres de connexions \u00e0 la base ne sont pas corrects
3131

3232
titreExecution = Consultation
33-
titreParametrageRequete = Saisie de la requ\u00E8te
34-
titreParametrageConnection = Param\u00E8trage de la connexion
35-
titrePopup = Requ\u00E8te simplifi\u00E9e
33+
titreParametrageRequete = Saisie de la requ\u00e8te
34+
titreParametrageConnection = Param\u00e8trage de la connexion
35+
titrePopup = Requ\u00e8te simplifi\u00e9e
3636

37-
popupSelection1 = S\u00E9lectionnez une table
38-
popupSelection2 = S\u00E9lectionnez une(des) colonne(s)
39-
popupSelection3 = Ajouter un crit\u00E8re
37+
popupSelection1 = S\u00e9lectionnez une table
38+
popupSelection2 = S\u00e9lectionnez une(des) colonne(s)
39+
popupSelection3 = Ajouter un crit\u00e8re
4040
popupChamp1 = Table
4141
popupChamp2 = Colonnes
4242
popupAvailableColumns = Colonnes
43-
popupSelected = S\u00E9lectionn\u00E9es
43+
popupSelected = S\u00e9lectionn\u00e9es
4444

4545

4646
tabbedPaneConsultation = Consultation
47-
tabbedPaneRequete = Requ\u00E8te
48-
tabbedPaneParametresJDBC = Param\u00E8tres JDBC
47+
tabbedPaneRequete = Requ\u00eate
48+
tabbedPaneParametresJDBC = Param\u00e8tres JDBC
4949

50-
operationPaneRequete = Saisir une requ\u00E8te simplifi\u00E9e
51-
operationPaneRequete_Delete = Supprimer la requ\u00E8te
52-
53-
54-
champRequete = Requ\u00E8te
50+
operationPaneRequete = Saisir une requ\u00e8te simplifi\u00e9e
51+
operationPaneRequete_Delete = Supprimer la requ\u00e8te
52+
champRequete=Requ\u00eate
53+
champRequeteEnErreur=Requ\u00eate en erreur
5554
champUrlJDBC = URL
5655
champNomDriver = Driver JDBC
5756
champIdentifiant = Identifiant
@@ -68,27 +67,29 @@ boutonFermer = Fermer
6867
boutonOk = Ok
6968

7069
windowTitleMain = Connecteur JDBC
71-
windowTitleParametrageRequete = Connecteur JDBC - param\u00E8trage de la requ\u00E8te
70+
windowTitleParametrageRequete = Connecteur JDBC - param\u00e8trage de la requ\u00e8te
7271
windowTitleParametrageConnection = ___/ Silverpeas&\#153; - Collaborative Portal Organizer _________________________________________
7372
windowTitleError = Erreur
7473

7574
champValeur = valeur
7675
comboTous = Tous
7776

7877
arrayPaneColonne = Colonne
79-
arrayPaneCritere = Crit\u00E8re
78+
arrayPaneCritere = Crit\u00e8re
8079
arrayPaneValeur = Valeur
8180
arrayPaneSuppression = Suppression
8281

8382
contient = Contient
84-
dataSourceField=Source de donn\u00E9es
85-
parametresConnectionIncorrects=mauvais param\u00E8tres de connexions
86-
erreurRequeteIncorrect=La requ\u00E8te SQL est incorrecte
87-
critereSupprimes=Les crit\u00E8res ont \u00E9t\u00E9 enlev\u00E9s
88-
sqlRequestExecutionFailure=L'ex\u00E9cution de la requ\u00E8te SQL a \u00E9chou\u00E9
89-
reloadRequest=Rafra\u00EEchir
90-
selectSome=S\u00E9lectionner des colonnes
91-
unselectSome=D\u00E9selectionner des colonnes
92-
selectAll=S\u00E9lectionner toutes les colonnes
93-
unselectAll=D\u00E9selectionner toutes les colonnes
94-
addCriterion=Ajouter le crit\u00E8re
83+
dataSourceField=Source de donn\u00e9es
84+
parametresConnectionIncorrects=mauvais param\u00e8tres de connexions
85+
erreurRequeteIncorrect=La requ\u00e8te SQL est incorrecte
86+
critereSupprimes=Les crit\u00e8res ont \u00e9t\u00e9 enlev\u00e9s
87+
sqlRequestExecutionFailure=L'ex\u00e9cution de la requ\u00e8te SQL a \u00e9chou\u00e9
88+
reloadRequest=Rafra\u00eechir
89+
selectSome=S\u00e9lectionner des colonnes
90+
unselectSome=D\u00e9selectionner des colonnes
91+
selectAll=S\u00e9lectionner toutes les colonnes
92+
unselectAll=D\u00e9selectionner toutes les colonnes
93+
addCriterion=Ajouter le crit\u00e8re
94+
95+
filter.value.info=Taper <b>@null@</b> pour chercher les valeurs nulles.<br/>Taper <b>@empty@</b> pour chercher les valeurs vides.

‎jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/comparators/Equality.java

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,30 @@
2424

2525
package org.silverpeas.components.jdbcconnector.service.comparators;
2626

27-
import java.util.Objects;
27+
import static org.apache.commons.lang3.StringUtils.EMPTY;
2828

2929
/**
3030
* The equality comparator.
3131
* @author mmoquillon
3232
*/
3333
public class Equality implements FieldValueComparator {
3434

35+
public static final String NULL = "null";
36+
37+
static final String NULL_VALUE = "@null@";
38+
static final String EMPTY_VALUE = "@empty@";
39+
3540
@Override
36-
public <T extends Comparable<T>> boolean compare(final T left, final T right) {
37-
Objects.requireNonNull(left);
38-
Objects.requireNonNull(right);
39-
return left.compareTo(right) == 0;
41+
public boolean compare(final Comparable value, final Comparable referenceValue) {
42+
if (value == null && NULL_VALUE.equals(referenceValue)) {
43+
return true;
44+
} else if (value != null && !NULL_VALUE.equals(referenceValue)) {
45+
final String finalReferenceValue = EMPTY_VALUE.equals(referenceValue)
46+
? EMPTY
47+
: referenceValue.toString();
48+
return value.toString().compareTo(finalReferenceValue) == 0;
49+
}
50+
return false;
4051
}
4152
}
4253

‎jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/comparators/FieldValueComparator.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,11 @@
3333
public interface FieldValueComparator {
3434

3535
/**
36-
* Compares the left value with the right one. The two specified values must be comparable and
37-
* instances of a same class.
38-
* @param left the left value. Must be non null.
39-
* @param right the right value. Must be non null.
36+
* Compares the value with the reference value. The two specified values must be comparable.
37+
* @param value the value to compare.
38+
* @param referenceValue the reference value the value is compared to.
4039
* @return true if the comparing predicate between the two specified values is satisfied.
4140
*/
42-
<T extends Comparable<T>> boolean compare(final T left, final T right);
41+
boolean compare(final Comparable value, final Comparable referenceValue);
4342
}
4443

‎jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/comparators/Inclusion.java

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,23 +24,18 @@
2424

2525
package org.silverpeas.components.jdbcconnector.service.comparators;
2626

27-
import java.util.Objects;
28-
2927
/**
3028
* The including comparator.
3129
* @author mmoquillon
3230
*/
3331
public class Inclusion implements FieldValueComparator {
3432

3533
@Override
36-
public <T extends Comparable<T>> boolean compare(final T left, final T right) {
37-
Objects.requireNonNull(left);
38-
Objects.requireNonNull(right);
39-
if (left instanceof String && right instanceof String) {
40-
return ((String)left).contains((String) right);
41-
} else {
42-
return left.compareTo(right) == 0;
34+
public boolean compare(final Comparable value, final Comparable referenceValue) {
35+
if (value == null) {
36+
return false;
4337
}
38+
return value.toString().contains(referenceValue.toString());
4439
}
4540
}
4641

‎jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/comparators/Inequality.java

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@
2424

2525
package org.silverpeas.components.jdbcconnector.service.comparators;
2626

27-
import java.util.Objects;
27+
import static org.apache.commons.lang3.StringUtils.EMPTY;
28+
import static org.silverpeas.components.jdbcconnector.service.comparators.Equality.EMPTY_VALUE;
29+
import static org.silverpeas.components.jdbcconnector.service.comparators.Equality.NULL_VALUE;
2830

2931
/**
3032
* The inequality comparator
@@ -33,10 +35,16 @@
3335
public class Inequality implements FieldValueComparator {
3436

3537
@Override
36-
public <T extends Comparable<T>> boolean compare(final T left, final T right) {
37-
Objects.requireNonNull(left);
38-
Objects.requireNonNull(right);
39-
return left.compareTo(right) != 0;
38+
public boolean compare(final Comparable value, final Comparable referenceValue) {
39+
if (value == null && NULL_VALUE.equals(referenceValue)) {
40+
return false;
41+
} else if (value != null && !NULL_VALUE.equals(referenceValue)) {
42+
final String finalReferenceValue = EMPTY_VALUE.equals(referenceValue)
43+
? EMPTY
44+
: referenceValue.toString();
45+
return value.toString().compareTo(finalReferenceValue) != 0;
46+
}
47+
return true;
4048
}
4149
}
4250

‎jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/comparators/Inferiority.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,19 @@
2424

2525
package org.silverpeas.components.jdbcconnector.service.comparators;
2626

27-
import java.util.Objects;
28-
2927
/**
3028
* The non-strict inferiority comparator; the two values can be equal.
3129
* @author mmoquillon
3230
*/
3331
public class Inferiority implements FieldValueComparator {
3432

33+
@SuppressWarnings("unchecked")
3534
@Override
36-
public <T extends Comparable<T>> boolean compare(final T left, final T right) {
37-
Objects.requireNonNull(left);
38-
Objects.requireNonNull(right);
39-
return left.compareTo(right) <= 0;
35+
public boolean compare(final Comparable value, final Comparable referenceValue) {
36+
if (value == null || !value.getClass().equals(referenceValue.getClass())) {
37+
return false;
38+
}
39+
return value.compareTo(referenceValue) <= 0;
4040
}
4141
}
4242

‎jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/comparators/NothingBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
public class NothingBuilder implements FieldValueComparator {
3232

3333
@Override
34-
public <T extends Comparable<T>> boolean compare(final T left, final T right) {
34+
public boolean compare(final Comparable value, final Comparable referenceValue) {
3535
return true;
3636
}
3737
}

0 commit comments

Comments
 (0)