Author: scabanovich Date: 2008-02-29 12:09:51 -0500 (Fri, 29 Feb 2008) New Revision: 6655 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/OpenEditorWizard.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/navigator/decorator/XModelObjectDecorator.java Log: JBIDE-1433 Test added. Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/OpenEditorWizard.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/OpenEditorWizard.java 2008-02-29 17:09:40 UTC (rev 6654) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/OpenEditorWizard.java 2008-02-29 17:09:51 UTC (rev 6655) @@ -56,7 +56,8 @@ } if(f == null || !f.exists()) { ServiceDialog d = object.getModel().getService(); - String message = "The file " + f.getFullPath() + " was removed externally."; + Object pathData = f == null ? object.getPath() : f.getFullPath(); + String message = "The file " + pathData + " was removed externally."; d.showDialog("Warning", message, new String[]{"Close"}, null, ServiceDialog.WARNING); object.getModel().update(); return 1; Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/navigator/decorator/XModelObjectDecorator.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/navigator/decorator/XModelObjectDecorator.java 2008-02-29 17:09:40 UTC (rev 6654) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/navigator/decorator/XModelObjectDecorator.java 2008-02-29 17:09:51 UTC (rev 6655) @@ -120,9 +120,9 @@ String v = value; if(value == null || value.length() == 0) v = defaultValue; if(v == null) v = ""; - if(v.indexOf(Variable.NAME.getRuleText()) < 0) { - if(v.length() > 0) v += " "; - v += Variable.NAME.getRuleText(); + if(v.indexOf(RULE_OPENING) < 0) { + if(v.length() > 0) v = " " + v; + v = Variable.NAME.getRuleText() + v; } StringTokenizer s = new StringTokenizer(v, RULE_OPENING + RULE_CLOSING, true); boolean inVariable = false;