[Castore-commits] RuleEntityMetadata.java 1.1.2.2 1.1.2.3 S4SFileParser.java 1.2.2.2 1.2.2.3 RuleFamilyMetadata.java 1.1.2.1 1.1.2.2

[Stéphane Bouchet]

Update of /cvsroot/castore/castore-core/src/java/fr/emn/castor/admin/gestionFeuillesStyles
In directory adullact1:/tmp/cvs-serv29248/src/java/fr/emn/castor/admin/gestionFeuillesStyles

Modified Files:
      Tag: v1_1_branch
	RuleEntityMetadata.java S4SFileParser.java 
	RuleFamilyMetadata.java 
Log Message:
Mise en page

Index: S4SFileParser.java
===================================================================
RCS file: /cvsroot/castore/castore-core/src/java/fr/emn/castor/admin/gestionFeuillesStyles/S4SFileParser.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C2 -d -r1.2.2.2 -r1.2.2.3
*** S4SFileParser.java	6 Mar 2006 10:10:38 -0000	1.2.2.2
--- S4SFileParser.java	6 Mar 2006 15:58:32 -0000	1.2.2.3
***************
*** 51,61 ****
  
  import javax.xml.parsers.FactoryConfigurationError;
- import javax.xml.parsers.ParserConfigurationException;
- import javax.xml.parsers.SAXParser;
- import javax.xml.parsers.SAXParserFactory;
  
  import org.apache.commons.logging.Log;
  import org.apache.commons.logging.LogFactory;
- import org.jdom.input.SAXBuilder;
  import org.xml.sax.Attributes;
  import org.xml.sax.InputSource;
--- 51,57 ----

Index: RuleFamilyMetadata.java
===================================================================
RCS file: /cvsroot/castore/castore-core/src/java/fr/emn/castor/admin/gestionFeuillesStyles/RuleFamilyMetadata.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** RuleFamilyMetadata.java	24 Nov 2005 14:30:25 -0000	1.1.2.1
--- RuleFamilyMetadata.java	6 Mar 2006 15:58:32 -0000	1.1.2.2
***************
*** 72,76 ****
       *            name of family
       */
!     public RuleFamilyMetadata(String familyName) {
          this.familyName = familyName;
          this.containedEntities = new ArrayList();
--- 72,76 ----
       *            name of family
       */
!     public RuleFamilyMetadata (String familyName) {
          this.familyName = familyName;
          this.containedEntities = new ArrayList();
***************
*** 228,232 ****
          }
  
!         retour.put(StyleSheetConstants.SS_FAMILY_LIST_OF_STYLES, listeStyles);
          return retour;
      }
--- 228,233 ----
          }
  
!         retour
!             .put(StyleSheetConstants.SS_FAMILY_LIST_OF_STYLES, listeStyles);
          return retour;
      }

Index: RuleEntityMetadata.java
===================================================================
RCS file: /cvsroot/castore/castore-core/src/java/fr/emn/castor/admin/gestionFeuillesStyles/RuleEntityMetadata.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** RuleEntityMetadata.java	21 Dec 2005 17:36:11 -0000	1.1.2.2
--- RuleEntityMetadata.java	6 Mar 2006 15:58:32 -0000	1.1.2.3
***************
*** 110,114 ****
       * @param aState state of transformation
       */
!     public RuleEntityMetadata(final String aRuleFileNameId,
              final String aUserEntityName, final String aState,
              final String aFamily) {
--- 110,114 ----
       * @param aState state of transformation
       */
!     public RuleEntityMetadata (final String aRuleFileNameId,
              final String aUserEntityName, final String aState,
              final String aFamily) {