RTSDK : Refactor message bundle's key and values
authordaeryong.park <bdragon.park@samsung.com>
Fri, 24 Mar 2017 06:22:32 +0000 (15:22 +0900)
committerdaeryong.park <bdragon.park@samsung.com>
Fri, 24 Mar 2017 08:42:30 +0000 (17:42 +0900)
- The message bundle's key has been modified to conform to the java
standard.
- Remove unused messages.

Change-Id: Ib5b262b3dfd344f7ac87d57b9e62bd46562595a1
Signed-off-by: daeryong.park <bdragon.park@samsung.com>
rt-ide/tizen.rt.product.plugin/src/org/tizen/rt/ide/Messages.java
rt-ide/tizen.rt.product.plugin/src/org/tizen/rt/ide/build/RtosBuildDialogPage.java
rt-ide/tizen.rt.product.plugin/src/org/tizen/rt/ide/build/RtosBuildWizard.java
rt-ide/tizen.rt.product.plugin/src/org/tizen/rt/ide/flash/RtosFlashDialogPage.java
rt-ide/tizen.rt.product.plugin/src/org/tizen/rt/ide/flash/RtosFlashWizard.java
rt-ide/tizen.rt.product.plugin/src/org/tizen/rt/ide/handlers/FlashHandler.java
rt-ide/tizen.rt.product.plugin/src/org/tizen/rt/ide/launch/LaunchShortcut.java
rt-ide/tizen.rt.product.plugin/src/org/tizen/rt/ide/messages.properties
rt-ide/tizen.rt.product.plugin/src/org/tizen/rt/ide/wizards/NewArtikProjectWizard.java
rt-ide/tizen.rt.product.plugin/src/org/tizen/rt/ide/wizards/NewArtikProjectWizardPage.java
rt-ide/tizen.rt.product.plugin/src/org/tizen/rt/ide/wizards/NewArtikProjectWizardPage2.java

index 8b983e8..7fd7298 100644 (file)
@@ -32,47 +32,38 @@ import org.eclipse.osgi.util.NLS;
 public class Messages extends NLS {
     private static final String BUNDLE_NAME = "org.tizen.rt.ide.messages"; //$NON-NLS-1$
 
-    public static String NewArtikProjectMainWizard_window_title;
+    public static String NewArtikProjectWizard_CreateOperationLabel;
+    public static String NewArtikProjectWizard_WindowTitle;
 
-    public static String NewArtikProjectMainPage_local_button_text;
-    public static String NewArtikProjectMainPage_git_button_text;
-    public static String NewArtikProjectMainPage_title;
-    public static String NewArtikProjectMainPage_desc;
+    public static String NewArtikProjectWizardPage_Description;
+    public static String NewArtikProjectWizardPage_Title;
 
-    public static String NewArtikProjectWizard_create_op_label;
-    public static String NewArtikProjectWizard_window_title;
+    public static String NewArtikProjectWizardPage2_Description;
+    public static String NewArtikProjectWizardPage2_Title;
+    public static String NewArtikProjectWizardPage2_LabelBoard;
+    public static String NewArtikProjectWizardPage2_LabelBoardName;
+    public static String NewArtikProjectWizardPage2_NameColumn;
 
-    public static String NewArtikProjectWizardPage_desc;
-    public static String NewArtikProjectWizardPage_title;
+    public static String RtosBuildDialogPage_BoardNameColumn;
+    public static String RtosBuildDialogPage_Description;
+    public static String RtosBuildDialogPage_KconfigErrorMessage;
+    public static String RtosBuildDialogPage_KernelConfigButtonText;
+    public static String RtosBuildDialogPage_OptionNameColumn;
+    public static String RtosBuildDialogPage_Title;
+    public static String RtosBuildDialogPage_ToolchainButtonText;
+    public static String RtosBuildDialogPage_ToolchainDialogMessage;
 
-    public static String NewArtikProjectWizardPage2_desc;
-    public static String NewArtikProjectWizardPage2_title;
-    public static String NewArtikProjectWizardPage2_label_board;
-    public static String NewArtikProjectWizardPage2_label_board_name;
-    public static String NewArtikProjectWizardPage2_name_column;
+    public static String RtosBuildWizard_WindowTitle;
 
-    public static String RtosBuildDialogPage_board_name_column;
-    public static String RtosBuildDialogPage_description;
-    public static String RtosBuildDialogPage_description_no_option;
-    public static String RtosBuildDialogPage_kconfig_error_message;
-    public static String RtosBuildDialogPage_kernel_config_button_text;
-    public static String RtosBuildDialogPage_option_name_column;
-    public static String RtosBuildDialogPage_title;
-    public static String RtosBuildDialogPage_toolchain_button_text;
-    public static String RtosBuildDialogPage_toolchain_dialog_message;
+    public static String RtosFlashDialogPage_Description;
+    public static String RtosFlashDialogPage_OptionNameColumn;
+    public static String RtosFlashDialogPage_Title;
 
-    public static String RtosBuildWizard_window_title;
+    public static String RtosFlashWizard_WindowTitle;
 
-    public static String RtosFlashDialogPage_description;
-    public static String RtosFlashDialogPage_description_no_option;
-    public static String RtosFlashDialogPage_option_name_column;
-    public static String RtosFlashDialogPage_title;
+    public static String FlashHandler_NotFoundBuildInfo;
 
-    public static String RtosFlashWizard_window_title;
-
-    public static String FlashHandler_not_found_build_info;
-
-    public static String LaunchShortcut_not_found_build_info;
+    public static String LaunchShortcut_NotFoundBuildInfo;
 
 
     static {
index 20d3414..73c5dae 100644 (file)
@@ -84,8 +84,8 @@ public class RtosBuildDialogPage extends WizardPage {
     protected RtosBuildDialogPage(String pageName, Shell shell) {
         super(pageName);
         this.shell = shell;
-        setTitle(Messages.RtosBuildDialogPage_title);
-        setDescription(Messages.RtosBuildDialogPage_description);
+        setTitle(Messages.RtosBuildDialogPage_Title);
+        setDescription(Messages.RtosBuildDialogPage_Description);
         setErrorMessage(null);
     }
 
@@ -117,7 +117,7 @@ public class RtosBuildDialogPage extends WizardPage {
 
         TableColumn boardNameColumn = new TableColumn(boardTable, SWT.NONE);
         boardNameColumn.setWidth(300);
-        boardNameColumn.setText(Messages.RtosBuildDialogPage_board_name_column);
+        boardNameColumn.setText(Messages.RtosBuildDialogPage_BoardNameColumn);
 
         boardTableViewer.setLabelProvider(new TableViewerProvider_1());
         boardTableViewer.setContentProvider(new ArrayContentProvider());
@@ -152,7 +152,7 @@ public class RtosBuildDialogPage extends WizardPage {
 
         TableColumn optionNameColumn = new TableColumn(buildOptionTable, SWT.NONE);
         optionNameColumn.setWidth(300);
-        optionNameColumn.setText(Messages.RtosBuildDialogPage_option_name_column);
+        optionNameColumn.setText(Messages.RtosBuildDialogPage_OptionNameColumn);
 
         buildOptionTableViewer.setLabelProvider(new TableViewerProvider());
         buildOptionTableViewer.setContentProvider(new ArrayContentProvider());
@@ -206,7 +206,7 @@ public class RtosBuildDialogPage extends WizardPage {
         btnGroupComposite.setLayout(btnLayout);
 
         selectToolchainBtn = new Button(btnGroupComposite, SWT.NONE);
-        selectToolchainBtn.setText(Messages.RtosBuildDialogPage_toolchain_button_text);
+        selectToolchainBtn.setText(Messages.RtosBuildDialogPage_ToolchainButtonText);
         selectToolchainBtn.setEnabled(false);
         selectToolchainBtn.addSelectionListener(new SelectionListener() {
             @Override
@@ -216,14 +216,14 @@ public class RtosBuildDialogPage extends WizardPage {
             @Override
             public void widgetSelected(SelectionEvent arg0) {
                 DirectoryDialog dialog = new DirectoryDialog(getShell(), SWT.SHEET);
-                dialog.setMessage(Messages.RtosBuildDialogPage_toolchain_dialog_message);
+                dialog.setMessage(Messages.RtosBuildDialogPage_ToolchainDialogMessage);
                 String toolchainPath = dialog.open();
                 RtosBuildWizardDialog.selectionToolchain(toolchainPath);
             }
         });
 
         kernelConfigBtn = new Button(btnGroupComposite, SWT.NONE);
-        kernelConfigBtn.setText(Messages.RtosBuildDialogPage_kernel_config_button_text);
+        kernelConfigBtn.setText(Messages.RtosBuildDialogPage_KernelConfigButtonText);
         kernelConfigBtn.setEnabled(false);
         kernelConfigBtn.addSelectionListener(new SelectionListener() {
             @Override
@@ -236,7 +236,7 @@ public class RtosBuildDialogPage extends WizardPage {
                     Runtime.getRuntime().exec(KERNEL_CONFIG_CMD, null,
                             new File(ResourceUtil.getCurrentProject().getLocation().toString() + File.separator + "os")); //$NON-NLS-1$
                 } catch (IOException e) {
-                    MessageDialog.openError(Display.getDefault().getActiveShell(), "Error", Messages.RtosBuildDialogPage_kconfig_error_message); //$NON-NLS-1$
+                    MessageDialog.openError(Display.getDefault().getActiveShell(), "Error", Messages.RtosBuildDialogPage_KconfigErrorMessage); //$NON-NLS-1$
                     return;
                 }
             }
index 0eb04bb..4de4d04 100644 (file)
@@ -59,7 +59,7 @@ public class RtosBuildWizard extends Wizard implements IPageChangedListener {
 
     public RtosBuildWizard(Shell shell, IProject project) {
         super();
-        this.setWindowTitle(Messages.RtosBuildWizard_window_title);
+        this.setWindowTitle(Messages.RtosBuildWizard_WindowTitle);
         this.setNeedsProgressMonitor(true);
         this.shell = shell;
         this.project = project;
index e390c15..e4bde51 100644 (file)
@@ -62,8 +62,8 @@ public class RtosFlashDialogPage extends WizardPage {
         super(pageName);
         this.shell = shell;
         this.board = board;
-        setTitle(Messages.RtosFlashDialogPage_title);
-        setDescription(Messages.RtosFlashDialogPage_description);
+        setTitle(Messages.RtosFlashDialogPage_Title);
+        setDescription(Messages.RtosFlashDialogPage_Description);
         setErrorMessage(null);
     }
 
@@ -101,7 +101,7 @@ public class RtosFlashDialogPage extends WizardPage {
         TableViewerColumn tableViewerColumn = new TableViewerColumn(tableViewer, SWT.NONE);
         TableColumn tblclmnPixel100 = tableViewerColumn.getColumn();
         layout.setColumnData(tblclmnPixel100, new ColumnPixelData(500, true, true));
-        tblclmnPixel100.setText(Messages.RtosFlashDialogPage_option_name_column);
+        tblclmnPixel100.setText(Messages.RtosFlashDialogPage_OptionNameColumn);
 
         tableViewer.setLabelProvider(new TableViewerProvider());
         tableViewer.setContentProvider(new ArrayContentProvider());
index 76e8315..84abd29 100644 (file)
@@ -56,7 +56,7 @@ public class RtosFlashWizard extends Wizard implements IPageChangedListener {
 
     public RtosFlashWizard(Shell shell, String board) {
         super();
-        this.setWindowTitle(Messages.RtosFlashWizard_window_title);
+        this.setWindowTitle(Messages.RtosFlashWizard_WindowTitle);
         this.setNeedsProgressMonitor(true);
         this.shell = shell;
         this.board = board;
index 65039ab..2bcb7e6 100644 (file)
@@ -70,7 +70,7 @@ public class FlashHandler extends AbstractHandler {
                     buildInfo.load(new FileReader(new File(outputPath, FILE_NAME_BUILD_INFO)));
                 } catch (IOException e) {
                     // logger.error(e.getMessage());
-                    MessageDialog.openError(Display.getDefault().getActiveShell(), "Error", Messages.FlashHandler_not_found_build_info); //$NON-NLS-1$
+                    MessageDialog.openError(Display.getDefault().getActiveShell(), "Error", Messages.FlashHandler_NotFoundBuildInfo); //$NON-NLS-1$
                     return;
                 }
                 String board = buildInfo.getProperty(PROP_NAME_BOARD);
index 8ac8f02..7b74d5b 100644 (file)
@@ -115,7 +115,7 @@ public class LaunchShortcut implements ILaunchShortcut {
 
                 File buildInfoFile = new File(outputPath, FILE_NAME_BUILD_INFO);
                 if (!buildInfoFile.exists()) {
-                    MessageDialog.openError(Display.getDefault().getActiveShell(), "Error", Messages.LaunchShortcut_not_found_build_info); //$NON-NLS-1$
+                    MessageDialog.openError(Display.getDefault().getActiveShell(), "Error", Messages.LaunchShortcut_NotFoundBuildInfo); //$NON-NLS-1$
                     return;
                 }
 
@@ -137,7 +137,7 @@ public class LaunchShortcut implements ILaunchShortcut {
                     try {
                         buildInfo.load(new FileReader(buildInfoFile));
                     } catch (IOException e) {
-                        MessageDialog.openError(Display.getDefault().getActiveShell(), "Error", Messages.LaunchShortcut_not_found_build_info); //$NON-NLS-1$
+                        MessageDialog.openError(Display.getDefault().getActiveShell(), "Error", Messages.LaunchShortcut_NotFoundBuildInfo); //$NON-NLS-1$
                         return;
                     }
                     board = buildInfo.getProperty(PROP_NAME_BOARD);
index 8899ab4..fb6764c 100644 (file)
@@ -1,42 +1,33 @@
-NewArtikProjectMainWizard_window_title=Create TizenRT Project
+NewArtikProjectWizard_CreateOperationLabel=Create new TizenRT project
+NewArtikProjectWizard_WindowTitle=New TizenRT Project
 
-NewArtikProjectMainPage_title=New TizenRT Project
-NewArtikProjectMainPage_desc=Select TizenRT Project Source
-NewArtikProjectMainPage_local_button_text=Create New TizenRT Project
-NewArtikProjectMainPage_git_button_text=Create TizenRT Project from Git
+NewArtikProjectWizardPage_Description=Create a TizenRT project in the workspace or in an external location
+NewArtikProjectWizardPage_Title=Create a TizenRT Project
 
-NewArtikProjectWizard_create_op_label=Create new TizenRT project
-NewArtikProjectWizard_window_title=New TizenRT Project
+NewArtikProjectWizardPage2_Description=Select one of the available board templates to generate a fully-functioning project
+NewArtikProjectWizardPage2_Title=Select a Board Template
+NewArtikProjectWizardPage2_LabelBoard=Board :
+NewArtikProjectWizardPage2_LabelBoardName=Board Name
+NewArtikProjectWizardPage2_NameColumn=Name
 
-NewArtikProjectWizardPage_desc=Create a TizenRT project in the workspace or in an external location.
-NewArtikProjectWizardPage_title=Create a TizenRT Project
+RtosBuildDialogPage_BoardNameColumn=Boards
+RtosBuildDialogPage_Description=Select one of the available board and build option for build
+RtosBuildDialogPage_KconfigErrorMessage=Could not execute kconfig
+RtosBuildDialogPage_KernelConfigButtonText=Kernel Config
+RtosBuildDialogPage_OptionNameColumn=Build Options
+RtosBuildDialogPage_Title=Build Project
+RtosBuildDialogPage_ToolchainButtonText=Toolchain Path Select
+RtosBuildDialogPage_ToolchainDialogMessage=Select the toolchain path
 
-NewArtikProjectWizardPage2_desc=Select one of the available board templates to generate a fully-functioning project
-NewArtikProjectWizardPage2_title=Select a Board Template
-NewArtikProjectWizardPage2_label_board=Board :
-NewArtikProjectWizardPage2_label_board_name=Board Name
-NewArtikProjectWizardPage2_name_column=Name
+RtosBuildWizard_WindowTitle=Rtos Build
 
-RtosBuildDialogPage_board_name_column=Boards
-RtosBuildDialogPage_description=Select one of the available board and build option for build
-RtosBuildDialogPage_description_no_option=There is no Option
-RtosBuildDialogPage_kconfig_error_message=Could not execute kconfig
-RtosBuildDialogPage_kernel_config_button_text=Kernel Config
-RtosBuildDialogPage_option_name_column=Build Options
-RtosBuildDialogPage_title=Build Project
-RtosBuildDialogPage_toolchain_button_text=Toolchain Path Select
-RtosBuildDialogPage_toolchain_dialog_message=Select the toolchain path
+RtosFlashDialogPage_Description=Select one of the available flash option for flashing
+RtosFlashDialogPage_OptionNameColumn=Flash Options
+RtosFlashDialogPage_Title=Flash Project
 
-RtosBuildWizard_window_title=Rtos Build Wizard
+RtosFlashWizard_WindowTitle=Rtos Flash
 
-RtosFlashDialogPage_description=Select one of the available flash option for flashing
-RtosFlashDialogPage_description_no_option=There is no Option
-RtosFlashDialogPage_option_name_column=Flash Options
-RtosFlashDialogPage_title=Flash Project
+FlashHandler_NotFoundBuildInfo=Flash can not be performed. Please build it first.
 
-RtosFlashWizard_window_title=Rtos Flash Wizard
-
-FlashHandler_not_found_build_info=Flash can not be performed. Please build it first.
-
-LaunchShortcut_not_found_build_info=Debug can not be performed. Please build it first.
+LaunchShortcut_NotFoundBuildInfo=Debug can not be performed. Please build it first.
 
index a53ad9d..6c4614b 100644 (file)
@@ -83,7 +83,7 @@ public class NewArtikProjectWizard extends BasicNewResourceWizard implements IEx
         setNeedsProgressMonitor(true);
         ImageDescriptor wizardBannerImage = WorkbenchImages
                 .getImageDescriptor(IWorkbenchGraphicConstants.IMG_WIZBAN_NEW_WIZ);
-        setWindowTitle(Messages.NewArtikProjectWizard_window_title);
+        setWindowTitle(Messages.NewArtikProjectWizard_WindowTitle);
         if (wizardBannerImage != null) {
             setDefaultPageImageDescriptor(wizardBannerImage);
         }
@@ -229,7 +229,7 @@ public class NewArtikProjectWizard extends BasicNewResourceWizard implements IEx
         // public void run(IProgressMonitor monitor) throws
         // InvocationTargetException {
         CreateProjectOperation op = new CreateProjectOperation(description,
-                Messages.NewArtikProjectWizard_create_op_label);
+                Messages.NewArtikProjectWizard_CreateOperationLabel);
         try {
             // see bug
             // https://bugs.eclipse.org/bugs/show_bug.cgi?id=219901
index 3f2fc9b..41b6513 100644 (file)
@@ -42,8 +42,8 @@ public class NewArtikProjectWizardPage extends WizardNewProjectCreationPage {
      */
     public NewArtikProjectWizardPage(ISelection selection) {
         super(NewArtikProjectWizardPage.class.getName());
-        setTitle(Messages.NewArtikProjectWizardPage_title);
-        setDescription(Messages.NewArtikProjectWizardPage_desc);
+        setTitle(Messages.NewArtikProjectWizardPage_Title);
+        setDescription(Messages.NewArtikProjectWizardPage_Description);
         this.selection = selection;
     }
 
index 76bdbe7..19caf06 100644 (file)
@@ -88,8 +88,8 @@ public class NewArtikProjectWizardPage2 extends WizardPage {
      */
     public NewArtikProjectWizardPage2(ISelection selection) {
         super(NewArtikProjectWizardPage2.class.getName());
-        setTitle(Messages.NewArtikProjectWizardPage2_title);
-        setDescription(Messages.NewArtikProjectWizardPage2_desc);
+        setTitle(Messages.NewArtikProjectWizardPage2_Title);
+        setDescription(Messages.NewArtikProjectWizardPage2_Description);
         this.selection = selection;
     }
 
@@ -105,7 +105,7 @@ public class NewArtikProjectWizardPage2 extends WizardPage {
         composite_l.setLayout(new GridLayout(1, false));
 
         Label lblNewLabel = new Label(composite_l, SWT.NONE);
-        lblNewLabel.setText(Messages.NewArtikProjectWizardPage2_label_board);
+        lblNewLabel.setText(Messages.NewArtikProjectWizardPage2_LabelBoard);
 
         table = new Table(composite_l, SWT.BORDER | SWT.FULL_SELECTION);
         GridData gd_table = new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1);
@@ -114,7 +114,7 @@ public class NewArtikProjectWizardPage2 extends WizardPage {
 
         TableColumn tblclmnNewColumn = new TableColumn(table, SWT.NONE);
         tblclmnNewColumn.setWidth(160);
-        tblclmnNewColumn.setText(Messages.NewArtikProjectWizardPage2_name_column);
+        tblclmnNewColumn.setText(Messages.NewArtikProjectWizardPage2_NameColumn);
 
         Composite composite_r = new Composite(container, SWT.NONE);
         composite_r.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1));
@@ -123,7 +123,7 @@ public class NewArtikProjectWizardPage2 extends WizardPage {
 
         lblBoardName = new Label(composite_r, SWT.NONE);
         lblBoardName.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 1, 1));
-        lblBoardName.setText(Messages.NewArtikProjectWizardPage2_label_board_name);
+        lblBoardName.setText(Messages.NewArtikProjectWizardPage2_LabelBoardName);
 
         browser = new Browser(composite_r, SWT.BORDER);
         browser.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1));