Skip to content
Browse files

Moves mapping related classes into package `mapping`

  • Loading branch information...
1 parent 903fb88 commit 1c84b654ddb3a8c9d809dc59cca15337fcfd9cde @tschneidereit committed Jun 8, 2012
View
20 src/org/swiftsuspenders/Injector.as
@@ -20,6 +20,8 @@ package org.swiftsuspenders
import org.swiftsuspenders.dependencyproviders.DependencyProvider;
import org.swiftsuspenders.dependencyproviders.LocalOnlyProvider;
import org.swiftsuspenders.dependencyproviders.SoftDependencyProvider;
+ import org.swiftsuspenders.mapping.InjectionMapping;
+ import org.swiftsuspenders.mapping.MappingEvent;
import org.swiftsuspenders.reflection.DescribeTypeJSONReflector;
import org.swiftsuspenders.reflection.DescribeTypeReflector;
import org.swiftsuspenders.reflection.Reflector;
@@ -93,7 +95,7 @@ package org.swiftsuspenders
*
* @eventType org.swiftsuspenders.MappingEvent.PRE_MAPPING_CREATE
*/
- [Event(name='preMappingCreate', type='org.swiftsuspenders.MappingEvent')]
+ [Event(name='preMappingCreate', type='org.swiftsuspenders.mapping.MappingEvent')]
/**
* This event is dispatched each time the injector creates a new mapping for a type/ name
* combination, right after the mapping was created
@@ -106,7 +108,7 @@ package org.swiftsuspenders
*
* @eventType org.swiftsuspenders.MappingEvent.POST_MAPPING_CREATE
*/
- [Event(name='postMappingCreate', type='org.swiftsuspenders.MappingEvent')]
+ [Event(name='postMappingCreate', type='org.swiftsuspenders.mapping.MappingEvent')]
/**
* This event is dispatched each time an injector mapping is changed in any way, right before
* the change is applied.
@@ -119,7 +121,7 @@ package org.swiftsuspenders
*
* @eventType org.swiftsuspenders.MappingEvent.PRE_MAPPING_CHANGE
*/
- [Event(name='preMappingChange', type='org.swiftsuspenders.MappingEvent')]
+ [Event(name='preMappingChange', type='org.swiftsuspenders.mapping.MappingEvent')]
/**
* This event is dispatched each time an injector mapping is changed in any way, right after
* the change is applied.
@@ -132,7 +134,7 @@ package org.swiftsuspenders
*
* @eventType org.swiftsuspenders.MappingEvent.POST_MAPPING_CHANGE
*/
- [Event(name='postMappingChange', type='org.swiftsuspenders.MappingEvent')]
+ [Event(name='postMappingChange', type='org.swiftsuspenders.mapping.MappingEvent')]
/**
* This event is dispatched each time an injector mapping is removed, right after
* the mapping is deleted from the configuration.
@@ -145,7 +147,7 @@ package org.swiftsuspenders
*
* @eventType org.swiftsuspenders.MappingEvent.POST_MAPPING_REMOVE
*/
- [Event(name='postMappingRemove', type='org.swiftsuspenders.MappingEvent')]
+ [Event(name='postMappingRemove', type='org.swiftsuspenders.mapping.MappingEvent')]
/**
* This event is dispatched if an existing mapping is overridden without first unmapping it.
*
@@ -158,7 +160,7 @@ package org.swiftsuspenders
*
* @eventType org.swiftsuspenders.MappingEvent.POST_MAPPING_REMOVE
*/
- [Event(name='mappingOverride', type='org.swiftsuspenders.MappingEvent')]
+ [Event(name='mappingOverride', type='org.swiftsuspenders.mapping.MappingEvent')]
/**
* The <code>Injector</code> manages the mappings and acts as the central hub from which all
@@ -219,7 +221,7 @@ package org.swiftsuspenders
* @return The <code>InjectionMapping</code> for the given request description
*
* @see #unmap()
- * @see org.swiftsuspenders.InjectionMapping
+ * @see org.swiftsuspenders.mapping.InjectionMapping
*/
public function map(type : Class, name : String = '') : InjectionMapping
{
@@ -237,8 +239,8 @@ package org.swiftsuspenders
* @throws org.swiftsuspenders.InjectorError Sealed mappings have to be unsealed before unmapping them
*
* @see #map()
- * @see org.swiftsuspenders.InjectionMapping
- * @see org.swiftsuspenders.InjectionMapping#unseal()
+ * @see org.swiftsuspenders.mapping.InjectionMapping
+ * @see org.swiftsuspenders.mapping.InjectionMapping#unseal()
*/
public function unmap(type : Class, name : String = '') : void
{
View
2 src/org/swiftsuspenders/dependencyproviders/OtherMappingProvider.as
@@ -9,7 +9,7 @@ package org.swiftsuspenders.dependencyproviders
{
import flash.utils.Dictionary;
- import org.swiftsuspenders.InjectionMapping;
+ import org.swiftsuspenders.mapping.InjectionMapping;
import org.swiftsuspenders.Injector;
public class OtherMappingProvider implements DependencyProvider
View
4 src/org/swiftsuspenders/InjectionMapping.as → ...iftsuspenders/mapping/InjectionMapping.as
@@ -5,8 +5,10 @@
* in accordance with the terms of the license agreement accompanying it.
*/
-package org.swiftsuspenders
+package org.swiftsuspenders.mapping
{
+ import org.swiftsuspenders.Injector;
+ import org.swiftsuspenders.InjectorError;
import org.swiftsuspenders.dependencyproviders.ClassProvider;
import org.swiftsuspenders.dependencyproviders.DependencyProvider;
import org.swiftsuspenders.dependencyproviders.ForwardingProvider;
View
2 src/org/swiftsuspenders/MappingEvent.as → ...g/swiftsuspenders/mapping/MappingEvent.as
@@ -5,7 +5,7 @@
* in accordance with the terms of the license agreement accompanying it.
*/
-package org.swiftsuspenders
+package org.swiftsuspenders.mapping
{
import flash.events.Event;
View
2 test/org/swiftsuspenders/ChildInjectorTests.as
@@ -9,6 +9,8 @@ package org.swiftsuspenders
{
import flexunit.framework.Assert;
+ import org.swiftsuspenders.mapping.InjectionMapping;
+
import org.swiftsuspenders.support.injectees.ClassInjectee;
import org.swiftsuspenders.support.injectees.childinjectors.ChildInjectorCreatingProvider;
import org.swiftsuspenders.support.injectees.childinjectors.InjectorInjectee;
View
1 test/org/swiftsuspenders/DependencyProviderTests.as
@@ -17,6 +17,7 @@ package org.swiftsuspenders
import org.swiftsuspenders.dependencyproviders.OtherMappingProvider;
import org.swiftsuspenders.dependencyproviders.SingletonProvider;
import org.swiftsuspenders.dependencyproviders.ValueProvider;
+ import org.swiftsuspenders.mapping.InjectionMapping;
import org.swiftsuspenders.support.injectees.ClassInjectee;
import org.swiftsuspenders.support.providers.ClassNameStoringProvider;
import org.swiftsuspenders.support.types.Clazz;
View
1 test/org/swiftsuspenders/InjectionMappingTests.as
@@ -17,6 +17,7 @@ package org.swiftsuspenders
import org.hamcrest.object.notNullValue;
import org.swiftsuspenders.dependencyproviders.ClassProvider;
import org.swiftsuspenders.dependencyproviders.SingletonProvider;
+ import org.swiftsuspenders.mapping.InjectionMapping;
import org.swiftsuspenders.support.types.Clazz;
import org.swiftsuspenders.support.types.Interface;
import org.swiftsuspenders.utils.SsInternal;
View
2 test/org/swiftsuspenders/InjectorTests.as
@@ -20,6 +20,8 @@ package org.swiftsuspenders
import org.hamcrest.object.hasPropertyWithValue;
import org.hamcrest.object.isTrue;
import org.swiftsuspenders.dependencyproviders.OtherMappingProvider;
+ import org.swiftsuspenders.mapping.InjectionMapping;
+ import org.swiftsuspenders.mapping.MappingEvent;
import org.swiftsuspenders.support.injectees.ClassInjectee;
import org.swiftsuspenders.support.injectees.ComplexClassInjectee;
import org.swiftsuspenders.support.injectees.InterfaceInjectee;

0 comments on commit 1c84b65

Please sign in to comment.
Something went wrong with that request. Please try again.