You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by li...@apache.org on 2011/06/09 10:44:02 UTC
svn commit: r1133719 - in /shindig/trunk/java:
common/src/main/java/org/apache/shindig/common/util/
gadgets/src/main/java/org/apache/shindig/gadgets/
gadgets/src/main/java/org/apache/shindig/gadgets/js/
gadgets/src/main/java/org/apache/shindig/gadgets/...
Author: lindner
Date: Thu Jun 9 08:44:01 2011
New Revision: 1133719
URL: http://svn.apache.org/viewvc?rev=1133719&view=rev
Log:
improve code cleanliness
Modified:
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/OpenSocialVersion.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/Gadget.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/ExportJsProcessor.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsResponseBuilder.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParser.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ModulePrefs.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManager.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManager.java
shindig/trunk/java/gadgets/src/main/java16/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompiler.java
shindig/trunk/java/gadgets/src/test/java16/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompilerTest.java
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/OpenSocialVersion.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/OpenSocialVersion.java?rev=1133719&r1=1133718&r2=1133719&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/OpenSocialVersion.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/OpenSocialVersion.java Thu Jun 9 08:44:01 2011
@@ -18,6 +18,8 @@
*/
package org.apache.shindig.common.util;
+import com.google.common.base.Objects;
+
import java.util.Comparator;
import java.util.StringTokenizer;
@@ -71,7 +73,12 @@ public class OpenSocialVersion {
}
return false;
}
-
+
+ @Override
+ public int hashCode() {
+ return Objects.hashCode(major, minor, patch);
+ }
+
/**
* Tests if OpenSocialVersion is equivalent to the parameter version
* @param version Compare with this version
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/Gadget.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/Gadget.java?rev=1133719&r1=1133718&r2=1133719&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/Gadget.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/Gadget.java Thu Jun 9 08:44:01 2011
@@ -152,13 +152,8 @@ public class Gadget {
* gadget.getSpec().getModulePrefs().getLocale(locale);
*/
public LocaleSpec getLocale() {
- String viewName = null;
View view = getCurrentView();
- if (view == null) { // Use default view if current view is not set
- viewName = GadgetSpec.DEFAULT_VIEW;
- } else {
- viewName = view.getName();
- }
+ String viewName = (view == null) ? GadgetSpec.DEFAULT_VIEW : view.getName();
return spec.getModulePrefs().getLocale(context.getLocale(), viewName);
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/ExportJsProcessor.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/ExportJsProcessor.java?rev=1133719&r1=1133718&r2=1133719&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/ExportJsProcessor.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/ExportJsProcessor.java Thu Jun 9 08:44:01 2011
@@ -166,8 +166,7 @@ public class ExportJsProcessor implement
// Global/window namespace.
} else {
- for (int i = 0; i < properties.size(); i++) {
- String prop = properties.get(i);
+ for (String prop : properties) {
result.append(FUNCTION_NAME).append("(");
result.append("'").append(prop).append("',[").append(prop);
result.append("]);");
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsResponseBuilder.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsResponseBuilder.java?rev=1133719&r1=1133718&r2=1133719&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsResponseBuilder.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsResponseBuilder.java Thu Jun 9 08:44:01 2011
@@ -243,7 +243,7 @@ public class JsResponseBuilder {
for (String exp : expandedList) {
if (set.contains(exp)) continue;
if (exp.endsWith(".prototype")) continue;
- if (exp.indexOf(".") < 0) builder.append("var ");
+ if (!exp.contains(".")) builder.append("var ");
builder.append(exp).append(" = {}").append(EXTERN_DELIM);
set.add(exp);
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParser.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParser.java?rev=1133719&r1=1133718&r2=1133719&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParser.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParser.java Thu Jun 9 08:44:01 2011
@@ -86,9 +86,6 @@ public class NekoSimplifiedHtmlParser ex
HTMLElements.getElement(HTMLElements.BODY)};
}
- private static final Map<String, HTMLElements.Element> OSML_ELEMENTS = ImmutableMap.of(
- SocialDataTags.OSML_TEMPLATE_TAG, OSML_TEMPLATE_ELEMENT,
- SocialDataTags.OSML_DATA_TAG, OSML_DATA_ELEMENT);
@Inject
public NekoSimplifiedHtmlParser(DOMImplementation documentFactory) {
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java?rev=1133719&r1=1133718&r2=1133719&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java Thu Jun 9 08:44:01 2011
@@ -421,9 +421,7 @@ public class CajaContentRewriter impleme
protected PluginCompiler makePluginCompiler(
PluginMeta meta, MessageQueue mq) {
- PluginCompiler compiler = new PluginCompiler(
+ return new PluginCompiler(
BuildInfo.getInstance(), meta, mq);
- return compiler;
}
-
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ModulePrefs.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ModulePrefs.java?rev=1133719&r1=1133718&r2=1133719&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ModulePrefs.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ModulePrefs.java Thu Jun 9 08:44:01 2011
@@ -780,7 +780,7 @@ public class ModulePrefs {
if (!feature.getName().startsWith("core")) {
// Key view level features by qualifying with the view ID
for (String view : feature.getViews()) {
- StringBuffer buff = new StringBuffer(feature.getName());
+ StringBuilder buff = new StringBuilder(feature.getName());
buff.append('.');
buff.append(view);
features.put(buff.toString(), feature);
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManager.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManager.java?rev=1133719&r1=1133718&r2=1133719&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManager.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManager.java Thu Jun 9 08:44:01 2011
@@ -141,7 +141,7 @@ public class DefaultConcatUriManager imp
// GET URL limit constraint.
List<Uri> uris = Lists.newArrayList();
- Integer i = Integer.valueOf(START_INDEX);
+ Integer i = START_INDEX;
for (Uri resource : resourceUris) {
uriBuilder.addQueryParameter(i.toString(), resource.toString());
if (uriBuilder.toString().length() > injectedMaxUrlLength) {
@@ -153,7 +153,7 @@ public class DefaultConcatUriManager imp
uriBuilder = makeUriBuilder(ctx, concatHost, concatPath);
batchUris = Lists.newArrayList();
- i = Integer.valueOf(START_INDEX);
+ i = START_INDEX;
uriBuilder.addQueryParameter(i.toString(), resource.toString());
}
i++;
@@ -201,7 +201,7 @@ public class DefaultConcatUriManager imp
private Map<Uri, String> createSnippets(List<Uri> uris) {
Map<Uri, String> snippets = Maps.newHashMap();
for (Uri uri : uris) {
- Integer i = Integer.valueOf(START_INDEX);
+ Integer i = START_INDEX;
String splitParam = uri.getQueryParameter(Param.JSON.getKey());
String resourceUri = null;
while ((resourceUri = uri.getQueryParameter(i.toString())) != null) {
@@ -267,7 +267,7 @@ public class DefaultConcatUriManager imp
}
String splitParam = type == Type.JS ? uri.getQueryParameter(Param.JSON.getKey()) : null;
- Integer i = Integer.valueOf(START_INDEX);
+ Integer i = START_INDEX;
String uriStr = null;
while ((uriStr = uri.getQueryParameter(i.toString())) != null) {
try {
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManager.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManager.java?rev=1133719&r1=1133718&r2=1133719&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManager.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManager.java Thu Jun 9 08:44:01 2011
@@ -292,7 +292,7 @@ public class DefaultProxyUriManager impl
val = val.replace("%authority%", hostProvider.get().getAuthority());
}else{
//require this for test purpose, %host% needs to be replaced with default value eg. StyleTagProxyEmbeddedUrlsVisitorTest
- if (val.indexOf("%authority%") >= 0){
+ if (val.contains("%authority%")) {
val = val.replace("%authority%", "localhost:8080");
}
}
Modified: shindig/trunk/java/gadgets/src/main/java16/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompiler.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java16/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompiler.java?rev=1133719&r1=1133718&r2=1133719&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java16/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompiler.java (original)
+++ shindig/trunk/java/gadgets/src/main/java16/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompiler.java Thu Jun 9 08:44:01 2011
@@ -315,9 +315,8 @@ public class ClosureJsCompiler implement
int codeStart = 0;
int codePos = 0;
int curMapping = -1;
- for (int line = 0; line < lines.length; ++line) {
- for (int col = 0; col < lines[line].length; ++col) {
- int nextMapping = lines[line][col];
+ for (int[] line : lines) {
+ for (int nextMapping : line) {
codePos++;
if (nextMapping != curMapping && curMapping != -1) {
appendJsContent(compiledOut, codeStart, codePos, compiled, curMapping);
Modified: shindig/trunk/java/gadgets/src/test/java16/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompilerTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java16/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompilerTest.java?rev=1133719&r1=1133718&r2=1133719&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java16/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompilerTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java16/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompilerTest.java Thu Jun 9 08:44:01 2011
@@ -182,8 +182,7 @@ public class ClosureJsCompilerTest exten
}
private Result mockRealJsResult() {
- Result result = createMock(Result.class);
- return result;
+ return createMock(Result.class);
}
private Compiler mockRealJsCompiler(JSError error, Result res, String toSource) {