- From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
- Date: Fri, 09 Sep 2011 12:16:45 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/properties/aural
In directory hutz:/tmp/cvs-serv18813/properties/aural
Modified Files:
ACssCue.java ACssPause.java ACssStyle.java
Removed Files:
ACssAzimuth.java
Log Message:
code cleanup, removed dead code, starting reorg of azimuth (others to follow)
Index: ACssPause.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/aural/ACssPause.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ACssPause.java 5 Jan 2010 13:49:36 -0000 1.4
+++ ACssPause.java 9 Sep 2011 12:16:43 -0000 1.5
@@ -6,7 +6,6 @@
// Please first read the full copyright statement in file COPYRIGHT.html
package org.w3c.css.properties.aural;
-import org.w3c.css.parser.CssPrinterStyle;
import org.w3c.css.parser.CssSelectors;
import org.w3c.css.parser.CssStyle;
import org.w3c.css.properties.css.CssProperty;
@@ -164,29 +163,6 @@
}
/**
- * Print this property.
- *
- * @param printer The printer.
- * @see #toString()
- * @see #getPropertyName()
- */
- public void print(CssPrinterStyle printer) {
- if ((pauseBefore != null && pauseAfter != null) &&
- (getImportant() ||
- (!pauseBefore.getImportant() &&
- !pauseAfter.getImportant()))) {
- printer.print(this);
- } else {
- if (pauseBefore != null) {
- pauseBefore.print(printer);
- }
- if (pauseAfter != null && !same) {
- pauseAfter.print(printer);
- }
- }
- }
-
- /**
* Add this property to the CssStyle
*
* @param style The CssStyle
--- ACssAzimuth.java DELETED ---
Index: ACssCue.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/aural/ACssCue.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ACssCue.java 5 Jan 2010 13:49:36 -0000 1.4
+++ ACssCue.java 9 Sep 2011 12:16:43 -0000 1.5
@@ -6,7 +6,6 @@
// Please first read the full copyright statement in file COPYRIGHT.html
package org.w3c.css.properties.aural;
-import org.w3c.css.parser.CssPrinterStyle;
import org.w3c.css.parser.CssSelectors;
import org.w3c.css.parser.CssStyle;
import org.w3c.css.properties.css.CssProperty;
@@ -144,27 +143,6 @@
}
/**
- * Print this property.
- *
- * @param printer The printer.
- * @see #toString()
- * @see #getPropertyName()
- */
- public void print(CssPrinterStyle printer) {
- if ((cueBefore != null && cueAfter != null) &&
- (getImportant() ||
- (!cueBefore.getImportant() &&
- !cueAfter.getImportant()))) {
- printer.print(this);
- } else {
- if (cueBefore != null)
- cueBefore.print(printer);
- if (cueAfter != null && !same)
- cueAfter.print(printer);
- }
- }
-
- /**
* Add this property to the CssStyle
*
* @param style The CssStyle
Index: ACssStyle.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/aural/ACssStyle.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ACssStyle.java 28 Mar 2008 16:36:45 -0000 1.5
+++ ACssStyle.java 9 Sep 2011 12:16:43 -0000 1.6
@@ -6,9 +6,6 @@
// Please first read the full copyright statement in file COPYRIGHT.html
package org.w3c.css.properties.aural;
-import java.util.Enumeration;
-
-import org.w3c.css.parser.CssPrinterStyle;
import org.w3c.css.parser.CssSelectors;
import org.w3c.css.properties.css1.Css1Style;
import org.w3c.css.util.ApplContext;
@@ -24,7 +21,6 @@
ACssVolume acssVolume;
ACssPause acssPause = new ACssPause(); // it's a macro
ACssCue acssCue = new ACssCue(); // it's a macro
- ACssAzimuth acssAzimuth;
ACssElevation acssElevation;
ACssSpeechRate acssSpeechRate;
ACssVoiceFamily acssVoiceFamily;
@@ -96,18 +92,6 @@
}
/**
- * Get the azimuth
- */
- public ACssAzimuth getAzimuth() {
- if (acssAzimuth == null) {
- acssAzimuth =
- (ACssAzimuth) style.CascadingOrder(new ACssAzimuth(),
- style, selector);
- }
- return acssAzimuth;
- }
-
- /**
* Get the elevation
*/
public ACssElevation getElevation() {
@@ -364,64 +348,7 @@
return acssPhonemes;
}
- public void print(CssPrinterStyle printer) {
- super.print(printer);
- if (acssVolume != null)
- acssVolume.print(printer);
- if (acssPlayDuring != null)
- acssPlayDuring.print(printer);
- acssPause.print(printer); // don't test null: it's a macro.
- if (acssAzimuth != null)
- acssAzimuth.print(printer);
- if (acssElevation != null)
- acssElevation.print(printer);
- if (acssSpeechRate != null)
- acssSpeechRate.print(printer);
- if (acssVoiceFamily != null)
- acssVoiceFamily.print(printer);
- if (acssPitch != null)
- acssPitch.print(printer);
- if (acssPitchRange != null)
- acssPitchRange.print(printer);
- acssCue.print(printer); // don't test null: it's a macro.
- if (acssStress != null)
- acssStress.print(printer);
- if (acssRichness != null)
- acssRichness.print(printer);
- if (acssSpeakPunctuation != null)
- acssSpeakPunctuation.print(printer);
- if (acssSpeakDate != null)
- acssSpeakDate.print(printer);
- if (acssSpeakNumeral != null)
- acssSpeakNumeral.print(printer);
- if (acssSpeakTime != null)
- acssSpeakTime.print(printer);
- if (acssSpeak != null)
- acssSpeak.print(printer);
- if (acssSpeakCSS3 != null)
- acssSpeakCSS3.print(printer);
- if (acssVoiceVolume != null)
- acssVoiceVolume.print(printer);
- if (acssVoiceBalance != null)
- acssVoiceBalance.print(printer);
- if (acssVoiceFamilyCSS3 != null)
- acssVoiceFamilyCSS3.print(printer);
- if (acssVoiceRate != null)
- acssVoiceRate.print(printer);
- if (acssVoicePitchRange != null)
- acssVoicePitchRange.print(printer);
- if (acssVoiceStress != null)
- acssVoiceStress.print(printer);
- if (acssVoiceDuration != null)
- acssVoiceDuration.print(printer);
- if (acssInterpretAs != null)
- acssInterpretAs.print(printer);
- if (acssPhonemes != null)
- acssPhonemes.print(printer);
-
- }
-
- /**
+ /**
* Find conflicts in this Style
*
* @param warnings For warnings reports.
Received on Friday, 9 September 2011 12:17:20 UTC