opengl, network : change sequence number type

Signed-off-by: Hyunjong.park <phjwithyou.park@samsung.com>
Conflicts:
	org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/data/NetworkAPIDBManager.java
	org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/data/NetworkDataManager.java
	org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/data/type/NetworkAPIType.java
	org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/DB/GLAPIDBTableManager.java
	org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/DB/GLFrameTimeDBTableManager.java
	org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/type/GLAPIData.java

Change-Id: I033d44108ef4602c8b468cfc6432095497d6f5ac

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/data/NetworkAPIDBManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/data/NetworkAPIDBManager.java
index 0ae9071..9c12505 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/data/NetworkAPIDBManager.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/data/NetworkAPIDBManager.java
@@ -206,7 +206,7 @@ public class NetworkAPIDBManager extends DBTable {
                        isPrepared = false;
                } else {
                        try {
-                               prep.setInt(DB_SEQ_INDEX + 1, (Integer) (rowData.get(DB_SEQ_INDEX)));
+                               prep.setLong(DB_SEQ_INDEX + 1, (Long) (rowData.get(DB_SEQ_INDEX)));
                                prep.setString(DB_DESTINATION_ADDRESS_INDEX + 1,
                                                (String) (rowData.get(DB_DESTINATION_ADDRESS_INDEX)));
                                prep.setString(DB_FD_VALUE_INDEX + 1, (String) (rowData.get(DB_FD_VALUE_INDEX)));

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/DB/GLAPIDBTableManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/DB/GLAPIDBTableManager.java
index f2d277a..121d515 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/DB/GLAPIDBTableManager.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/DB/GLAPIDBTableManager.java
@@ -158,7 +158,7 @@ public class GLAPIDBTableManager extends DBTable {
                        isPrepared = false;
                } else {
                        try {
-                               prep.setInt(TABLE_SEQ_INDEX + 1, (Integer) (rowData.get(TABLE_SEQ_INDEX)));
+                               prep.setLong(TABLE_SEQ_INDEX + 1, (Long) (rowData.get(TABLE_SEQ_INDEX)));
                                prep.setLong(TABLE_CONTEXT_ID_INDEX + 1,
                                                (Long) (rowData.get(TABLE_CONTEXT_ID_INDEX)));
                                prep.setInt(TABLE_FRAME_INDEX_INDEX + 1,

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/DB/GLCommonStateDBTableManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/DB/GLCommonStateDBTableManager.java
index c49707a..195e46a 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/DB/GLCommonStateDBTableManager.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/DB/GLCommonStateDBTableManager.java
@@ -42,7 +42,8 @@ public class GLCommonStateDBTableManager extends DBTable {
        private String[] columnName = null;
        private int rid = 0;
        private static final String SELECT_CONTEXT_TABLE__QUERY = "select RID, SEQ, CONTEXT_ID, VIEWPORT, BLEND_ENABLED, BLEND_COLOR, BLEND_DEST_RGB, BLEND_DEST_ALPHA, BLEND_EQUATION_RGB, BLEND_EQUATION_ALPHA, BLEND_SRC_RGB, BLEND_SRC_ALPHA, CULLING_ENABLED, CULLING_ORIENTATION, CULLING_MODE, DEPTH_ENABLED, DEPTH_FUNC, DEPTH_RANGE_N, DEPTH_RANGE_F, DITHER_ENABLED, FRAME_BUFFER_BINDING, LINE_WIDTH, POLY_ENABLED, POLY_FACTOR, POLY_UNITS, SCISSOR_ENABLED, SCISSOR, STENCIL_ENABLED, STENCIL_FRONT_FUNC, STENCIL_FRONT_REF, STENCIL_FRONT_MASK, STENCIL_FRONT_S_FAIL, STENCIL_FRONT_D_FAIL, STENCIL_FRONT_D_PASS, STENCIL_BACK_FUNC, STENCIL_BACK_REF, STENCIL_BACK_MASK, STENCIL_BACK_S_FAIL, STENCIL_BACK_D_FAIL, STENCIL_BACK_D_PASS, PACK_ALIGN, UNPACK_ALIGN, GVA_ENABLED, GVA_SIZE, GVA_TYPE, GVA_NORMAL, GVA_STRIDE, GVA_POINTER, GVA_V0, GVA_V1, GVA_V2, GVA_V3, VBO_ARRAY_BINDING, VBO_ARRAY_ID, VBO_ARRAY_SIZE, VBO_ARRAY_DATA, VBO_ARRAY_USAGE, VBO_ELEMENT_BINDING, VBO_ELEMENT_ID, VBO_ELEMENT_SIZE, VBO_ELEMENT_DATA, VBO_ELEMENT_USAGE, TEXTURE_ACTIVE from "//$NON-NLS-1$
-                       + TABLENAME + " where SEQ <= '%s' and CONTEXT_ID = '%S' order by rid desc";//$NON-NLS-1$
+                       + TABLENAME
+                       + " where SEQ <= '%s' and CONTEXT_ID = '%S' order by rid desc";//$NON-NLS-1$
 
        @Override
        public String getTableName() {
@@ -108,7 +109,8 @@ public class GLCommonStateDBTableManager extends DBTable {
        }
 
        @SuppressWarnings("unchecked")
-       private <T> List<Object> makeArray(int index, List<Object> insertData, T type) {
+       private <T> List<Object> makeArray(int index, List<Object> insertData,
+                       T type) {
                List<Object> returnObjectList = new ArrayList<Object>();
                if (null == insertData.get(index)) {
                        returnObjectList.add(null);
@@ -126,7 +128,8 @@ public class GLCommonStateDBTableManager extends DBTable {
        }
 
        public List<Object> getContextData(String seq, long contextID) {
-               String query = String.format(SELECT_CONTEXT_TABLE__QUERY, seq, contextID);
+               String query = String.format(SELECT_CONTEXT_TABLE__QUERY, seq,
+                               contextID);
                List<List<Object>> result = SqlConnectionManager.executeQuery(query);
                if (null == result || result.size() == 0 || result.get(0).size() == 0) {
                        return null;
@@ -145,7 +148,7 @@ public class GLCommonStateDBTableManager extends DBTable {
        }
 
        public boolean isIntegerType(int index) {
-               if (index == GLContextNameEnum.RID.ordinal() || index == GLContextNameEnum.SEQ.ordinal()
+               if (index == GLContextNameEnum.RID.ordinal()
                                || index == GLContextNameEnum.BLEND_EQUATION_RGB.ordinal()
                                || index == GLContextNameEnum.BLEND_EQUATION_ALPHA.ordinal()
                                || index == GLContextNameEnum.BLEND_EQUATION_RGB.ordinal()
@@ -192,7 +195,8 @@ public class GLCommonStateDBTableManager extends DBTable {
        }
 
        public boolean isLongType(int index) {
-               if (index == GLContextNameEnum.CONTEXT_ID.ordinal()
+               if (index == GLContextNameEnum.SEQ.ordinal()
+                               || index == GLContextNameEnum.CONTEXT_ID.ordinal()
                                || index == GLContextNameEnum.VBO_ARRAY_DATA.ordinal()
                                || index == GLContextNameEnum.VBO_ELEMENT_DATA.ordinal()) {
                        return true;
@@ -256,17 +260,21 @@ public class GLCommonStateDBTableManager extends DBTable {
                        for (int index = 0; index < columnsize; index++) {
                                try {
                                        if (isBooleanArray(index)) {
-                                               setArrayToPreparedStatement(index, DBConstants.BOOLEAN, prep, rowData);
+                                               setArrayToPreparedStatement(index, DBConstants.BOOLEAN,
+                                                               prep, rowData);
                                        } else if (isIntegerArray(index)) {
-                                               setArrayToPreparedStatement(index, DBConstants.INTEGER, prep, rowData);
+                                               setArrayToPreparedStatement(index, DBConstants.INTEGER,
+                                                               prep, rowData);
                                        } else if (isLongArray(index)) {
-                                               setArrayToPreparedStatement(index, DBConstants.LONG, prep, rowData);
+                                               setArrayToPreparedStatement(index, DBConstants.LONG,
+                                                               prep, rowData);
                                        } else if (isIntegerType(index)) {
                                                prep.setInt(index + 1, (Integer) (rowData.get(index)));
                                        } else if (isLongType(index)) {
                                                prep.setLong(index + 1, (Long) (rowData.get(index)));
                                        } else if (isBooleans(index)) {
-                                               prep.setBoolean(index + 1, (Boolean) (rowData.get(index)));
+                                               prep.setBoolean(index + 1,
+                                                               (Boolean) (rowData.get(index)));
                                        } else if (isStringType(index)) {
                                                prep.setString(index + 1, (String) (rowData.get(index)));
                                        } else {

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/DB/GLFrameTimeDBTableManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/DB/GLFrameTimeDBTableManager.java
index 5f6dbb4..979fd99 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/DB/GLFrameTimeDBTableManager.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/DB/GLFrameTimeDBTableManager.java
@@ -145,7 +145,6 @@ public class GLFrameTimeDBTableManager extends DBTable {
                                prep.setBoolean(TABLE_ERROR_INFO_INDEX + 1,
                                                (Boolean) (rowData.get(TABLE_ERROR_INFO_INDEX)));
                                prep.setInt(TABLE_PID_INDEX + 1, (Integer) (rowData.get(TABLE_PID_INDEX)));
-
                        } catch (SQLException e) {
                                e.printStackTrace();
                                isPrepared = false;

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/GLStatisticsDataManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/GLStatisticsDataManager.java
index c90762b..f4a23f1 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/GLStatisticsDataManager.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/GLStatisticsDataManager.java
@@ -195,7 +195,7 @@ public class GLStatisticsDataManager {
                        returnBuffer.append(EVAS_GL);
                }
                if (returnBuffer.length() == 0) {
-                       Logger.error("Not Define API Type of Statistics  : " + apiName);
+//                     Logger.error("Not Define API Type of Statistics  : " + apiName);
                        return CommonConstants.EMPTY;
                }
                if (returnBuffer.lastIndexOf(SPLIT) == returnBuffer.length()

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/type/GLAPIData.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/type/GLAPIData.java
index 3ed000d..a99e3f1 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/type/GLAPIData.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/type/GLAPIData.java
@@ -39,7 +39,6 @@ public class GLAPIData extends GLES20LogData {
        private int binaryId = 0;
 
        public GLAPIData() {
-
        }
 
        public GLAPIData(GLES20LogData logData, int currentFrameIndex) {