Index: standard/project/web/src/main/java/egovframework/com/ext/jstree/strutsiBatis/core/actionController/C_MoveNode.java =================================================================== diff -u -rb02423f6d5e1e3a4bb8c9086682209556611f3e8 -r7dae9ff2d50bef587d8bf46344fc2e2d306878e8 --- standard/project/web/src/main/java/egovframework/com/ext/jstree/strutsiBatis/core/actionController/C_MoveNode.java (.../C_MoveNode.java) (revision b02423f6d5e1e3a4bb8c9086682209556611f3e8) +++ standard/project/web/src/main/java/egovframework/com/ext/jstree/strutsiBatis/core/actionController/C_MoveNode.java (.../C_MoveNode.java) (revision 7dae9ff2d50bef587d8bf46344fc2e2d306878e8) @@ -97,11 +97,11 @@ if (request.getParameter("c_id") == null || request.getParameter("c_position") == null || request.getParameter("copy") == null || request.getParameter("multiCounter") == null || request.getParameter("ref") == null) { throw new RuntimeException("invalid parameters Null"); } else { - if (request.getParameter("ref").equals("0")) { + if ("0".equals(request.getParameter("ref"))) { throw new RuntimeException("moveNode ref value is 0"); } - if (request.getParameter("c_id").equals("0") || request.getParameter("c_id").equals("1")) { + if ("0".equals(request.getParameter("c_id")) || "1".equals(request.getParameter("c_id"))) { throw new RuntimeException("invalid parameters c_id is 0 or 1"); } Index: standard/project/web/src/main/java/egovframework/com/ext/jstree/strutsiBatis/core/actionController/C_RemoveNode.java =================================================================== diff -u -rc3fe7d88a1bde5257b7456bc4c5846eba00e7772 -r7dae9ff2d50bef587d8bf46344fc2e2d306878e8 --- standard/project/web/src/main/java/egovframework/com/ext/jstree/strutsiBatis/core/actionController/C_RemoveNode.java (.../C_RemoveNode.java) (revision c3fe7d88a1bde5257b7456bc4c5846eba00e7772) +++ standard/project/web/src/main/java/egovframework/com/ext/jstree/strutsiBatis/core/actionController/C_RemoveNode.java (.../C_RemoveNode.java) (revision 7dae9ff2d50bef587d8bf46344fc2e2d306878e8) @@ -1,112 +1,103 @@ package egovframework.com.ext.jstree.strutsiBatis.core.actionController; -import java.util.Map; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import org.apache.log4j.Logger; -import org.apache.struts2.interceptor.RequestAware; -import org.apache.struts2.interceptor.ServletRequestAware; -import org.apache.struts2.interceptor.SessionAware; - import com.opensymphony.xwork2.Action; import com.opensymphony.xwork2.ActionSupport; import com.opensymphony.xwork2.ModelDriven; import com.opensymphony.xwork2.Preparable; - import egovframework.com.ext.jstree.strutsiBatis.core.service.I_S_RemoveNode; import egovframework.com.ext.jstree.strutsiBatis.core.service.Util_SwapNode; import egovframework.com.ext.jstree.strutsiBatis.core.vo.T_ComprehensiveTree; +import org.apache.log4j.Logger; +import org.apache.struts2.interceptor.RequestAware; +import org.apache.struts2.interceptor.ServletRequestAware; +import org.apache.struts2.interceptor.SessionAware; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.Map; + /** * Modification Information - * + * * @author 이동민 - * @since 2014.07.28 * @version 1.0 * @see
- * 
+ *
  * Class Name 	: C_RemoveNode.java
  * Description 	: JSTree의 node를 제거하는  actionController 클래스
- * Infomation	: 
+ * Infomation	:
  *
  * jstree의 node의 제거
- * 
+ *
  *  << 개정이력(Modification Information) >>
- *  
+ *
  *  수정일         수정자             수정내용
  *  -------      ------------   -----------------------
- *  2014.07.28    Dongmin.Lee      최초 생성 
- * 
+ *  2014.07.28    Dongmin.Lee      최초 생성
+ *
  *  Copyright (C) 2007 by 313 DeveloperGroup  All right reserved.
  * 
- * */ + * @since 2014.07.28 + */ @SuppressWarnings("rawtypes") -public class C_RemoveNode extends ActionSupport implements Preparable, - ModelDriven, ServletRequestAware, SessionAware, RequestAware { +public class C_RemoveNode extends ActionSupport implements Preparable, ModelDriven, ServletRequestAware, SessionAware, RequestAware { - private static final long serialVersionUID = 7795427982040661127L; + private static final long serialVersionUID = 7795427982040661127L; - static Logger logger = Logger.getLogger(C_RemoveNode.class); + static Logger logger = Logger.getLogger(C_RemoveNode.class); - T_ComprehensiveTree t_ComprehensiveTree; + T_ComprehensiveTree t_ComprehensiveTree; - @Resource(name="S_RemoveNode") - I_S_RemoveNode i_S_RemoveNode; + @Resource(name = "S_RemoveNode") + I_S_RemoveNode i_S_RemoveNode; - HttpServletRequest request; - Map sessionMap; - Map requestMap; + HttpServletRequest request; + Map sessionMap; + Map requestMap; - @Override - public void setServletRequest(HttpServletRequest request) { - this.request = request; - } + @Override + public void setServletRequest(HttpServletRequest request) { + this.request = request; + } - @Override - public void setSession(Map session) { - this.sessionMap = session; - } + @Override + public void setSession(Map session) { + this.sessionMap = session; + } - @Override - public void setRequest(Map requestMap) { - this.requestMap = requestMap; - } + @Override + public void setRequest(Map requestMap) { + this.requestMap = requestMap; + } - @Override - public Object getModel() { - return t_ComprehensiveTree; - } + @Override + public Object getModel() { + return t_ComprehensiveTree; + } - @Override - public void prepare() throws Exception { - t_ComprehensiveTree = new T_ComprehensiveTree(); - } + @Override + public void prepare() throws Exception { + t_ComprehensiveTree = new T_ComprehensiveTree(); + } - @Override - public String execute() { + @Override + public String execute() { - i_S_RemoveNode.setRequest(request); + i_S_RemoveNode.setRequest(request); + t_ComprehensiveTree.setStatus(i_S_RemoveNode.executeRemoveNode(Util_SwapNode.swapTtoP(t_ComprehensiveTree))); + return Action.SUCCESS; + } - t_ComprehensiveTree - .setStatus(i_S_RemoveNode.executeRemoveNode(Util_SwapNode - .swapTtoP(t_ComprehensiveTree))); + @Override + public void validate() { - return Action.SUCCESS; - } + if (request.getParameter("c_id") == null) { + throw new RuntimeException(); + } else { + if ("0".equals(request.getParameter("c_id"))|| "1".equals(request.getParameter("c_id"))) { + throw new RuntimeException(); + } + } - @Override - public void validate() { - - if (request.getParameter("c_id") == null) { - throw new RuntimeException(); - } else { - if (request.getParameter("c_id").equals("0") - || request.getParameter("c_id").equals("1")) { - throw new RuntimeException(); - } - } - - } + } } Index: standard/project/web/src/main/java/egovframework/com/ext/jstree/strutsiBatis/core/actionController/C_SearchNode.java =================================================================== diff -u -ra0c206993c202375dd04d37db3d17c843482684e -r7dae9ff2d50bef587d8bf46344fc2e2d306878e8 --- standard/project/web/src/main/java/egovframework/com/ext/jstree/strutsiBatis/core/actionController/C_SearchNode.java (.../C_SearchNode.java) (revision a0c206993c202375dd04d37db3d17c843482684e) +++ standard/project/web/src/main/java/egovframework/com/ext/jstree/strutsiBatis/core/actionController/C_SearchNode.java (.../C_SearchNode.java) (revision 7dae9ff2d50bef587d8bf46344fc2e2d306878e8) @@ -1,109 +1,103 @@ package egovframework.com.ext.jstree.strutsiBatis.core.actionController; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import org.apache.log4j.Logger; -import org.apache.struts2.interceptor.RequestAware; -import org.apache.struts2.interceptor.ServletRequestAware; -import org.apache.struts2.interceptor.SessionAware; - import com.opensymphony.xwork2.Action; import com.opensymphony.xwork2.ActionSupport; import com.opensymphony.xwork2.ModelDriven; import com.opensymphony.xwork2.Preparable; - import egovframework.com.ext.jstree.strutsiBatis.core.dto.P_ComprehensiveTree; import egovframework.com.ext.jstree.strutsiBatis.core.service.I_S_SearchNode; import egovframework.com.ext.jstree.strutsiBatis.core.service.Util_TitleChecker; +import org.apache.log4j.Logger; +import org.apache.struts2.interceptor.RequestAware; +import org.apache.struts2.interceptor.ServletRequestAware; +import org.apache.struts2.interceptor.SessionAware; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + /** * Modification Information - * + * * @author 이동민 - * @since 2014.07.28 * @version 1.0 * @see
- * 
+ *
  * Class Name 	: C_SearchNode.java
  * Description 	: JSTree의 node의 정보를 조회하는  actionController 클래스
- * Infomation	: 
+ * Infomation	:
  *
  * jstree의 정보를 조회한다.
- * 
+ *
  *  << 개정이력(Modification Information) >>
- *  
+ *
  *  수정일         수정자             수정내용
  *  -------      ------------   -----------------------
- *  2014.07.28    Dongmin.Lee      최초 생성 
- * 
+ *  2014.07.28    Dongmin.Lee      최초 생성
+ *
  *  Copyright (C) 2007 by 313 DeveloperGroup  All right reserved.
  * 
- * */ + * @since 2014.07.28 + */ @SuppressWarnings("rawtypes") public class C_SearchNode extends ActionSupport implements Preparable, - ModelDriven, ServletRequestAware, SessionAware, RequestAware { + ModelDriven, ServletRequestAware, SessionAware, RequestAware { - private static final long serialVersionUID = 4187246952455486758L; - static Logger logger = Logger.getLogger(C_SearchNode.class); + private static final long serialVersionUID = 4187246952455486758L; + static Logger logger = Logger.getLogger(C_SearchNode.class); - List searchNodeResults; - P_ComprehensiveTree p_ComprehensiveTree; + List searchNodeResults; + P_ComprehensiveTree p_ComprehensiveTree; - @Resource(name="S_SearchNode") - I_S_SearchNode i_S_SearchNode; + @Resource(name = "S_SearchNode") + I_S_SearchNode i_S_SearchNode; - HttpServletRequest request; - Map sessionMap; - Map requestMap; + HttpServletRequest request; + Map sessionMap; + Map requestMap; - @Override - public void setServletRequest(HttpServletRequest request) { - this.request = request; - } + @Override + public void setServletRequest(HttpServletRequest request) { + this.request = request; + } - @Override - public void setSession(Map session) { - this.sessionMap = session; - } + @Override + public void setSession(Map session) { + this.sessionMap = session; + } - @Override - public void setRequest(Map requestMap) { - this.requestMap = requestMap; - } + @Override + public void setRequest(Map requestMap) { + this.requestMap = requestMap; + } - @Override - public Object getModel() { - return searchNodeResults; - } + @Override + public Object getModel() { + return searchNodeResults; + } - @Override - public void prepare() throws Exception { - p_ComprehensiveTree = new P_ComprehensiveTree(); - searchNodeResults = new ArrayList(); - } + @Override + public void prepare() throws Exception { + p_ComprehensiveTree = new P_ComprehensiveTree(); + searchNodeResults = new ArrayList(); + } - @Override - public String execute() { - i_S_SearchNode.setRequest(request); - p_ComprehensiveTree.setSearchStr(Util_TitleChecker - .StringReplace(request.getParameter("searchString"))); + @Override + public String execute() { + i_S_SearchNode.setRequest(request); + p_ComprehensiveTree.setSearchStr(Util_TitleChecker.StringReplace(request.getParameter("searchString"))); + searchNodeResults.addAll(i_S_SearchNode.searchNode(p_ComprehensiveTree)); + return Action.SUCCESS; + } - searchNodeResults - .addAll(i_S_SearchNode.searchNode(p_ComprehensiveTree)); - return Action.SUCCESS; - } + @Override + public void validate() { - @Override - public void validate() { + if (request.getParameter("searchString") == null) { + throw new RuntimeException(); + } - if (request.getParameter("searchString") == null) { - throw new RuntimeException(); - } - - } + } } \ No newline at end of file Index: standard/project/web/src/main/java/egovframework/com/ext/jstree/strutsiBatis/core/actionController/CoreController.java =================================================================== diff -u -rc3fe7d88a1bde5257b7456bc4c5846eba00e7772 -r7dae9ff2d50bef587d8bf46344fc2e2d306878e8 --- standard/project/web/src/main/java/egovframework/com/ext/jstree/strutsiBatis/core/actionController/CoreController.java (.../CoreController.java) (revision c3fe7d88a1bde5257b7456bc4c5846eba00e7772) +++ standard/project/web/src/main/java/egovframework/com/ext/jstree/strutsiBatis/core/actionController/CoreController.java (.../CoreController.java) (revision 7dae9ff2d50bef587d8bf46344fc2e2d306878e8) @@ -1,82 +1,76 @@ package egovframework.com.ext.jstree.strutsiBatis.core.actionController; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; - -import org.apache.struts2.interceptor.RequestAware; -import org.apache.struts2.interceptor.ServletRequestAware; -import org.apache.struts2.interceptor.SessionAware; - import com.opensymphony.xwork2.Action; import com.opensymphony.xwork2.ActionSupport; import com.opensymphony.xwork2.ModelDriven; import com.opensymphony.xwork2.Preparable; +import org.apache.struts2.interceptor.RequestAware; +import org.apache.struts2.interceptor.ServletRequestAware; +import org.apache.struts2.interceptor.SessionAware; +import javax.servlet.http.HttpServletRequest; +import java.util.Map; + /** * Modification Information - * + * * @author 이동민 - * @since 2014.07.28 * @version 1.0 * @see
- * 
+ *
  * Class Name 	: C_GetChildNode.java
  * Description 	: JSTree의 하위 node의 정보를 가져오는 actionController 클래스
- * Infomation	: 
- * 
+ * Infomation	:
+ *
  * jstree의 하위 node의 정보를 가져온다.
- * 
+ *
  *  << 개정이력(Modification Information) >>
- *  
+ *
  *  수정일         수정자             수정내용
  *  -------      ------------   -----------------------
- *  2014.07.28    Dongmin.Lee      최초 생성 
- * 
+ *  2014.07.28    Dongmin.Lee      최초 생성
+ *
  *  Copyright (C) 2007 by 313 DeveloperGroup  All right reserved.
  * 
- * */ + * @since 2014.07.28 + */ @SuppressWarnings("rawtypes") -public class CoreController extends ActionSupport implements Preparable, ModelDriven, ServletRequestAware, - SessionAware, RequestAware { - /** - * - */ - private static final long serialVersionUID = -727128969816759415L; +public class CoreController extends ActionSupport implements Preparable, ModelDriven, ServletRequestAware, SessionAware, RequestAware { + private static final long serialVersionUID = -727128969816759415L; - HttpServletRequest request; - Map sessionMap; - Map requestMap; + HttpServletRequest request; + Map sessionMap; + Map requestMap; - @Override - public Object getModel() { - return null; - } + @Override + public Object getModel() { + return null; + } - @Override - public void prepare() throws Exception { - } + @Override + public void prepare() throws Exception { + } - @Override - public void setServletRequest(HttpServletRequest request) { - this.request = request; + @Override + public void setServletRequest(HttpServletRequest request) { + this.request = request; - } + } - @Override - public void setSession(Map session) { - this.sessionMap = session; - } + @Override + public void setSession(Map session) { + this.sessionMap = session; + } - @Override - public void setRequest(Map requestMap) { - this.requestMap = requestMap; - } + @Override + public void setRequest(Map requestMap) { + this.requestMap = requestMap; + } - @Override - public String execute() { - return Action.SUCCESS; - } + @Override + public String execute() { + return Action.SUCCESS; + } }