Skip to content

Commit 26fe8ec

Browse files
SimplyProgrammerSimplyProgrammer
committed
final formating an committing
1 parent 6023552 commit 26fe8ec

File tree

10 files changed

+240
-221
lines changed

10 files changed

+240
-221
lines changed

‎SerialX-core/pom.xml

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
2-
<modelVersion>4.0.0</modelVersion>
3-
<parent>
4-
<groupId>org.ugp</groupId>
5-
<artifactId>serialx</artifactId>
6-
<version>${revision}</version>
7-
</parent>
8-
9-
<groupId>org.ugp.serialx</groupId>
10-
<artifactId>serialx-core</artifactId>
11-
<version>1.3.8</version>
12-
13-
<name>SerialX core</name>
14-
<description>Core of SerialX. Contains core features and utilities shared across the library.</description>
1+
<project xmlns="http://maven.apache.org/POM/4.0.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
4+
<modelVersion>4.0.0</modelVersion>
5+
<parent>
6+
<groupId>org.ugp</groupId>
7+
<artifactId>serialx</artifactId>
8+
<version>${revision}</version>
9+
</parent>
10+
11+
<groupId>org.ugp.serialx</groupId>
12+
<artifactId>serialx-core</artifactId>
13+
<version>1.3.8</version>
14+
15+
<name>SerialX core</name>
16+
<description>Core of SerialX. Contains core features and utilities shared across the library.</description>
1517
</project>

‎SerialX-core/src/main/java/org/ugp/serialx/GenericScope.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,11 +104,11 @@ public boolean equals(Object obj)
104104
{
105105
if (obj instanceof GenericScope)
106106
return values().equals(((GenericScope<?, ?>) obj).values()) && variables().equals(((GenericScope<?, ?>) obj).variables());
107-
else if (obj instanceof Collection)
107+
if (obj instanceof Collection)
108108
return variablesCount() <= 0 && values().equals(obj);
109-
else if (obj instanceof Map)
109+
if (obj instanceof Map)
110110
return valuesCount() <= 0 && variables().equals(obj);
111-
else if (obj != null && obj.getClass().isArray())
111+
if (obj != null && obj.getClass().isArray())
112112
return variablesCount() <= 0 && Objects.deepEquals(toArray(), Utils.fromAmbiguousArray(obj));
113113
return super.equals(obj);
114114
}

‎SerialX-core/src/main/java/org/ugp/serialx/converters/StringConverter.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,12 @@ public CharSequence toString(ParserRegistry myHomeRegistry, Object arg, Object..
7979
str = "{"+str+"}";
8080
return str;
8181
}
82-
else if (serializeStringNormally)
82+
83+
if (serializeStringNormally)
8384
{
8485
if (contains(str, '\"', '\n', '\r'))
8586
return CONTINUE;
86-
else
87-
return "\""+str+"\"";
87+
return "\""+str+"\"";
8888
}
8989
}
9090
return CONTINUE;
@@ -158,4 +158,4 @@ public static String DirectCode(Object obj)
158158
{
159159
return "${" + obj + "}";
160160
}
161-
}
161+
}

‎SerialX-core/src/main/java/org/ugp/serialx/converters/imports/Import.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,9 @@ public boolean equals(Object obj)
9292
{
9393
if (obj instanceof String)
9494
return getClsAlias().equals(obj);
95-
else if (obj instanceof Class)
95+
if (obj instanceof Class)
9696
return getCls().equals(obj);
97-
else if (obj instanceof Import)
97+
if (obj instanceof Import)
9898
return getClsAlias().equals(((Import) obj).getClsAlias()) && getCls().equals(((Import) obj).getCls());
9999
return super.equals(obj);
100100
}

‎SerialX-devtools/pom.xml

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,25 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
2-
<modelVersion>4.0.0</modelVersion>
3-
<parent>
4-
<groupId>org.ugp</groupId>
5-
<artifactId>serialx</artifactId>
6-
<version>${revision}</version>
7-
</parent>
8-
9-
<groupId>org.ugp.serialx</groupId>
10-
<artifactId>serialx-devtools</artifactId>
11-
<version>1.3.8</version>
12-
13-
<name>SerialX devtools</name>
14-
<description>Tools for debugging, mainly for Parser/Converter API. It is intended for DSL developers and people who want to add their own data formats.</description>
15-
16-
<dependencies>
17-
<dependency>
18-
<groupId>org.ugp.serialx</groupId>
19-
<artifactId>serialx-core</artifactId>
20-
<version>${revision}</version>
21-
</dependency>
22-
</dependencies>
1+
<project xmlns="http://maven.apache.org/POM/4.0.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
4+
<modelVersion>4.0.0</modelVersion>
5+
<parent>
6+
<groupId>org.ugp</groupId>
7+
<artifactId>serialx</artifactId>
8+
<version>${revision}</version>
9+
</parent>
10+
11+
<groupId>org.ugp.serialx</groupId>
12+
<artifactId>serialx-devtools</artifactId>
13+
<version>1.3.8</version>
14+
15+
<name>SerialX devtools</name>
16+
<description>Tools for debugging, mainly for Parser/Converter API. It is intended for DSL developers and people who want to add their own data formats.</description>
17+
18+
<dependencies>
19+
<dependency>
20+
<groupId>org.ugp.serialx</groupId>
21+
<artifactId>serialx-core</artifactId>
22+
<version>${revision}</version>
23+
</dependency>
24+
</dependencies>
2325
</project>

‎SerialX-json/pom.xml

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,25 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
2-
<modelVersion>4.0.0</modelVersion>
3-
<parent>
4-
<groupId>org.ugp</groupId>
5-
<artifactId>serialx</artifactId>
6-
<version>${revision}</version>
7-
</parent>
8-
9-
<groupId>org.ugp.serialx</groupId>
10-
<artifactId>serialx-json</artifactId>
11-
<version>1.3.8</version>
12-
13-
<name>SerialX json</name>
14-
<description>SerialX Json support</description>
15-
16-
<dependencies>
17-
<dependency>
18-
<groupId>org.ugp.serialx</groupId>
19-
<artifactId>serialx-juss</artifactId>
20-
<version>${revision}</version>
21-
</dependency>
22-
</dependencies>
1+
<project xmlns="http://maven.apache.org/POM/4.0.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
4+
<modelVersion>4.0.0</modelVersion>
5+
<parent>
6+
<groupId>org.ugp</groupId>
7+
<artifactId>serialx</artifactId>
8+
<version>${revision}</version>
9+
</parent>
10+
11+
<groupId>org.ugp.serialx</groupId>
12+
<artifactId>serialx-json</artifactId>
13+
<version>1.3.8</version>
14+
15+
<name>SerialX json</name>
16+
<description>SerialX Json support</description>
17+
18+
<dependencies>
19+
<dependency>
20+
<groupId>org.ugp.serialx</groupId>
21+
<artifactId>serialx-juss</artifactId>
22+
<version>${revision}</version>
23+
</dependency>
24+
</dependencies>
2325
</project>

‎SerialX-juss/pom.xml

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,25 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
2-
<modelVersion>4.0.0</modelVersion>
3-
<parent>
4-
<groupId>org.ugp</groupId>
5-
<artifactId>serialx</artifactId>
6-
<version>${revision}</version>
7-
</parent>
8-
9-
<groupId>org.ugp.serialx</groupId>
10-
<artifactId>serialx-juss</artifactId>
11-
<version>1.3.8</version>
12-
13-
<name>SerialX juss</name>
14-
<description>SerialX support for Java Universal Serial Script data format, custom default format of SerialX!</description>
15-
16-
<dependencies>
17-
<dependency>
18-
<groupId>org.ugp.serialx</groupId>
19-
<artifactId>serialx-core</artifactId>
20-
<version>${revision}</version>
21-
</dependency>
22-
</dependencies>
1+
<project xmlns="http://maven.apache.org/POM/4.0.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
4+
<modelVersion>4.0.0</modelVersion>
5+
<parent>
6+
<groupId>org.ugp</groupId>
7+
<artifactId>serialx</artifactId>
8+
<version>${revision}</version>
9+
</parent>
10+
11+
<groupId>org.ugp.serialx</groupId>
12+
<artifactId>serialx-juss</artifactId>
13+
<version>1.3.8</version>
14+
15+
<name>SerialX juss</name>
16+
<description>SerialX support for Java Universal Serial Script data format, custom default format of SerialX!</description>
17+
18+
<dependencies>
19+
<dependency>
20+
<groupId>org.ugp.serialx</groupId>
21+
<artifactId>serialx-core</artifactId>
22+
<version>${revision}</version>
23+
</dependency>
24+
</dependencies>
2325
</project>

‎SerialX-operators/pom.xml

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,25 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
2-
<modelVersion>4.0.0</modelVersion>
3-
<parent>
4-
<groupId>org.ugp</groupId>
5-
<artifactId>serialx</artifactId>
6-
<version>${revision}</version>
7-
</parent>
8-
9-
<groupId>org.ugp.serialx</groupId>
10-
<artifactId>serialx-operators</artifactId>
11-
<version>1.3.8</version>
12-
13-
<name>SerialX operators</name>
14-
<description>This modul contains basic operators contained in almost every programing language...</description>
15-
16-
<dependencies>
17-
<dependency>
18-
<groupId>org.ugp.serialx</groupId>
19-
<artifactId>serialx-core</artifactId>
20-
<version>${revision}</version>
21-
</dependency>
22-
</dependencies>
1+
<project xmlns="http://maven.apache.org/POM/4.0.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
4+
<modelVersion>4.0.0</modelVersion>
5+
<parent>
6+
<groupId>org.ugp</groupId>
7+
<artifactId>serialx</artifactId>
8+
<version>${revision}</version>
9+
</parent>
10+
11+
<groupId>org.ugp.serialx</groupId>
12+
<artifactId>serialx-operators</artifactId>
13+
<version>1.3.8</version>
14+
15+
<name>SerialX operators</name>
16+
<description>This modul contains basic operators contained in almost every programing language...</description>
17+
18+
<dependencies>
19+
<dependency>
20+
<groupId>org.ugp.serialx</groupId>
21+
<artifactId>serialx-core</artifactId>
22+
<version>${revision}</version>
23+
</dependency>
24+
</dependencies>
2325
</project>

‎SerialX-operators/src/main/java/org/ugp/serialx/converters/operators/ComparisonOperators.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,13 +117,13 @@ public static Object toCompareFriendly(Object obj)
117117
{
118118
if (obj instanceof Map)
119119
return ((Map<?, ?>) obj).size();
120-
else if (obj instanceof Collection)
120+
if (obj instanceof Collection)
121121
return ((Collection<?>) obj).size();
122-
else if (obj instanceof Scope)
122+
if (obj instanceof Scope)
123123
return ((Scope) obj).valuesCount() + ((Scope) obj).variablesCount();
124-
else if (obj instanceof CharSequence)
124+
if (obj instanceof CharSequence)
125125
return ((CharSequence) obj).length();
126-
else if ((obj = ArithmeticOperators.toNum(obj)).getClass().isArray())
126+
if ((obj = ArithmeticOperators.toNum(obj)).getClass().isArray())
127127
return Array.getLength(obj);
128128
return obj;
129129
}

0 commit comments

Comments
 (0)