tn5250j/src/org/tn5250j/tools LoadMacroMenu.java,1.11,1.12

"Kenneth J. Pouncey" <[email protected]> Sat, 26 Jun 2004 05:33:40 +0000
Newsgroups gmane.comp.java.tn5250j.cvs
Message-ID <[email protected]>
Update of /cvsroot/tn5250j/tn5250j/src/org/tn5250j/tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11816

Modified Files:
	LoadMacroMenu.java 
Log Message:
Fixex from Luc - LDC, fix to call getInstance()

Index: LoadMacroMenu.java
===================================================================
RCS file: /cvsroot/tn5250j/tn5250j/src/org/tn5250j/tools/LoadMacroMenu.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** LoadMacroMenu.java	30 Nov 2003 12:00:56 -0000	1.11
--- LoadMacroMenu.java	26 Jun 2004 05:33:38 -0000	1.12
***************
*** 102,106 ****
        try {
           conPath = new File("scripts").getCanonicalPath();
!          conPath2 = new File(GlobalConfigure.instance().getProperty(
                                "emulator.settingsDirectory") +
                                "scripts").getCanonicalPath();
--- 102,106 ----
        try {
           conPath = new File("scripts").getCanonicalPath();
!          conPath2 = new File(GlobalConfigure.getInstance().getProperty(
                                "emulator.settingsDirectory") +
                                "scripts").getCanonicalPath();
***************
*** 112,116 ****
        // lets not load the menu again if they point to the same place
        if (!conPath.equals(conPath2))
!          scriptDir(GlobalConfigure.instance().getProperty(
                                "emulator.settingsDirectory") +
                                "scripts",menu,session);
--- 112,116 ----
        // lets not load the menu again if they point to the same place
        if (!conPath.equals(conPath2))
!          scriptDir(GlobalConfigure.getInstance().getProperty(
                                "emulator.settingsDirectory") +
                                "scripts",menu,session);



-------------------------------------------------------
This SF.Net email sponsored by Black Hat Briefings & Training.
Attend Black Hat Briefings & Training, Las Vegas July 24-29 - 
digital self defense, top technical experts, no vendor pitches, 
unmatched networking opportunities. Visit www.blackhat.com