Skip to content

Commit 516a3e6

Browse files
authored
Merge pull request #86 from useocl/84-update-use-version-after-release-of-v710
chore: Updated version for fix / code style
2 parents 319b229 + 381f2d5 commit 516a3e6

File tree

5 files changed

+13
-16
lines changed

5 files changed

+13
-16
lines changed

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<groupId>org.tzi.use</groupId>
88
<artifactId>use</artifactId>
99
<packaging>pom</packaging>
10-
<version>7.1.0</version>
10+
<version>7.1.1</version>
1111
<modules>
1212
<module>use-core</module>
1313
<module>use-gui</module>

use-assembly/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>use</artifactId>
77
<groupId>org.tzi.use</groupId>
8-
<version>7.1.0</version>
8+
<version>7.1.1</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

use-core/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>use</artifactId>
77
<groupId>org.tzi.use</groupId>
8-
<version>7.1.0</version>
8+
<version>7.1.1</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

use-core/src/main/java/org/tzi/use/config/Options.java

+9-12
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,7 @@
2929
import java.net.URI;
3030
import java.net.URISyntaxException;
3131
import java.net.URL;
32-
import java.nio.file.Files;
33-
import java.nio.file.InvalidPathException;
34-
import java.nio.file.Path;
35-
import java.nio.file.Paths;
32+
import java.nio.file.*;
3633
import java.util.LinkedList;
3734
import java.util.List;
3835
import java.util.prefs.Preferences;
@@ -45,7 +42,7 @@
4542
public class Options {
4643

4744
// the release version
48-
public static final String RELEASE_VERSION = "7.1.0";
45+
public static final String RELEASE_VERSION = "7.1.1";
4946

5047
// the copyright
5148
public static final String COPYRIGHT = "Copyright (C) 1999-2024 University of Bremen & " +
@@ -86,9 +83,9 @@ public class Options {
8683
*/
8784
public static String USE_HISTORY_PATH = ".use_history";
8885

89-
public static String LINE_SEPARATOR = System.getProperty("line.separator");
86+
public static String LINE_SEPARATOR = System.lineSeparator();
9087

91-
public static String FILE_SEPARATOR = System.getProperty("file.separator");
88+
public static String FILE_SEPARATOR = FileSystems.getDefault().getSeparator();
9289

9390
/**
9491
* Name of the property giving the path to the monitor aspect template.
@@ -302,8 +299,8 @@ private static void printHelp() {
302299
*/
303300
public static void resetOptions() {
304301
USE_HISTORY_PATH = ".use_history";
305-
LINE_SEPARATOR = System.getProperty("line.separator");
306-
FILE_SEPARATOR = System.getProperty("file.separator");
302+
LINE_SEPARATOR = System.lineSeparator();
303+
FILE_SEPARATOR = FileSystems.getDefault().getSeparator();
307304
MONITOR_ASPECT_TEMPLATE = null;
308305
homeDir = null;
309306
compileOnly = false;
@@ -318,12 +315,12 @@ public static void resetOptions() {
318315
explicitVariableDeclarations = true;
319316
checkTransitions = true;
320317
checkStateInvariants = false;
321-
WarningType checkWarningsOclAnyInCollections = WarningType.WARN;
322-
WarningType checkWarningsUnrelatedTypes = WarningType.WARN;
318+
checkWarningsOclAnyInCollections = WarningType.WARN;
319+
checkWarningsUnrelatedTypes = WarningType.WARN;
323320
doPLUGIN = true;
324321
pluginDir = null;
325322
fDiagramDimension = new Dimension( 600, 600 );
326-
TypedProperties props = null;
323+
props = null;
327324
specFilename = null;
328325
cmdFilename = null;
329326
lastDirectory = Paths.get(System.getProperty("user.dir"));

use-gui/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>use</artifactId>
77
<groupId>org.tzi.use</groupId>
8-
<version>7.1.0</version>
8+
<version>7.1.1</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

0 commit comments

Comments
 (0)