[CIShell-SVN] SF.net SVN: cishell: [388] trunk/clients/gui/org.cishell.reference.gui. menumanager/src/org/cishell/reference/gui/menumanager/menu/MenuAdapter.java

[<hu...@us...>]

Revision: 388
          http://svn.sourceforge.net/cishell/?rev=388&view=rev
Author:   huangb
Date:     2007-04-26 11:37:26 -0700 (Thu, 26 Apr 2007)

Log Message:
-----------
fix the file path problem, use osgi.configuration.area property

Modified Paths:
--------------
    trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/MenuAdapter.java

Modified: trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/MenuAdapter.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/MenuAdapter.java	2007-04-26 15:26:41 UTC (rev 387)
+++ trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/MenuAdapter.java	2007-04-26 18:37:26 UTC (rev 388)
@@ -77,7 +77,6 @@
     private Map pidToServiceReferenceMap;
     private Map pidToServiceReferenceMapCopy;
     private Document dom;
-    private static File DirForDefaultMenuXMLFile;
     private static String DEFAULT_MENU_FILE_NAME = "default_menu.xml";
     
     /*
@@ -307,12 +306,9 @@
 			DocumentBuilder db = dbf.newDocumentBuilder();
 			
 			//parse using builder to get DOM representation of the XML file
-	        if (DirForDefaultMenuXMLFile == null) {
-	        	DirForDefaultMenuXMLFile = new File(System.getProperty("user.dir") + File.separator + "configuration");                
-	        }
-	        String fullpath=DirForDefaultMenuXMLFile.getPath()+File.separator+DEFAULT_MENU_FILE_NAME;
+	        String fullpath=System.getProperty("osgi.configuration.area") + DEFAULT_MENU_FILE_NAME;
 //	        System.out.println(">>parse file: "+fullpath);
-			dom = db.parse(fullpath);			
+	        dom = db.parse(fullpath);			
 
 		}catch(ParserConfigurationException pce) {
 			pce.printStackTrace();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.