Permalink
Browse files

Updating contribs, showing date in log, re-enabling test

  • Loading branch information...
TimLethbridge committed Sep 28, 2017
1 parent 037b6b2 commit 896f3adf1db2eaf7f57e75a6fead4aaf95735008
Showing with 13 additions and 6 deletions.
  1. +1 −1 LICENSE.md
  2. +11 −4 cruise.umple/src/Main_Code.ump
  3. +1 −1 cruise.umple/test/cruise/umple/compiler/AssociationEndTest.java
View
@@ -1,7 +1,7 @@
The MIT License for Umple
=========================
Copyright 2008-2016 Timothy C. Lethbridge, Andrew Forward, Omar Badreddin, Dusan Brestovansky, Julie Filion, Miguel Garzon, Hamoud Aljamaan, Ali Fatolahi, Julian Solano, Joshua Horacsek, Joel Hobson, Alvina Lee, Sultan Eid, Jordan Johns, Sonya Adams, James Zhao, Adam Dzialoszynski, Luna Lu, Song Bae Choi, Thomas Morrison, Sacha Bagasan, Andrew Paugh, Stuart Erskine, Russell Staughton, Christopher Hogan, Geoffrey Guest, Gabriel Blais Bourget, Robin Jastrzebski, Quinlan Jung, Blakeley Quebec Desloges, Jesus Zambrano, Ahmed Orabi, Mahmoud Orabi, Tonio Resende, Vahdat Abdelzad, Opeyemi Adesina, Aliaa Alghamdi, Tiago Nascimento, Tianyuan Chu, Fiodar Kazhamiaka, Greg Hysen, Jean-Christophe Charbonneau, Kenan Kigunda, Adriaan Cody Schuffelen, Marc Antoine Gosselin-Lavigne, Pedro Augusto Vincente, Jason Canto, Ellen Arteca, Alexi Turcotte, Karin Ng, Mark Galloway, Alexander Ringeri, Antonio Maria Pereria de Resende, Craig Bryan, Eric Telmer, Charles Wang, Chan Chun Kit, Nabil Maadarani, John Zweip, Kevin Brightwell, Warren Marivel, Ashley Merman, Xinxin Kou, Aymen Ben Rkhis, Curtis Meerkerk, Adam Kereliuk, Matthew Fritze, Michael Mkicik, Victoria Lacroix, Morgan Redshaw, Matthew Rodusek, Shikib Mehri, Amid Zakariapour, Marc de Niverville, Alex Hochheiden
Copyright 2008-2017 Timothy C. Lethbridge, Andrew Forward, Omar Badreddin, Dusan Brestovansky, Julie Filion, Miguel Garzon, Hamoud Aljamaan, Ali Fatolahi, Julian Solano, Joshua Horacsek, Joel Hobson, Alvina Lee, Sultan Eid, Jordan Johns, Sonya Adams, James Zhao, Adam Dzialoszynski, Luna Lu, Song Bae Choi, Thomas Morrison, Sacha Bagasan, Andrew Paugh, Stuart Erskine, Russell Staughton, Christopher Hogan, Geoffrey Guest, Gabriel Blais Bourget, Robin Jastrzebski, Quinlan Jung, Blakeley Quebec Desloges, Jesus Zambrano, Ahmed Orabi, Mahmoud Orabi, Tonio Resende, Vahdat Abdelzad, Opeyemi Adesina, Aliaa Alghamdi, Tiago Nascimento, Tianyuan Chu, Fiodar Kazhamiaka, Greg Hysen, Jean-Christophe Charbonneau, Kenan Kigunda, Adriaan Cody Schuffelen, Marc Antoine Gosselin-Lavigne, Pedro Augusto Vincente, Jason Canto, Ellen Arteca, Alexi Turcotte, Karin Ng, Mark Galloway, Alexander Ringeri, Antonio Maria Pereria de Resende, Craig Bryan, Eric Telmer, Charles Wang, Chan Chun Kit, Nabil Maadarani, John Zweip, Kevin Brightwell, Warren Marivel, Ashley Merman, Xinxin Kou, Aymen Ben Rkhis, Curtis Meerkerk, Adam Kereliuk, Matthew Fritze, Michael Mkicik, Victoria Lacroix, Morgan Redshaw, Matthew Rodusek, Shikib Mehri, Amid Zakariapour, Marc de Niverville, Alex Hochheiden, Noah Murad, Katharine Cavers, Jackie Lang, Adam Bolding Jones, Chang Ding, Joshua McManus, Balaji Venkatesh, Runqing Zhang, Finn Hackett
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
@@ -472,6 +472,7 @@ class PlaygroundMain
depend java.net.*;
depend com.sun.management.OperatingSystemMXBean;
depend java.lang.management.*;
depend java.text.SimpleDateFormat;
Boolean isServer=false;
int commandsRun = 0;
@@ -587,10 +588,16 @@ class PlaygroundMain
if ("-log".equals(args[0])) {
if(isServer) {
returnCommandResult("Number of commands run since start: "+commandsRun+"\n\n", client);
returnCommandResult("JVM uptime seconds: "
+ManagementFactory.getRuntimeMXBean().getUptime()/1000+"\n\n", client);
long uptime = ManagementFactory.getRuntimeMXBean().getUptime();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy MMM dd HH:mm:ss");
Date startDate = new Date(System.currentTimeMillis()-uptime);
returnCommandResult("Number of commands run since start: "
+commandsRun+" (pace "+String.format("%.1f", 3600000.0*commandsRun/uptime)+"/h)\n\n", client);
returnCommandResult("JVM uptime: "
+uptime/1000+"s "+String.format("%.3f",uptime/60000/1440.0)+"days restarted "+
sdf.format(startDate)+"\n\n", client);
returnCommandResult("Number of clients working: "
+getClientConnections().length+"\n\n", client);
@@ -282,7 +282,7 @@ public void equals_checkAllData_okay()
Assert.assertEquals(true,end.equals(end));
}
@Test @Ignore
@Test
public void equals_checkAllData_nullNowSameAsEmpty()
{
AssociationEnd end,compareTo;

0 comments on commit 896f3ad

Please sign in to comment.