[overlord-commits] Overlord SVN: r309 - in cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src: java/org/jboss/tools/overlord/cdl/jbossesb/model/actions and 1 other directories.
overlord-commits at lists.jboss.org
overlord-commits at lists.jboss.org
Sat Sep 6 18:33:15 EDT 2008
Author: objectiser
Date: 2008-09-06 18:33:14 -0400 (Sat, 06 Sep 2008)
New Revision: 309
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/DefaultESBLanguageModel.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/DefaultESBService.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/AbstractESBAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/CreateSessionAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/IfAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/MessageRouterAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/ParallelAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/PerformAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/RetrieveSessionAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/ScheduleStateAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/SendMessageAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/SetStateAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/SwitchAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/WhenAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/WhileAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/TestModelListener.java
Log:
Update to reflect change in the way errors are reported.
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/DefaultESBLanguageModel.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/DefaultESBLanguageModel.java 2008-09-05 20:12:05 UTC (rev 308)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/DefaultESBLanguageModel.java 2008-09-06 22:33:14 UTC (rev 309)
@@ -629,39 +629,35 @@
m_listener = l;
}
- public void error(ModelObject src, String mesg, java.util.Map<String,Object> props) {
-
- if (props == null) {
- props = new java.util.HashMap<String,Object>();
+ public void error(ModelIssue issue) {
+
+ issue.getProperties().put(ModelListener.RESOLUTIONS, ModelListener.SHOW_REFERENCE_DESCRIPTION_RESOLUTION);
+ issue.getProperties().put(ModelListener.REFERENCE_MODEL, m_source);
+ issue.getProperties().put(ModelListener.REFERENCE_MODEL_START_POSITION,
+ issue.getModelObject().getSource().getStartPosition());
+ issue.getProperties().put(ModelListener.REFERENCE_MODEL_END_POSITION,
+ issue.getModelObject().getSource().getEndPosition());
+ if (issue.getModelObject().getSource().getComponentURI() != null) {
+ issue.getProperties().put(ModelListener.REFERENCE_MODEL_COMPONENT,
+ issue.getModelObject().getSource().getComponentURI());
}
- props.put(ModelListener.RESOLUTIONS, ModelListener.SHOW_REFERENCE_DESCRIPTION_RESOLUTION);
- props.put(ModelListener.REFERENCE_MODEL, m_source);
- props.put(ModelListener.REFERENCE_MODEL_START_POSITION, src.getSource().getStartPosition());
- props.put(ModelListener.REFERENCE_MODEL_END_POSITION, src.getSource().getEndPosition());
- if (src.getSource().getComponentURI() != null) {
- props.put(ModelListener.REFERENCE_MODEL_COMPONENT,
- src.getSource().getComponentURI());
- }
-
- m_listener.error(src, mesg, props);
+ m_listener.error(issue);
}
- public void warning(ModelObject src, String mesg, java.util.Map<String,Object> props) {
- if (props == null) {
- props = new java.util.HashMap<String,Object>();
+ public void warning(ModelIssue issue) {
+ issue.getProperties().put(ModelListener.RESOLUTIONS, ModelListener.SHOW_REFERENCE_DESCRIPTION_RESOLUTION);
+ issue.getProperties().put(ModelListener.REFERENCE_MODEL, m_source);
+ issue.getProperties().put(ModelListener.REFERENCE_MODEL_START_POSITION,
+ issue.getModelObject().getSource().getStartPosition());
+ issue.getProperties().put(ModelListener.REFERENCE_MODEL_END_POSITION,
+ issue.getModelObject().getSource().getEndPosition());
+ if (issue.getModelObject().getSource().getComponentURI() != null) {
+ issue.getProperties().put(ModelListener.REFERENCE_MODEL_COMPONENT,
+ issue.getModelObject().getSource().getComponentURI());
}
- props.put(ModelListener.RESOLUTIONS, ModelListener.SHOW_REFERENCE_DESCRIPTION_RESOLUTION);
- props.put(ModelListener.REFERENCE_MODEL, m_source);
- props.put(ModelListener.REFERENCE_MODEL_START_POSITION, src.getSource().getStartPosition());
- props.put(ModelListener.REFERENCE_MODEL_END_POSITION, src.getSource().getEndPosition());
- if (src.getSource().getComponentURI() != null) {
- props.put(ModelListener.REFERENCE_MODEL_COMPONENT,
- src.getSource().getComponentURI());
- }
-
- m_listener.warning(src, mesg, props);
+ m_listener.warning(issue);
}
private ModelListener m_listener=null;
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/DefaultESBService.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/DefaultESBService.java 2008-09-05 20:12:05 UTC (rev 308)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/DefaultESBService.java 2008-09-06 22:33:14 UTC (rev 309)
@@ -190,11 +190,11 @@
src = (ModelObject)focus;
}
- l.error(src, org.scribble.util.MessageUtil.format(
+ l.error(new ModelIssue(src, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
"org.jboss.tools.overlord.cdl.jbossesb.model.Messages"),
"_NOT_SPECIFIED_SESSION_CLASS",
- new String[]{}), null);
+ new String[]{})));
}
for (int i=0; i < m_actions.size(); i++) {
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/AbstractESBAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/AbstractESBAction.java 2008-09-05 20:12:05 UTC (rev 308)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/AbstractESBAction.java 2008-09-06 22:33:14 UTC (rev 309)
@@ -177,11 +177,11 @@
java.util.Map<String,Object> props=new java.util.HashMap<String,Object>();
props.put(ProblemDefinitions.PROBLEM_PROPERTY,
mandatory.get(i));
- l.error(this, org.scribble.util.MessageUtil.format(
+ l.error(new ModelIssue(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
"org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_NOT_SPECIFIED_PROPERTY",
- new String[]{mandatory.get(i)}), props);
+ new String[]{mandatory.get(i)}), props));
}
}
@@ -192,11 +192,11 @@
if (getOptionalProperties().contains(propName) == false &&
getMandatoryProperties().contains(propName) == false) {
- l.error(this, org.scribble.util.MessageUtil.format(
+ l.error(new ModelIssue(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
"org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_UNKNOWN_PROPERTY",
- new String[]{propName}), null);
+ new String[]{propName})));
}
}
@@ -211,11 +211,11 @@
try {
Class.forName(session, true, cl);
} catch(ClassNotFoundException cfne) {
- l.error(this, org.scribble.util.MessageUtil.format(
+ l.error(new ModelIssue(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
"org.jboss.tools.overlord.cdl.jbossesb.model.Messages"),
"_NOT_FOUND_BUSINESS_OBJECT_TYPE",
- new String[]{session}), null);
+ new String[]{session})));
}
} catch(Exception e) {
@@ -233,11 +233,11 @@
// unless it is a remote service, so defined in a
// different file
if (link.isRemote() == false) {
- l.error(this, org.scribble.util.MessageUtil.format(
+ l.error(new ModelIssue(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
"org.jboss.tools.overlord.cdl.jbossesb.model.Messages"),
"_NOT_FOUND_SERVICE_DESCRIPTOR",
- new String[]{link.getCategory(),link.getName()}), null);
+ new String[]{link.getCategory(),link.getName()})));
}
} else if (getService().getSessionName() != null &&
isPerform() == false && link.isRemote() == false &&
@@ -249,11 +249,11 @@
props.put(ProblemDefinitions.PROBLEM_PROPERTY,
DefaultESBService.BUSINESS_OBJECT_TYPE_PROPERTY);
- l.error(this, org.scribble.util.MessageUtil.format(
+ l.error(new ModelIssue(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
"org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_MISMATCH_SESSION_CLASS",
- new String[]{link.getCategory(),link.getName()}), props);
+ new String[]{link.getCategory(),link.getName()}), props));
}
}
}
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/CreateSessionAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/CreateSessionAction.java 2008-09-05 20:12:05 UTC (rev 308)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/CreateSessionAction.java 2008-09-06 22:33:14 UTC (rev 309)
@@ -96,32 +96,32 @@
ESBAction act=getService().getActions().get(0);
if (act != this) {
- l.error(this, org.scribble.util.MessageUtil.format(
+ l.error(new ModelIssue(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
"org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_MUST_BE_FIRST_ACTION",
- new String[]{"CreateSession"}), null);
+ new String[]{"CreateSession"})));
}
}
// If service is root, then need to defined conversation type
if (getService().isRoot()) {
if (getService().getConversationType() == null) {
- l.error(this, org.scribble.util.MessageUtil.format(
+ l.error(new ModelIssue(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
"org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_NOT_SPECIFIED_CONVERSATION_TYPE",
- new String[]{}), null);
+ new String[]{})));
} else {
int index=getService().getConversationType().indexOf('@');
String convType=getService().getConversationType().trim();
if (index == -1 || index == convType.length()-1) {
- l.error(this, org.scribble.util.MessageUtil.format(
+ l.error(new ModelIssue(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
"org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_NOT_SPECIFIED_CONVERSATION_TYPE_ROLE",
- new String[]{convType}), null);
+ new String[]{convType})));
}
}
}
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/IfAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/IfAction.java 2008-09-05 20:12:05 UTC (rev 308)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/IfAction.java 2008-09-06 22:33:14 UTC (rev 309)
@@ -195,27 +195,27 @@
// Report any errors
if (nl != null && (f_if == false || f_orderWrong)) {
- l.error(this, org.scribble.util.MessageUtil.format(
+ l.error(new ModelIssue(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
"org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_IF_ORDER_WRONG",
- new String[]{}), null);
+ new String[]{})));
}
if (f_serviceDetailsMissing) {
- l.error(this, org.scribble.util.MessageUtil.format(
+ l.error(new ModelIssue(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
"org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_PATH_SERVICE_DETAILS_MISSING",
- new String[]{}), null);
+ new String[]{})));
}
if (f_immediateInvalid) {
- l.error(this, org.scribble.util.MessageUtil.format(
+ l.error(new ModelIssue(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
"org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_BOOLEAN",
- new String[]{IMMEDIATE}), null);
+ new String[]{IMMEDIATE})));
}
}
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/MessageRouterAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/MessageRouterAction.java 2008-09-05 20:12:05 UTC (rev 308)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/MessageRouterAction.java 2008-09-06 22:33:14 UTC (rev 309)
@@ -289,11 +289,11 @@
// Check that message router has no other session based
// ESB actions in the same service descriptor
if (getService().isSessionBased()) {
- l.error(this, org.scribble.util.MessageUtil.format(
+ l.error(new ModelIssue(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
"org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_CANNOT_SESSION_BASED_ACTIONS_WITH_ROUTER",
- new String[]{}), null);
+ new String[]{})));
}
// Check that 'initate' services have a 'CreateSessionAction' and
@@ -302,12 +302,12 @@
ESBService service=m_initiateServices.get(i);
if (service.isRoot() == false) {
- l.error(this, org.scribble.util.MessageUtil.format(
+ l.error(new ModelIssue(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
"org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_CANNOT_INITIATE_NON_ROOT",
new String[]{service.getCategory(),
- service.getName()}), null);
+ service.getName()})));
}
}
@@ -317,12 +317,12 @@
ESBService service=m_services.get(i);
if (service.isRoot()) {
- l.error(this, org.scribble.util.MessageUtil.format(
+ l.error(new ModelIssue(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
"org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_MUST_INITIATE_ROOT",
new String[]{service.getCategory(),
- service.getName()}), null);
+ service.getName()})));
}
}
@@ -348,19 +348,19 @@
// Report any errors
if (nl != null && routeCount < 1) {
- l.error(this, org.scribble.util.MessageUtil.format(
+ l.error(new ModelIssue(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
"org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_ROUTER_ONE_OR_MORE_PATHS",
- new String[]{}), null);
+ new String[]{})));
}
if (f_serviceDetailsMissing) {
- l.error(this, org.scribble.util.MessageUtil.format(
+ l.error(new ModelIssue(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
"org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_PATH_SERVICE_DETAILS_MISSING",
- new String[]{}), null);
+ new String[]{})));
}
}
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/ParallelAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/ParallelAction.java 2008-09-05 20:12:05 UTC (rev 308)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/ParallelAction.java 2008-09-06 22:33:14 UTC (rev 309)
@@ -184,43 +184,43 @@
// Report any errors
if (nl != null && pathCount < 2) {
- l.error(this, org.scribble.util.MessageUtil.format(
+ l.error(new ModelIssue(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
"org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_PARALLEL_MORE_THAN_TWO_PATHS",
- new String[]{}), null);
+ new String[]{})));
}
if (f_pathAfterJoin) {
- l.error(this, org.scribble.util.MessageUtil.format(
+ l.error(new ModelIssue(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
"org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_PARALLEL_PATH_AFTER_JOIN",
- new String[]{}), null);
+ new String[]{})));
}
if (f_multipleJoins) {
- l.error(this, org.scribble.util.MessageUtil.format(
+ l.error(new ModelIssue(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
"org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_MULTIPLE_JOINS",
- new String[]{}), null);
+ new String[]{})));
}
if (f_serviceDetailsMissing) {
- l.error(this, org.scribble.util.MessageUtil.format(
+ l.error(new ModelIssue(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
"org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_PATH_SERVICE_DETAILS_MISSING",
- new String[]{}), null);
+ new String[]{})));
}
if (f_immediateInvalid) {
- l.error(this, org.scribble.util.MessageUtil.format(
+ l.error(new ModelIssue(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
"org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_BOOLEAN",
- new String[]{IMMEDIATE}), null);
+ new String[]{IMMEDIATE})));
}
}
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/PerformAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/PerformAction.java 2008-09-05 20:12:05 UTC (rev 308)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/PerformAction.java 2008-09-06 22:33:14 UTC (rev 309)
@@ -141,11 +141,11 @@
// Check if performed state starts with a create session action
if (m_service != null &&
m_service.isCreateSession() == false) {
- l.error(this, org.scribble.util.MessageUtil.format(
+ l.error(new ModelIssue(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
"org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_NOT_FOUND_PERFORM_CREATE_SESSION",
- new String[]{}), null);
+ new String[]{})));
}
// Check if performed service has relevant bind
@@ -158,20 +158,20 @@
if (PropertyUtil.isProperty(m_service.getSessionClass(),
parentRefProperty) == false) {
- l.error(this, org.scribble.util.MessageUtil.format(
+ l.error(new ModelIssue(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
"org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_NOT_FOUND_VARIABLE",
new String[]{parentRefProperty,
- m_service.getSessionClass().getName()}), null);
+ m_service.getSessionClass().getName()})));
} else if (PropertyUtil.hasWritableProperty(m_service.getSessionClass(),
parentRefProperty) == false) {
- l.error(this, org.scribble.util.MessageUtil.format(
+ l.error(new ModelIssue(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
"org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_NOT_WRITABLE_PROPERTY",
new String[]{parentRefProperty,
- m_service.getSessionClass().getName()}), null);
+ m_service.getSessionClass().getName()})));
}
Class<?> parentCls=PropertyUtil.getPropertyType(
@@ -180,13 +180,13 @@
if (parentCls != null && getService() != null &&
getService().getSessionClass() != null &&
parentCls != getService().getSessionClass()) {
- l.error(this, org.scribble.util.MessageUtil.format(
+ l.error(new ModelIssue(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
"org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_INVALID_PROPERTY_TYPE",
new String[]{parentRefProperty,
m_service.getSessionClass().getName(),
- getService().getSessionClass().getName()}), null);
+ getService().getSessionClass().getName()})));
}
}
@@ -204,21 +204,21 @@
if (PropertyUtil.isProperty(m_service.getSessionClass(),
variable) == false) {
- l.error(this, org.scribble.util.MessageUtil.format(
+ l.error(new ModelIssue(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
"org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_NOT_FOUND_VARIABLE",
new String[]{variable,
- m_service.getSessionClass().getName()}), null);
+ m_service.getSessionClass().getName()})));
} else if (PropertyUtil.hasWritableProperty(m_service.getSessionClass(),
variable) == false) {
- l.error(this, org.scribble.util.MessageUtil.format(
+ l.error(new ModelIssue(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
"org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_NOT_WRITABLE_PROPERTY",
new String[]{variable,
- m_service.getSessionClass().getName()}), null);
+ m_service.getSessionClass().getName()})));
}
} else {
// Possibly report if 'to-variable' not
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/RetrieveSessionAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/RetrieveSessionAction.java 2008-09-05 20:12:05 UTC (rev 308)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/RetrieveSessionAction.java 2008-09-06 22:33:14 UTC (rev 309)
@@ -69,11 +69,11 @@
ESBAction act=getService().getActions().get(0);
if (act != this) {
- l.error(this, org.scribble.util.MessageUtil.format(
+ l.error(new ModelIssue(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
"org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_MUST_BE_FIRST_ACTION",
- new String[]{"RetrieveSession"}), null);
+ new String[]{"RetrieveSession"})));
}
}
}
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/ScheduleStateAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/ScheduleStateAction.java 2008-09-05 20:12:05 UTC (rev 308)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/ScheduleStateAction.java 2008-09-06 22:33:14 UTC (rev 309)
@@ -112,11 +112,11 @@
if (immediate != null && immediate.equalsIgnoreCase("true") == false &&
immediate.equalsIgnoreCase("false") == false) {
- l.error(this, org.scribble.util.MessageUtil.format(
+ l.error(new ModelIssue(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
"org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_BOOLEAN",
- new String[]{IMMEDIATE}), null);
+ new String[]{IMMEDIATE})));
}
}
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/SendMessageAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/SendMessageAction.java 2008-09-05 20:12:05 UTC (rev 308)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/SendMessageAction.java 2008-09-06 22:33:14 UTC (rev 309)
@@ -134,11 +134,11 @@
// TODO: Validate that the client EPR has been sent on
// a preceding received request
} else {
- l.error(this, org.scribble.util.MessageUtil.format(
+ l.error(new ModelIssue(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
"org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_NOT_SPECIFIED_REQ_RESP_EPR",
- new String[]{}), null);
+ new String[]{})));
}
}
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/SetStateAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/SetStateAction.java 2008-09-05 20:12:05 UTC (rev 308)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/SetStateAction.java 2008-09-06 22:33:14 UTC (rev 309)
@@ -97,35 +97,35 @@
if (PropertyUtil.isProperty(cls, token) == false) {
if (variable.equals(token)) {
- l.error(this, org.scribble.util.MessageUtil.format(
+ l.error(new ModelIssue(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
"org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_NOT_FOUND_VARIABLE",
- new String[]{variable, cls.getName()}), null);
+ new String[]{variable, cls.getName()})));
} else {
- l.error(this, org.scribble.util.MessageUtil.format(
+ l.error(new ModelIssue(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
"org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_NOT_FOUND_VARIABLE_PROPERTY",
- new String[]{variable, token, cls.getName()}), null);
+ new String[]{variable, token, cls.getName()})));
}
} else if (st.hasMoreTokens()) {
// Check property can be read
if (!PropertyUtil.hasReadableProperty(cls, token)) {
- l.error(this, org.scribble.util.MessageUtil.format(
+ l.error(new ModelIssue(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
"org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_NOT_READABLE_PROPERTY",
- new String[]{token, cls.getName()}), null);
+ new String[]{token, cls.getName()})));
}
} else {
// Check property can be written
if (!PropertyUtil.hasWritableProperty(cls, token)) {
- l.error(this, org.scribble.util.MessageUtil.format(
+ l.error(new ModelIssue(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
"org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_NOT_WRITABLE_PROPERTY",
- new String[]{token, cls.getName()}), null);
+ new String[]{token, cls.getName()})));
}
}
@@ -140,11 +140,11 @@
if ((stateExpression == null && messageExpression == null) ||
(stateExpression != null && messageExpression != null)) {
- l.error(this, org.scribble.util.MessageUtil.format(
+ l.error(new ModelIssue(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
"org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_MUST_SPECIFY_STATE_OR_MESSAGE_EXPRESSION",
- new String[]{}), null);
+ new String[]{})));
}
}
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/SwitchAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/SwitchAction.java 2008-09-05 20:12:05 UTC (rev 308)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/SwitchAction.java 2008-09-06 22:33:14 UTC (rev 309)
@@ -136,19 +136,19 @@
// Report any errors
if (nl != null && pathCount < 1) {
- l.error(this, org.scribble.util.MessageUtil.format(
+ l.error(new ModelIssue(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
"org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_SWITCH_ONE_OR_MORE_PATHS",
- new String[]{}), null);
+ new String[]{})));
}
if (f_serviceDetailsMissing) {
- l.error(this, org.scribble.util.MessageUtil.format(
+ l.error(new ModelIssue(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
"org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_PATH_SERVICE_DETAILS_MISSING",
- new String[]{}), null);
+ new String[]{})));
}
}
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/WhenAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/WhenAction.java 2008-09-05 20:12:05 UTC (rev 308)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/WhenAction.java 2008-09-06 22:33:14 UTC (rev 309)
@@ -142,19 +142,19 @@
// Report any errors
if (nl != null && pathCount < 1) {
- l.error(this, org.scribble.util.MessageUtil.format(
+ l.error(new ModelIssue(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
"org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_WHEN_ONE_OR_MORE_PATHS",
- new String[]{}), null);
+ new String[]{})));
}
if (f_serviceDetailsMissing) {
- l.error(this, org.scribble.util.MessageUtil.format(
+ l.error(new ModelIssue(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
"org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_PATH_SERVICE_DETAILS_MISSING",
- new String[]{}), null);
+ new String[]{})));
}
}
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/WhileAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/WhileAction.java 2008-09-05 20:12:05 UTC (rev 308)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/WhileAction.java 2008-09-06 22:33:14 UTC (rev 309)
@@ -151,11 +151,11 @@
ESBAction act=getService().getActions().get(0);
if (act != this) {
- l.error(this, org.scribble.util.MessageUtil.format(
+ l.error(new ModelIssue(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
"org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_MUST_BE_FIRST_ACTION",
- new String[]{"While"}), null);
+ new String[]{"While"})));
}
}
@@ -230,43 +230,43 @@
// Report any errors
if (nl != null && (f_while == false || f_multipleWhiles)) {
- l.error(this, org.scribble.util.MessageUtil.format(
+ l.error(new ModelIssue(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
"org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_MUST_DEFINE_SINGLE_WHILE_PATH",
- new String[]{}), null);
+ new String[]{})));
}
if (nl != null && (f_exit == false || f_multipleExits)) {
- l.error(this, org.scribble.util.MessageUtil.format(
+ l.error(new ModelIssue(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
"org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_MUST_DEFINE_SINGLE_WHILE_EXIT",
- new String[]{}), null);
+ new String[]{})));
}
if (f_pathAfterExit) {
- l.error(this, org.scribble.util.MessageUtil.format(
+ l.error(new ModelIssue(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
"org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_WHILE_PATH_AFTER_EXIT",
- new String[]{}), null);
+ new String[]{})));
}
if (f_serviceDetailsMissing) {
- l.error(this, org.scribble.util.MessageUtil.format(
+ l.error(new ModelIssue(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
"org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_PATH_SERVICE_DETAILS_MISSING",
- new String[]{}), null);
+ new String[]{})));
}
if (f_immediateInvalid) {
- l.error(this, org.scribble.util.MessageUtil.format(
+ l.error(new ModelIssue(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
"org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_BOOLEAN",
- new String[]{IMMEDIATE}), null);
+ new String[]{IMMEDIATE})));
}
}
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/TestModelListener.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/TestModelListener.java 2008-09-05 20:12:05 UTC (rev 308)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/TestModelListener.java 2008-09-06 22:33:14 UTC (rev 309)
@@ -17,18 +17,17 @@
*/
package org.jboss.tools.overlord.cdl.jbossesb.model;
+import org.scribble.model.ModelIssue;
import org.scribble.model.ModelObject;
public class TestModelListener implements org.scribble.model.ModelListener {
- public void error(ModelObject modelObject, String mesg,
- java.util.Map<String,Object> props) {
- reported(mesg);
+ public void error(ModelIssue issue) {
+ reported(issue.getMessage());
}
- public void warning(ModelObject modelObject, String mesg,
- java.util.Map<String,Object> props) {
- reported(mesg);
+ public void warning(ModelIssue issue) {
+ reported(issue.getMessage());
}
protected void reported(String mesg) {
More information about the overlord-commits
mailing list