MISC: Refined common Preferences label

Refined logging Preferences description.
Refactored variable names for the Preferences page.

Change-Id: I35a6c9a03e5591e133127f22fb9fc98484808b39
Signed-off-by: kh5325.kim <kh5325.kim@samsung.com>

diff --git a/org.tizen.common/src/org/tizen/common/ui/page/preference/LoggingPreferencePage.java b/org.tizen.common/src/org/tizen/common/ui/page/preference/LoggingPreferencePage.java
index 78ca10e..7808e7c 100644 (file)
--- a/org.tizen.common/src/org/tizen/common/ui/page/preference/LoggingPreferencePage.java
+++ b/org.tizen.common/src/org/tizen/common/ui/page/preference/LoggingPreferencePage.java
@@ -87,7 +87,7 @@ public class LoggingPreferencePage extends FieldEditorPreferencePage implements
      */
     public LoggingPreferencePage() {
         setPreferenceStore(CommonPlugin.getDefault().getPreferenceStore());
-        setDescription(Messages.DESCRIPTION);
+        setDescription(Messages.LOGGING_DESCRIPTION);
     }
 
     @Override
@@ -116,7 +116,7 @@ public class LoggingPreferencePage extends FieldEditorPreferencePage implements
     }
 
     private void createLoggerPreferences(Composite parent) {
-        Composite comp = SWTUtil.createGroup(parent, Messages.LOGGER_GROUP, 1);
+        Composite comp = SWTUtil.createGroup(parent, Messages.LOGGING_GROUP, 1);
         SWTUtil.setGridLayout(comp, 2, false, -1, -1, -1, -1, GridData.FILL_HORIZONTAL);
         createLoggerLocationButton(comp);
         createLoggerConversionPatterhn(comp);
@@ -125,7 +125,7 @@ public class LoggingPreferencePage extends FieldEditorPreferencePage implements
 
     private void createLoggerConversionPatterhn(Composite parent) {
         Label loggerLocationLabel = new Label(parent, SWT.None);
-        loggerLocationLabel.setText(Messages.LABEL_LOG_CP);
+        loggerLocationLabel.setText(Messages.LOGGING_CP);
         loggerCP = new Text(parent, SWT.BORDER);
         SWTUtil.setGridLayoutData(loggerCP, -1, -1, -1, -1, GridData.FILL_HORIZONTAL);
         loggerCP.setText(getLogConversionPattern());
@@ -133,7 +133,7 @@ public class LoggingPreferencePage extends FieldEditorPreferencePage implements
 
     private void createLoggerLocationButton(Composite parent) {
         Label loggerLocationLabel = new Label(parent, SWT.None);
-        loggerLocationLabel.setText(Messages.LABEL_LOG_LOCATION);
+        loggerLocationLabel.setText(Messages.LOGGING_LOCATION);
         loggerLocText = new Text(parent, SWT.BORDER);
         SWTUtil.setGridLayoutData(loggerLocText, -1, -1, -1, -1, GridData.FILL_HORIZONTAL);
         loggerLocText.setText(getLogLocation());

diff --git a/org.tizen.common/src/org/tizen/common/ui/page/preference/Messages.java b/org.tizen.common/src/org/tizen/common/ui/page/preference/Messages.java
index e1da46e..cebad54 100644 (file)
--- a/org.tizen.common/src/org/tizen/common/ui/page/preference/Messages.java
+++ b/org.tizen.common/src/org/tizen/common/ui/page/preference/Messages.java
@@ -31,18 +31,19 @@ public class Messages {
 
     public static String DESCRIPTION;
 
-    public static String GROUP1;
-    public static String LABEL_LOCATION;
-    public static String LABEL_UPDATE;
+    public static String GROUP;
+    public static String LOCATION;
+    public static String UPDATE;
 
     public static String PROPERTIES_PAGE_BODY;
     public static String RDS_NOTE;
     public static String RDS_OPTION_SAVE_FAIL;
     public static String RDS_MODE_PREFERENCE;
 
-    public static String LOGGER_GROUP;
-    public static String LABEL_LOG_LOCATION;
-    public static String LABEL_LOG_CP;
+    public static String LOGGING_DESCRIPTION;
+    public static String LOGGING_GROUP;
+    public static String LOGGING_LOCATION;
+    public static String LOGGING_CP;
 
     public static String BUTTON_REPORT;
     public static String BUTTON_USAGE;

diff --git a/org.tizen.common/src/org/tizen/common/ui/page/preference/Messages.properties b/org.tizen.common/src/org/tizen/common/ui/page/preference/Messages.properties
index 6392b44..0af0496 100644 (file)
--- a/org.tizen.common/src/org/tizen/common/ui/page/preference/Messages.properties
+++ b/org.tizen.common/src/org/tizen/common/ui/page/preference/Messages.properties
@@ -1,19 +1,22 @@
 DESCRIPTION=General settings for Tizen IDE:
-GROUP1=SDK information
-LABEL_LOCATION=Location:
-LABEL_UPDATE=Automatically find new updates at start-up and notify me
+GROUP=SDK information
+LOCATION=Location:
+UPDATE=Automatically find new updates at start-up and notify me
 
 PROPERTIES_PAGE_BODY=Expand the tree to edit preferences for a specific feature.
 RDS_NOTE=Currently, this option is not supported for multi-app project.
 RDS_OPTION_SAVE_FAIL=Failed to save options.
 RDS_MODE_PREFERENCE=Enable rapid development mode
-LOGGER_GROUP=Logger
-LABEL_LOG_LOCATION=&Location
-LABEL_LOG_CP=&Pattern
+
 BUTTON_REPORT=I want to contribute this information to improve Tizen IDE
 BUTTON_USAGE=Send usage data
 BUTTON_PERFORM=Send performance data
 
+LOGGING_DESCRIPTION=Logging settings:
+LOGGING_GROUP=Logger
+LOGGING_LOCATION=&Location:
+LOGGING_CP=&Pattern:
+
 SDB_DESCRIPTION=General settings for Tizen SDB:
 SDB_RESPONSE_TIMEOUT_GROUP=Communication
 SDB_RESPONSE_TIMEOUT_LABEL=Connection timeout (ms):

diff --git a/org.tizen.common/src/org/tizen/common/ui/page/preference/TizenBasePreferencePage.java b/org.tizen.common/src/org/tizen/common/ui/page/preference/TizenBasePreferencePage.java
index e9fcb63..b1a9411 100644 (file)
--- a/org.tizen.common/src/org/tizen/common/ui/page/preference/TizenBasePreferencePage.java
+++ b/org.tizen.common/src/org/tizen/common/ui/page/preference/TizenBasePreferencePage.java
@@ -48,7 +48,6 @@ public class TizenBasePreferencePage extends FieldEditorPreferencePage implement
     private boolean applyOk = true;
 
     /**
-     * Constructor for {@link TizenBasePreferencePage}
      * @author Ho Namkoong {@literal <ho.namkoong@samsung.com>} (S-Core)
      */
     public TizenBasePreferencePage() {
@@ -59,7 +58,7 @@ public class TizenBasePreferencePage extends FieldEditorPreferencePage implement
     @Override
     public void init(IWorkbench workbench) {
     }
-    
+
     /**
      * {@inheritDoc}
      * @author Ho Namkoong {@literal <ho.namkoong@samsung.com>} (S-Core)
@@ -82,17 +81,15 @@ public class TizenBasePreferencePage extends FieldEditorPreferencePage implement
     }
 
     private void createSDKPreferences(Composite parent) {
-        Composite comp = SWTUtil.createGroup(parent, Messages.GROUP1, 1);
+        Composite comp = SWTUtil.createGroup(parent, Messages.GROUP, 1);
         Composite formatComposite = SWTUtil.createCompositeEx(comp, 1, GridData.FILL_HORIZONTAL);
-        DirectoryFieldEditor mDirectoryField = new DirectoryFieldEditor(KEY_SDKLOCATION,
-                Messages.LABEL_LOCATION, formatComposite);
+        DirectoryFieldEditor mDirectoryField = new DirectoryFieldEditor(KEY_SDKLOCATION, Messages.LOCATION, formatComposite);
         addField(mDirectoryField);
 
         mDirectoryField.setEnabled(false, formatComposite);
 
         formatComposite = SWTUtil.createCompositeEx(comp, 1, GridData.FILL_HORIZONTAL);
-        BooleanFieldEditor startupCheckEditor = new BooleanFieldEditor(KEY_SDKUPDATE,
-                Messages.LABEL_UPDATE, formatComposite);
+        BooleanFieldEditor startupCheckEditor = new BooleanFieldEditor(KEY_SDKUPDATE, Messages.UPDATE, formatComposite);
         addField(startupCheckEditor);
     }
 
@@ -126,7 +123,6 @@ public class TizenBasePreferencePage extends FieldEditorPreferencePage implement
         if(!applyOk) {
             return false;
         }
-        
         return super.performOk();
     }
 }