Changeset 13488

Timestamp:

07/05/09 11:43:40 (3 years ago)

Author:

sys

Message:

memLeak : purge ref au dialogue en cours.

Location:

trunk/Jav_GE/com/scenari/m/ge/donnee

Files:

• WDonneeNavOutline.java (modified) (1 diff)
• WDonneeOutline.java (modified) (1 diff)

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

@@ -545 +545 @@
         protected final synchronized String xGetValue(IHDialog pDialog, Object pOwner, Object pArguments, Writer pWriter) throws Exception {
                 fWalker.setCurrentDialog((IWADialog) pDialog);
-                fWalker.gotoCurrent();
-                if (xNavSteps(fSteps)) {
-                        if (pWriter == null) {
-                                return fWalker.getDialogUrl();
-                        } else {
-                                pWriter.write(fWalker.getDialogUrl());
-                                return null;
-                        }
-                } else if (fIfNoneSteps != null) {
-                        for (int i = 0; i < fIfNoneSteps.length; i++) {
-                                fWalker.gotoCurrent();
-                                if (xNavSteps(fIfNoneSteps[i])) {
-                                        if (pWriter == null) {
-                                                return fWalker.getDialogUrl();
-                                        } else {
-                                                pWriter.write(fWalker.getDialogUrl());
-                                                return null;
+                try {
+                        fWalker.gotoCurrent();
+                        if (xNavSteps(fSteps)) {
+                                if (pWriter == null) {
+                                        return fWalker.getDialogUrl();
+                                } else {
+                                        pWriter.write(fWalker.getDialogUrl());
+                                        return null;
+                                }
+                        } else if (fIfNoneSteps != null) {
+                                for (int i = 0; i < fIfNoneSteps.length; i++) {
+                                        fWalker.gotoCurrent();
+                                        if (xNavSteps(fIfNoneSteps[i])) {
+                                                if (pWriter == null) {
+                                                        return fWalker.getDialogUrl();
+                                                } else {
+                                                        pWriter.write(fWalker.getDialogUrl());
+                                                        return null;
+                                                }
                                         }
                                 }
                         }
+                } finally {
+                        fWalker.setCurrentDialog(null);
                 }
                 return "";

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

@@ -257 +257 @@
         protected final synchronized void xGetValue(IHDialog pDialog, Object pOwner, Object pArguments, Writer pWriter) throws Exception {
                 fWalker.setCurrentDialog((IWADialog) pDialog);
-                IXmlWriter vWriter = new XmlWriterAppendable(pWriter);
-
-                if (fResult == RESULT_TREECONTENT) {
-                        vWriter.writeOpenTag("treeContent");
-                        if (fWalker.gotoFirstChild()) {
-                                do {
-                                        xPublishOutlineXml(vWriter);
-                                } while (fWalker.gotoNextSibling());
+                try {
+                        IXmlWriter vWriter = new XmlWriterAppendable(pWriter);
+
+                        if (fResult == RESULT_TREECONTENT) {
+                                vWriter.writeOpenTag("treeContent");
+                                if (fWalker.gotoFirstChild()) {
+                                        do {
+                                                xPublishOutlineXml(vWriter);
+                                        } while (fWalker.gotoNextSibling());
+                                }
+                                vWriter.writeCloseTag("treeContent");
+                        } else if (fResult == RESULT_PROGRESSSTATUS) {
+                                vWriter.writeStartTag("progressStatus");
+                                int vSeen = 0;
+                                int vNotSeen = 0;
+                                fWalker.gotoRoot();
+                                boolean vCurrentPassed = false;
+                                while (fWalker.gotoNext()) {
+                                        if (vCurrentPassed) {
+                                                vNotSeen++;
+                                        } else {
+                                                if (fWalker.getPosition() == OutlineWalker.POS_CURRENT) vCurrentPassed = true;
+                                                vSeen++;
+                                        }
+                                }
+                                if (fNumPagesToExcludeBefore > 0) {
+                                        vSeen -= fNumPagesToExcludeBefore;
+                                        if (vSeen < 0) {
+                                                vNotSeen += vSeen;
+                                                vSeen = 0;
+                                        }
+                                }
+                                if (fNumPagesToExcludeAfter > 0) {
+                                        vNotSeen -= fNumPagesToExcludeAfter;
+                                        if (vNotSeen < 0) {
+                                                vSeen += vNotSeen;
+                                                vNotSeen = 0;
+                                        }
+                                }
+                                float vRatio = (float) vSeen / (vSeen + vNotSeen);
+                                vWriter.writeAttribute("seen", Integer.toString(vSeen));
+                                vWriter.writeAttribute("notSeen", Integer.toString(vNotSeen));
+                                vWriter.writeAttribute("total", Integer.toString(vSeen + vNotSeen));
+                                vWriter.writeAttribute("ratio", Float.toString(vRatio));
+                                vWriter.writeAttribute("percent", Integer.toString(Math.round(vRatio * 100)));
+                                vWriter.writeEndEmptyTag();
                         }
-                        vWriter.writeCloseTag("treeContent");
-                } else if (fResult == RESULT_PROGRESSSTATUS) {
-                        vWriter.writeStartTag("progressStatus");
-                        int vSeen = 0;
-                        int vNotSeen = 0;
-                        fWalker.gotoRoot();
-                        boolean vCurrentPassed = false;
-                        while (fWalker.gotoNext()) {
-                                if (vCurrentPassed) {
-                                        vNotSeen++;
-                                } else {
-                                        if (fWalker.getPosition() == OutlineWalker.POS_CURRENT) vCurrentPassed = true;
-                                        vSeen++;
-                                }
-                        }
-                        if (fNumPagesToExcludeBefore > 0) {
-                                vSeen -= fNumPagesToExcludeBefore;
-                                if (vSeen < 0) {
-                                        vNotSeen += vSeen;
-                                        vSeen = 0;
-                                }
-                        }
-                        if (fNumPagesToExcludeAfter > 0) {
-                                vNotSeen -= fNumPagesToExcludeAfter;
-                                if (vNotSeen < 0) {
-                                        vSeen += vNotSeen;
-                                        vNotSeen = 0;
-                                }
-                        }
-                        float vRatio = (float) vSeen / (vSeen + vNotSeen);
-                        vWriter.writeAttribute("seen", Integer.toString(vSeen));
-                        vWriter.writeAttribute("notSeen", Integer.toString(vNotSeen));
-                        vWriter.writeAttribute("total", Integer.toString(vSeen + vNotSeen));
-                        vWriter.writeAttribute("ratio", Float.toString(vRatio));
-                        vWriter.writeAttribute("percent", Integer.toString(Math.round(vRatio * 100)));
-                        vWriter.writeEndEmptyTag();
+                } finally {
+                        fWalker.setCurrentDialog(null);
                 }
         }