From 6f764e7a2938bf32d0f08054367db024d0f66126 Mon Sep 17 00:00:00 2001 From: "Christian P. MOMON" Date: Fri, 2 Aug 2013 16:09:33 +0200 Subject: [PATCH] Clean code. --- .../xidyn/presenters/DomPresenterCore.java | 22 +++++++++---------- .../xidyn/presenters/URLPresenter.java | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/fr/devinsy/xidyn/presenters/DomPresenterCore.java b/src/fr/devinsy/xidyn/presenters/DomPresenterCore.java index bdc7616..63ceefe 100644 --- a/src/fr/devinsy/xidyn/presenters/DomPresenterCore.java +++ b/src/fr/devinsy/xidyn/presenters/DomPresenterCore.java @@ -39,7 +39,7 @@ public class DomPresenterCore StringBuffer result; StringWriter htmlCode = new StringWriter(); - DomPresenterCore.dynamize(htmlCode, doc, data); + dynamize(htmlCode, doc, data); result = htmlCode.getBuffer(); // @@ -274,7 +274,7 @@ public class DomPresenterCore // Log.write(Log.TRACE,"systemId = " + systemId); } - DomPresenterCore.process(result, ((Document) node).getDocumentElement(), datas, suffix); + process(result, ((Document) node).getDocumentElement(), datas, suffix); break; } @@ -288,11 +288,11 @@ public class DomPresenterCore if (idAttr != null) { - DomPresenterCore.processElementWithId(result, node, attrs, idAttr, datas, suffix); + processElementWithId(result, node, attrs, idAttr, datas, suffix); } else { - DomPresenterCore.processElementBasically(result, node, datas, suffix); + processElementBasically(result, node, datas, suffix); } break; @@ -529,7 +529,7 @@ public class DomPresenterCore process(result, children.item(childIndex), datas, suffix); } } - break; + break; case ONLY_FIRST_TWO_ROWS: lineCounter = 0; @@ -549,7 +549,7 @@ public class DomPresenterCore process(result, children.item(childIndex), datas, suffix); } } - break; + break; case ONLY_ROWS_WITH_ID: for (int childIndex = 0; childIndex < childrenCount; childIndex++) @@ -568,7 +568,7 @@ public class DomPresenterCore process(result, children.item(childIndex), datas, suffix); } } - break; + break; case ONLY_ROWS_WITHOUT_ID: for (int childIndex = 0; childIndex < childrenCount; childIndex++) @@ -586,14 +586,14 @@ public class DomPresenterCore process(result, children.item(childIndex), datas, suffix); } } - break; + break; case ALL_ROWS: for (int childIndex = 0; childIndex < childrenCount; childIndex++) { process(result, children.item(childIndex), datas, suffix); } - break; + break; } } @@ -681,7 +681,7 @@ public class DomPresenterCore if (dataCore == null) { - DomPresenterCore.processElementBasically(result, node, datas, suffix); + processElementBasically(result, node, datas, suffix); } else if (dataCore instanceof SimpleTagData) { @@ -775,7 +775,7 @@ public class DomPresenterCore // Manage a Hashmap. TagDataListById data = (TagDataListById) tags.elementAt(nLine); - DomPresenterCore.processElementWithId(result, node, attrs, idAttr, data, Integer.toString(nLine)); + processElementWithId(result, node, attrs, idAttr, data, Integer.toString(nLine)); result.append('\n'); } } diff --git a/src/fr/devinsy/xidyn/presenters/URLPresenter.java b/src/fr/devinsy/xidyn/presenters/URLPresenter.java index 38cdd94..4f19c50 100644 --- a/src/fr/devinsy/xidyn/presenters/URLPresenter.java +++ b/src/fr/devinsy/xidyn/presenters/URLPresenter.java @@ -88,7 +88,7 @@ public class URLPresenter implements Presenter } else { - long lastModified = sourceURL.openConnection().getLastModified(); + long lastModified = this.sourceURL.openConnection().getLastModified(); if ((this.doc == null) || (this.sourceFileTime != lastModified)) { this.sourceFileTime = lastModified;