From: Claudio Sacerdoti Coen <claudio.sacerdoticoen@unibo.it>
Date: Mon, 12 Nov 2001 09:37:39 +0000 (+0000)
Subject: - Stylesheet exceptions now printed in red.
X-Git-Tag: uwobo_pre_ocaml~2
X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=commitdiff_plain;h=1c36cc1e2966b1a593cf9480e713d2cb1597a749;p=helm.git

- Stylesheet exceptions now printed in red.
- Load of an already loaded stylesheet now ignored (was interpreted as
  reloadin before).
- Version renumbered as 1.2.1beta.
---

diff --git a/helm/uwobo/build.xml b/helm/uwobo/build.xml
index 9efec3c7a..52c3557d0 100644
--- a/helm/uwobo/build.xml
+++ b/helm/uwobo/build.xml
@@ -4,7 +4,7 @@
 
 	<property name="Name" value="Uwobo"/>
 	<property name="name" value="uwobo"/>
-	<property name="version" value="1.2.0"/>
+	<property name="version" value="1.2.1beta"/>
 	<property name="serialization_dir" value=""/>
 
 	<property file=".${name}.properties" />
diff --git a/helm/uwobo/src/it/unibo/cs/helm/uwobo/Server.java b/helm/uwobo/src/it/unibo/cs/helm/uwobo/Server.java
index 51dbc14c8..293b2b91b 100644
--- a/helm/uwobo/src/it/unibo/cs/helm/uwobo/Server.java
+++ b/helm/uwobo/src/it/unibo/cs/helm/uwobo/Server.java
@@ -63,7 +63,6 @@ import org.xml.sax.helpers.*;
 public class Server {
 	private static class Style implements Serializable {
 		public String fileName;
-		public long lastModified;
 		public Templates stylesheet;
 	};
 
@@ -221,11 +220,9 @@ public class Server {
                    Style style = (Style)hashMap.get(key);
                    if (style.fileName.equals(filename)) {
                       String msg =
-                         "Warning: Stylesheet already loaded. Reloading...";
+                         "Warning: Stylesheet already loaded. Request ignored.";
                       log(msg);
-                      String msg2 = reload(key);
-                      return htmlOfWarning(msg) +
-                         (msg2.equals("") ? "" : "<br />" + msg2);
+                      return htmlOfWarning(msg);
                    } else {
                       String res =
                          "Error: There is already a stylesheet with keyword \""+
@@ -237,7 +234,6 @@ public class Server {
 
 		Style style = new Style();
 		style.fileName = filename;
-		style.lastModified = new File(filename).lastModified();
 		String res = compileStylesheet(style,key);
                 log("done!");
 
@@ -405,7 +401,6 @@ public class Server {
 		Style style = (Style)hashMap.get(key);
 		if (style != null) {
 		   log("reloading \"" + key + "\"... ");
-		   style.lastModified = new File(style.fileName).lastModified();
                    res= compileStylesheet(style,key);
                    log("done!");
 		} else {
diff --git a/helm/uwobo/src/it/unibo/cs/helm/uwobo/Servlet.java b/helm/uwobo/src/it/unibo/cs/helm/uwobo/Servlet.java
index 32014063e..d259c3f89 100644
--- a/helm/uwobo/src/it/unibo/cs/helm/uwobo/Servlet.java
+++ b/helm/uwobo/src/it/unibo/cs/helm/uwobo/Servlet.java
@@ -142,7 +142,7 @@ public class Servlet extends HttpServlet {
       }
       String local = e.getLocalizedMessage();
       local = local.substring(local.lastIndexOf(':')+1);
-      return "<b>"+message+": "+local+"</b><br />";
+      return "<b style=\"color: red\">"+message+": "+local+"</b><br />";
    }
    
    public void doGet(HttpServletRequest request, HttpServletResponse response)
@@ -175,7 +175,7 @@ public class Servlet extends HttpServlet {
                   if(!log.equals(""))
                      out.println(msg_out(log));
 	        } catch (TransformerConfigurationException tce) {
-                  out.println(exc_out("stylesheet error", tce));
+                  out.println(exc_out("Stylesheet Error", tce));
                } catch (Exception e) {
 	          out.println(exc_out(null, e));
 	       }
@@ -299,7 +299,7 @@ public class Servlet extends HttpServlet {
 		     out.println(msg_out(server.reload(data[i])));
 	          }
 	       } catch (TransformerConfigurationException tce) {
-                  out.println(exc_out("stylesheet error", tce));
+                  out.println(exc_out("Stylesheet Error", tce));
                } catch (Exception e) {
 	          out.println(exc_out(null, e));
                }