You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ra...@apache.org on 2008/11/22 00:31:16 UTC
svn commit: r719746 - in
/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml:
SCXMLHelper.java io/SCXMLDigester.java io/SCXMLSerializer.java
semantics/SCXMLSemanticsImpl.java
Author: rahul
Date: Fri Nov 21 15:31:15 2008
New Revision: 719746
URL: http://svn.apache.org/viewvc?rev=719746&view=rev
Log:
Some checkstyle corrections.
Modified:
commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/SCXMLHelper.java
commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/io/SCXMLDigester.java
commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/io/SCXMLSerializer.java
commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/semantics/SCXMLSemanticsImpl.java
Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/SCXMLHelper.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/SCXMLHelper.java?rev=719746&r1=719745&r2=719746&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/SCXMLHelper.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/SCXMLHelper.java Fri Nov 21 15:31:15 2008
@@ -504,6 +504,7 @@
case '>':
entityName = "gt";
break;
+ default:
}
if (entityName == null) {
if (c > 0x7F) {
Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/io/SCXMLDigester.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/io/SCXMLDigester.java?rev=719746&r1=719745&r2=719746&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/io/SCXMLDigester.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/io/SCXMLDigester.java Fri Nov 21 15:31:15 2008
@@ -1485,8 +1485,8 @@
if (source == null) {
org.apache.commons.logging.Log log = LogFactory.
getLog(SCXMLDigester.class);
- log.error("Unknown fragment in <state src=\"" + path +
- "\">");
+ log.error("Unknown fragment in <state src=\"" + path
+ + "\">");
return;
}
if (source instanceof State) {
@@ -1519,8 +1519,8 @@
} else {
org.apache.commons.logging.Log log = LogFactory.
getLog(SCXMLDigester.class);
- log.error("Fragment in <state src=\"" + path +
- "\"> is not a <state> or <final>");
+ log.error("Fragment in <state src=\"" + path
+ + "\"> is not a <state> or <final>");
}
}
}
Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/io/SCXMLSerializer.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/io/SCXMLSerializer.java?rev=719746&r1=719745&r2=719746&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/io/SCXMLSerializer.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/io/SCXMLSerializer.java Fri Nov 21 15:31:15 2008
@@ -177,7 +177,7 @@
Map c = s.getChildren();
Iterator j = c.keySet().iterator();
while (j.hasNext()) {
- TransitionTarget tt = (TransitionTarget) c.get(j.next());
+ TransitionTarget tt = (TransitionTarget) c.get(j.next());
if (tt instanceof State) {
serializeState(b, (State) tt, indent + INDENT);
} else if (tt instanceof Parallel) {
@@ -601,6 +601,7 @@
* Serialize namespace declarations for the root SCXML element.
*
* @param holder The {@link NamespacePrefixesHolder} object
+ * @return The serialized namespace declarations
*/
private static String serializeNamespaceDeclarations(
final NamespacePrefixesHolder holder) {
@@ -615,16 +616,16 @@
if (prefix.length() == 0 && !nsURI.equals(NAMESPACE_SCXML)) {
org.apache.commons.logging.Log log = LogFactory.
getLog(SCXMLSerializer.class);
- log.warn("When using the SCXMLSerializer, the default " +
- "namespace must be the SCXML namespace:" +
- NAMESPACE_SCXML);
- } if (prefix.equals("cs") &&
- !nsURI.equals(NAMESPACE_COMMONS_SCXML)) {
+ log.warn("When using the SCXMLSerializer, the default "
+ + "namespace must be the SCXML namespace:"
+ + NAMESPACE_SCXML);
+ } if (prefix.equals("cs")
+ && !nsURI.equals(NAMESPACE_COMMONS_SCXML)) {
org.apache.commons.logging.Log log = LogFactory.
getLog(SCXMLSerializer.class);
- log.warn("When using the SCXMLSerializer, the namespace" +
- "prefix \"cs\" must bind to the Commons SCXML " +
- "namespace:" + NAMESPACE_COMMONS_SCXML);
+ log.warn("When using the SCXMLSerializer, the namespace"
+ + "prefix \"cs\" must bind to the Commons SCXML "
+ + "namespace:" + NAMESPACE_COMMONS_SCXML);
} else if (prefix.length() > 0) {
b.append(" xmlns:").append(prefix).append("=\"").
append(nsURI).append("\"");
Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/semantics/SCXMLSemanticsImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/semantics/SCXMLSemanticsImpl.java?rev=719746&r1=719745&r2=719746&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/semantics/SCXMLSemanticsImpl.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/semantics/SCXMLSemanticsImpl.java Fri Nov 21 15:31:15 2008
@@ -94,12 +94,12 @@
*/
private static final String NAMESPACES_KEY = "_ALL_NAMESPACES";
- /**
- * Suffix for error event that are triggered in reaction to invalid data
- * model locations.
+ /**
+ * Suffix for error event that are triggered in reaction to invalid data
+ * model locations.
*/
private static final String ERR_ILLEGAL_ALLOC = ".error.illegalalloc";
-
+
/**
* @param input
* SCXML state machine