Permalink
Browse files

Moves contents of the org.swiftsuspenders.injection package back into…

… the main package


@darscan notes that injection is what Swiftsuspenders is all about and that is makes no sense to hide that functionality in a sub-package.
  • Loading branch information...
tschneidereit committed Jun 2, 2012
1 parent b332ba2 commit fd6e8fcfbc830e135438a6a83bc6c1a8d5983b65
Showing with 157 additions and 253 deletions.
  1. +1 −1 src/org/swiftsuspenders/{injection → }/InjectionEvent.as
  2. +21 −22 src/org/swiftsuspenders/{injection → }/InjectionMapping.as
  3. +21 −21 src/org/swiftsuspenders/{injection → }/Injector.as
  4. +1 −1 src/org/swiftsuspenders/{injection → }/InjectorError.as
  5. +1 −1 src/org/swiftsuspenders/{injection → }/MappingEvent.as
  6. +2 −2 src/org/swiftsuspenders/{injection → }/dependencyproviders/ClassProvider.as
  7. +2 −2 src/org/swiftsuspenders/{injection → }/dependencyproviders/DependencyProvider.as
  8. +2 −2 src/org/swiftsuspenders/{injection → }/dependencyproviders/FactoryProvider.as
  9. +2 −2 src/org/swiftsuspenders/{injection → }/dependencyproviders/ForwardingProvider.as
  10. +2 −2 src/org/swiftsuspenders/{injection → }/dependencyproviders/InjectorUsingProvider.as
  11. +1 −1 src/org/swiftsuspenders/{injection → }/dependencyproviders/LocalOnlyProvider.as
  12. +3 −3 src/org/swiftsuspenders/{injection → }/dependencyproviders/OtherMappingProvider.as
  13. +3 −3 src/org/swiftsuspenders/{injection → }/dependencyproviders/SingletonProvider.as
  14. +1 −1 src/org/swiftsuspenders/{injection → }/dependencyproviders/SoftDependencyProvider.as
  15. +2 −2 src/org/swiftsuspenders/{injection → }/dependencyproviders/ValueProvider.as
  16. +1 −1 src/org/swiftsuspenders/reflection/DescribeTypeJSONReflector.as
  17. +1 −1 src/org/swiftsuspenders/reflection/DescribeTypeReflector.as
  18. +1 −1 src/org/swiftsuspenders/typedescriptions/ConstructorInjectionPoint.as
  19. +1 −1 src/org/swiftsuspenders/typedescriptions/InjectionPoint.as
  20. +3 −3 src/org/swiftsuspenders/typedescriptions/MethodInjectionPoint.as
  21. +1 −1 src/org/swiftsuspenders/typedescriptions/NoParamsConstructorInjectionPoint.as
  22. +3 −3 src/org/swiftsuspenders/typedescriptions/PropertyInjectionPoint.as
  23. +1 −1 src/org/swiftsuspenders/typedescriptions/TypeDescription.as
  24. +9 −2 test/SwiftSuspendersTestRunner.as
  25. +0 −2 test/org/swiftsuspenders/ApplicationDomainTests.as
  26. +0 −3 test/org/swiftsuspenders/ChildInjectorTests.as
  27. +5 −9 test/org/swiftsuspenders/DependencyProviderTests.as
  28. +0 −1 test/org/swiftsuspenders/DescribeTypeJSONReflectorTests.as
  29. +0 −1 test/org/swiftsuspenders/DescribeTypeReflectorTests.as
  30. +6 −9 test/org/swiftsuspenders/InjectionMappingTests.as
  31. +6 −13 test/org/swiftsuspenders/InjectorTests.as
  32. +9 −12 test/org/swiftsuspenders/ReflectorTests.as
  33. +1 −1 test/org/swiftsuspenders/suites/SwiftSuspendersTestSuite.as
  34. +1 −4 test/org/swiftsuspenders/support/AppDomainSupportSWFSprite.as
  35. +6 −21 test/org/swiftsuspenders/support/injectees/MultipleNamedSingletonsOfSameClassInjectee.as
  36. +6 −21 test/org/swiftsuspenders/support/injectees/OneNamedParameterConstructorInjectee.as
  37. +6 −21 test/org/swiftsuspenders/support/injectees/OneRequiredOneOptionalPropertyMethodInjectee.as
  38. +6 −21 test/org/swiftsuspenders/support/injectees/TwoNamedInterfaceFieldsInjectee.as
  39. +6 −21 test/org/swiftsuspenders/support/injectees/TwoNamedParametersConstructorInjectee.as
  40. +2 −2 test/org/swiftsuspenders/support/injectees/childinjectors/ChildInjectorCreatingProvider.as
  41. +1 −1 test/org/swiftsuspenders/support/injectees/childinjectors/InjectorInjectee.as
  42. +1 −1 test/org/swiftsuspenders/support/injectees/childinjectors/NestedInjectorInjectee.as
  43. +1 −1 test/org/swiftsuspenders/support/injectees/childinjectors/NestedNestedInjectorInjectee.as
  44. +2 −2 test/org/swiftsuspenders/support/providers/ClassNameStoringProvider.as
  45. +2 −2 test/org/swiftsuspenders/support/providers/UnknownParametersUsingProvider.as
  46. +1 −1 test/org/swiftsuspenders/typedescriptions/ConstructorInjectionPointTests.as
  47. +1 −1 test/org/swiftsuspenders/typedescriptions/MethodInjectionPointTest.as
  48. +1 −1 test/org/swiftsuspenders/typedescriptions/PostConstructInjectionPointTests.as
  49. +1 −1 test/org/swiftsuspenders/typedescriptions/PropertyInjectionPointTests.as
@@ -5,7 +5,7 @@
* in accordance with the terms of the license agreement accompanying it.
*/
-package org.swiftsuspenders.injection
+package org.swiftsuspenders
{
import flash.events.Event;
@@ -5,17 +5,16 @@
* in accordance with the terms of the license agreement accompanying it.
*/
-package org.swiftsuspenders.injection
+package org.swiftsuspenders
{
- import org.swiftsuspenders.*;
- import org.swiftsuspenders.injection.dependencyproviders.ClassProvider;
- import org.swiftsuspenders.injection.dependencyproviders.DependencyProvider;
- import org.swiftsuspenders.injection.dependencyproviders.ForwardingProvider;
- import org.swiftsuspenders.injection.dependencyproviders.InjectorUsingProvider;
- import org.swiftsuspenders.injection.dependencyproviders.LocalOnlyProvider;
- import org.swiftsuspenders.injection.dependencyproviders.SingletonProvider;
- import org.swiftsuspenders.injection.dependencyproviders.SoftDependencyProvider;
- import org.swiftsuspenders.injection.dependencyproviders.ValueProvider;
+ import org.swiftsuspenders.dependencyproviders.ClassProvider;
+ import org.swiftsuspenders.dependencyproviders.DependencyProvider;
+ import org.swiftsuspenders.dependencyproviders.ForwardingProvider;
+ import org.swiftsuspenders.dependencyproviders.InjectorUsingProvider;
+ import org.swiftsuspenders.dependencyproviders.LocalOnlyProvider;
+ import org.swiftsuspenders.dependencyproviders.SingletonProvider;
+ import org.swiftsuspenders.dependencyproviders.SoftDependencyProvider;
+ import org.swiftsuspenders.dependencyproviders.ValueProvider;
import org.swiftsuspenders.utils.SsInternal;
public class InjectionMapping
@@ -54,7 +53,7 @@ package org.swiftsuspenders.injection
*
* @return The <code>InjectionMapping</code> the method is invoked on
*
- * @throws org.swiftsuspenders.injection.InjectorError Sealed mappings can't be changed in any way
+ * @throws org.swiftsuspenders.InjectorError Sealed mappings can't be changed in any way
*
* @see #toSingleton()
*/
@@ -75,7 +74,7 @@ package org.swiftsuspenders.injection
*
* @return The <code>InjectionMapping</code> the method is invoked on
*
- * @throws org.swiftsuspenders.injection.InjectorError Sealed mappings can't be changed in any way
+ * @throws org.swiftsuspenders.InjectorError Sealed mappings can't be changed in any way
*
* @see #toProvider()
*/
@@ -97,7 +96,7 @@ package org.swiftsuspenders.injection
*
* @return The <code>InjectionMapping</code> the method is invoked on
*
- * @throws org.swiftsuspenders.injection.InjectorError Sealed mappings can't be changed in any way
+ * @throws org.swiftsuspenders.InjectorError Sealed mappings can't be changed in any way
*
* @see #toProvider()
*/
@@ -117,7 +116,7 @@ package org.swiftsuspenders.injection
*
* @return The <code>InjectionMapping</code> the method is invoked on
*
- * @throws org.swiftsuspenders.injection.InjectorError Sealed mappings can't be changed in any way
+ * @throws org.swiftsuspenders.InjectorError Sealed mappings can't be changed in any way
*
* @see #toProvider()
*/
@@ -135,7 +134,7 @@ package org.swiftsuspenders.injection
*
* @return The <code>InjectionMapping</code> the method is invoked on
*
- * @throws org.swiftsuspenders.injection.InjectorError Sealed mappings can't be changed in any way
+ * @throws org.swiftsuspenders.InjectorError Sealed mappings can't be changed in any way
*/
public function toProvider(provider : DependencyProvider) : InjectionMapping
{
@@ -168,7 +167,7 @@ package org.swiftsuspenders.injection
*
* @return The <code>InjectionMapping</code> the method is invoked on
*
- * @throws org.swiftsuspenders.injection.InjectorError Sealed mappings can't be changed in any way
+ * @throws org.swiftsuspenders.InjectorError Sealed mappings can't be changed in any way
*
* @see #strong()
*/
@@ -192,7 +191,7 @@ package org.swiftsuspenders.injection
*
* @return The <code>InjectionMapping</code> the method is invoked on
*
- * @throws org.swiftsuspenders.injection.InjectorError Sealed mappings can't be changed in any way
+ * @throws org.swiftsuspenders.InjectorError Sealed mappings can't be changed in any way
*
* @see #soft()
*/
@@ -215,7 +214,7 @@ package org.swiftsuspenders.injection
*
* @return The <code>InjectionMapping</code> the method is invoked on
*
- * @throws org.swiftsuspenders.injection.InjectorError Sealed mappings can't be changed in any way
+ * @throws org.swiftsuspenders.InjectorError Sealed mappings can't be changed in any way
*
* @see #shared()
*/
@@ -240,7 +239,7 @@ package org.swiftsuspenders.injection
*
* @return The <code>InjectionMapping</code> the method is invoked on
*
- * @throws org.swiftsuspenders.injection.InjectorError Sealed mappings can't be changed in any way
+ * @throws org.swiftsuspenders.InjectorError Sealed mappings can't be changed in any way
*
* @see #local()
*/
@@ -269,7 +268,7 @@ package org.swiftsuspenders.injection
*
* @returns An internally created object that can be used as the key for unseal
*
- * @throws org.swiftsuspenders.injection.InjectorError Can't be invoked on a mapping that's already sealed
+ * @throws org.swiftsuspenders.InjectorError Can't be invoked on a mapping that's already sealed
*
* @see #unseal()
*/
@@ -292,8 +291,8 @@ package org.swiftsuspenders.injection
*
* @return The <code>InjectionMapping</code> the method is invoked on
*
- * @throws org.swiftsuspenders.injection.InjectorError Has to be invoked with the unique key object returned by an earlier call to <code>seal</code>
- * @throws org.swiftsuspenders.injection.InjectorError Can't unseal a mapping that's not sealed
+ * @throws org.swiftsuspenders.InjectorError Has to be invoked with the unique key object returned by an earlier call to <code>seal</code>
+ * @throws org.swiftsuspenders.InjectorError Can't unseal a mapping that's not sealed
*
* @see #seal()
*/
@@ -5,7 +5,7 @@
* in accordance with the terms of the license agreement accompanying it.
*/
-package org.swiftsuspenders.injection
+package org.swiftsuspenders
{
import avmplus.DescribeTypeJSON;
@@ -14,11 +14,11 @@ package org.swiftsuspenders.injection
import flash.utils.Dictionary;
import flash.utils.getQualifiedClassName;
- import org.swiftsuspenders.injection.dependencyproviders.ClassProvider;
+ import org.swiftsuspenders.dependencyproviders.ClassProvider;
- import org.swiftsuspenders.injection.dependencyproviders.DependencyProvider;
- import org.swiftsuspenders.injection.dependencyproviders.LocalOnlyProvider;
- import org.swiftsuspenders.injection.dependencyproviders.SoftDependencyProvider;
+ import org.swiftsuspenders.dependencyproviders.DependencyProvider;
+ import org.swiftsuspenders.dependencyproviders.LocalOnlyProvider;
+ import org.swiftsuspenders.dependencyproviders.SoftDependencyProvider;
import org.swiftsuspenders.reflection.DescribeTypeJSONReflector;
import org.swiftsuspenders.reflection.DescribeTypeReflector;
import org.swiftsuspenders.reflection.Reflector;
@@ -46,7 +46,7 @@ package org.swiftsuspenders.injection
*
* @eventType org.swiftsuspenders.InjectionEvent.POST_INSTANTIATE
*/
- [Event(name='postInstantiate', type='org.swiftsuspenders.injection.InjectionEvent')]
+ [Event(name='postInstantiate', type='org.swiftsuspenders.InjectionEvent')]
/**
* This event is dispatched each time the injector is about to inject into a class
*
@@ -62,7 +62,7 @@ package org.swiftsuspenders.injection
*
* @eventType org.swiftsuspenders.InjectionEvent.PRE_CONSTRUCT
*/
- [Event(name='preConstruct', type='org.swiftsuspenders.injection.InjectionEvent')]
+ [Event(name='preConstruct', type='org.swiftsuspenders.InjectionEvent')]
/**
* This event is dispatched each time the injector created and fully initialized a new instance
*
@@ -78,7 +78,7 @@ package org.swiftsuspenders.injection
*
* @eventType org.swiftsuspenders.InjectionEvent.POST_CONSTRUCT
*/
- [Event(name='postConstruct', type='org.swiftsuspenders.injection.InjectionEvent')]
+ [Event(name='postConstruct', type='org.swiftsuspenders.InjectionEvent')]
/**
* This event is dispatched each time the injector creates a new mapping for a type/ name
@@ -92,7 +92,7 @@ package org.swiftsuspenders.injection
*
* @eventType org.swiftsuspenders.MappingEvent.PRE_MAPPING_CREATE
*/
- [Event(name='preMappingCreate', type='org.swiftsuspenders.injection.MappingEvent')]
+ [Event(name='preMappingCreate', type='org.swiftsuspenders.MappingEvent')]
/**
* This event is dispatched each time the injector creates a new mapping for a type/ name
* combination, right after the mapping was created
@@ -105,7 +105,7 @@ package org.swiftsuspenders.injection
*
* @eventType org.swiftsuspenders.MappingEvent.POST_MAPPING_CREATE
*/
- [Event(name='postMappingCreate', type='org.swiftsuspenders.injection.MappingEvent')]
+ [Event(name='postMappingCreate', type='org.swiftsuspenders.MappingEvent')]
/**
* This event is dispatched each time an injector mapping is changed in any way, right before
* the change is applied.
@@ -118,7 +118,7 @@ package org.swiftsuspenders.injection
*
* @eventType org.swiftsuspenders.MappingEvent.PRE_MAPPING_CHANGE
*/
- [Event(name='preMappingChange', type='org.swiftsuspenders.injection.MappingEvent')]
+ [Event(name='preMappingChange', type='org.swiftsuspenders.MappingEvent')]
/**
* This event is dispatched each time an injector mapping is changed in any way, right after
* the change is applied.
@@ -131,7 +131,7 @@ package org.swiftsuspenders.injection
*
* @eventType org.swiftsuspenders.MappingEvent.POST_MAPPING_CHANGE
*/
- [Event(name='postMappingChange', type='org.swiftsuspenders.injection.MappingEvent')]
+ [Event(name='postMappingChange', type='org.swiftsuspenders.MappingEvent')]
/**
* This event is dispatched each time an injector mapping is removed, right after
* the mapping is deleted from the configuration.
@@ -144,7 +144,7 @@ package org.swiftsuspenders.injection
*
* @eventType org.swiftsuspenders.MappingEvent.POST_MAPPING_REMOVE
*/
- [Event(name='postMappingRemove', type='org.swiftsuspenders.injection.MappingEvent')]
+ [Event(name='postMappingRemove', type='org.swiftsuspenders.MappingEvent')]
/**
* This event is dispatched if an existing mapping is overridden without first unmapping it.
*
@@ -157,7 +157,7 @@ package org.swiftsuspenders.injection
*
* @eventType org.swiftsuspenders.MappingEvent.POST_MAPPING_REMOVE
*/
- [Event(name='mappingOverride', type='org.swiftsuspenders.injection.MappingEvent')]
+ [Event(name='mappingOverride', type='org.swiftsuspenders.MappingEvent')]
/**
* The <code>Injector</code> manages the mappings and acts as the central hub from which all
@@ -218,7 +218,7 @@ package org.swiftsuspenders.injection
* @return The <code>InjectionMapping</code> for the given request description
*
* @see #unmap()
- * @see org.swiftsuspenders.injection.InjectionMapping
+ * @see org.swiftsuspenders.InjectionMapping
*/
public function map(type : Class, name : String = '') : InjectionMapping
{
@@ -232,12 +232,12 @@ package org.swiftsuspenders.injection
* @param type The <code>class</code> describing the mapping
* @param name The name, as a case-sensitive string, to further describe the mapping
*
- * @throws org.swiftsuspenders.injection.InjectorError Descriptions that are not mapped can't be unmapped
- * @throws org.swiftsuspenders.injection.InjectorError Sealed mappings have to be unsealed before unmapping them
+ * @throws org.swiftsuspenders.InjectorError Descriptions that are not mapped can't be unmapped
+ * @throws org.swiftsuspenders.InjectorError Sealed mappings have to be unsealed before unmapping them
*
* @see #map()
- * @see org.swiftsuspenders.injection.InjectionMapping
- * @see org.swiftsuspenders.injection.InjectionMapping#unseal()
+ * @see org.swiftsuspenders.InjectionMapping
+ * @see org.swiftsuspenders.InjectionMapping#unseal()
*/
public function unmap(type : Class, name : String = '') : void
{
@@ -301,7 +301,7 @@ package org.swiftsuspenders.injection
*
* @return The mapping for the specified dependency class
*
- * @throws org.swiftsuspenders.injection.InjectorError When no mapping was found for the specified dependency
+ * @throws org.swiftsuspenders.InjectorError When no mapping was found for the specified dependency
*/
public function getMapping(type : Class, name : String = '') : InjectionMapping
{
@@ -320,7 +320,7 @@ package org.swiftsuspenders.injection
*
* @param target The instance to inject into
*
- * @throws org.swiftsuspenders.injection.InjectorError The <code>Injector</code> must have mappings for all injection points
+ * @throws org.swiftsuspenders.InjectorError The <code>Injector</code> must have mappings for all injection points
*
* @see #map()
*/
@@ -5,7 +5,7 @@
* in accordance with the terms of the license agreement accompanying it.
*/
-package org.swiftsuspenders.injection
+package org.swiftsuspenders
{
public class InjectorError extends Error
{
@@ -5,7 +5,7 @@
* in accordance with the terms of the license agreement accompanying it.
*/
-package org.swiftsuspenders.injection
+package org.swiftsuspenders
{
import flash.events.Event;
@@ -5,11 +5,11 @@
* in accordance with the terms of the license agreement accompanying it.
*/
-package org.swiftsuspenders.injection.dependencyproviders
+package org.swiftsuspenders.dependencyproviders
{
import flash.utils.Dictionary;
- import org.swiftsuspenders.injection.Injector;
+ import org.swiftsuspenders.Injector;
import org.swiftsuspenders.utils.SsInternal;
public class ClassProvider implements DependencyProvider
@@ -5,11 +5,11 @@
* in accordance with the terms of the license agreement accompanying it.
*/
-package org.swiftsuspenders.injection.dependencyproviders
+package org.swiftsuspenders.dependencyproviders
{
import flash.utils.Dictionary;
- import org.swiftsuspenders.injection.Injector;
+ import org.swiftsuspenders.Injector;
public interface DependencyProvider
{
@@ -5,11 +5,11 @@
* in accordance with the terms of the license agreement accompanying it.
*/
-package org.swiftsuspenders.injection.dependencyproviders
+package org.swiftsuspenders.dependencyproviders
{
import flash.utils.Dictionary;
- import org.swiftsuspenders.injection.Injector;
+ import org.swiftsuspenders.Injector;
public class FactoryProvider implements DependencyProvider
{
@@ -5,11 +5,11 @@
* in accordance with the terms of the license agreement accompanying it.
*/
-package org.swiftsuspenders.injection.dependencyproviders
+package org.swiftsuspenders.dependencyproviders
{
import flash.utils.Dictionary;
- import org.swiftsuspenders.injection.Injector;
+ import org.swiftsuspenders.Injector;
public class ForwardingProvider implements DependencyProvider
{
@@ -5,11 +5,11 @@
* in accordance with the terms of the license agreement accompanying it.
*/
-package org.swiftsuspenders.injection.dependencyproviders
+package org.swiftsuspenders.dependencyproviders
{
import flash.utils.Dictionary;
- import org.swiftsuspenders.injection.Injector;
+ import org.swiftsuspenders.Injector;
public class InjectorUsingProvider extends ForwardingProvider
{
@@ -5,7 +5,7 @@
* in accordance with the terms of the license agreement accompanying it.
*/
-package org.swiftsuspenders.injection.dependencyproviders
+package org.swiftsuspenders.dependencyproviders
{
public class LocalOnlyProvider extends ForwardingProvider
{
@@ -5,12 +5,12 @@
* in accordance with the terms of the license agreement accompanying it.
*/
-package org.swiftsuspenders.injection.dependencyproviders
+package org.swiftsuspenders.dependencyproviders
{
import flash.utils.Dictionary;
- import org.swiftsuspenders.injection.InjectionMapping;
- import org.swiftsuspenders.injection.Injector;
+ import org.swiftsuspenders.InjectionMapping;
+ import org.swiftsuspenders.Injector;
public class OtherMappingProvider implements DependencyProvider
{
Oops, something went wrong.

0 comments on commit fd6e8fc

Please sign in to comment.