[Castore-commits] PropertiesHelper.java 1.2.2.1 1.2.2.2 Utils.java 1.6.2.3 1.6.2.4

[Stéphane Bouchet]

Update of /cvsroot/castore/castore-core/src/java/fr/emn/castor/common
In directory adullact1:/tmp/cvs-serv5548/src/java/fr/emn/castor/common

Modified Files:
      Tag: v1_1_branch
	PropertiesHelper.java Utils.java 
Log Message:
Mise en page

Index: Utils.java
===================================================================
RCS file: /cvsroot/castore/castore-core/src/java/fr/emn/castor/common/Utils.java,v
retrieving revision 1.6.2.3
retrieving revision 1.6.2.4
diff -C2 -d -r1.6.2.3 -r1.6.2.4
*** Utils.java	6 Mar 2006 10:33:13 -0000	1.6.2.3
--- Utils.java	6 Mar 2006 16:08:20 -0000	1.6.2.4
***************
*** 73,77 ****
       * Constructeur.
       */
!     private Utils () {
          //prevent creation
      }
--- 73,77 ----
       * Constructeur.
       */
!     private Utils() {
          //prevent creation
      }

Index: PropertiesHelper.java
===================================================================
RCS file: /cvsroot/castore/castore-core/src/java/fr/emn/castor/common/PropertiesHelper.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -d -r1.2.2.1 -r1.2.2.2
*** PropertiesHelper.java	24 Nov 2005 14:30:14 -0000	1.2.2.1
--- PropertiesHelper.java	6 Mar 2006 16:08:20 -0000	1.2.2.2
***************
*** 68,72 ****
       * @return la propriete correspondante, sinon une chaine vide
       */
!     public static String getProperty(final String bundleName, final String cle) {
          String bundleString = bundleName.replaceAll("\\.", "/");
          if (!bundleString.startsWith("/")) {
--- 68,73 ----
       * @return la propriete correspondante, sinon une chaine vide
       */
!     public static String getProperty(
!             final String bundleName, final String cle) {
          String bundleString = bundleName.replaceAll("\\.", "/");
          if (!bundleString.startsWith("/")) {
***************
*** 78,82 ****
                      + ".properties");
              if (in != null) {
!                 PropertyResourceBundle bundle = new PropertyResourceBundle(in);
                  return bundle.getString(cle);
              }
--- 79,84 ----
                      + ".properties");
              if (in != null) {
!                 PropertyResourceBundle bundle = new PropertyResourceBundle(
!                     in);
                  return bundle.getString(cle);
              }