You are viewing a plain text version of this content. The canonical link for it is here.
Posted to xap-commits@incubator.apache.org by jm...@apache.org on 2006/08/18 20:27:42 UTC
svn commit: r432716 - in /incubator/xap/trunk/src/xap:
session/EventHandler.js taghandling/PluginDocumentHandler.js
util/ResourceDictionary.js
Author: jmargaris
Date: Fri Aug 18 13:27:41 2006
New Revision: 432716
URL: http://svn.apache.org/viewvc?rev=432716&view=rev
Log:
fixed incorrect usage of XapException
Modified:
incubator/xap/trunk/src/xap/session/EventHandler.js
incubator/xap/trunk/src/xap/taghandling/PluginDocumentHandler.js
incubator/xap/trunk/src/xap/util/ResourceDictionary.js
Modified: incubator/xap/trunk/src/xap/session/EventHandler.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/session/EventHandler.js?rev=432716&r1=432715&r2=432716&view=diff
==============================================================================
--- incubator/xap/trunk/src/xap/session/EventHandler.js (original)
+++ incubator/xap/trunk/src/xap/session/EventHandler.js Fri Aug 18 13:27:41 2006
@@ -17,7 +17,7 @@
Xap.provide('xap.session.EventHandler');
-Xap.require('xap.util.XapException');
+Xap.require('xap.util.Exception');
@@ -107,7 +107,7 @@
!(periodPos<openParenPos && openParenPos<closeParenPos)){
//TODO cleanup
- throw new xap.util.XapException(" bad parens and period or something", null, null, "xap.session.EventHandler._handleObjectEvent")
+ throw new xap.util.Exception(" bad parens and period or something", null, null, "xap.session.EventHandler._handleObjectEvent")
}
//we use parseArgument here because technically an object event is just an argument
Modified: incubator/xap/trunk/src/xap/taghandling/PluginDocumentHandler.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/taghandling/PluginDocumentHandler.js?rev=432716&r1=432715&r2=432716&view=diff
==============================================================================
--- incubator/xap/trunk/src/xap/taghandling/PluginDocumentHandler.js (original)
+++ incubator/xap/trunk/src/xap/taghandling/PluginDocumentHandler.js Fri Aug 18 13:27:41 2006
@@ -237,7 +237,7 @@
handler.fireEvent( "onCreate" );
}
catch( ex ) {
- this._clientSession.handleException( new xap.util.XapException("blah",null, ex,"xap.taghandling.PluginDocumentHandler.parseChild" ));
+ this._clientSession.handleException( ex );
}
return handler;
}
Modified: incubator/xap/trunk/src/xap/util/ResourceDictionary.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/util/ResourceDictionary.js?rev=432716&r1=432715&r2=432716&view=diff
==============================================================================
--- incubator/xap/trunk/src/xap/util/ResourceDictionary.js (original)
+++ incubator/xap/trunk/src/xap/util/ResourceDictionary.js Fri Aug 18 13:27:41 2006
@@ -45,10 +45,10 @@
xap.util.ResourceDictionary.getMessage = function( msgId, className, args ) {
var resourceObject = xap.util.ResourceDictionary.s_classnameToResourceObject.get
( className );
- if( resourceObject == null ) {
+ if( !resourceObject) {
try {
Xap.require(className+"Res");
- var resourceObject = eval ( "new " + className + "Res();" );
+ resourceObject = eval ( "new " + className + "Res();" );
xap.util.ResourceDictionary.s_classnameToResourceObject.put( className, resourceObject );
} catch ( e ){
xap.util.ResourceDictionary.s_log.exception( "Exception getting message:" +
@@ -56,7 +56,7 @@
", args:" + args + ", exception:" + e );
}
}
- if( resourceObject != null ) {
+ if( resourceObject ) {
var messagePattern = resourceObject.messages[msgId];
return xap.util.MessageFormat.format( messagePattern, args);
}