Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
NomadGUI
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Instrument Control
NomadGUI
Commits
6abe1697
Commit
6abe1697
authored
3 months ago
by
helene ortiz
Browse files
Options
Downloads
Patches
Plain Diff
5.1.2-SNAPSHOT
parent
d8c32436
No related branches found
Branches containing commit
Tags
4.3.25
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
pom.xml
+1
-1
1 addition, 1 deletion
pom.xml
src/main/java/fr/ill/ics/client/control/version/VersionChecker.java
+5
-6
5 additions, 6 deletions
...ava/fr/ill/ics/client/control/version/VersionChecker.java
with
6 additions
and
7 deletions
pom.xml
+
1
−
1
View file @
6abe1697
...
...
@@ -3,7 +3,7 @@
<modelVersion>
4.0.0
</modelVersion>
<groupId>
fr.ill.ics
</groupId>
<artifactId>
nomadgui
</artifactId>
<version>
5.1.
1
-SNAPSHOT
</version>
<version>
5.1.
2
-SNAPSHOT
</version>
<name>
NomadGUI
</name>
<description>
Graphical user interface for Nomad
</description>
<scm>
...
...
This diff is collapsed.
Click to expand it.
src/main/java/fr/ill/ics/client/control/version/VersionChecker.java
+
5
−
6
View file @
6abe1697
...
...
@@ -21,6 +21,8 @@ package fr.ill.ics.client.control.version;
import
java.io.BufferedWriter
;
import
java.io.File
;
import
java.io.IOException
;
import
java.util.logging.Level
;
import
java.util.logging.Logger
;
import
org.json.simple.JSONObject
;
import
org.json.simple.parser.JSONParser
;
...
...
@@ -52,7 +54,7 @@ public class VersionChecker {
private
static
VersionChecker
instance
=
null
;
private
String
compatibleVersion
;
private
static
final
Logger
LOGGER
=
Logger
.
getLogger
(
VersionChecker
.
class
.
getName
());
private
VersionChecker
()
{
}
...
...
@@ -115,10 +117,7 @@ public class VersionChecker {
public
void
downgrade
()
{
System
.
out
.
println
(
"VersionChecker / method downgrade / start"
);
LOGGER
.
log
(
Level
.
WARNING
,
"VersionChecker / method downgrade / start"
);
try
{
// Create Json file with necessary information to squeeze login on next launch
...
...
@@ -128,7 +127,7 @@ public class VersionChecker {
jsonObject
.
put
(
INSTRUMENT_NAME_KEY
,
RemoteControlManager
.
getInstance
().
getInstrumentName
());
jsonObject
.
put
(
INSTRUMENT_CODE_KEY
,
RemoteControlManager
.
getInstance
().
getInstrumentCode
());
System
.
out
.
println
(
" Json content "
+
jsonObject
.
toJSONString
());
LOGGER
.
log
(
Level
.
WARNING
,
" Json content "
+
jsonObject
.
toJSONString
());
BufferedWriter
writer
=
Nomad
.
initFile
(
JSON_VERSION_FILE
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment