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 2008/05/29 11:33:55 UTC
svn commit: r661271 - in
/directory/studio/branches/apacheds-plugin-branch/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/v...
Author: pamarcelot
Date: Thu May 29 02:33:54 2008
New Revision: 661271
URL: http://svn.apache.org/viewvc?rev=661271&view=rev
Log:
Renamed the Open action to OpenConfiguration.
Added:
directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/OpenConfigurationAction.java
- copied, changed from r661268, directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/OpenAction.java
Removed:
directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/OpenAction.java
Modified:
directory/studio/branches/apacheds-plugin-branch/apacheds/plugin.xml
directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPluginConstants.java
directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/views/ServersView.java
Modified: directory/studio/branches/apacheds-plugin-branch/apacheds/plugin.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/apacheds-plugin-branch/apacheds/plugin.xml?rev=661271&r1=661270&r2=661271&view=diff
==============================================================================
--- directory/studio/branches/apacheds-plugin-branch/apacheds/plugin.xml (original)
+++ directory/studio/branches/apacheds-plugin-branch/apacheds/plugin.xml Thu May 29 02:33:54 2008
@@ -70,10 +70,10 @@
</command>
<command
categoryId="org.apache.directory.studio.apacheds.commands"
- defaultHandler="org.apache.directory.studio.apacheds.actions.OpenAction"
+ defaultHandler="org.apache.directory.studio.apacheds.actions.OpenConfigurationAction"
description="Opens the server configuration"
- id="org.apache.directory.studio.apacheds.commands.open"
- name="Open">
+ id="org.apache.directory.studio.apacheds.commands.openConfiguration"
+ name="Open Configuration">
</command>
<command
categoryId="org.apache.directory.studio.apacheds.commands"
@@ -121,7 +121,7 @@
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
sequence="M1+E"/>
<key
- commandId="org.apache.directory.studio.apacheds.commands.open"
+ commandId="org.apache.directory.studio.apacheds.commands.openConfiguration"
contextId="org.apache.directory.studio.apacheds.contexts.serversView"
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
sequence="F3"/>
Modified: directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPluginConstants.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPluginConstants.java?rev=661271&r1=661270&r2=661271&view=diff
==============================================================================
--- directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPluginConstants.java (original)
+++ directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPluginConstants.java Thu May 29 02:33:54 2008
@@ -52,7 +52,7 @@
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 = "org.apache.directory.studio.apacheds.commands.open";
+ 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";
Copied: directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/OpenConfigurationAction.java (from r661268, directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/OpenAction.java)
URL: http://svn.apache.org/viewvc/directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/OpenConfigurationAction.java?p2=directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/OpenConfigurationAction.java&p1=directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/OpenAction.java&r1=661268&r2=661271&rev=661271&view=diff
==============================================================================
--- directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/OpenAction.java (original)
+++ directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/OpenConfigurationAction.java Thu May 29 02:33:54 2008
@@ -47,25 +47,25 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class OpenAction extends Action implements IWorkbenchWindowActionDelegate
+public class OpenConfigurationAction extends Action implements IWorkbenchWindowActionDelegate
{
/** The associated view */
private ServersView view;
/**
- * Creates a new instance of OpenAction.
+ * Creates a new instance of OpenConfigurationAction.
*
* @param view
* the associated view
*/
- public OpenAction( ServersView view )
+ public OpenConfigurationAction( ServersView view )
{
- super( "&Open" );
+ super( "&Open Configuration" );
this.view = view;
- setId( ApacheDsPluginConstants.CMD_OPEN );
- setActionDefinitionId( ApacheDsPluginConstants.CMD_OPEN );
- setToolTipText( "Open" );
+ setId( ApacheDsPluginConstants.CMD_OPEN_CONFIGURATION );
+ setActionDefinitionId( ApacheDsPluginConstants.CMD_OPEN_CONFIGURATION );
+ setToolTipText( "Open Configuration" );
}
Modified: directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/views/ServersView.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/views/ServersView.java?rev=661271&r1=661270&r2=661271&view=diff
==============================================================================
--- directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/views/ServersView.java (original)
+++ directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/views/ServersView.java Thu May 29 02:33:54 2008
@@ -23,7 +23,7 @@
import org.apache.directory.studio.apacheds.ApacheDsPluginConstants;
import org.apache.directory.studio.apacheds.actions.DeleteAction;
import org.apache.directory.studio.apacheds.actions.NewServerAction;
-import org.apache.directory.studio.apacheds.actions.OpenAction;
+import org.apache.directory.studio.apacheds.actions.OpenConfigurationAction;
import org.apache.directory.studio.apacheds.actions.PropertiesAction;
import org.apache.directory.studio.apacheds.actions.RenameAction;
import org.apache.directory.studio.apacheds.actions.RunAction;
@@ -93,12 +93,12 @@
// Actions
private NewServerAction newServer;
+ private OpenConfigurationAction openConfiguration;
+ private DeleteAction delete;
+ private RenameAction rename;
private RunAction run;
private StopAction stop;
private PropertiesAction properties;
- private DeleteAction delete;
- private OpenAction open;
- private RenameAction rename;
// Listeners
private ServersHandlerListener serversHandlerListener = new ServersHandlerListener()
@@ -251,6 +251,15 @@
{
newServer = new NewServerAction();
+ openConfiguration = new OpenConfigurationAction( this );
+ openConfiguration.setEnabled( false );
+
+ delete = new DeleteAction( this );
+ delete.setEnabled( false );
+
+ rename = new RenameAction( this );
+ rename.setEnabled( false );
+
run = new RunAction( this );
run.setEnabled( false );
@@ -259,15 +268,6 @@
properties = new PropertiesAction( this );
properties.setEnabled( false );
-
- open = new OpenAction( this );
- open.setEnabled( false );
-
- delete = new DeleteAction( this );
- delete.setEnabled( false );
-
- rename = new RenameAction( this );
- rename.setEnabled( false );
}
@@ -298,7 +298,7 @@
MenuManager newManager = new MenuManager( "&New" );
newManager.add( newServer );
manager.add( newManager );
- manager.add( open );
+ manager.add( openConfiguration );
manager.add( new Separator() );
manager.add( delete );
manager.add( rename );
@@ -330,7 +330,7 @@
{
public void doubleClick( DoubleClickEvent event )
{
- open.run();
+ openConfiguration.run();
}
} );
@@ -357,7 +357,7 @@
if ( commandService != null )
{
commandService.getCommand( newServer.getActionDefinitionId() ).setHandler( null );
- commandService.getCommand( open.getActionDefinitionId() ).setHandler( null );
+ commandService.getCommand( openConfiguration.getActionDefinitionId() ).setHandler( null );
commandService.getCommand( delete.getActionDefinitionId() ).setHandler( null );
commandService.getCommand( rename.getActionDefinitionId() ).setHandler( null );
commandService.getCommand( run.getActionDefinitionId() ).setHandler( null );
@@ -390,8 +390,8 @@
{
commandService.getCommand( newServer.getActionDefinitionId() ).setHandler(
new ActionHandler( newServer ) );
- commandService.getCommand( open.getActionDefinitionId() )
- .setHandler( new ActionHandler( open ) );
+ commandService.getCommand( openConfiguration.getActionDefinitionId() ).setHandler(
+ new ActionHandler( openConfiguration ) );
commandService.getCommand( delete.getActionDefinitionId() ).setHandler(
new ActionHandler( delete ) );
commandService.getCommand( rename.getActionDefinitionId() ).setHandler(
@@ -476,19 +476,19 @@
break;
}
- open.setEnabled( true );
+ openConfiguration.setEnabled( true );
delete.setEnabled( true );
- properties.setEnabled( true );
rename.setEnabled( true );
+ properties.setEnabled( true );
}
else
{
+ openConfiguration.setEnabled( false );
+ delete.setEnabled( false );
+ rename.setEnabled( false );
run.setEnabled( false );
stop.setEnabled( false );
- open.setEnabled( false );
- delete.setEnabled( false );
properties.setEnabled( false );
- rename.setEnabled( false );
}
}