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

Update of /cvsroot/tn5250j/tn5250j/src/org/tn5250j/tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7067

Modified Files:
	LoadMacroMenu.java Macronizer.java 
Log Message:
Make sure we use ConfigureFactory and not GlobalConfig

Index: LoadMacroMenu.java
===================================================================
RCS file: /cvsroot/tn5250j/tn5250j/src/org/tn5250j/tools/LoadMacroMenu.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** LoadMacroMenu.java	26 Jun 2004 05:33:38 -0000	1.12
--- LoadMacroMenu.java	26 Jun 2004 08:42:24 -0000	1.13
***************
*** 32,35 ****
--- 32,36 ----
  
  import org.tn5250j.*;
+ import org.tn5250j.interfaces.ConfigureFactory;
  import org.tn5250j.scripting.ExecuteScriptAction;
  import org.tn5250j.scripting.InterpreterDriverManager;
***************
*** 102,106 ****
        try {
           conPath = new File("scripts").getCanonicalPath();
!          conPath2 = new File(GlobalConfigure.getInstance().getProperty(
                                "emulator.settingsDirectory") +
                                "scripts").getCanonicalPath();
--- 103,107 ----
        try {
           conPath = new File("scripts").getCanonicalPath();
!          conPath2 = new File(ConfigureFactory.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.getInstance().getProperty(
                                "emulator.settingsDirectory") +
                                "scripts",menu,session);
--- 113,117 ----
        // lets not load the menu again if they point to the same place
        if (!conPath.equals(conPath2))
!          scriptDir(ConfigureFactory.getInstance().getProperty(
                                "emulator.settingsDirectory") +
                                "scripts",menu,session);

Index: Macronizer.java
===================================================================
RCS file: /cvsroot/tn5250j/tn5250j/src/org/tn5250j/tools/Macronizer.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Macronizer.java	26 Jun 2004 05:34:05 -0000	1.11
--- Macronizer.java	26 Jun 2004 08:42:24 -0000	1.12
***************
*** 34,38 ****
  
  import org.tn5250j.Session;
- import org.tn5250j.GlobalConfigure;
  import org.tn5250j.scripting.InterpreterDriverManager;
  import org.tn5250j.interfaces.ConfigureFactory;
--- 34,37 ----
***************
*** 55,59 ****
     private static boolean loadMacros() {
  
!       macros = ConfigureFactory.getInstance().getProperties(GlobalConfigure.MACROS);
        if (macros != null && macros.size() > 0)
           return true;
--- 54,58 ----
     private static boolean loadMacros() {
  
!       macros = ConfigureFactory.getInstance().getProperties(ConfigureFactory.MACROS);
        if (macros != null && macros.size() > 0)
           return true;
***************
*** 65,69 ****
  
        ConfigureFactory.getInstance().saveSettings(
!                GlobalConfigure.MACROS,"------ Macros --------");
     }
  
--- 64,68 ----
  
        ConfigureFactory.getInstance().saveSettings(
!                ConfigureFactory.MACROS,"------ Macros --------");
     }
  
***************
*** 228,232 ****
        File directory = new File("scripts");
  
!       File directory2 = new File(GlobalConfigure.getInstance().getProperty(
                             "emulator.settingsDirectory") +
                             "scripts");
--- 227,231 ----
        File directory = new File("scripts");
  
!       File directory2 = new File(ConfigureFactory.getInstance().getProperty(
                             "emulator.settingsDirectory") +
                             "scripts");



-------------------------------------------------------
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