version update

Author: nmacedo

electrum/pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>pt.uminho.haslab.electrum</groupId>
 	<artifactId>electrum</artifactId>
-	<version>0.2.0</version>
+	<version>1.0.0</version>
 	<name>electrum</name>
 	<packaging>jar</packaging>
 	<profiles>

electrum/src/main/java/edu/mit/csail/sdg/alloy4/MailBug.java

@@ -103,7 +103,7 @@ private static boolean isGUI(Throwable ex) {
    private static String prepareCrashReport (Thread thread, Throwable ex, String email, String problem) {
       StringWriter sw = new StringWriter();
       PrintWriter pw = new PrintWriter(sw);
-      pw.printf("Alloy Analyzer %s crash report (Build Date = %s)\n", Version.version(), Version.buildDate());
+      pw.printf("Alloy Analyzer %s (Electrum Analyzer %s) crash report (Build Date = %s)\n", Version.version(), Version.eleVersion(), Version.buildDate());
       pw.printf("\n========================= Email ============================\n%s\n", Util.convertLineBreak(email).trim());
       pw.printf("\n========================= Problem ==========================\n%s\n", Util.convertLineBreak(problem).trim());
       pw.printf("\n========================= Thread Name ======================\n%s\n", thread.getName().trim());

electrum/src/main/java/edu/mit/csail/sdg/alloy4/Version.java

@@ -33,9 +33,12 @@ private Version() { }
    /** Returns the build number. */
    public static int buildNumber() { return Integer.MAX_VALUE; }
 
-   /** Returns the version string. */
+   /** Returns the Alloy version string. */
    public static String version() { return "4.2.?"; }
 
+   /** Returns the Electrum version string. */
+   public static String eleVersion() { return "1.0.?"; }
+
    /** Returns the build date. */
    public static String buildDate() { return "unknown"; }
 

electrum/src/main/java/edu/mit/csail/sdg/alloy4whole/SimpleCLI.java

@@ -304,18 +304,13 @@ private static void copyFromJAR() {
     private static synchronized String alloyHome() {
         String temp=System.getProperty("java.io.tmpdir");
         if (temp==null || temp.length()==0)
-            OurDialog.fatal("Error. JVM need to specify a temporary directory using java.io.tmpdir property.");
+            throw new RuntimeException("Error. JVM need to specify a temporary directory using java.io.tmpdir property.");
         String username=System.getProperty("user.name");
         File tempfile=new File(temp+File.separatorChar+"alloy4tmp40-"+(username==null?"":username));
         tempfile.mkdirs();
         String ans=Util.canon(tempfile.getPath());
         if (!tempfile.isDirectory()) {
-            OurDialog.fatal("Error. Cannot create the temporary directory "+ans);
-        }
-        if (!Util.onWindows()) {
-            String[] args={"chmod", "700", ans};
-            try {Runtime.getRuntime().exec(args).waitFor();}
-            catch (Throwable ex) {} // We only intend to make a best effort.
+        		throw new RuntimeException("Error. Cannot create the temporary directory "+ans);
         }
         return ans;
     }

electrum/src/main/java/edu/mit/csail/sdg/alloy4whole/SimpleGUI.java

@@ -52,7 +52,6 @@
 import java.util.Scanner;
 import java.util.Set;
 import java.util.prefs.Preferences;
-import java.util.regex.Pattern;
 
 import javax.swing.Box;
 import javax.swing.Icon;
@@ -398,7 +397,7 @@ private Runner notifyChange() {
         if (text==null) return null; // If this was called prior to the "text" being fully initialized
         OurSyntaxWidget t = text.get();
         if (Util.onMac()) frame.getRootPane().putClientProperty("windowModified", Boolean.valueOf(t.modified()));
-        if (t.isFile()) frame.setTitle(t.getFilename()); else frame.setTitle("Alloy Analyzer (Electrum) "+Version.version());
+        if (t.isFile()) frame.setTitle(t.getFilename()); else frame.setTitle("Alloy Analyzer "+Version.version() + " (Electrum Analyzer"+Version.eleVersion()+")");
         toolbar.setBorder(new OurBorder(false, false, text.count()<=1, false));
         int c = t.getCaret();
         int y = t.getLineOfOffset(c)+1;
@@ -514,7 +513,7 @@ private void copyFromJAR() {
         // Record the locations
         System.setProperty("alloy.theme0", alloyHome() + fs + "models");
         System.setProperty("alloy.home", alloyHome());
-//        System.setProperty("debug", "no"); // [HASLab]: this breaks iteration!
+//        		System.setProperty("debug", "yes"); // [HASLab]: this breaks iteration!
     }
 
     /** Called when this window is resized. */
@@ -1454,7 +1453,7 @@ private Runner doOptSyntaxHighlighting() {
     /** This method displays the about box. */
     private Runner doAbout() {
        if (wrap) return wrapMe();
-       OurDialog.showmsg("About Alloy Analyzer " + Version.version(),
+       OurDialog.showmsg("About Alloy Analyzer " + Version.version() + " (Electrum Analyzer "+Version.eleVersion()+")",
              OurUtil.loadIcon("images/logo.gif"),
              "Alloy Analyzer " + Version.version(),
              "Build date: " + Version.buildDate(),
@@ -1468,7 +1467,13 @@ private Runner doAbout() {
              " ",
              "Thanks to: Ilya Shlyakhter, Manu Sridharan, Derek Rayside, Jonathan Edwards, Gregory Dennis,",
              "Robert Seater, Edmond Lau, Vincent Yeung, Sam Daitch, Andrew Yip, Jongmin Baek, Ning Song,",
-             "Arturo Arizpe, Li-kuo (Brian) Lin, Joseph Cohen, Jesse Pavel, Ian Schechter, and Uriel Schafer."
+             "Arturo Arizpe, Li-kuo (Brian) Lin, Joseph Cohen, Jesse Pavel, Ian Schechter, and Uriel Schafer.",
+             " ",
+             "Electrum Analyzer " + Version.eleVersion(),
+             " ",
+             "Lead developer: Nuno Macedo",
+             "Project lead: Alcino Cunha",
+             "Thanks to: David Chemouil, Julien Brunel, Denis Kuperberg, Eduardo Pessoa, Tiago Guimarães."
        );
        return null;
     }
@@ -1785,7 +1790,7 @@ private SimpleGUI (final String[] args) {
 
         // Enable better look-and-feel
         if (Util.onMac() || Util.onWindows()) {
-            System.setProperty("com.apple.mrj.application.apple.menu.about.name", "Alloy Analyzer (Electrum) "+Version.version());
+            System.setProperty("com.apple.mrj.application.apple.menu.about.name", "Alloy Analyzer "+Version.version() + " (Electrum Analyzer"+Version.eleVersion()+")");
             System.setProperty("com.apple.mrj.application.growbox.intrudes","true");
             System.setProperty("com.apple.mrj.application.live-resize","true");
             System.setProperty("com.apple.macos.useScreenMenuBar","true");
@@ -1962,7 +1967,7 @@ private void finishInit(String[] args, List<Integer> initialAllowedMemorySizes,
         all.add(status, BorderLayout.SOUTH);
 
         // Generate some informative log messages
-        log.logBold("Alloy Analyzer (Electrum) "+Version.version()+" (build date: "+Version.buildDate()+")\n\n");
+        log.logBold("Alloy Analyzer "+Version.version()+" (Electrum Analyzer "+Version.eleVersion()+") (build date: "+Version.buildDate()+")\n\n");
 
         // If on Mac, then register an application listener
         try {