Return-Path: Delivered-To: apmail-commons-commits-archive@locus.apache.org Received: (qmail 78751 invoked from network); 2 Jan 2009 19:17:57 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 Jan 2009 19:17:57 -0000 Received: (qmail 97230 invoked by uid 500); 2 Jan 2009 19:17:56 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 97165 invoked by uid 500); 2 Jan 2009 19:17:56 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 97156 invoked by uid 99); 2 Jan 2009 19:17:56 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Jan 2009 11:17:56 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Jan 2009 19:17:55 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 456EC2388A23; Fri, 2 Jan 2009 11:17:35 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r730824 - in /commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml: TriggerEvent.java env/SimpleScheduler.java env/faces/SessionContext.java io/SCXMLParser.java model/Exit.java Date: Fri, 02 Jan 2009 19:17:35 -0000 To: commits@commons.apache.org From: sebb@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090102191735.456EC2388A23@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sebb Date: Fri Jan 2 11:17:34 2009 New Revision: 730824 URL: http://svn.apache.org/viewvc?rev=730824&view=rev Log: Add missing @Override markers Modified: commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/TriggerEvent.java commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/SimpleScheduler.java commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/faces/SessionContext.java commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/io/SCXMLParser.java commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/model/Exit.java Modified: commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/TriggerEvent.java URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/TriggerEvent.java?rev=730824&r1=730823&r2=730824&view=diff ============================================================================== --- commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/TriggerEvent.java (original) +++ commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/TriggerEvent.java Fri Jan 2 11:17:34 2009 @@ -129,6 +129,7 @@ * * @see java.lang.Object#equals(java.lang.Object) */ + @Override public boolean equals(final Object obj) { if (obj instanceof TriggerEvent) { TriggerEvent te2 = (TriggerEvent) obj; @@ -146,6 +147,7 @@ * * @see java.lang.Object#toString() */ + @Override public String toString() { StringBuffer buf = new StringBuffer("TriggerEvent{name="); buf.append(name).append(",type=").append(type); @@ -161,6 +163,7 @@ * * @see java.lang.Object#hashCode() */ + @Override public int hashCode() { return String.valueOf(this).hashCode(); } Modified: commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/SimpleScheduler.java URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/SimpleScheduler.java?rev=730824&r1=730823&r2=730824&view=diff ============================================================================== --- commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/SimpleScheduler.java (original) +++ commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/SimpleScheduler.java Fri Jan 2 11:17:34 2009 @@ -87,7 +87,7 @@ if (!timers.containsKey(sendId)) { return; // done, we don't track this one or its already expired } - Timer timer = (Timer) timers.get(sendId); + Timer timer = timers.get(sendId); if (timer != null) { timer.cancel(); if (log.isDebugEnabled()) { @@ -231,6 +231,7 @@ /** * What to do when timer expires. */ + @Override public void run() { try { executor.triggerEvent(new TriggerEvent(event, Modified: commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/faces/SessionContext.java URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/faces/SessionContext.java?rev=730824&r1=730823&r2=730824&view=diff ============================================================================== --- commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/faces/SessionContext.java (original) +++ commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/faces/SessionContext.java Fri Jan 2 11:17:34 2009 @@ -77,6 +77,7 @@ * @return The value (or null) * @see org.apache.commons.scxml.Context#get(java.lang.String) */ + @Override public Object get(final String name) { Object value = getVars().get(name); if (value == null) { @@ -92,6 +93,7 @@ * @return boolean true if the variable exists * @see org.apache.commons.scxml.Context#has(java.lang.String) */ + @Override public boolean has(final String name) { return (sessionMap.containsKey(name) || getVars().containsKey(name)); } Modified: commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/io/SCXMLParser.java URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/io/SCXMLParser.java?rev=730824&r1=730823&r2=730824&view=diff ============================================================================== --- commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/io/SCXMLParser.java (original) +++ commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/io/SCXMLParser.java Fri Jan 2 11:17:34 2009 @@ -1016,6 +1016,7 @@ // Add custom action rule in Commons SCXML namespace scxmlRules.setNamespaceURI(NAMESPACE_COMMONS_SCXML); scxmlRules.add(xp + XPF_EXT, new Rule() { + @Override public void end(final String namespace, final String name) { Transition t = (Transition) getDigester().peek(1); TransitionTarget tt = (TransitionTarget) getDigester(). @@ -1267,6 +1268,7 @@ /** * @see Rule#end(String, String) */ + @Override public final void end(final String namespace, final String name) { if (scxml == null) { scxml = (SCXML) getDigester() @@ -1292,6 +1294,7 @@ /** * @see Rule#end(String, String) */ + @Override public final void end(final String namespace, final String name) { Action child = (Action) getDigester().peek(); for (int i = 1; i < getDigester().getCount() - 1; i++) { @@ -1322,6 +1325,7 @@ /** * @see Rule#end(String, String) */ + @Override public final void end(final String namespace, final String name) { Element bodyElement = (Element) getDigester().pop(); NodeList childNodes = bodyElement.getChildNodes(); @@ -1376,6 +1380,7 @@ /** * @see Rule#begin(String, String, Attributes) */ + @Override public final void begin(final String namespace, final String name, final Attributes attributes) throws Exception { super.begin(namespace, name, attributes); @@ -1405,6 +1410,7 @@ /** * @see Rule#end(String, String) */ + @Override public final void end(final String namespace, final String name) { Node bodyNode = (Node) getDigester().pop(); Data data = ((Data) getDigester().peek()); @@ -1481,6 +1487,7 @@ /** * @see Rule#begin(String, String, Attributes) */ + @Override public final void begin(final String namespace, final String name, final Attributes attributes) throws ModelException { String src = attributes.getValue("src"); @@ -1649,6 +1656,7 @@ /** * @see Rule#begin(String, String, Attributes) */ + @Override public final void begin(final String namespace, final String name, final Attributes attributes) { PathResolverHolder prHolder = (PathResolverHolder) getDigester(). @@ -1665,6 +1673,7 @@ /** * @see Rule#begin(String, String, Attributes) */ + @Override public final void begin(final String namespace, final String name, final Attributes attributes) { Finalize finalize = (Finalize) getDigester().peek(); @@ -1684,6 +1693,7 @@ /** * @see Rule#begin(String, String, Attributes) */ + @Override @SuppressWarnings("unchecked") // Accomodate legacy code org.apache.commons.digester.Digester#getCurrentNamespaces() public final void begin(final String namespace, final String name, @@ -1702,6 +1712,7 @@ /** * @see Rule#begin(String, String, Attributes) */ + @Override public final void begin(final String namespace, final String name, final Attributes attributes) { org.apache.commons.logging.Log log = LogFactory. Modified: commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/model/Exit.java URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/model/Exit.java?rev=730824&r1=730823&r2=730824&view=diff ============================================================================== --- commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/model/Exit.java (original) +++ commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/model/Exit.java Fri Jan 2 11:17:34 2009 @@ -94,6 +94,7 @@ /** * {@inheritDoc} */ + @Override public void execute(final EventDispatcher evtDispatcher, final ErrorReporter errRep, final SCInstance scInstance, final Log appLog, final Collection derivedEvents)