Skip to content

Commit 1575d3b

Browse files
committed
cfformatting rules
1 parent 57fa5ce commit 1575d3b

File tree

6 files changed

+73
-68
lines changed

6 files changed

+73
-68
lines changed

models/javaloader/JavaCompiler.cfc

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,13 @@
142142
<cfreturn jarPath/>
143143
</cffunction>
144144

145-
<cffunction name="getVersion" hint="returns the version number" access="public" returntype="string" output="false">
145+
<cffunction
146+
name ="getVersion"
147+
hint ="returns the version number"
148+
access ="public"
149+
returntype="string"
150+
output ="false"
151+
>
146152
<cfreturn "0.1.b"/>
147153
</cffunction>
148154

models/javaloader/JavaLoader.cfc

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,11 @@
207207
</cfscript>
208208

209209
<cfif isSimpleValue( arguments[ 1 ] )>
210-
<cfinvoke method="#arguments[ 1 ]#" returnvariable="local.return" argumentCollection="#local.funcArgs#"/>
210+
<cfinvoke
211+
method ="#arguments[ 1 ]#"
212+
returnvariable ="local.return"
213+
argumentCollection="#local.funcArgs#"
214+
/>
211215
<cfelseif isCustomFunction( arguments[ 1 ] )>
212216
<cfscript>
213217
func = arguments[ 1 ];

models/javaloader/JavaProxy.cfc

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -218,28 +218,28 @@
218218
found = true;
219219
} else if ( param.isPrimitive() )
220220
// if it's a primitive, it can be mapped to object primtive classes
221-
{
222-
if ( param.getName() eq "boolean" AND class.getName() eq "java.lang.Boolean" ) {
223-
found = true;
224-
} else if ( param.getName() eq "int" AND class.getName() eq "java.lang.Integer" ) {
225-
found = true;
226-
} else if ( param.getName() eq "long" AND class.getName() eq "java.lang.Long" ) {
227-
found = true;
228-
} else if ( param.getName() eq "float" AND class.getName() eq "java.lang.Float" ) {
229-
found = true;
230-
} else if ( param.getName() eq "double" AND class.getName() eq "java.lang.Double" ) {
231-
found = true;
232-
} else if ( param.getName() eq "char" AND class.getName() eq "java.lang.Character" ) {
233-
found = true;
234-
} else if ( param.getName() eq "byte" AND class.getName() eq "java.lang.Byte" ) {
235-
found = true;
236-
} else if ( param.getName() eq "short" AND class.getName() eq "java.lang.Short" ) {
237-
found = true;
238-
} else {
239-
found = false;
240-
}
241-
}
242-
else {
221+
{
222+
if ( param.getName() eq "boolean" AND class.getName() eq "java.lang.Boolean" ) {
223+
found = true;
224+
} else if ( param.getName() eq "int" AND class.getName() eq "java.lang.Integer" ) {
225+
found = true;
226+
} else if ( param.getName() eq "long" AND class.getName() eq "java.lang.Long" ) {
227+
found = true;
228+
} else if ( param.getName() eq "float" AND class.getName() eq "java.lang.Float" ) {
229+
found = true;
230+
} else if ( param.getName() eq "double" AND class.getName() eq "java.lang.Double" ) {
231+
found = true;
232+
} else if ( param.getName() eq "char" AND class.getName() eq "java.lang.Character" ) {
233+
found = true;
234+
} else if ( param.getName() eq "byte" AND class.getName() eq "java.lang.Byte" ) {
235+
found = true;
236+
} else if ( param.getName() eq "short" AND class.getName() eq "java.lang.Short" ) {
237+
found = true;
238+
} else {
239+
found = false;
240+
}
241+
}
242+
else {
243243
found = false;
244244
}
245245
}
Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
/**
2-
* This is a protection Application cfm for the config file. You do not
3-
* need to modify this file
4-
*/
5-
component{
1+
/**
2+
* This is a protection Application cfm for the config file. You do not
3+
* need to modify this file
4+
*/
5+
component {
6+
67
abort;
7-
}
8+
9+
}

test-harness/config/WireBox.cfc

Lines changed: 21 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,39 @@
1-
component extends="coldbox.system.ioc.config.Binder"{
2-
1+
component extends="coldbox.system.ioc.config.Binder" {
2+
33
/**
4-
* Configure WireBox, that's it!
5-
*/
4+
* Configure WireBox, that's it!
5+
*/
66
function configure(){
7-
87
// The WireBox configuration structure DSL
98
wireBox = {
109
// Scope registration, automatically register a wirebox injector instance on any CF scope
1110
// By default it registeres itself on application scope
12-
scopeRegistration = {
13-
enabled = true,
14-
scope = "application", // server, cluster, session, application
15-
key = "wireBox"
11+
scopeRegistration : {
12+
enabled : true,
13+
scope : "application", // server, cluster, session, application
14+
key : "wireBox"
1615
},
17-
1816
// DSL Namespace registrations
19-
customDSL = {
20-
// namespace = "mapping name"
17+
customDSL : {
18+
// namespace = "mapping name"
2119
},
22-
2320
// Custom Storage Scopes
24-
customScopes = {
25-
// annotationName = "mapping name"
21+
customScopes : {
22+
// annotationName = "mapping name"
2623
},
27-
2824
// Package scan locations
29-
scanLocations = [],
30-
25+
scanLocations : [],
3126
// Stop Recursions
32-
stopRecursions = [],
33-
27+
stopRecursions : [],
3428
// Parent Injector to assign to the configured injector, this must be an object reference
35-
parentInjector = "",
36-
29+
parentInjector : "",
3730
// Register all event listeners here, they are created in the specified order
38-
listeners = [
39-
// { class="", name="", properties={} }
40-
]
31+
listeners : [
32+
// { class="", name="", properties={} }
33+
]
4134
};
42-
35+
4336
// Map Bindings below
44-
}
37+
}
4538

46-
}
39+
}

test-harness/tests/specs/LoaderTest.cfc

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,50 +6,50 @@ component extends="coldbox.system.testing.BaseTestCase" appMapping="/root" {
66
/*********************************** LIFE CYCLE Methods ***********************************/
77

88
// executes before all suites+specs in the run() method
9-
function beforeAll() {
9+
function beforeAll(){
1010
super.beforeAll();
1111
}
1212

1313
// executes after all suites+specs in the run() method
14-
function afterAll() {
14+
function afterAll(){
1515
super.afterAll();
1616
structDelete( server, getLoader().getStaticIDKey() );
1717
}
1818

1919
/*********************************** BDD SUITES ***********************************/
2020

21-
function run() {
21+
function run(){
2222
// all your suites go here.
23-
describe( "JavaLoader Module", function() {
24-
beforeEach( function( currentSpec ) {
23+
describe( "JavaLoader Module", function(){
24+
beforeEach( function( currentSpec ){
2525
setup();
2626
} );
2727

28-
it( "should register loader proxy", function() {
28+
it( "should register loader proxy", function(){
2929
var loader = getLoader();
3030
expect( loader ).toBeComponent();
3131
} );
3232

33-
it( "should class load jar files", function() {
33+
it( "should class load jar files", function(){
3434
var event = execute( "main.index" );
3535
var prc = event.getCollection( private = true );
3636
expect( prc.hello ).toBe( "Hello World" );
3737
} );
3838

39-
it( "should get loaded URLs", function() {
39+
it( "should get loaded URLs", function(){
4040
var loader = getLoader();
4141
expect( loader.getLoadedURls() ).toBeArray();
4242
expect( loader.getLoadedURLs() ).toHaveLength( 2 );
4343
} );
4444

45-
it( "should retrieve via custom DSL", function() {
45+
it( "should retrieve via custom DSL", function(){
4646
var hello = getWireBox().getInstance( dsl = "javaloader:HelloWorld" );
4747
expect( isObject( hello ) ).toBeTrue();
4848
} );
4949
} );
5050
}
5151

52-
private function getLoader() {
52+
private function getLoader(){
5353
return getWireBox().getInstance( "loader@cbjavaloader" );
5454
}
5555

0 commit comments

Comments
 (0)