Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[7126] trunk/framework/ctulu-common/src/main/java/org/ fudaa/ctulu
|
From: <de...@us...> - 2012-04-30 22:31:29
|
Revision: 7126
http://fudaa.svn.sourceforge.net/fudaa/?rev=7126&view=rev
Author: deniger
Date: 2012-04-30 22:31:22 +0000 (Mon, 30 Apr 2012)
Log Message:
-----------
support rcal
Modified Paths:
--------------
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluIOResult.java
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluLog.java
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluLogGroup.java
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluLogLevel.java
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluLogRecord.java
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/fileformat/FileOperationWriterAbstract.java
Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluIOResult.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluIOResult.java 2012-04-30 22:06:36 UTC (rev 7125)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluIOResult.java 2012-04-30 22:31:22 UTC (rev 7126)
@@ -32,7 +32,7 @@
* @return true si une erreur fatale est survenue
*/
public boolean containsFatalError() {
- return (log != null) && (log.containsFatalError());
+ return (log != null) && (log.containsSevereError());
}
/**
Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluLog.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluLog.java 2012-04-30 22:06:36 UTC (rev 7125)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluLog.java 2012-04-30 22:31:22 UTC (rev 7126)
@@ -128,8 +128,8 @@
/**
* @param _m le message
*/
- public void addFatalError(final String _m) {
- addRecord(CtuluLogLevel.FATAL, _m);
+ public void addSevereError(final String _m) {
+ addRecord(CtuluLogLevel.SEVERE, _m);
}
/**
@@ -138,16 +138,16 @@
* @param _m le message
* @param _index le num de ligne
*/
- public void addFatalError(final String _m, final int _index) {
- addRecord(CtuluLogLevel.FATAL, _m, Integer.valueOf(_index));
+ public void addSevereError(final String _m, final int _index) {
+ addRecord(CtuluLogLevel.SEVERE, _m, Integer.valueOf(_index));
}
/**
* @param _m
* @param arg
*/
- public void addFatalError(final String _m, final Object... arg) {
- addRecord(CtuluLogLevel.FATAL, _m, arg);
+ public void addSevereError(final String _m, final Object... arg) {
+ addRecord(CtuluLogLevel.SEVERE, _m, arg);
}
/**
@@ -156,8 +156,8 @@
* @param _m le message
* @param _in pour recuperer le num de ligne
*/
- public void addFatalError(final String _m, final LineNumberReader _in) {
- addFatalError(_m, _in == null ? -1 : _in.getLineNumber());
+ public void addSevereError(final String _m, final LineNumberReader _in) {
+ addSevereError(_m, _in == null ? -1 : _in.getLineNumber());
}
/**
@@ -255,7 +255,7 @@
* @param _m
*/
@Deprecated
- public void changeFatalError(final String _m) {
+ public void changeSevereError(final String _m) {
addError(_m);
}
@@ -266,8 +266,8 @@
logs.clear();
}
- public boolean containsErrorOrFatalError() {
- return containsErrors() || containsFatalError();
+ public boolean containsErrorOrSevereError() {
+ return containsErrors() || containsSevereError();
}
/**
@@ -280,8 +280,8 @@
/**
* @return true si contient une erreur fatale
*/
- public boolean containsFatalError() {
- return containsLevel(CtuluLogLevel.FATAL);
+ public boolean containsSevereError() {
+ return containsLevel(CtuluLogLevel.SEVERE);
}
/**
@@ -357,8 +357,8 @@
return getDesc() + "\n" + CtuluDefaultLogFormatter.formatLogs(logs, getDefaultResourceBundle());
}
- public String getFatalError() {
- CtuluLogRecord log = getFirstOfLevel(CtuluLogLevel.FATAL);
+ public String getSevereError() {
+ CtuluLogRecord log = getFirstOfLevel(CtuluLogLevel.SEVERE);
return log == null ? null : CtuluDefaultLogFormatter.DEFAULT.format(log, getDefaultResourceBundle());
}
Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluLogGroup.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluLogGroup.java 2012-04-30 22:06:36 UTC (rev 7125)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluLogGroup.java 2012-04-30 22:31:22 UTC (rev 7126)
@@ -106,7 +106,7 @@
return false;
}
for (CtuluLog analyze : logs) {
- if (analyze.containsFatalError() || analyze.containsErrors()) {
+ if (analyze.containsSevereError() || analyze.containsErrors()) {
return true;
}
}
@@ -125,7 +125,7 @@
return false;
}
for (CtuluLog analyze : logs) {
- if (analyze.containsFatalError()) {
+ if (analyze.containsSevereError()) {
return true;
}
}
Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluLogLevel.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluLogLevel.java 2012-04-30 22:06:36 UTC (rev 7125)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluLogLevel.java 2012-04-30 22:31:22 UTC (rev 7126)
@@ -11,5 +11,5 @@
INFO,
WARNING,
ERROR,
- FATAL;
+ SEVERE;
}
Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluLogRecord.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluLogRecord.java 2012-04-30 22:06:36 UTC (rev 7125)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluLogRecord.java 2012-04-30 22:31:22 UTC (rev 7126)
@@ -11,8 +11,9 @@
private Throwable thrown;
private Date logDate;
private int id;
+ private String helpUrl;
+ private String helpSupportUrl;
-
/**
* @param level
* @param msg
@@ -21,25 +22,41 @@
super();
this.level = level;
this.msg = msg;
- logDate=new Date(System.currentTimeMillis());
+ logDate = new Date(System.currentTimeMillis());
}
+
+ public String getHelpSupportUrl() {
+ return helpSupportUrl;
+ }
+
+ public void setHelpSupportUrl(String helpSupportUrl) {
+ this.helpSupportUrl = helpSupportUrl;
+ }
+
+ public String getHelpUrl() {
+ return helpUrl;
+ }
+
+ public void setHelpUrl(String helpUrl) {
+ this.helpUrl = helpUrl;
+ }
+
/**
* @param level
* @param msg
*/
- public CtuluLogRecord(CtuluLogLevel level, String msg,int id) {
+ public CtuluLogRecord(CtuluLogLevel level, String msg, int id) {
super();
this.level = level;
this.msg = msg;
- this.id=id;
- logDate=new Date(System.currentTimeMillis());
+ this.id = id;
+ logDate = new Date(System.currentTimeMillis());
}
-
+
public int getId() {
return id;
}
-
public String getLevelDetail() {
return levelDetail;
}
Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/fileformat/FileOperationWriterAbstract.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/fileformat/FileOperationWriterAbstract.java 2012-04-30 22:06:36 UTC (rev 7125)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/fileformat/FileOperationWriterAbstract.java 2012-04-30 22:31:22 UTC (rev 7126)
@@ -56,7 +56,7 @@
}
protected void donneesInvalides(final T _o){
- analyze_.addFatalError(CtuluLib.getS("Donn\xE9es invalides"));
+ analyze_.addSevereError(CtuluLib.getS("Donn\xE9es invalides"));
analyze_.addInfo(_o==null?"null":_o.getClass().toString(), 0);
}
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
