- From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
- Date: Tue, 23 Aug 2005 16:22:57 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/properties In directory hutz:/tmp/cvs-serv7360/properties Added Files: CSS1Properties.properties PropertiesLoader.java Removed Files: CSS1Default.properties Css1Style.java CssBackground.java CssBackgroundAttachment.java CssBackgroundAttachmentCSS1.java CssBackgroundAttachmentCSS2.java CssBackgroundAttachmentMob.java CssBackgroundCSS1.java CssBackgroundCSS2.java CssBackgroundColor.java CssBackgroundColorCSS1.java CssBackgroundColorCSS2.java CssBackgroundColorMob.java CssBackgroundConstants.java CssBackgroundImage.java CssBackgroundImageCSS1.java CssBackgroundImageCSS2.java CssBackgroundImageMob.java CssBackgroundMob.java CssBackgroundPosition.java CssBackgroundPositionCSS1.java CssBackgroundPositionCSS2.java CssBackgroundPositionMob.java CssBackgroundRepeat.java CssBackgroundRepeatCSS1.java CssBackgroundRepeatCSS2.java CssBackgroundRepeatMob.java CssBackgroundTV.java CssBorder.java CssBorderBottom.java CssBorderBottomCSS1.java CssBorderBottomCSS2.java CssBorderBottomColor.java CssBorderBottomColorCSS1.java CssBorderBottomColorCSS2.java CssBorderBottomStyle.java CssBorderBottomStyleCSS1.java CssBorderBottomStyleCSS2.java CssBorderBottomWidth.java CssBorderBottomWidthCSS1.java CssBorderBottomWidthCSS2.java CssBorderCSS1.java CssBorderCSS2.java CssBorderColor.java CssBorderColorCSS1.java CssBorderColorCSS2.java CssBorderFaceColor.java CssBorderFaceColorCSS1.java CssBorderFaceColorCSS2.java CssBorderFaceStyle.java CssBorderFaceStyleCSS1.java CssBorderFaceStyleCSS2.java CssBorderFaceWidth.java CssBorderFaceWidthCSS1.java CssBorderFaceWidthCSS2.java CssBorderLeft.java CssBorderLeftCSS1.java CssBorderLeftCSS2.java CssBorderLeftColor.java CssBorderLeftColorCSS1.java CssBorderLeftColorCSS2.java CssBorderLeftStyle.java CssBorderLeftStyleCSS1.java CssBorderLeftStyleCSS2.java CssBorderLeftWidth.java CssBorderLeftWidthCSS1.java CssBorderLeftWidthCSS2.java CssBorderRight.java CssBorderRightCSS1.java CssBorderRightCSS2.java CssBorderRightColor.java CssBorderRightColorCSS1.java CssBorderRightColorCSS2.java CssBorderRightStyle.java CssBorderRightStyleCSS1.java CssBorderRightStyleCSS2.java CssBorderRightWidth.java CssBorderRightWidthCSS1.java CssBorderRightWidthCSS2.java CssBorderStyle.java CssBorderStyleCSS1.java CssBorderStyleCSS2.java CssBorderTop.java CssBorderTopCSS1.java CssBorderTopCSS2.java CssBorderTopColor.java CssBorderTopColorCSS1.java CssBorderTopColorCSS2.java CssBorderTopStyle.java CssBorderTopStyleCSS1.java CssBorderTopStyleCSS2.java CssBorderTopWidth.java CssBorderTopWidthCSS1.java CssBorderTopWidthCSS2.java CssBorderWidth.java CssBorderWidthCSS1.java CssBorderWidthCSS2.java CssBottom.java CssBoxOffsetFace.java CssClear.java CssClip.java CssColor.java CssColorCSS1.java CssColorCSS2.java CssContent.java CssContentCSS2.java CssCounterIncrement.java CssCounterReset.java CssDirection.java CssDirectionATSC.java CssDisplay.java CssDisplayCSS1.java CssDisplayCSS2.java CssFloat.java CssFont.java CssFontCSS1.java CssFontCSS2.java CssFontConstant.java CssFontConstantCSS1.java CssFontConstantCSS2.java CssFontFamily.java CssFontFamilyCSS1.java CssFontFamilyCSS2.java CssFontSize.java CssFontSizeAdjust.java CssFontSizeAdjustCSS2.java CssFontSizeCSS1.java CssFontSizeCSS2.java CssFontStretch.java CssFontStretchCSS1.java CssFontStretchCSS2.java CssFontStyle.java CssFontStyleCSS1.java CssFontStyleCSS2.java CssFontVariant.java CssFontVariantCSS1.java CssFontVariantCSS2.java CssFontWeight.java CssFontWeightCSS1.java CssFontWeightCSS2.java CssHeight.java CssHeightMob.java CssLeft.java CssLetterSpacing.java CssLineHeight.java CssLineHeightCSS1.java CssLineHeightCSS2.java CssListStyle.java CssListStyleCSS1.java CssListStyleCSS2.java CssListStyleConstants.java CssListStyleImage.java CssListStyleImageCSS1.java CssListStyleImageCSS2.java CssListStylePosition.java CssListStylePositionCSS1.java CssListStylePositionCSS2.java CssListStyleTV.java CssListStyleType.java CssListStyleTypeCSS1.java CssListStyleTypeCSS2.java CssListStyleTypeTV.java CssMargin.java CssMarginBottom.java CssMarginLeft.java CssMarginRight.java CssMarginSide.java CssMarginTop.java CssMarkerOffset.java CssMarkerOffsetATSC.java CssMaxHeight.java CssMaxHeightATSC.java CssMaxWidth.java CssMaxWidthATSC.java CssMinHeight.java CssMinHeightATSC.java CssMinWidth.java CssMinWidthATSC.java CssOverflow.java CssPadding.java CssPaddingBottom.java CssPaddingLeft.java CssPaddingRight.java CssPaddingSide.java CssPaddingTop.java CssPosition.java CssPositionTV.java CssProperties.java CssProperty.java CssQuotes.java CssQuotesATSC.java CssRight.java CssTextAlign.java CssTextAlignMob.java CssTextAlignTV.java CssTextDecoration.java CssTextDecorationMob.java CssTextDecorationTV.java CssTextIndent.java CssTextIndentMob.java CssTextPropertiesConstants.java CssTextShadow.java CssTextShadowATSC.java CssTextTransform.java CssTop.java CssUnicodeBidi.java CssUnicodeBidiATSC.java CssVerticalAlign.java CssVerticalAlignCSS1.java CssVerticalAlignMob.java CssVerticalAlignTV.java CssVisibility.java CssWhiteSpace.java CssWidth.java CssWidthMob.java CssWordSpacing.java CssZIndex.java Makefile TextShadowFace.java Log Message: Patch by Jean-Guilhem Rouel Better handling of media and properties files Major reorganization of those properties files --- CssBorderTopStyleCSS2.java DELETED --- --- CssPaddingTop.java DELETED --- --- CssBorderBottomWidthCSS2.java DELETED --- --- CssBackgroundPosition.java DELETED --- --- CssBorderLeftWidth.java DELETED --- --- CssBorderColor.java DELETED --- --- CssPosition.java DELETED --- --- CssBorderBottom.java DELETED --- --- CssFontStretch.java DELETED --- --- CssHeight.java DELETED --- --- CssBackgroundMob.java DELETED --- --- CssMaxWidth.java DELETED --- --- CssListStyleCSS1.java DELETED --- --- CssBackgroundColor.java DELETED --- --- CssTextDecoration.java DELETED --- --- CssLineHeightCSS2.java DELETED --- --- CssTextAlign.java DELETED --- --- CssTextDecorationTV.java DELETED --- --- CssContent.java DELETED --- --- CssListStyleType.java DELETED --- --- CssDisplay.java DELETED --- --- CssPaddingSide.java DELETED --- --- CssTextPropertiesConstants.java DELETED --- --- CssListStyleImage.java DELETED --- --- CssBackgroundColorMob.java DELETED --- --- CssFontConstantCSS1.java DELETED --- --- CssBorderTopStyle.java DELETED --- --- CssLineHeight.java DELETED --- --- CssProperty.java DELETED --- --- CssFontSize.java DELETED --- --- CssListStyleTypeTV.java DELETED --- --- CssBorderStyleCSS1.java DELETED --- --- CssColorCSS1.java DELETED --- --- CssBackgroundAttachment.java DELETED --- --- CssBorderFaceColorCSS2.java DELETED --- --- CssBorderLeftWidthCSS1.java DELETED --- --- CssListStyleImageCSS2.java DELETED --- --- CssFontWeightCSS1.java DELETED --- --- Css1Style.java DELETED --- --- CssVerticalAlign.java DELETED --- --- CssBorderRightColor.java DELETED --- --- CssBorderBottomWidthCSS1.java DELETED --- --- CssDirection.java DELETED --- --- CssListStyleTypeCSS1.java DELETED --- --- CssMinHeight.java DELETED --- --- CssBorderColorCSS2.java DELETED --- --- CssBackgroundRepeatMob.java DELETED --- --- CssBorderFaceColorCSS1.java DELETED --- --- CssFontVariant.java DELETED --- --- CssPaddingRight.java DELETED --- --- CssBorderStyle.java DELETED --- --- CssBorderTopColorCSS2.java DELETED --- --- CssHeightMob.java DELETED --- --- Makefile DELETED --- --- CssBackgroundColorCSS2.java DELETED --- --- CssMinHeightATSC.java DELETED --- --- CssBackgroundAttachmentCSS2.java DELETED --- --- CssFontWeightCSS2.java DELETED --- --- CssBorderBottomStyleCSS1.java DELETED --- --- CssBorderTopStyleCSS1.java DELETED --- --- CssFontFamilyCSS1.java DELETED --- --- CssBackgroundRepeatCSS1.java DELETED --- --- CssPadding.java DELETED --- --- CssColorCSS2.java DELETED --- --- CssBorderRightStyle.java DELETED --- --- CssBorderTopCSS1.java DELETED --- --- CssBorderLeftCSS1.java DELETED --- --- CssBorderBottomColorCSS2.java DELETED --- --- CssTextIndent.java DELETED --- --- CssVerticalAlignTV.java DELETED --- --- CssFontStyleCSS1.java DELETED --- --- CssBackgroundPositionCSS1.java DELETED --- --- CssMarginRight.java DELETED --- --- CssBackgroundRepeatCSS2.java DELETED --- --- CssMarkerOffset.java DELETED --- --- CssFontWeight.java DELETED --- --- CssBorderTopWidth.java DELETED --- --- CssUnicodeBidiATSC.java DELETED --- --- CssColor.java DELETED --- --- CssBorderFaceWidthCSS2.java DELETED --- --- CssFontConstant.java DELETED --- --- CssBorderRightColorCSS1.java DELETED --- --- CssWordSpacing.java DELETED --- --- CssMaxHeight.java DELETED --- --- CssPaddingLeft.java DELETED --- --- CssBackgroundTV.java DELETED --- --- CssBorderBottomStyle.java DELETED --- --- CssBackgroundColorCSS1.java DELETED --- --- CssPositionTV.java DELETED --- --- CssBackgroundImage.java DELETED --- --- CssFontSizeAdjust.java DELETED --- --- CssBorderTop.java DELETED --- --- TextShadowFace.java DELETED --- --- CssBorderLeftColor.java DELETED --- --- CssLineHeightCSS1.java DELETED --- --- CssFontCSS1.java DELETED --- --- CssBackgroundRepeat.java DELETED --- --- CssCounterIncrement.java DELETED --- --- CssZIndex.java DELETED --- --- CssDirectionATSC.java DELETED --- --- CssBorderLeftWidthCSS2.java DELETED --- --- CssContentCSS2.java DELETED --- --- CssBorderColorCSS1.java DELETED --- --- CssBorderLeftStyleCSS1.java DELETED --- --- CssBorderBottomCSS2.java DELETED --- --- CssBorderWidthCSS1.java DELETED --- --- CssWidth.java DELETED --- --- CssBorderTopCSS2.java DELETED --- --- CssListStyle.java DELETED --- --- CssFontSizeCSS1.java DELETED --- --- CssDisplayCSS1.java DELETED --- --- CssCounterReset.java DELETED --- --- CssListStyleConstants.java DELETED --- --- CssMarginSide.java DELETED --- --- CssVerticalAlignMob.java DELETED --- --- CssBorderLeftCSS2.java DELETED --- --- CssBorderRightCSS1.java DELETED --- --- CssMaxHeightATSC.java DELETED --- --- CssFontStretchCSS1.java DELETED --- --- CssBorderBottomCSS1.java DELETED --- --- CssTextTransform.java DELETED --- --- CssFontFamilyCSS2.java DELETED --- --- CssBorderCSS1.java DELETED --- --- CssBorderBottomStyleCSS2.java DELETED --- --- CssFontStyleCSS2.java DELETED --- --- CssBorderFaceStyleCSS2.java DELETED --- --- CssFloat.java DELETED --- --- CssBackgroundPositionMob.java DELETED --- --- CssListStyleTypeCSS2.java DELETED --- --- CssBorderRightColorCSS2.java DELETED --- --- CssBorderFaceStyle.java DELETED --- --- CssListStylePositionCSS2.java DELETED --- --- CssBackgroundAttachmentCSS1.java DELETED --- --- CssVerticalAlignCSS1.java DELETED --- --- CssBackgroundImageCSS2.java DELETED --- --- CssQuotes.java DELETED --- --- CssLeft.java DELETED --- --- CssBorderTopWidthCSS2.java DELETED --- --- CssPaddingBottom.java DELETED --- --- CssBorderWidthCSS2.java DELETED --- --- CssBorderRight.java DELETED --- --- CssMinWidth.java DELETED --- --- CssBorderRightCSS2.java DELETED --- --- CssBorderTopColorCSS1.java DELETED --- --- CssMargin.java DELETED --- --- CssFontSizeAdjustCSS2.java DELETED --- --- CssBackgroundImageMob.java DELETED --- --- CssFontCSS2.java DELETED --- --- CssBorderRightStyleCSS2.java DELETED --- --- CssTop.java DELETED --- --- CssBorderRightWidth.java DELETED --- --- CssBorderWidth.java DELETED --- --- CssFontSizeCSS2.java DELETED --- --- CssTextAlignMob.java DELETED --- --- CssDisplayCSS2.java DELETED --- --- CssBackgroundPositionCSS2.java DELETED --- --- CssClip.java DELETED --- --- CssMarginBottom.java DELETED --- --- CssBorderBottomWidth.java DELETED --- --- CssBoxOffsetFace.java DELETED --- --- CssBorderStyleCSS2.java DELETED --- --- CssBorderTopWidthCSS1.java DELETED --- --- CssFont.java DELETED --- --- CssRight.java DELETED --- --- CssBorderLeft.java DELETED --- --- CssProperties.java DELETED --- --- CssLetterSpacing.java DELETED --- --- CssListStylePosition.java DELETED --- --- CssFontStretchCSS2.java DELETED --- --- CssBorderFaceStyleCSS1.java DELETED --- --- CssVisibility.java DELETED --- --- CssBorderRightStyleCSS1.java DELETED --- --- CssBackgroundAttachmentMob.java DELETED --- --- CssBottom.java DELETED --- --- CssFontVariantCSS2.java DELETED --- --- CssMarkerOffsetATSC.java DELETED --- --- CssBorderFaceColor.java DELETED --- --- CssTextShadowATSC.java DELETED --- --- CssFontVariantCSS1.java DELETED --- --- CssBorderFaceWidthCSS1.java DELETED --- --- CssBorderBottomColorCSS1.java DELETED --- --- NEW FILE: CSS1Properties.properties --- # Fonts properties font-style: org.w3c.css.properties.css1.CssFontStyleCSS1 font-variant: org.w3c.css.properties.css1.CssFontVariantCSS1 font-weight: org.w3c.css.properties.css1.CssFontWeightCSS1 font-stretch: org.w3c.css.properties.css1.CssFontStretchCSS1 font-size: org.w3c.css.properties.css1.CssFontSizeCSS1 font-family: org.w3c.css.properties.css1.CssFontFamilyCSS1 font: org.w3c.css.properties.css1.CssFontCSS1 color: org.w3c.css.properties.css1.CssColorCSS1 background-color: org.w3c.css.properties.css1.CssBackgroundColorCSS1 background-image: org.w3c.css.properties.css1.CssBackgroundImageCSS1 background-repeat: org.w3c.css.properties.css1.CssBackgroundRepeatCSS1 background-attachment: org.w3c.css.properties.css1.CssBackgroundAttachmentCSS1 background-position: org.w3c.css.properties.css1.CssBackgroundPositionCSS1 background: org.w3c.css.properties.css1.CssBackgroundCSS1 word-spacing: org.w3c.css.properties.css1.CssWordSpacing letter-spacing: org.w3c.css.properties.css1.CssLetterSpacing text-decoration: org.w3c.css.properties.css1.CssTextDecoration vertical-align: org.w3c.css.properties.css1.CssVerticalAlignCSS1 text-transform: org.w3c.css.properties.css1.CssTextTransform text-align: org.w3c.css.properties.css1.CssTextAlign text-indent: org.w3c.css.properties.css1.CssTextIndent line-height: org.w3c.css.properties.css1.CssLineHeightCSS1 margin-top: org.w3c.css.properties.css1.CssMarginTop margin-bottom: org.w3c.css.properties.css1.CssMarginBottom margin-left: org.w3c.css.properties.css1.CssMarginLeft margin-right: org.w3c.css.properties.css1.CssMarginRight margin: org.w3c.css.properties.css1.CssMargin padding-top: org.w3c.css.properties.css1.CssPaddingTop padding-bottom: org.w3c.css.properties.css1.CssPaddingBottom 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.properties.css1.CssBorderTopWidthCSS1 border-right-width: org.w3c.css.properties.css1.CssBorderRightWidthCSS1 border-left-width: org.w3c.css.properties.css1.CssBorderLeftWidthCSS1 border-bottom-width: org.w3c.css.properties.css1.CssBorderBottomWidthCSS1 border-width: org.w3c.css.properties.css1.CssBorderWidthCSS1 border-color: org.w3c.css.properties.css1.CssBorderColorCSS1 border-style: org.w3c.css.properties.css1.CssBorderStyleCSS1 border-top: org.w3c.css.properties.css1.CssBorderTopCSS1 border-right: org.w3c.css.properties.css1.CssBorderRightCSS1 border-left: org.w3c.css.properties.css1.CssBorderLeftCSS1 border-bottom: org.w3c.css.properties.css1.CssBorderBottomCSS1 border: org.w3c.css.properties.css1.CssBorderCSS1 width: org.w3c.css.properties.css1.CssWidth height: org.w3c.css.properties.css1.CssHeight float: org.w3c.css.properties.css1.CssFloat clear: org.w3c.css.properties.css1.CssClear display: org.w3c.css.properties.css1.CssDisplayCSS1 # position: org.w3c.css.properties.css1.CssPosition white-space: org.w3c.css.properties.css1.CssWhiteSpace list-style-type: org.w3c.css.properties.css1.CssListStyleTypeCSS1 list-style-image: org.w3c.css.properties.css1.CssListStyleImageCSS1 list-style-position: org.w3c.css.properties.css1.CssListStylePositionCSS1 list-style: org.w3c.css.properties.css1.CssListStyleCSS1 --- CssBorderLeftStyle.java DELETED --- --- CssWidthMob.java DELETED --- --- CssBackgroundCSS2.java DELETED --- --- CssFontFamily.java DELETED --- --- CssBackgroundImageCSS1.java DELETED --- --- CssTextShadow.java DELETED --- --- CssBorder.java DELETED --- --- CssFontConstantCSS2.java DELETED --- --- CssBorderBottomColor.java DELETED --- --- CssBorderCSS2.java DELETED --- --- CssBorderTopColor.java DELETED --- --- CssFontStyle.java DELETED --- --- CssBorderRightWidthCSS1.java DELETED --- --- CssListStyleCSS2.java DELETED --- --- CssBackground.java DELETED --- --- CssMinWidthATSC.java DELETED --- --- CssUnicodeBidi.java DELETED --- --- CssListStyleTV.java DELETED --- --- CssListStylePositionCSS1.java DELETED --- --- CssWhiteSpace.java DELETED --- --- CssClear.java DELETED --- --- CssBackgroundCSS1.java DELETED --- --- CssListStyleImageCSS1.java DELETED --- --- NEW FILE: PropertiesLoader.java --- // $Id: PropertiesLoader.java,v 1.1 2005/08/23 16:22:55 ylafon Exp $ // Author: Jean-Guilhem Rouel // (c) COPYRIGHT MIT, ERCIM and Keio, 2005. // Please first read the full copyright statement in file COPYRIGHT.html package org.w3c.css.properties; import java.io.IOException; import java.io.InputStream; import java.net.URL; import java.util.Hashtable; import org.w3c.css.util.Utf8Properties; import org.w3c.css.util.Util; /** * PropertiesLoader<br /> * Created: Aug 16, 2005 5:19:44 PM<br /> * This class is a factory used to load all the CSS-related properties files */ 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 * 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 * containing all its properties */ private static Hashtable allProps; 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 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 */ public static Utf8Properties getProfile(String profile) { Utf8Properties result = (Utf8Properties) allProps.get(profile); // 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 + ": Error while loading " + profile + " profile"); } e.printStackTrace(); } } // if the wanted profile is unknown, or there has been an error // while loading it, we return the default profile return DEFAULT_PROFILE; } else { return result; } } static { config = new Utf8Properties(); mediaProperties = new Utf8Properties(); profiles = new Utf8Properties(); 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 + ") loaded"); } } catch (Exception e) { System.err.println(PropertiesLoader.class + ": Error while loading default config"); e.printStackTrace(); } finally { try { if (f != null) { f.close(); f = null; } } catch (Exception e) { e.printStackTrace(); } } } } --- CssTextAlignTV.java DELETED --- --- CssTextIndentMob.java DELETED --- --- CssMaxWidthATSC.java DELETED --- --- CssBackgroundConstants.java DELETED --- --- CssBorderLeftStyleCSS2.java DELETED --- --- CssBorderLeftColorCSS1.java DELETED --- --- CSS1Default.properties DELETED --- --- CssQuotesATSC.java DELETED --- --- CssMarginTop.java DELETED --- --- CssTextDecorationMob.java DELETED --- --- CssMarginLeft.java DELETED --- --- CssBorderLeftColorCSS2.java DELETED --- --- CssOverflow.java DELETED --- --- CssBorderRightWidthCSS2.java DELETED --- --- CssBorderFaceWidth.java DELETED ---
Received on Tuesday, 23 August 2005 16:24:05 UTC