From bd5c261f3fb0d4a676eb3cf3eb0c5d236c8ad770 Mon Sep 17 00:00:00 2001 From: "Christian P. MOMON" Date: Mon, 24 Jun 2013 08:34:10 +0200 Subject: [PATCH] Rename TagsData* to TagDataList* --- src/fr/devinsy/xidyn/DomPresenter.java | 4 ++-- src/fr/devinsy/xidyn/FilePresenter.java | 2 +- src/fr/devinsy/xidyn/Presenter.java | 24 +++++++++---------- src/fr/devinsy/xidyn/StringPresenter.java | 4 ++-- ...TagsDataById.java => TagDataListById.java} | 4 ++-- ...taByIndex.java => TagDataListByIndex.java} | 4 ++-- src/fr/devinsy/xidyn/TagDataManager.java | 24 +++++++++---------- 7 files changed, 33 insertions(+), 33 deletions(-) rename src/fr/devinsy/xidyn/{TagsDataById.java => TagDataListById.java} (72%) rename src/fr/devinsy/xidyn/{TagsDataByIndex.java => TagDataListByIndex.java} (57%) diff --git a/src/fr/devinsy/xidyn/DomPresenter.java b/src/fr/devinsy/xidyn/DomPresenter.java index 71f0162..d290ec9 100644 --- a/src/fr/devinsy/xidyn/DomPresenter.java +++ b/src/fr/devinsy/xidyn/DomPresenter.java @@ -46,7 +46,7 @@ public class DomPresenter extends Presenter /** * */ - public StringBuffer dynamize(final TagsDataById datas) throws Exception + public StringBuffer dynamize(final TagDataListById datas) throws Exception { StringBuffer result; @@ -110,7 +110,7 @@ public class DomPresenter extends Presenter /** * Xid a file with data. */ - static public StringBuffer dynamize(final Document doc, final TagsDataById datas) throws Exception + static public StringBuffer dynamize(final Document doc, final TagDataListById datas) throws Exception { StringBuffer result; diff --git a/src/fr/devinsy/xidyn/FilePresenter.java b/src/fr/devinsy/xidyn/FilePresenter.java index 09d3e55..167ed48 100644 --- a/src/fr/devinsy/xidyn/FilePresenter.java +++ b/src/fr/devinsy/xidyn/FilePresenter.java @@ -51,7 +51,7 @@ public class FilePresenter extends DomPresenter * No need to be synchronized. */ @Override - public StringBuffer dynamize(final TagsDataById datas) throws Exception + public StringBuffer dynamize(final TagDataListById datas) throws Exception { StringBuffer result; diff --git a/src/fr/devinsy/xidyn/Presenter.java b/src/fr/devinsy/xidyn/Presenter.java index 5cd843a..54160db 100644 --- a/src/fr/devinsy/xidyn/Presenter.java +++ b/src/fr/devinsy/xidyn/Presenter.java @@ -137,7 +137,7 @@ public class Presenter /** * Dynamize a file with data. */ - static public void dynamize(final Writer result, final Document doc, final TagsDataById data) throws Exception + static public void dynamize(final Writer result, final Document doc, final TagDataListById data) throws Exception { Presenter.process(result, doc, data); } @@ -427,7 +427,7 @@ public class Presenter /** * */ - static protected void process(final Writer result, final Node node, final TagsDataById datas) throws Exception + static protected void process(final Writer result, final Node node, final TagDataListById datas) throws Exception { Presenter.process(result, node, datas, ""); } @@ -436,7 +436,7 @@ public class Presenter * Recursive method that processes a node and any child nodes. * */ - static protected void process(final Writer result, final Node node, final TagsDataById datas, final String suffix) throws Exception + static protected void process(final Writer result, final Node node, final TagDataListById datas, final String suffix) throws Exception { logger.debug("process - started"); String TRANSITIONAL_DTD = "xhtml1-transitional.dtd"; @@ -661,7 +661,7 @@ public class Presenter /** * */ - static protected void processChildren(final Writer result, final Node node, final TagsDataById datas) throws Exception + static protected void processChildren(final Writer result, final Node node, final TagDataListById datas) throws Exception { processChildren(result, node, datas, ""); } @@ -669,7 +669,7 @@ public class Presenter /** * */ - static protected void processChildren(final Writer result, final Node node, final TagsDataById datas, final String suffix) throws Exception + static protected void processChildren(final Writer result, final Node node, final TagDataListById datas, final String suffix) throws Exception { // Get the iteration strategy. SimpleTagData.IterationStrategy strategy; @@ -800,7 +800,7 @@ public class Presenter /** * */ - static void processElementBasically(final Writer result, final Node node, final TagsDataById datas) throws Exception + static void processElementBasically(final Writer result, final Node node, final TagDataListById datas) throws Exception { processElementBasically(result, node, datas, ""); } @@ -808,7 +808,7 @@ public class Presenter /** * */ - static void processElementBasically(final Writer result, final Node node, final TagsDataById datas, final String suffix) throws Exception + static void processElementBasically(final Writer result, final Node node, final TagDataListById datas, final String suffix) throws Exception { logger.debug("processElementBasically - started"); @@ -851,7 +851,7 @@ public class Presenter * @param idAttr * The ID. */ - static protected void processElementWithId(final Writer result, final Node node, final NamedNodeMap attrs, final Node idAttr, final TagsDataById datas) throws Exception + static protected void processElementWithId(final Writer result, final Node node, final NamedNodeMap attrs, final Node idAttr, final TagDataListById datas) throws Exception { processElementWithId(result, node, attrs, idAttr, datas, ""); @@ -868,7 +868,7 @@ public class Presenter * @param idAttr * The ID. */ - static protected void processElementWithId(final Writer result, final Node node, final NamedNodeMap attrs, final Node idAttr, final TagsDataById datas, final String suffix) throws Exception + static protected void processElementWithId(final Writer result, final Node node, final NamedNodeMap attrs, final Node idAttr, final TagDataListById datas, final String suffix) throws Exception { String tag = node.getNodeName(); @@ -926,9 +926,9 @@ public class Presenter } } } - else if (dataCore instanceof TagsDataByIndex) + else if (dataCore instanceof TagDataListByIndex) { - TagsDataByIndex tags = (TagsDataByIndex) dataCore; + TagDataListByIndex tags = (TagDataListByIndex) dataCore; int nbLines = tags.size(); for (int nLine = 0; nLine < nbLines; nLine++) @@ -973,7 +973,7 @@ public class Presenter else { // Manage a Hashmap. - TagsDataById data = (TagsDataById) tags.elementAt(nLine); + TagDataListById data = (TagDataListById) tags.elementAt(nLine); Presenter.processElementWithId(result, node, attrs, idAttr, data, Integer.toString(nLine)); result.append('\n'); diff --git a/src/fr/devinsy/xidyn/StringPresenter.java b/src/fr/devinsy/xidyn/StringPresenter.java index 779c0ff..a9fbf74 100644 --- a/src/fr/devinsy/xidyn/StringPresenter.java +++ b/src/fr/devinsy/xidyn/StringPresenter.java @@ -48,7 +48,7 @@ public class StringPresenter extends DomPresenter * */ @Override - public StringBuffer dynamize(final TagsDataById datas) throws Exception + public StringBuffer dynamize(final TagDataListById datas) throws Exception { StringBuffer result; @@ -139,7 +139,7 @@ public class StringPresenter extends DomPresenter /** * Xid a string with html in. */ - static public StringBuffer dynamize(final String html, final TagsDataById datas) throws Exception + static public StringBuffer dynamize(final String html, final TagDataListById datas) throws Exception { StringBuffer result; diff --git a/src/fr/devinsy/xidyn/TagsDataById.java b/src/fr/devinsy/xidyn/TagDataListById.java similarity index 72% rename from src/fr/devinsy/xidyn/TagsDataById.java rename to src/fr/devinsy/xidyn/TagDataListById.java index d09f1cf..2870f34 100644 --- a/src/fr/devinsy/xidyn/TagsDataById.java +++ b/src/fr/devinsy/xidyn/TagDataListById.java @@ -5,7 +5,7 @@ import java.util.HashMap; /** * */ -public class TagsDataById extends HashMap implements TagData +public class TagDataListById extends HashMap implements TagData { private static final long serialVersionUID = -5787252043825503554L; @@ -13,7 +13,7 @@ public class TagsDataById extends HashMap implements TagData /** * */ - public TagsDataById() + public TagDataListById() { super(); } diff --git a/src/fr/devinsy/xidyn/TagsDataByIndex.java b/src/fr/devinsy/xidyn/TagDataListByIndex.java similarity index 57% rename from src/fr/devinsy/xidyn/TagsDataByIndex.java rename to src/fr/devinsy/xidyn/TagDataListByIndex.java index 0802b58..ea11a9d 100644 --- a/src/fr/devinsy/xidyn/TagsDataByIndex.java +++ b/src/fr/devinsy/xidyn/TagDataListByIndex.java @@ -5,7 +5,7 @@ import java.util.Vector; /** * */ -public class TagsDataByIndex extends Vector implements TagData +public class TagDataListByIndex extends Vector implements TagData { private static final long serialVersionUID = 215545720925753884L; @@ -13,7 +13,7 @@ public class TagsDataByIndex extends Vector implements TagData /** * */ - public TagsDataByIndex() + public TagDataListByIndex() { super(); } diff --git a/src/fr/devinsy/xidyn/TagDataManager.java b/src/fr/devinsy/xidyn/TagDataManager.java index 2e7989e..3a4b193 100644 --- a/src/fr/devinsy/xidyn/TagDataManager.java +++ b/src/fr/devinsy/xidyn/TagDataManager.java @@ -5,14 +5,14 @@ package fr.devinsy.xidyn; */ public class TagDataManager { - private TagsDataById idsDataById; + private TagDataListById idsDataById; /** * */ public TagDataManager() { - this.idsDataById = new TagsDataById(); + this.idsDataById = new TagDataListById(); } /** @@ -108,12 +108,12 @@ public class TagDataManager SimpleTagData result; // Be sure that IdsData are existing. - TagsDataByIndex tags = (TagsDataByIndex) this.idsDataById.getId(id); + TagDataListByIndex tags = (TagDataListByIndex) this.idsDataById.getId(id); if (tags == null) { - this.idsDataById.setId(id, new TagsDataByIndex()); + this.idsDataById.setId(id, new TagDataListByIndex()); - tags = (TagsDataByIndex) this.idsDataById.getId(id); + tags = (TagDataListByIndex) this.idsDataById.getId(id); } // Be sure that lines are existing. @@ -138,23 +138,23 @@ public class TagDataManager SimpleTagData result; // Be sure that IdsData are existing. - TagsDataByIndex tags = (TagsDataByIndex) this.idsDataById.getId(id); + TagDataListByIndex tags = (TagDataListByIndex) this.idsDataById.getId(id); if (tags == null) { - this.idsDataById.setId(id, new TagsDataByIndex()); + this.idsDataById.setId(id, new TagDataListByIndex()); - tags = (TagsDataByIndex) this.idsDataById.getId(id); + tags = (TagDataListByIndex) this.idsDataById.getId(id); } // Be sure that lines are existing. int nbLines = tags.size(); for (int nLine = nbLines; nLine < line + 1; nLine++) { - tags.add(nLine, new TagsDataById()); + tags.add(nLine, new TagDataListById()); } // Get item. - TagsDataById lineData = (TagsDataById) tags.elementAt(line); + TagDataListById lineData = (TagDataListById) tags.elementAt(line); result = (SimpleTagData) lineData.get(column); @@ -172,9 +172,9 @@ public class TagDataManager /** * */ - public TagsDataById getIdsDataById() + public TagDataListById getIdsDataById() { - TagsDataById result; + TagDataListById result; result = this.idsDataById;