[TCO-Tool_cvs] TCO-Tool/plugins/org.tcotool.core.runtime/source/org/tcotool/core/runtime ApplicationPlugin.java, 1.6, 1.7

[Hirzel P. <ph...@us...>]

Update of /cvsroot/tcotool/TCO-Tool/plugins/org.tcotool.core.runtime/source/org/tcotool/core/runtime
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv22194/plugins/org.tcotool.core.runtime/source/org/tcotool/core/runtime

Modified Files:
	ApplicationPlugin.java 
Log Message:
Error handling enhanced

Index: ApplicationPlugin.java
===================================================================
RCS file: /cvsroot/tcotool/TCO-Tool/plugins/org.tcotool.core.runtime/source/org/tcotool/core/runtime/ApplicationPlugin.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ApplicationPlugin.java	29 Jun 2006 22:51:36 -0000	1.6
--- ApplicationPlugin.java	18 May 2008 16:24:13 -0000	1.7
***************
*** 219,226 ****
              Class toolClass = pluginClass.getClassLoader().loadClass(ext.getParameter("class").valueAsString());
              
!             String text = ext.getParameter(key).valueAsString();
!             text = ResourceManager.getResource(toolClass, text, loader);
              if (StringUtils.isNullOrEmpty(text)) {
!                 Tracer.getInstance().runtimeWarning("No property for: " + key);
                  return "";
              } else {
--- 219,230 ----
              Class toolClass = pluginClass.getClassLoader().loadClass(ext.getParameter("class").valueAsString());
              
!             String text = null;
!             Parameter param = ext.getParameter(key);
!             if (param != null) {
!             	text = ResourceManager.getResource(toolClass, param.valueAsString(), loader);
!             }            
!             
              if (StringUtils.isNullOrEmpty(text)) {
!                 Tracer.getInstance().runtimeWarning("No property in plugin.xml for <parameter id=\"" + key + "\"> (evtl. optional?)");
                  return "";
              } else {
***************
*** 228,232 ****
              }
          } catch (Throwable e) {
!             Tracer.getInstance().runtimeWarning("Key: " + key + " failed (evtl. optional only): " + e.getLocalizedMessage());
              return "";
          }
--- 232,236 ----
              }
          } catch (Throwable e) {
!             Tracer.getInstance().runtimeWarning("see plugin.xml for <parameter id=\"" + key + "\"> " + e.getLocalizedMessage());
              return "";
          }