From 78230154c69c6f04587e5490bdc52bee611aed3f Mon Sep 17 00:00:00 2001 From: Tango CI Date: Fri, 23 Aug 2019 15:18:06 +0000 Subject: [PATCH 01/10] [Tango CI] Next development iteration --- assembly/pom.xml | 2 +- client/pom.xml | 2 +- common/pom.xml | 2 +- dao/pom.xml | 2 +- parent/pom.xml | 2 +- pom.xml | 2 +- server/pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/assembly/pom.xml b/assembly/pom.xml index 754b05bc..75093700 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -3,7 +3,7 @@ org.tango-controls JTangoParent - JTango-9.5.17-SNAPSHOT + 9.5.17-SNAPSHOT ../parent/pom.xml 4.0.0 diff --git a/client/pom.xml b/client/pom.xml index dfcc0882..6d860c94 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -4,7 +4,7 @@ org.tango-controls JTangoParent - JTango-9.5.17-SNAPSHOT + 9.5.17-SNAPSHOT ../parent/pom.xml JTangoClientLang diff --git a/common/pom.xml b/common/pom.xml index e7d6bd88..d7b3a3fb 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -5,7 +5,7 @@ org.tango-controls JTangoParent - JTango-9.5.17-SNAPSHOT + 9.5.17-SNAPSHOT ../parent/pom.xml diff --git a/dao/pom.xml b/dao/pom.xml index 00393214..e7d8ea15 100644 --- a/dao/pom.xml +++ b/dao/pom.xml @@ -5,7 +5,7 @@ org.tango-controls JTangoParent - JTango-9.5.17-SNAPSHOT + 9.5.17-SNAPSHOT ../parent/pom.xml diff --git a/parent/pom.xml b/parent/pom.xml index bf086e86..f0ba1ae7 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -4,7 +4,7 @@ org.tango-controls JTangoParent - JTango-9.5.17-SNAPSHOT + 9.5.17-SNAPSHOT pom diff --git a/pom.xml b/pom.xml index 5ff41dea..2e4ccffd 100755 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.tango-controls JTangoParent - JTango-9.5.17-SNAPSHOT + 9.5.17-SNAPSHOT parent/pom.xml diff --git a/server/pom.xml b/server/pom.xml index 4ccd2add..883fd1de 100755 --- a/server/pom.xml +++ b/server/pom.xml @@ -4,7 +4,7 @@ org.tango-controls JTangoParent - JTango-9.5.17-SNAPSHOT + 9.5.17-SNAPSHOT ../parent/pom.xml JTangoServer From 4731fd47ed4a9f39626d6ec260d2203d457a5cc7 Mon Sep 17 00:00:00 2001 From: Ingvord Date: Sat, 24 Aug 2019 11:26:21 +0200 Subject: [PATCH 02/10] Update .travis.yml Enable sources and java doc generation when deploying artifacts --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5ff5a1f5..b708ac97 100644 --- a/.travis.yml +++ b/.travis.yml @@ -58,7 +58,7 @@ jobs: - cd parent - mvn versions:set versions:update-child-modules -DnewVersion=${TRAVIS_BRANCH} -DprocessAllModule -DgenerateBackupPoms=false - cd .. - - mvn install -Dmaven.test.skip=true + - mvn install -Dmaven.test.skip=true -Prelease deploy: - provider: script script: bash .travis/maven_deploy.sh From b0885ec587ee4e0d53c89687115bafef4a759ba4 Mon Sep 17 00:00:00 2001 From: Tango CI Date: Sat, 24 Aug 2019 09:42:08 +0000 Subject: [PATCH 03/10] [Tango CI] Next development iteration --- assembly/pom.xml | 2 +- client/pom.xml | 2 +- common/pom.xml | 2 +- dao/pom.xml | 2 +- parent/pom.xml | 2 +- pom.xml | 2 +- server/pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/assembly/pom.xml b/assembly/pom.xml index 75093700..b5bf92fe 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -3,7 +3,7 @@ org.tango-controls JTangoParent - 9.5.17-SNAPSHOT + 9.3.14-SNAPSHOT ../parent/pom.xml 4.0.0 diff --git a/client/pom.xml b/client/pom.xml index 6d860c94..566d602c 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -4,7 +4,7 @@ org.tango-controls JTangoParent - 9.5.17-SNAPSHOT + 9.3.14-SNAPSHOT ../parent/pom.xml JTangoClientLang diff --git a/common/pom.xml b/common/pom.xml index d7b3a3fb..166448ea 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -5,7 +5,7 @@ org.tango-controls JTangoParent - 9.5.17-SNAPSHOT + 9.3.14-SNAPSHOT ../parent/pom.xml diff --git a/dao/pom.xml b/dao/pom.xml index e7d8ea15..7261a54d 100644 --- a/dao/pom.xml +++ b/dao/pom.xml @@ -5,7 +5,7 @@ org.tango-controls JTangoParent - 9.5.17-SNAPSHOT + 9.3.14-SNAPSHOT ../parent/pom.xml diff --git a/parent/pom.xml b/parent/pom.xml index f0ba1ae7..fe324ef5 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -4,7 +4,7 @@ org.tango-controls JTangoParent - 9.5.17-SNAPSHOT + 9.3.14-SNAPSHOT pom diff --git a/pom.xml b/pom.xml index 2e4ccffd..8a7f0d60 100755 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.tango-controls JTangoParent - 9.5.17-SNAPSHOT + 9.3.14-SNAPSHOT parent/pom.xml diff --git a/server/pom.xml b/server/pom.xml index 883fd1de..c98cb323 100755 --- a/server/pom.xml +++ b/server/pom.xml @@ -4,7 +4,7 @@ org.tango-controls JTangoParent - 9.5.17-SNAPSHOT + 9.3.14-SNAPSHOT ../parent/pom.xml JTangoServer From 67ba8af709f346d93487a7fd3b38072afe4d538b Mon Sep 17 00:00:00 2001 From: ingvord Date: Sat, 24 Aug 2019 12:51:05 +0300 Subject: [PATCH 04/10] Revert "[Tango CI] Next development iteration" This reverts commit b0885ec587ee4e0d53c89687115bafef4a759ba4. --- assembly/pom.xml | 2 +- client/pom.xml | 2 +- common/pom.xml | 2 +- dao/pom.xml | 2 +- parent/pom.xml | 2 +- pom.xml | 2 +- server/pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/assembly/pom.xml b/assembly/pom.xml index b5bf92fe..75093700 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -3,7 +3,7 @@ org.tango-controls JTangoParent - 9.3.14-SNAPSHOT + 9.5.17-SNAPSHOT ../parent/pom.xml 4.0.0 diff --git a/client/pom.xml b/client/pom.xml index 566d602c..6d860c94 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -4,7 +4,7 @@ org.tango-controls JTangoParent - 9.3.14-SNAPSHOT + 9.5.17-SNAPSHOT ../parent/pom.xml JTangoClientLang diff --git a/common/pom.xml b/common/pom.xml index 166448ea..d7b3a3fb 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -5,7 +5,7 @@ org.tango-controls JTangoParent - 9.3.14-SNAPSHOT + 9.5.17-SNAPSHOT ../parent/pom.xml diff --git a/dao/pom.xml b/dao/pom.xml index 7261a54d..e7d8ea15 100644 --- a/dao/pom.xml +++ b/dao/pom.xml @@ -5,7 +5,7 @@ org.tango-controls JTangoParent - 9.3.14-SNAPSHOT + 9.5.17-SNAPSHOT ../parent/pom.xml diff --git a/parent/pom.xml b/parent/pom.xml index fe324ef5..f0ba1ae7 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -4,7 +4,7 @@ org.tango-controls JTangoParent - 9.3.14-SNAPSHOT + 9.5.17-SNAPSHOT pom diff --git a/pom.xml b/pom.xml index 8a7f0d60..2e4ccffd 100755 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.tango-controls JTangoParent - 9.3.14-SNAPSHOT + 9.5.17-SNAPSHOT parent/pom.xml diff --git a/server/pom.xml b/server/pom.xml index c98cb323..883fd1de 100755 --- a/server/pom.xml +++ b/server/pom.xml @@ -4,7 +4,7 @@ org.tango-controls JTangoParent - 9.3.14-SNAPSHOT + 9.5.17-SNAPSHOT ../parent/pom.xml JTangoServer From b18fb976361985a2b0657723e83ed11e389bac3c Mon Sep 17 00:00:00 2001 From: Ingvord Date: Tue, 27 Aug 2019 12:02:06 +0300 Subject: [PATCH 05/10] Change latest release badge to bintray (#80) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index cf71cdf4..145ec11e 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ [![Build Status](https://travis-ci.org/tango-controls/JTango.svg?branch=jtango-9-lts)](https://travis-ci.org/tango-controls/JTango) [![Documentation Status](https://readthedocs.org/projects/jtango/badge/?version=jtango-9-lts)](http://jtango.readthedocs.io/en/jtango-9-lts/?badge=jtango-9-lts) -[![Download](https://api.bintray.com/packages/tango-controls/generic/JTango-9-LTS/images/download.svg) ](https://bintray.com/tango-controls/generic/JTango-9-LTS/_latestVersion) +[ ![Download](https://api.bintray.com/packages/tango-controls/jtango/JTango/images/download.svg) ](https://bintray.com/tango-controls/jtango/JTango/_latestVersion) [![License](https://img.shields.io/badge/license-LGPL--3.0-blue.svg)](https://github.com/tango-controls/JTango/blob/jtango-9-lts/LICENSE) ## SonarCloud From a0a701b9234511ef073182d5ece6dc189383a680 Mon Sep 17 00:00:00 2001 From: Ingvord Date: Tue, 27 Aug 2019 12:03:35 +0300 Subject: [PATCH 06/10] PR for #79 (#81) * trigger build on branch * Update README.md * Update .travis.yml see [this](https://github.com/sbaudoin/sonar-ansible/issues/5) --- .travis.yml | 3 +++ README.md | 19 ++++++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index b708ac97..831fd6fd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,9 @@ sudo: false services: - docker +git: + depth: false + env: - TANGO_HOST=localhost:10000 diff --git a/README.md b/README.md index 145ec11e..95f03c7e 100644 --- a/README.md +++ b/README.md @@ -10,19 +10,20 @@ ## SonarCloud -[![Quality gate](https://sonarcloud.io/api/project_badges/measure?project=org.tango-controls%3AJTango-root%3Ajtango-9-lts&metric=alert_status)](https://sonarcloud.io/dashboard?id=org.tango-controls%3AJTango-root%3Ajtango-9-lts) +[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=org.tango-controls%3AJTango-root&metric=alert_status)](https://sonarcloud.io/dashboard?id=org.tango-controls%3AJTango-root) -[![Maintainability](https://sonarcloud.io/api/project_badges/measure?project=org.tango-controls%3AJTango-root%3Ajtango-9-lts&metric=sqale_rating)](https://sonarcloud.io/dashboard?id=org.tango-controls%3AJTango-root%3Ajtango-9-lts) -[![Reliability](https://sonarcloud.io/api/project_badges/measure?project=org.tango-controls%3AJTango-root%3Ajtango-9-lts&metric=reliability_rating)](https://sonarcloud.io/dashboard?id=org.tango-controls%3AJTango-root%3Ajtango-9-lts) -[![Security](https://sonarcloud.io/api/project_badges/measure?project=org.tango-controls%3AJTango-root%3Ajtango-9-lts&metric=security_rating)](https://sonarcloud.io/dashboard?id=org.tango-controls%3AJTango-root%3Ajtango-9-lts) +[![Maintainability Rating](https://sonarcloud.io/api/project_badges/measure?project=org.tango-controls%3AJTango-root&metric=sqale_rating)](https://sonarcloud.io/dashboard?id=org.tango-controls%3AJTango-root) +[![Reliability Rating](https://sonarcloud.io/api/project_badges/measure?project=org.tango-controls%3AJTango-root&metric=reliability_rating)](https://sonarcloud.io/dashboard?id=org.tango-controls%3AJTango-root) +[![Security Rating](https://sonarcloud.io/api/project_badges/measure?project=org.tango-controls%3AJTango-root&metric=security_rating)](https://sonarcloud.io/dashboard?id=org.tango-controls%3AJTango-root) -[![Bugs](https://sonarcloud.io/api/project_badges/measure?project=org.tango-controls%3AJTango-root%3Ajtango-9-lts&metric=bugs)](https://sonarcloud.io/dashboard?id=org.tango-controls%3AJTango-root%3Ajtango-9-lts) -[![Code smells](https://sonarcloud.io/api/project_badges/measure?project=org.tango-controls%3AJTango-root%3Ajtango-9-lts&metric=code_smells)](https://sonarcloud.io/dashboard?id=org.tango-controls%3AJTango-root%3Ajtango-9-lts) -[![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=org.tango-controls%3AJTango-root%3Ajtango-9-lts&metric=vulnerabilities)](https://sonarcloud.io/dashboard?id=org.tango-controls%3AJTango-root%3Ajtango-9-lts) -[![Tech debt](https://sonarcloud.io/api/project_badges/measure?project=org.tango-controls%3AJTango-root%3Ajtango-9-lts&metric=sqale_index)](https://sonarcloud.io/dashboard?id=org.tango-controls%3AJTango-root%3Ajtango-9-lts) +[![Bugs](https://sonarcloud.io/api/project_badges/measure?project=org.tango-controls%3AJTango-root&metric=bugs)](https://sonarcloud.io/dashboard?id=org.tango-controls%3AJTango-root) +[![Code Smells](https://sonarcloud.io/api/project_badges/measure?project=org.tango-controls%3AJTango-root&metric=code_smells)](https://sonarcloud.io/dashboard?id=org.tango-controls%3AJTango-root) +[![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=org.tango-controls%3AJTango-root&metric=vulnerabilities)](https://sonarcloud.io/dashboard?id=org.tango-controls%3AJTango-root) +[![Technical Debt](https://sonarcloud.io/api/project_badges/measure?project=org.tango-controls%3AJTango-root&metric=sqale_index)](https://sonarcloud.io/dashboard?id=org.tango-controls%3AJTango-root) -[![Lines of code](https://sonarcloud.io/api/project_badges/measure?project=org.tango-controls%3AJTango-root%3Ajtango-9-lts&metric=ncloc)](https://sonarcloud.io/dashboard?id=org.tango-controls%3AJTango-root%3Ajtango-9-lts) +[![Lines of Code](https://sonarcloud.io/api/project_badges/measure?project=org.tango-controls%3AJTango-root&metric=ncloc)](https://sonarcloud.io/dashboard?id=org.tango-controls%3AJTango-root) +[![Duplicated Lines (%)](https://sonarcloud.io/api/project_badges/measure?project=org.tango-controls%3AJTango-root&metric=duplicated_lines_density)](https://sonarcloud.io/dashboard?id=org.tango-controls%3AJTango-root) # JavaDoc From 010fa6a8620daef6f91d08fac96a3f889cc41d40 Mon Sep 17 00:00:00 2001 From: Ingvord Date: Tue, 27 Aug 2019 12:04:01 +0300 Subject: [PATCH 07/10] Enable sources and javadoc (#83) * Revert "Update .travis.yml" This reverts commit 4731fd47ed4a9f39626d6ec260d2203d457a5cc7. * enable javadoc and sources jars generation --- .travis.yml | 2 +- .travis/maven_deploy.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 831fd6fd..f9481d69 100644 --- a/.travis.yml +++ b/.travis.yml @@ -61,7 +61,7 @@ jobs: - cd parent - mvn versions:set versions:update-child-modules -DnewVersion=${TRAVIS_BRANCH} -DprocessAllModule -DgenerateBackupPoms=false - cd .. - - mvn install -Dmaven.test.skip=true -Prelease + - mvn install -Dmaven.test.skip=true deploy: - provider: script script: bash .travis/maven_deploy.sh diff --git a/.travis/maven_deploy.sh b/.travis/maven_deploy.sh index 8313f230..37e2731f 100755 --- a/.travis/maven_deploy.sh +++ b/.travis/maven_deploy.sh @@ -4,7 +4,7 @@ set -e cp .travis/settings.xml $HOME/.m2/settings.xml -mvn deploy -Dmaven.test.skip=true +mvn deploy -Dmaven.test.skip=true -Prelease cd parent mvn versions:set versions:update-child-modules -DprocessAllModules -DnextSnapshot -DgenerateBackupPoms=false From e4c4daaada729fc800a3c27b9c905cdc04ca9416 Mon Sep 17 00:00:00 2001 From: Tango CI Date: Tue, 27 Aug 2019 09:27:38 +0000 Subject: [PATCH 08/10] [Tango CI] Next development iteration --- assembly/pom.xml | 2 +- client/pom.xml | 2 +- common/pom.xml | 2 +- dao/pom.xml | 2 +- parent/pom.xml | 2 +- pom.xml | 2 +- server/pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/assembly/pom.xml b/assembly/pom.xml index 75093700..a7d8c805 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -3,7 +3,7 @@ org.tango-controls JTangoParent - 9.5.17-SNAPSHOT + 9.5.18-SNAPSHOT ../parent/pom.xml 4.0.0 diff --git a/client/pom.xml b/client/pom.xml index 6d860c94..fdf3c43d 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -4,7 +4,7 @@ org.tango-controls JTangoParent - 9.5.17-SNAPSHOT + 9.5.18-SNAPSHOT ../parent/pom.xml JTangoClientLang diff --git a/common/pom.xml b/common/pom.xml index d7b3a3fb..338a9f0b 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -5,7 +5,7 @@ org.tango-controls JTangoParent - 9.5.17-SNAPSHOT + 9.5.18-SNAPSHOT ../parent/pom.xml diff --git a/dao/pom.xml b/dao/pom.xml index e7d8ea15..90a64315 100644 --- a/dao/pom.xml +++ b/dao/pom.xml @@ -5,7 +5,7 @@ org.tango-controls JTangoParent - 9.5.17-SNAPSHOT + 9.5.18-SNAPSHOT ../parent/pom.xml diff --git a/parent/pom.xml b/parent/pom.xml index f0ba1ae7..5b9aa083 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -4,7 +4,7 @@ org.tango-controls JTangoParent - 9.5.17-SNAPSHOT + 9.5.18-SNAPSHOT pom diff --git a/pom.xml b/pom.xml index 2e4ccffd..03359e61 100755 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.tango-controls JTangoParent - 9.5.17-SNAPSHOT + 9.5.18-SNAPSHOT parent/pom.xml diff --git a/server/pom.xml b/server/pom.xml index 883fd1de..c80ef68d 100755 --- a/server/pom.xml +++ b/server/pom.xml @@ -4,7 +4,7 @@ org.tango-controls JTangoParent - 9.5.17-SNAPSHOT + 9.5.18-SNAPSHOT ../parent/pom.xml JTangoServer From 1ab70082d7affb748755ee4e3c723578df149675 Mon Sep 17 00:00:00 2001 From: Ingvord Date: Tue, 27 Aug 2019 16:16:54 +0300 Subject: [PATCH 09/10] Update pom.xml (#85) Since #68 fat jar is uploaded to GitHub releases --- assembly/pom.xml | 40 +--------------------------------------- 1 file changed, 1 insertion(+), 39 deletions(-) diff --git a/assembly/pom.xml b/assembly/pom.xml index a7d8c805..504fd9a3 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -124,43 +124,5 @@ - - - - - release - - - - org.codehaus.mojo - exec-maven-plugin - 1.5.0 - - - deploy-jar - deploy - - exec - - - curl - - -T - - ${shaded.outputFile} - - -u${bintray.user.name}:${bintray.user.apikey} - - https://api.bintray.com/content/tango-controls/generic/${project.artifactId}-9-LTS/${project.version}/${project.artifactId}-${project.version}.jar;publish=1 - - --verbose - - - - - - - - - + From b00043a5df6bd6b4bd95e2ce35c92b871f2e99a7 Mon Sep 17 00:00:00 2001 From: Pascal Verdier Date: Tue, 12 Nov 2019 09:27:39 +0100 Subject: [PATCH 10/10] Do the connection whith HWM for send is set without limit to avoid problem due to the buffer size when connect to server for large number of attributes --- .../esrf/TangoApi/events/ZmqMainThread.java | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/dao/src/main/java/fr/esrf/TangoApi/events/ZmqMainThread.java b/dao/src/main/java/fr/esrf/TangoApi/events/ZmqMainThread.java index c7c1b195..99e53a38 100755 --- a/dao/src/main/java/fr/esrf/TangoApi/events/ZmqMainThread.java +++ b/dao/src/main/java/fr/esrf/TangoApi/events/ZmqMainThread.java @@ -70,13 +70,13 @@ public class ZmqMainThread extends Thread { private static final long SendHwmSocket = 10000; //=============================================================== - private class ZmqPollers extends ZMQ.Poller { + //=============================================================== + private static class ZmqPollers extends ZMQ.Poller { private ZmqPollers(ZMQ.Context context, int size) { super(context, size); } } //=============================================================== - //=============================================================== /** * Default constructor * @param context ZMQ context instance @@ -667,19 +667,20 @@ private void connectIfNotDone(ZMQ.Socket socket, ZMQutils.ControlStructure contr // Check if it ia a reconnection -> disconnect before connection if (controlStructure.forceReconnection && alreadyConnected(controlStructure.endPoint)) { try { - // needs an un subscribe before disconnection - //socket.unsubscribe(controlStructure.eventName.getBytes()); socket.disconnect(controlStructure.endPoint); } catch (org.zeromq.ZMQException e) { System.err.println(e.getMessage()); } } - - // Do the connection //System.out.println("Connect on " + controlStructure.endPoint); //System.out.println(" for " + controlStructure.eventName); - socket.setHWM(controlStructure.hwm); + + // Do the connection (HWM for send is set without limit + // to avoid problem due to the buffer size when connect + // to server for large number of attributes) + socket.setSndHWM(0); + socket.setRcvHWM(controlStructure.hwm); socket.connect(controlStructure.endPoint); if (!alreadyConnected(controlStructure.endPoint)) { EventList eventList = new EventList(); @@ -763,11 +764,9 @@ private static String formatTime(long ms) return time + "." + ms; } - - //=============================================================== //=============================================================== - private class EventList extends ArrayList { + private static class EventList extends ArrayList { private String getEvent(String eventName) { for (String event : this) { if (event.equals(eventName)) {