Revision: 4150
Author: solomax666
Date: Tue Aug 30 09:58:45 2011
Log: - Error types/values are fixed
http://code.google.com/p/openmeetings/source/detail?r=4150
Modified:
/branches/dev/injection/src/app/org/openmeetings/app/data/basic/ErrorManagement.java
/branches/dev/injection/src/app/org/openmeetings/app/persistence/beans/basic/ErrorValues.java
/branches/dev/injection/src/app/org/openmeetings/app/remote/ErrorService.java
/branches/dev/injection/src/test/org/openmeetings/test/error/TestErrorManagement.java
/branches/dev/injection/src/userservice/org/openmeetings/axis/services/UserWebService.java
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/data/basic/ErrorManagement.java
Sun Aug 28 04:49:49 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/data/basic/ErrorManagement.java
Tue Aug 30 09:58:45 2011
@@ -13,7 +13,6 @@
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@Transactional
@@ -23,8 +22,6 @@
@PersistenceContext
private EntityManager em;
- @Autowired
- private Fieldmanagment fieldmanagment;
public Long addErrorType(Long errortype_id, Long fieldvalues_id) {
try {
@@ -66,7 +63,7 @@
query.setParameter("errortype_id", errortype_id);
return (ErrorType) query.getSingleResult();
} catch (Exception ex2) {
- log.error("[getErrorType]", ex2);
+ log.error("[getErrorType(" + errortype_id + ")]", ex2);
}
return null;
}
@@ -76,7 +73,7 @@
try {
ErrorValues eValue = new ErrorValues();
eValue.setErrorvalues_id(errorvalues_id);
- eValue.setErrorType(getErrorType(errortype_id));
+ eValue.setErrortype_id(errortype_id);
eValue.setDeleted("false");
eValue.setStarttime(new Date());
eValue.setFieldvalues_id(fieldvalues_id);
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/persistence/beans/basic/ErrorValues.java
Sun Aug 28 04:49:49 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/persistence/beans/basic/ErrorValues.java
Tue Aug 30 09:58:45 2011
@@ -5,10 +5,7 @@
import javax.persistence.Column;
import javax.persistence.Entity;
-import javax.persistence.FetchType;
import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
import javax.persistence.Table;
@Entity
@@ -19,11 +16,8 @@
@Id
@Column(name = "errorvalues_id")
private Long errorvalues_id;
-
- @ManyToOne(fetch = FetchType.EAGER)
- @JoinColumn(name = "errortype_id", updatable = true, insertable = true)
- private ErrorType errorType;
-
+ @Column(name = "errortype_id")
+ private Long errortype_id;
@Column(name = "fieldvalues_id")
private Long fieldvalues_id;
@Column(name = "starttime")
@@ -64,15 +58,7 @@
public void setDeleted(String deleted) {
this.deleted = deleted;
}
-
- public ErrorType getErrorType() {
- return errorType;
- }
-
- public void setErrorType(ErrorType errorType) {
- this.errorType = errorType;
- }
-
+
public Long getFieldvalues_id() {
return fieldvalues_id;
}
@@ -82,10 +68,11 @@
}
public Long getErrortype_id() {
- return errorType.getErrortype_id();
+ //return errorType.getErrortype_id();
+ return errortype_id;
}
public void setErrortype_id(Long errortype_id) {
- errorType.setErrortype_id(errortype_id);
+ this.errortype_id = errortype_id;
}
}
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/remote/ErrorService.java
Sun Aug 28 04:49:49 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/remote/ErrorService.java
Tue Aug 30 09:58:45 2011
@@ -43,9 +43,9 @@
ErrorValues eValues =
errorManagement.getErrorValuesById(-1
* errorid);
if (eValues != null) {
- log.debug("" + eValues.getFieldvalues_id());
+ log.debug("eValues.getFieldvalues_id() = " +
eValues.getFieldvalues_id());
//
log.debug(eValues.getFieldvalues().getFieldvalues_id());
- // log.debug(eValues.getErrorType());
+ log.debug("eValues.getErrorType() = " +
errorManagement.getErrorType(eValues.getErrortype_id()));
//
log.debug(eValues.getErrorType().getErrortype_id());
//
log.debug(eValues.getErrorType().getFieldvalues());
//
log.debug(eValues.getErrorType().getFieldvalues().getFieldvalues_id());
@@ -53,7 +53,7 @@
.getFieldByIdAndLanguage(eValues.getFieldvalues_id(),
language_id);
Fieldlanguagesvalues typeValue = fieldmanagment
-
.getFieldByIdAndLanguage(eValues.getErrorType()
+
.getFieldByIdAndLanguage(errorManagement.getErrorType(eValues.getErrortype_id())
.getFieldvalues_id(), language_id);
if (errorValue != null) {
return new ErrorResult(errorid,
errorValue.getValue(),
=======================================
---
/branches/dev/injection/src/test/org/openmeetings/test/error/TestErrorManagement.java
Sun Aug 28 04:49:49 2011
+++
/branches/dev/injection/src/test/org/openmeetings/test/error/TestErrorManagement.java
Tue Aug 30 09:58:45 2011
@@ -51,7 +51,7 @@
assertNotNull("Errorvalues Id should persists", errorValuesId);
ErrorValues ev =
errorManagement.getErrorValuesById(errorValuesId);
- assertNotNull("Error type should not be null",
ev.getErrorType());
+ assertNotNull("Error type id should not be null",
ev.getErrortype_id());
assertEquals("Error type should persists", errorTypeId,
ev.getErrortype_id());
assertNotNull("Fieldvalues should not be null",
ev.getFieldvalues_id());
=======================================
---
/branches/dev/injection/src/userservice/org/openmeetings/axis/services/UserWebService.java
Sun Aug 28 04:49:49 2011
+++
/branches/dev/injection/src/userservice/org/openmeetings/axis/services/UserWebService.java
Tue Aug 30 09:58:45 2011
@@ -115,7 +115,7 @@
.getFieldByIdAndLanguage(
eValues.getFieldvalues_id(), language_id);
Fieldlanguagesvalues typeValue =
fieldmanagment
-
.getFieldByIdAndLanguage(eValues.getErrorType()
+
.getFieldByIdAndLanguage(errorManagement.getErrorType(eValues.getErrortype_id())
.getFieldvalues_id(), language_id);
if (errorValue != null) {
return new ErrorResult(errorid,
errorValue.getValue(),
--
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en.
