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 2009/10/21 14:06:44 UTC
svn commit: r827975 - in
/directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui:
./ actions/ dialogs/ preferences/ properties/ widgets/ wizards/
Author: pamarcelot
Date: Wed Oct 21 12:06:43 2009
New Revision: 827975
URL: http://svn.apache.org/viewvc?rev=827975&view=rev
Log:
Code formatting.
Modified:
directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionParameterPageManager.java
directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionUIPlugin.java
directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/ExceptionHandler.java
directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/UIAuthHandler.java
directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/UiThreadEventRunner.java
directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/actions/ActionHandlerManager.java
directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/actions/CloseConnectionAction.java
directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/actions/CollapseAllAction.java
directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/actions/CopyAction.java
directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/actions/DeleteAction.java
directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/actions/NewConnectionAction.java
directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/actions/NewConnectionFolderAction.java
directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/actions/OpenConnectionAction.java
directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/actions/PasteAction.java
directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/actions/RenameAction.java
directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/actions/SelectionUtils.java
directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/dialogs/SelectReferralConnectionDialog.java
directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/preferences/ConnectionsPreferencePage.java
directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/properties/ConnectionPropertyPage.java
directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/ConnectionActionGroup.java
directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/ConnectionConfiguration.java
directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/ConnectionUniversalListener.java
directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/NetworkParameterPage.java
directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/wizards/NewConnectionWizard.java
Modified: directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionParameterPageManager.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionParameterPageManager.java?rev=827975&r1=827974&r2=827975&view=diff
==============================================================================
--- directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionParameterPageManager.java (original)
+++ directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionParameterPageManager.java Wed Oct 21 12:06:43 2009
@@ -72,9 +72,15 @@
}
catch ( Exception e )
{
- ConnectionUIPlugin.getDefault().getLog().log(
- new Status( IStatus.ERROR, ConnectionUIConstants.PLUGIN_ID, 1,
- Messages.getString("ConnectionParameterPageManager.UnableCreateConnectionParamPage") + member.getAttribute( "class" ), e ) ); //$NON-NLS-1$//$NON-NLS-2$
+ ConnectionUIPlugin
+ .getDefault()
+ .getLog()
+ .log(
+ new Status(
+ IStatus.ERROR,
+ ConnectionUIConstants.PLUGIN_ID,
+ 1,
+ Messages.getString( "ConnectionParameterPageManager.UnableCreateConnectionParamPage" ) + member.getAttribute( "class" ), e ) ); //$NON-NLS-1$//$NON-NLS-2$
}
}
Modified: directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionUIPlugin.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionUIPlugin.java?rev=827975&r1=827974&r2=827975&view=diff
==============================================================================
--- directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionUIPlugin.java (original)
+++ directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionUIPlugin.java Wed Oct 21 12:06:43 2009
@@ -211,9 +211,8 @@
{
// We can't use the PLUGIN_ID constant since loading the plugin.properties file has failed,
// So we're using a default plugin id.
- getLog().log(
- new Status( Status.ERROR, "org.apache.directory.studio.connection.ui", Status.OK, //$NON-NLS-1$
- Messages.getString("ConnectionUIPlugin.UnableGetPluginProperties"), e ) ); //$NON-NLS-1$
+ getLog().log( new Status( Status.ERROR, "org.apache.directory.studio.connection.ui", Status.OK, //$NON-NLS-1$
+ Messages.getString( "ConnectionUIPlugin.UnableGetPluginProperties" ), e ) ); //$NON-NLS-1$
}
}
Modified: directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/ExceptionHandler.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/ExceptionHandler.java?rev=827975&r1=827974&r2=827975&view=diff
==============================================================================
--- directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/ExceptionHandler.java (original)
+++ directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/ExceptionHandler.java Wed Oct 21 12:06:43 2009
@@ -59,7 +59,8 @@
{
if ( Thread.currentThread() == Display.getDefault().getThread() )
{
- ErrorDialog.openError( Display.getDefault().getActiveShell(), Messages.getString("ExceptionHandler.Error"), message, status ); //$NON-NLS-1$
+ ErrorDialog.openError( Display.getDefault().getActiveShell(),
+ Messages.getString( "ExceptionHandler.Error" ), message, status ); //$NON-NLS-1$
}
else
{
@@ -67,7 +68,8 @@
{
public void run()
{
- ErrorDialog.openError( Display.getDefault().getActiveShell(), Messages.getString("ExceptionHandler.Error"), message, status ); //$NON-NLS-1$
+ ErrorDialog.openError( Display.getDefault().getActiveShell(), Messages
+ .getString( "ExceptionHandler.Error" ), message, status ); //$NON-NLS-1$
}
};
Display.getDefault().asyncExec( runnable );
Modified: directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/UIAuthHandler.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/UIAuthHandler.java?rev=827975&r1=827974&r2=827975&view=diff
==============================================================================
--- directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/UIAuthHandler.java (original)
+++ directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/UIAuthHandler.java Wed Oct 21 12:06:43 2009
@@ -67,7 +67,7 @@
NLS
.bind(
Messages.getString( "UIAuthHandler.EnterPasswordFor" ), new String[] { connectionParameter.getName() } ), //$NON-NLS-1$
- Messages.getString( "UIAuthHandler.PleaseEnterPasswordOfUser" ) + connectionParameter.getBindPrincipal() + ":", "", null ); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
+ Messages.getString( "UIAuthHandler.PleaseEnterPasswordOfUser" ) + connectionParameter.getBindPrincipal() + ":", "", null ); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
if ( dialog.open() == CredentialsDialog.OK )
{
pw[0] = dialog.getValue();
Modified: directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/UiThreadEventRunner.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/UiThreadEventRunner.java?rev=827975&r1=827974&r2=827975&view=diff
==============================================================================
--- directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/UiThreadEventRunner.java (original)
+++ directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/UiThreadEventRunner.java Wed Oct 21 12:06:43 2009
@@ -19,6 +19,7 @@
*/
package org.apache.directory.studio.connection.ui;
+
import org.apache.directory.studio.connection.core.event.EventRunnable;
import org.apache.directory.studio.connection.core.event.EventRunner;
import org.eclipse.swt.widgets.Display;
Modified: directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/actions/ActionHandlerManager.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/actions/ActionHandlerManager.java?rev=827975&r1=827974&r2=827975&view=diff
==============================================================================
--- directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/actions/ActionHandlerManager.java (original)
+++ directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/actions/ActionHandlerManager.java Wed Oct 21 12:06:43 2009
@@ -19,6 +19,7 @@
*/
package org.apache.directory.studio.connection.ui.actions;
+
/**
* A ActionHandlerManager activates and deactives the action handlers.
*
@@ -33,7 +34,7 @@
*/
public void deactivateGlobalActionHandlers();
-
+
/**
* Activates global action handlers.
*/
Modified: directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/actions/CloseConnectionAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/actions/CloseConnectionAction.java?rev=827975&r1=827974&r2=827975&view=diff
==============================================================================
--- directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/actions/CloseConnectionAction.java (original)
+++ directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/actions/CloseConnectionAction.java Wed Oct 21 12:06:43 2009
@@ -60,7 +60,7 @@
*/
public String getText()
{
- return getSelectedConnections().length > 1 ? Messages.getString("CloseConnectionAction.CloseConnections") : Messages.getString("CloseConnectionAction.CloseConnection"); //$NON-NLS-1$ //$NON-NLS-2$
+ return getSelectedConnections().length > 1 ? Messages.getString( "CloseConnectionAction.CloseConnections" ) : Messages.getString( "CloseConnectionAction.CloseConnection" ); //$NON-NLS-1$ //$NON-NLS-2$
}
Modified: directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/actions/CollapseAllAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/actions/CollapseAllAction.java?rev=827975&r1=827974&r2=827975&view=diff
==============================================================================
--- directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/actions/CollapseAllAction.java (original)
+++ directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/actions/CollapseAllAction.java Wed Oct 21 12:06:43 2009
@@ -46,7 +46,8 @@
*/
public CollapseAllAction( TreeViewer viewer )
{
- super( Messages.getString("CollapseAllAction.CollapseAll"), ConnectionUIPlugin.getDefault().getImageDescriptor( ConnectionUIConstants.IMG_COLLAPSEALL ) ); //$NON-NLS-1$
+ super(
+ Messages.getString( "CollapseAllAction.CollapseAll" ), ConnectionUIPlugin.getDefault().getImageDescriptor( ConnectionUIConstants.IMG_COLLAPSEALL ) ); //$NON-NLS-1$
super.setToolTipText( getText() );
super.setEnabled( true );
Modified: directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/actions/CopyAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/actions/CopyAction.java?rev=827975&r1=827974&r2=827975&view=diff
==============================================================================
--- directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/actions/CopyAction.java (original)
+++ directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/actions/CopyAction.java Wed Oct 21 12:06:43 2009
@@ -77,15 +77,15 @@
ConnectionFolder[] connectionFolders = getSelectedConnectionFolders();
if ( connections.length > 0 && connectionFolders.length == 0 )
{
- return connections.length > 1 ? Messages.getString("CopyAction.CopyConnections") : Messages.getString("CopyAction.CopyConnection"); //$NON-NLS-1$ //$NON-NLS-2$
+ return connections.length > 1 ? Messages.getString( "CopyAction.CopyConnections" ) : Messages.getString( "CopyAction.CopyConnection" ); //$NON-NLS-1$ //$NON-NLS-2$
}
else if ( connectionFolders.length > 0 && connections.length == 0 )
{
- return connectionFolders.length > 1 ? Messages.getString("CopyAction.CopyFolders") : Messages.getString("CopyAction.CopyFolder"); //$NON-NLS-1$ //$NON-NLS-2$
+ return connectionFolders.length > 1 ? Messages.getString( "CopyAction.CopyFolders" ) : Messages.getString( "CopyAction.CopyFolder" ); //$NON-NLS-1$ //$NON-NLS-2$
}
else
{
- return Messages.getString("CopyAction.Copy"); //$NON-NLS-1$
+ return Messages.getString( "CopyAction.Copy" ); //$NON-NLS-1$
}
}
Modified: directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/actions/DeleteAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/actions/DeleteAction.java?rev=827975&r1=827974&r2=827975&view=diff
==============================================================================
--- directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/actions/DeleteAction.java (original)
+++ directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/actions/DeleteAction.java Wed Oct 21 12:06:43 2009
@@ -52,18 +52,18 @@
public String getText()
{
Connection[] connections = getSelectedConnections();
- ConnectionFolder[] connectionFolders = getSelectedConnectionFolders();
+ ConnectionFolder[] connectionFolders = getSelectedConnectionFolders();
if ( connections.length > 0 && connectionFolders.length == 0 )
{
- return connections.length > 1 ? Messages.getString("DeleteAction.DeleteConnections") : Messages.getString("DeleteAction.DeleteConnection"); //$NON-NLS-1$ //$NON-NLS-2$
+ return connections.length > 1 ? Messages.getString( "DeleteAction.DeleteConnections" ) : Messages.getString( "DeleteAction.DeleteConnection" ); //$NON-NLS-1$ //$NON-NLS-2$
}
else if ( connectionFolders.length > 0 && connections.length == 0 )
{
- return connectionFolders.length > 1 ? Messages.getString("DeleteAction.DeleteConnectionFolders") : Messages.getString("DeleteAction.DeleteConnectionFolder"); //$NON-NLS-1$ //$NON-NLS-2$
+ return connectionFolders.length > 1 ? Messages.getString( "DeleteAction.DeleteConnectionFolders" ) : Messages.getString( "DeleteAction.DeleteConnectionFolder" ); //$NON-NLS-1$ //$NON-NLS-2$
}
- else
+ else
{
- return Messages.getString("DeleteAction.Delete"); //$NON-NLS-1$
+ return Messages.getString( "DeleteAction.Delete" ); //$NON-NLS-1$
}
}
@@ -92,7 +92,7 @@
public void run()
{
Connection[] connections = getSelectedConnections();
- ConnectionFolder[] connectionFolders = getSelectedConnectionFolders();
+ ConnectionFolder[] connectionFolders = getSelectedConnectionFolders();
StringBuffer message = new StringBuffer();
@@ -100,8 +100,9 @@
{
if ( connections.length <= 5 )
{
- message.append( connections.length == 1 ? Messages.getString("DeleteAction.SureDeleteFollowingConnection") //$NON-NLS-1$
- : Messages.getString("DeleteAction.SureDeleteFollowingConnections") ); //$NON-NLS-1$
+ message.append( connections.length == 1 ? Messages
+ .getString( "DeleteAction.SureDeleteFollowingConnection" ) //$NON-NLS-1$
+ : Messages.getString( "DeleteAction.SureDeleteFollowingConnections" ) ); //$NON-NLS-1$
for ( int i = 0; i < connections.length; i++ )
{
message.append( ConnectionCoreConstants.LINE_SEPARATOR );
@@ -111,7 +112,7 @@
}
else
{
- message.append( Messages.getString("DeleteAction.SureDeleteSelectedConnections") ); //$NON-NLS-1$
+ message.append( Messages.getString( "DeleteAction.SureDeleteSelectedConnections" ) ); //$NON-NLS-1$
}
message.append( ConnectionCoreConstants.LINE_SEPARATOR );
message.append( ConnectionCoreConstants.LINE_SEPARATOR );
@@ -121,8 +122,9 @@
{
if ( connectionFolders.length <= 5 )
{
- message.append( connectionFolders.length == 1 ? Messages.getString("DeleteAction.SureDeleteFollowingFolder") //$NON-NLS-1$
- : Messages.getString("DeleteAction.SureDeleteFollowingFolders") ); //$NON-NLS-1$
+ message.append( connectionFolders.length == 1 ? Messages
+ .getString( "DeleteAction.SureDeleteFollowingFolder" ) //$NON-NLS-1$
+ : Messages.getString( "DeleteAction.SureDeleteFollowingFolders" ) ); //$NON-NLS-1$
for ( int i = 0; i < connectionFolders.length; i++ )
{
message.append( ConnectionCoreConstants.LINE_SEPARATOR );
@@ -132,7 +134,7 @@
}
else
{
- message.append( Messages.getString("DeleteAction.SureDeleteSelectedConnectionFolders") ); //$NON-NLS-1$
+ message.append( Messages.getString( "DeleteAction.SureDeleteSelectedConnectionFolders" ) ); //$NON-NLS-1$
}
message.append( ConnectionCoreConstants.LINE_SEPARATOR );
message.append( ConnectionCoreConstants.LINE_SEPARATOR );
@@ -142,7 +144,7 @@
{
List<Connection> connectionsToDelete = getConnectionsToDelete();
List<ConnectionFolder> connectionsFoldersToDelete = getConnectionsFoldersToDelete();
-
+
if ( !connectionsToDelete.isEmpty() )
{
deleteConnections( connectionsToDelete );
@@ -157,27 +159,29 @@
private List<ConnectionFolder> getConnectionsFoldersToDelete()
{
- List<ConnectionFolder> selectedFolders = new ArrayList<ConnectionFolder>(Arrays.asList( getSelectedConnectionFolders() ));
+ List<ConnectionFolder> selectedFolders = new ArrayList<ConnectionFolder>( Arrays
+ .asList( getSelectedConnectionFolders() ) );
List<ConnectionFolder> foldersToDelete = new ArrayList<ConnectionFolder>();
- while( !selectedFolders.isEmpty() )
+ while ( !selectedFolders.isEmpty() )
{
ConnectionFolder folder = selectedFolders.get( 0 );
List<String> subFolderIds = folder.getSubFolderIds();
for ( String subFolderId : subFolderIds )
{
- ConnectionFolder subFolder = ConnectionCorePlugin.getDefault().getConnectionFolderManager().getConnectionFolderById( subFolderId );
+ ConnectionFolder subFolder = ConnectionCorePlugin.getDefault().getConnectionFolderManager()
+ .getConnectionFolderById( subFolderId );
if ( subFolder != null )
{
selectedFolders.add( subFolder );
}
}
- if( !foldersToDelete.contains( folder ) )
+ if ( !foldersToDelete.contains( folder ) )
{
foldersToDelete.add( folder );
}
-
+
selectedFolders.remove( folder );
}
return foldersToDelete;
@@ -186,17 +190,19 @@
private List<Connection> getConnectionsToDelete()
{
- List<ConnectionFolder> selectedFolders = new ArrayList<ConnectionFolder>(Arrays.asList( getSelectedConnectionFolders() ));
- List<Connection> selectedConnections = new ArrayList<Connection>(Arrays.asList( getSelectedConnections() ));
+ List<ConnectionFolder> selectedFolders = new ArrayList<ConnectionFolder>( Arrays
+ .asList( getSelectedConnectionFolders() ) );
+ List<Connection> selectedConnections = new ArrayList<Connection>( Arrays.asList( getSelectedConnections() ) );
List<Connection> connectionsToDelete = new ArrayList<Connection>( selectedConnections );
- while( !selectedFolders.isEmpty() )
+ while ( !selectedFolders.isEmpty() )
{
ConnectionFolder folder = selectedFolders.get( 0 );
List<String> subFolderIds = folder.getSubFolderIds();
for ( String subFolderId : subFolderIds )
{
- ConnectionFolder subFolder = ConnectionCorePlugin.getDefault().getConnectionFolderManager().getConnectionFolderById( subFolderId );
+ ConnectionFolder subFolder = ConnectionCorePlugin.getDefault().getConnectionFolderManager()
+ .getConnectionFolderById( subFolderId );
if ( subFolder != null )
{
selectedFolders.add( subFolder );
@@ -206,8 +212,9 @@
List<String> connectionIds = folder.getConnectionIds();
for ( String connectionId : connectionIds )
{
- Connection connection = ConnectionCorePlugin.getDefault().getConnectionManager().getConnectionById( connectionId );
- if(connection != null && !connectionsToDelete.contains( connection ))
+ Connection connection = ConnectionCorePlugin.getDefault().getConnectionManager().getConnectionById(
+ connectionId );
+ if ( connection != null && !connectionsToDelete.contains( connection ) )
{
connectionsToDelete.add( connection );
}
@@ -218,7 +225,7 @@
return connectionsToDelete;
}
-
+
/**
* {@inheritDoc}
*/
@@ -239,7 +246,7 @@
new StudioConnectionJob( new CloseConnectionsRunnable( connectionsToDelete ) ).execute();
for ( Connection connection : connectionsToDelete )
{
- ConnectionCorePlugin.getDefault().getConnectionManager().removeConnection( connection);
+ ConnectionCorePlugin.getDefault().getConnectionManager().removeConnection( connection );
}
}
Modified: directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/actions/NewConnectionAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/actions/NewConnectionAction.java?rev=827975&r1=827974&r2=827975&view=diff
==============================================================================
--- directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/actions/NewConnectionAction.java (original)
+++ directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/actions/NewConnectionAction.java Wed Oct 21 12:06:43 2009
@@ -74,7 +74,7 @@
*/
public String getText()
{
- return Messages.getString("NewConnectionAction.NewConnection"); //$NON-NLS-1$
+ return Messages.getString( "NewConnectionAction.NewConnection" ); //$NON-NLS-1$
}
Modified: directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/actions/NewConnectionFolderAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/actions/NewConnectionFolderAction.java?rev=827975&r1=827974&r2=827975&view=diff
==============================================================================
--- directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/actions/NewConnectionFolderAction.java (original)
+++ directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/actions/NewConnectionFolderAction.java Wed Oct 21 12:06:43 2009
@@ -53,8 +53,9 @@
*/
public void run()
{
- ConnectionFolderDialog dialog = new ConnectionFolderDialog( PlatformUI.getWorkbench().getDisplay()
- .getActiveShell(), Messages.getString("NewConnectionFolderAction.NewConnectionFolder"), Messages.getString("NewConnectionFolderAction.NeterNameNewFolder"), "", null ); //$NON-NLS-1$ //$NON-NLS-2$//$NON-NLS-3$
+ ConnectionFolderDialog dialog = new ConnectionFolderDialog(
+ PlatformUI.getWorkbench().getDisplay().getActiveShell(),
+ Messages.getString( "NewConnectionFolderAction.NewConnectionFolder" ), Messages.getString( "NewConnectionFolderAction.NeterNameNewFolder" ), "", null ); //$NON-NLS-1$ //$NON-NLS-2$//$NON-NLS-3$
if ( dialog.open() == CredentialsDialog.OK )
{
String name = dialog.getValue();
@@ -81,7 +82,7 @@
*/
public String getText()
{
- return Messages.getString("NewConnectionFolderAction.NewConnectionFolderDots"); //$NON-NLS-1$
+ return Messages.getString( "NewConnectionFolderAction.NewConnectionFolderDots" ); //$NON-NLS-1$
}
Modified: directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/actions/OpenConnectionAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/actions/OpenConnectionAction.java?rev=827975&r1=827974&r2=827975&view=diff
==============================================================================
--- directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/actions/OpenConnectionAction.java (original)
+++ directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/actions/OpenConnectionAction.java Wed Oct 21 12:06:43 2009
@@ -59,7 +59,7 @@
*/
public String getText()
{
- return getSelectedConnections().length > 1 ? Messages.getString("OpenConnectionAction.OpenConnections") : Messages.getString("OpenConnectionAction.OpenConnection"); //$NON-NLS-1$ //$NON-NLS-2$
+ return getSelectedConnections().length > 1 ? Messages.getString( "OpenConnectionAction.OpenConnections" ) : Messages.getString( "OpenConnectionAction.OpenConnection" ); //$NON-NLS-1$ //$NON-NLS-2$
}
Modified: directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/actions/PasteAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/actions/PasteAction.java?rev=827975&r1=827974&r2=827975&view=diff
==============================================================================
--- directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/actions/PasteAction.java (original)
+++ directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/actions/PasteAction.java Wed Oct 21 12:06:43 2009
@@ -73,15 +73,15 @@
List<ConnectionFolder> connectionFolders = getConnectionFoldersToPaste();
if ( connections.size() > 0 && connectionFolders.size() == 0 )
{
- return connections.size() > 1 ? Messages.getString("PasteAction.PasteConnections") : Messages.getString("PasteAction.PasteConnection"); //$NON-NLS-1$ //$NON-NLS-2$
+ return connections.size() > 1 ? Messages.getString( "PasteAction.PasteConnections" ) : Messages.getString( "PasteAction.PasteConnection" ); //$NON-NLS-1$ //$NON-NLS-2$
}
else if ( connectionFolders.size() > 0 && connections.size() == 0 )
{
- return connectionFolders.size() > 1 ? Messages.getString("PasteAction.PasteConnectionFolders") : Messages.getString("PasteAction.PasteConnectionFolder"); //$NON-NLS-1$ //$NON-NLS-2$
+ return connectionFolders.size() > 1 ? Messages.getString( "PasteAction.PasteConnectionFolders" ) : Messages.getString( "PasteAction.PasteConnectionFolder" ); //$NON-NLS-1$ //$NON-NLS-2$
}
else
{
- return Messages.getString("PasteAction.Paste"); //$NON-NLS-1$
+ return Messages.getString( "PasteAction.Paste" ); //$NON-NLS-1$
}
}
Modified: directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/actions/RenameAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/actions/RenameAction.java?rev=827975&r1=827974&r2=827975&view=diff
==============================================================================
--- directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/actions/RenameAction.java (original)
+++ directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/actions/RenameAction.java Wed Oct 21 12:06:43 2009
@@ -57,15 +57,15 @@
ConnectionFolder[] connectionFolders = getSelectedConnectionFolders();
if ( connections.length == 1 && connectionFolders.length == 0 )
{
- return Messages.getString("RenameAction.Connection"); //$NON-NLS-1$
+ return Messages.getString( "RenameAction.Connection" ); //$NON-NLS-1$
}
else if ( connectionFolders.length == 1 && connections.length == 0 )
{
- return Messages.getString("RenameAction.ConnectionFolder"); //$NON-NLS-1$
+ return Messages.getString( "RenameAction.ConnectionFolder" ); //$NON-NLS-1$
}
else
{
- return Messages.getString("RenameAction.Rename"); //$NON-NLS-1$
+ return Messages.getString( "RenameAction.Rename" ); //$NON-NLS-1$
}
}
@@ -133,7 +133,7 @@
}
else if ( ConnectionCorePlugin.getDefault().getConnectionManager().getConnectionByName( newName ) != null )
{
- return Messages.getString("RenameAction.ConnectionAlreadyExists"); //$NON-NLS-1$
+ return Messages.getString( "RenameAction.ConnectionAlreadyExists" ); //$NON-NLS-1$
}
else
{
@@ -142,7 +142,9 @@
}
};
- InputDialog dialog = new InputDialog( getShell(), Messages.getString("RenameAction.RenameConnection"), Messages.getString("RenameAction.NewNameConnection"), connection.getName(), //$NON-NLS-1$ //$NON-NLS-2$
+ InputDialog dialog = new InputDialog(
+ getShell(),
+ Messages.getString( "RenameAction.RenameConnection" ), Messages.getString( "RenameAction.NewNameConnection" ), connection.getName(), //$NON-NLS-1$ //$NON-NLS-2$
validator );
dialog.open();
@@ -152,7 +154,7 @@
connection.setName( newName );
}
}
-
+
/**
* Renames a ConnectionFolder.
@@ -170,9 +172,10 @@
{
return null;
}
- else if ( ConnectionCorePlugin.getDefault().getConnectionFolderManager().getConnectionFolderByName( newName ) != null )
+ else if ( ConnectionCorePlugin.getDefault().getConnectionFolderManager().getConnectionFolderByName(
+ newName ) != null )
{
- return Messages.getString("RenameAction.ConnectionFolderAlreadyExists"); //$NON-NLS-1$
+ return Messages.getString( "RenameAction.ConnectionFolderAlreadyExists" ); //$NON-NLS-1$
}
else
{
@@ -181,7 +184,9 @@
}
};
- InputDialog dialog = new InputDialog( getShell(), Messages.getString("RenameAction.RenameConnectionFolder"), Messages.getString("RenameAction.NewNameConnectionFolder"), connectionFolder.getName(), //$NON-NLS-1$ //$NON-NLS-2$
+ InputDialog dialog = new InputDialog(
+ getShell(),
+ Messages.getString( "RenameAction.RenameConnectionFolder" ), Messages.getString( "RenameAction.NewNameConnectionFolder" ), connectionFolder.getName(), //$NON-NLS-1$ //$NON-NLS-2$
validator );
dialog.open();
@@ -191,5 +196,5 @@
connectionFolder.setName( newName );
}
}
-
+
}
Modified: directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/actions/SelectionUtils.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/actions/SelectionUtils.java?rev=827975&r1=827974&r2=827975&view=diff
==============================================================================
--- directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/actions/SelectionUtils.java (original)
+++ directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/actions/SelectionUtils.java Wed Oct 21 12:06:43 2009
@@ -105,8 +105,8 @@
List<Object> list = getTypes( selection, ConnectionFolder.class );
return list.toArray( new ConnectionFolder[list.size()] );
}
-
-
+
+
/**
* Gets the objects contained in the given selection.
*
Modified: directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/dialogs/SelectReferralConnectionDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/dialogs/SelectReferralConnectionDialog.java?rev=827975&r1=827974&r2=827975&view=diff
==============================================================================
--- directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/dialogs/SelectReferralConnectionDialog.java (original)
+++ directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/dialogs/SelectReferralConnectionDialog.java Wed Oct 21 12:06:43 2009
@@ -138,7 +138,7 @@
Button okButton = createButton( parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true );
okButton.setFocus();
createButton( parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false );
-
+
validate();
}
Modified: directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/preferences/ConnectionsPreferencePage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/preferences/ConnectionsPreferencePage.java?rev=827975&r1=827974&r2=827975&view=diff
==============================================================================
--- directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/preferences/ConnectionsPreferencePage.java (original)
+++ directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/preferences/ConnectionsPreferencePage.java Wed Oct 21 12:06:43 2009
@@ -127,7 +127,7 @@
} );
validate();
-
+
return composite;
}
Modified: directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/properties/ConnectionPropertyPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/properties/ConnectionPropertyPage.java?rev=827975&r1=827974&r2=827975&view=diff
==============================================================================
--- directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/properties/ConnectionPropertyPage.java (original)
+++ directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/properties/ConnectionPropertyPage.java Wed Oct 21 12:06:43 2009
@@ -119,7 +119,7 @@
int index = tabFolder.getSelectionIndex();
ConnectionParameterPage page = index >= 0 ? pages[tabFolder.getSelectionIndex()] : null;
if ( page != null
- && ( page.getMessage() != null || page.getInfoMessage() != null || page.getErrorMessage() != null ) )
+ && ( page.getMessage() != null || page.getInfoMessage() != null || page.getErrorMessage() != null ) )
{
if ( page.getMessage() != null )
{
@@ -160,7 +160,7 @@
return;
}
}
-
+
setMessage( null );
setErrorMessage( null );
setValid( true );
@@ -187,30 +187,33 @@
Connection connection = getConnection( getElement() );
if ( connection != null )
{
- super.setMessage( Messages.getString("ConnectionPropertyPage.Connection") + Utils.shorten( connection.getName(), 30 ) ); //$NON-NLS-1$
-
+ super
+ .setMessage( Messages.getString( "ConnectionPropertyPage.Connection" ) + Utils.shorten( connection.getName(), 30 ) ); //$NON-NLS-1$
+
pages = ConnectionParameterPageManager.getConnectionParameterPages();
-
+
tabFolder = new TabFolder( parent, SWT.TOP );
-
+
tabs = new TabItem[pages.length];
for ( int i = 0; i < pages.length; i++ )
{
Composite composite = new Composite( tabFolder, SWT.NONE );
GridLayout gl = new GridLayout( 1, false );
composite.setLayout( gl );
-
+
pages[i].init( composite, this, connection.getConnectionParameter() );
-
+
tabs[i] = new TabItem( tabFolder, SWT.NONE );
tabs[i].setText( pages[i].getPageName() );
tabs[i].setControl( composite );
}
-
+
return tabFolder;
}
- else {
- Label label = BaseWidgetUtils.createLabel( parent, Messages.getString("ConnectionPropertyPage.NoConnection"), 1 ); //$NON-NLS-1$
+ else
+ {
+ Label label = BaseWidgetUtils.createLabel( parent, Messages
+ .getString( "ConnectionPropertyPage.NoConnection" ), 1 ); //$NON-NLS-1$
return label;
}
}
@@ -223,7 +226,7 @@
{
// get current connection parameters
Connection connection = ( Connection ) getConnection( getElement() );
-
+
// save modified parameters
boolean parametersModified = false;
boolean reconnectionRequired = false;
Modified: directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/ConnectionActionGroup.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/ConnectionActionGroup.java?rev=827975&r1=827974&r2=827975&view=diff
==============================================================================
--- directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/ConnectionActionGroup.java (original)
+++ directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/ConnectionActionGroup.java Wed Oct 21 12:06:43 2009
@@ -129,7 +129,7 @@
expandAllAction = new ExpandAllAction( viewer );
connectionActionMap = new HashMap<String, ConnectionViewActionProxy>();
-
+
connectionActionMap.put( newConnectionAction, new ConnectionViewActionProxy( viewer, this,
new NewConnectionAction() ) );
connectionActionMap.put( newConnectionFolderAction, new ConnectionViewActionProxy( viewer, this,
Modified: directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/ConnectionConfiguration.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/ConnectionConfiguration.java?rev=827975&r1=827974&r2=827975&view=diff
==============================================================================
--- directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/ConnectionConfiguration.java (original)
+++ directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/ConnectionConfiguration.java Wed Oct 21 12:06:43 2009
@@ -49,7 +49,7 @@
/** The sorter. */
private ConnectionSorter sorter;
-
+
/** The context menu manager. */
private MenuManager contextMenuManager;
@@ -146,8 +146,8 @@
return labelProvider;
}
-
-
+
+
/**
* Gets the sorter.
*
@@ -159,7 +159,7 @@
{
sorter = new ConnectionSorter();
}
-
+
return sorter;
}
Modified: directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/ConnectionUniversalListener.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/ConnectionUniversalListener.java?rev=827975&r1=827974&r2=827975&view=diff
==============================================================================
--- directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/ConnectionUniversalListener.java (original)
+++ directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/ConnectionUniversalListener.java Wed Oct 21 12:06:43 2009
@@ -68,7 +68,8 @@
}
}
};
-
+
+
/**
* Creates a new instance of ConnectionUniversalListener.
*
Modified: directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/NetworkParameterPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/NetworkParameterPage.java?rev=827975&r1=827974&r2=827975&view=diff
==============================================================================
--- directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/NetworkParameterPage.java (original)
+++ directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/NetworkParameterPage.java Wed Oct 21 12:06:43 2009
@@ -181,11 +181,11 @@
.getString( "NetworkParameterPage.NetworkParameter" ), 1 ); //$NON-NLS-1$
Composite groupComposite = BaseWidgetUtils.createColumnContainer( group, 3, 1 );
- BaseWidgetUtils.createLabel( groupComposite, Messages.getString("NetworkParameterPage.HostName"), 1 ); //$NON-NLS-1$
+ BaseWidgetUtils.createLabel( groupComposite, Messages.getString( "NetworkParameterPage.HostName" ), 1 ); //$NON-NLS-1$
String[] hostHistory = HistoryUtils.load( ConnectionUIConstants.DIALOGSETTING_KEY_HOST_HISTORY );
hostCombo = BaseWidgetUtils.createCombo( groupComposite, hostHistory, -1, 2 );
- BaseWidgetUtils.createLabel( groupComposite, Messages.getString("NetworkParameterPage.Port"), 1 ); //$NON-NLS-1$
+ BaseWidgetUtils.createLabel( groupComposite, Messages.getString( "NetworkParameterPage.Port" ), 1 ); //$NON-NLS-1$
String[] portHistory = HistoryUtils.load( ConnectionUIConstants.DIALOGSETTING_KEY_PORT_HISTORY );
portCombo = BaseWidgetUtils.createCombo( groupComposite, portHistory, -1, 2 );
portCombo.setTextLimit( 5 );
@@ -198,7 +198,7 @@
int index = 0;
BaseWidgetUtils.createLabel( groupComposite, Messages.getString( "NetworkParameterPage.EncryptionMethod" ), 1 ); //$NON-NLS-1$
encryptionMethodCombo = BaseWidgetUtils.createReadonlyCombo( groupComposite, encMethods, index, 2 );
-
+
boolean validateCertificates = ConnectionCorePlugin.getDefault().getPluginPreferences().getBoolean(
ConnectionCoreConstants.PREFERENCE_VALIDATE_CERTIFICATES );
if ( !validateCertificates )
@@ -247,9 +247,8 @@
if ( ConnectionCorePlugin.getDefault().getConnectionManager().getConnectionByName( nameText.getText() ) != null
&& ( connectionParameter == null || !nameText.getText().equals( connectionParameter.getName() ) ) )
{
- errorMessage = NLS
- .bind(
- Messages.getString( "NetworkParameterPage.ConnectionExists" ), new String[] { nameText.getText() } ); //$NON-NLS-1$
+ errorMessage = NLS.bind(
+ Messages.getString( "NetworkParameterPage.ConnectionExists" ), new String[] { nameText.getText() } ); //$NON-NLS-1$
}
}
Modified: directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/wizards/NewConnectionWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/wizards/NewConnectionWizard.java?rev=827975&r1=827974&r2=827975&view=diff
==============================================================================
--- directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/wizards/NewConnectionWizard.java (original)
+++ directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/wizards/NewConnectionWizard.java Wed Oct 21 12:06:43 2009
@@ -62,7 +62,7 @@
*/
public NewConnectionWizard()
{
- setWindowTitle( Messages.getString("NewConnectionWizard.NewLdapConnection") ); //$NON-NLS-1$
+ setWindowTitle( Messages.getString( "NewConnectionWizard.NewLdapConnection" ) ); //$NON-NLS-1$
setNeedsProgressMonitor( true );
}