Rename TagsData* to TagDataList*
This commit is contained in:
parent
f7bf01a1d2
commit
bd5c261f3f
7 changed files with 33 additions and 33 deletions
|
@ -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;
|
StringBuffer result;
|
||||||
|
|
||||||
|
@ -110,7 +110,7 @@ public class DomPresenter extends Presenter
|
||||||
/**
|
/**
|
||||||
* Xid a file with data.
|
* 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;
|
StringBuffer result;
|
||||||
|
|
||||||
|
|
|
@ -51,7 +51,7 @@ public class FilePresenter extends DomPresenter
|
||||||
* No need to be synchronized.
|
* No need to be synchronized.
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public StringBuffer dynamize(final TagsDataById datas) throws Exception
|
public StringBuffer dynamize(final TagDataListById datas) throws Exception
|
||||||
{
|
{
|
||||||
StringBuffer result;
|
StringBuffer result;
|
||||||
|
|
||||||
|
|
|
@ -137,7 +137,7 @@ public class Presenter
|
||||||
/**
|
/**
|
||||||
* Dynamize a file with data.
|
* 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);
|
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, "");
|
Presenter.process(result, node, datas, "");
|
||||||
}
|
}
|
||||||
|
@ -436,7 +436,7 @@ public class Presenter
|
||||||
* Recursive method that processes a node and any child nodes.
|
* 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");
|
logger.debug("process - started");
|
||||||
String TRANSITIONAL_DTD = "xhtml1-transitional.dtd";
|
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, "");
|
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.
|
// Get the iteration strategy.
|
||||||
SimpleTagData.IterationStrategy 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, "");
|
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");
|
logger.debug("processElementBasically - started");
|
||||||
|
|
||||||
|
@ -851,7 +851,7 @@ public class Presenter
|
||||||
* @param idAttr
|
* @param idAttr
|
||||||
* The ID.
|
* 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, "");
|
processElementWithId(result, node, attrs, idAttr, datas, "");
|
||||||
|
@ -868,7 +868,7 @@ public class Presenter
|
||||||
* @param idAttr
|
* @param idAttr
|
||||||
* The ID.
|
* 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();
|
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();
|
int nbLines = tags.size();
|
||||||
for (int nLine = 0; nLine < nbLines; nLine++)
|
for (int nLine = 0; nLine < nbLines; nLine++)
|
||||||
|
@ -973,7 +973,7 @@ public class Presenter
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// Manage a Hashmap.
|
// 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));
|
Presenter.processElementWithId(result, node, attrs, idAttr, data, Integer.toString(nLine));
|
||||||
result.append('\n');
|
result.append('\n');
|
||||||
|
|
|
@ -48,7 +48,7 @@ public class StringPresenter extends DomPresenter
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public StringBuffer dynamize(final TagsDataById datas) throws Exception
|
public StringBuffer dynamize(final TagDataListById datas) throws Exception
|
||||||
{
|
{
|
||||||
StringBuffer result;
|
StringBuffer result;
|
||||||
|
|
||||||
|
@ -139,7 +139,7 @@ public class StringPresenter extends DomPresenter
|
||||||
/**
|
/**
|
||||||
* Xid a string with html in.
|
* 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;
|
StringBuffer result;
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@ import java.util.HashMap;
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
public class TagsDataById extends HashMap<String, TagData> implements TagData
|
public class TagDataListById extends HashMap<String, TagData> implements TagData
|
||||||
{
|
{
|
||||||
|
|
||||||
private static final long serialVersionUID = -5787252043825503554L;
|
private static final long serialVersionUID = -5787252043825503554L;
|
||||||
|
@ -13,7 +13,7 @@ public class TagsDataById extends HashMap<String, TagData> implements TagData
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
public TagsDataById()
|
public TagDataListById()
|
||||||
{
|
{
|
||||||
super();
|
super();
|
||||||
}
|
}
|
|
@ -5,7 +5,7 @@ import java.util.Vector;
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
public class TagsDataByIndex extends Vector<TagData> implements TagData
|
public class TagDataListByIndex extends Vector<TagData> implements TagData
|
||||||
{
|
{
|
||||||
|
|
||||||
private static final long serialVersionUID = 215545720925753884L;
|
private static final long serialVersionUID = 215545720925753884L;
|
||||||
|
@ -13,7 +13,7 @@ public class TagsDataByIndex extends Vector<TagData> implements TagData
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
public TagsDataByIndex()
|
public TagDataListByIndex()
|
||||||
{
|
{
|
||||||
super();
|
super();
|
||||||
}
|
}
|
|
@ -5,14 +5,14 @@ package fr.devinsy.xidyn;
|
||||||
*/
|
*/
|
||||||
public class TagDataManager
|
public class TagDataManager
|
||||||
{
|
{
|
||||||
private TagsDataById idsDataById;
|
private TagDataListById idsDataById;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
public TagDataManager()
|
public TagDataManager()
|
||||||
{
|
{
|
||||||
this.idsDataById = new TagsDataById();
|
this.idsDataById = new TagDataListById();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -108,12 +108,12 @@ public class TagDataManager
|
||||||
SimpleTagData result;
|
SimpleTagData result;
|
||||||
|
|
||||||
// Be sure that IdsData are existing.
|
// Be sure that IdsData are existing.
|
||||||
TagsDataByIndex tags = (TagsDataByIndex) this.idsDataById.getId(id);
|
TagDataListByIndex tags = (TagDataListByIndex) this.idsDataById.getId(id);
|
||||||
if (tags == null)
|
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.
|
// Be sure that lines are existing.
|
||||||
|
@ -138,23 +138,23 @@ public class TagDataManager
|
||||||
SimpleTagData result;
|
SimpleTagData result;
|
||||||
|
|
||||||
// Be sure that IdsData are existing.
|
// Be sure that IdsData are existing.
|
||||||
TagsDataByIndex tags = (TagsDataByIndex) this.idsDataById.getId(id);
|
TagDataListByIndex tags = (TagDataListByIndex) this.idsDataById.getId(id);
|
||||||
if (tags == null)
|
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.
|
// Be sure that lines are existing.
|
||||||
int nbLines = tags.size();
|
int nbLines = tags.size();
|
||||||
for (int nLine = nbLines; nLine < line + 1; nLine++)
|
for (int nLine = nbLines; nLine < line + 1; nLine++)
|
||||||
{
|
{
|
||||||
tags.add(nLine, new TagsDataById());
|
tags.add(nLine, new TagDataListById());
|
||||||
}
|
}
|
||||||
|
|
||||||
// Get item.
|
// Get item.
|
||||||
TagsDataById lineData = (TagsDataById) tags.elementAt(line);
|
TagDataListById lineData = (TagDataListById) tags.elementAt(line);
|
||||||
|
|
||||||
result = (SimpleTagData) lineData.get(column);
|
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;
|
result = this.idsDataById;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue