[Gzz-commits] fenfire/org/fenfire loom/Loom.java util/MsgBox....

[Benja Fallenstein]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Benja Fallenstein <address@hidden>      03/03/21 09:50:32

Modified files:
        org/fenfire/loom: Loom.java 
Added files:
        org/fenfire/util: MsgBox.java 

Log message:
        Fix antont's bug

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/loom/Loom.java.diff?tr1=1.40&tr2=1.41&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/MsgBox.java?rev=1.1

Patches:
Index: fenfire/org/fenfire/loom/Loom.java
diff -u fenfire/org/fenfire/loom/Loom.java:1.40 
fenfire/org/fenfire/loom/Loom.java:1.41
--- fenfire/org/fenfire/loom/Loom.java:1.40     Sun Mar 16 15:12:40 2003
+++ fenfire/org/fenfire/loom/Loom.java  Fri Mar 21 09:50:32 2003
@@ -55,13 +55,30 @@
 
     public void load(File file) throws RDFException, IOException, 
                                       org.xml.sax.SAXException {
-       model = new ModelMem();
-       rdf = new RDFVocab(model);
-
-       model.read(new java.io.FileReader(file), "");
+       NamespaceMap names;
+       try {
+           Model my_model = new ModelMem();
+           System.out.println("!");
+           my_model.read(new java.io.FileReader(file), "");
+           System.out.println("@");
+           names = new NamespaceMap();
+           System.out.println("#");
+           names.loadMappings(new java.io.FileReader(file));
+           System.out.println("$");
+
+           model = my_model;
+       } catch(Throwable _) {
+           System.out.println(".");
+           if(msgBox == null)
+               msgBox = new org.fenfire.util.MsgBox(new Frame());
+           msgBox.msgBox("Error while loading",
+                         "Sorry, there was a problem while "+
+                         "loading file "+file+".");
+           //_.printStackTrace();
+           return;
+       }
 
-       NamespaceMap names = new NamespaceMap();
-       names.loadMappings(new java.io.FileReader(file));
+       rdf = new RDFVocab(model);
 
        propertiesBox.setModel(model, names);
        
@@ -74,9 +91,10 @@
        menuBar.setModel(model, names);
     }
 
-    protected Frame propFrame = new Frame("Properties");
+    protected Frame propFrame;
 
     protected Dialog goTo;
+    protected org.fenfire.util.MsgBox msgBox;
     protected TextField goToText;
     
     protected LoomMenuBar menuBar = new LoomMenuBar(this);
@@ -122,6 +140,7 @@
            load(new File(file));
        this.colors = colors0;
 
+       propFrame = new Frame("Properties");
        propFrame.setBounds(350, 300, 350, 200);
        propFrame.add(propertiesBox);
        propertiesBox.addItemListener(new ItemListener() {
@@ -355,8 +374,10 @@
                    frame = ((org.nongnu.libvob.impl.awt.FrameScreen)scr.window)
                        .getFrame();
                    frame.setTitle("Fenfire Loom");
+                   msgBox = new org.fenfire.util.MsgBox(frame);
 
                    goTo = new Dialog(frame, "Go to URI");
+                   goTo.setLayout(new FlowLayout());
                    Panel goToP = new Panel(); goTo.add(goToP);
                    Label goToLabel = new Label("Go to URI:");
                    goToText = new TextField(25);
@@ -381,6 +402,10 @@
                    // threading issues? -b
                    goTo.setVisible(true);
                    goTo.setVisible(false);
+
+                   // same with msgBox...
+                   msgBox.setVisible(true);
+                   msgBox.setVisible(false);
 
                    goTo.setSize(500, 80);