diff --git a/dist/contents/README.txt b/dist/contents/README.txt index f4fc325b4f..c40cd25b9c 100644 --- a/dist/contents/README.txt +++ b/dist/contents/README.txt @@ -11,7 +11,7 @@ Having said so, we assume that you have some knowledge about Java and especially If you don't know anything about GWT, then we suggest you make yourself familiar with it before reading any further: - GWT Introduction: http://code.google.com/webtoolkit/overview.html + GWT Introduction: http://code.google.com/webtoolkit/overview.html [Contents of this distribution] @@ -22,7 +22,7 @@ before reading any further: |---quickstart (quickstart guide) |-examples (demo apps) |-libi (errai libs) - + [Running the examples] diff --git a/errai-bus-demos/rpcdemo/src/main/java/org/errai/samples/rpcdemo/client/local/RPCDemo.java b/errai-bus-demos/rpcdemo/src/main/java/org/errai/samples/rpcdemo/client/local/RPCDemo.java index ad1e9f5a1a..7ba3bd6e55 100644 --- a/errai-bus-demos/rpcdemo/src/main/java/org/errai/samples/rpcdemo/client/local/RPCDemo.java +++ b/errai-bus-demos/rpcdemo/src/main/java/org/errai/samples/rpcdemo/client/local/RPCDemo.java @@ -122,7 +122,7 @@ public void onClick(ClickEvent clickEvent) { new RemoteCallback() { public void callback(Void response) { } - }, + }, new ErrorCallback() { public boolean error(Message message, Throwable throwable) { try { diff --git a/errai-bus-demos/rpcdemo/src/main/java/org/errai/samples/rpcdemo/client/shared/TestService.java b/errai-bus-demos/rpcdemo/src/main/java/org/errai/samples/rpcdemo/client/shared/TestService.java index 2c2f35bcd9..d5919ab51e 100644 --- a/errai-bus-demos/rpcdemo/src/main/java/org/errai/samples/rpcdemo/client/shared/TestService.java +++ b/errai-bus-demos/rpcdemo/src/main/java/org/errai/samples/rpcdemo/client/shared/TestService.java @@ -34,7 +34,7 @@ public interface TestService { List getDates(); Date getDate(); - + public void exception() throws TestException; } diff --git a/errai-bus/src/main/java/org/jboss/errai/bus/client/api/base/MessageBuilder.java b/errai-bus/src/main/java/org/jboss/errai/bus/client/api/base/MessageBuilder.java index e77e5d843a..bdd85a40d5 100644 --- a/errai-bus/src/main/java/org/jboss/errai/bus/client/api/base/MessageBuilder.java +++ b/errai-bus/src/main/java/org/jboss/errai/bus/client/api/base/MessageBuilder.java @@ -46,7 +46,7 @@ public class MessageBuilder { public static MessageBuildSubject createMessage() { return new AbstractMessageBuilder(provider.get()).start(); } - + /** * Create a new message for the provided subject. * @@ -76,7 +76,7 @@ public static MessageBuildSubject createConversation(Messa return new AbstractMessageBuilder(new ConversationMessageWrapper(message, newMessage)).start(); } } - + /** * Create a conversational messages for the provided subject * @@ -108,7 +108,7 @@ public static MessageBuildCommand createConversation(Messa public static AbstractRemoteCallBuilder createCall() { return new AbstractRemoteCallBuilder(CommandMessage.create()); } - + /** * Creates an RPC call. * @@ -121,7 +121,7 @@ public static AbstractRemoteCallBuilder createCall() { public static T createCall(RemoteCallback callback, Class service) { return new AbstractRemoteCallBuilder(CommandMessage.create()).call(callback, service); } - + /** * Creates an RPC call with an ErrorCallback. * diff --git a/errai-bus/src/main/java/org/jboss/errai/bus/client/api/builder/AbstractRemoteCallBuilder.java b/errai-bus/src/main/java/org/jboss/errai/bus/client/api/builder/AbstractRemoteCallBuilder.java index b925acb096..567775f61d 100644 --- a/errai-bus/src/main/java/org/jboss/errai/bus/client/api/builder/AbstractRemoteCallBuilder.java +++ b/errai-bus/src/main/java/org/jboss/errai/bus/client/api/builder/AbstractRemoteCallBuilder.java @@ -64,7 +64,7 @@ public T call(final RemoteCallback callback, final ErrorCallback error else return call(callback, errorCallback, remoteService); } - + ((RPCStub) svc).setRemoteCallback(callback); ((RPCStub) svc).setErrorCallback(errorCallback); return svc; @@ -83,11 +83,11 @@ public RemoteCallEndpointDef call(final String serviceName) { message.toSubject(serviceName + ":RPC"); final RemoteCallSendable sendable = new RemoteCallSendable() { - + public void sendNowWith(final MessageBus bus) { Integer id = null; if (remoteCallback != null) { - final String replyTo = message.getSubject() + "." + message.getCommandType() + + final String replyTo = message.getSubject() + "." + message.getCommandType() + ":RespondTo:" + (id = uniqueNumber()); if (remoteCallback != null) { @@ -103,11 +103,11 @@ public void callback(Message message) { message.set(MessageParts.ReplyTo, replyTo); } } - + if (message.getErrorCallback() != null) { - final String errorTo = message.getSubject() + "." + message.getCommandType() + + final String errorTo = message.getSubject() + "." + message.getCommandType() + ":Errors:" + ((id == null) ? uniqueNumber() : id); - + bus.subscribe(errorTo, new MessageCallback() { @SuppressWarnings({"unchecked"}) @@ -119,7 +119,7 @@ public void callback(Message m) { ); message.set(MessageParts.ErrorTo, errorTo); } - + message.sendNowWith(bus); } }; diff --git a/errai-bus/src/main/java/org/jboss/errai/bus/client/framework/ClientMessageBusImpl.java b/errai-bus/src/main/java/org/jboss/errai/bus/client/framework/ClientMessageBusImpl.java index 35aec0afb6..b45b3640ee 100644 --- a/errai-bus/src/main/java/org/jboss/errai/bus/client/framework/ClientMessageBusImpl.java +++ b/errai-bus/src/main/java/org/jboss/errai/bus/client/framework/ClientMessageBusImpl.java @@ -110,7 +110,7 @@ public class ClientMessageBusImpl implements ClientMessageBus { * IMPORTANT: only access this member via {@link #getNextRequestNumber()}. */ private int requestNumber = 0; - + private boolean disconnected = false; ProxySettings proxySettings; @@ -173,7 +173,7 @@ private RequestBuilder getRecvBuilder() { RequestBuilder.GET, URL.encode(endpoint) + "?z=" + getNextRequestNumber() ); - + builder.setHeader("Content-Type", "application/json"); builder.setHeader(ClientMessageBus.REMOTE_QUEUE_ID_HEADER, clientId); return builder; @@ -1343,7 +1343,7 @@ public void addError(String message, String additionalDetails, Throwable e) { } } } - + public int getNextRequestNumber() { if (requestNumber == Integer.MAX_VALUE) { requestNumber = 0; diff --git a/errai-bus/src/main/java/org/jboss/errai/bus/client/util/ErrorHelper.java b/errai-bus/src/main/java/org/jboss/errai/bus/client/util/ErrorHelper.java index 799db3fc4c..6a11335aee 100644 --- a/errai-bus/src/main/java/org/jboss/errai/bus/client/util/ErrorHelper.java +++ b/errai-bus/src/main/java/org/jboss/errai/bus/client/util/ErrorHelper.java @@ -154,7 +154,7 @@ public static void handleMessageDeliveryFailure(MessageBus bus, Message message, "\nexception: " + e + "\ndisconnect: " + disconnect; System.err.println(logMessage); - + try { if (message.getErrorCallback() != null) { if (!message.getErrorCallback().error(message, e)) { diff --git a/errai-bus/src/main/java/org/jboss/errai/bus/public/js/pagebus_2.0.js b/errai-bus/src/main/java/org/jboss/errai/bus/public/js/pagebus_2.0.js index e0075428cd..6ea63453f5 100644 --- a/errai-bus/src/main/java/org/jboss/errai/bus/public/js/pagebus_2.0.js +++ b/errai-bus/src/main/java/org/jboss/errai/bus/public/js/pagebus_2.0.js @@ -1872,16 +1872,16 @@ OpenAjax.hub.InlineHubClient.prototype.getParameters = function() { Copyright 2006-2009 OpenAjax Alliance - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and limitations under the License. */ @@ -3443,14 +3443,14 @@ smash._protocolID = "openajax-2.0"; //smash._initialClientURI = undefined; // For use by the smash provider loaded by a client. Should only be changed from the default value if the client does URI redirection at load time. Otherwise, we will assume that the current URI was also the initial URI //--- security token stuff --- -//configurable pseudo random number generator (prng) to use for generating the security token. -//If not set, we use Math.random. +//configurable pseudo random number generator (prng) to use for generating the security token. +//If not set, we use Math.random. //If set, the provided random number generator must support a function nextRandomB64Str(strlength:integer) //that returns a string of length strlength, where each character is a "modified Base64 for URL" character. //This includes A-Z, a-z, and 0-9 for the first 62 digits, like standard Base64 encoding, but //no padding '='. And the '+', '/' characters of standard Base64 are replaced by '-', '_'. smash._prng = undefined; -smash._securityTokenLength = 6; // configurable security token length. If default value is not used, both manager and clients have to change it to the same value. +smash._securityTokenLength = 6; // configurable security token length. If default value is not used, both manager and clients have to change it to the same value. smash._securityTokenOverhead = null; // the number of characters in a serialized message consumed by the security tokens smash._computeOtherTokenConstants = function() { smash._securityTokenOverhead = 2 * smash._securityTokenLength; @@ -4097,11 +4097,11 @@ smash.SECommMessage.CONNECT_ACK = "cac"; //DISCONNECT message smash.SECommMessage.DISCONNECT = "xcon"; smash.SECommMessage.DISCONNECT_ACK = "xac"; -//PUBLISH message: additionalHeader is {f:"S"} or {f:"J"} representing that the payload is a string or JSON, +//PUBLISH message: additionalHeader is {f:"S"} or {f:"J"} representing that the payload is a string or JSON, //topic and payload are topic, payload of message smash.SECommMessage.PUBLISH = "pub"; -//DISTRIBUTE message: additionalHeader is {f: string, s:[string, ...]} where f is defined as in the PUBLISH message, -//and s representing subIds that should receive this message; topic and payload are as in PUBLISH message +//DISTRIBUTE message: additionalHeader is {f: string, s:[string, ...]} where f is defined as in the PUBLISH message, +//and s representing subIds that should receive this message; topic and payload are as in PUBLISH message smash.SECommMessage.DISTRIBUTE = "dis"; //SUSCRIBE message: additionalHeader is {subId: string}, payload==null, topic is subscription topic smash.SECommMessage.SUBSCRIBE = "sub"; @@ -4414,7 +4414,7 @@ smash.SEComm = function() { } } -//Static array which contains the list of the currently loaded instances. The array is indexed by the url of the child component. +//Static array which contains the list of the currently loaded instances. The array is indexed by the url of the child component. smash.SEComm.instances = []; //----------------------------------------------------------------------------------------------- @@ -5032,7 +5032,7 @@ smash.CommLib = function(child, controllers, clientName) { // //- a message authentication code (MAC): HMAC-SHA-1 (RFC2104/2202) //BigEndianWord[5] <- smash.crypto.hmac_sha1( -// BigEndianWord[3-16] keyWA, +// BigEndianWord[3-16] keyWA, // Ascii or Unicode string dataS, // int chrsz (8 for Asci/16 for Unicode) // @@ -5043,7 +5043,7 @@ smash.CommLib = function(child, controllers, clientName) { //addSeed(String seed) //BigEndianWord[len] <- nextRandomOctets(int len) //Base64-String[len] <- nextRandomB64Str(int len) -//Note: HMAC-SHA1 in counter-mode does not provide forward-security on corruption. +//Note: HMAC-SHA1 in counter-mode does not provide forward-security on corruption. // However, the PRNG state is kept inside a closure. So if somebody can break the closure, he probably could // break a whole lot more and forward-security of the prng is not the highest of concerns anymore :-) diff --git a/errai-bus/src/main/java/org/jboss/errai/bus/rebind/RPCProxyGenerator.mv b/errai-bus/src/main/java/org/jboss/errai/bus/rebind/RPCProxyGenerator.mv index a1f486ea48..8f136b1b43 100644 --- a/errai-bus/src/main/java/org/jboss/errai/bus/rebind/RPCProxyGenerator.mv +++ b/errai-bus/src/main/java/org/jboss/errai/bus/rebind/RPCProxyGenerator.mv @@ -11,7 +11,7 @@ Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and -limitations under the License. +limitations under the License. } @code{ def box(cls) { org.mvel2.util.ParseTools.boxPrimitive(cls); } @@ -41,7 +41,7 @@ def pretty(cls) { public void setErrorCallback(org.jboss.errai.bus.client.api.ErrorCallback callback) { this.errorCallback = callback; } - + @foreach{method : interfaceClass.getMethods()} public @{method.getReturnType() == Void ? "void" : pretty(method.getReturnType())} @{method.getName()}(@code{count = 0;}@foreach{type : method.getParameterTypes()}@{type.getCanonicalName()} _@{count++}@end{", "}) { diff --git a/errai-bus/src/main/java/org/jboss/errai/bus/server/MessageQueueImpl.java b/errai-bus/src/main/java/org/jboss/errai/bus/server/MessageQueueImpl.java index 56376e1ac1..719af36fe9 100644 --- a/errai-bus/src/main/java/org/jboss/errai/bus/server/MessageQueueImpl.java +++ b/errai-bus/src/main/java/org/jboss/errai/bus/server/MessageQueueImpl.java @@ -51,7 +51,7 @@ public class MessageQueueImpl implements MessageQueue { * done in such large chunks. */ private static final int MAXIMUM_PAYLOAD_SIZE = 25; - + // private static final long DEFAULT_TRANSMISSION_WINDOW = millis(25); // private static final long MAX_TRANSMISSION_WINDOW = millis(100); diff --git a/errai-bus/src/main/java/org/jboss/errai/bus/server/async/scheduling/PooledExecutorService.java b/errai-bus/src/main/java/org/jboss/errai/bus/server/async/scheduling/PooledExecutorService.java index e4afc8941d..e63fc07946 100644 --- a/errai-bus/src/main/java/org/jboss/errai/bus/server/async/scheduling/PooledExecutorService.java +++ b/errai-bus/src/main/java/org/jboss/errai/bus/server/async/scheduling/PooledExecutorService.java @@ -52,7 +52,7 @@ public class PooledExecutorService implements TaskProvider { * Enumeration of possible ways of handling a queue full scenario. */ public enum SaturationPolicy { - + /** * Runs the task in the calling thread. */ @@ -62,7 +62,7 @@ void dealWith(Runnable task) { task.run(); } }, - + /** * Throws a RuntimeException when called. The exception message includes * {@code task.toString()}, so name your runnables if you'd like nice messages @@ -114,7 +114,7 @@ public void execute(final Runnable runnable) throws InterruptedException { if (!queue.offer(new SingleFireTask(runnable))) { saturationPolicy.dealWith(runnable); } - + // queue.add(new SingleFireTask(runnable)); } diff --git a/errai-bus/src/main/java/org/jboss/errai/bus/server/io/JSONEncoder.java b/errai-bus/src/main/java/org/jboss/errai/bus/server/io/JSONEncoder.java index da7adf35c8..9d2df941af 100644 --- a/errai-bus/src/main/java/org/jboss/errai/bus/server/io/JSONEncoder.java +++ b/errai-bus/src/main/java/org/jboss/errai/bus/server/io/JSONEncoder.java @@ -156,7 +156,7 @@ else if (first) { if (i == 0) { build.append(",").append(keyValue(encodeString(SerializationParts.INSTANTIATE_ONLY,ctx), "true")); } - + return build.append('}').toString(); } diff --git a/errai-bus/src/main/java/org/jboss/errai/bus/server/io/JSONStreamDecoder.java b/errai-bus/src/main/java/org/jboss/errai/bus/server/io/JSONStreamDecoder.java index cf052851ed..f1eb186864 100644 --- a/errai-bus/src/main/java/org/jboss/errai/bus/server/io/JSONStreamDecoder.java +++ b/errai-bus/src/main/java/org/jboss/errai/bus/server/io/JSONStreamDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright 2010 JBoss, a divison Red Hat, Inc. + * Copyright 2010 JBoss, a divison Red Hat, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/errai-bus/src/main/java/org/jboss/errai/bus/server/io/TypeDemarshallHelper.java b/errai-bus/src/main/java/org/jboss/errai/bus/server/io/TypeDemarshallHelper.java index 26666604b4..dedf71a2a7 100644 --- a/errai-bus/src/main/java/org/jboss/errai/bus/server/io/TypeDemarshallHelper.java +++ b/errai-bus/src/main/java/org/jboss/errai/bus/server/io/TypeDemarshallHelper.java @@ -61,7 +61,7 @@ public boolean canConvertFrom(Class aClass) { public static Object instantiate(Map oMap, DecodingContext ctx) { try { - + Class clazz = Thread.currentThread().getContextClassLoader().loadClass((String) oMap.get(SerializationParts.ENCODED_TYPE)); String objId = (String) oMap.get(SerializationParts.OBJECT_ID); @@ -78,10 +78,10 @@ else if (java.util.Date.class.isAssignableFrom(clazz)) { else if (java.sql.Date.class.isAssignableFrom(clazz)) { return new java.sql.Date(getNumeric(oMap.get("Value"))); } - + Object newInstance = clazz.newInstance(); if (objId != null) ctx.putObject(objId, newInstance); - + return newInstance; } @@ -127,7 +127,7 @@ else if (o instanceof Map) { Map oMap = (Map) o; if (oMap.containsKey(SerializationParts.ENCODED_TYPE)) { Object newInstance = instantiate(oMap, ctx); - + if (ctx.hasUnsatisfiedDependency(o)) { ctx.swapDepReference(o, newInstance); } diff --git a/errai-bus/src/main/java/org/jboss/errai/bus/server/service/ServiceProcessor.java b/errai-bus/src/main/java/org/jboss/errai/bus/server/service/ServiceProcessor.java index 199a7435d1..00fd26b8b1 100644 --- a/errai-bus/src/main/java/org/jboss/errai/bus/server/service/ServiceProcessor.java +++ b/errai-bus/src/main/java/org/jboss/errai/bus/server/service/ServiceProcessor.java @@ -161,7 +161,7 @@ protected void configure() { Map epts = new HashMap(); final Object targetService = svc; - + // we scan for endpoints for (final Method method : loadClass.getDeclaredMethods()) { if (method.isAnnotationPresent(Endpoint.class)) { @@ -255,7 +255,7 @@ public T getRemoteProxy(Class proxyType) { throw new RuntimeException("This API is not supported in the server-side environment."); } }; - + return svc; } } diff --git a/errai-bus/src/test/java/org/jboss/errai/bus/client/tests/BusCommunicationTests.java b/errai-bus/src/test/java/org/jboss/errai/bus/client/tests/BusCommunicationTests.java index bb422f9675..476c86db2a 100644 --- a/errai-bus/src/test/java/org/jboss/errai/bus/client/tests/BusCommunicationTests.java +++ b/errai-bus/src/test/java/org/jboss/errai/bus/client/tests/BusCommunicationTests.java @@ -58,7 +58,7 @@ public void callback(Message message) { } }); } - + public void testBasicRoundTripWithoutToSubjectCall() { runAfterInit(new Runnable() { public void run() { @@ -196,7 +196,7 @@ public void callback(Boolean response) { ++count; System.out.println("response (" + count + ")" + response); assertTrue(response); - assertEquals(3, count); + assertEquals(3, count); finishTest(); } }, TestRPCServiceRemote.class); @@ -207,10 +207,10 @@ public void callback(Boolean response) { } }); } - + private Throwable caught = null; private Message message = null; - + public void testRPCThrowingException() { runAfterInit(new Runnable() { public void run() { @@ -229,16 +229,16 @@ public boolean error(Message m, Throwable t) { TestRPCServiceRemote.class).exception(); } }); - + Timer t = new Timer() { @Override public void run() { assertNotNull("Message is null.", message); assertNotNull("Throwable is null.", caught); - + try { throw caught; - } + } catch(TestException e) { finishTest(); } diff --git a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/ArithmeticExpression.java b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/ArithmeticExpression.java index 0517369c21..20e4c085cf 100644 --- a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/ArithmeticExpression.java +++ b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/ArithmeticExpression.java @@ -17,10 +17,10 @@ package org.jboss.errai.codegen.framework; /** - * Represents an arithmetic expression. - * + * Represents an arithmetic expression. + * * @author Christian Sadilek */ public interface ArithmeticExpression extends Expression, Statement { - + } diff --git a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/ArithmeticOperator.java b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/ArithmeticOperator.java index 238fcdd902..45841cb7b5 100644 --- a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/ArithmeticOperator.java +++ b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/ArithmeticOperator.java @@ -27,7 +27,7 @@ public enum ArithmeticOperator implements Operator { Multiplication("*", 1, Number.class), Division("/", 1, Number.class), Remainder("%", 1, Number.class); - + private final Operator operator; ArithmeticOperator(String canonicalString, int operatorPrecedence, Class... constraints) { diff --git a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/BooleanExpression.java b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/BooleanExpression.java index 0198e5b0e3..7a798e2d36 100644 --- a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/BooleanExpression.java +++ b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/BooleanExpression.java @@ -17,11 +17,11 @@ package org.jboss.errai.codegen.framework; /** - * Represents a boolean expression. - * + * Represents a boolean expression. + * * @author Christian Sadilek */ public interface BooleanExpression extends Expression, Statement { - + public BooleanExpression negate(); } diff --git a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/Context.java b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/Context.java index 015ac4d50e..ca5441835c 100644 --- a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/Context.java +++ b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/Context.java @@ -215,7 +215,7 @@ public boolean isScoped(Variable variable) { while ((ctx = ctx.parent) != null); return false; } - + public boolean isNonAmbiguous(String symbol) { Context ctx = this; int matches = 0; diff --git a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/DefModifiers.java b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/DefModifiers.java index 2e2dec8bca..be22ea3919 100644 --- a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/DefModifiers.java +++ b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/DefModifiers.java @@ -22,7 +22,7 @@ public DefModifiers(Modifier... modifiers) { public static DefModifiers none() { return new DefModifiers(); } - + public DefModifiers addModifiers(Modifier... modifier) { modifiers.addAll(Arrays.asList(modifier)); return this; diff --git a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/DefParameters.java b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/DefParameters.java index 4e790d133c..21916ddbd9 100644 --- a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/DefParameters.java +++ b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/DefParameters.java @@ -42,7 +42,7 @@ public static DefParameters from(MetaMethod method) { } return new DefParameters(parameters); } - + public static DefParameters from(MetaMethod method, Parameter... mergeNames) { List parameters = new ArrayList(); diff --git a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/Expression.java b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/Expression.java index 17360d8201..aa598db7d1 100644 --- a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/Expression.java +++ b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/Expression.java @@ -17,24 +17,24 @@ package org.jboss.errai.codegen.framework; /** - * Represents an expression. The LHS can either be a {@link Statement} + * Represents an expression. The LHS can either be a {@link Statement} * or the generated {@link String} thereof. - * + * * @param the type of operator to be used for the expression. - * + * * @author Christian Sadilek */ public interface Expression extends Statement { - + public Statement getLhs(); public void setLhs(Statement lhs); - + public String getLhsExpr(); public void setLhsExpr(String lhsExpr); - + public Statement getRhs(); public void setRhs(Statement rhs); - + public T getOperator(); public void setOperator(T operator); } \ No newline at end of file diff --git a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/InnerClass.java b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/InnerClass.java index ca82ecb5ea..0e96c4dad8 100644 --- a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/InnerClass.java +++ b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/InnerClass.java @@ -21,23 +21,23 @@ /** * Represents an inner class. - * + * * @author Christian Sadilek */ public class InnerClass { private BuildMetaClass clazz = null; - + public InnerClass(BuildMetaClass clazz) { this.clazz = clazz; this.clazz.setInner(true); } - + public String generate(Context context) { clazz.setContext(Context.create(context)); return clazz.toJavaString(); } - + public MetaClass getType() { return clazz; } diff --git a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/Variable.java b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/Variable.java index ffb87502e4..096e611d2b 100644 --- a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/Variable.java +++ b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/Variable.java @@ -28,7 +28,7 @@ /** * This class represents a variable. - * + * * Note that initialization using {@link LiteralValue}s takes effect immediately, * initialization using {@ link Statement}s needs to be deferred to generation time. * @@ -51,7 +51,7 @@ private Variable(String name, MetaClass type) { private Variable(String name, MetaClass type, Object initialization) { this(name, type); - + LiteralValue val = LiteralFactory.isLiteral(initialization); if (val != null) { this.type = (type == null) ? val.getType() : type; @@ -66,7 +66,7 @@ private Variable(String name, MetaClass type, Object initialization) { public void initialize(Object initializationValue) { this.initialization = initializationValue; } - + private MetaClass inferType(Context context, Object initialization) { Statement initStatement = GenUtil.generate(context, initialization); MetaClass inferredType = (initStatement != null) ? initStatement.getType() : null; @@ -171,11 +171,11 @@ public Statement getValue() { return value; } - + public boolean isFinal() { return isFinal; } - + private String hashString; private String hashString() { diff --git a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/VariableReference.java b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/VariableReference.java index c118b24e02..cdeb9c9c00 100644 --- a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/VariableReference.java +++ b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/VariableReference.java @@ -18,7 +18,7 @@ /** * {@link Statement} thats represents a reference to a {@link Variable}. - * + * * @author Mike Brock * @author Christian Sadilek */ @@ -36,7 +36,7 @@ public String generate(Context context) { public Statement[] getIndexes() { return indexes; } - + public void setIndexes(Statement[] indexes) { this.indexes = indexes; } diff --git a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/CaseBlockBuilder.java b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/CaseBlockBuilder.java index ae826cc608..268a8bf4c2 100644 --- a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/CaseBlockBuilder.java +++ b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/CaseBlockBuilder.java @@ -32,7 +32,7 @@ public interface CaseBlockBuilder extends Statement, Builder { BlockBuilder case_(short value); BlockBuilder case_(char value); BlockBuilder case_(Enum value); - + BlockBuilder case_(IntValue value); BlockBuilder case_(ByteValue value); BlockBuilder case_(ShortValue value); diff --git a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/ClassDefinitionBuilderAbstractOption.java b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/ClassDefinitionBuilderAbstractOption.java index 299ca776cc..7c71ac0f3d 100644 --- a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/ClassDefinitionBuilderAbstractOption.java +++ b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/ClassDefinitionBuilderAbstractOption.java @@ -21,6 +21,6 @@ */ public interface ClassDefinitionBuilderAbstractOption> extends ClassDefinitionBuilderInterfaces { - + public ClassDefinitionBuilderInterfaces abstractClass(); } diff --git a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/ContextualIfBlockBuilder.java b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/ContextualIfBlockBuilder.java index ea81b8ab87..117610c160 100644 --- a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/ContextualIfBlockBuilder.java +++ b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/ContextualIfBlockBuilder.java @@ -26,6 +26,6 @@ public interface ContextualIfBlockBuilder extends Statement, Builder { BlockBuilder if_(); BlockBuilder if_(BooleanOperator op, Statement rhs); BlockBuilder if_(BooleanOperator op, Object rhs); - + BlockBuilder ifNot(); } diff --git a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/ContextualLoopBuilder.java b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/ContextualLoopBuilder.java index 3d5e9055b8..c52655c72a 100644 --- a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/ContextualLoopBuilder.java +++ b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/ContextualLoopBuilder.java @@ -29,9 +29,9 @@ public interface ContextualLoopBuilder extends Statement, Builder { public BlockBuilder for_(Statement initializer, BooleanExpression condition); public BlockBuilder for_(Statement initializer, BooleanExpression condition, Statement countingExpression); - + public BlockBuilder do_(); - + public BlockBuilder while_(); public BlockBuilder while_(BooleanOperator op, Statement rhs); public BlockBuilder while_(BooleanOperator op, Object rhs); diff --git a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/StatementBegin.java b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/StatementBegin.java index 9b2aa3ffea..f5c31b6f7d 100644 --- a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/StatementBegin.java +++ b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/StatementBegin.java @@ -53,15 +53,15 @@ public interface StatementBegin extends ArrayBuilder, LoopBuilder, IfBlockBuilde public ObjectBuilder newObject(Class type); public ObjectBuilder newObject(MetaClass type); public ObjectBuilder newObject(TypeLiteral type); - + public StatementEnd throw_(Class throwableType, Object... parameters); public StatementEnd throw_(String exceptionVarName); - + public StatementEnd label(String label); - + public StatementEnd break_(); public StatementEnd break_(String label); - + public StatementEnd continue_(); public StatementEnd continue_(String label); } \ No newline at end of file diff --git a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/callstack/AssignVariable.java b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/callstack/AssignVariable.java index 5d377ba66b..06e7316a9f 100644 --- a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/callstack/AssignVariable.java +++ b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/callstack/AssignVariable.java @@ -26,7 +26,7 @@ /** * {@link CallElement} to assign a value to a variable. - * + * * @author Christian Sadilek */ public class AssignVariable extends AbstractCallElement { @@ -44,9 +44,9 @@ public void handleCall(CallWriter writer, Context context, Statement statement) final Statement stmt = new AssignmentBuilder(false, operator, (VariableReference) statement, GenUtil.generate(context, value)); - + Statement wrapperStmt; - + if (next == null) { wrapperStmt = new Statement() { @Override diff --git a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/callstack/BranchCallElement.java b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/callstack/BranchCallElement.java index 5e71ebc8ed..c99332b764 100644 --- a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/callstack/BranchCallElement.java +++ b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/callstack/BranchCallElement.java @@ -25,11 +25,11 @@ */ public class BranchCallElement extends AbstractCallElement { private AbstractBranchStatement branchStatement; - + public BranchCallElement(AbstractBranchStatement branchStatement) { this.branchStatement = branchStatement; } - + @Override public void handleCall(CallWriter writer, Context context, Statement statement) { writer.append(branchStatement.generate(context)); diff --git a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/callstack/ConditionalBlockCallElement.java b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/callstack/ConditionalBlockCallElement.java index e457162420..f1b16c98ff 100644 --- a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/callstack/ConditionalBlockCallElement.java +++ b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/callstack/ConditionalBlockCallElement.java @@ -23,12 +23,12 @@ /** * A {@link CallElement} for conditional blocks. It can only be the last * element in a chain of calls. - * + * * @author Christian Sadilek */ public class ConditionalBlockCallElement extends AbstractCallElement { private AbstractConditionalBlock conditionalBlock; - + public ConditionalBlockCallElement(final AbstractConditionalBlock conditionalBlock) { this.conditionalBlock = conditionalBlock; } diff --git a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/callstack/DeclareVariable.java b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/callstack/DeclareVariable.java index 000f462105..e0fed57f0b 100644 --- a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/callstack/DeclareVariable.java +++ b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/callstack/DeclareVariable.java @@ -38,7 +38,7 @@ public void handleCall(CallWriter writer, Context context, Statement statement) if (next == null) { writer.append(";"); } - + nextOrReturn(writer, context, null); } diff --git a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/callstack/DeferredCallElement.java b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/callstack/DeferredCallElement.java index 24c078668b..75b068ca5d 100644 --- a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/callstack/DeferredCallElement.java +++ b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/callstack/DeferredCallElement.java @@ -22,7 +22,7 @@ /** * An element for deferring and offloading validation and generation work for building the * call stack. - * + * * @author Mike Brock */ public class DeferredCallElement extends AbstractCallElement { diff --git a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/callstack/DefineLabel.java b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/callstack/DefineLabel.java index 28ab150c14..705aaa3b6d 100644 --- a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/callstack/DefineLabel.java +++ b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/callstack/DefineLabel.java @@ -24,18 +24,18 @@ * @author Christian Sadilek */ public class DefineLabel extends AbstractCallElement { - + private String name; - + public DefineLabel(String name) { this.name = name; } - + @Override public void handleCall(CallWriter writer, Context context, Statement statement) { Label label = Label.create(name); context.addLabel(label); - + writer.reset(); writer.append(label.generate(context)); } diff --git a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/callstack/LoadClassReference.java b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/callstack/LoadClassReference.java index ece211511b..813488464f 100644 --- a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/callstack/LoadClassReference.java +++ b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/callstack/LoadClassReference.java @@ -57,7 +57,7 @@ public MetaClass getType() { return metaClass; } } - + public static String getClassReference(MetaType metaClass, Context context) { return getClassReference(metaClass, context, false); } @@ -103,13 +103,13 @@ else if (metaClass instanceof MetaTypeVariable) { return buf.toString(); } - private static String getClassReferencesForParameterizedTypes(MetaParameterizedType parameterizedType, + private static String getClassReferencesForParameterizedTypes(MetaParameterizedType parameterizedType, Context context) { StringBuilder buf = new StringBuilder(); if (parameterizedType != null && parameterizedType.getTypeParameters().length != 0) { buf.append("<"); - + for (int i = 0; i < parameterizedType.getTypeParameters().length; i++) { MetaType typeParameter = parameterizedType.getTypeParameters()[i]; @@ -121,7 +121,7 @@ private static String getClassReferencesForParameterizedTypes(MetaParameterizedT else { buf.append(getClassReference(typeParameter, context)); } - + if (i + 1 < parameterizedType.getTypeParameters().length) buf.append(", "); } diff --git a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/callstack/LoadField.java b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/callstack/LoadField.java index 276e28a2a2..36809e4c39 100644 --- a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/callstack/LoadField.java +++ b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/callstack/LoadField.java @@ -41,7 +41,7 @@ public void handleCall(final CallWriter writer, final Context context, Statement if (fieldName.equals("this")) { // TODO this is a workaround to access the enclosing instance of a type field = new BuildMetaField(null, null, Scope.Private, statement.getType(), "this"); - } + } else { field = statement.getType().getField(fieldName); } diff --git a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/callstack/LoadNested.java b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/callstack/LoadNested.java index 74ef024b4e..9b84ad5415 100644 --- a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/callstack/LoadNested.java +++ b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/callstack/LoadNested.java @@ -63,10 +63,10 @@ private static boolean isIdentifierOnly(String s) { for (int i = 0; i < s.length(); i++) { if (!Character.isJavaIdentifierPart(s.charAt(0))) return false; } - + return true; } - + @Override public void handleCall(CallWriter writer, Context context, Statement statement) { nextOrReturn(writer, context, this.statement); diff --git a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/callstack/LoadVariable.java b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/callstack/LoadVariable.java index f34e953fa9..a0e907ef79 100644 --- a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/callstack/LoadVariable.java +++ b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/callstack/LoadVariable.java @@ -77,7 +77,7 @@ public Statement getValue() { public String generate(Context context) { StringBuilder buf = new StringBuilder((classMember && !context.isNonAmbiguous(ref.getName()) ? "this." : "") + getName()); - + for (Statement s : idx) { buf.append('[').append(s.generate(context)).append(']'); } @@ -88,7 +88,7 @@ public String generate(Context context) { @Override public MetaClass getType() { MetaClass ret; - + int dims = GenUtil.getArrayDimensions(ref.getType()); if (ref.getType().isArray() && idx.length > 0) { @@ -103,7 +103,7 @@ public MetaClass getType() { else { ret = ref.getType(); } - + return ret; } }; diff --git a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/callstack/MethodCall.java b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/callstack/MethodCall.java index 7f8099b73e..49c1f200ba 100644 --- a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/callstack/MethodCall.java +++ b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/callstack/MethodCall.java @@ -55,7 +55,7 @@ public void handleCall(CallWriter writer, Context context, Statement statement) CallParameters callParams = fromStatements(GenUtil.generateCallParameters(context, parameters)); statement.generate(context); - + MetaClass callType = statement.getType(); MetaClass[] parameterTypes = callParams.getParameterTypes(); @@ -75,7 +75,7 @@ public void handleCall(CallWriter writer, Context context, Statement statement) callParams = fromStatements(GenUtil.generateCallParameters(method, context, parameters)); statement = new MethodInvocation(method, callParams); - + resultType = statement.getType(); nextOrReturn(writer, context, statement); diff --git a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/callstack/ThrowException.java b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/callstack/ThrowException.java index 11aa26da6f..cd16b68c43 100644 --- a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/callstack/ThrowException.java +++ b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/callstack/ThrowException.java @@ -28,7 +28,7 @@ */ public class ThrowException extends AbstractCallElement { private String exceptionVariableName; - + private Class throwableType; private Object[] parameters; diff --git a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/impl/AnonymousClassStructureBuilderImpl.java b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/impl/AnonymousClassStructureBuilderImpl.java index 686fcb9cd8..b541dcfe44 100644 --- a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/impl/AnonymousClassStructureBuilderImpl.java +++ b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/impl/AnonymousClassStructureBuilderImpl.java @@ -45,7 +45,7 @@ public class AnonymousClassStructureBuilderImpl private BuildCallback callback; private List callables = new ArrayList(); private Context context; - + AnonymousClassStructureBuilderImpl(MetaClass clazz, BuildCallback builderBuildCallback) { super(clazz.getFullyQualifiedName(), clazz, builderBuildCallback.getParentContext()); this.callback = builderBuildCallback; diff --git a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/impl/ArithmeticExpressionBuilder.java b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/impl/ArithmeticExpressionBuilder.java index 09ad6c1cef..5a19befc98 100644 --- a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/impl/ArithmeticExpressionBuilder.java +++ b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/impl/ArithmeticExpressionBuilder.java @@ -40,7 +40,7 @@ public ArithmeticExpressionBuilder(Statement lhs, Statement rhs, ArithmeticOpera public ArithmeticExpressionBuilder(Object lhs, Object rhs, ArithmeticOperator operator) { super(lhs, rhs, operator); } - + public static ArithmeticExpression create(Statement lhs) { return new ArithmeticExpressionBuilder(lhs, null, null); } diff --git a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/impl/AssignmentBuilder.java b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/impl/AssignmentBuilder.java index 3002266054..64041111ec 100644 --- a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/impl/AssignmentBuilder.java +++ b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/impl/AssignmentBuilder.java @@ -25,7 +25,7 @@ /** * {@link StatementBuilder} that generates {@link VariableReference} assignments. - * + * * @author Mike Brock * @author Christian Sadilek */ @@ -53,7 +53,7 @@ public String generate(Context context) { if (!referenceType.isArray()) throw new InvalidTypeException("Variable is not a " + indexes.length + "-dimensional array!"); referenceType = referenceType.getComponentType(); - } + } } operator.assertCanBeApplied(referenceType); operator.assertCanBeApplied(statement.getType()); @@ -64,7 +64,7 @@ public String generate(Context context) { private String generateIndexes(Context context, Statement[] indexes) { if (indexes==null || indexes.length == 0) return ""; - + StringBuilder buf = new StringBuilder(); for (Statement index : indexes) { buf.append("[").append(index.generate(context)).append("]"); diff --git a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/impl/BlockBuilderImpl.java b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/impl/BlockBuilderImpl.java index 369a9de17d..0a17147f71 100644 --- a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/impl/BlockBuilderImpl.java +++ b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/impl/BlockBuilderImpl.java @@ -67,7 +67,7 @@ public MetaClass getType() { }); return this; } - + @Override public T finish() { if (callback != null) { diff --git a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/impl/BooleanExpressionBuilder.java b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/impl/BooleanExpressionBuilder.java index f28c6ab437..622dc3a0b3 100644 --- a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/impl/BooleanExpressionBuilder.java +++ b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/impl/BooleanExpressionBuilder.java @@ -45,7 +45,7 @@ public BooleanExpressionBuilder(Statement lhs, Statement rhs, BooleanOperator op public BooleanExpressionBuilder(Object lhs, Object rhs, BooleanOperator operator) { super(lhs, rhs, operator); } - + public static BooleanExpression create(Statement lhs) { return new BooleanExpressionBuilder(lhs, null, null); } @@ -70,7 +70,7 @@ public String generate(Context context) { if (negated) { return UnaryOperator.Complement.getCanonicalString() + "(" + expr + ")"; } - + return expr; } diff --git a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/impl/ClassBuilderAbstractMethodOption.java b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/impl/ClassBuilderAbstractMethodOption.java index b033da6072..35b0e25a3d 100644 --- a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/impl/ClassBuilderAbstractMethodOption.java +++ b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/impl/ClassBuilderAbstractMethodOption.java @@ -31,7 +31,7 @@ /** * @author Christian Sadilek */ -public class ClassBuilderAbstractMethodOption extends ClassBuilder +public class ClassBuilderAbstractMethodOption extends ClassBuilder implements ClassStructureBuilderAbstractMethodOption { ClassBuilderAbstractMethodOption(ClassBuilder that, Context context) { diff --git a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/impl/ConstructorBlockBuilderImpl.java b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/impl/ConstructorBlockBuilderImpl.java index 6c81c4e9d0..468a7fe0e9 100644 --- a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/impl/ConstructorBlockBuilderImpl.java +++ b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/impl/ConstructorBlockBuilderImpl.java @@ -50,7 +50,7 @@ public BlockBuilder callSuper(final Object... parameters) { append(new AbstractStatement() { @Override public String generate(Context context) { - return "super" + + return "super" + CallParameters.fromStatements(GenUtil.generateCallParameters(context, parameters)).generate(context); } }); @@ -63,7 +63,7 @@ public BlockBuilder callThis(final Object... parameters) { append(new AbstractStatement() { @Override public String generate(Context context) { - return "this" + + return "this" + CallParameters.fromStatements(GenUtil.generateCallParameters(context, parameters)).generate(context); } }); diff --git a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/impl/ContextualStatementBuilderImpl.java b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/impl/ContextualStatementBuilderImpl.java index e46948ccdb..3b83f693e3 100644 --- a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/impl/ContextualStatementBuilderImpl.java +++ b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/impl/ContextualStatementBuilderImpl.java @@ -151,10 +151,10 @@ public StatementEnd assignValue(AssignmentOperator operator, Object statement) { appendCallElement(new AssignVariable(operator, statement)); return this; } - + @Override public String toString() { return "[Statement:" + callElementBuilder + "]"; - + } } \ No newline at end of file diff --git a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/impl/ExpressionBuilder.java b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/impl/ExpressionBuilder.java index 5ee3674ba4..e4b59fc88a 100644 --- a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/impl/ExpressionBuilder.java +++ b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/impl/ExpressionBuilder.java @@ -30,13 +30,13 @@ public abstract class ExpressionBuilder implements Statement, Expression { protected Statement lhs; protected String lhsExpr; - + protected Statement rhs; protected String rhsExpr; - + protected T operator; protected String operExpr; - + public ExpressionBuilder() {} public ExpressionBuilder(Statement rhs, T operator) { @@ -53,7 +53,7 @@ public ExpressionBuilder(String lhsExpr, Statement rhs, T operator) { this(rhs, operator); this.lhsExpr = lhsExpr; } - + public ExpressionBuilder(Object lhs, Object rhs, T operator) { this.lhs = (!(lhs instanceof Statement)) ? LiteralFactory.getLiteral(lhs) : (Statement) lhs; this.rhs = (!(rhs instanceof Statement)) ? LiteralFactory.getLiteral(rhs) : (Statement) rhs; @@ -68,10 +68,10 @@ public String generate(Context context) { if (rhs != null) operator.assertCanBeApplied(GenUtil.generate(context, rhs).getType()); } - + operExpr = ""; rhsExpr = ""; - + if (lhsExpr == null && lhs != null) { if (lhs instanceof ExpressionBuilder && this.operator != null) { lhsExpr = "(" + lhs.generate(context) + ")"; @@ -126,7 +126,7 @@ public Statement getRhs() { public void setRhs(Statement rhs) { this.rhs = rhs; } - + @Override public T getOperator() { return operator; diff --git a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/impl/IfBlockBuilderImpl.java b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/impl/IfBlockBuilderImpl.java index d22a3bac02..49052eec57 100644 --- a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/impl/IfBlockBuilderImpl.java +++ b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/impl/IfBlockBuilderImpl.java @@ -33,12 +33,12 @@ /** * StatementBuilder to generate if blocks. - * + * * @author Christian Sadilek */ public class IfBlockBuilderImpl extends AbstractStatementBuilder implements ContextualIfBlockBuilder, IfBlockBuilder, ElseBlockBuilder { - + private IfBlock ifBlock; protected IfBlockBuilderImpl(Context context, CallElementBuilder callElementBuilder) { @@ -59,7 +59,7 @@ public BlockBuilder if_() { public BlockBuilder ifNot() { return if_(new BooleanExpressionBuilder().negate()); } - + @Override public BlockBuilder if_(BooleanOperator op, Statement rhs) { if (rhs == null) diff --git a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/impl/LoopBuilderImpl.java b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/impl/LoopBuilderImpl.java index d1ba6e96ce..fb287dc803 100644 --- a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/impl/LoopBuilderImpl.java +++ b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/impl/LoopBuilderImpl.java @@ -44,7 +44,7 @@ /** * StatementBuilder to generate loops. - * + * * @author Christian Sadilek */ public class LoopBuilderImpl extends AbstractStatementBuilder implements ContextualLoopBuilder, LoopBuilder { @@ -162,7 +162,7 @@ public BlockBuilder for_(Statement initializer, BooleanExpression @Override public BlockBuilder for_(final Statement initializer, final BooleanExpression condition, final Statement countingExpression) { - + final BlockStatement body = new BlockStatement(); appendCallElement(new ConditionalBlockCallElement(new ForLoop(condition, body, initializer, countingExpression))); return createLoopBody(body); diff --git a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/impl/MethodBlockBuilderImpl.java b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/impl/MethodBlockBuilderImpl.java index c2029b2573..396d838d55 100644 --- a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/impl/MethodBlockBuilderImpl.java +++ b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/impl/MethodBlockBuilderImpl.java @@ -117,7 +117,7 @@ else if (o instanceof TypeLiteral) { p.add(MetaClassFactory.get((TypeLiteral) o)); } } - + defParameters = DefParameters.fromTypeArray(p.toArray(new MetaClass[p.size()])); return this; diff --git a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/impl/MethodBuilderAbstractOption.java b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/impl/MethodBuilderAbstractOption.java index 377f091b34..b8d17afb1b 100644 --- a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/impl/MethodBuilderAbstractOption.java +++ b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/impl/MethodBuilderAbstractOption.java @@ -33,7 +33,7 @@ public class MethodBuilderAbstractOption implements Finishable { public MethodBuilderAbstractOption(MethodBuildCallback callback) { this.callback = callback; } - + public T throws_(Class... exceptionTypes) { throwsDeclaration = ThrowsDeclaration.of(exceptionTypes); return callback.callback(null, null, new DefModifiers(Modifier.Abstract), throwsDeclaration); @@ -43,7 +43,7 @@ public T throws_(MetaClass... exceptions) { throwsDeclaration = ThrowsDeclaration.of(exceptions); return callback.callback(null, null, new DefModifiers(Modifier.Abstract), throwsDeclaration); } - + @Override public T finish() { if (callback != null) { diff --git a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/impl/SwitchBlockBuilderImpl.java b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/impl/SwitchBlockBuilderImpl.java index e2a6e8d632..d01d26b7c4 100644 --- a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/impl/SwitchBlockBuilderImpl.java +++ b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/impl/SwitchBlockBuilderImpl.java @@ -37,12 +37,12 @@ /** * StatementBuilder to generate switch blocks. - * + * * @author Christian Sadilek */ public class SwitchBlockBuilderImpl extends AbstractStatementBuilder implements SwitchBlockBuilder, ContextualSwitchBlockBuilder, CaseBlockBuilder { - + private SwitchBlock switchBlock; protected SwitchBlockBuilderImpl(Context context, CallElementBuilder callElementBuilder) { @@ -53,7 +53,7 @@ protected SwitchBlockBuilderImpl(Context context, CallElementBuilder callElement public CaseBlockBuilder switch_() { return switch_(new SwitchBlock()); } - + @Override public CaseBlockBuilder switch_(Statement statement) { return switch_(new SwitchBlock(statement)); @@ -75,7 +75,7 @@ public void doDeferred(CallWriter writer, Context context, Statement statement) return this; } - + @Override public BlockBuilder case_(IntValue value) { switchBlock.addCase(value); @@ -93,7 +93,7 @@ public BlockBuilder case_(CharValue value) { switchBlock.addCase(value); return caseBlock(value); } - + @Override public BlockBuilder case_(char value) { CharValue val = (CharValue) LiteralFactory.getLiteral(value); @@ -105,7 +105,7 @@ public BlockBuilder case_(ByteValue value) { switchBlock.addCase(value); return caseBlock(value); } - + @Override public BlockBuilder case_(byte value) { ByteValue val = (ByteValue) LiteralFactory.getLiteral(value); @@ -135,7 +135,7 @@ public BlockBuilder case_(Enum value) { LiteralValue> val = (LiteralValue>) LiteralFactory.getLiteral(value); return case_(val); } - + private BlockBuilder caseBlock(LiteralValue value) { return new BlockBuilderImpl(switchBlock.getCaseBlock(value), new BuildCallback() { diff --git a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/impl/TryBlockBuilderImpl.java b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/impl/TryBlockBuilderImpl.java index 8f8831ec28..487584a321 100644 --- a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/impl/TryBlockBuilderImpl.java +++ b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/builder/impl/TryBlockBuilderImpl.java @@ -33,7 +33,7 @@ /** * StatementBuilder to generate try/catch/finally blocks. - * + * * @author Christian Sadilek */ public class TryBlockBuilderImpl extends AbstractStatementBuilder implements TryBlockBuilder, CatchBlockBuilder { diff --git a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/control/ForLoop.java b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/control/ForLoop.java index 488705e542..ab4834aef9 100644 --- a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/control/ForLoop.java +++ b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/control/ForLoop.java @@ -50,10 +50,10 @@ public String generate(Context context) { context.addVariable((Variable) initializer); } } - + if (!builder.toString().endsWith(";")) builder.append(";"); - + builder.append(" ").append(getCondition().generate(context)).append("; "); if (afterBlock != null) { diff --git a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/control/SwitchBlock.java b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/control/SwitchBlock.java index d07a7f2811..c9cf65af63 100644 --- a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/control/SwitchBlock.java +++ b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/control/SwitchBlock.java @@ -122,7 +122,7 @@ private void checkSwitchExprType() { } } if (!validType) - throw new InvalidTypeException("Type not permitted in switch statements:" + + throw new InvalidTypeException("Type not permitted in switch statements:" + switchExprStmt.getType().getFullyQualifiedName()); } } \ No newline at end of file diff --git a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/control/TryBlock.java b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/control/TryBlock.java index 58c0f749f4..2442f56b6b 100644 --- a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/control/TryBlock.java +++ b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/control/TryBlock.java @@ -39,7 +39,7 @@ public BlockStatement getBlock() { public void addCatchBlock(Variable exception) { catchBlocks.put(exception, new BlockStatement()); } - + public BlockStatement getCatchBlock(Variable exceptionVar) { return catchBlocks.get(exceptionVar); } @@ -47,7 +47,7 @@ public BlockStatement getCatchBlock(Variable exceptionVar) { public BlockStatement getFinallyBlock() { if (finallyBlock == null) finallyBlock = new BlockStatement(); - + return finallyBlock; } diff --git a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/control/branch/BreakStatement.java b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/control/branch/BreakStatement.java index b0d01916ef..933ae233a7 100644 --- a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/control/branch/BreakStatement.java +++ b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/control/branch/BreakStatement.java @@ -24,7 +24,7 @@ public class BreakStatement extends AbstractBranchStatement { public BreakStatement() {} - + public BreakStatement(String label) { super(label); } @@ -32,5 +32,5 @@ public BreakStatement(String label) { @Override public String generate(Context context) { return "break" + generateLabelReference(context); - } + } } \ No newline at end of file diff --git a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/control/branch/ContinueStatement.java b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/control/branch/ContinueStatement.java index 89da452069..1f5a2ecc53 100644 --- a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/control/branch/ContinueStatement.java +++ b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/control/branch/ContinueStatement.java @@ -24,7 +24,7 @@ public class ContinueStatement extends AbstractBranchStatement { public ContinueStatement() {} - + public ContinueStatement(String label) { super(label); } diff --git a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/control/branch/Label.java b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/control/branch/Label.java index 5ab2faa423..9b5206a352 100644 --- a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/control/branch/Label.java +++ b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/control/branch/Label.java @@ -28,7 +28,7 @@ public class Label extends AbstractStatement { public static Label create(String name) { return new Label(name); } - + private Label(String name) { this.name = name; } @@ -36,12 +36,12 @@ private Label(String name) { public String getName() { return name; } - + @Override public String generate(Context context) { return name+":"; } - + public LabelReference getReference() { return new LabelReference(name); } diff --git a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/literal/ArrayLiteral.java b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/literal/ArrayLiteral.java index ecb8284dae..9cb4313b36 100644 --- a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/literal/ArrayLiteral.java +++ b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/literal/ArrayLiteral.java @@ -38,7 +38,7 @@ public class ArrayLiteral extends LiteralValue { private Class arrayType; private MetaClass mArrayType; - + public ArrayLiteral(Object value) { super(value); @@ -50,14 +50,14 @@ public ArrayLiteral(Object value) { } this.dimensions = dim; - + if (MetaClass.class.isAssignableFrom(type)) { type = Class.class; } else if (MetaType.class.isAssignableFrom(type)) { type = Type.class; } - + this.arrayType = type; mArrayType = MetaClassFactory.get(arrayType).asArrayOf(dim); diff --git a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/literal/ClassLiteral.java b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/literal/ClassLiteral.java index 4ae9f6f140..75ed7817da 100644 --- a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/literal/ClassLiteral.java +++ b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/literal/ClassLiteral.java @@ -26,7 +26,7 @@ * @author Mike Brock */ public class ClassLiteral extends LiteralValue> { - + public ClassLiteral(Class value) { super(value); } @@ -39,12 +39,12 @@ public String getCanonicalString(Context context) { return getClassReference(MetaClassFactory.get(getValue()), context) + ".class"; } } - + @Override public MetaClass getType() { return MetaClassFactory.get(Class.class); } - + public MetaClass getActualType() { return super.getType(); } diff --git a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/literal/LiteralFactory.java b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/literal/LiteralFactory.java index bfd29062a0..6fa29f819c 100644 --- a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/literal/LiteralFactory.java +++ b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/literal/LiteralFactory.java @@ -28,7 +28,7 @@ /** * The literal factory provides a LiteralValue for the specified object (if possible). - * + * * @author Mike Brock */ public class LiteralFactory { diff --git a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/literal/LiteralValue.java b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/literal/LiteralValue.java index f1734e68a6..ecc62aac5c 100644 --- a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/literal/LiteralValue.java +++ b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/literal/LiteralValue.java @@ -28,7 +28,7 @@ public abstract class LiteralValue implements Statement { private T value; protected Class clazz; - + public abstract String getCanonicalString(Context context); protected LiteralValue(T value) { diff --git a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/meta/MetaClass.java b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/meta/MetaClass.java index bd5f8da446..5a6aa61616 100644 --- a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/meta/MetaClass.java +++ b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/meta/MetaClass.java @@ -85,7 +85,7 @@ public abstract class MetaClass implements HasAnnotations, MetaType, MetaGeneric public abstract MetaClass getSuperClass(); public abstract MetaClass getComponentType(); - + public abstract MetaClass getOuterComponentType(); public abstract boolean isAssignableFrom(MetaClass clazz); @@ -127,7 +127,7 @@ public abstract class MetaClass implements HasAnnotations, MetaType, MetaGeneric public abstract MetaClass asBoxed(); public abstract MetaClass asUnboxed(); - + public abstract MetaClass asArrayOf(int dimensions); public abstract MetaClass getErased(); diff --git a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/meta/MetaClassMember.java b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/meta/MetaClassMember.java index ca5cef3592..d9bb285fc9 100644 --- a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/meta/MetaClassMember.java +++ b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/meta/MetaClassMember.java @@ -37,9 +37,9 @@ public interface MetaClassMember extends HasAnnotations { public abstract boolean isTransient(); public abstract boolean isSynthetic(); - + public abstract boolean isVolatile(); public abstract boolean isSynchronized(); - + } diff --git a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/meta/MetaField.java b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/meta/MetaField.java index 654ef4eda2..429d008ce8 100644 --- a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/meta/MetaField.java +++ b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/meta/MetaField.java @@ -35,7 +35,7 @@ public String toString() { public int hashCode() { return toString().hashCode(); } - + public static class ArrayLengthMetaField extends MetaField { private MetaClass componentType; @@ -129,6 +129,6 @@ public A getAnnotation(Class annotation) { return null; } } - - + + } diff --git a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/meta/impl/AbstractMetaClass.java b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/meta/impl/AbstractMetaClass.java index 3cac3848de..eaa417c3fb 100644 --- a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/meta/impl/AbstractMetaClass.java +++ b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/meta/impl/AbstractMetaClass.java @@ -402,7 +402,7 @@ public boolean equals(Object o) { public int hashCode() { return hashString().hashCode(); } - + private volatile transient Class asClassCache; @Override @@ -410,7 +410,7 @@ public Class asClass() { if (asClassCache != null) { return asClassCache; } - + Class cls = null; if (enclosedMetaObject instanceof Class) { diff --git a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/meta/impl/build/BuildMetaConstructor.java b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/meta/impl/build/BuildMetaConstructor.java index 6fb70f33e8..e9c3c2852f 100644 --- a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/meta/impl/build/BuildMetaConstructor.java +++ b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/meta/impl/build/BuildMetaConstructor.java @@ -64,7 +64,7 @@ public BuildMetaConstructor(BuildMetaClass declaringClass, Statement body, DefPa this.body = body; this.defParameters = defParameters; } - + public BuildMetaConstructor(BuildMetaClass declaringClass, Statement body, Scope scope, DefParameters defParameters) { this.context = Context.create(declaringClass.getContext()); this.declaringClass = declaringClass; diff --git a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/meta/impl/build/BuildMetaMethod.java b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/meta/impl/build/BuildMetaMethod.java index b76a184d08..705091d69e 100644 --- a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/meta/impl/build/BuildMetaMethod.java +++ b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/meta/impl/build/BuildMetaMethod.java @@ -58,7 +58,7 @@ public class BuildMetaMethod extends MetaMethod implements Builder { private ThrowsDeclaration throwsDeclaration; private MetaMethod reifiedFormOf; - + public BuildMetaMethod(BuildMetaClass declaringClass, Statement body, Scope scope, @@ -229,7 +229,7 @@ public void setDefParameters(DefParameters defParameters) { public void setThrowsDeclaration(ThrowsDeclaration throwsDeclaration) { this.throwsDeclaration = throwsDeclaration; } - + public boolean isReifiedForm() { return reifiedFormOf != null; } @@ -245,7 +245,7 @@ public void setReifiedFormOf(MetaMethod reifiedFormOf) { @Override public String toJavaString() { this.context = Context.create(declaringClass.getContext()); - + for (Parameter p : defParameters.getParameters()) { context.addVariable(Variable.create(p.getName(), p.getType())); } diff --git a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/util/Bool.java b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/util/Bool.java index bd4e84de88..a8eab5c9eb 100644 --- a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/util/Bool.java +++ b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/util/Bool.java @@ -38,47 +38,47 @@ public static BooleanExpression expr(BooleanOperator operator, Object rhs) { public static BooleanExpression expr(Statement lhs) { return BooleanExpressionBuilder.create(lhs); } - + public static BooleanExpression equals(Object lhs, Object rhs) { return BooleanExpressionBuilder.create(lhs, BooleanOperator.Equals, rhs); } - + public static BooleanExpression notEquals(Object lhs, Object rhs) { return BooleanExpressionBuilder.create(lhs, BooleanOperator.NotEquals, rhs); } - + public static BooleanExpression or(Object lhs, Object rhs) { return BooleanExpressionBuilder.create(lhs, BooleanOperator.Or, rhs); } - + public static BooleanExpression and(Object lhs, Object rhs) { return BooleanExpressionBuilder.create(lhs, BooleanOperator.And, rhs); } - + public static BooleanExpression instanceOf(Object lhs, Object rhs) { return BooleanExpressionBuilder.create(lhs, BooleanOperator.InstanceOf, rhs); } - + public static BooleanExpression greaterThanOrEqual(Object lhs, Object rhs) { return BooleanExpressionBuilder.create(lhs, BooleanOperator.GreaterThanOrEqual, rhs); } - + public static BooleanExpression greaterThan(Object lhs, Object rhs) { return BooleanExpressionBuilder.create(lhs, BooleanOperator.GreaterThan, rhs); } - + public static BooleanExpression lessThanOrEqual(Object lhs, Object rhs) { return BooleanExpressionBuilder.create(lhs, BooleanOperator.LessThanOrEqual, rhs); } - + public static BooleanExpression lessThan(Object lhs, Object rhs) { return BooleanExpressionBuilder.create(lhs, BooleanOperator.LessThan, rhs); } - + public static BooleanExpression isNotNull(Object test) { return Bool.notEquals(test, null); } - + public static BooleanExpression isNull(Object test) { return Bool.equals(test, null); } diff --git a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/util/EmptyStatement.java b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/util/EmptyStatement.java index c0c4409f1c..949876d5db 100644 --- a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/util/EmptyStatement.java +++ b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/util/EmptyStatement.java @@ -7,10 +7,10 @@ /** * @author Mike Brock - */ + */ public class EmptyStatement implements Statement { public static final Statement INSTANCE = new EmptyStatement(); - + @Override public String generate(Context context) { throw new RuntimeException("empty statement cannot be generated"); diff --git a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/util/Implementations.java b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/util/Implementations.java index 73bb521cfe..04f07f5182 100644 --- a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/util/Implementations.java +++ b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/util/Implementations.java @@ -22,34 +22,34 @@ public static ClassStructureBuilder implement(Class clazz) { .implementsInterface(clazz) .body(); } - + public static ClassStructureBuilder implement(Class clazz, String implClassName) { return ClassBuilder.define(clazz.getPackage().getName() + "." + implClassName) .publicScope() .implementsInterface(clazz) .body(); } - + public static ClassStructureBuilder implement(Class clazz, String implPackageName, String implClassName) { return ClassBuilder.define(implPackageName+ "." + implClassName) .publicScope() .implementsInterface(clazz) .body(); } - - - + + + public static void autoInitializedField(ClassStructureBuilder builder, MetaClass type, String name, Class implementation) { autoInitializedField(builder, type, name, MetaClassFactory.get(implementation)); } - + public static void autoInitializedField(ClassStructureBuilder builder, MetaClass type, String name, MetaClass implementation) { implementation = MetaClassFactory.parameterizedAs(implementation, type.getParameterizedType()); - + builder.privateField(name, type) .initializesWith(Stmt.newObject(implementation)).finish(); } @@ -57,7 +57,7 @@ public static void autoInitializedField(ClassStructureBuilder builder, MetaCl public static StringBuilderBuilder newStringBuilder() { final ContextualStatementBuilder statementBuilder = Stmt.nestedCall(Stmt.newObject(StringBuilder.class)); - + return new StringBuilderBuilder() { @Override @@ -77,16 +77,16 @@ public MetaClass getType() { } }; } - - + + public static interface StringBuilderBuilder extends Statement { public StringBuilderBuilder append(Object statement); } - + public static BlockBuilder autoForLoop(String varName, Statement value) { return Stmt.for_(Stmt.declareVariable(int.class).named("i").initializeWith(0), Bool.lessThan(Variable.get("i"), value), new StringStatement(varName + "++")); } - + } diff --git a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/util/Stmt.java b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/util/Stmt.java index 54ae31637d..751b43f1ae 100644 --- a/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/util/Stmt.java +++ b/errai-codegen/src/main/java/org/jboss/errai/codegen/framework/util/Stmt.java @@ -44,7 +44,7 @@ public class Stmt { public static StatementBegin create() { return StatementBuilder.create(); } - + public static StatementBegin create(Context ctx) { return StatementBuilder.create(ctx); } diff --git a/errai-codegen/src/test/java/org/jboss/errai/codegen/framework/tests/ClassBuilderTest.java b/errai-codegen/src/test/java/org/jboss/errai/codegen/framework/tests/ClassBuilderTest.java index dd7677e9f0..c2312f4f8d 100644 --- a/errai-codegen/src/test/java/org/jboss/errai/codegen/framework/tests/ClassBuilderTest.java +++ b/errai-codegen/src/test/java/org/jboss/errai/codegen/framework/tests/ClassBuilderTest.java @@ -35,7 +35,7 @@ /** * Tests the {@link ClassBuilder} API. - * + * * @author Mike Brock * @author Christian Sadilek */ diff --git a/errai-codegen/src/test/java/org/jboss/errai/codegen/framework/tests/ContextBuilderTest.java b/errai-codegen/src/test/java/org/jboss/errai/codegen/framework/tests/ContextBuilderTest.java index da79f0920b..e97e575c77 100644 --- a/errai-codegen/src/test/java/org/jboss/errai/codegen/framework/tests/ContextBuilderTest.java +++ b/errai-codegen/src/test/java/org/jboss/errai/codegen/framework/tests/ContextBuilderTest.java @@ -38,7 +38,7 @@ /** * Tests the {@link org.jboss.errai.codegen.framework.builder.impl.ContextBuilder} API. - * + * * @author Christian Sadilek */ public class ContextBuilderTest extends AbstractStatementBuilderTest { @@ -49,7 +49,7 @@ public void testDeclareVariableWithExactTypeProvided() { .declareVariable("n", Integer.class) .initializeWith(10) .toJavaString(); - + assertEquals("failed to generate variable declaration using a literal initialization", "Integer n = 10;", declaration); } @@ -60,11 +60,11 @@ public void testDeclareVariableWithTypeLiteral() { .declareVariable("list", new TypeLiteral>() {}) .finish() .toJavaString(); - + assertEquals("failed to generate variable declaration using a type literal", "List list;", declaration); } - + @Test public void testDeclareVariableWithIntegerTypeInference() { String declaration = ContextBuilder.create() @@ -222,7 +222,7 @@ public void testAddVariableWithObjectInitializationWithExactTypeProvided() { VariableReference str = ctx.getVariable("str"); assertEquals("Wrong variable name", "str", str.getName()); Assert.assertEquals("Wrong variable type", MetaClassFactory.get(String.class), str.getType()); - + // variable value cannot be verified before initialization statement was generated. Variable v = ctx.getVariables().get("str"); v.generate(ctx); @@ -235,7 +235,7 @@ public void testAddVariableWithObjectInitializationWithStringTypeInference() { VariableReference str = ctx.getVariable("str"); assertEquals("Wrong variable name", "str", str.getName()); - + // variable type and value cannot be verified before initialization statement was generated. Variable v = ctx.getVariables().get("str"); v.generate(ctx); diff --git a/errai-codegen/src/test/java/org/jboss/errai/codegen/framework/tests/IfBlockBuilderTest.java b/errai-codegen/src/test/java/org/jboss/errai/codegen/framework/tests/IfBlockBuilderTest.java index c01c25db6e..47ec7f95ff 100644 --- a/errai-codegen/src/test/java/org/jboss/errai/codegen/framework/tests/IfBlockBuilderTest.java +++ b/errai-codegen/src/test/java/org/jboss/errai/codegen/framework/tests/IfBlockBuilderTest.java @@ -36,7 +36,7 @@ /** * Tests the generation of if blocks using the {@link StatementBuilder} API. - * + * * @author Christian Sadilek */ public class IfBlockBuilderTest extends AbstractStatementBuilderTest implements IfBlockBuilderTestResult { @@ -317,11 +317,11 @@ public void testIfBlockUnchainedWithNestedExpressions() { String s = Stmt.create(ctx) .if_(Bool.expr( - Bool.expr("foo", BooleanOperator.Equals, "bar"), + Bool.expr("foo", BooleanOperator.Equals, "bar"), BooleanOperator.Or, Bool.expr( - Bool.expr("cat", BooleanOperator.Equals, "dog"), - BooleanOperator.And, + Bool.expr("cat", BooleanOperator.Equals, "dog"), + BooleanOperator.And, Bool.expr("girl", BooleanOperator.NotEquals, "boy")))) .finish() .elseif_(Bool.expr(Stmt.loadVariable("a"), BooleanOperator.And, Stmt.loadVariable("b"))) diff --git a/errai-codegen/src/test/java/org/jboss/errai/codegen/framework/tests/InvocationBuilderTest.java b/errai-codegen/src/test/java/org/jboss/errai/codegen/framework/tests/InvocationBuilderTest.java index 280fc0d8d5..f70a84dd75 100644 --- a/errai-codegen/src/test/java/org/jboss/errai/codegen/framework/tests/InvocationBuilderTest.java +++ b/errai-codegen/src/test/java/org/jboss/errai/codegen/framework/tests/InvocationBuilderTest.java @@ -38,7 +38,7 @@ /** * Tests the generation of method invocations using the {@link StatementBuilder} API. - * + * * @author Christian Sadilek */ public class InvocationBuilderTest extends AbstractStatementBuilderTest { @@ -271,7 +271,7 @@ public void testInvokeWithVariableReturnType() { StatementBuilder.create().invokeStatic(Foo.class, "foo", Variable.get("s"))) .toJavaString(); - assertEquals("Failed to generate method invocation using variable return type", + assertEquals("Failed to generate method invocation using variable return type", "String str = Foo.foo(s);", s); } @@ -300,10 +300,10 @@ public void testInvokeWithParameterizedListAndVariableReturnType() { StatementBuilder.create().invokeStatic(Foo.class, "bar", Variable.get("list"))) .toJavaString(); - assertEquals("Failed to generate method invocation with variable return type inferred from List", + assertEquals("Failed to generate method invocation with variable return type inferred from List", "String str = Foo.bar(list);", s); } - + @Test public void testInvokeWithNestedParameterizedListAndVariableReturnType() { String s = @@ -327,7 +327,7 @@ public void testInvokeWithParameterizedMapAndVariableReturnType() { StatementBuilder.create().invokeStatic(Foo.class, "bar", Variable.get("map"))) .toJavaString(); - assertEquals("Failed to generate method invocation with variable return type inferred from Map", + assertEquals("Failed to generate method invocation with variable return type inferred from Map", "Integer val = Foo.bar(map);", s); } @@ -339,7 +339,7 @@ public void testInvokeWithParameterizedClassAndVariableReturnType() { StatementBuilder.create().invokeStatic(Foo.class, "baz", Set.class)) .toJavaString(); - assertEquals("Failed to generate method invocation with variable return type inferred from Class", + assertEquals("Failed to generate method invocation with variable return type inferred from Class", "Set set = Foo.baz(Set.class);", s); } } \ No newline at end of file diff --git a/errai-codegen/src/test/java/org/jboss/errai/codegen/framework/tests/LoopBuilderTest.java b/errai-codegen/src/test/java/org/jboss/errai/codegen/framework/tests/LoopBuilderTest.java index 02cbe6a892..a33e20392e 100644 --- a/errai-codegen/src/test/java/org/jboss/errai/codegen/framework/tests/LoopBuilderTest.java +++ b/errai-codegen/src/test/java/org/jboss/errai/codegen/framework/tests/LoopBuilderTest.java @@ -42,7 +42,7 @@ /** * Tests the generation of loops using the {@link StatementBuilder} API. - * + * * @author Christian Sadilek */ public class LoopBuilderTest extends AbstractStatementBuilderTest implements LoopBuilderTestResult { diff --git a/errai-codegen/src/test/java/org/jboss/errai/codegen/framework/tests/LoopBuilderTestResult.java b/errai-codegen/src/test/java/org/jboss/errai/codegen/framework/tests/LoopBuilderTestResult.java index c75f826a3f..7c2894f8c1 100644 --- a/errai-codegen/src/test/java/org/jboss/errai/codegen/framework/tests/LoopBuilderTestResult.java +++ b/errai-codegen/src/test/java/org/jboss/errai/codegen/framework/tests/LoopBuilderTestResult.java @@ -18,7 +18,7 @@ /** * Expected test results for the {@link LoopBuilderTest} - * + * * @author Christian Sadilek */ public interface LoopBuilderTestResult { diff --git a/errai-codegen/src/test/java/org/jboss/errai/codegen/framework/tests/StatementBuilderTest.java b/errai-codegen/src/test/java/org/jboss/errai/codegen/framework/tests/StatementBuilderTest.java index d4e5fccf5b..b1c2788487 100644 --- a/errai-codegen/src/test/java/org/jboss/errai/codegen/framework/tests/StatementBuilderTest.java +++ b/errai-codegen/src/test/java/org/jboss/errai/codegen/framework/tests/StatementBuilderTest.java @@ -47,7 +47,7 @@ /** * Tests the {@link StatementBuilder} API. - * + * * @author Christian Sadilek */ public class StatementBuilderTest extends AbstractStatementBuilderTest { @@ -116,7 +116,7 @@ public void testDeclareVariableWithImplicitTypeConversion() { assertTrue(ive.getCause() instanceof NumberFormatException); } } - + @Test public void testDeclareVariableWithObjectInitializationWithExactTypeProvided() { Context ctx = Context.create(); @@ -144,7 +144,7 @@ public void testDeclareVariableWithObjectInitializationWithStringTypeInference() assertEquals("Wrong variable name", "str", str.getName()); Assert.assertEquals("Wrong variable type", MetaClassFactory.get(String.class), str.getType()); } - + @Test public void testDeclareVariableWithStatementInitialization() { Context ctx = Context.create(); @@ -504,22 +504,22 @@ public void testAssignField() { String s = Stmt.create(Context.create().autoImport()).nestedCall( Stmt.newObject(Foo.class)).loadField("bar").loadField("name").assignValue("test").toJavaString(); - assertEquals("failed to generate nested field assignment", + assertEquals("failed to generate nested field assignment", "new Foo().bar.name = \"test\";", s); } - + @Test public void testCastDown() { Statement stmt = Cast.to(String.class, Stmt.declareVariable("obj", Object.class).loadVariable("obj")); assertEquals("failed to generate cast", "(String) obj", stmt.generate(Context.create())); } - + @Test public void testCastUp() { Statement stmt = Cast.to(Object.class, Stmt.declareVariable("str", String.class).loadVariable("str")); assertEquals("created a redundant cast", "str", stmt.generate(Context.create())); } - + @Test public void testInvalidCast() { try { diff --git a/errai-codegen/src/test/java/org/jboss/errai/codegen/framework/tests/SwitchBlockBuilderTest.java b/errai-codegen/src/test/java/org/jboss/errai/codegen/framework/tests/SwitchBlockBuilderTest.java index 30141ec58a..90382b3198 100644 --- a/errai-codegen/src/test/java/org/jboss/errai/codegen/framework/tests/SwitchBlockBuilderTest.java +++ b/errai-codegen/src/test/java/org/jboss/errai/codegen/framework/tests/SwitchBlockBuilderTest.java @@ -26,7 +26,7 @@ /** * Tests the generation of switch blocks using the {@link StatementBuilder} API. - * + * * @author Christian Sadilek */ public class SwitchBlockBuilderTest extends AbstractStatementBuilderTest implements SwitchBlockBuilderTestResult { @@ -131,7 +131,7 @@ public void testSwitchBlockOnEnum() { assertEquals("Failed to generate enum switch block", SWITCH_BLOCK_ENUM, s); } - + @Test public void testSwitchBlockWithoutDefaultBlock() { String s = StatementBuilder.create() @@ -166,7 +166,7 @@ public void testSwitchBlockWithFallThrough() { assertEquals("Failed to generate int switch block with fallthrough", SWITCH_BLOCK_INT_FALLTHROUGH, s); } - + @Test public void testSwitchBlockChained() { String s = StatementBuilder.create() @@ -188,7 +188,7 @@ public void testSwitchBlockChained() { assertEquals("Failed to generate chained switch block", SWITCH_BLOCK_INT, s); } - + @Test public void testSwitchBlockChainedOnChar() { String s = StatementBuilder.create() @@ -206,10 +206,10 @@ public void testSwitchBlockChainedOnChar() { .append(Stmt.break_()) .finish() .toJavaString(); - + assertEquals("Failed to generate char switch block", SWITCH_BLOCK_CHAR_CHAINED, s); } - + @Test public void testSwitchBlockChainedOnInvocation() { String s = StatementBuilder.create() @@ -229,7 +229,7 @@ public void testSwitchBlockChainedOnInvocation() { .append(Stmt.break_()) .finish() .toJavaString(); - + assertEquals("Failed to generate switch block chained on invocation", SWITCH_BLOCK_CHAINED_INVOCATION, s); } } \ No newline at end of file diff --git a/errai-codegen/src/test/java/org/jboss/errai/codegen/framework/tests/SwitchBlockBuilderTestResult.java b/errai-codegen/src/test/java/org/jboss/errai/codegen/framework/tests/SwitchBlockBuilderTestResult.java index d57cb3a1db..b2abd4da3d 100644 --- a/errai-codegen/src/test/java/org/jboss/errai/codegen/framework/tests/SwitchBlockBuilderTestResult.java +++ b/errai-codegen/src/test/java/org/jboss/errai/codegen/framework/tests/SwitchBlockBuilderTestResult.java @@ -57,7 +57,7 @@ public interface SwitchBlockBuilderTestResult { " case 1: break;" + " default: break;" + " } "; - + public static final String SWITCH_BLOCK_CHAR_CHAINED = " switch (c) {\n" + " case 'a': System.out.println(\"a\"); break;" + diff --git a/errai-codegen/src/test/java/org/jboss/errai/codegen/framework/tests/TryBlockBuilderTest.java b/errai-codegen/src/test/java/org/jboss/errai/codegen/framework/tests/TryBlockBuilderTest.java index 10a12fcd49..97e13a50d4 100644 --- a/errai-codegen/src/test/java/org/jboss/errai/codegen/framework/tests/TryBlockBuilderTest.java +++ b/errai-codegen/src/test/java/org/jboss/errai/codegen/framework/tests/TryBlockBuilderTest.java @@ -23,7 +23,7 @@ /** * Tests the generation of try/catch/finally blocks using the {@link StatementBuilder} API. - * + * * @author Christian Sadilek */ public class TryBlockBuilderTest extends AbstractStatementBuilderTest implements TryBlockBuilderTestResult { @@ -37,7 +37,7 @@ public void testEmptyTryBlock() { assertEquals("Failed to generate empty try catch block", EMPTY_TRY_FINALLY_BLOCK, s); } - + @Test public void testTryFinallyBlock() { String s = StatementBuilder.create() @@ -49,7 +49,7 @@ public void testTryFinallyBlock() { assertEquals("Failed to generate empty try finally block", EMPTY_TRY_FINALLY_BLOCK, s); } - + @Test public void testTryCatchBlock() { String s = StatementBuilder.create() @@ -61,7 +61,7 @@ public void testTryCatchBlock() { assertEquals("Failed to generate empty try catch block", EMPTY_TRY_CATCH_BLOCK, s); } - + @Test public void testTryCatchFinallyBlockEmpty() { String s = StatementBuilder.create() @@ -75,7 +75,7 @@ public void testTryCatchFinallyBlockEmpty() { assertEquals("Failed to generate empty try catch finally block", EMPTY_TRY_CATCH_FINALLY_BLOCK, s); } - + @Test public void testTryMultipleCatchFinallyBlock() { String s = StatementBuilder.create() @@ -91,7 +91,7 @@ public void testTryMultipleCatchFinallyBlock() { assertEquals("Failed to generate empty try catch finally block", EMPTY_TRY_MULTIPLE_CATCH_FINALLY_BLOCK, s); } - + @Test public void testTryCatchFinallyBlock() { String s = StatementBuilder.create() diff --git a/errai-codegen/src/test/java/org/jboss/errai/codegen/framework/tests/TryBlockBuilderTestResult.java b/errai-codegen/src/test/java/org/jboss/errai/codegen/framework/tests/TryBlockBuilderTestResult.java index bc38594e95..d688b355de 100644 --- a/errai-codegen/src/test/java/org/jboss/errai/codegen/framework/tests/TryBlockBuilderTestResult.java +++ b/errai-codegen/src/test/java/org/jboss/errai/codegen/framework/tests/TryBlockBuilderTestResult.java @@ -50,7 +50,7 @@ public interface TryBlockBuilderTestResult { " }\n" + " finally {\n" + " }\n"; - + public static final String TRY_CATCH_FINALLY_BLOCK = " try {\n" + " throw new Exception();" + @@ -59,6 +59,6 @@ public interface TryBlockBuilderTestResult { " throw new RuntimeException(e);" + " }\n" + " finally {\n" + - " return 0;" + + " return 0;" + " }\n"; } \ No newline at end of file diff --git a/errai-codegen/src/test/java/org/jboss/errai/codegen/framework/tests/meta/MetaClassTest.java b/errai-codegen/src/test/java/org/jboss/errai/codegen/framework/tests/meta/MetaClassTest.java index ba7adec7ab..6a5656c2c1 100644 --- a/errai-codegen/src/test/java/org/jboss/errai/codegen/framework/tests/meta/MetaClassTest.java +++ b/errai-codegen/src/test/java/org/jboss/errai/codegen/framework/tests/meta/MetaClassTest.java @@ -23,7 +23,7 @@ /** * Epic team effort! - * + * * @author Christian Sadilek * @author Jonathan Fuerth * @author Mike Brock @@ -36,21 +36,21 @@ public void testInternalNameForOneDimensionalPrimitiveArray() { assertEquals("Wrong internal name generated for one-dimensional primitive array", "[C", internalName); } - + @Test public void testInternalNameForOneDimensionalObjectArray() { String internalName = MetaClassFactory.get(String[].class).getInternalName(); assertEquals("Wrong internal name generated for one-dimensional object array", "[Ljava/lang/String;", internalName); } - + @Test public void testInternalNameForMultiDimensionalPrimitiveArray() { String internalName = MetaClassFactory.get(char[][].class).getInternalName(); assertEquals("Wrong internal name generated for multidimensional primitive array", "[[C", internalName); } - + @Test public void testInternalNameForMultiDimensionalObjectArray() { String internalName = MetaClassFactory.get(String[][].class).getInternalName(); diff --git a/errai-codegen/src/test/java/org/jboss/errai/codegen/framework/tests/model/Bar.java b/errai-codegen/src/test/java/org/jboss/errai/codegen/framework/tests/model/Bar.java index 370ec31786..e17e4f5d25 100644 --- a/errai-codegen/src/test/java/org/jboss/errai/codegen/framework/tests/model/Bar.java +++ b/errai-codegen/src/test/java/org/jboss/errai/codegen/framework/tests/model/Bar.java @@ -5,8 +5,8 @@ */ public abstract class Bar { protected String name; - + public void setName(String name) { - + } } diff --git a/errai-codegen/src/test/java/org/jboss/errai/codegen/framework/tests/model/Foo.java b/errai-codegen/src/test/java/org/jboss/errai/codegen/framework/tests/model/Foo.java index 7c03c78c2f..7ded7e864b 100644 --- a/errai-codegen/src/test/java/org/jboss/errai/codegen/framework/tests/model/Foo.java +++ b/errai-codegen/src/test/java/org/jboss/errai/codegen/framework/tests/model/Foo.java @@ -9,11 +9,11 @@ */ public class Foo { public Bar bar; - + public static T foo(T t) { return t; } - + public static T bar(List list) { return list.get(0); } @@ -25,7 +25,7 @@ public static T bar(int n, List>> list) { public static V bar(Map map) { return map.get(null); } - + public static T baz(Class list) { return null; } diff --git a/errai-common/src/main/java/org/jboss/errai/common/client/api/annotations/ExposeEntity.java b/errai-common/src/main/java/org/jboss/errai/common/client/api/annotations/ExposeEntity.java index b676626c9f..3fbeb9ecee 100644 --- a/errai-common/src/main/java/org/jboss/errai/common/client/api/annotations/ExposeEntity.java +++ b/errai-common/src/main/java/org/jboss/errai/common/client/api/annotations/ExposeEntity.java @@ -27,7 +27,7 @@ *

* Note that this annotation has been renamed to {@link Portable}. Use the new * name instead. - * + * * @deprecated This annotation has been renamed to {@link Portable}. * @since Errai 2.0 * @author Mike Brock diff --git a/errai-common/src/main/java/org/jboss/errai/common/client/api/annotations/Portable.java b/errai-common/src/main/java/org/jboss/errai/common/client/api/annotations/Portable.java index 9918a88ab5..276518c6dd 100644 --- a/errai-common/src/main/java/org/jboss/errai/common/client/api/annotations/Portable.java +++ b/errai-common/src/main/java/org/jboss/errai/common/client/api/annotations/Portable.java @@ -11,7 +11,7 @@ *

* This annotation supersedes and has the same meaning as the older * {@link ExposeEntity} annotation. - * + * * @since Errai 2.0 * @author Mike Brock */ diff --git a/errai-common/src/main/java/org/jboss/errai/common/client/types/EncodingContext.java b/errai-common/src/main/java/org/jboss/errai/common/client/types/EncodingContext.java index 23f465416f..fad75d2b9c 100644 --- a/errai-common/src/main/java/org/jboss/errai/common/client/types/EncodingContext.java +++ b/errai-common/src/main/java/org/jboss/errai/common/client/types/EncodingContext.java @@ -9,7 +9,7 @@ /** * @author Mike Brock */ -public class EncodingContext { +public class EncodingContext { private HashMap refs; private int escapeMode; @@ -17,7 +17,7 @@ public boolean isEncoded(Object o) { return !(o instanceof String || o instanceof Number || o instanceof Boolean || o instanceof Character) && (refs != null && refs.containsKey(o)); } - + public String markRef(Object o) { if (o instanceof String || o instanceof Number || o instanceof Boolean || o instanceof Character) return null; if (refs == null) { diff --git a/errai-ioc/pom.xml b/errai-ioc/pom.xml index c242688898..0d8d8ef028 100644 --- a/errai-ioc/pom.xml +++ b/errai-ioc/pom.xml @@ -1,10 +1,10 @@ - diff --git a/errai-ioc/src/main/java/org/jboss/errai/ioc/rebind/IOCGenerator.java b/errai-ioc/src/main/java/org/jboss/errai/ioc/rebind/IOCGenerator.java index 70d960515c..59b371bef3 100644 --- a/errai-ioc/src/main/java/org/jboss/errai/ioc/rebind/IOCGenerator.java +++ b/errai-ioc/src/main/java/org/jboss/errai/ioc/rebind/IOCGenerator.java @@ -85,7 +85,7 @@ public String generate(TreeLogger logger, GeneratorContext context, String typeN logger.log(TreeLogger.INFO, "will scan in package: " + modulePackage); } } - catch (Exception e) { + catch (Exception e) { throw new RuntimeException("could not determine module package", e); // could not determine package. } diff --git a/errai-ioc/src/main/java/org/jboss/errai/ioc/rebind/IOCProcessorFactory.java b/errai-ioc/src/main/java/org/jboss/errai/ioc/rebind/IOCProcessorFactory.java index af5e5aff4c..aad232ce33 100644 --- a/errai-ioc/src/main/java/org/jboss/errai/ioc/rebind/IOCProcessorFactory.java +++ b/errai-ioc/src/main/java/org/jboss/errai/ioc/rebind/IOCProcessorFactory.java @@ -176,7 +176,7 @@ public boolean processAll() { if (iter.next().processAllDelegates()) { iter.remove(); } - } + } catch (InjectionFailure f) { // We are ignoring this Exception and keep retrying. The problem should go away after // all the other dependencies have been processed. diff --git a/errai-ioc/src/main/java/org/jboss/errai/ioc/rebind/ioc/ContextualProviderInjector.java b/errai-ioc/src/main/java/org/jboss/errai/ioc/rebind/ioc/ContextualProviderInjector.java index 948088706c..e79373e8b5 100644 --- a/errai-ioc/src/main/java/org/jboss/errai/ioc/rebind/ioc/ContextualProviderInjector.java +++ b/errai-ioc/src/main/java/org/jboss/errai/ioc/rebind/ioc/ContextualProviderInjector.java @@ -87,12 +87,12 @@ public Statement getType(InjectionContext injectContext, InjectableInstance inje else { MetaType[] typeArgs = pType.getTypeParameters(); MetaClass[] typeArgsClasses = new MetaClass[typeArgs.length]; - + for (int i = 0; i < typeArgs.length; i++) { typeArgsClasses[i] = (MetaClass) typeArgs[i]; } - - + + Annotation[] qualifiers = injectableInstance.getQualifiers(); if (providerInjector.getInjectedType().isAssignableTo(Provider.class)) { diff --git a/errai-ioc/src/main/java/org/jboss/errai/ioc/rebind/ioc/exception/UnsatisfiedDependencies.java b/errai-ioc/src/main/java/org/jboss/errai/ioc/rebind/ioc/exception/UnsatisfiedDependencies.java index 3b9a44eda7..b5fde27ae0 100644 --- a/errai-ioc/src/main/java/org/jboss/errai/ioc/rebind/ioc/exception/UnsatisfiedDependencies.java +++ b/errai-ioc/src/main/java/org/jboss/errai/ioc/rebind/ioc/exception/UnsatisfiedDependencies.java @@ -31,7 +31,7 @@ public void addUnsatisfiedDependency(UnsatisfiedDependency dependency) { unsatisfiedDependencies.add(dependency); } - + @Override public String toString() { StringBuilder buf = new StringBuilder(); @@ -40,7 +40,7 @@ public String toString() { } return buf.toString(); } - + public List get() { return unsatisfiedDependencies; } diff --git a/errai-ioc/src/main/java/org/jboss/errai/ioc/rebind/ioc/exception/UnsatisfiedDependenciesException.java b/errai-ioc/src/main/java/org/jboss/errai/ioc/rebind/ioc/exception/UnsatisfiedDependenciesException.java index 46c1d30038..dd9d48a3f2 100644 --- a/errai-ioc/src/main/java/org/jboss/errai/ioc/rebind/ioc/exception/UnsatisfiedDependenciesException.java +++ b/errai-ioc/src/main/java/org/jboss/errai/ioc/rebind/ioc/exception/UnsatisfiedDependenciesException.java @@ -23,14 +23,14 @@ */ public class UnsatisfiedDependenciesException extends RuntimeException { private static final long serialVersionUID = 1L; - + private UnsatisfiedDependencies unsatisfiedDependencies; - + public UnsatisfiedDependenciesException(UnsatisfiedDependencies unsatisfiedDependencies) { super(unsatisfiedDependencies.toString()); this.unsatisfiedDependencies = unsatisfiedDependencies; - } - + } + public List getUnsatisfiedDependencies() { return unsatisfiedDependencies.get(); } diff --git a/errai-ioc/src/main/java/org/jboss/errai/ioc/rebind/ioc/exception/UnsatisfiedDependency.java b/errai-ioc/src/main/java/org/jboss/errai/ioc/rebind/ioc/exception/UnsatisfiedDependency.java index 76cde61fe4..28863db3db 100644 --- a/errai-ioc/src/main/java/org/jboss/errai/ioc/rebind/ioc/exception/UnsatisfiedDependency.java +++ b/errai-ioc/src/main/java/org/jboss/errai/ioc/rebind/ioc/exception/UnsatisfiedDependency.java @@ -24,7 +24,7 @@ public abstract class UnsatisfiedDependency { private MetaClass enclosingType; protected MetaClass injectedType; - + public UnsatisfiedDependency(MetaClass enclosingType, MetaClass injectedType) { this.enclosingType = enclosingType; this.injectedType = injectedType; diff --git a/errai-ioc/src/main/java/org/jboss/errai/ioc/rebind/ioc/exception/UnsatisfiedField.java b/errai-ioc/src/main/java/org/jboss/errai/ioc/rebind/ioc/exception/UnsatisfiedField.java index 4d169a08c4..fa3e2d5ab6 100644 --- a/errai-ioc/src/main/java/org/jboss/errai/ioc/rebind/ioc/exception/UnsatisfiedField.java +++ b/errai-ioc/src/main/java/org/jboss/errai/ioc/rebind/ioc/exception/UnsatisfiedField.java @@ -25,12 +25,12 @@ public class UnsatisfiedField extends UnsatisfiedDependency { private MetaField field; - + public UnsatisfiedField(MetaField field, MetaClass enclosingType, MetaClass injectedType) { super(enclosingType, injectedType); this.field = field; } - + @Override public String toString() { StringBuilder sbuf = new StringBuilder(); @@ -39,7 +39,7 @@ public String toString() { .append(" could not be satisfied for type: ").append(injectedType.getFullyQualifiedName()).append("\n"); return sbuf.toString(); } - + public MetaField getField() { return field; } diff --git a/errai-ioc/src/main/java/org/jboss/errai/ioc/rebind/ioc/exception/UnsatisfiedMethod.java b/errai-ioc/src/main/java/org/jboss/errai/ioc/rebind/ioc/exception/UnsatisfiedMethod.java index e11ddc92f7..829e6eb463 100644 --- a/errai-ioc/src/main/java/org/jboss/errai/ioc/rebind/ioc/exception/UnsatisfiedMethod.java +++ b/errai-ioc/src/main/java/org/jboss/errai/ioc/rebind/ioc/exception/UnsatisfiedMethod.java @@ -25,12 +25,12 @@ public class UnsatisfiedMethod extends UnsatisfiedDependency { private MetaMethod method; - + public UnsatisfiedMethod(MetaMethod method, MetaClass enclosingType, MetaClass injectedType) { super(enclosingType, injectedType); this.method = method; } - + @Override public String toString() { StringBuilder sbuf = new StringBuilder(); diff --git a/errai-ioc/src/test/java/org/jboss/errai/ioc/tests/client/res/GenericServiceClass.java b/errai-ioc/src/test/java/org/jboss/errai/ioc/tests/client/res/GenericServiceClass.java index b836e7e309..aa39bf8338 100644 --- a/errai-ioc/src/test/java/org/jboss/errai/ioc/tests/client/res/GenericServiceClass.java +++ b/errai-ioc/src/test/java/org/jboss/errai/ioc/tests/client/res/GenericServiceClass.java @@ -1,7 +1,7 @@ package org.jboss.errai.ioc.tests.client.res; /** - * + * * @author Christian Sadilek * @param */ diff --git a/errai-ioc/src/test/java/org/jboss/errai/ioc/tests/client/res/HappyInspector.java b/errai-ioc/src/test/java/org/jboss/errai/ioc/tests/client/res/HappyInspector.java index f9a66288a0..8bc3ea1ccf 100644 --- a/errai-ioc/src/test/java/org/jboss/errai/ioc/tests/client/res/HappyInspector.java +++ b/errai-ioc/src/test/java/org/jboss/errai/ioc/tests/client/res/HappyInspector.java @@ -18,7 +18,7 @@ public class HappyInspector { @Inject private GenericService stringService; - + @Inject private GenericServiceClassForLong longService; @@ -38,7 +38,7 @@ public GenericService getIntegerService() { public GenericService getStringService() { return stringService; } - + public GenericServiceClassForLong getLongService() { return longService; } diff --git a/errai-marshalling/src/main/java/org/jboss/errai/marshalling/client/api/MarshallingSession.java b/errai-marshalling/src/main/java/org/jboss/errai/marshalling/client/api/MarshallingSession.java index 644bf6b5f0..49a2b8ba52 100644 --- a/errai-marshalling/src/main/java/org/jboss/errai/marshalling/client/api/MarshallingSession.java +++ b/errai-marshalling/src/main/java/org/jboss/errai/marshalling/client/api/MarshallingSession.java @@ -5,18 +5,18 @@ */ public interface MarshallingSession { public Marshaller getMarshallerForType(String fqcn); - + public Marshaller getArrayMarshallerForType(String fqcn); - + public String marshall(Object o); - + public T demarshall(Class clazz, Object o); - + public String determineTypeFor(String formatType, Object o); - + public boolean hasObjectHash(String hashCode); - + public T getObject(Class type, String hashCode); - + public void recordObjectHash(String hashCode, Object instance); } diff --git a/errai-marshalling/src/main/java/org/jboss/errai/marshalling/client/api/annotations/ImplementationAliases.java b/errai-marshalling/src/main/java/org/jboss/errai/marshalling/client/api/annotations/ImplementationAliases.java index cc85bdb8ec..51b0e25246 100644 --- a/errai-marshalling/src/main/java/org/jboss/errai/marshalling/client/api/annotations/ImplementationAliases.java +++ b/errai-marshalling/src/main/java/org/jboss/errai/marshalling/client/api/annotations/ImplementationAliases.java @@ -11,7 +11,7 @@ *

* This annotation supersedes and has the same meaning as the older * {@link ExposeEntity} annotation. - * + * * @since Errai 2.0 * @author Mike Brock */ diff --git a/errai-marshalling/src/main/java/org/jboss/errai/marshalling/client/marshallers/ListMarshaller.java b/errai-marshalling/src/main/java/org/jboss/errai/marshalling/client/marshallers/ListMarshaller.java index 1e22900140..93d7855215 100644 --- a/errai-marshalling/src/main/java/org/jboss/errai/marshalling/client/marshallers/ListMarshaller.java +++ b/errai-marshalling/src/main/java/org/jboss/errai/marshalling/client/marshallers/ListMarshaller.java @@ -31,7 +31,7 @@ public String getEncodingType() { @Override public List demarshall(JSONValue o, MarshallingSession ctx) { if (o == null) return null; - + JSONArray jsonArray = o.isArray(); if (jsonArray == null) return null; diff --git a/errai-marshalling/src/main/java/org/jboss/errai/marshalling/client/marshallers/NullMarshaller.java b/errai-marshalling/src/main/java/org/jboss/errai/marshalling/client/marshallers/NullMarshaller.java index e6e27150c3..6e788148d0 100644 --- a/errai-marshalling/src/main/java/org/jboss/errai/marshalling/client/marshallers/NullMarshaller.java +++ b/errai-marshalling/src/main/java/org/jboss/errai/marshalling/client/marshallers/NullMarshaller.java @@ -8,7 +8,7 @@ */ public class NullMarshaller implements Marshaller { public static final Marshaller INSTANCE = new NullMarshaller(); - + @Override public Class getTypeHandled() { return Object.class; diff --git a/errai-marshalling/src/main/java/org/jboss/errai/marshalling/client/marshallers/StringMarshaller.java b/errai-marshalling/src/main/java/org/jboss/errai/marshalling/client/marshallers/StringMarshaller.java index b56ee031d2..1df1e1b90b 100644 --- a/errai-marshalling/src/main/java/org/jboss/errai/marshalling/client/marshallers/StringMarshaller.java +++ b/errai-marshalling/src/main/java/org/jboss/errai/marshalling/client/marshallers/StringMarshaller.java @@ -31,7 +31,7 @@ public String demarshall(JSONValue o, MarshallingSession ctx) { public String marshall(String o, MarshallingSession ctx) { return o == null ? "null" : "\"" + jsonStringEscape(o) + "\""; } - + public static String jsonStringEscape(final String o) { return o.replaceAll("\\\\", "\\\\\\\\").replaceAll("[\\\\]{0}\\\"", "\\\\\""); } diff --git a/errai-marshalling/src/main/java/org/jboss/errai/marshalling/client/util/MarshallUtil.java b/errai-marshalling/src/main/java/org/jboss/errai/marshalling/client/util/MarshallUtil.java index 43d1ab0912..6758aebf53 100644 --- a/errai-marshalling/src/main/java/org/jboss/errai/marshalling/client/util/MarshallUtil.java +++ b/errai-marshalling/src/main/java/org/jboss/errai/marshalling/client/util/MarshallUtil.java @@ -20,11 +20,11 @@ public static T notNull(String message, T obj) { public static T demarshallCache(Class type, JSONObject jsonObject, MarshallingSession session) { final String hashCode = jsonObject.get(SerializationParts.OBJECT_ID).isNumber().toString(); - + if (session.hasObjectHash(hashCode)) { return session.getObject(type, hashCode); } - + final String typeName = jsonObject.get(SerializationParts.ENCODED_TYPE).isString().stringValue(); final Object demarshalledInstance = session.getMarshallerForType(typeName).demarshall(jsonObject, session); session.recordObjectHash(hashCode, demarshalledInstance); @@ -45,7 +45,7 @@ public static T demarshallCache(Class type, JSONObject jsonObject, Marsha return demarshalledInstance; } - + public static JSONValue nullSafe_JSONObject(JSONValue v, String key) { if (v == null || v.isObject() == null) { return null; @@ -54,14 +54,14 @@ public static JSONValue nullSafe_JSONObject(JSONValue v, String key) { return v.isObject().get(key); } } - + public static > T demarshalEnum(Class enumType, JSONObject obj, String name) { if (obj == null || !obj.containsKey(name) || obj.get(name).isNull() != null) { return null; } return Enum.valueOf(enumType, obj.get(name).isString().stringValue()); } - + public static boolean handles(JSONObject object, Class cls) { JSONValue v = object.get(SerializationParts.ENCODED_TYPE); return !(v == null || v.isString() == null) && cls.getName().equals(v.isString().stringValue()); diff --git a/errai-marshalling/src/main/java/org/jboss/errai/marshalling/rebind/MarshallerGeneratorFactory.java b/errai-marshalling/src/main/java/org/jboss/errai/marshalling/rebind/MarshallerGeneratorFactory.java index d7b0413801..b062cc67c0 100644 --- a/errai-marshalling/src/main/java/org/jboss/errai/marshalling/rebind/MarshallerGeneratorFactory.java +++ b/errai-marshalling/src/main/java/org/jboss/errai/marshalling/rebind/MarshallerGeneratorFactory.java @@ -54,10 +54,10 @@ public class MarshallerGeneratorFactory { Set arrayMarshallers = new HashSet(); long startTime; - + public String generate(String packageName, String clazzName) { startTime = System.currentTimeMillis(); - + classStructureBuilder = implement(MarshallerFactory.class, packageName, clazzName); classContext = ((BuildMetaClass) classStructureBuilder.getClassDefinition()).getContext(); diff --git a/errai-marshalling/src/main/java/org/jboss/errai/marshalling/rebind/api/impl/DefaultJavaMappingStrategy.java b/errai-marshalling/src/main/java/org/jboss/errai/marshalling/rebind/api/impl/DefaultJavaMappingStrategy.java index f226a579a2..12af5c45bb 100644 --- a/errai-marshalling/src/main/java/org/jboss/errai/marshalling/rebind/api/impl/DefaultJavaMappingStrategy.java +++ b/errai-marshalling/src/main/java/org/jboss/errai/marshalling/rebind/api/impl/DefaultJavaMappingStrategy.java @@ -277,7 +277,7 @@ else if (field.getType().getCanonicalName().equals("long")) { Stmt.if_(Bool.and( Bool.expr(loadVariable("obj").invoke("containsKey", field.getName())), Bool.isNull(loadVariable("obj").invoke("get", field.getName()).invoke("isNull")) - + )) .append(bindingStatement).finish()); } @@ -591,7 +591,7 @@ else if (i > 0) { sb.append(",\"" + SerializationParts.INSTANTIATE_ONLY + "\":true"); } - + sb.append("}"); builder.append(Stmt.nestedCall(sb).invoke("toString").returnValue()); diff --git a/errai-marshalling/src/main/java/org/jboss/errai/marshalling/rebind/util/MarshallingGenUtil.java b/errai-marshalling/src/main/java/org/jboss/errai/marshalling/rebind/util/MarshallingGenUtil.java index 26ea54a0db..8c29d7ebb6 100644 --- a/errai-marshalling/src/main/java/org/jboss/errai/marshalling/rebind/util/MarshallingGenUtil.java +++ b/errai-marshalling/src/main/java/org/jboss/errai/marshalling/rebind/util/MarshallingGenUtil.java @@ -22,7 +22,7 @@ public static String getVarName(Class clazz) { public static String getArrayVarName(String clazz) { return "arrayOf_" + clazz.replaceAll("\\.", "_"); } - + public static String getVarName(String clazz) { return clazz.replaceAll("\\.", "_"); } diff --git a/errai-persistence/src/test/java/org/jboss/errai/test/persistence/DetachmentTest.java b/errai-persistence/src/test/java/org/jboss/errai/test/persistence/DetachmentTest.java index acc00d0e15..3e5c63fd7e 100644 --- a/errai-persistence/src/test/java/org/jboss/errai/test/persistence/DetachmentTest.java +++ b/errai-persistence/src/test/java/org/jboss/errai/test/persistence/DetachmentTest.java @@ -66,6 +66,6 @@ public void exportOutsidePersistenceContext() { User exportedUser = (User) beanManager.clone(user); assertEquals(user.getUserId(), exportedUser.getUserId()); - assertNull("relation should be null", exportedUser.getOrders()); // not exported (null) + assertNull("relation should be null", exportedUser.getOrders()); // not exported (null) } } diff --git a/errai-tools/pom.xml b/errai-tools/pom.xml index 4738a424b3..0406f69b08 100644 --- a/errai-tools/pom.xml +++ b/errai-tools/pom.xml @@ -114,8 +114,8 @@ clean - diff --git a/errai-tools/src/main/java/org/jboss/errai/tools/proxy/XmlHttpProxyServlet.java b/errai-tools/src/main/java/org/jboss/errai/tools/proxy/XmlHttpProxyServlet.java index b023d85c36..54caa7a9d1 100644 --- a/errai-tools/src/main/java/org/jboss/errai/tools/proxy/XmlHttpProxyServlet.java +++ b/errai-tools/src/main/java/org/jboss/errai/tools/proxy/XmlHttpProxyServlet.java @@ -184,7 +184,7 @@ private void getServices(HttpServletResponse res) { InputStream is = null; try { /*URL url = ctx.getResource(configResource); - // use classpath if not found locally. + // use classpath if not found locally. if (url == null) url = XmlHttpProxyServlet.class.getResource(configResource); // same package*/ // use classpath if not found locally. diff --git a/errai-widgets/src/main/java/org/jboss/errai/widgets/client/effects/Effects.java b/errai-widgets/src/main/java/org/jboss/errai/widgets/client/effects/Effects.java index af2f45bb7c..16a5bbd9a1 100644 --- a/errai-widgets/src/main/java/org/jboss/errai/widgets/client/effects/Effects.java +++ b/errai-widgets/src/main/java/org/jboss/errai/widgets/client/effects/Effects.java @@ -47,4 +47,4 @@ public static void fade(Element el, final double duration, final int start, fina public static void setOpacity(Element el, int opacity) { effect.setOpacity(el, opacity); } -} +} diff --git a/tools/build-gwt-trunk.sh b/tools/build-gwt-trunk.sh index 12d8ffbab2..ad76c2f3ca 100755 --- a/tools/build-gwt-trunk.sh +++ b/tools/build-gwt-trunk.sh @@ -17,7 +17,7 @@ GWT_VERSION=2.0.0-$SVN_REV ant clean ant -Dgwt.version=$GWT_VERSION -for artifact in `ls build/lib`; do +for artifact in `ls build/lib`; do artifact_packaging=${artifact##*.} artifact_name=${artifact%.*} mvn deploy:deploy-file -DgroupId=com.google.gwt \ diff --git a/tools/sandbox.sh b/tools/sandbox.sh index b89769665b..aed60a602d 100755 --- a/tools/sandbox.sh +++ b/tools/sandbox.sh @@ -9,5 +9,5 @@ mvn archetype:generate \ -DarchetypeArtifactId=sandbox-archetype \ -DarchetypeVersion=1.0-SNAPSHOT \ -DarchetypeRepository=http://snapshots.jboss.org/maven2 - - + +