directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r689018 - in /directory/studio/trunk/apacheds: ./ src/main/java/org/apache/directory/studio/apacheds/ src/main/java/org/apache/directory/studio/apacheds/actions/ src/main/java/org/apache/directory/studio/apacheds/properties/ src/main/java/o...
Date Tue, 26 Aug 2008 10:20:24 GMT
Author: pamarcelot
Date: Tue Aug 26 03:20:17 2008
New Revision: 689018

URL: http://svn.apache.org/viewvc?rev=689018&view=rev
Log:
Part of a fix for DIRSTUDIO-375 (Move each plugin IDs in a plugin.properties file).

Modified:
    directory/studio/trunk/apacheds/plugin.properties
    directory/studio/trunk/apacheds/plugin.xml
    directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPlugin.java
    directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPluginConstants.java
    directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/PropertiesAction.java
    directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/properties/ServerPropertyPage.java
    directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/views/ServersView.java

Modified: directory/studio/trunk/apacheds/plugin.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds/plugin.properties?rev=689018&r1=689017&r2=689018&view=diff
==============================================================================
--- directory/studio/trunk/apacheds/plugin.properties (original)
+++ directory/studio/trunk/apacheds/plugin.properties Tue Aug 26 03:20:17 2008
@@ -15,59 +15,59 @@
 # specific language governing permissions and limitations
 # under the License.
 
-ID_PrefPage_MainPage.id=org.apache.directory.studio.apacheds.prefs.MainPage
-ID_PrefPage_MainPage.name=Apache DS
+Pref_MainPage_id=org.apache.directory.studio.apacheds.prefs.MainPage
+Pref_MainPage_name=Apache DS
 
-ID_PrefPage_ColorsAndFontsPage.id=org.apache.directory.studio.apacheds.ColorsAndFontsPage
-ID_PrefPage_ColorsAndFontsPage.name=Colors and Fonts
+Pref_ColorsAndFontsPage_id=org.apache.directory.studio.apacheds.ColorsAndFontsPage
+Pref_ColorsAndFontsPage_name=Colors and Fonts
 
-ID_PrefPage_ServerLogsPage.id=org.apache.directory.studio.apacheds.ServerLogsPage
-ID_PrefPage_ServerLogsPage.name=Server Logs
+Pref_ServerLogsPage_id=org.apache.directory.studio.apacheds.ServerLogsPage
+Pref_ServerLogsPage_name=Server Logs
 
-ID_View_Category.id=org.apache.directory.studio.apacheds.category
-ID_View_Category.name=Apache DS
+View_Category_id=org.apache.directory.studio.apacheds.category
+View_Category_name=Apache DS
 
-ID_View_ServersView.id=org.apache.directory.studio.apacheds.serversView
-ID_View_ServersView.name=Servers
+View_ServersView_id=org.apache.directory.studio.apacheds.serversView
+View_ServersView_name=Servers
 
-ID_PropPage_ServerPropertyPage.id=org.apache.directory.studio.apacheds.properties.serverProperties
-ID_PropPage_ServerPropertyPage.name=Info
+Prop_ServerPropertyPage_id=org.apache.directory.studio.apacheds.properties.serverProperties
+Prop_ServerPropertyPage_name=Info
 
-ID_Cmd_Category.id=org.apache.directory.studio.apacheds.commands
-ID_Cmd_Category.name=Apache DS
+Cmd_Category_id=org.apache.directory.studio.apacheds.commands
+Cmd_Category_name=Apache DS
 
-ID_Cmd_NewServer.id=org.apache.directory.studio.apacheds.commands.newServer
-ID_Cmd_NewServer.name=New Server
-ID_Cmd_NewServer.description=Creates a new server
+Cmd_NewServer_id=org.apache.directory.studio.apacheds.commands.newServer
+Cmd_NewServer_name=New Server
+Cmd_NewServer_description=Creates a new server
 
-ID_Cmd_OpenConfiguration.id=org.apache.directory.studio.apacheds.commands.openConfiguration
-ID_Cmd_OpenConfiguration.name=Open Configuration
-ID_Cmd_OpenConfiguration.description=Open Configuration
+Cmd_OpenConfiguration_id=org.apache.directory.studio.apacheds.commands.openConfiguration
+Cmd_OpenConfiguration_name=Open Configuration
+Cmd_OpenConfiguration_description=Open Configuration
 
-ID_Cmd_Delete.id=org.apache.directory.studio.apacheds.commands.delete
-ID_Cmd_Delete.name=Delete
-ID_Cmd_Delete.description=Deletes a server
+Cmd_Delete_id=org.apache.directory.studio.apacheds.commands.delete
+Cmd_Delete_name=Delete
+Cmd_Delete_description=Deletes a server
 
-ID_Cmd_Rename.id=org.apache.directory.studio.apacheds.commands.rename
-ID_Cmd_Rename.name=org.apache.directory.studio.apacheds.commands.rename
-ID_Cmd_Rename.description=Renames the server
+Cmd_Rename_id=org.apache.directory.studio.apacheds.commands.rename
+Cmd_Rename_name=org.apache.directory.studio.apacheds.commands.rename
+Cmd_Rename_description=Renames the server
 
-ID_Cmd_CreateConnection.id=org.apache.directory.studio.apacheds.commands.createConnection
-ID_Cmd_CreateConnection.name=Create a Connection
-ID_Cmd_CreateConnection.description=Creates a connection
+Cmd_CreateConnection_id=org.apache.directory.studio.apacheds.commands.createConnection
+Cmd_CreateConnection_name=Create a Connection
+Cmd_CreateConnection_description=Creates a connection
 
-ID_Cmd_Run.id=org.apache.directory.studio.apacheds.commands.run
-ID_Cmd_Run.name=Run
-ID_Cmd_Run.description=Runs the server
+Cmd_Run_id=org.apache.directory.studio.apacheds.commands.run
+Cmd_Run_name=Run
+Cmd_Run_description=Runs the server
 
-ID_Cmd_Stop.id=org.apache.directory.studio.apacheds.commands.stop
-ID_Cmd_Stop.name=Stop
-ID_Cmd_Stop.description=Stops the server
+Cmd_Stop_id=org.apache.directory.studio.apacheds.commands.stop
+Cmd_Stop_name=Stop
+Cmd_Stop_description=Stops the server
 
-ID_Cmd_Properties.id=org.apache.directory.studio.apacheds.commands.properties
-ID_Cmd_Properties.name=Properties
-ID_Cmd_Properties.description=Shows the properties of the server
+Cmd_Properties_id=org.apache.directory.studio.apacheds.commands.properties
+Cmd_Properties_name=Properties
+Cmd_Properties_description=Shows the properties of the server
 
-ID_Context_ServersView.id=org.apache.directory.studio.apacheds.contexts.serversView
-ID_Context_ServersView.name=In Servers View of Apache DS
-ID_Context_ServersView.description=In Servers View of Apache DS
+Ctx_ServersView_id=org.apache.directory.studio.apacheds.contexts.serversView
+Ctx_ServersView_name=In Servers View of Apache DS
+Ctx_ServersView_description=In Servers View of Apache DS

Modified: directory/studio/trunk/apacheds/plugin.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds/plugin.xml?rev=689018&r1=689017&r2=689018&view=diff
==============================================================================
--- directory/studio/trunk/apacheds/plugin.xml (original)
+++ directory/studio/trunk/apacheds/plugin.xml Tue Aug 26 03:20:17 2008
@@ -5,20 +5,20 @@
          point="org.eclipse.ui.preferencePages">
       <page
             class="org.apache.directory.studio.apacheds.prefs.MainPage"
-            id="%ID_PrefPage_MainPage.id"
-            name="%ID_PrefPage_MainPage.name">
+            id="%Pref_MainPage_id"
+            name="%Pref_MainPage_name">
       </page>
       <page
             class="org.apache.directory.studio.apacheds.prefs.ColorsAndFontsPage"
-            id="%ID_PrefPage_ColorsAndFontsPage.id"
-            name="%ID_PrefPage_ColorsAndFontsPage.name"
-            category="%ID_PrefPage_MainPage.id">
+            id="%Pref_ColorsAndFontsPage_id"
+            name="%Pref_ColorsAndFontsPage_name"
+            category="%Pref_MainPage_id">
       </page>
       <page
             class="org.apache.directory.studio.apacheds.prefs.ServerLogsPage"
-            id="%ID_PrefPage_ServerLogsPage.id"
-            name="%ID_PrefPage_ServerLogsPage.name"
-            category="%ID_PrefPage_MainPage.id">
+            id="%Pref_ServerLogsPage_id"
+            name="%Pref_ServerLogsPage_name"
+            category="%Pref_MainPage_id">
       </page>
    </extension>
    <extension
@@ -30,23 +30,23 @@
    <extension
          point="org.eclipse.ui.views">
       <category
-            id="%ID_View_Category.id"
-            name="%ID_View_Category.name">
+            id="%View_Category_id"
+            name="%View_Category_name">
       </category>
       <view
-            category="%ID_View_Category.id"
+            category="%View_Category_id"
             class="org.apache.directory.studio.apacheds.views.ServersView"
             icon="resources/icons/serverView.png"
-            id="%ID_View_ServersView.id"
-            name="%ID_View_ServersView.name">
+            id="%View_ServersView_id"
+            name="%View_ServersView_name">
       </view>
    </extension>
    <extension
          point="org.eclipse.ui.propertyPages">
       <page
             class="org.apache.directory.studio.apacheds.properties.ServerPropertyPage"
-            id="%ID_PropPage_ServerPropertyPage.id"
-            name="%ID_PropPage_ServerPropertyPage.name">
+            id="%Prop_ServerPropertyPage_id"
+            name="%Prop_ServerPropertyPage_name">
          <enabledWhen>
             <instanceof
                   value="org.apache.directory.studio.apacheds.model.Server">
@@ -57,102 +57,102 @@
    <extension
          point="org.eclipse.ui.commands">
       <category
-            id="%ID_Cmd_Category.id"
-            name="%ID_Cmd_Category.name">
+            id="%Cmd_Category_id"
+            name="%Cmd_Category_name">
       </category>
       <command
-            categoryId="%ID_Cmd_Category.id"
-            description="%ID_Cmd_NewServer.description"
-            id="%ID_Cmd_NewServer.id"
-            name="%ID_Cmd_NewServer.name">
+            categoryId="%Cmd_Category_id"
+            description="%Cmd_NewServer_description"
+            id="%Cmd_NewServer_id"
+            name="%Cmd_NewServer_name">
       </command>
       <command
-            categoryId="%ID_Cmd_Category.id"
-            description="%ID_Cmd_OpenConfiguration.description"
-            id="%ID_Cmd_OpenConfiguration.id"
-            name="%ID_Cmd_OpenConfiguration.name">
+            categoryId="%Cmd_Category_id"
+            description="%Cmd_OpenConfiguration_description"
+            id="%Cmd_OpenConfiguration_id"
+            name="%Cmd_OpenConfiguration_name">
       </command>
       <command
-            categoryId="%ID_Cmd_Category.id"
-            description="%ID_Cmd_Delete.description"
-            id="%ID_Cmd_Delete.id"
-            name="%ID_Cmd_Delete.name">
+            categoryId="%Cmd_Category_id"
+            description="%Cmd_Delete_description"
+            id="%Cmd_Delete_id"
+            name="%Cmd_Delete_name">
       </command>
       <command
-            categoryId="%ID_Cmd_Category.id"
-            description="%ID_Cmd_Rename.description"
-            id="%ID_Cmd_Rename.id"
-            name="%ID_Cmd_Rename.name">
+            categoryId="%Cmd_Category_id"
+            description="%Cmd_Rename_description"
+            id="%Cmd_Rename_id"
+            name="%Cmd_Rename_name">
       </command>
       <command
-            categoryId="%ID_Cmd_Category.id"
-            description="%ID_Cmd_CreateConnection.description"
-            id="%ID_Cmd_CreateConnection.id"
-            name="%ID_Cmd_CreateConnection.name">
+            categoryId="%Cmd_Category_id"
+            description="%Cmd_CreateConnection_description"
+            id="%Cmd_CreateConnection_id"
+            name="%Cmd_CreateConnection_name">
       </command>
       <command
-            categoryId="%ID_Cmd_Category.id"
-            description="%ID_Cmd_Run.description"
-            id="%ID_Cmd_Run.id"
-            name="%ID_Cmd_Run.name">
+            categoryId="%Cmd_Category_id"
+            description="%Cmd_Run_description"
+            id="%Cmd_Run_id"
+            name="%Cmd_Run_name">
       </command>
       <command
-            categoryId="%ID_Cmd_Category.id"
-            description="%ID_Cmd_Stop.description"
-            id="%ID_Cmd_Stop.id"
-            name="%ID_Cmd_Stop.name">
+            categoryId="%Cmd_Category_id"
+            description="%Cmd_Stop_description"
+            id="%Cmd_Stop_id"
+            name="%Cmd_Stop_name">
       </command>
       <command
-            categoryId="%ID_Cmd_Category.id"
-            description="%ID_Cmd_Properties.description"
-            id="%ID_Cmd_Properties.id"
-            name="%ID_Cmd_Properties.name">
+            categoryId="%Cmd_Category_id"
+            description="%Cmd_Properties_description"
+            id="%Cmd_Properties_id"
+            name="%Cmd_Properties_name">
       </command>
    </extension>
    <extension
          point="org.eclipse.ui.contexts">
       <context
-            description="%ID_Context_ServersView.description"
-            id="%ID_Context_ServersView.id"
-            name="%ID_Context_ServersView.name"
+            description="%Ctx_ServersView_description"
+            id="%Ctx_ServersView_id"
+            name="%Ctx_ServersView_name"
             parentId="org.eclipse.ui.contexts.window">
       </context>
    </extension>
    <extension
          point="org.eclipse.ui.bindings">
       <key
-            commandId="%ID_Cmd_NewServer.id"
-            contextId="%ID_Context_ServersView.id"
+            commandId="%Cmd_NewServer_id"
+            contextId="%Ctx_ServersView_id"
             schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
             sequence="M1+E"/>
       <key
-            commandId="%ID_Cmd_OpenConfiguration.id"
-            contextId="%ID_Context_ServersView.id"
+            commandId="%Cmd_OpenConfiguration_id"
+            contextId="%Ctx_ServersView_id"
             schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
             sequence="F3"/>
       <key
-            commandId="%ID_Cmd_Delete.id"
-            contextId="%ID_Context_ServersView.id"
+            commandId="%Cmd_Delete_id"
+            contextId="%Ctx_ServersView_id"
             schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
             sequence="DEL"/>
       <key
-            commandId="%ID_Cmd_Rename.id"
-            contextId="%ID_Context_ServersView.id"
+            commandId="%Cmd_Rename_id"
+            contextId="%Ctx_ServersView_id"
             schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
             sequence="F2"/>
       <key
-            commandId="%ID_Cmd_Run.id"
-            contextId="%ID_Context_ServersView.id"
+            commandId="%Cmd_Run_id"
+            contextId="%Ctx_ServersView_id"
             schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
             sequence="M1+R"/>
       <key
-            commandId="%ID_Cmd_Stop.id"
-            contextId="%ID_Context_ServersView.id"
+            commandId="%Cmd_Stop_id"
+            contextId="%Ctx_ServersView_id"
             schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
             sequence="M1+T"/>
       <key
-            commandId="%ID_Cmd_Properties.id"
-            contextId="%ID_Context_ServersView.id"
+            commandId="%Cmd_Properties_id"
+            contextId="%Ctx_ServersView_id"
             schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
             sequence="ALT+RETURN"/>
    </extension>

Modified: directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPlugin.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPlugin.java?rev=689018&r1=689017&r2=689018&view=diff
==============================================================================
--- directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPlugin.java
(original)
+++ directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPlugin.java
Tue Aug 26 03:20:17 2008
@@ -20,11 +20,14 @@
 package org.apache.directory.studio.apacheds;
 
 
+import java.io.IOException;
 import java.net.URL;
+import java.util.PropertyResourceBundle;
 
 import org.apache.directory.studio.apacheds.model.ServersHandler;
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
@@ -45,6 +48,9 @@
     /** The servers handler */
     private ServersHandler serversHandler;
 
+    /** The plugin properties */
+    private PropertyResourceBundle properties;
+
 
     /**
      * The constructor
@@ -144,4 +150,30 @@
         }
         return image;
     }
+
+
+    /**
+     * Gets the plugin properties.
+     *
+     * @return
+     *      the plugin properties
+     */
+    public PropertyResourceBundle getPluginProperties()
+    {
+        if ( properties == null )
+        {
+            try
+            {
+                properties = new PropertyResourceBundle( FileLocator.openStream( this.getBundle(),
new Path(
+                    "plugin.properties" ), false ) );
+            }
+            catch ( IOException e )
+            {
+                getLog().log(
+                    new Status( Status.ERROR, PLUGIN_ID, Status.OK, "Unable to get the plugin
properties.", e ) );
+            }
+        }
+
+        return properties;
+    }
 }

Modified: directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPluginConstants.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPluginConstants.java?rev=689018&r1=689017&r2=689018&view=diff
==============================================================================
--- directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPluginConstants.java
(original)
+++ directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPluginConstants.java
Tue Aug 26 03:20:17 2008
@@ -28,9 +28,9 @@
  */
 public interface ApacheDsPluginConstants
 {
-    // -------
+    // ------
     // IMAGES
-    // -------
+    // ------
     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";
@@ -49,19 +49,38 @@
     // --------
     // COMMANDS
     // --------
-    public static final String CMD_NEW_SERVER = "org.apache.directory.studio.apacheds.commands.newServer";
-    public static final String CMD_RUN = "org.apache.directory.studio.apacheds.commands.run";
-    public static final String CMD_STOP = "org.apache.directory.studio.apacheds.commands.stop";
-    public static final String CMD_PROPERTIES = "org.apache.directory.studio.apacheds.commands.properties";
-    public static final String CMD_OPEN_CONFIGURATION = "org.apache.directory.studio.apacheds.commands.openConfiguration";
-    public static final String CMD_DELETE = "org.apache.directory.studio.apacheds.commands.delete";
-    public static final String CMD_RENAME = "org.apache.directory.studio.apacheds.commands.rename";
-    public static final String CMD_CREATE_CONNECTION = "org.apache.directory.studio.apacheds.commands.createConnection";
+    public static final String CMD_NEW_SERVER = ApacheDsPlugin.getDefault().getPluginProperties().getString(
+        "Cmd_NewServer_id" );
+    public static final String CMD_RUN = ApacheDsPlugin.getDefault().getPluginProperties().getString(
"Cmd_Run_id" );
+    public static final String CMD_STOP = ApacheDsPlugin.getDefault().getPluginProperties().getString(
"Cmd_Stop_id" );
+    public static final String CMD_PROPERTIES = ApacheDsPlugin.getDefault().getPluginProperties().getString(
+        "Cmd_Properties_id" );
+    public static final String CMD_OPEN_CONFIGURATION = ApacheDsPlugin.getDefault().getPluginProperties().getString(
+        "Cmd_OpenConfiguration_id" );
+    public static final String CMD_DELETE = ApacheDsPlugin.getDefault().getPluginProperties().getString(
+        "Cmd_Delete_id" );;
+    public static final String CMD_RENAME = ApacheDsPlugin.getDefault().getPluginProperties().getString(
+        "Cmd_Rename_id" );;
+    public static final String CMD_CREATE_CONNECTION = ApacheDsPlugin.getDefault().getPluginProperties().getString(
+        "Cmd_CreateConnection_id" );
+
+    // --------------
+    // PROPERTY PAGES
+    // --------------
+    public static final String PROP_SERVER_PROPERTY_PAGE = ApacheDsPlugin.getDefault().getPluginProperties().getString(
+        "Prop_ServerPropertyPage_id" );
+
+    // -----
+    // VIEWS
+    // -----
+    public static final String VIEW_SERVERS_VIEW = ApacheDsPlugin.getDefault().getPluginProperties().getString(
+        "View_ServersView_id" );
 
     // --------
     // CONTEXTS
     // --------
-    public static final String CONTEXTS_SERVERS_VIEW = "org.apache.directory.studio.apacheds.contexts.serversView";
+    public static final String CONTEXTS_SERVERS_VIEW = ApacheDsPlugin.getDefault().getPluginProperties().getString(
+        "Ctx_ServersView_id" );
 
     // -----------
     // PREFERENCES

Modified: directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/PropertiesAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/PropertiesAction.java?rev=689018&r1=689017&r2=689018&view=diff
==============================================================================
--- directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/PropertiesAction.java
(original)
+++ directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/PropertiesAction.java
Tue Aug 26 03:20:17 2008
@@ -95,7 +95,7 @@
             {
                 Server server = ( Server ) selection.getFirstElement();
                 PreferenceDialog dialog = PreferencesUtil.createPropertyDialogOn( view.getViewSite().getShell(),
-                    server, ServerPropertyPage.ID, null, null );
+                    server, ApacheDsPluginConstants.PROP_SERVER_PROPERTY_PAGE, null, null
);
                 dialog.getShell().setText( "Properties for '" + shorten( server.getName(),
30 ) + "'" );
                 dialog.open();
             }

Modified: directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/properties/ServerPropertyPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/properties/ServerPropertyPage.java?rev=689018&r1=689017&r2=689018&view=diff
==============================================================================
--- directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/properties/ServerPropertyPage.java
(original)
+++ directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/properties/ServerPropertyPage.java
Tue Aug 26 03:20:17 2008
@@ -41,15 +41,13 @@
  */
 public class ServerPropertyPage extends PropertyPage implements IWorkbenchPropertyPage
 {
-    public static final String ID = "org.apache.directory.studio.apacheds.properties.serverProperties";
-
-
     /**
      * Creates a new instance of ServerPropertyPage.
      */
     public ServerPropertyPage()
     {
         super();
+
         super.noDefaultAndApplyButton();
     }
 
@@ -87,8 +85,7 @@
         if ( server != null )
         {
             nameText.setText( server.getName() );
-            locationText.setText( ApacheDsPluginUtils.getApacheDsServersFolder().append(
server.getId() )
-                .toOSString() );
+            locationText.setText( ApacheDsPluginUtils.getApacheDsServersFolder().append(
server.getId() ).toOSString() );
         }
 
         return parent;

Modified: directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/views/ServersView.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/views/ServersView.java?rev=689018&r1=689017&r2=689018&view=diff
==============================================================================
--- directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/views/ServersView.java
(original)
+++ directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/views/ServersView.java
Tue Aug 26 03:20:17 2008
@@ -20,6 +20,7 @@
 package org.apache.directory.studio.apacheds.views;
 
 
+import org.apache.directory.studio.apacheds.ApacheDsPlugin;
 import org.apache.directory.studio.apacheds.ApacheDsPluginConstants;
 import org.apache.directory.studio.apacheds.actions.CreateConnectionAction;
 import org.apache.directory.studio.apacheds.actions.DeleteAction;
@@ -75,7 +76,7 @@
 public class ServersView extends ViewPart
 {
     /** The ID of the view */
-    public static final String ID = "org.apache.directory.studio.apacheds.serversView";
+    public static final String ID = ApacheDsPluginConstants.VIEW_SERVERS_VIEW;
 
     /** The tree*/
     private Tree tree;



Mime
View raw message