Removed line length and reformatted

boncey · boncey · commit 9e848993f68b · 2012-02-21T23:13:05.000Z
diff --git a/src/main/config/scribe-eclipse-formatter.xml b/src/main/config/scribe-eclipse-formatter.xml
@@ -53,7 +53,7 @@
 <setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="false"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
@@ -73,7 +73,7 @@
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="80"/>
+<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="9999"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
@@ -204,7 +204,7 @@
 <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
 <setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="80"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="9999"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
diff --git a/src/main/java/org/scribe/builder/api/FlickrApi.java b/src/main/java/org/scribe/builder/api/FlickrApi.java
@@ -26,8 +26,7 @@ public String getAccessTokenEndpoint()
   @Override
   public String getAuthorizationUrl(Token requestToken)
   {
-    return "http://www.flickr.com/services/oauth/authorize?oauth_token="
-        + requestToken.getToken();
+    return "http://www.flickr.com/services/oauth/authorize?oauth_token=" + requestToken.getToken();
   }
 
   /**
diff --git a/src/test/java/org/scribe/examples/FlickrExample.java b/src/test/java/org/scribe/examples/FlickrExample.java
@@ -16,8 +16,7 @@ public static void main(String[] args)
     // Replace these with your own api key and secret
     String apiKey = "your_app_id";
     String apiSecret = "your_api_secret";
-    OAuthService service = new ServiceBuilder().provider(FlickrApi.class)
-        .apiKey(apiKey).apiSecret(apiSecret).build();
+    OAuthService service = new ServiceBuilder().provider(FlickrApi.class).apiKey(apiKey).apiSecret(apiSecret).build();
     Scanner in = new Scanner(System.in);
 
     System.out.println("=== Flickr's OAuth Workflow ===");
@@ -41,8 +40,7 @@ public static void main(String[] args)
     System.out.println("Trading the Request Token for an Access Token...");
     Token accessToken = service.getAccessToken(requestToken, verifier);
     System.out.println("Got the Access Token!");
-    System.out.println("(if your curious it looks like this: " + accessToken
-        + " )");
+    System.out.println("(if your curious it looks like this: " + accessToken + " )");
     System.out.println();
 
     // Now let's go and ask for a protected resource!
@@ -56,7 +54,6 @@ public static void main(String[] args)
     System.out.println(response.getBody());
 
     System.out.println();
-    System.out
-        .println("Thats it man! Go and build something awesome with Scribe! :)");
+    System.out.println("Thats it man! Go and build something awesome with Scribe! :)");
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,7 @@ public String getAccessTokenEndpoint()`
`26`	`26`	`@Override`
`27`	`27`	`public String getAuthorizationUrl(Token requestToken)`
`28`	`28`	`{`
`29`		`- return "http://www.flickr.com/services/oauth/authorize?oauth_token="`
`30`		`- + requestToken.getToken();`
	`29`	`+ return "http://www.flickr.com/services/oauth/authorize?oauth_token=" + requestToken.getToken();`
`31`	`30`	`}`
`32`	`31`
`33`	`32`	`/**`