[Gzz-commits] gzz/metacode mputils.py pegboard.py uml.py umlr...

[Vesa Kaihlavirta]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Vesa Kaihlavirta <address@hidden>       03/01/31 08:29:48

Modified files:
        metacode       : mputils.py pegboard.py uml.py umlrst.py 
                         umltool.py 

Log message:
        Assimilated the settings. Resistance is futile.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/metacode/mputils.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/metacode/pegboard.py.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/metacode/uml.py.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/metacode/umlrst.py.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/metacode/umltool.py.diff?tr1=1.21&tr2=1.22&r1=text&r2=text

Patches:
Index: gzz/metacode/mputils.py
diff -u gzz/metacode/mputils.py:1.2 gzz/metacode/mputils.py:1.3
--- gzz/metacode/mputils.py:1.2 Thu Jan 16 04:47:26 2003
+++ gzz/metacode/mputils.py     Fri Jan 31 08:29:48 2003
@@ -19,14 +19,33 @@
 Metapost -> PNG related stuff.
 """
 import os, sys, re
-import docutils.parsers.rst.directives, docutils.nodes, docutils.core
+#import docutils.parsers.rst.directives, docutils.nodes, docutils.core
+import docutils
+import uml
+
+
+class Borg:
+    """Class with but one mind"""
+    __shared_state = {}
+    def __init__(self):
+        self.__dict__ = self.__shared_state
+        
+class Settings(Borg):
+    """Store global settings"""
+
+    dict={}
+    
+    def __getitem__(self, name):
+        return self.dict[name]
+
+    def __setitem__(self, name, val):
+        self.dict[name] = val
 
 """
 Stores global settings for metapost actions.
 """
-settings = {
-    'tmpdir': 'doc/uml',
-    }
+settings = Settings()
+settings['tmpdir'] = 'doc/uml'
 
 #Environmental variable MPINPUTS should be relative to tmpdir,
 #or be an absolute path.
Index: gzz/metacode/pegboard.py
diff -u gzz/metacode/pegboard.py:1.28 gzz/metacode/pegboard.py:1.29
--- gzz/metacode/pegboard.py:1.28       Thu Jan 16 04:47:26 2003
+++ gzz/metacode/pegboard.py    Fri Jan 31 08:29:48 2003
@@ -26,6 +26,11 @@
 from docutils import frontend, io, readers, parsers, writers, nodes
 from docutils.core import publish_cmdline, Publisher
 from docutils.frontend import OptionParser, ConfigParser
+import mputils
+
+
+#global settings
+settings = mputils.Settings()
 
 #registers UML reST-directives
 umlrst.__rst_init__()
@@ -171,7 +176,7 @@
         args = '-stg --stylesheet ../'+css+' %s.rst %s.gen.html' % (file,file)
 
         #saves using contexts for diagrams
-        umltool.settings['context'] = pegroot+'/'+pegdir+'/'+rstfile
+        settings['context'] = pegroot+'/'+pegdir+'/'+rstfile
         pub.process_command_line(argv=args.split())
 
         #conversion may fail because of bad restructuredtext
Index: gzz/metacode/uml.py
diff -u gzz/metacode/uml.py:1.24 gzz/metacode/uml.py:1.25
--- gzz/metacode/uml.py:1.24    Mon Jan 13 08:39:38 2003
+++ gzz/metacode/uml.py Fri Jan 31 08:29:48 2003
@@ -17,9 +17,11 @@
 
 import sys, umltool, mputils
 
-umltool.set_transition_paths("")
-mputils.settings['tmpdir'] = "./"
 
-for path in sys.argv[1:]:
-    umltool.run(path)
 
+if __name__ == '__main__':
+    umltool.set_transition_paths("")
+    mputils.Settings()['tmpdir'] = "./"
+
+    for path in sys.argv[1:]:
+        umltool.run(path)
Index: gzz/metacode/umlrst.py
diff -u gzz/metacode/umlrst.py:1.15 gzz/metacode/umlrst.py:1.16
--- gzz/metacode/umlrst.py:1.15 Thu Jan 16 04:47:26 2003
+++ gzz/metacode/umlrst.py      Fri Jan 31 08:29:48 2003
@@ -16,9 +16,11 @@
 # 
 
 import os.path
-import docutils.parsers.rst.directives, docutils.nodes, docutils.core
+import docutils
 import umltool, mputils
 
+settings = mputils.Settings()
+
 def __rst_init__():
     """
     Initializes Docutils Directives.
@@ -68,12 +70,12 @@
 
         #writes uml and mp sourcefiles and converts them into png and html
 
-        uml = open(mputils._slashify(mputils.settings['tmpdir'])\
+        uml = open(mputils._slashify(settings['tmpdir'])\
                    +attributes['name']+".gen.uml", "w")
         uml.write(files[0])
         uml.close()
     
-        mp = open(mputils._slashify(mputils.settings['tmpdir'])\
+        mp = open(mputils._slashify(settings['tmpdir'])\
                   +attributes['name']+".gen.mp", "w")
         mp.write(files[1])
         mp.close()
@@ -85,23 +87,23 @@
 
 def add_refer_context(name, top = 0):
     if umltool.settings.has_key('context'):
-        if (os.path.isfile(mputils._slashify(mputils.settings['tmpdir'])\
+        if (os.path.isfile(mputils._slashify(settings['tmpdir'])\
                            +name+".gen.refers")):
-            old_refers = open(mputils._slashify(mputils.settings['tmpdir'])\
+            old_refers = open(mputils._slashify(settings['tmpdir'])\
                               +name+".gen.refers", "r").read()
             if old_refers.find(umltool.settings['context']) == -1:
                 if top:
-                    refers = 
open(mputils._slashify(mputils.settings['tmpdir'])\
+                    refers = open(mputils._slashify(settings['tmpdir'])\
                                   +name+".gen.refers", "w")
                     refers.write(umltool.settings['context']+"\n"+old_refers)
                     refers.close()
                 else:
-                    refers = 
open(mputils._slashify(mputils.settings['tmpdir'])\
+                    refers = open(mputils._slashify(settings['tmpdir'])\
                                   +name+".gen.refers", "a")
                     refers.write(umltool.settings['context']+"\n")
                     refers.close()
         else:
-            refers = open(mputils._slashify(mputils.settings['tmpdir'])\
+            refers = open(mputils._slashify(settings['tmpdir'])\
                           +name+".gen.refers", "a")
             refers.write(umltool.settings['context']+"\n")
             refers.close()
@@ -137,7 +139,7 @@
 
             #This should work also with non-generated UML-diagrams. Checks 
first
             #for generated and then if non-generated diagram exists.
-            if (os.path.isfile(mputils._slashify(mputils.settings['tmpdir'])\
+            if (os.path.isfile(mputils._slashify(settings['tmpdir'])\
                                +name+".gen.uml")):
                 prefix = name + ".gen"
             else: prefix = name
@@ -151,16 +153,16 @@
                 embed_implicit(path, name, target) 
 
             #Cut&Pastes imagemap into html
-            imgmap = 
open(mputils.settings['tmpdir']+"/"+context_name+".gen.html").read()
+            imgmap = 
open(settings['tmpdir']+"/"+context_name+".gen.html").read()
             out.write("<map id=\""+name+"\" name=\""+name+"\">\n")
             out.write(imgmap[imgmap.find('>',imgmap.find('<map'))+1:\
                              imgmap.find('</map>')])
             out.write("</map>\n")
 
             out.write("<div class=\"uml-explicit\">\n")
-            if (os.path.isfile(mputils._slashify(mputils.settings['tmpdir'])\
+            if (os.path.isfile(mputils._slashify(settings['tmpdir'])\
                                +name+".gen.refers")):
-                refers = open(mputils._slashify(mputils.settings['tmpdir'])\
+                refers = open(mputils._slashify(settings['tmpdir'])\
                                +name+".gen.refers").readlines()
                 out.write("<strong>"+name+"</strong>: \n")
                 for refer in refers:
@@ -169,7 +171,7 @@
                               
+"#"+name+"\">"+refer.split("/")[-1].split(".")[0]+"</a>]\n")
                 out.write("<br/>\n")
             out.write("<a id=\""+name+"\"></a>\n")
-            out.write("<img 
src=\""+mputils._slashify(mputils.settings['to_tmpdir'])\
+            out.write("<img src=\""+mputils._slashify(settings['to_tmpdir'])\
                       +context_name+".gen.png"\
                       +"\" usemap=\"#"+name+"\" alt=\""+name+"\" />\n")
             out.write("</div>\n")
@@ -193,8 +195,8 @@
         if slash != -1:
             path = (oldpath[0:slash+1] + path).replace("//", "/")
 
-    umltool_backup = umltool.settings.copy()
-    mputils_backup =  mputils.settings.copy()
+    #umltool_backup = umltool.settings.copy()
+    mputils_backup =  settings.copy()
 
     umltool.set_transition_paths(path)
     slash = oldpath.rfind("/")
@@ -217,7 +219,7 @@
 
             #This should work also with non-generated UML-diagrams. Checks 
first
             #for generated and then if non-generated diagram exists.
-            if (os.path.isfile(mputils._slashify(mputils.settings['tmpdir'])\
+            if (os.path.isfile(mputils._slashify(settings['tmpdir'])\
                                +name+".gen.uml")):
                 old_prefix = name + ".gen"
             else: old_prefix = name
@@ -230,16 +232,16 @@
             create_diagram(old_prefix, context_name, 0.5)
         
             #Cut&Pastes imagemap into html
-            imgmap = open(mputils._slashify(mputils.settings['tmpdir'])\
+            imgmap = open(mputils._slashify(settings['tmpdir'])\
                           +context_name+".gen.html").read()
             out.write("<map id=\""+name+"\" name=\""+name+"\">\n")
             out.write(imgmap[imgmap.find('>',imgmap.find('<map'))+1:\
                              imgmap.find('</map>')])
             out.write("</map>\n")
             out.write("<div class=\"uml-implicit\">\n")
-            if (os.path.isfile(mputils._slashify(mputils.settings['tmpdir'])\
+            if (os.path.isfile(mputils._slashify(settings['tmpdir'])\
                                +name+".gen.refers")):
-                refers = open(mputils._slashify(mputils.settings['tmpdir'])\
+                refers = open(mputils._slashify(settings['tmpdir'])\
                                +name+".gen.refers").readlines()
                 out.write("<small><strong>"+name+"</strong>: \n")
                 for refer in refers:
@@ -250,7 +252,7 @@
 
             out.write("<a id=\""+name+"\"></a>\n")
             out.write("<img "\
-                      
+"src=\""+mputils._slashify(mputils.settings['to_tmpdir'])\
+                      +"src=\""+mputils._slashify(settings['to_tmpdir'])\
                       +context_name+".gen.png"\
                       +"\" usemap=\"#"+name+"\" alt=\""+name+"\" />\n")
             out.write("</div>\n")
@@ -259,5 +261,5 @@
             out.write(html)
             out.close()
         
-    umltool.settings = umltool_backup
-    mputils.settings = mputils_backup
+    #umltool.settings = umltool_backup
+    settings = mputils_backup
Index: gzz/metacode/umltool.py
diff -u gzz/metacode/umltool.py:1.21 gzz/metacode/umltool.py:1.22
--- gzz/metacode/umltool.py:1.21        Thu Jan 16 04:47:26 2003
+++ gzz/metacode/umltool.py     Fri Jan 31 08:29:48 2003
@@ -18,12 +18,10 @@
 from __future__ import nested_scopes
 import re, os, sys
 import random, string
-
 import mputils
 
-settings = {
-    'javadoc': 'doc/javadoc',
-    }
+settings = mputils.Settings()
+settings['javadoc'] = 'doc/javadoc'
 
 jlinkpackage = None
 
@@ -35,9 +33,9 @@
     depth = path.count("/")
     settings['to_root'] = "".join(["../" for i in range(depth)])
     settings['to_javadoc'] = mputils.transition_path(path, settings['javadoc'])
-    if mputils.settings.has_key('tmpdir'):
-        mputils.settings['to_tmpdir'] = mputils.transition_path(path,\
-                                                   mputils.settings['tmpdir'])
+    if settings.has_key('tmpdir'):
+        settings['to_tmpdir'] = mputils.transition_path(path,\
+                                                   settings['tmpdir'])
     if settings.has_key('css'):
         settings['to_css'] = mputils.transition_path(path, settings['css'])
             
@@ -767,8 +765,8 @@
 
     settings['focus'] = prefix_out;
 
-    if mputils.settings.has_key('tmpdir'):
-        path = mputils._slashify(mputils.settings['tmpdir'])
+    if settings.has_key('tmpdir'):
+        path = mputils._slashify(settings['tmpdir'])
     else: path = '';
     
     s = open(path+prefix_in+".uml").read()