[Title] Change "Git Configuration" to "Site Configuration"

diff --git a/org.tizen.nativeplatform/OSGI-INF/l10n/bundle.properties b/org.tizen.nativeplatform/OSGI-INF/l10n/bundle.properties
index c6bdce8..1bcf689 100644 (file)
--- a/org.tizen.nativeplatform/OSGI-INF/l10n/bundle.properties
+++ b/org.tizen.nativeplatform/OSGI-INF/l10n/bundle.properties
@@ -1,6 +1,6 @@
 Bundle-Vendor = Samsung Electronics
 
-org.tizen.nativeplatform.gitconfig.label=GIT Configuration
+org.tizen.nativeplatform.gitconfig.label=Site Configuration
 org.tizen.nativeplatform.proxyconfig.label=HTTP Proxy
 org.tizen.nativeplatform.password.label=Password
 org.tizen.nativeplatform.page.name=Platform

diff --git a/org.tizen.nativeplatform/plugin.xml b/org.tizen.nativeplatform/plugin.xml
index 42f37b8..0394dd2 100644 (file)
--- a/org.tizen.nativeplatform/plugin.xml
+++ b/org.tizen.nativeplatform/plugin.xml
@@ -577,7 +577,7 @@
                point="org.eclipse.ui.preferencePages">
                <page
                        category="org.tizen.nativeplatform.preferences"
-                       class="org.tizen.nativeplatform.preferences.ui.git.GitConfigurationPreferencePage"
+                       class="org.tizen.nativeplatform.preferences.ui.SiteConfigurationPreferencePage"
                        id="org.tizen.nativeplatform.gitconfig"
                        name="%org.tizen.nativeplatform.gitconfig.label">
                </page>

diff --git a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/preferences/ui/git/GitConfUIMessages.properties b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/preferences/ui/GitConfUIMessages.properties
similarity index 100%
rename from org.tizen.nativeplatform/src/org/tizen/nativeplatform/preferences/ui/git/GitConfUIMessages.properties
rename to org.tizen.nativeplatform/src/org/tizen/nativeplatform/preferences/ui/GitConfUIMessages.properties

diff --git a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/preferences/ui/git/GitConfDialog.java b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/preferences/ui/SiteConfigurationDialog.java
similarity index 90%
rename from org.tizen.nativeplatform/src/org/tizen/nativeplatform/preferences/ui/git/GitConfDialog.java
rename to org.tizen.nativeplatform/src/org/tizen/nativeplatform/preferences/ui/SiteConfigurationDialog.java
index b5e68a1..35c1901 100644 (file)
--- a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/preferences/ui/git/GitConfDialog.java
+++ b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/preferences/ui/SiteConfigurationDialog.java
@@ -1,4 +1,4 @@
-package org.tizen.nativeplatform.preferences.ui.git;
+package org.tizen.nativeplatform.preferences.ui;
 
 import java.util.ResourceBundle;
 
@@ -24,15 +24,15 @@ import org.eclipse.swt.events.SelectionListener;
 import org.tizen.common.util.DialogUtil;
 import org.tizen.nativeplatform.preferences.PreferencesManager;
 
-public class GitConfDialog extends Dialog {
+public class SiteConfigurationDialog extends Dialog {
        
-       private Text gitConfigNameText;
+       private Text siteConfigNameText;
        private Text gitBaseURIText;
        private Combo gitListTypeCombo;
        private Text gitListLocationText;
        private Button fileBrowseBt;
        
-       private String gitConfigName = "";
+       private String siteConfigName = "";
        private String gitBaseURI = "";
        private String gitListType = "";
        private String gitListLocation = "";
@@ -43,12 +43,12 @@ public class GitConfDialog extends Dialog {
        private final int height = 250;
        private Shell shell;
        
-       private final String BUNDLE_NAME = GitConfDialog.class.getPackage().getName() + ".GitConfUIMessages";//$NON-NLS-1$
+       private final String BUNDLE_NAME = SiteConfigurationDialog.class.getPackage().getName() + ".GitConfUIMessages";//$NON-NLS-1$
        private ResourceBundle resources = ResourceBundle.getBundle(BUNDLE_NAME);
 
-       protected GitConfDialog(Shell parentShell ) {
+       protected SiteConfigurationDialog(Shell parentShell ) {
                super(parentShell);     
-               gitConfigName = "";
+               siteConfigName = "";
                gitBaseURI = "";
                gitListType = "";
                gitListLocation = "";
@@ -57,11 +57,11 @@ public class GitConfDialog extends Dialog {
        }
 
        
-       protected GitConfDialog(Shell parentShell, 
+       protected SiteConfigurationDialog(Shell parentShell, 
                        String gitConfigName1, String gitBaseURI1 , String gitListType1, String gitListLocation1 ) {
                super(parentShell);     
                
-               gitConfigName = gitConfigName1;
+               siteConfigName = gitConfigName1;
                gitBaseURI = gitBaseURI1;
                gitListType = gitListType1;
                gitListLocation = gitListLocation1;
@@ -74,7 +74,7 @@ public class GitConfDialog extends Dialog {
        protected void configureShell(Shell newShell) {
                super.configureShell(newShell);         
                
-               if ( gitConfigName == "" ) {
+               if ( siteConfigName == "" ) {
                        newShell.setText(resources.getString("GitConfDlg.Title.Add"));          
                }
                else {
@@ -115,11 +115,11 @@ public class GitConfDialog extends Dialog {
                configNameLabel.setAlignment(SWT.RIGHT);
         configNameLabel.setText(resources.getString("GitConfDlg.Label.GitConfigName"));
         
-        gitConfigNameText = new Text(composite, SWT.SINGLE | SWT.BORDER | SWT.SEARCH);
+        siteConfigNameText = new Text(composite, SWT.SINGLE | SWT.BORDER | SWT.SEARCH);
         gridData = new GridData(GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL);
                gridData.minimumHeight = 0;
-        gitConfigNameText.setLayoutData(gridData);
-        gitConfigNameText.setText(gitConfigName);
+        siteConfigNameText.setLayoutData(gridData);
+        siteConfigNameText.setText(siteConfigName);
        }
        
     
@@ -243,13 +243,14 @@ public class GitConfDialog extends Dialog {
                });
        }
 
+       
        @Override
        protected void okPressed() {
-               gitConfigName = gitConfigNameText.getText().trim();
+               siteConfigName = siteConfigNameText.getText().trim();
                gitBaseURI = gitBaseURIText.getText().trim();
                gitListType = gitListTypeCombo.getText();
                gitListLocation = gitListLocationText.getText().trim();
-               if ( gitConfigName.isEmpty()) {
+               if ( siteConfigName.isEmpty()) {
                        DialogUtil.openErrorDialog(resources.getString("GitConfDlg.Error.NoName"));
                }
                else if ( gitBaseURI.isEmpty() ) {
@@ -263,8 +264,8 @@ public class GitConfDialog extends Dialog {
                }
        }
 
-       public String getGitConfigName() {
-               return gitConfigName;
+       public String getSiteConfigName() {
+               return siteConfigName;
        }
        
        

diff --git a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/preferences/ui/git/GitConfigurationPreferencePage.java b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/preferences/ui/SiteConfigurationPreferencePage.java
similarity index 94%
rename from org.tizen.nativeplatform/src/org/tizen/nativeplatform/preferences/ui/git/GitConfigurationPreferencePage.java
rename to org.tizen.nativeplatform/src/org/tizen/nativeplatform/preferences/ui/SiteConfigurationPreferencePage.java
index 071963e..9458e4a 100644 (file)
--- a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/preferences/ui/git/GitConfigurationPreferencePage.java
+++ b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/preferences/ui/SiteConfigurationPreferencePage.java
@@ -1,4 +1,4 @@
-package org.tizen.nativeplatform.preferences.ui.git;
+package org.tizen.nativeplatform.preferences.ui;
 
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
@@ -32,7 +32,7 @@ import org.tizen.common.util.DialogUtil;
 import org.tizen.nativeplatform.preferences.PreferencesManager;
 
 
-public class GitConfigurationPreferencePage extends PreferencePage implements IWorkbenchPreferencePage{
+public class SiteConfigurationPreferencePage extends PreferencePage implements IWorkbenchPreferencePage{
 
     private ArrayList<PreferencesManager.GitConfiguration> gitConfigList;
     private TableViewer gitConfigTable;
@@ -42,10 +42,10 @@ public class GitConfigurationPreferencePage extends PreferencePage implements IW
     private Button setActiveBt;
     private Button removeBt;
     
-    private final String BUNDLE_NAME = GitConfigurationPreferencePage.class.getPackage().getName() + ".GitConfUIMessages";//$NON-NLS-1$
+    private final String BUNDLE_NAME = SiteConfigurationPreferencePage.class.getPackage().getName() + ".GitConfUIMessages";//$NON-NLS-1$
        private ResourceBundle resources = ResourceBundle.getBundle(BUNDLE_NAME);
     
-    public GitConfigurationPreferencePage() {
+    public SiteConfigurationPreferencePage() {
        gitConfigList = new ArrayList<PreferencesManager.GitConfiguration>();
     }
     
@@ -188,11 +188,11 @@ public class GitConfigurationPreferencePage extends PreferencePage implements IW
 
                        @Override
                        public void mouseDown(MouseEvent e) {
-                               GitConfDialog dialog = new GitConfDialog(getShell());
+                               SiteConfigurationDialog dialog = new SiteConfigurationDialog(getShell());
                                
-                               if (dialog.open() == GitConfDialog.OK) {
+                               if (dialog.open() == SiteConfigurationDialog.OK) {
                                        PreferencesManager.addGitConfiguration( 
-                                                       dialog.getGitConfigName(),
+                                                       dialog.getSiteConfigName(),
                                                        dialog.getGitBaseURI(),
                                                        dialog.getGitListType(),
                                                        dialog.getGitListLocation()     );
@@ -226,12 +226,12 @@ public class GitConfigurationPreferencePage extends PreferencePage implements IW
                                String gitListType = gitConfigList.get(idx).listType; 
                                String gitListLocation = gitConfigList.get(idx).listLocation;
                                
-                               GitConfDialog dialog = new GitConfDialog(getShell(), 
+                               SiteConfigurationDialog dialog = new SiteConfigurationDialog(getShell(), 
                                                gitConfigName, gitBaseURI, gitListType, gitListLocation );
-                               if (dialog.open() == GitConfDialog.OK) {
+                               if (dialog.open() == SiteConfigurationDialog.OK) {
                                        PreferencesManager.updateGitConfiguration(
                                                        gitConfigTable.getTable().getSelectionIndex(),
-                                                       dialog.getGitConfigName(),
+                                                       dialog.getSiteConfigName(),
                                                        dialog.getGitBaseURI(),
                                                        dialog.getGitListType(),
                                                        dialog.getGitListLocation()     );