Changeset 9395 for trunk/Jav_GE/com/scenari/m/ge/donnee/WDonneeOutline.java

Timestamp:

07/25/07 11:08:55 (5 years ago)

Author:

sys

Message:

navOutline : gestion du scope

File:

• trunk/Jav_GE/com/scenari/m/ge/donnee/WDonneeOutline.java (modified) (7 diffs)

trunk/Jav_GE/com/scenari/m/ge/donnee/WDonneeOutline.java

@@ -56 +56 @@
 import com.scenari.m.co.donnee.IAgentData;
 import com.scenari.m.co.donnee.WDonnee;
-import com.scenari.m.co.donnee.XSaxHandlerDonnees;
 import com.scenari.m.ge.agent.OutlineWalker;
 import com.scenari.s.co.source.IHAliasResolver;
@@ -74 +73 @@
  *     [outlineDef]
  *       [scope]
- *         [startingPoint dir='up|down' offset='0|X|max' include='y|n']
- *           [stopCompType code='' include='y|n'/]
- *           ...
- *         [/startingPoint]
- *         [endingPoint depth='0|X|noLimit' depthFrom='startingPoint|current']
- *           [stopCompType code='' include='y|n'/]
- *           ...
- *         [/endingPoint]
- *         [uncleFrom dir='up|down|none' offset='0|X|max']
- *           [stopCompType code='' include='y/n'/]
- *           ...
- *         [/uncleFrom]
- *         [uncleTo dir='up|down|none' offset='0|X|max']
- *           [stopCompType code='' include='y/n'/]
- *           ...
- *         [/uncleTo]
- *         [uncleDesc depth='0|X|noLimit' depthFrom='startingPoint|current']
- *           [stopCompType code='' include='y/n'/]
- *           ...
- *         [/uncleDesc]
- *         [currentDesc depth='0|X|noLimit' depthFrom='startingPoint|current']
- *           [stopCompType code='' include='y/n'/]
- *           ...
- *         [/currentDesc]
+ *         Voir ScopeSaxHandler
  *       [/scope]
  *       [result]
@@ -116 +92 @@
 
         protected String fResult = RESULT_TREECONTENT;
-
-        public class XSaxHandler extends XSaxHandlerDonnees {
+        
+        
+        public class XSaxHandler extends ScopeSaxHandler {
 
                 public static final String TAG_ROOT_DONNEE = "outlineDef";
 
-                public static final String TAG_STARTINGPOINT = "startingPoint";
-
-                public static final String TAG_ENDINGPOINT = "endingPoint";
-
-                public static final String TAG_UNCLEFROM = "uncleFrom";
-
-                public static final String TAG_UNCLETO = "uncleTo";
-
-                public static final String TAG_UNCLEDESC = "uncleDesc";
-
-                public static final String TAG_CURRENTDESC = "currentDesc";
-
-                public static final String TAG_STOPCOMPTYPE = "stopCompType";
-
-                String fCurrentBlock = null;
-
-                public XSaxHandler(IHComposantType pCompType) {
-                        super(pCompType);
+                public XSaxHandler(IHComposantType pCompType, OutlineWalker pWalker) {
+                        super(pCompType, pWalker);
                 }
 
@@ -146 +107 @@
 
                 protected boolean xStartElement(String pUri, String pLocalName, String pQName, Attributes pAttributes) throws Exception {
-                        if (pLocalName == TAG_STARTINGPOINT) {
-                                fCurrentBlock = pLocalName;
-                                fWalker.setStartingPoint(getDir(pAttributes, OutlineWalker.DIR_UP_DOWN), getOffset(pAttributes, 0), getInclude(pAttributes, true));
-                        }
                         
-                        else if (pLocalName == TAG_ENDINGPOINT) {
-                                fCurrentBlock = pLocalName;
-                                fWalker.setEndingPoint(getDepth(pAttributes, OutlineWalker.NO_LIMIT), getDepthFrom(pAttributes, OutlineWalker.FROM_STARTINGPOINT));
-                        }
-
-                        else if (pLocalName == TAG_UNCLEFROM) {
-                                fCurrentBlock = pLocalName;
-                                fWalker.setUncleFrom(getDir(pAttributes, OutlineWalker.DIR_NONE), getOffset(pAttributes, 0));
-                        }
-
-                        else if (pLocalName == TAG_UNCLETO) {
-                                fCurrentBlock = pLocalName;
-                                fWalker.setUncleTo(getDir(pAttributes, OutlineWalker.DIR_NONE), getOffset(pAttributes, 0));
-                        }
-
-                        else if (pLocalName == TAG_UNCLEDESC) {
-                                fCurrentBlock = pLocalName;
-                                fWalker.setUncleDesc(getDepth(pAttributes, OutlineWalker.NO_LIMIT), getDepthFrom(pAttributes, OutlineWalker.FROM_STARTINGPOINT));
-                        }
-
-                        else if (pLocalName == TAG_CURRENTDESC) {
-                                fCurrentBlock = pLocalName;
-                                fWalker.setCurrDesc(getDepth(pAttributes, OutlineWalker.NO_LIMIT), getDepthFrom(pAttributes, OutlineWalker.FROM_CURRENT));
-                        }
-
-                        else if (pLocalName == TAG_STOPCOMPTYPE) {
-                                if (fCurrentBlock == TAG_STARTINGPOINT) {
-                                        fWalker.addStartingPointStopOnCompType(pAttributes.getValue("code"), getInclude(pAttributes, true));
-                                } else if (fCurrentBlock == TAG_ENDINGPOINT) {
-                                        fWalker.addEndingPointStopOnCompType(pAttributes.getValue("code"), getInclude(pAttributes, true));
-                                }else if (fCurrentBlock == TAG_UNCLEFROM) {
-                                        fWalker.addUncleFromStopOnCompType(pAttributes.getValue("code"), getInclude(pAttributes, true));
-                                } else if (fCurrentBlock == TAG_UNCLETO) {
-                                        fWalker.addUncleToStopOnCompType(pAttributes.getValue("code"), getInclude(pAttributes, true));
-                                } else if (fCurrentBlock == TAG_UNCLEDESC) {
-                                        fWalker.addUncleDescStopOnCompType(pAttributes.getValue("code"), getInclude(pAttributes, true));
-                                } else if (fCurrentBlock == TAG_CURRENTDESC) {
-                                        fWalker.addCurrDescStopOnCompType(pAttributes.getValue("code"), getInclude(pAttributes, true));
-                                }
-                        }
-
-                        else if (pLocalName == RESULT_TREECONTENT) {
-                                fResult = RESULT_TREECONTENT;
-                        }
-
-                        else if (pLocalName == RESULT_PROGRESSSTATUS) {
-                                fResult = RESULT_PROGRESSSTATUS;
+                        if( ! super.xStartElement(pUri, pLocalName, pQName, pAttributes)) {
+                                if (pLocalName == RESULT_TREECONTENT) {
+                                        fResult = RESULT_TREECONTENT;
+                                }
+        
+                                else if (pLocalName == RESULT_PROGRESSSTATUS) {
+                                        fResult = RESULT_PROGRESSSTATUS;
+                                }
                         }
 
@@ -203 +121 @@
                 }
 
-                protected short getDir(Attributes pAttributes, short pDefault) {
-                        String vDir = pAttributes.getValue("dir");
-                        if (vDir == null) return pDefault;
-                        if (vDir.equals("none")) return OutlineWalker.DIR_NONE;
-                        return vDir.equals("up") ? OutlineWalker.DIR_DOWN_UP : OutlineWalker.DIR_UP_DOWN;
-                }
-
-                protected int getOffset(Attributes pAttributes, int pDefault) {
-                        String vOffset = pAttributes.getValue("offset");
-                        if (vOffset == null) return pDefault;
-                        if (vOffset.equals("max")) return OutlineWalker.NO_LIMIT;
-                        return Integer.parseInt(vOffset);
-                }
-
-                protected int getDepth(Attributes pAttributes, int pDefault) {
-                        String vOffset = pAttributes.getValue("depth");
-                        if (vOffset == null) return pDefault;
-                        if (vOffset.equals("noLimit")) return OutlineWalker.NO_LIMIT;
-                        return Integer.parseInt(vOffset);
-                }
-
-                protected boolean getInclude(Attributes pAttributes, boolean pDefault) {
-                        String vInclude = pAttributes.getValue("include");
-                        if (vInclude == null) return pDefault;
-                        return vInclude.equals("y");
-                }
-
-                protected short getDepthFrom(Attributes pAttributes, short pDefault) {
-                        String vDir = pAttributes.getValue("depthFrom");
-                        if (vDir == null) return pDefault;
-                        return vDir.equals("current") ? OutlineWalker.FROM_CURRENT : OutlineWalker.FROM_STARTINGPOINT;
-                }
         }
 
@@ -297 +183 @@
         public boolean wSetValueParSaxHandler(IHComposantType pCompType, HExtraitSaxHandler pParentHandler, IHContextDonnee pContextDonnee) throws java.lang.Exception {
                 // Preparation du Handler
-                XSaxHandler vHandler = new XSaxHandler(pCompType);
+                XSaxHandler vHandler = new XSaxHandler(pCompType, fWalker);
                 vHandler.hSetTagRoot(XSaxHandler.TAG_ROOT_DONNEE);
                 vHandler.hSetXmlReader(pParentHandler.hGetXMLReader(), false);
@@ -318 +204 @@
 
                         // Preparation du Handler
-                        XSaxHandler vHandler = new XSaxHandler(pCompType);
+                        XSaxHandler vHandler = new XSaxHandler(pCompType, fWalker);
                         vHandler.hSetTagRoot(XSaxHandler.TAG_ROOT_DONNEE);
                         vHandler.hSetXmlReader(vXmlReader);