Index: .idea/sonarIssues.xml
===================================================================
diff -u -r3aa7947c5189c7aaf8b01d2eb8df3fb4e79a04e0 -rf384fdaf3ce3e68e450e432ba89f045a5c8b99e3
--- .idea/sonarIssues.xml (.../sonarIssues.xml) (revision 3aa7947c5189c7aaf8b01d2eb8df3fb4e79a04e0)
+++ .idea/sonarIssues.xml (.../sonarIssues.xml) (revision f384fdaf3ce3e68e450e432ba89f045a5c8b99e3)
@@ -963,11 +963,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1363,6 +1378,56 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: standard/project/web/src/main/java/egovframework/com/ext/jstree/springHibernate/core/vo/JsTreeHibernateBaseDTO.java
===================================================================
diff -u -r29fd864ddfe9ed46b56befbfdb21e46913b2043e -rf384fdaf3ce3e68e450e432ba89f045a5c8b99e3
--- standard/project/web/src/main/java/egovframework/com/ext/jstree/springHibernate/core/vo/JsTreeHibernateBaseDTO.java (.../JsTreeHibernateBaseDTO.java) (revision 29fd864ddfe9ed46b56befbfdb21e46913b2043e)
+++ standard/project/web/src/main/java/egovframework/com/ext/jstree/springHibernate/core/vo/JsTreeHibernateBaseDTO.java (.../JsTreeHibernateBaseDTO.java) (revision f384fdaf3ce3e68e450e432ba89f045a5c8b99e3)
@@ -1,19 +1,13 @@
package egovframework.com.ext.jstree.springHibernate.core.vo;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import javax.persistence.*;
import java.io.Serializable;
import java.util.Collection;
import java.util.HashMap;
-import javax.persistence.Column;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.MappedSuperclass;
-import javax.persistence.Transient;
-
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
-
@MappedSuperclass
public abstract class JsTreeHibernateBaseDTO implements Serializable {
@@ -93,7 +87,6 @@
private long id; // moveNode
private final HashMap attr;
- private volatile long hashCode;
public JsTreeHibernateBaseDTO() {
super();
@@ -412,73 +405,5 @@
return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);
}
- @Override
- @Transient
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- JsTreeHibernateBaseDTO that = (JsTreeHibernateBaseDTO) o;
-
- if (c_id != that.c_id)
- return false;
- if (c_left != that.c_left)
- return false;
- if (c_level != that.c_level)
- return false;
- if (c_parentid != that.c_parentid)
- return false;
- if (c_position != that.c_position)
- return false;
- if (c_right != that.c_right)
- return false;
- if (copy != that.copy)
- return false;
- if (fixCopyId != that.fixCopyId)
- return false;
- if (fixCopyPosition != that.fixCopyPosition)
- return false;
- if (hashCode != that.hashCode)
- return false;
- if (id != that.id)
- return false;
- if (idif != that.idif)
- return false;
- if (idifLeft != that.idifLeft)
- return false;
- if (idifRight != that.idifRight)
- return false;
- if (ldif != that.ldif)
- return false;
- if (multiCounter != that.multiCounter)
- return false;
- if (ref != that.ref)
- return false;
- if (rightPositionFromNodeByRef != that.rightPositionFromNodeByRef)
- return false;
- if (spaceOfTargetNode != that.spaceOfTargetNode)
- return false;
- if (status != that.status)
- return false;
- if (!attr.equals(that.attr))
- return false;
- if (c_idsByChildNodeFromNodeById != null ? !c_idsByChildNodeFromNodeById
- .equals(that.c_idsByChildNodeFromNodeById) : that.c_idsByChildNodeFromNodeById != null)
- return false;
- if (c_title != null ? !c_title.equals(that.c_title) : that.c_title != null)
- return false;
- if (c_type != null ? !c_type.equals(that.c_type) : that.c_type != null)
- return false;
- if (childcount != null ? !childcount.equals(that.childcount) : that.childcount != null)
- return false;
- if (nodeById != null ? !nodeById.equals(that.nodeById) : that.nodeById != null)
- return false;
- if (searchStr != null ? !searchStr.equals(that.searchStr) : that.searchStr != null)
- return false;
-
- return true;
- }
-
}
Index: standard/project/web/src/main/java/egovframework/com/ext/jstree/springHibernate/core/vo/JsTreeHibernateDTO.java
===================================================================
diff -u -r299ac81aa5e774f3c26bd26f16b42fbca5ad7552 -rf384fdaf3ce3e68e450e432ba89f045a5c8b99e3
--- standard/project/web/src/main/java/egovframework/com/ext/jstree/springHibernate/core/vo/JsTreeHibernateDTO.java (.../JsTreeHibernateDTO.java) (revision 299ac81aa5e774f3c26bd26f16b42fbca5ad7552)
+++ standard/project/web/src/main/java/egovframework/com/ext/jstree/springHibernate/core/vo/JsTreeHibernateDTO.java (.../JsTreeHibernateDTO.java) (revision f384fdaf3ce3e68e450e432ba89f045a5c8b99e3)
@@ -1,18 +1,13 @@
package egovframework.com.ext.jstree.springHibernate.core.vo;
-import java.io.Serializable;
+import org.hibernate.annotations.*;
import javax.persistence.Entity;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import javax.persistence.Transient;
+import java.io.Serializable;
-import org.hibernate.annotations.Cache;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
-import org.hibernate.annotations.DynamicInsert;
-import org.hibernate.annotations.DynamicUpdate;
-import org.hibernate.annotations.SelectBeforeUpdate;
-
@Entity
@Table(name = "T_COMPREHENSIVETREE_HIBER")
@SelectBeforeUpdate(value=true)
Index: standard/project/web/src/main/java/egovframework/com/ext/jstree/springHibernate/core/vo/JsTreeHibernatePaginatedDTO.java
===================================================================
diff -u -r29fd864ddfe9ed46b56befbfdb21e46913b2043e -rf384fdaf3ce3e68e450e432ba89f045a5c8b99e3
--- standard/project/web/src/main/java/egovframework/com/ext/jstree/springHibernate/core/vo/JsTreeHibernatePaginatedDTO.java (.../JsTreeHibernatePaginatedDTO.java) (revision 29fd864ddfe9ed46b56befbfdb21e46913b2043e)
+++ standard/project/web/src/main/java/egovframework/com/ext/jstree/springHibernate/core/vo/JsTreeHibernatePaginatedDTO.java (.../JsTreeHibernatePaginatedDTO.java) (revision f384fdaf3ce3e68e450e432ba89f045a5c8b99e3)
@@ -1,16 +1,13 @@
package egovframework.com.ext.jstree.springHibernate.core.vo;
-import java.io.Serializable;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo;
+import org.apache.commons.lang3.builder.ToStringBuilder;
import javax.persistence.MappedSuperclass;
import javax.persistence.Transient;
+import java.io.Serializable;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-
-import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo;
-
@MappedSuperclass
public abstract class JsTreeHibernatePaginatedDTO extends JsTreeHibernateBaseDTO implements Serializable{
Index: standard/project/web/src/main/java/egovframework/com/ext/jstree/springHibernate/core/vo/JsTreeHibernateSearchDTO.java
===================================================================
diff -u -r29fd864ddfe9ed46b56befbfdb21e46913b2043e -rf384fdaf3ce3e68e450e432ba89f045a5c8b99e3
--- standard/project/web/src/main/java/egovframework/com/ext/jstree/springHibernate/core/vo/JsTreeHibernateSearchDTO.java (.../JsTreeHibernateSearchDTO.java) (revision 29fd864ddfe9ed46b56befbfdb21e46913b2043e)
+++ standard/project/web/src/main/java/egovframework/com/ext/jstree/springHibernate/core/vo/JsTreeHibernateSearchDTO.java (.../JsTreeHibernateSearchDTO.java) (revision f384fdaf3ce3e68e450e432ba89f045a5c8b99e3)
@@ -1,26 +1,14 @@
package egovframework.com.ext.jstree.springHibernate.core.vo;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.persistence.Transient;
-
-import org.hibernate.criterion.Criterion;
-import org.hibernate.criterion.Disjunction;
-import org.hibernate.criterion.MatchMode;
-import org.hibernate.criterion.Order;
-import org.hibernate.criterion.Projection;
-import org.hibernate.criterion.Restrictions;
-
import com.fasterxml.jackson.annotation.JsonIgnore;
-
import egovframework.com.ext.jstree.support.util.StringUtils;
import egovframework.com.ext.jstree.support.util.Text;
+import org.hibernate.criterion.*;
+import javax.persistence.Transient;
+import java.io.Serializable;
+import java.util.*;
+
public abstract class JsTreeHibernateSearchDTO extends JsTreeHibernatePaginatedDTO implements Serializable {
private static final long serialVersionUID = 2591336265806317114L;