Author: solomax
Date: Wed May 30 03:38:36 2012
New Revision: 1344088
URL: http://svn.apache.org/viewvc?rev=1344088&view=rev
Log:
OPENMEETINGS-297 fixed
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Statemanagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/adresses/States.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupImportController.java
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Statemanagement.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Statemanagement.java?rev=1344088&r1=1344087&r2=1344088&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Statemanagement.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Statemanagement.java
Wed May 30 03:38:36 2012
@@ -45,16 +45,30 @@ public class Statemanagement {
private EntityManager em;
/**
+ * adds a new State to the states table with no short name and code
+ *
+ * @param name
+ * @return the id of the new state or null if an error occurred
+ */
+ public Long addState(String name) {
+ return addState(name, "", 0);
+ }
+
+ /**
* adds a new State to the states table
*
- * @param statename
+ * @param name the name of the country
+ * @param shortName the short name of the country
+ * @param code the code of the country
* @return the id of the new state or null if an error occurred
*/
- public Long addState(String statename) {
+ public Long addState(String name, String shortName, int code) {
try {
States st = new States();
- st.setName(statename);
+ st.setName(name);
+ st.setShortName(shortName);
+ st.setCode(code);
st.setStarttime(new Date());
st.setDeleted("false");
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java?rev=1344088&r1=1344087&r2=1344088&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
Wed May 30 03:38:36 2012
@@ -741,9 +741,11 @@ public class ImportInitvalues {
for (@SuppressWarnings("rawtypes")
Iterator it = root.elementIterator("country"); it.hasNext();) {
Element item = (Element) it.next();
- String country = item.attributeValue("name");
- statemanagement.addState(country);
+ statemanagement.addState(
+ item.attributeValue("name")
+ , item.attributeValue("short")
+ ,
Integer.parseInt(item.attributeValue("code")));
}
log.debug("Countries ADDED");
}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/adresses/States.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/adresses/States.java?rev=1344088&r1=1344087&r2=1344088&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/adresses/States.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/adresses/States.java
Wed May 30 03:38:36 2012
@@ -24,38 +24,35 @@ import java.util.Date;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
-
-
@Entity
@Table(name = "states")
public class States implements Serializable {
-
private static final long serialVersionUID = -1629546369219451403L;
@Id
- @GeneratedValue
-
- @Column(name="state_id")
- private Long state_id;
- @Column(name="name")
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ @Column(name = "state_id")
+ private Long state_id;
+ @Column(name = "name")
private String name;
- @Column(name="starttime")
+ @Column(name = "starttime")
private Date starttime;
- @Column(name="updatetime")
+ @Column(name = "updatetime")
private Date updatetime;
- @Column(name="deleted")
+ @Column(name = "deleted")
private String deleted;
-
- public States() {
- super();
- // TODO Auto-generated constructor stub
- }
+ @Column(name = "shortName")
+ private String shortName;
+ @Column(name = "code")
+ private int code;
public String getName() {
return name;
}
+
public void setName(String name) {
this.name = name;
}
@@ -63,29 +60,48 @@ public class States implements Serializa
public Long getState_id() {
return state_id;
}
+
public void setState_id(Long state_id) {
this.state_id = state_id;
}
-
+
public Date getStarttime() {
return starttime;
}
+
public void setStarttime(Date starttime) {
this.starttime = starttime;
}
-
+
public Date getUpdatetime() {
return updatetime;
}
+
public void setUpdatetime(Date updatetime) {
this.updatetime = updatetime;
}
-
+
public String getDeleted() {
return deleted;
}
+
public void setDeleted(String deleted) {
this.deleted = deleted;
}
-
+
+ public String getShortName() {
+ return shortName;
+ }
+
+ public void setShortName(String shortName) {
+ this.shortName = shortName;
+ }
+
+ public int getCode() {
+ return code;
+ }
+
+ public void setCode(int code) {
+ this.code = code;
+ }
}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupImportController.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupImportController.java?rev=1344088&r1=1344087&r2=1344088&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupImportController.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupImportController.java
Wed May 30 03:38:36 2012
@@ -1086,7 +1086,7 @@ public class BackupImportController exte
States st =
statemanagement.getStateById(state_id);
if (st == null) {
-
statemanagement.getStateById(1L);
+ st =
statemanagement.getStateById(1L);
}
us.setAdresses(street, zip,
town,
