You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by va...@apache.org on 2015/07/21 22:52:20 UTC
[23/50] ode git commit: trival cleaning and unify
trival cleaning and unify
Project: http://git-wip-us.apache.org/repos/asf/ode/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/e54b5be9
Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/e54b5be9
Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/e54b5be9
Branch: refs/heads/ODE-912
Commit: e54b5be9c559fe801b1aaa7c65830927d5e6acc3
Parents: 98c4f79
Author: fangzhen <fa...@gmail.com>
Authored: Tue Jul 29 14:18:35 2014 +0800
Committer: fangzhen <fa...@gmail.com>
Committed: Tue Jul 29 14:38:56 2014 +0800
----------------------------------------------------------------------
.../java/org/apache/ode/bpel/obj/ExtensibleImpl.java | 3 +--
.../src/main/java/org/apache/ode/bpel/obj/OBase.java | 6 +++---
.../java/org/apache/ode/bpel/obj/OProcessWrapper.java | 13 ++++++-------
3 files changed, 10 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ode/blob/e54b5be9/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/ExtensibleImpl.java
----------------------------------------------------------------------
diff --git a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/ExtensibleImpl.java b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/ExtensibleImpl.java
index fc12f82..98ae216 100644
--- a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/ExtensibleImpl.java
+++ b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/ExtensibleImpl.java
@@ -6,7 +6,6 @@ import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.util.LinkedHashMap;
import java.util.Map;
-import java.util.Map.Entry;
import org.apache.ode.bpel.obj.migrate.OModelVisitor;
@@ -21,7 +20,7 @@ public class ExtensibleImpl implements Extensible<Object>, Serializable{
/** The wrapper wraps fields. Fields can be deleted, added or updated */
transient protected Map<String, Object> fieldContainer;
/** Version of this class*/
- private static String CLASS_VERSION = "classVersion";
+ private static final String CLASS_VERSION = "classVersion";
protected ExtensibleImpl() {
fieldContainer = new LinkedHashMap<String, Object>();
http://git-wip-us.apache.org/repos/asf/ode/blob/e54b5be9/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OBase.java
----------------------------------------------------------------------
diff --git a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OBase.java b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OBase.java
index 76b3089..5002214 100644
--- a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OBase.java
+++ b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OBase.java
@@ -30,10 +30,10 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
public class OBase extends ExtensibleImpl implements Serializable{
public static final long serialVersionUID = -1L;
/** Our identifier, in terms of our parent. */
- private static String ID = "_id";
+ private static final String ID = "_id";
/** Owner OProcess */
- private static String OWNER = "_owner";
- private static String DEBUG_INFO = "debugInfo";
+ private static final String OWNER = "_owner";
+ private static final String DEBUG_INFO = "debugInfo";
/**
* This should only be used by jackson when deserialize
http://git-wip-us.apache.org/repos/asf/ode/blob/e54b5be9/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OProcessWrapper.java
----------------------------------------------------------------------
diff --git a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OProcessWrapper.java b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OProcessWrapper.java
index a409b6d..365575e 100644
--- a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OProcessWrapper.java
+++ b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OProcessWrapper.java
@@ -34,13 +34,12 @@ public class OProcessWrapper extends ExtensibleImpl implements Serializable{
'5', 'S', 0x00, 'O', 'F', 'H', 0x20, 0x14, 0x05, 0x29 };
public static final byte[] CURRENT_MAGIC_NUMBER = MAGIC_NUMBER_OFH_20140529;
// key constants
- public static final String MAGIC_NUMBER = "magic";
- public static final String FORMAT = "format";
- public static final String COMPILE_TIME = "compileTime";
- public static final String GUID = "guid";
- public static final String TYPE = "type";
- public static final String PROCESS = "process";
- public static final String OTHER_HEADERS = "otherHeaders";
+ private static final String MAGIC_NUMBER = "magic";
+ private static final String FORMAT = "format";
+ private static final String COMPILE_TIME = "compileTime";
+ private static final String GUID = "guid";
+ private static final String PROCESS = "process";
+ private static final String OTHER_HEADERS = "otherHeaders";
public OProcessWrapper() {
super(new LinkedHashMap<String, Object>());