[jbosstools-commits] JBoss Tools SVN: r43575 - trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples.

[jbosstools-commits at lists.jboss.org]

Author: ldimaggio
Date: 2012-09-10 23:26:13 -0400 (Mon, 10 Sep 2012)
New Revision: 43575

Modified:
   trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorldFileAction.java
Log:
Cleaned up the Windows dir path finally



Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorldFileAction.java
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorldFileAction.java	2012-09-11 00:10:28 UTC (rev 43574)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorldFileAction.java	2012-09-11 03:26:13 UTC (rev 43575)
@@ -65,36 +65,18 @@
 		SWTBotTreeItem theProject = bot.tree(0).getTreeItem(projectName).select();
 		bot.menu("File").menu("Properties").click();
 		
-		bot.sleep(60000l);
-		
 		if (System.getProperty("file.separator").equals("/")) { 
 			baseDir = bot.textWithLabel("Location:").getText() + System.getProperty("file.separator");
 		}	
 		else 	{
 			/* Needed to avoid a syntax error with Windows \ dir path characters */
-			//baseDir = bot.textWithLabel("Location:").getText().replaceAll(System.getProperty("file.separator"), System.getProperty("file.separator") + System.getProperty("file.separator")) + System.getProperty("file.separator");
 			baseDir = bot.textWithLabel("Location:").getText();
 			System.out.println("DEBUG baseDir = " + baseDir) ;
-			
-			try {
-				//baseDir = bot.textWithLabel("Location:").getText().replaceAll(System.getProperty("file.separator"), "zzz");
-				// http://stackoverflow.com/questions/1701839/backslash-problem-with-string-replaceall
-				baseDir = bot.textWithLabel("Location:").getText().replace("\\", "\\\\") + "\\\\";
-			}
-			catch (Exception E) {
-				System.out.println ("replaceAll failing with " + E.getMessage() );
-			}
 
+			// http://stackoverflow.com/questions/1701839/backslash-problem-with-string-replaceall
+			baseDir = bot.textWithLabel("Location:").getText().replace("\\", "\\\\") + "\\\\";
 			System.out.println("DEBUG baseDir = " + baseDir) ;
-			
-			
-		}						
-//		if (System.getProperty("file.separator").equals("/")) { 
-//			baseDir = bot.textWithLabel("Location:").getText() + System.getProperty("file.separator");
-//		}
-//		else {
-//			baseDir = bot.textWithLabel("Location:").getText().replaceAll("\\", "\\\\") + System.getProperty("file.separator");
-//		}
+		}	
 		bot.button("OK").click();
 				
 		theSWTBotView = open.viewOpen(ActionItem.View.GeneralNavigator.LABEL);