Skip to content

Commit 94065fe

Browse files
Merge remote-tracking branch 'origin/dev'
2 parents 733b976 + 4974b14 commit 94065fe

File tree

133 files changed

+4511
-191
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

133 files changed

+4511
-191
lines changed

wffweb/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.webfirmframework</groupId>
55
<artifactId>wffweb</artifactId>
6-
<version>3.0.1</version>
6+
<version>3.0.2</version>
77

88
<properties>
99
<maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>

wffweb/src/main/java/com/webfirmframework/wffweb/core/constants/CommonConstants.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,19 @@
1818
/**
1919
* @author WFF
2020
* @since 1.0.0
21-
* @version 1.0.0
21+
* @version 1.1.0
2222
*
2323
*/
2424
public final class CommonConstants {
2525

26+
/**
27+
* It is the maximum value for color
28+
*
29+
* @since 3.0.2
30+
*/
31+
public static final long FFFFFFFF_HEX_VALUE = Long.parseLong("FFFFFFFF",
32+
16);
33+
2634
public static final long FFFFFF_HEX_VALUE = Long.parseLong("FFFFFF", 16);
2735

2836
/**

wffweb/src/main/java/com/webfirmframework/wffweb/css/BackgroundColor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ public static boolean isValid(final String cssValue) {
314314

315315
final long value = Long.parseLong(trimmedCssValue.substring(1), 16);
316316

317-
return !(value > CommonConstants.FFFFFF_HEX_VALUE || value < 0);
317+
return !(value > CommonConstants.FFFFFFFF_HEX_VALUE || value < 0);
318318
} catch (final NumberFormatException ex) {
319319
}
320320

wffweb/src/main/java/com/webfirmframework/wffweb/css/BorderBottomColor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ public static boolean isValid(final String cssValue) {
317317

318318
final long value = Long.parseLong(trimmedCssValue.substring(1), 16);
319319

320-
return !(value > CommonConstants.FFFFFF_HEX_VALUE || value < 0);
320+
return !(value > CommonConstants.FFFFFFFF_HEX_VALUE || value < 0);
321321
} catch (final NumberFormatException ex) {
322322
// NOP
323323
}

wffweb/src/main/java/com/webfirmframework/wffweb/css/BorderLeftColor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ public static boolean isValid(final String cssValue) {
333333

334334
final long value = Long.parseLong(trimmedCssValue.substring(1), 16);
335335

336-
return !(value > CommonConstants.FFFFFF_HEX_VALUE || value < 0);
336+
return !(value > CommonConstants.FFFFFFFF_HEX_VALUE || value < 0);
337337
} catch (final NumberFormatException ex) {
338338
}
339339

wffweb/src/main/java/com/webfirmframework/wffweb/css/BorderRightColor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ public static boolean isValid(final String cssValue) {
327327

328328
final long value = Long.parseLong(trimmedCssValue.substring(1), 16);
329329

330-
return !(value > CommonConstants.FFFFFF_HEX_VALUE || value < 0);
330+
return !(value > CommonConstants.FFFFFFFF_HEX_VALUE || value < 0);
331331
} catch (final NumberFormatException ex) {
332332
}
333333

wffweb/src/main/java/com/webfirmframework/wffweb/css/BorderTopColor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ public static boolean isValid(final String cssValue) {
330330

331331
final long value = Long.parseLong(trimmedCssValue.substring(1), 16);
332332

333-
return !(value > CommonConstants.FFFFFF_HEX_VALUE || value < 0);
333+
return !(value > CommonConstants.FFFFFFFF_HEX_VALUE || value < 0);
334334
} catch (final NumberFormatException ex) {
335335
}
336336

wffweb/src/main/java/com/webfirmframework/wffweb/css/Color.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ public static boolean isValid(final String cssValue) {
330330
}
331331
final long value = Long.parseLong(trimmedCssValue.substring(1), 16);
332332

333-
return !(value > CommonConstants.FFFFFF_HEX_VALUE || value < 0);
333+
return !(value > CommonConstants.FFFFFFFF_HEX_VALUE || value < 0);
334334
} catch (final NumberFormatException ex) {
335335
}
336336

wffweb/src/main/java/com/webfirmframework/wffweb/css/OutlineColor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ public static boolean isValid(final String cssValue) {
320320

321321
final long value = Long.parseLong(trimmedCssValue.substring(1), 16);
322322

323-
return !(value > CommonConstants.FFFFFF_HEX_VALUE || value < 0);
323+
return !(value > CommonConstants.FFFFFFFF_HEX_VALUE || value < 0);
324324
} catch (final NumberFormatException ex) {
325325
}
326326

wffweb/src/main/java/com/webfirmframework/wffweb/css/UnicodeRange.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,12 @@ public class UnicodeRange extends AbstractCssProperty<UnicodeRange> {
5050

5151
private String[] unicodeChars;
5252

53+
/**
54+
* @since 1.1.2 initial implementation
55+
* @since 3.0.2 the default value is U+0-10FFFF
56+
*/
5357
public UnicodeRange() {
54-
setCssValue("");
58+
setCssValue(DEFAULT_VALUE);
5559
}
5660

5761
/**

0 commit comments

Comments
 (0)