[jbosstools-commits] JBoss Tools SVN: r17595 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project.

[jbosstools-commits at lists.jboss.org]

Author: scabanovich
Date: 2009-09-15 11:38:29 -0400 (Tue, 15 Sep 2009)
New Revision: 17595

Modified:
   trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ProjectHome.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4885

Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ProjectHome.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ProjectHome.java	2009-09-15 15:34:12 UTC (rev 17594)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ProjectHome.java	2009-09-15 15:38:29 UTC (rev 17595)
@@ -48,15 +48,15 @@
 		File f = new File(location + XModelObjectConstants.SEPARATOR + IModelNature.PROJECT_TEMP);
 		File ep = new File(location + XModelObjectConstants.SEPARATOR + IModelNature.PROJECT_FILE);
 		if(ep.isFile()) {
-			// to remove .struts file 
+			// to remove temp file 
 			if(f.isFile()) f.delete();
-			return getLocationFrom_strutsstudio_File(location, ep);
+			return getLocationFrom_project_File(location, ep);
 		}
-		if(f.isFile()) return getLocationFrom_struts_File(location, f);
+		if(f.isFile()) return getLocationFrom_temp_File(location, f);
 		return ""; //$NON-NLS-1$
 	}
 	
-	private String getLocationFrom_strutsstudio_File(String location, File ss) {
+	private String getLocationFrom_project_File(String location, File ss) {
 		Element element = XMLUtil.getElement(ss);
 		String path = ""; //$NON-NLS-1$
 		if(element.hasAttribute("workspace-home")) { //$NON-NLS-1$
@@ -68,7 +68,7 @@
 		return q;
 	}
 	
-	private String getLocationFrom_struts_File(String location, File s) {
+	private String getLocationFrom_temp_File(String location, File s) {
 		String path = XModelObjectLoaderUtil.getCDATA(XMLUtil.getElement(s));
 		String q = (path.equals(".")) ? location : (path.startsWith("./")) ? location + path.substring(1) : path; //$NON-NLS-1$ //$NON-NLS-2$
 		s.delete();