diff -u -r1.2 -r1.3
--- LCDDMessenger.cc	19 Mar 2005 20:28:43 -0000	1.2
+++ LCDDMessenger.cc	27 Jun 2005 19:21:39 -0000	1.3
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/lcdd/src/LCDDMessenger.cc,v 1.2 2005/03/19 20:28:43 jeremy Exp $

+// $Header: /cvs/lcd/lcdd/src/LCDDMessenger.cc,v 1.3 2005/06/27 19:21:39 jeremy Exp $

 
 // LCDD
 #include "LCDDMessenger.hh"

@@ -11,13 +11,13 @@

 
 #include <cassert>
 

-LCDDMessenger::LCDDMessenger() 

+LCDDMessenger::LCDDMessenger()

 {
   // define UI commands
   defineCommands();
 }
 

-LCDDMessenger::~LCDDMessenger() 

+LCDDMessenger::~LCDDMessenger()

 {
   delete m_setupCmd;
   delete m_setURICmd;

@@ -26,14 +26,14 @@

   delete m_lcddDir;
 }
 

-void LCDDMessenger::SetNewValue(G4UIcommand *cmd, G4String newVals) 

+void LCDDMessenger::SetNewValue(G4UIcommand *cmd, G4String newVals)

 {
   LCDDParser* parser = LCDDParser::instance();

-  
-  G4String singleArg = newVals; 

+
+  G4String singleArg = newVals;

 
   if (cmd == m_setURICmd ) {

-    parser->setURI(singleArg); 

+    parser->setURI(singleArg);

   }
   else if (cmd == m_setSetupNameCmd) {
     parser->setSetupName(singleArg);

@@ -60,7 +60,7 @@

   }
 }
 

-G4String LCDDMessenger::GetCurrentValue(G4UIcommand *) 

+G4String LCDDMessenger::GetCurrentValue(G4UIcommand *)

 {
   return G4String("");
 }

@@ -72,9 +72,9 @@

   // LCDD directory
   m_lcddDir = new G4UIdirectory("/lcdd/");
   m_lcddDir->SetGuidance( "XML detector description and geometry commands." );

-  

+

   // set URL for input geometry file

-  m_setURICmd = new G4UIcommand("/lcdd/setURI", this);

+  m_setURICmd = new G4UIcommand("/lcdd/url", this);

   m_setURICmd->SetGuidance("Set the Uniform Resource Locator (URL) for the input geometry file.");
   m_setURICmd->AvailableForStates(G4State_PreInit);
 

@@ -82,15 +82,15 @@

   m_setURICmd->SetParameter(p);
 
   // set name of GDML setup

-  m_setSetupNameCmd = new G4UIcommand("/lcdd/setGDMLSetupName",this);

+  m_setSetupNameCmd = new G4UIcommand("/lcdd/setupName",this);

   m_setSetupNameCmd->SetGuidance("Set GDML setup name.");
   m_setSetupNameCmd->AvailableForStates(G4State_PreInit);
 
   p = new G4UIparameter("SetupName",'s',false);
   m_setSetupNameCmd->SetParameter(p);
 

-  // set version of GDML setup 
-  m_setVersionCmd = new G4UIcommand("/lcdd/setGDMLVersionTag",this);

+  // set version of GDML setup
+  m_setVersionCmd = new G4UIcommand("/lcdd/version",this);

   m_setVersionCmd->SetGuidance("Set GDML version tag.");
   m_setVersionCmd->AvailableForStates(G4State_PreInit);
 

@@ -99,7 +99,7 @@

 
   // setup URI, Setup and Version in one command
   m_setupCmd = new G4UIcommand("/lcdd/setup",this);

-  m_setupCmd->SetGuidance( "Set URI, SetupName and Version in same command." );

+  m_setupCmd->SetGuidance( "Set URI, SetupName and Version with a single command." );

   m_setupCmd->AvailableForStates(G4State_PreInit);
 
   p = new G4UIparameter("URI",'s',false);