devinsy/xidyn
devinsy/xidyn
1
0
Fork 0
Code Issues Pull requests Releases Activity

Fix recursive submethods.

Browse source
This commit is contained in:
Christian P. MOMON 2013-08-23 03:02:26 +02:00
parent 87b352e933
commit 850415a837
2 changed files with 93 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
src/fr/devinsy/xidyn/presenters/FilePresenter.java
View file

@ -53,7 +53,11 @@ public class FilePresenter extends StringPresenter
{
StringBuffer result;
result = dynamize((TagDataManager) null);
//
update();
//
result = dynamize();
//
return result;
@ -72,29 +76,7 @@ public class FilePresenter extends StringPresenter
logger.info("dynamize file [" + this.sourceFilePathname + "]");
//
if (this.source == null)
{
String errorMessage = "source not defined";
logger.error(errorMessage);
result = null;
throw new Exception(errorMessage);
}
else if (!source.exists())
{
String errorMessage = "source file defined but not found (" + this.sourceFilePathname + ")";
logger.error(errorMessage);
result = null;
throw new Exception(errorMessage);
}
else
{
long currentTime = this.source.lastModified();
if ((super.getSource() == null) || (this.sourceTime != currentTime))
{
super.setSource(XidynUtils.load(this.source));
this.sourceTime = currentTime;
}
}
update();
// Build the web page.
result = super.dynamize(data);
@ -212,6 +194,35 @@ public class FilePresenter extends StringPresenter
setSource(file);
}
/**
* @throws Exception
*/
public void update() throws Exception
{
//
if (this.source == null)
{
String errorMessage = "source not defined";
logger.error(errorMessage);
throw new NullPointerException(errorMessage);
}
else if (!source.exists())
{
String errorMessage = "source file defined but not found (" + this.sourceFilePathname + ")";
logger.error(errorMessage);
throw new Exception(errorMessage);
}
else
{
long currentTime = this.source.lastModified();
if ((super.getSource() == null) || (this.sourceTime != currentTime))
{
super.setSource(XidynUtils.load(this.source));
this.sourceTime = currentTime;
}
}
}
/**
* Dynamize a file without data.
*/

72
src/fr/devinsy/xidyn/presenters/URLPresenter.java
View file

@ -56,7 +56,11 @@ public class URLPresenter extends StringPresenter
{
StringBuffer result;
result = dynamize((TagDataManager) null);
//
update();
//
result = super.dynamize();
//
return result;
@ -73,24 +77,10 @@ public class URLPresenter extends StringPresenter
logger.info("dynamize URL [" + this.sourcePathname + "]");
//
if (this.source == null)
{
String errorMessage = "source not defined";
logger.error(errorMessage);
throw new NullPointerException(errorMessage);
}
else
{
long currentSourceTime = this.source.openConnection().getLastModified();
if ((super.getSource() == null) || (this.sourceTime != currentSourceTime))
{
super.setSource(XidynUtils.load(this.source));
this.sourceTime = currentSourceTime;
}
update();
// Build the web page.
result = super.dynamize(data);
}
//
return (result);
@ -194,6 +184,56 @@ public class URLPresenter extends StringPresenter
}
}
/**
*
*/
@Override
public String toString()
{
String result;
try
{
//
update();
//
result = super.getSource();
}
catch (final IOException exception)
{
result = null;
}
//
return result;
}
/**
* No need to be synchronized.
*
* @throws IOException
*/
public void update() throws IOException
{
//
if (this.source == null)
{
String errorMessage = "source not defined";
logger.error(errorMessage);
throw new NullPointerException(errorMessage);
}
else
{
long currentSourceTime = this.source.openConnection().getLastModified();
if ((super.getSource() == null) || (this.sourceTime != currentSourceTime))
{
super.setSource(XidynUtils.load(this.source));
this.sourceTime = currentSourceTime;
}
}
}
/**
* Dynamize a file without data.
*/