You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2015/06/11 15:06:46 UTC
svn commit: r1684876 -
/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ServerConfigurationEditorUtils.java
Author: elecharny
Date: Thu Jun 11 13:06:46 2015
New Revision: 1684876
URL: http://svn.apache.org/r1684876
Log:
A bit of formatting
Modified:
directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ServerConfigurationEditorUtils.java
Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ServerConfigurationEditorUtils.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ServerConfigurationEditorUtils.java?rev=1684876&r1=1684875&r2=1684876&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ServerConfigurationEditorUtils.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ServerConfigurationEditorUtils.java Thu Jun 11 13:06:46 2015
@@ -81,18 +81,12 @@ public class ServerConfigurationEditorUt
/**
* Performs the "Save as..." action.
*
- * @param monitor
- * the monitor
- * @param shell
- * the shell
- * @param input
- * the editor input
- * @param configWriter
- * the configuration writer
- * @param newInput
- * a flag to indicate if a new input is required
- * @return
- * the new input for the editor
+ * @param monitor the monitor
+ * @param shell the shell
+ * @param input the editor input
+ * @param configWriter the configuration writer
+ * @param newInput a flag to indicate if a new input is required
+ * @return the new input for the editor
* @throws Exception
*/
public static IEditorInput saveAs( IProgressMonitor monitor, Shell shell, IEditorInput input,
@@ -168,6 +162,7 @@ public class ServerConfigurationEditorUt
{
// Open FileDialog
path = openFileDialogInUIThread( shell );
+
if ( path == null )
{
return null;
@@ -175,6 +170,7 @@ public class ServerConfigurationEditorUt
// Check whether file exists and if so, confirm overwrite
final File externalFile = new File( path );
+
if ( externalFile.exists() )
{
String question = NLS.bind(
@@ -184,13 +180,16 @@ public class ServerConfigurationEditorUt
MessageDialog.QUESTION, new String[]
{ IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL, IDialogConstants.CANCEL_LABEL }, 0 );
int overwrite = openDialogInUIThread( overwriteDialog );
+
switch ( overwrite )
{
case 0: // Yes
canOverwrite = true;
break;
+
case 1: // No
break;
+
case 2: // Cancel
default:
return null;
@@ -222,10 +221,8 @@ public class ServerConfigurationEditorUt
/**
* Opens a {@link Dialog} in the UI thread.
*
- * @param dialog
- * the dialog
- * @return
- * the result of the dialog
+ * @param dialog the dialog
+ * @return the result of the dialog
*/
private static int openDialogInUIThread( final Dialog dialog )
{
@@ -234,7 +231,6 @@ public class ServerConfigurationEditorUt
{
private int result;
-
public int getResult()
{
return result;
@@ -266,10 +262,8 @@ public class ServerConfigurationEditorUt
/**
* Opens a {@link FileDialog} in the UI thread.
*
- * @param shell
- * the shell
- * @return
- * the result of the dialog
+ * @param shell the shell
+ * @return the result of the dialog
*/
private static String openFileDialogInUIThread( final Shell shell )
{
@@ -278,7 +272,6 @@ public class ServerConfigurationEditorUt
{
private String result;
-
public String getResult()
{
return result;
@@ -311,15 +304,10 @@ public class ServerConfigurationEditorUt
/**
* Saves the configuration.
*
- * @param input
- * the connection server configuration input
- * @param configWriter
- * the configuration writer
- * @param monitor
- * the monitor
- * @return
- * <code>true</code> if the operation is successful,
- * <code>false</code> if not
+ * @param input the connection server configuration input
+ * @param configWriter the configuration writer
+ * @param monitor the monitor
+ * @return <code>true</code> if the operation is successful, <code>false</code> if not
* @throws Exception
*/
public static void saveConfiguration( ConnectionServerConfigurationInput input, ConfigWriter configWriter,
@@ -338,6 +326,7 @@ public class ServerConfigurationEditorUt
newconfigurationPartition.setCacheService( cacheService );
newconfigurationPartition.initialize();
List<LdifEntry> convertedLdifEntries = configWriter.getConvertedLdifEntries();
+
for ( LdifEntry ldifEntry : convertedLdifEntries )
{
newconfigurationPartition.addEntry( new DefaultEntry( schemaManager, ldifEntry.getEntry() ) );
@@ -358,6 +347,7 @@ public class ServerConfigurationEditorUt
// Building the resulting LDIF
StringBuilder modificationsLdif = new StringBuilder();
+
for ( LdifEntry ldifEntry : modificationsList )
{
modificationsLdif.append( ldifEntry.toString() );
@@ -397,10 +387,8 @@ public class ServerConfigurationEditorUt
/**
* Saves the configuration.
*
- * @param file
- * the file
- * @param configWriter
- * the configuration writer
+ * @param file the file
+ * @param configWriter the configuration writer
* @throws Exception
*/
public static void saveConfiguration( File file, ConfigWriter configWriter, Configuration configuration )
@@ -419,13 +407,16 @@ public class ServerConfigurationEditorUt
{
// create partiton
AbstractLdifPartition configPartition;
+
if ( file.getName().equals( ApacheDS2ConfigurationPluginConstants.OU_CONFIG_LDIF ) )
{
File confDir = file.getParentFile();
+
if ( file.exists() )
{
FileUtils.deleteDirectory( confDir );
}
+
configPartition = createMultiFileConfiguration( confDir, schemaManager, dnFactory, cacheService );
}
else
@@ -434,23 +425,28 @@ public class ServerConfigurationEditorUt
{
file.delete();
}
+
configPartition = createSingleFileConfiguration( file, schemaManager, dnFactory, cacheService );
}
// write entries to partition
List<LdifEntry> convertedLdifEntries = configWriter.getConvertedLdifEntries();
+
for ( LdifEntry ldifEntry : convertedLdifEntries )
{
Entry entry = new DefaultEntry( schemaManager, ldifEntry.getEntry() );
+
if ( entry.get( SchemaConstants.ENTRY_CSN_AT ) == null )
{
entry.add( SchemaConstants.ENTRY_CSN_AT, csnFactory.newInstance().toString() );
}
+
if ( entry.get( SchemaConstants.ENTRY_UUID_AT ) == null )
{
String uuid = UUID.randomUUID().toString();
entry.add( SchemaConstants.ENTRY_UUID_AT, uuid );
}
+
configPartition.add( new AddOperationContext( null, entry ) );
}
}
@@ -467,6 +463,7 @@ public class ServerConfigurationEditorUt
configPartition.setSchemaManager( schemaManager );
configPartition.setCacheService( cacheService );
configPartition.initialize();
+
return configPartition;
}
@@ -481,11 +478,12 @@ public class ServerConfigurationEditorUt
configPartition.setSchemaManager( schemaManager );
configPartition.setCacheService( cacheService );
configPartition.initialize();
+
return configPartition;
}
- // TODO: somthing link this should be used in future to only write changes to partition
+ // TODO: something link this should be used in future to only write changes to partition
private static List<LdifEntry> computeModifications( ConfigWriter configWriter,
AbstractBTreePartition originalPartition ) throws Exception
{
@@ -498,6 +496,7 @@ public class ServerConfigurationEditorUt
newconfigurationPartition.setCacheService( cacheService );
newconfigurationPartition.initialize();
List<LdifEntry> convertedLdifEntries = configWriter.getConvertedLdifEntries();
+
for ( LdifEntry ldifEntry : convertedLdifEntries )
{
newconfigurationPartition.addEntry( new DefaultEntry( schemaManager, ldifEntry.getEntry() ) );