| Chunk |
|---|
| Conflicting content |
|---|
* @author Anatoli Barski
*/
public class FlexiProviderEngineFactory {
<<<<<<< HEAD
/**
* Returns the matching FlexiProviderEngine for the given registry type. Will return null in
* case of an unknown registry type.
*
* @param registryType The registry type to look for
* @return The FlexiProviderEngine, may be null
*/
public static FlexiProviderEngine createEngine(RegistryType registryType) {
switch (registryType) {
case ASYMMETRIC_BLOCK_CIPHER:
return new AsymmetricBlockCipherEngine();
case ASYMMETRIC_HYBRID_CIPHER:
return new AsymmetricHybridCipherEngine();
case BLOCK_CIPHER:
return new BlockCipherEngine();
case CIPHER:
return new CipherEngine();
case MAC:
return new MacEngine();
case MESSAGE_DIGEST:
return new MessageDigestEngine();
case SECURE_RANDOM:
return new SecureRandomEngine();
case SIGNATURE:
return new SignatureEngine();
default:
return null;
}
}
=======
public static FlexiProviderEngine createEngine(RegistryType registryType) {
FlexiProviderEngine engine = null;
switch (registryType) {
case ASYMMETRIC_BLOCK_CIPHER:
engine = new AsymmetricBlockCipherEngine();
break;
case ASYMMETRIC_HYBRID_CIPHER:
engine = new AsymmetricHybridCipherEngine();
break;
case BLOCK_CIPHER:
engine = new BlockCipherEngine();
break;
case CIPHER:
engine = new CipherEngine();
break;
case MAC:
engine = new MacEngine();
break;
case MESSAGE_DIGEST:
engine = new MessageDigestEngine();
break;
case SECURE_RANDOM:
engine = new SecureRandomEngine();
break;
case SIGNATURE:
engine = new SignatureEngine();
break;
default:
break;
}
return engine;
}
>>>>>>> dbac26f14ac9981e80fce5cb95aeff3d3b254a20
} |
| Solution content |
|---|
* @author Anatoli Barski
*/
public class FlexiProviderEngineFactory {
/**
* Returns the matching FlexiProviderEngine for the given registry type. Will return null in
* case of an unknown registry type.
*
* @param registryType The registry type to look for
* @return The FlexiProviderEngine, may be null
*/
public static FlexiProviderEngine createEngine(RegistryType registryType) {
switch (registryType) {
case ASYMMETRIC_BLOCK_CIPHER:
return new AsymmetricBlockCipherEngine();
case ASYMMETRIC_HYBRID_CIPHER:
return new AsymmetricHybridCipherEngine();
case BLOCK_CIPHER:
return new BlockCipherEngine();
case CIPHER:
return new CipherEngine();
case MAC:
return new MacEngine();
case MESSAGE_DIGEST:
return new MessageDigestEngine();
case SECURE_RANDOM:
return new SecureRandomEngine();
case SIGNATURE:
return new SignatureEngine();
default:
return null;
}
}
} |
| File |
|---|
| FlexiProviderEngineFactory.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |
| Method declaration |