- From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
- Date: Wed, 14 Sep 2005 15:14:20 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/properties
In directory hutz:/tmp/cvs-serv9389/org/w3c/css/properties
Modified Files:
ATSCProperties.properties Config.properties
PropertiesLoader.java TVProperties.properties
Log Message:
>From Jean-Guilhem Rouel (again!)
Reformatting of code
Fix for bug 774 [1] (even more warnings)
Fix for bug 768 [2]
Modification of the soap output format (each warning list and error list has
the URI it refers to)
[1] http://www.w3.org/Bugs/Public/show_bug.cgi?id=774
[2] http://www.w3.org/Bugs/Public/show_bug.cgi?id=768
Index: PropertiesLoader.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/PropertiesLoader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- PropertiesLoader.java 23 Aug 2005 16:22:55 -0000 1.1
+++ PropertiesLoader.java 14 Sep 2005 15:14:18 -0000 1.2
@@ -21,57 +21,57 @@
public class PropertiesLoader {
public static Utf8Properties DEFAULT_PROFILE;
-
+
/**
* Basic configuration of the CSS Validator
*/
public static Utf8Properties config;
-
+
/**
- * The association between properties and the media for which they
+ * The association between properties and the media for which they
* are defined
*/
public static Utf8Properties mediaProperties;
-
+
/**
* The list of existing profiles associated to their Java classes
*/
private static Utf8Properties profiles;
-
+
/**
- * This hashtable contains for each css profile, an Utf8Properties
+ * This hashtable contains for each css profile, an Utf8Properties
* containing all its properties
*/
private static Hashtable allProps;
-
- private static Utf8Properties loadProfile(String profile,
+
+ private static Utf8Properties loadProfile(String profile,
String profilePath) throws IOException {
-
+
Utf8Properties result = new Utf8Properties();
InputStream f = null;
-
+
URL url = null;
-
+
// the url of the properties file of the selected profile
if(profilePath != null) {
url = PropertiesLoader.class.getResource(profilePath);
}
f = url.openStream();
-
- // we load the properties
+
+ // we load the properties
result.load(f);
// we add the profile to the profiles Hashtable
allProps.put(new String(profile), result);
-
+
if(Util.onDebug) {
System.out.println(profile + " profile loaded");
}
return result;
}
-
+
/**
- *
+ *
* @param profile the profile needed
* @return an Utf8Properties containing all the properties for the specified profile
*/
@@ -80,16 +80,16 @@
// the profile has not been loaded yet
if(result == null) {
result = new Utf8Properties();
-
+
String profilePath = (String) profiles.get(profile);
-
+
if(profilePath != null && !profilePath.equals("")) {
try {
return loadProfile(profile, profilePath);
}
catch(IOException e) {
if(Util.onDebug) {
- System.out.println(PropertiesLoader.class +
+ System.out.println(PropertiesLoader.class +
": Error while loading " + profile +
" profile");
}
@@ -104,46 +104,46 @@
return result;
}
}
-
+
static {
config = new Utf8Properties();
mediaProperties = new Utf8Properties();
profiles = new Utf8Properties();
-
- allProps = new Hashtable();
+
+ allProps = new Hashtable();
InputStream f = null;
-
+
try {
// first, we load the general Config
URL url = PropertiesLoader.class.getResource("Config.properties");
f = url.openStream();
config.load(f);
-
+
// the media associated to each property
url = PropertiesLoader.class.getResource(config.getProperty("media"));
f = url.openStream();
mediaProperties.load(f);
-
+
// profiles
url = PropertiesLoader.class.getResource(
config.getProperty("profilesProperties"));
-
+
f = url.openStream();
profiles.load(f);
-
+
// Load the default profile
String defaultProfile = config.getProperty("defaultProfile");
String defaultPath = (String) profiles.get(defaultProfile);
DEFAULT_PROFILE = loadProfile(defaultProfile, defaultPath);
-
+
if(Util.onDebug) {
- System.out.println("Default profile (" + defaultProfile +
+ System.out.println("Default profile (" + defaultProfile +
") loaded");
}
-
+
} catch (Exception e) {
- System.err.println(PropertiesLoader.class +
+ System.err.println(PropertiesLoader.class +
": Error while loading default config");
e.printStackTrace();
} finally {
@@ -158,5 +158,5 @@
}
}
-
+
}
Index: ATSCProperties.properties
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/ATSCProperties.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ATSCProperties.properties 23 Aug 2005 16:36:13 -0000 1.1
+++ ATSCProperties.properties 14 Sep 2005 15:14:18 -0000 1.2
@@ -50,15 +50,15 @@
@page.widows: org.w3c.css.properties.paged.Widows
# Font properties
-@font-face.font-style: org.w3c.css.font.FontStyle
-@font-face.font-variant: org.w3c.css.font.FontVariant
-@font-face.font-weight: org.w3c.css.font.FontWeight
-@font-face.font-size: org.w3c.css.font.FontSize
-@font-face.font-family: org.w3c.css.font.FontFamily
-@font-face.font-stretch: org.w3c.css.font.FontStretch
-@font-face.unicode-range: org.w3c.css.font.UnicodeRange
+@font-face.font-style: org.w3c.css.properties.font.FontStyle
+@font-face.font-variant: org.w3c.css.properties.font.FontVariant
+@font-face.font-weight: org.w3c.css.properties.font.FontWeight
+@font-face.font-size: org.w3c.css.properties.font.FontSize
+@font-face.font-family: org.w3c.css.properties.font.FontFamily
+@font-face.font-stretch: org.w3c.css.properties.font.FontStretch
+@font-face.unicode-range: org.w3c.css.properties.font.UnicodeRange
#@font-face.units-per-em: org.w3c.css.font.UnitsPerEm
-@font-face.src: org.w3c.css.font.Src
+@font-face.src: org.w3c.css.properties.font.Src
#@font-face.panose-1: org.w3c.css.font.Panose1
#@font-face.stemv: org.w3c.css.font.Stemv
#@font-face.stemh: org.w3c.css.font.Stemh
@@ -77,25 +77,25 @@
# ATSC
-atsc-dynamic-refresh org.w3c.css.atsc.ATSCDynamicRefresh
-atsc-nav-down org.w3c.css.atsc.ATSCNavDown
-atsc-nav-index org.w3c.css.atsc.ATSCNavIndex
-atsc-nav-left org.w3c.css.atsc.ATSCNavLeft
-atsc-nav-right org.w3c.css.atsc.ATSCNavRight
-atsc-nav-up org.w3c.css.atsc.ATSCNavUp
+atsc-dynamic-refresh org.w3c.css.properties.atsc.ATSCDynamicRefresh
+atsc-nav-down org.w3c.css.properties.atsc.ATSCNavDown
+atsc-nav-index org.w3c.css.properties.atsc.ATSCNavIndex
+atsc-nav-left org.w3c.css.properties.atsc.ATSCNavLeft
+atsc-nav-right org.w3c.css.properties.atsc.ATSCNavRight
+atsc-nav-up org.w3c.css.properties.atsc.ATSCNavUp
font-style: org.w3c.css.properties.css1.CssFontStyleCSS2
font-variant: org.w3c.css.properties.css1.CssFontVariantCSS2
font-weight: org.w3c.css.properties.css1.CssFontWeightCSS2
font-size: org.w3c.css.properties.css1.CssFontSizeCSS2
font-family: org.w3c.css.properties.css1.CssFontFamilyCSS2
font: org.w3c.css.properties.css1.CssFontCSS2
-color: org.w3c.css.atsc.ATSCColor
-background-color: org.w3c.css.atsc.CssBackgroundColorATSC
-background-image: org.w3c.css.atsc.CssBackgroundImageATSC
-background-repeat: org.w3c.css.atsc.CssBackgroundRepeatATSC
-background-attachment: org.w3c.css.atsc.CssBackgroundAttachmentATSC
-background-position: org.w3c.css.atsc.CssBackgroundPositionATSC
-background: org.w3c.css.atsc.CssBackgroundATSC
+color: org.w3c.css.properties.atsc.ATSCColor
+background-color: org.w3c.css.properties.atsc.CssBackgroundColorATSC
+background-image: org.w3c.css.properties.atsc.CssBackgroundImageATSC
+background-repeat: org.w3c.css.properties.atsc.CssBackgroundRepeatATSC
+background-attachment: org.w3c.css.properties.atsc.CssBackgroundAttachmentATSC
+background-position: org.w3c.css.properties.atsc.CssBackgroundPositionATSC
+background: org.w3c.css.properties.atsc.CssBackgroundATSC
word-spacing: org.w3c.css.properties.css1.CssWordSpacing
letter-spacing: org.w3c.css.properties.css1.CssLetterSpacing
text-decoration: org.w3c.css.properties.css1.CssTextDecoration
@@ -114,26 +114,26 @@
padding-left: org.w3c.css.properties.css1.CssPaddingLeft
padding-right: org.w3c.css.properties.css1.CssPaddingRight
padding: org.w3c.css.properties.css1.CssPadding
-border-top-width: org.w3c.css.atsc.CssBorderTopWidthATSC
-border-right-width: org.w3c.css.atsc.CssBorderRightWidthATSC
-border-left-width: org.w3c.css.atsc.CssBorderLeftWidthATSC
-border-bottom-width: org.w3c.css.atsc.CssBorderBottomWidthATSC
-border-top-color: org.w3c.css.atsc.CssBorderTopColorATSC
-border-right-color: org.w3c.css.atsc.CssBorderRightColorATSC
-border-left-color: org.w3c.css.atsc.CssBorderLeftColorATSC
-border-bottom-color: org.w3c.css.atsc.CssBorderBottomColorATSC
-border-top-style: org.w3c.css.atsc.CssBorderTopStyleATSC
-border-right-style: org.w3c.css.atsc.CssBorderRightStyleATSC
-border-left-style: org.w3c.css.atsc.CssBorderLeftStyleATSC
-border-bottom-style: org.w3c.css.atsc.CssBorderBottomStyleATSC
-border-width: org.w3c.css.atsc.CssBorderWidthATSC
-border-color: org.w3c.css.atsc.CssBorderColorATSC
-border-style: org.w3c.css.atsc.CssBorderStyleATSC
-border-top: org.w3c.css.atsc.CssBorderTopATSC
-border-right: org.w3c.css.atsc.CssBorderRightATSC
-border-left: org.w3c.css.atsc.CssBorderLeftATSC
-border-bottom: org.w3c.css.atsc.CssBorderBottomATSC
-border: org.w3c.css.atsc.CssBorderATSC
+border-top-width: org.w3c.css.properties.atsc.CssBorderTopWidthATSC
+border-right-width: org.w3c.css.properties.atsc.CssBorderRightWidthATSC
+border-left-width: org.w3c.css.properties.atsc.CssBorderLeftWidthATSC
+border-bottom-width: org.w3c.css.properties.atsc.CssBorderBottomWidthATSC
+border-top-color: org.w3c.css.properties.atsc.CssBorderTopColorATSC
+border-right-color: org.w3c.css.properties.atsc.CssBorderRightColorATSC
+border-left-color: org.w3c.css.properties.atsc.CssBorderLeftColorATSC
+border-bottom-color: org.w3c.css.properties.atsc.CssBorderBottomColorATSC
+border-top-style: org.w3c.css.properties.atsc.CssBorderTopStyleATSC
+border-right-style: org.w3c.css.properties.atsc.CssBorderRightStyleATSC
+border-left-style: org.w3c.css.properties.atsc.CssBorderLeftStyleATSC
+border-bottom-style: org.w3c.css.properties.atsc.CssBorderBottomStyleATSC
+border-width: org.w3c.css.properties.atsc.CssBorderWidthATSC
+border-color: org.w3c.css.properties.atsc.CssBorderColorATSC
+border-style: org.w3c.css.properties.atsc.CssBorderStyleATSC
+border-top: org.w3c.css.properties.atsc.CssBorderTopATSC
+border-right: org.w3c.css.properties.atsc.CssBorderRightATSC
+border-left: org.w3c.css.properties.atsc.CssBorderLeftATSC
+border-bottom: org.w3c.css.properties.atsc.CssBorderBottomATSC
+border: org.w3c.css.properties.atsc.CssBorderATSC
width: org.w3c.css.properties.css1.CssWidth
height: org.w3c.css.properties.css1.CssHeight
float: org.w3c.css.properties.css1.CssFloat
@@ -156,32 +156,32 @@
content: org.w3c.css.properties.css1.CssContentCSS2
counter-reset: org.w3c.css.properties.css1.CssCounterReset
counter-increment: org.w3c.css.properties.css1.CssCounterIncrement
-font-style: org.w3c.css.font.FontStyle
-font-variant: org.w3c.css.font.FontVariant
-font-weight: org.w3c.css.font.FontWeight
-font-size: org.w3c.css.font.FontSize
-font-family: org.w3c.css.font.FontFamily
-font-stretch: org.w3c.css.font.FontStretch
-caption-side: org.w3c.css.table.CaptionSide
+font-style: org.w3c.css.properties.css1.CssFontStyleCSS2
+font-variant: org.w3c.css.properties.css1.CssFontVariantCSS2
+font-weight: org.w3c.css.properties.css1.CssFontWeightCSS2
+font-size: org.w3c.css.properties.css1.CssFontSizeCSS2
+font-family: org.w3c.css.properties.css1.CssFontFamilyCSS2
+font-stretch: org.w3c.css.properties.css1.CssFontStretchCSS2
+caption-side: org.w3c.css.properties.css2.table.CaptionSide
# these properties are valid for CSS2 but have a warning for ATSC
-units-per-em: org.w3c.css.atsc.UnitsPerEmATSC
-panose-1: org.w3c.css.atsc.Panose1ATSC
-stemv: org.w3c.css.atsc.StemvATSC
-stemh: org.w3c.css.atsc.StemhATSC
-slope: org.w3c.css.atsc.SlopeATSC
-cap-height: org.w3c.css.atsc.CapHeightATSC
-x-height: org.w3c.css.atsc.XHeightATSC
-widths: org.w3c.css.atsc.WidthsATSC
-ascent: org.w3c.css.atsc.AscentATSC
-descent: org.w3c.css.atsc.DescentATSC
-bbox: org.w3c.css.atsc.BboxATSC
-baseline: org.w3c.css.atsc.BaselineATSC
-centerline: org.w3c.css.atsc.CenterlineATSC
-definition-src: org.w3c.css.atsc.DefinitionSrcATSC
-mathline: org.w3c.css.atsc.MathlineATSC
-topline: org.w3c.css.atsc.ToplineATSC
+units-per-em: org.w3c.css.properties.atsc.UnitsPerEmATSC
+panose-1: org.w3c.css.properties.atsc.Panose1ATSC
+stemv: org.w3c.css.properties.atsc.StemvATSC
+stemh: org.w3c.css.properties.atsc.StemhATSC
+slope: org.w3c.css.properties.atsc.SlopeATSC
+cap-height: org.w3c.css.properties.atsc.CapHeightATSC
+x-height: org.w3c.css.properties.atsc.XHeightATSC
+widths: org.w3c.css.properties.atsc.WidthsATSC
+ascent: org.w3c.css.properties.atsc.AscentATSC
+descent: org.w3c.css.properties.atsc.DescentATSC
+bbox: org.w3c.css.properties.atsc.BboxATSC
+baseline: org.w3c.css.properties.atsc.BaselineATSC
+centerline: org.w3c.css.properties.atsc.CenterlineATSC
+definition-src: org.w3c.css.properties.atsc.DefinitionSrcATSC
+mathline: org.w3c.css.properties.atsc.MathlineATSC
+topline: org.w3c.css.properties.atsc.ToplineATSC
text-shadow: org.w3c.css.properties.css1.CssTextShadowATSC
direction: org.w3c.css.properties.css1.CssDirectionATSC
unicode-bidi: org.w3c.css.properties.css1.CssUnicodeBidiATSC
@@ -191,18 +191,18 @@
max-width: org.w3c.css.properties.css1.CssMaxWidthATSC
min-height: org.w3c.css.properties.css1.CssMinHeightATSC
max-height: org.w3c.css.properties.css1.CssMaxHeightATSC
-row-span: org.w3c.css.table.RowSpanATSC
-column-span: org.w3c.css.table.ColumnSpanATSC
-table-layout: org.w3c.css.table.TableLayoutATSC
-border-collapse: org.w3c.css.table.BorderCollapseATSC
-border-spacing: org.w3c.css.table.BorderSpacingATSC
-empty-cells: org.w3c.css.table.EmptyCellsATSC
-speak-header: org.w3c.css.table.SpeakHeaderATSC
-cursor: org.w3c.css.user.CursorATSC
-outline: org.w3c.css.user.OutlineATSC
-outline-width: org.w3c.css.user.OutlineWidthATSC
-outline-style: org.w3c.css.user.OutlineStyleATSC
-outline-color: org.w3c.css.user.OutlineColorATSC
+row-span: org.w3c.css.properties.css2.table.RowSpanATSC
+column-span: org.w3c.css.properties.css2.table.ColumnSpanATSC
+table-layout: org.w3c.css.properties.css2.table.TableLayoutATSC
+border-collapse: org.w3c.css.properties.css2.table.BorderCollapseATSC
+border-spacing: org.w3c.css.properties.css2.table.BorderSpacingATSC
+empty-cells: org.w3c.css.properties.css2.table.EmptyCellsATSC
+speak-header: org.w3c.css.properties.css2.table.SpeakHeaderATSC
+cursor: org.w3c.css.properties.css2.user.CursorATSC
+outline: org.w3c.css.properties.css2.user.OutlineATSC
+outline-width: org.w3c.css.properties.css2.user.OutlineWidthATSC
+outline-style: org.w3c.css.properties.css2.user.OutlineStyleATSC
+outline-color: org.w3c.css.properties.css2.user.OutlineColorATSC
page-break-before: org.w3c.css.properties.paged.PageBreakBeforeATSC
page-break-after: org.w3c.css.properties.paged.PageBreakAfterATSC
page-break-inside: org.w3c.css.properties.paged.PageBreakInsideATSC
Index: TVProperties.properties
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/TVProperties.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- TVProperties.properties 23 Aug 2005 16:36:13 -0000 1.1
+++ TVProperties.properties 14 Sep 2005 15:14:18 -0000 1.2
@@ -29,9 +29,9 @@
caption-side: org.w3c.css.table.CaptionSide
clear: org.w3c.css.properties.css1.CssClear
clip: org.w3c.css.properties.css1.CssClip
-color: org.w3c.css.properties.css3.CssColor
+color: org.w3c.css.properties.css1.CssColorCSS2
display: org.w3c.css.properties.css1.CssDisplayCSS1
-float: org.w3c.css.properties.css1.CssFloat
+float: org.w3c.css.properties.css1.CssFloatCSS2
font: org.w3c.css.properties.css1.CssFontCSS2
font-family: org.w3c.css.properties.css1.CssFontFamilyCSS2
font-size: org.w3c.css.properties.css1.CssFontSizeCSS2
Index: Config.properties
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/Config.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Config.properties 1 Sep 2005 11:51:21 -0000 1.2
+++ Config.properties 14 Sep 2005 15:14:18 -0000 1.3
@@ -6,19 +6,19 @@
# the CssStyle to use
#style for CSS1
-style1: org.w3c.css.properties.css1.Css1Style
+css1: org.w3c.css.properties.css1.Css1Style
#style for CSS2 (and mobile profile and TV profile)
-style2: org.w3c.css.properties.css2.font.Css2Style
+css2: org.w3c.css.properties.css2.font.Css2Style
#style for CSS2.1
-style21: org.w3c.css.properties.css21.Css21Style
+css21: org.w3c.css.properties.css21.Css21Style
#style for CSS3
-style3: org.w3c.css.properties.css3.Css3Style
+css3: org.w3c.css.properties.css3.Css3Style
#SVG styles
-svgstyle : org.w3c.css.properties.svg.SVGStyle
-svgbasicstyle : org.w3c.css.properties.svg.SVGBasicStyle
-svgtinystyle : org.w3c.css.properties.svg.SVGTinyStyle
+svgs : org.w3c.css.properties.svg.SVGStyle
+svgbasic : org.w3c.css.properties.svg.SVGBasicStyle
+svgtiny : org.w3c.css.properties.svg.SVGTinyStyle
#ATSC style
-styleatsc: org.w3c.css.properties.atsc.ATSCStyle
+atsc-tv: org.w3c.css.properties.atsc.ATSCStyle
#media
media: Media.properties
Received on Wednesday, 14 September 2005 15:16:15 UTC