NL: remove database table name from label file

remove database table name from label file

Change-Id: I25367413130afcd1d34361898e32a833e2166e88
Signed-off-by: greatim <jaewon81.lim@samsung.com>

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/FilePageLabels.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/FilePageLabels.java
index 0a21670..e83c21b 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/FilePageLabels.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/FilePageLabels.java
@@ -79,12 +79,6 @@ public class FilePageLabels extends NLS {
        public static String FILE_CHART_TOOLTIP_LOCK_WAIT;
        public static String FILE_CHART_TOOLTIP_FAIL;
        
-       
-       public static String FILE_API_DB;
-       public static String FILE_STATUS_DB;
-       public static String FILE_ACCESS_DB;
-       public static String FILE_ACCESSOR_DB;
-       
        public static String FILE_CHART_LOCK;
        
        public static String TIME_MS;

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/FilePageLabels.properties b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/FilePageLabels.properties
index 86c431b..398a8ac 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/FilePageLabels.properties
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/FilePageLabels.properties
@@ -47,10 +47,5 @@ FILE_CHART_TOOLTIP_LOCK_WAIT=LOCK WAITING
 FILE_CHART_TOOLTIP_LOCK_AUTORELEASE=AUTO RELEASE
 FILE_CHART_TOOLTIP_FAIL=FAIL
 
-FILE_API_DB=FILE_API
-FILE_STATUS_DB=FILE_STATUS
-FILE_ACCESS_DB=FILE_ACCESS
-FILE_ACCESSOR_DB=FILE_ACCESSOR
-       
 TIME_MS = ms
 

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/data/FileAccessDB.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/data/FileAccessDB.java
index 4c9ed41..d9f5f21 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/data/FileAccessDB.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/data/FileAccessDB.java
@@ -36,12 +36,11 @@ import org.tizen.dynamicanalyzer.database.DBColumn;
 import org.tizen.dynamicanalyzer.database.DBConstants;
 import org.tizen.dynamicanalyzer.database.DBTable;
 import org.tizen.dynamicanalyzer.database.SqlConnectionManager;
-import org.tizen.dynamicanalyzer.nl.FilePageLabels;
 import org.tizen.dynamicanalyzer.ui.file.model.FileAccess;
 import org.tizen.dynamicanalyzer.util.Logger;
 
 public class FileAccessDB extends DBTable {
-       private static final String ACCESS_TABLE = FilePageLabels.FILE_ACCESS_DB;
+       public static final String TABLENAME = "FILE_ACCESS";
        private static final String DBTYPE_TOOLTIP = "VARCHAR(256)";//$NON-NLS-1$
        
        public static enum COLUMN {
@@ -77,13 +76,13 @@ public class FileAccessDB extends DBTable {
        
        @Override
        public String getTableName() {
-               return ACCESS_TABLE;
+               return TABLENAME;
        }
 
        private static final String selectAll = selectAll();
        private static final String SELECT_QUERY = "select "
                        + selectAll
-                       + " from " + ACCESS_TABLE; 
+                       + " from " + TABLENAME; 
        
        public List<FileAccess> executeQueryRS(String query) {
                List<FileAccess> resultData = new ArrayList<FileAccess>();

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/data/FileAccessorDB.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/data/FileAccessorDB.java
index f5a15e3..1da96dd 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/data/FileAccessorDB.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/data/FileAccessorDB.java
@@ -36,12 +36,11 @@ import org.tizen.dynamicanalyzer.database.DBColumn;
 import org.tizen.dynamicanalyzer.database.DBConstants;
 import org.tizen.dynamicanalyzer.database.DBTable;
 import org.tizen.dynamicanalyzer.database.SqlConnectionManager;
-import org.tizen.dynamicanalyzer.nl.FilePageLabels;
 import org.tizen.dynamicanalyzer.ui.file.model.FileAccessor;
 import org.tizen.dynamicanalyzer.util.Logger;
 
 public class FileAccessorDB  extends DBTable {
-       private static final String ACCESSOR_TABLE = FilePageLabels.FILE_ACCESSOR_DB;
+       public static final String TABLENAME = "FILE_ACCESSOR";
        private static final String DBTYPE_FILEPATH = "VARCHAR(4096)";//$NON-NLS-1$
 
        public static enum COLUMN {
@@ -81,13 +80,13 @@ public class FileAccessorDB  extends DBTable {
        
        @Override
        public String getTableName() {
-               return ACCESSOR_TABLE;
+               return TABLENAME;
        }
 
        private static final String selectAll = selectAll();
        private static final String SELECT_QUERY = "select "
                        + selectAll
-                       + " from " + ACCESSOR_TABLE; //$NON-NLS-1$
+                       + " from " + TABLENAME; //$NON-NLS-1$
        
        public List<FileAccessor> executeQueryRS(String query) {
                List<FileAccessor> resultData = new ArrayList<FileAccessor>();

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/data/FileApiDB.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/data/FileApiDB.java
index fbd2e26..4e075cf 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/data/FileApiDB.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/data/FileApiDB.java
@@ -36,13 +36,11 @@ import org.tizen.dynamicanalyzer.database.DBColumn;
 import org.tizen.dynamicanalyzer.database.DBConstants;
 import org.tizen.dynamicanalyzer.database.DBTable;
 import org.tizen.dynamicanalyzer.database.SqlConnectionManager;
-import org.tizen.dynamicanalyzer.nl.FilePageLabels;
 import org.tizen.dynamicanalyzer.ui.file.model.FileEvent;
 import org.tizen.dynamicanalyzer.util.Logger;
 
 public class FileApiDB extends DBTable {
-       private static final String API_TABLE = FilePageLabels.FILE_API_DB;
-       private static final String ACCESSOR_TABLE = FilePageLabels.FILE_ACCESSOR_DB;
+       public static final String TABLENAME = "FILE_API";
        private static final String DBTYPE_RETURN_VALUE = "VARCHAR(1024)";//$NON-NLS-1$
        private static final String DBTYPE_ARGUMENTS_VALUE = "VARCHAR(1024)";//$NON-NLS-1$
        
@@ -79,7 +77,7 @@ public class FileApiDB extends DBTable {
 
        @Override
        public String getTableName() {
-               return API_TABLE;
+               return TABLENAME;
        }
        
        public FileApiDB() {
@@ -103,7 +101,7 @@ public class FileApiDB extends DBTable {
                        "select "
                        + "SEQUENCE_NUMBER, FD, API_TYPE, EVENT_TIME, API_ID, ERROR_NUMBER, "
                        + "IO_SIZE, FILE_SIZE, RETURN_VALUE, ARGUMENT "
-                       + "from " + API_TABLE
+                       + "from " + TABLENAME
                        + " where "
                        + "ACCESSOR_ID" + " = '%d'"; 
                
@@ -113,23 +111,23 @@ public class FileApiDB extends DBTable {
                        + "api.SEQUENCE_NUMBER, api.FD, api.API_TYPE, api.EVENT_TIME, api.API_ID, api.ERROR_NUMBER, "
                        + "api.IO_SIZE, api.FILE_SIZE, api.RETURN_VALUE, api.ARGUMENT, "
                        + "accessor.FILE_PATH, accessor.PID, accessor.TID "
-                       + "from " + API_TABLE + " api, " + ACCESSOR_TABLE + " accessor " 
+                       + "from " + TABLENAME + " api, " + FileAccessorDB.TABLENAME + " accessor " 
                        + "where "
                        + "api.FILE_ID" + " = '%d'"+ " and " + "api.ACCESSOR_ID = accessor.ACCESSOR_ID";
        
        private static final String SELECT_FILE_EVENT_BY_SEQ = "select "
                        + COLUMN.ACCESSOR_ID.name
-                       + " from " + API_TABLE 
+                       + " from " + TABLENAME 
                        + " where " 
                        + COLUMN.SEQUENCE_NUMBER.name  + " = '%d'";
        
        private static final String SELECT_APIS_COUNT = 
-                       "select COUNT(*) from " + API_TABLE;
+                       "select COUNT(*) from " + TABLENAME;
        
        private static final String SELECT_ALL = "select "
                        + selectAllColumn
                        + " from "
-                       + API_TABLE;
+                       + TABLENAME;
        
        public ResultSet executeQuery(String query) {
                ResultSet rs = SqlConnectionManager.executeQueryRS(query);

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/data/FileStatusDB.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/data/FileStatusDB.java
index 1b49ecb..fa8009b 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/data/FileStatusDB.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/data/FileStatusDB.java
@@ -36,13 +36,12 @@ import org.tizen.dynamicanalyzer.database.DBColumn;
 import org.tizen.dynamicanalyzer.database.DBConstants;
 import org.tizen.dynamicanalyzer.database.DBTable;
 import org.tizen.dynamicanalyzer.database.SqlConnectionManager;
-import org.tizen.dynamicanalyzer.nl.FilePageLabels;
 import org.tizen.dynamicanalyzer.ui.file.model.FileStatus;
 import org.tizen.dynamicanalyzer.util.Logger;
 
 // open, close
 public class FileStatusDB extends DBTable {
-       private static final String STATUS_TABLE = FilePageLabels.FILE_STATUS_DB;
+       public static final String TABLENAME = "FILE_STATUS";
        
        public static enum COLUMN {
                FILE_ID(1, "FILE_ID"),
@@ -73,13 +72,13 @@ public class FileStatusDB extends DBTable {
        
        @Override
        public String getTableName() {
-               return STATUS_TABLE;
+               return TABLENAME;
        }
 
        private static final String selectAll = selectAll();
        private static final String SELECT_QUERY = "select "
                        + selectAll
-                       + " from " + STATUS_TABLE; //$NON-NLS-1$
+                       + " from " + TABLENAME; //$NON-NLS-1$
        
        public List<FileStatus> executeQueryRS(String query) {
                List<FileStatus> resultData = new ArrayList<FileStatus>();