You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2010/08/17 10:47:41 UTC

svn commit: r986240 - in /directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers: ./ actions/ properties/ views/

Author: pamarcelot
Date: Tue Aug 17 08:47:40 2010
New Revision: 986240

URL: http://svn.apache.org/viewvc?rev=986240&view=rev
Log:
Cleaning in string externalization.

Modified:
    directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/LdapServerAdapterExtensionsManager.java
    directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/LdapServersManager.java
    directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/LdapServersPluginConstants.java
    directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/LdapServersUtils.java
    directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/actions/RenameAction.java
    directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/properties/ServerPropertyPage.java
    directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/properties/messages_de.properties
    directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/properties/messages_fr.properties
    directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/views/ServersTableViewer.java

Modified: directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/LdapServerAdapterExtensionsManager.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/LdapServerAdapterExtensionsManager.java?rev=986240&r1=986239&r2=986240&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/LdapServerAdapterExtensionsManager.java (original)
+++ directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/LdapServerAdapterExtensionsManager.java Tue Aug 17 08:47:40 2010
@@ -44,13 +44,13 @@ import org.eclipse.ui.plugin.AbstractUIP
 public class LdapServerAdapterExtensionsManager
 {
     // Attributes names used in 'plugin.xml' file
-    private static final String ID_ATTR = "id";
-    private static final String NAME_ATTR = "name";
-    private static final String VERSION_ATTR = "version";
-    private static final String VENDOR_ATTR = "vendor";
-    private static final String CLASS_ATTR = "class";
-    private static final String DESCRIPTION_ATTR = "description";
-    private static final String ICON_ATTR = "icon";
+    private static final String ID_ATTR = "id"; //$NON-NLS-1$
+    private static final String NAME_ATTR = "name"; //$NON-NLS-1$
+    private static final String VERSION_ATTR = "version"; //$NON-NLS-1$
+    private static final String VENDOR_ATTR = "vendor"; //$NON-NLS-1$
+    private static final String CLASS_ATTR = "class"; //$NON-NLS-1$
+    private static final String DESCRIPTION_ATTR = "description"; //$NON-NLS-1$
+    private static final String ICON_ATTR = "icon"; //$NON-NLS-1$
 
     /** The default instance */
     private static LdapServerAdapterExtensionsManager instance;

Modified: directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/LdapServersManager.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/LdapServersManager.java?rev=986240&r1=986239&r2=986240&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/LdapServersManager.java (original)
+++ directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/LdapServersManager.java Tue Aug 17 08:47:40 2010
@@ -49,7 +49,7 @@ import org.eclipse.ui.XMLMemento;
  */
 public class LdapServersManager
 {
-    private static final String SERVERS = "servers";
+    private static final String SERVERS = "servers"; //$NON-NLS-1$
 
     /** The default instance */
     private static LdapServersManager instance;
@@ -480,7 +480,7 @@ public class LdapServersManager
             if ( server != null )
             {
                 // Creating the File of the memento (if needed)
-                File mementoFile = getServerFolder( server ).append( "memento.xml" ).toFile();
+                File mementoFile = getServerFolder( server ).append( "memento.xml" ).toFile(); //$NON-NLS-1$
                 if ( !mementoFile.exists() )
                 {
                     mementoFile.createNewFile();
@@ -490,7 +490,7 @@ public class LdapServersManager
                 XMLMemento readMemento = XMLMemento.createReadRoot( new FileReader( mementoFile ) );
 
                 // Converting the read memento to a writable memento
-                XMLMemento memento = XMLMemento.createWriteRoot( "memento" );
+                XMLMemento memento = XMLMemento.createWriteRoot( "memento" ); //$NON-NLS-1$
                 memento.putMemento( readMemento );
 
                 return memento;

Modified: directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/LdapServersPluginConstants.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/LdapServersPluginConstants.java?rev=986240&r1=986239&r2=986240&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/LdapServersPluginConstants.java (original)
+++ directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/LdapServersPluginConstants.java Tue Aug 17 08:47:40 2010
@@ -37,51 +37,51 @@ public interface LdapServersPluginConsta
     // ------
     // IMAGES
     // ------
-    public static final String IMG_FOLDER = "resources/icons/folder.gif";
-    public static final String IMG_SERVER_NEW = "resources/icons/server_new.gif";
-    public static final String IMG_SERVER_NEW_WIZARD = "resources/icons/server_new_wizard.png";
-    public static final String IMG_SERVER = "resources/icons/server.gif";
-    public static final String IMG_SERVER_STARTED = "resources/icons/server_started.gif";
-    public static final String IMG_SERVER_STARTING1 = "resources/icons/server_starting1.gif";
-    public static final String IMG_SERVER_STARTING2 = "resources/icons/server_starting2.gif";
-    public static final String IMG_SERVER_STARTING3 = "resources/icons/server_starting3.gif";
-    public static final String IMG_SERVER_STOPPED = "resources/icons/server_stopped.gif";
-    public static final String IMG_SERVER_STOPPING1 = "resources/icons/server_stopping1.gif";
-    public static final String IMG_SERVER_STOPPING2 = "resources/icons/server_stopping2.gif";
-    public static final String IMG_SERVER_STOPPING3 = "resources/icons/server_stopping3.gif";
-    public static final String IMG_START = "resources/icons/start.gif";
-    public static final String IMG_STOP = "resources/icons/stop.gif";
+    public static final String IMG_FOLDER = "resources/icons/folder.gif"; //$NON-NLS-1$
+    public static final String IMG_SERVER_NEW = "resources/icons/server_new.gif"; //$NON-NLS-1$
+    public static final String IMG_SERVER_NEW_WIZARD = "resources/icons/server_new_wizard.png"; //$NON-NLS-1$
+    public static final String IMG_SERVER = "resources/icons/server.gif"; //$NON-NLS-1$
+    public static final String IMG_SERVER_STARTED = "resources/icons/server_started.gif"; //$NON-NLS-1$
+    public static final String IMG_SERVER_STARTING1 = "resources/icons/server_starting1.gif"; //$NON-NLS-1$
+    public static final String IMG_SERVER_STARTING2 = "resources/icons/server_starting2.gif"; //$NON-NLS-1$
+    public static final String IMG_SERVER_STARTING3 = "resources/icons/server_starting3.gif"; //$NON-NLS-1$
+    public static final String IMG_SERVER_STOPPED = "resources/icons/server_stopped.gif"; //$NON-NLS-1$
+    public static final String IMG_SERVER_STOPPING1 = "resources/icons/server_stopping1.gif"; //$NON-NLS-1$
+    public static final String IMG_SERVER_STOPPING2 = "resources/icons/server_stopping2.gif"; //$NON-NLS-1$
+    public static final String IMG_SERVER_STOPPING3 = "resources/icons/server_stopping3.gif"; //$NON-NLS-1$
+    public static final String IMG_START = "resources/icons/start.gif"; //$NON-NLS-1$
+    public static final String IMG_STOP = "resources/icons/stop.gif"; //$NON-NLS-1$
 
     // --------
     // COMMANDS
     // --------
     public static final String CMD_DELETE = LdapServersPlugin.getDefault().getPluginProperties()
-        .getString( "Cmd_Delete_id" );
+        .getString( "Cmd_Delete_id" ); //$NON-NLS-1$
     public static final String CMD_NEW_SERVER = LdapServersPlugin.getDefault().getPluginProperties()
-        .getString( "Cmd_NewServer_id" );
+        .getString( "Cmd_NewServer_id" ); //$NON-NLS-1$
     public static final String CMD_PROPERTIES = LdapServersPlugin.getDefault().getPluginProperties()
-        .getString( "Cmd_Properties_id" );
+        .getString( "Cmd_Properties_id" ); //$NON-NLS-1$
     public static final String CMD_RENAME = LdapServersPlugin.getDefault().getPluginProperties()
-        .getString( "Cmd_Rename_id" );
+        .getString( "Cmd_Rename_id" ); //$NON-NLS-1$
     public static final String CMD_START = LdapServersPlugin.getDefault().getPluginProperties()
-        .getString( "Cmd_Start_id" );
+        .getString( "Cmd_Start_id" ); //$NON-NLS-1$
     public static final String CMD_STOP = LdapServersPlugin.getDefault().getPluginProperties()
-        .getString( "Cmd_Stop_id" );
+        .getString( "Cmd_Stop_id" ); //$NON-NLS-1$
 
     // --------------
     // PROPERTY PAGES
     // --------------
-    public static final String PROP_SERVER_PROPERTY_PAGE = "org.apache.directory.studio.ldapservers.properties.ServerPropertyPage";
+    public static final String PROP_SERVER_PROPERTY_PAGE = "org.apache.directory.studio.ldapservers.properties.ServerPropertyPage"; //$NON-NLS-1$
 
     // -----
     // VIEWS
     // -----
     public static final String VIEW_SERVERS_VIEW = LdapServersPlugin.getDefault().getPluginProperties()
-        .getString( "View_ServersView_id" );
+        .getString( "View_ServersView_id" ); //$NON-NLS-1$
 
     // --------
     // CONTEXTS
     // --------
     public static final String CONTEXTS_SERVERS_VIEW = LdapServersPlugin.getDefault().getPluginProperties()
-        .getString( "Ctx_ServersView_id" );
+        .getString( "Ctx_ServersView_id" ); //$NON-NLS-1$
 }

Modified: directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/LdapServersUtils.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/LdapServersUtils.java?rev=986240&r1=986239&r2=986240&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/LdapServersUtils.java (original)
+++ directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/LdapServersUtils.java Tue Aug 17 08:47:40 2010
@@ -61,7 +61,7 @@ import org.osgi.framework.Bundle;
 public class LdapServersUtils
 {
     /** The ID of the launch configuration custom object */
-    public static final String LAUNCH_CONFIGURATION_CUSTOM_OBJECT = "launchConfiguration";
+    public static final String LAUNCH_CONFIGURATION_CUSTOM_OBJECT = "launchConfiguration"; //$NON-NLS-1$
 
 
     /**

Modified: directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/actions/RenameAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/actions/RenameAction.java?rev=986240&r1=986239&r2=986240&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/actions/RenameAction.java (original)
+++ directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/actions/RenameAction.java Tue Aug 17 08:47:40 2010
@@ -348,7 +348,7 @@ public class RenameAction extends Action
                 return -2; // native border
             }
         }
-        else if ( "cocoa".equals( SWT.getPlatform() ) )
+        else if ( "cocoa".equals( SWT.getPlatform() ) ) //$NON-NLS-1$
         {
             return 0; // native border
         }

Modified: directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/properties/ServerPropertyPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/properties/ServerPropertyPage.java?rev=986240&r1=986239&r2=986240&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/properties/ServerPropertyPage.java (original)
+++ directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/properties/ServerPropertyPage.java Tue Aug 17 08:47:40 2010
@@ -61,21 +61,21 @@ public class ServerPropertyPage extends 
 
         // Name
         BaseWidgetUtils.createLabel( composite, Messages.getString( "ServerPropertyPage.Name" ), 1 ); //$NON-NLS-1$
-        Text nameText = BaseWidgetUtils.createLabeledText( composite, "", 1 );
+        Text nameText = BaseWidgetUtils.createLabeledText( composite, "", 1 ); //$NON-NLS-1$
 
         // Type
         BaseWidgetUtils.createLabel( composite, "Type:", 1 );
-        Text typeText = BaseWidgetUtils.createLabeledText( composite, "", 1 );
+        Text typeText = BaseWidgetUtils.createLabeledText( composite, "", 1 ); //$NON-NLS-1$
 
         // Vendor
         BaseWidgetUtils.createLabel( composite, "Vendor:", 1 );
-        Text vendorText = BaseWidgetUtils.createLabeledText( composite, "", 1 );
+        Text vendorText = BaseWidgetUtils.createLabeledText( composite, "", 1 ); //$NON-NLS-1$
 
         // Location
         Label locationLabel = BaseWidgetUtils.createLabel( composite,
             Messages.getString( "ServerPropertyPage.Location" ), 1 ); //$NON-NLS-1$
         locationLabel.setLayoutData( new GridData( SWT.NONE, SWT.TOP, false, false ) );
-        Text locationText = BaseWidgetUtils.createWrappedLabeledText( composite, "", 1 );
+        Text locationText = BaseWidgetUtils.createWrappedLabeledText( composite, "", 1 ); //$NON-NLS-1$
         GridData gd = new GridData( SWT.FILL, SWT.NONE, true, false );
         gd.widthHint = 300;
         locationText.setLayoutData( gd );

Modified: directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/properties/messages_de.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/properties/messages_de.properties?rev=986240&r1=986239&r2=986240&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/properties/messages_de.properties (original)
+++ directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/properties/messages_de.properties Tue Aug 17 08:47:40 2010
@@ -16,3 +16,5 @@
 #  under the License.
 
 ServerPropertyPage.Location=Ort\:
+ServerPropertyPage.Name=TODO:Name:
+ServerPropertyPage.Version=TODO:Version:
\ No newline at end of file

Modified: directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/properties/messages_fr.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/properties/messages_fr.properties?rev=986240&r1=986239&r2=986240&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/properties/messages_fr.properties (original)
+++ directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/properties/messages_fr.properties Tue Aug 17 08:47:40 2010
@@ -15,6 +15,6 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-ServerPropertyPage.Location=Fichier:
+ServerPropertyPage.Location=Emplacement:
 ServerPropertyPage.Name=Nom:
 ServerPropertyPage.Version=Version:

Modified: directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/views/ServersTableViewer.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/views/ServersTableViewer.java?rev=986240&r1=986239&r2=986240&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/views/ServersTableViewer.java (original)
+++ directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/views/ServersTableViewer.java Tue Aug 17 08:47:40 2010
@@ -317,7 +317,7 @@ public class ServersTableViewer extends 
                     }
                     catch ( Exception e )
                     {
-                        //                        Trace.trace( Trace.FINEST, "Error in Servers view animation", e ); TODO
+                        // Trace.trace( Trace.FINEST, "Error in Servers view animation", e ); TODO
                     }
 
                     // Re-launching the animation
@@ -363,8 +363,7 @@ public class ServersTableViewer extends 
         }
         catch ( Exception e )
         {
-            //            Trace.trace( Trace.WARNING, "Error in optimized animation", e );
-            //TODO
+            // Trace.trace( Trace.WARNING, "Error in optimized animation", e ); TODO
         }
     }