Changeset 5

Timestamp:

09/25/19 16:49:11 (5 years ago)

Author:

bart

Message:

Fix consistency check LinearAdditiveUtilitySpace

Files:

• pom.xml (modified) (1 diff)
• src/main/java/geniusweb/runserver/RunNego.java (modified) (1 diff)
• src/main/java/geniusweb/runserver/RunningNego.java (modified) (2 diffs)
• src/main/webapp/newsession.xhtml (modified) (2 diffs)

pom.xml

@@ -138 +138 @@
                         <groupId>junit</groupId>
                         <artifactId>junit</artifactId>
-                        <version>3.8.1</version>
+                        <version>4.12</version>
                         <scope>test</scope>
                 </dependency>

src/main/java/geniusweb/runserver/RunNego.java

@@ -65 +65 @@
                 RunningNego session = new RunningNego(settings,
                                 RunningNegotiationsRepo.instance(), log);
-                RunningNegotiationsRepo.instance().put(session);
+                session.start();
                 // set content type to prevent some browsers
                 // trying to parse this (eg as XML)

src/main/java/geniusweb/runserver/RunningNego.java

@@ -36 +36 @@
 
         /**
-         * Create new session wth unique ID.
+         * Create new session wth unique ID. You should call {@link #start()} to
+         * actually start this.
          * 
          * @param settings the settings to use for this session
@@ -48 +49 @@
                         Reporter logger) {
                 this.log = logger;
-                protocol = settings.getProtocol(logger);
+                this.protocol = settings.getProtocol(logger);
                 this.sessionid = "" + protocol.getRef().getURI() + (negoNr++);
                 this.repo = repo;
+        }
+
+        public void start() {
                 System.out.println("new session. logging to " + logdir);
+                repo.put(this);
                 protocol.addListener(evt -> handle(evt));
-                protocol.start(new PartyConnectionFactory(logger));
+                protocol.start(new PartyConnectionFactory(log));
         }
 

src/main/webapp/newsession.xhtml

@@ -75 +75 @@
         </div>
         <div id="results" style="visibility: hidden">
-                Your session started.<br /> <a href="" id="logref">view the log
+                Session completed. <a href="" id="logref">view the log
                         file</a> <br /> <a href="" id="plotref">render a utilities plot</a>.
         </div>
@@ -311 +311 @@
 
                 // see https://www.w3schools.com/xml/dom_httprequest.asp
-            var xmlHttp = new XMLHttpRequest();
+                document.getElementById("startbutton").disabled=true;
+                document.getElementById("started").setAttribute("style","");
+
+                var xmlHttp = new XMLHttpRequest();
             xmlHttp.onreadystatechange = function() { 
                 if (this.readyState == 4) {
                         if (this.status == 200) {
                                 var logurl="log/"+this.responseText+".json";
-                                document.getElementById("startbutton").disabled=true;
                                 document.getElementById("logref").href=logurl;
                                 document.getElementById("plotref").href="plotlog.xhtml?id="+this.responseText;
-                                document.getElementById("started").setAttribute("style","");
                                 
                                 sometimeWhen(function() { return urlExists(logurl) },