CLOUDSTACK-1176 1) remove 'final' modifier from id attribute in SnapshotVO 2) make state setter method comply with convention

Mice Xia · Mice Xia · commit 13a4c0670ee2 · 2013-02-07T13:41:49.000+08:00
diff --git a/core/src/com/cloud/storage/SnapshotVO.java b/core/src/com/cloud/storage/SnapshotVO.java
@@ -31,7 +31,7 @@ public class SnapshotVO implements Snapshot {
     @Id
     @GeneratedValue(strategy=GenerationType.IDENTITY)
     @Column(name="id")
-    private final long id = -1;
+    private long id;
 
     @Column(name="data_center_id")
     long dataCenterId;
@@ -248,7 +248,7 @@ public State getState() {
         return state;
     }
 
-	public void setStatus(State state) {
+	public void setState(State state) {
         this.state = state;
     }
 
diff --git a/server/src/com/cloud/storage/dao/SnapshotDaoImpl.java b/server/src/com/cloud/storage/dao/SnapshotDaoImpl.java
@@ -328,7 +328,7 @@ public boolean updateState(State currentState, Event event, State nextState, Sna
         Transaction txn = Transaction.currentTxn();
         txn.start();
         SnapshotVO snapshotVO = (SnapshotVO)snapshot;
-        snapshotVO.setStatus(nextState);
+        snapshotVO.setState(nextState);
         super.update(snapshotVO.getId(), snapshotVO);
         txn.commit();
         return true;

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public class SnapshotVO implements Snapshot {`
`31`	`31`	`@Id`
`32`	`32`	`@GeneratedValue(strategy=GenerationType.IDENTITY)`
`33`	`33`	`@Column(name="id")`
`34`		`- private final long id = -1;`
	`34`	`+ private long id;`
`35`	`35`
`36`	`36`	`@Column(name="data_center_id")`
`37`	`37`	`long dataCenterId;`
`@@ -248,7 +248,7 @@ public State getState() {`
`248`	`248`	`return state;`
`249`	`249`	`}`
`250`	`250`
`251`		`- public void setStatus(State state) {`
	`251`	`+ public void setState(State state) {`
`252`	`252`	`this.state = state;`
`253`	`253`	`}`
`254`	`254`