You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2006/08/01 19:44:01 UTC
svn commit: r427657 [8/42] - in /myfaces:
core/trunk/api/src/main/java/javax/faces/component/
core/trunk/api/src/test/java/javax/faces/
core/trunk/api/src/test/java/javax/faces/application/
core/trunk/api/src/test/java/javax/faces/component/ core/trunk...
Modified: myfaces/tobago/trunk/theme/scarborough/src/test/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/DateUnitTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/test/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/DateUnitTest.java?rev=427657&r1=427656&r2=427657&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/test/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/DateUnitTest.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/test/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/DateUnitTest.java Tue Aug 1 10:43:28 2006
@@ -1,182 +1,182 @@
-/*
- * Copyright 2002-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/*
- * Created 23.11.2005 15:53:49.
- * $Id$
- */
-package org.apache.myfaces.tobago.renderkit.html.scarborough.standard;
-
-import org.mozilla.javascript.JavaScriptException;
-
-import java.io.IOException;
-import java.text.DecimalFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-import java.util.Locale;
-
-public class DateUnitTest extends AbstractJavaScriptTestBase {
-
- private static final int[] YEAR_MONTH_DAY
- = {Calendar.YEAR, Calendar.MONTH, Calendar.DAY_OF_MONTH};
-
- private static final List<Date> DATES = Arrays.asList(
- createDate(1970, 1, 1),
- createDate(2005, 11, 21),
- createDate(2005, 12, 24),
- createDate(1972, 1, 29)
- );
-
- private static Date createDate(int year, int month, int day) {
- Calendar calendar = Calendar.getInstance(Locale.ENGLISH); // XXX
- calendar.set(Calendar.YEAR, year);
- calendar.set(Calendar.MONTH, month - 1);
- calendar.set(Calendar.DAY_OF_MONTH, day);
- return calendar.getTime();
- }
-
- protected void setUp() throws Exception {
- super.setUp();
- loadScriptFile("dateConverter.js");
- }
-
- public void testNumberOnlyDateFormats() throws IOException, JavaScriptException {
- for (int i = 0; i < DATES.size(); i++) {
- Date date = DATES.get(i);
- checkFormat("yyyyMMdd", date, YEAR_MONTH_DAY, Locale.ENGLISH);
- checkFormat("ddMMyyyy", date, YEAR_MONTH_DAY, Locale.ENGLISH);
- checkFormat("d.M.yyyy", date, YEAR_MONTH_DAY, Locale.ENGLISH);
- checkFormat("dd.MM.yyyy", date, YEAR_MONTH_DAY, Locale.ENGLISH);
- checkFormat("dd/MM/yyyy", date, YEAR_MONTH_DAY, Locale.ENGLISH);
- checkFormat("dd/MM/yyy", date, YEAR_MONTH_DAY, Locale.ENGLISH);
- checkFormat("dd/MM/yy", date, YEAR_MONTH_DAY, Locale.ENGLISH);
- checkFormat("EddMMyyyy", date, YEAR_MONTH_DAY, Locale.ENGLISH);
- }
- }
-
- public void testEnglishMonths() throws IOException {
- for (int month = 1; month <= 12; ++month) {
- Date date = createDate(2005, month, 10);
- StringBuffer format = new StringBuffer("M");
- for (int i = 0; i < 4; ++i) {
- format.append('M');
- checkFormat(format.toString(), date, new int[] {Calendar.MONTH}, Locale.ENGLISH);
- }
- }
- }
-
- public void testTwoDigitYears() throws IOException, ParseException {
- checkTwoDigitYears(Locale.ENGLISH);
- checkTwoDigitYears(Locale.GERMAN);
- }
-
- public void checkTwoDigitYears(Locale locale) throws IOException, ParseException {
- DecimalFormat decimalFormat = new DecimalFormat("00");
- SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yy", locale);
- Calendar calendar = Calendar.getInstance(locale);
- for (int year = 0; year < 100; ++year) {
- String yearString = decimalFormat.format(year);
- calendar.setTime(simpleDateFormat.parse(yearString));
- assertEquals(calendar.get(Calendar.YEAR), evalParseDate(yearString, "yy", locale).get(Calendar.YEAR));
- }
- }
-
- public void testEnglishWeekDays() throws IOException {
- for (int day = 1; day <= 7; ++day) {
- Calendar calendar = Calendar.getInstance();
- calendar.set(Calendar.DAY_OF_WEEK, day);
- Date date = calendar.getTime();
-
- StringBuffer format = new StringBuffer();
- for (int i = 0; i < 4; ++i) {
- format.append('E');
- checkFormat(format.toString(), date, new int[0], Locale.ENGLISH); // XXX new int[] {Calendar.DAY_OF_WEEK}
- }
- }
- }
-
- private Object evalFormatDate(Date date, String format) {
- // SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
- // System.out.println(simpleDateFormat.format(date) + " -> " + o);
- return eval("new SimpleDateFormat(\"" + format + "\")"
- + ".format(new Date(" + date.getTime() + "))");
- }
-
- public void testLocalization() {
- assertEquals("January", eval("var s = new DateFormatSymbols(); s.months[0]"));
- assertEquals("Januar", eval(createSymbols("s", Locale.GERMAN) + "s.months[0]"));
- }
-
- private String createSymbols(String var, Locale locale) {
- return "var " + var + " = new DateFormatSymbols(); "
- + var + ".months = new Array("
- + createStringList(DateTestUtils.createMonthNames(true, locale)) + ");"
- + var + ".shortMonths = new Array("
- + createStringList(DateTestUtils.createMonthNames(false, locale)) + ");"
- + var + ".weekdays = new Array("
- + createStringList(DateTestUtils.createDayNames(true, locale)) + ");"
- + var + ".shortWeekdays = new Array("
- + createStringList(DateTestUtils.createDayNames(false, locale)) + ");";
- }
-
- private String createStringList(List<String> strings) {
- return "'" + join(strings, "', '") + "'";
- }
-
- private String join(List<String> strings, String separator) {
- StringBuilder builder = new StringBuilder();
- for (int i = 0; i < strings.size(); i++) {
- String s = strings.get(i);
- if (i > 0) {
- builder.append(separator);
- }
- builder.append(s);
- }
- return builder.toString();
- }
-
- private Calendar evalParseDate(String input, String format, Locale locale) {
- long time = evalLong(createSymbols("s", locale) + ";"
- + "new SimpleDateFormat(\"" + format + "\", s)"
- + ".parse(\"" + input + "\").getTime()");
- Calendar calendar = Calendar.getInstance(locale);
- calendar.setTime(new Date(time));
- return calendar;
- }
-
- private void checkFormat(String format, Date date, int[] fields,
- Locale locale) {
- SimpleDateFormat simpleDateFormat = new SimpleDateFormat(format, locale);
- assertEquals(simpleDateFormat.format(date), evalFormatDate(date, format));
- Calendar calendar1 = Calendar.getInstance(locale);
- calendar1.setTime(date);
- Calendar calendar2 = evalParseDate(
- simpleDateFormat.format(date), format, locale);
- for (int i = 0; i < fields.length; i++) {
- int field = fields[i];
- checkField(calendar1, calendar2, field);
- }
- }
-
- private void checkField(Calendar calendar1, Calendar calendar2, int field) {
- assertEquals(calendar1.get(field), calendar2.get(field));
- }
-
-}
+/*
+ * Copyright 2002-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * Created 23.11.2005 15:53:49.
+ * $Id$
+ */
+package org.apache.myfaces.tobago.renderkit.html.scarborough.standard;
+
+import org.mozilla.javascript.JavaScriptException;
+
+import java.io.IOException;
+import java.text.DecimalFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+
+public class DateUnitTest extends AbstractJavaScriptTestBase {
+
+ private static final int[] YEAR_MONTH_DAY
+ = {Calendar.YEAR, Calendar.MONTH, Calendar.DAY_OF_MONTH};
+
+ private static final List<Date> DATES = Arrays.asList(
+ createDate(1970, 1, 1),
+ createDate(2005, 11, 21),
+ createDate(2005, 12, 24),
+ createDate(1972, 1, 29)
+ );
+
+ private static Date createDate(int year, int month, int day) {
+ Calendar calendar = Calendar.getInstance(Locale.ENGLISH); // XXX
+ calendar.set(Calendar.YEAR, year);
+ calendar.set(Calendar.MONTH, month - 1);
+ calendar.set(Calendar.DAY_OF_MONTH, day);
+ return calendar.getTime();
+ }
+
+ protected void setUp() throws Exception {
+ super.setUp();
+ loadScriptFile("dateConverter.js");
+ }
+
+ public void testNumberOnlyDateFormats() throws IOException, JavaScriptException {
+ for (int i = 0; i < DATES.size(); i++) {
+ Date date = DATES.get(i);
+ checkFormat("yyyyMMdd", date, YEAR_MONTH_DAY, Locale.ENGLISH);
+ checkFormat("ddMMyyyy", date, YEAR_MONTH_DAY, Locale.ENGLISH);
+ checkFormat("d.M.yyyy", date, YEAR_MONTH_DAY, Locale.ENGLISH);
+ checkFormat("dd.MM.yyyy", date, YEAR_MONTH_DAY, Locale.ENGLISH);
+ checkFormat("dd/MM/yyyy", date, YEAR_MONTH_DAY, Locale.ENGLISH);
+ checkFormat("dd/MM/yyy", date, YEAR_MONTH_DAY, Locale.ENGLISH);
+ checkFormat("dd/MM/yy", date, YEAR_MONTH_DAY, Locale.ENGLISH);
+ checkFormat("EddMMyyyy", date, YEAR_MONTH_DAY, Locale.ENGLISH);
+ }
+ }
+
+ public void testEnglishMonths() throws IOException {
+ for (int month = 1; month <= 12; ++month) {
+ Date date = createDate(2005, month, 10);
+ StringBuffer format = new StringBuffer("M");
+ for (int i = 0; i < 4; ++i) {
+ format.append('M');
+ checkFormat(format.toString(), date, new int[] {Calendar.MONTH}, Locale.ENGLISH);
+ }
+ }
+ }
+
+ public void testTwoDigitYears() throws IOException, ParseException {
+ checkTwoDigitYears(Locale.ENGLISH);
+ checkTwoDigitYears(Locale.GERMAN);
+ }
+
+ public void checkTwoDigitYears(Locale locale) throws IOException, ParseException {
+ DecimalFormat decimalFormat = new DecimalFormat("00");
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yy", locale);
+ Calendar calendar = Calendar.getInstance(locale);
+ for (int year = 0; year < 100; ++year) {
+ String yearString = decimalFormat.format(year);
+ calendar.setTime(simpleDateFormat.parse(yearString));
+ assertEquals(calendar.get(Calendar.YEAR), evalParseDate(yearString, "yy", locale).get(Calendar.YEAR));
+ }
+ }
+
+ public void testEnglishWeekDays() throws IOException {
+ for (int day = 1; day <= 7; ++day) {
+ Calendar calendar = Calendar.getInstance();
+ calendar.set(Calendar.DAY_OF_WEEK, day);
+ Date date = calendar.getTime();
+
+ StringBuffer format = new StringBuffer();
+ for (int i = 0; i < 4; ++i) {
+ format.append('E');
+ checkFormat(format.toString(), date, new int[0], Locale.ENGLISH); // XXX new int[] {Calendar.DAY_OF_WEEK}
+ }
+ }
+ }
+
+ private Object evalFormatDate(Date date, String format) {
+ // SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
+ // System.out.println(simpleDateFormat.format(date) + " -> " + o);
+ return eval("new SimpleDateFormat(\"" + format + "\")"
+ + ".format(new Date(" + date.getTime() + "))");
+ }
+
+ public void testLocalization() {
+ assertEquals("January", eval("var s = new DateFormatSymbols(); s.months[0]"));
+ assertEquals("Januar", eval(createSymbols("s", Locale.GERMAN) + "s.months[0]"));
+ }
+
+ private String createSymbols(String var, Locale locale) {
+ return "var " + var + " = new DateFormatSymbols(); "
+ + var + ".months = new Array("
+ + createStringList(DateTestUtils.createMonthNames(true, locale)) + ");"
+ + var + ".shortMonths = new Array("
+ + createStringList(DateTestUtils.createMonthNames(false, locale)) + ");"
+ + var + ".weekdays = new Array("
+ + createStringList(DateTestUtils.createDayNames(true, locale)) + ");"
+ + var + ".shortWeekdays = new Array("
+ + createStringList(DateTestUtils.createDayNames(false, locale)) + ");";
+ }
+
+ private String createStringList(List<String> strings) {
+ return "'" + join(strings, "', '") + "'";
+ }
+
+ private String join(List<String> strings, String separator) {
+ StringBuilder builder = new StringBuilder();
+ for (int i = 0; i < strings.size(); i++) {
+ String s = strings.get(i);
+ if (i > 0) {
+ builder.append(separator);
+ }
+ builder.append(s);
+ }
+ return builder.toString();
+ }
+
+ private Calendar evalParseDate(String input, String format, Locale locale) {
+ long time = evalLong(createSymbols("s", locale) + ";"
+ + "new SimpleDateFormat(\"" + format + "\", s)"
+ + ".parse(\"" + input + "\").getTime()");
+ Calendar calendar = Calendar.getInstance(locale);
+ calendar.setTime(new Date(time));
+ return calendar;
+ }
+
+ private void checkFormat(String format, Date date, int[] fields,
+ Locale locale) {
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat(format, locale);
+ assertEquals(simpleDateFormat.format(date), evalFormatDate(date, format));
+ Calendar calendar1 = Calendar.getInstance(locale);
+ calendar1.setTime(date);
+ Calendar calendar2 = evalParseDate(
+ simpleDateFormat.format(date), format, locale);
+ for (int i = 0; i < fields.length; i++) {
+ int field = fields[i];
+ checkField(calendar1, calendar2, field);
+ }
+ }
+
+ private void checkField(Calendar calendar1, Calendar calendar2, int field) {
+ assertEquals(calendar1.get(field), calendar2.get(field));
+ }
+
+}
Propchange: myfaces/tobago/trunk/theme/scarborough/src/test/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/DateUnitTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/theme/speyside/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/script/theme-config.js
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/theme/standard/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/tobago/trunk/theme/standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/msie/script/tobago.js
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/msie/script/tobago.js?rev=427657&r1=427656&r2=427657&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/msie/script/tobago.js (original)
+++ myfaces/tobago/trunk/theme/standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/msie/script/tobago.js Tue Aug 1 10:43:28 2006
@@ -1,64 +1,64 @@
-Tobago.loadPngFix= function() {
-
- var images = document.getElementsByTagName("img");
- var supported = /MSIE (5\.5)|[6789]/.test(navigator.userAgent) && navigator.platform == "Win32";
-
- if (! supported) {
- return;
- }
-
- for (i = 0; i < images.length; i++) {
-
- var image = images[i];
-
- fixImage(image);
- Tobago.addEventListener(image, 'propertyChanged', propertyChanged);
- }
- }
-
- function propertyChanged() {
-
- var pName = event.propertyName;
- if (pName != "src") return;
- // if not set to blank
- if ( ! new RegExp(Tobago.pngFixBlankImage).test(src)) {
- fixImage(this);
- }
- }
-
- function fixImage(element) {
- // get src
- var src = element.src;
- // check for real change
-
- if (src == element.realSrc) {
- element.src = Tobago.pngFixBlankImage;
- return;
- }
-
- if ( ! new RegExp(Tobago.pngFixBlankImage).test(src)) {
- // backup old src
- element.realSrc = src;
- }
-
- // test for png
- if (element.realSrc != null &&
- /\.png$/.test( element.realSrc.toLowerCase() ) ) {
- // get width and height of old src
- var origWidth = element.clientWidth;
- var origHeight = element.clientHeight;
-
- // set blank image
- element.src = Tobago.pngFixBlankImage;
- // set filter
-
- element.runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" +
- src + "',sizingMethod='scale')";
- element.style.width = origWidth + 'px';
- element.style.height = origHeight + 'px';
-
- } else {
- // remove filter
- element.runtimeStyle.filter = "";
- }
+Tobago.loadPngFix= function() {
+
+ var images = document.getElementsByTagName("img");
+ var supported = /MSIE (5\.5)|[6789]/.test(navigator.userAgent) && navigator.platform == "Win32";
+
+ if (! supported) {
+ return;
+ }
+
+ for (i = 0; i < images.length; i++) {
+
+ var image = images[i];
+
+ fixImage(image);
+ Tobago.addEventListener(image, 'propertyChanged', propertyChanged);
+ }
+ }
+
+ function propertyChanged() {
+
+ var pName = event.propertyName;
+ if (pName != "src") return;
+ // if not set to blank
+ if ( ! new RegExp(Tobago.pngFixBlankImage).test(src)) {
+ fixImage(this);
+ }
+ }
+
+ function fixImage(element) {
+ // get src
+ var src = element.src;
+ // check for real change
+
+ if (src == element.realSrc) {
+ element.src = Tobago.pngFixBlankImage;
+ return;
+ }
+
+ if ( ! new RegExp(Tobago.pngFixBlankImage).test(src)) {
+ // backup old src
+ element.realSrc = src;
+ }
+
+ // test for png
+ if (element.realSrc != null &&
+ /\.png$/.test( element.realSrc.toLowerCase() ) ) {
+ // get width and height of old src
+ var origWidth = element.clientWidth;
+ var origHeight = element.clientHeight;
+
+ // set blank image
+ element.src = Tobago.pngFixBlankImage;
+ // set filter
+
+ element.runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" +
+ src + "',sizingMethod='scale')";
+ element.style.width = origWidth + 'px';
+ element.style.height = origHeight + 'px';
+
+ } else {
+ // remove filter
+ element.runtimeStyle.filter = "";
+ }
}
Propchange: myfaces/tobago/trunk/theme/standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/msie/script/tobago.js
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/theme/standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/controls.js
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/theme/standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/dragdrop.js
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/theme/standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/effects.js
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/theme/standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/inputSuggest.js
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/theme/standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/logging.js
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/theme/standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/prototype.js
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/theme/standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/scriptaculous.js
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/theme/standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tabgroup.js
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/theme/standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/theme-config.js
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/theme/standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-menu.js
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/theme/standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-sheet.js
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/theme/standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-assembly/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-tool/gendoc/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-tool/maven-apt-plugin/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-tool/maven-apt-plugin/src/main/java/org/apache/myfaces/maven/plugin/AbstractAPTMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/tobago/trunk/tobago-tool/maven-apt-plugin/src/main/java/org/apache/myfaces/maven/plugin/AllSourcesInclusionScanner.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/maven-apt-plugin/src/main/java/org/apache/myfaces/maven/plugin/AllSourcesInclusionScanner.java?rev=427657&r1=427656&r2=427657&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/maven-apt-plugin/src/main/java/org/apache/myfaces/maven/plugin/AllSourcesInclusionScanner.java (original)
+++ myfaces/tobago/trunk/tobago-tool/maven-apt-plugin/src/main/java/org/apache/myfaces/maven/plugin/AllSourcesInclusionScanner.java Tue Aug 1 10:43:28 2006
@@ -1,50 +1,50 @@
-/*
- * Copyright 2001-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.myfaces.maven.plugin;
-
-import org.codehaus.plexus.compiler.util.scan.AbstractSourceInclusionScanner;
-import org.codehaus.plexus.compiler.util.scan.InclusionScanException;
-
-import java.io.File;
-import java.util.HashSet;
-import java.util.Set;
-
-public class AllSourcesInclusionScanner extends AbstractSourceInclusionScanner
-{
- private Set sourceIncludes;
- private Set sourceExcludes;
-
- public AllSourcesInclusionScanner( Set sourceIncludes,
- Set sourceExcludes )
- {
- this.sourceIncludes = sourceIncludes;
- this.sourceExcludes = sourceExcludes;
- }
-
- public Set getIncludedSources( File sourceDir, File targetDir )
- throws InclusionScanException
- {
- String[] sourceNames = scanForSources(sourceDir, sourceIncludes, sourceExcludes);
- Set sources = new HashSet();
- for ( int i = 0; i < sourceNames.length; i++ )
- {
- String path = sourceNames[i];
- File sourceFile = new File( sourceDir, path );
- sources.add(sourceFile);
- }
- return sources;
- }
-}
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.myfaces.maven.plugin;
+
+import org.codehaus.plexus.compiler.util.scan.AbstractSourceInclusionScanner;
+import org.codehaus.plexus.compiler.util.scan.InclusionScanException;
+
+import java.io.File;
+import java.util.HashSet;
+import java.util.Set;
+
+public class AllSourcesInclusionScanner extends AbstractSourceInclusionScanner
+{
+ private Set sourceIncludes;
+ private Set sourceExcludes;
+
+ public AllSourcesInclusionScanner( Set sourceIncludes,
+ Set sourceExcludes )
+ {
+ this.sourceIncludes = sourceIncludes;
+ this.sourceExcludes = sourceExcludes;
+ }
+
+ public Set getIncludedSources( File sourceDir, File targetDir )
+ throws InclusionScanException
+ {
+ String[] sourceNames = scanForSources(sourceDir, sourceIncludes, sourceExcludes);
+ Set sources = new HashSet();
+ for ( int i = 0; i < sourceNames.length; i++ )
+ {
+ String path = sourceNames[i];
+ File sourceFile = new File( sourceDir, path );
+ sources.add(sourceFile);
+ }
+ return sources;
+ }
+}
Propchange: myfaces/tobago/trunk/tobago-tool/maven-apt-plugin/src/main/java/org/apache/myfaces/maven/plugin/AllSourcesInclusionScanner.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/tobago/trunk/tobago-tool/maven-apt-plugin/src/main/java/org/apache/myfaces/maven/plugin/AptMojo.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/maven-apt-plugin/src/main/java/org/apache/myfaces/maven/plugin/AptMojo.java?rev=427657&r1=427656&r2=427657&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/maven-apt-plugin/src/main/java/org/apache/myfaces/maven/plugin/AptMojo.java (original)
+++ myfaces/tobago/trunk/tobago-tool/maven-apt-plugin/src/main/java/org/apache/myfaces/maven/plugin/AptMojo.java Tue Aug 1 10:43:28 2006
@@ -1,175 +1,175 @@
-package org.apache.myfaces.maven.plugin;
-
-/*
- * Copyright 2001-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import org.apache.maven.model.Resource;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.codehaus.plexus.compiler.util.scan.SourceInclusionScanner;
-import org.codehaus.plexus.compiler.util.scan.StaleSourceScanner;
-import org.codehaus.plexus.compiler.util.scan.mapping.SuffixMapping;
-import org.codehaus.plexus.compiler.util.scan.mapping.SingleTargetSourceMapping;
-
-import java.io.File;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.Iterator;
-
-/**
- * @author <a href="mailto:jubu@volny.cz">Juraj Burian</a>
- * @version $Id:$
- * @goal execute
- * @phase generate-sources
- * @requiresProject
- * @requiresDependencyResolution compile
- * @description generates and/or compiles application sources
- */
-public class AptMojo extends AbstractAPTMojo
-{
-
- /**
- * The source directory containing the generated sources.
- *
- * @parameter default-value="src/main/gen"
- */
- private String generated;
-
- /**
- * A List of targetFiles for SingleSourceTargetMapping
- *
- * @parameter
- */
- private List targetFiles;
- /**
- * targetPath for generated resources
- *
- * @parameter
- */
- private String resourceTargetPath;
- /**
- * The source directories containing the sources to be compiled.
- *
- * @parameter expression="${project.compileSourceRoots}"
- * @required
- * @readonly
- */
- private List compileSourceRoots;
-
- /**
- * Project classpath.
- *
- * @parameter expression="${project.compileClasspathElements}"
- * @required
- * @readonly
- */
- private List classpathElements;
-
- /**
- * The directory for compiled classes.
- *
- * @parameter expression="${project.build.outputDirectory}"
- * @required
- * @readonly
- */
- private File outputDirectory;
-
- /**
- * Force apt call without staleness chhecking.
- *
- * @parameter default-value="false"
- */
- private boolean force;
-
- protected String getGenerated()
- {
- return generated;
- }
-
- protected List getCompileSourceRoots()
- {
- return compileSourceRoots;
- }
-
- protected List getClasspathElements()
- {
- return classpathElements;
- }
-
- protected File getOutputDirectory()
- {
- return outputDirectory;
- }
-
- public void execute() throws MojoExecutionException
- {
- super.execute();
- project.addCompileSourceRoot(
- new File( project.getBasedir(), getGenerated() ).getPath() );
- Resource resource = new Resource();
- if ( resourceTargetPath != null )
- {
- resource.setTargetPath(resourceTargetPath);
- }
- resource.setDirectory( getGenerated() );
- resource.addExclude( "**/*.java" );
- project.addResource( resource );
- }
-
- /**
- * A list of inclusion filters for the compiler.
- *
- * @parameter
- */
- private Set includes = new HashSet();
-
- /**
- * A list of exclusion filters for the compiler.
- *
- * @parameter
- */
- private Set excludes = new HashSet();
-
- protected SourceInclusionScanner getSourceInclusionScanner()
- {
- StaleSourceScanner scanner = null;
-
- if( includes.isEmpty() )
- {
- includes.add( "**/*.java" );
- }
-
- if (force)
- {
- return new AllSourcesInclusionScanner(includes, excludes);
- }
-
- scanner = new StaleSourceScanner( staleMillis, includes, excludes );
- if ( targetFiles!=null && targetFiles.size() > 0 )
- {
- for ( Iterator it = targetFiles.iterator() ; it.hasNext() ; )
- {
- String file = (String) it.next();
- scanner.addSourceMapping( new SingleTargetSourceMapping(".java", file ) );
- }
- }
- else
- {
- scanner.addSourceMapping( new SuffixMapping( ".java", ".class" ) );
- }
- return scanner;
- }
+package org.apache.myfaces.maven.plugin;
+
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.apache.maven.model.Resource;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.codehaus.plexus.compiler.util.scan.SourceInclusionScanner;
+import org.codehaus.plexus.compiler.util.scan.StaleSourceScanner;
+import org.codehaus.plexus.compiler.util.scan.mapping.SuffixMapping;
+import org.codehaus.plexus.compiler.util.scan.mapping.SingleTargetSourceMapping;
+
+import java.io.File;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.Iterator;
+
+/**
+ * @author <a href="mailto:jubu@volny.cz">Juraj Burian</a>
+ * @version $Id:$
+ * @goal execute
+ * @phase generate-sources
+ * @requiresProject
+ * @requiresDependencyResolution compile
+ * @description generates and/or compiles application sources
+ */
+public class AptMojo extends AbstractAPTMojo
+{
+
+ /**
+ * The source directory containing the generated sources.
+ *
+ * @parameter default-value="src/main/gen"
+ */
+ private String generated;
+
+ /**
+ * A List of targetFiles for SingleSourceTargetMapping
+ *
+ * @parameter
+ */
+ private List targetFiles;
+ /**
+ * targetPath for generated resources
+ *
+ * @parameter
+ */
+ private String resourceTargetPath;
+ /**
+ * The source directories containing the sources to be compiled.
+ *
+ * @parameter expression="${project.compileSourceRoots}"
+ * @required
+ * @readonly
+ */
+ private List compileSourceRoots;
+
+ /**
+ * Project classpath.
+ *
+ * @parameter expression="${project.compileClasspathElements}"
+ * @required
+ * @readonly
+ */
+ private List classpathElements;
+
+ /**
+ * The directory for compiled classes.
+ *
+ * @parameter expression="${project.build.outputDirectory}"
+ * @required
+ * @readonly
+ */
+ private File outputDirectory;
+
+ /**
+ * Force apt call without staleness chhecking.
+ *
+ * @parameter default-value="false"
+ */
+ private boolean force;
+
+ protected String getGenerated()
+ {
+ return generated;
+ }
+
+ protected List getCompileSourceRoots()
+ {
+ return compileSourceRoots;
+ }
+
+ protected List getClasspathElements()
+ {
+ return classpathElements;
+ }
+
+ protected File getOutputDirectory()
+ {
+ return outputDirectory;
+ }
+
+ public void execute() throws MojoExecutionException
+ {
+ super.execute();
+ project.addCompileSourceRoot(
+ new File( project.getBasedir(), getGenerated() ).getPath() );
+ Resource resource = new Resource();
+ if ( resourceTargetPath != null )
+ {
+ resource.setTargetPath(resourceTargetPath);
+ }
+ resource.setDirectory( getGenerated() );
+ resource.addExclude( "**/*.java" );
+ project.addResource( resource );
+ }
+
+ /**
+ * A list of inclusion filters for the compiler.
+ *
+ * @parameter
+ */
+ private Set includes = new HashSet();
+
+ /**
+ * A list of exclusion filters for the compiler.
+ *
+ * @parameter
+ */
+ private Set excludes = new HashSet();
+
+ protected SourceInclusionScanner getSourceInclusionScanner()
+ {
+ StaleSourceScanner scanner = null;
+
+ if( includes.isEmpty() )
+ {
+ includes.add( "**/*.java" );
+ }
+
+ if (force)
+ {
+ return new AllSourcesInclusionScanner(includes, excludes);
+ }
+
+ scanner = new StaleSourceScanner( staleMillis, includes, excludes );
+ if ( targetFiles!=null && targetFiles.size() > 0 )
+ {
+ for ( Iterator it = targetFiles.iterator() ; it.hasNext() ; )
+ {
+ String file = (String) it.next();
+ scanner.addSourceMapping( new SingleTargetSourceMapping(".java", file ) );
+ }
+ }
+ else
+ {
+ scanner.addSourceMapping( new SuffixMapping( ".java", ".class" ) );
+ }
+ return scanner;
+ }
}
Propchange: myfaces/tobago/trunk/tobago-tool/maven-apt-plugin/src/main/java/org/apache/myfaces/maven/plugin/AptMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/tobago/trunk/tobago-tool/maven-apt-plugin/src/main/java/org/apache/myfaces/maven/plugin/TestAptMojo.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/maven-apt-plugin/src/main/java/org/apache/myfaces/maven/plugin/TestAptMojo.java?rev=427657&r1=427656&r2=427657&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/maven-apt-plugin/src/main/java/org/apache/myfaces/maven/plugin/TestAptMojo.java (original)
+++ myfaces/tobago/trunk/tobago-tool/maven-apt-plugin/src/main/java/org/apache/myfaces/maven/plugin/TestAptMojo.java Tue Aug 1 10:43:28 2006
@@ -1,149 +1,149 @@
-package org.apache.myfaces.maven.plugin;
-
-/*
- * Copyright 2001-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import java.io.File;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.maven.model.Resource;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.codehaus.plexus.compiler.util.scan.SimpleSourceInclusionScanner;
-import org.codehaus.plexus.compiler.util.scan.SourceInclusionScanner;
-import org.codehaus.plexus.compiler.util.scan.StaleSourceScanner;
-import org.codehaus.plexus.compiler.util.scan.mapping.SourceMapping;
-import org.codehaus.plexus.compiler.util.scan.mapping.SuffixMapping;
-
-/**
- * @author <a href="mailto:jubu@volny.cz">Juraj Burian</a>
- * @version $Id:$
- * @goal testExecute
- * @phase generate-sources
- * @requiresDependencyResolution test
- * @description Generats and/or compiles test sources
- */
-public class TestAptMojo extends AbstractAPTMojo
-{
-
- /**
- * The source directory containing the generated sources to be compiled.
- *
- * @parameter default-value="src/test/gen"
- */
- private String testGenerated;
-
- /**
- * Set this to 'true' to bypass unit tests entirely. Its use is NOT
- * RECOMMENDED, but quite convenient on occasion.
- *
- * @parameter expression="${maven.test.skip}"
- */
- private boolean skip;
-
- /**
- * The source directories containing the test-source to be compiled.
- *
- * @parameter expression="${project.testCompileSourceRoots}"
- * @required
- * @readonly
- */
- private List compileSourceRoots;
-
- /**
- * Project test classpath.
- *
- * @parameter expression="${project.testClasspathElements}"
- * @required
- * @readonly
- */
- private List testClasspathElements;
-
- /**
- * The directory where compiled test classes go.
- *
- * @parameter expression="${project.build.testOutputDirectory}"
- * @required
- * @readonly
- */
- private File outputDirectory;
-
- /**
- * A list of inclusion filters for the compiler.
- *
- * @parameter
- */
- private Set testIncludes = new HashSet();
-
- /**
- * A list of exclusion filters for the compiler.
- *
- * @parameter
- */
- private Set testExcludes = new HashSet();
-
- public void execute() throws MojoExecutionException
- {
- if( skip )
- {
- //getLog().info( "Not executing test sources" );
- return;
- } else
- {
- super.execute();
- project.addTestCompileSourceRoot( getGenerated() );
- Resource resource = new Resource();
- resource.setDirectory( getGenerated() );
- resource.addExclude( "**/*.java" );
- project.addTestResource( resource );
- }
- }
-
- protected String getGenerated()
- {
- return testGenerated;
- }
-
- protected List getCompileSourceRoots()
- {
- return compileSourceRoots;
- }
-
- protected List getClasspathElements()
- {
- return testClasspathElements;
- }
-
- protected File getOutputDirectory()
- {
- return outputDirectory;
- }
-
- protected SourceInclusionScanner getSourceInclusionScanner()
- {
- StaleSourceScanner scanner = null;
-
- if( true == testIncludes.isEmpty() )
- {
- testIncludes.add( "**/*.java" );
- scanner = new StaleSourceScanner( staleMillis, testIncludes,
- testExcludes );
- }
- scanner.addSourceMapping( new SuffixMapping( ".java", ".class" ) );
- return scanner;
- }
-}
+package org.apache.myfaces.maven.plugin;
+
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.io.File;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.maven.model.Resource;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.codehaus.plexus.compiler.util.scan.SimpleSourceInclusionScanner;
+import org.codehaus.plexus.compiler.util.scan.SourceInclusionScanner;
+import org.codehaus.plexus.compiler.util.scan.StaleSourceScanner;
+import org.codehaus.plexus.compiler.util.scan.mapping.SourceMapping;
+import org.codehaus.plexus.compiler.util.scan.mapping.SuffixMapping;
+
+/**
+ * @author <a href="mailto:jubu@volny.cz">Juraj Burian</a>
+ * @version $Id:$
+ * @goal testExecute
+ * @phase generate-sources
+ * @requiresDependencyResolution test
+ * @description Generats and/or compiles test sources
+ */
+public class TestAptMojo extends AbstractAPTMojo
+{
+
+ /**
+ * The source directory containing the generated sources to be compiled.
+ *
+ * @parameter default-value="src/test/gen"
+ */
+ private String testGenerated;
+
+ /**
+ * Set this to 'true' to bypass unit tests entirely. Its use is NOT
+ * RECOMMENDED, but quite convenient on occasion.
+ *
+ * @parameter expression="${maven.test.skip}"
+ */
+ private boolean skip;
+
+ /**
+ * The source directories containing the test-source to be compiled.
+ *
+ * @parameter expression="${project.testCompileSourceRoots}"
+ * @required
+ * @readonly
+ */
+ private List compileSourceRoots;
+
+ /**
+ * Project test classpath.
+ *
+ * @parameter expression="${project.testClasspathElements}"
+ * @required
+ * @readonly
+ */
+ private List testClasspathElements;
+
+ /**
+ * The directory where compiled test classes go.
+ *
+ * @parameter expression="${project.build.testOutputDirectory}"
+ * @required
+ * @readonly
+ */
+ private File outputDirectory;
+
+ /**
+ * A list of inclusion filters for the compiler.
+ *
+ * @parameter
+ */
+ private Set testIncludes = new HashSet();
+
+ /**
+ * A list of exclusion filters for the compiler.
+ *
+ * @parameter
+ */
+ private Set testExcludes = new HashSet();
+
+ public void execute() throws MojoExecutionException
+ {
+ if( skip )
+ {
+ //getLog().info( "Not executing test sources" );
+ return;
+ } else
+ {
+ super.execute();
+ project.addTestCompileSourceRoot( getGenerated() );
+ Resource resource = new Resource();
+ resource.setDirectory( getGenerated() );
+ resource.addExclude( "**/*.java" );
+ project.addTestResource( resource );
+ }
+ }
+
+ protected String getGenerated()
+ {
+ return testGenerated;
+ }
+
+ protected List getCompileSourceRoots()
+ {
+ return compileSourceRoots;
+ }
+
+ protected List getClasspathElements()
+ {
+ return testClasspathElements;
+ }
+
+ protected File getOutputDirectory()
+ {
+ return outputDirectory;
+ }
+
+ protected SourceInclusionScanner getSourceInclusionScanner()
+ {
+ StaleSourceScanner scanner = null;
+
+ if( true == testIncludes.isEmpty() )
+ {
+ testIncludes.add( "**/*.java" );
+ scanner = new StaleSourceScanner( staleMillis, testIncludes,
+ testExcludes );
+ }
+ scanner.addSourceMapping( new SuffixMapping( ".java", ".class" ) );
+ return scanner;
+ }
+}
Propchange: myfaces/tobago/trunk/tobago-tool/maven-apt-plugin/src/main/java/org/apache/myfaces/maven/plugin/TestAptMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-tool/maven-theme-plugin/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-tool/maven-theme-plugin/src/main/java/org/apache/myfaces/tobago/maven/plugin/AbstractThemeMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-tool/maven-theme-plugin/src/main/java/org/apache/myfaces/tobago/maven/plugin/PackThemeMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-tool/maven-theme-plugin/src/main/java/org/apache/myfaces/tobago/maven/plugin/UnPackThemeMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-tool/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/ant/sniplet/CodeSniplet.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/ant/sniplet/CodeSniplet.java?rev=427657&r1=427656&r2=427657&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/ant/sniplet/CodeSniplet.java (original)
+++ myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/ant/sniplet/CodeSniplet.java Tue Aug 1 10:43:28 2006
@@ -1,106 +1,106 @@
-package org.apache.myfaces.tobago.ant.sniplet;
-
-/*
- * Copyright 2002-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import java.util.List;
-import java.util.ArrayList;
-
-public class CodeSniplet {
-
- private String id;
- private List<String> code;
- private String fileName;
- private int lineStart;
- private int lineEnd;
-
- public CodeSniplet(String id, String fileName, int lineStart) {
- this.id = id;
- this.fileName = fileName;
- this.code = new ArrayList<String>();
- this.lineStart = lineStart;
- }
-
- public void addLine(String line) {
- code.add(line);
- }
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public StringBuffer getCode(boolean stripLeadingSpaces) {
- int minSpaces = -1;
- for (int i = 0; i < code.size(); i++) {
- String s = code.get(i);
- for (int j = 0; j < s.length(); j++) {
- char c = s.charAt(j);
- if (!Character.isWhitespace(c)) {
- if (minSpaces == -1 || j < minSpaces) {
- minSpaces = j;
- }
- break;
- }
- }
- }
- StringBuffer sb = new StringBuffer();
- for (int i = 0; i < code.size(); i++) {
- String s = code.get(i);
- if (stripLeadingSpaces && s.length() > minSpaces && minSpaces != -1) {
- sb.append(s.substring(minSpaces));
- } else {
- sb.append(s);
- }
- if (i < code.size() -1) {
- sb.append("\n");
- }
- }
- return sb;
- }
-
- public String getFileName() {
- return fileName;
- }
-
- public void setFileName(String fileName) {
- this.fileName = fileName;
- }
-
- public int getLineStart() {
- return lineStart;
- }
-
- public void setLineStart(int lineStart) {
- this.lineStart = lineStart;
- }
-
- public int getLineEnd() {
- return lineEnd;
- }
-
- public void setLineEnd(int lineEnd) {
- this.lineEnd = lineEnd;
- }
-
- public String toString() {
- return fileName + ":" + id + "[" + lineStart + "-" + lineEnd + "]" + " {" + code.toString() + " }";
- }
-
-}
+package org.apache.myfaces.tobago.ant.sniplet;
+
+/*
+ * Copyright 2002-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.util.List;
+import java.util.ArrayList;
+
+public class CodeSniplet {
+
+ private String id;
+ private List<String> code;
+ private String fileName;
+ private int lineStart;
+ private int lineEnd;
+
+ public CodeSniplet(String id, String fileName, int lineStart) {
+ this.id = id;
+ this.fileName = fileName;
+ this.code = new ArrayList<String>();
+ this.lineStart = lineStart;
+ }
+
+ public void addLine(String line) {
+ code.add(line);
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public StringBuffer getCode(boolean stripLeadingSpaces) {
+ int minSpaces = -1;
+ for (int i = 0; i < code.size(); i++) {
+ String s = code.get(i);
+ for (int j = 0; j < s.length(); j++) {
+ char c = s.charAt(j);
+ if (!Character.isWhitespace(c)) {
+ if (minSpaces == -1 || j < minSpaces) {
+ minSpaces = j;
+ }
+ break;
+ }
+ }
+ }
+ StringBuffer sb = new StringBuffer();
+ for (int i = 0; i < code.size(); i++) {
+ String s = code.get(i);
+ if (stripLeadingSpaces && s.length() > minSpaces && minSpaces != -1) {
+ sb.append(s.substring(minSpaces));
+ } else {
+ sb.append(s);
+ }
+ if (i < code.size() -1) {
+ sb.append("\n");
+ }
+ }
+ return sb;
+ }
+
+ public String getFileName() {
+ return fileName;
+ }
+
+ public void setFileName(String fileName) {
+ this.fileName = fileName;
+ }
+
+ public int getLineStart() {
+ return lineStart;
+ }
+
+ public void setLineStart(int lineStart) {
+ this.lineStart = lineStart;
+ }
+
+ public int getLineEnd() {
+ return lineEnd;
+ }
+
+ public void setLineEnd(int lineEnd) {
+ this.lineEnd = lineEnd;
+ }
+
+ public String toString() {
+ return fileName + ":" + id + "[" + lineStart + "-" + lineEnd + "]" + " {" + code.toString() + " }";
+ }
+
+}
Propchange: myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/ant/sniplet/CodeSniplet.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/ant/sniplet/CodeSnipletExtractTask.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/ant/sniplet/CodeSnipletExtractTask.java?rev=427657&r1=427656&r2=427657&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/ant/sniplet/CodeSnipletExtractTask.java (original)
+++ myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/ant/sniplet/CodeSnipletExtractTask.java Tue Aug 1 10:43:28 2006
@@ -1,208 +1,208 @@
-package org.apache.myfaces.tobago.ant.sniplet;
-
-/*
- * Copyright 2002-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.DirectoryScanner;
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.types.FileSet;
-
-import java.util.regex.Pattern;
-import java.util.regex.Matcher;
-import java.util.List;
-import java.util.ArrayList;
-import java.io.File;
-import java.io.LineNumberReader;
-import java.io.FileReader;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.FileOutputStream;
-
-/**
- * This task extracts lines from source fileSets marked with a tag. Such a sniplet starts with
- * <p/>
- * code-sniplet-start id="id"
- * <p/>
- * and ends with
- * <p/>
- * code-sniplet-end id="id"
- * <p/>
- * Its allowed to have nested and even entangled tags. Each sniplet gets ist own output file
- * in the output directory. The name of the file is [id].txt.
- * <p/>
- * The fileSets to process are specified by a fileset.
- * <p/>
- * Example:
- * <pre>
- * <target name="code-extract">
- * <taskdef name="code-extract" classname="org.apache.myfaces.tobago.ant.sniplet.CodeSnipletExtractTask"/>
- * <code-extract outputDir="build/sniplets">
- * <fileset dir="src">
- * <include name="*.java"/>
- * </fileset>
- * </code-extract>
- * </target>
- * </pre>
- */
-public class CodeSnipletExtractTask extends Task {
-
- private List<CodeSniplet> sniplets;
- private List<FileSet> fileSets;
- private Pattern startPattern;
- private Pattern endPattern;
- private File outputDir;
- private String outputFileNamePattern;
- private boolean stripLeadingSpaces;
-
- public void init() throws BuildException {
- startPattern = Pattern.compile(".*code-sniplet-start\\s*id\\s*=\\s*\"(\\w*)\".*");
- endPattern = Pattern.compile(".*code-sniplet-end\\s*id\\s*=\\s*\"(\\w*)\".*");
- this.sniplets = new ArrayList<CodeSniplet>();
- this.fileSets = new ArrayList<FileSet>();
- }
-
- public String getOutputFileNamePattern() {
- return outputFileNamePattern;
- }
-
- public void setOutputFileNamePattern(String outputFileNamePattern) {
- this.outputFileNamePattern = outputFileNamePattern;
- }
-
- public File getOutputDir() {
- return outputDir;
- }
-
- public void setOutputDir(File outputDir) {
- this.outputDir = outputDir;
- }
-
- public void addConfiguredFileSet(FileSet fileSet) {
- this.fileSets.add(fileSet);
- }
-
- public boolean isStripLeadingSpaces() {
- return stripLeadingSpaces;
- }
-
- public void setStripLeadingSpaces(boolean stripLeadingSpaces) {
- this.stripLeadingSpaces = stripLeadingSpaces;
- }
-
- public void execute() throws BuildException {
- for (int k = 0; k < fileSets.size(); k++) {
- FileSet fileSet = fileSets.get(k);
- DirectoryScanner dirScanner = fileSet.getDirectoryScanner(getProject());
- dirScanner.scan();
- String[] includedFiles = dirScanner.getIncludedFiles();
- for (int i = 0; i < includedFiles.length; i++) {
- String fileS = includedFiles[i];
- LineNumberReader in = null;
- try {
- in = new LineNumberReader(new FileReader(fileSet.getDir(getProject())
- + File.separator + fileS));
- String line = in.readLine();
- while (line != null) {
- Matcher startMatcher = startPattern.matcher(line);
- if (startMatcher.matches()) {
- startSniplet(startMatcher.group(1), fileS, in.getLineNumber());
- } else {
- Matcher endMatcher = endPattern.matcher(line);
- if (endMatcher.matches()) {
- endSniplet(endMatcher.group(1), fileS, in.getLineNumber());
- } else {
- addLine(line);
- }
- }
- line = in.readLine();
- }
- for (int j = 0; j < sniplets.size(); j++) {
- CodeSniplet codeSniplet = (CodeSniplet) sniplets.get(j);
- if (codeSniplet.getLineEnd() == 0) {
- codeSniplet.setLineEnd(in.getLineNumber());
- log("Unclosed sniplet '" + codeSniplet.getId() + "' in file '" + codeSniplet.getFileName() + "' at line '"
- + codeSniplet.getLineStart() + "'. Forcing close", Project.MSG_WARN);
- }
- }
- createOutput();
- sniplets = new ArrayList<CodeSniplet>();
- } catch (IOException e) {
- throw new BuildException(e);
- } finally {
- if (in != null) {
- try {
- in.close();
- } catch (IOException e) {
- throw new BuildException(e);
- }
- }
- }
- }
- }
- }
-
- private void createOutput() throws FileNotFoundException {
- for (int i = 0; i < sniplets.size(); i++) {
- CodeSniplet codeSniplet = (CodeSniplet) sniplets.get(i);
- String fileName = codeSniplet.getId() + ".snip";
- File file = new File(outputDir, fileName);
- PrintWriter out = new PrintWriter(new FileOutputStream(file));
- StringBuffer code = codeSniplet.getCode(stripLeadingSpaces);
- out.print(code);
- out.close();
- log("Wrote: " + file.getName(), Project.MSG_INFO);
- }
- }
-
- private void startSniplet(String id, String fileName, int lineNumber) {
- for (int i = 0; i < sniplets.size(); i++) {
- CodeSniplet codeSniplet = (CodeSniplet) sniplets.get(i);
- if (codeSniplet.getId().equals(id)) {
- throw new BuildException("Duplicate sniplet declaration '" + id + "' in file '" + fileName + "' at line '"
- + lineNumber + "'. First declaration was in file '" + codeSniplet.getFileName() + "' at line '"
- + codeSniplet.getLineStart() + "'.");
- }
- }
- CodeSniplet codeSniplet = new CodeSniplet(id, fileName, lineNumber);
- sniplets.add(codeSniplet);
- }
-
- private void endSniplet(String id, String fileName, int lineNumber) {
- for (int i = 0; i < sniplets.size(); i++) {
- CodeSniplet codeSniplet = (CodeSniplet) sniplets.get(i);
- if (codeSniplet.getId().equals(id)) {
- codeSniplet.setLineEnd(lineNumber);
- return;
- }
- }
- throw new BuildException("No start of sniplet '" + id + "' in file '" + fileName + "' at line '" + lineNumber
- + "' found.");
- }
-
- private void addLine(String line) {
- for (int i = 0; i < sniplets.size(); i++) {
- CodeSniplet codeSniplet = (CodeSniplet) sniplets.get(i);
- if (codeSniplet.getLineEnd() == 0) {
- codeSniplet.addLine(line);
- log("Adding: " + line + " -> " + codeSniplet.getFileName() + ":" + codeSniplet.getId(), Project.MSG_DEBUG);
- }
- }
- }
-
-}
+package org.apache.myfaces.tobago.ant.sniplet;
+
+/*
+ * Copyright 2002-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.DirectoryScanner;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.types.FileSet;
+
+import java.util.regex.Pattern;
+import java.util.regex.Matcher;
+import java.util.List;
+import java.util.ArrayList;
+import java.io.File;
+import java.io.LineNumberReader;
+import java.io.FileReader;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.FileOutputStream;
+
+/**
+ * This task extracts lines from source fileSets marked with a tag. Such a sniplet starts with
+ * <p/>
+ * code-sniplet-start id="id"
+ * <p/>
+ * and ends with
+ * <p/>
+ * code-sniplet-end id="id"
+ * <p/>
+ * Its allowed to have nested and even entangled tags. Each sniplet gets ist own output file
+ * in the output directory. The name of the file is [id].txt.
+ * <p/>
+ * The fileSets to process are specified by a fileset.
+ * <p/>
+ * Example:
+ * <pre>
+ * <target name="code-extract">
+ * <taskdef name="code-extract" classname="org.apache.myfaces.tobago.ant.sniplet.CodeSnipletExtractTask"/>
+ * <code-extract outputDir="build/sniplets">
+ * <fileset dir="src">
+ * <include name="*.java"/>
+ * </fileset>
+ * </code-extract>
+ * </target>
+ * </pre>
+ */
+public class CodeSnipletExtractTask extends Task {
+
+ private List<CodeSniplet> sniplets;
+ private List<FileSet> fileSets;
+ private Pattern startPattern;
+ private Pattern endPattern;
+ private File outputDir;
+ private String outputFileNamePattern;
+ private boolean stripLeadingSpaces;
+
+ public void init() throws BuildException {
+ startPattern = Pattern.compile(".*code-sniplet-start\\s*id\\s*=\\s*\"(\\w*)\".*");
+ endPattern = Pattern.compile(".*code-sniplet-end\\s*id\\s*=\\s*\"(\\w*)\".*");
+ this.sniplets = new ArrayList<CodeSniplet>();
+ this.fileSets = new ArrayList<FileSet>();
+ }
+
+ public String getOutputFileNamePattern() {
+ return outputFileNamePattern;
+ }
+
+ public void setOutputFileNamePattern(String outputFileNamePattern) {
+ this.outputFileNamePattern = outputFileNamePattern;
+ }
+
+ public File getOutputDir() {
+ return outputDir;
+ }
+
+ public void setOutputDir(File outputDir) {
+ this.outputDir = outputDir;
+ }
+
+ public void addConfiguredFileSet(FileSet fileSet) {
+ this.fileSets.add(fileSet);
+ }
+
+ public boolean isStripLeadingSpaces() {
+ return stripLeadingSpaces;
+ }
+
+ public void setStripLeadingSpaces(boolean stripLeadingSpaces) {
+ this.stripLeadingSpaces = stripLeadingSpaces;
+ }
+
+ public void execute() throws BuildException {
+ for (int k = 0; k < fileSets.size(); k++) {
+ FileSet fileSet = fileSets.get(k);
+ DirectoryScanner dirScanner = fileSet.getDirectoryScanner(getProject());
+ dirScanner.scan();
+ String[] includedFiles = dirScanner.getIncludedFiles();
+ for (int i = 0; i < includedFiles.length; i++) {
+ String fileS = includedFiles[i];
+ LineNumberReader in = null;
+ try {
+ in = new LineNumberReader(new FileReader(fileSet.getDir(getProject())
+ + File.separator + fileS));
+ String line = in.readLine();
+ while (line != null) {
+ Matcher startMatcher = startPattern.matcher(line);
+ if (startMatcher.matches()) {
+ startSniplet(startMatcher.group(1), fileS, in.getLineNumber());
+ } else {
+ Matcher endMatcher = endPattern.matcher(line);
+ if (endMatcher.matches()) {
+ endSniplet(endMatcher.group(1), fileS, in.getLineNumber());
+ } else {
+ addLine(line);
+ }
+ }
+ line = in.readLine();
+ }
+ for (int j = 0; j < sniplets.size(); j++) {
+ CodeSniplet codeSniplet = (CodeSniplet) sniplets.get(j);
+ if (codeSniplet.getLineEnd() == 0) {
+ codeSniplet.setLineEnd(in.getLineNumber());
+ log("Unclosed sniplet '" + codeSniplet.getId() + "' in file '" + codeSniplet.getFileName() + "' at line '"
+ + codeSniplet.getLineStart() + "'. Forcing close", Project.MSG_WARN);
+ }
+ }
+ createOutput();
+ sniplets = new ArrayList<CodeSniplet>();
+ } catch (IOException e) {
+ throw new BuildException(e);
+ } finally {
+ if (in != null) {
+ try {
+ in.close();
+ } catch (IOException e) {
+ throw new BuildException(e);
+ }
+ }
+ }
+ }
+ }
+ }
+
+ private void createOutput() throws FileNotFoundException {
+ for (int i = 0; i < sniplets.size(); i++) {
+ CodeSniplet codeSniplet = (CodeSniplet) sniplets.get(i);
+ String fileName = codeSniplet.getId() + ".snip";
+ File file = new File(outputDir, fileName);
+ PrintWriter out = new PrintWriter(new FileOutputStream(file));
+ StringBuffer code = codeSniplet.getCode(stripLeadingSpaces);
+ out.print(code);
+ out.close();
+ log("Wrote: " + file.getName(), Project.MSG_INFO);
+ }
+ }
+
+ private void startSniplet(String id, String fileName, int lineNumber) {
+ for (int i = 0; i < sniplets.size(); i++) {
+ CodeSniplet codeSniplet = (CodeSniplet) sniplets.get(i);
+ if (codeSniplet.getId().equals(id)) {
+ throw new BuildException("Duplicate sniplet declaration '" + id + "' in file '" + fileName + "' at line '"
+ + lineNumber + "'. First declaration was in file '" + codeSniplet.getFileName() + "' at line '"
+ + codeSniplet.getLineStart() + "'.");
+ }
+ }
+ CodeSniplet codeSniplet = new CodeSniplet(id, fileName, lineNumber);
+ sniplets.add(codeSniplet);
+ }
+
+ private void endSniplet(String id, String fileName, int lineNumber) {
+ for (int i = 0; i < sniplets.size(); i++) {
+ CodeSniplet codeSniplet = (CodeSniplet) sniplets.get(i);
+ if (codeSniplet.getId().equals(id)) {
+ codeSniplet.setLineEnd(lineNumber);
+ return;
+ }
+ }
+ throw new BuildException("No start of sniplet '" + id + "' in file '" + fileName + "' at line '" + lineNumber
+ + "' found.");
+ }
+
+ private void addLine(String line) {
+ for (int i = 0; i < sniplets.size(); i++) {
+ CodeSniplet codeSniplet = (CodeSniplet) sniplets.get(i);
+ if (codeSniplet.getLineEnd() == 0) {
+ codeSniplet.addLine(line);
+ log("Adding: " + line + " -> " + codeSniplet.getFileName() + ":" + codeSniplet.getId(), Project.MSG_DEBUG);
+ }
+ }
+ }
+
+}
Propchange: myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/ant/sniplet/CodeSnipletExtractTask.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/AbstractAnnotationVisitor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/AnnotationDeclarationVisitorCollector.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/DocumentAndFileName.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/FaceletAnnotationProcessor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/FaceletAnnotationProcessorFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/FaceletAnnotationVisitor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/PrintAnnotationVisitor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/TaglibAnnotationProcessor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/TaglibAnnotationProcessorFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/TaglibAnnotationVisitor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/TobagoAnnotationProcessor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/TobagoAnnotationProcessorFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/TobagoAnnotationVisitor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/annotation/BodyContent.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/annotation/BodyContentDescription.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/annotation/DynamicExpression.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/annotation/Preliminary.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/annotation/Tag.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/annotation/TagAttribute.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/annotation/Taglib.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/annotation/UIComponentTag.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/annotation/UIComponentTagAttribute.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlGraphicImage.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlGraphicImage.java?rev=427657&r1=427656&r2=427657&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlGraphicImage.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlGraphicImage.java Tue Aug 1 10:43:28 2006
@@ -1,105 +1,105 @@
-/*
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.myfaces.component.html.ext;
-
-import org.apache.myfaces.component.UserRoleAware;
-import org.apache.myfaces.component.UserRoleUtils;
-import org.apache.myfaces.component.html.util.HtmlComponentUtils;
-import org.apache.myfaces.shared_tomahawk.util._ComponentUtils;
-
-import javax.faces.context.FacesContext;
-import javax.faces.el.ValueBinding;
-
-/**
- * @author Bruno Aranda
- * @version $Revision$ $Date: 2005-05-11 17:34:57 +0200 (Wed, 11 May 2005) $
- */
-public class HtmlGraphicImage
- extends javax.faces.component.html.HtmlGraphicImage
- implements UserRoleAware
-{
- public String getClientId(FacesContext context)
- {
- String clientId = HtmlComponentUtils.getClientId(this, getRenderer(context), context);
- if (clientId == null)
- {
- clientId = super.getClientId(context);
- }
-
- return clientId;
- }
-
- //------------------ GENERATED CODE BEGIN (do not modify!) --------------------
-
- public static final String COMPONENT_TYPE = "org.apache.myfaces.HtmlGraphicImage";
-
- private String _enabledOnUserRole = null;
- private String _visibleOnUserRole = null;
-
- public HtmlGraphicImage()
- {
- }
-
-
- public void setEnabledOnUserRole(String enabledOnUserRole)
- {
- _enabledOnUserRole = enabledOnUserRole;
- }
-
- public String getEnabledOnUserRole()
- {
- if (_enabledOnUserRole != null) return _enabledOnUserRole;
- ValueBinding vb = getValueBinding("enabledOnUserRole");
- return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
- }
-
- public void setVisibleOnUserRole(String visibleOnUserRole)
- {
- _visibleOnUserRole = visibleOnUserRole;
- }
-
- public String getVisibleOnUserRole()
- {
- if (_visibleOnUserRole != null) return _visibleOnUserRole;
- ValueBinding vb = getValueBinding("visibleOnUserRole");
- return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
- }
-
-
- public boolean isRendered()
- {
- if (!UserRoleUtils.isVisibleOnUserRole(this)) return false;
- return super.isRendered();
- }
-
- public Object saveState(FacesContext context)
- {
- Object values[] = new Object[3];
- values[0] = super.saveState(context);
- values[1] = _enabledOnUserRole;
- values[2] = _visibleOnUserRole;
- return ((Object) (values));
- }
-
- public void restoreState(FacesContext context, Object state)
- {
- Object values[] = (Object[])state;
- super.restoreState(context, values[0]);
- _enabledOnUserRole = (String)values[1];
- _visibleOnUserRole = (String)values[2];
- }
- //------------------ GENERATED CODE END ---------------------------------------
-}
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.myfaces.component.html.ext;
+
+import org.apache.myfaces.component.UserRoleAware;
+import org.apache.myfaces.component.UserRoleUtils;
+import org.apache.myfaces.component.html.util.HtmlComponentUtils;
+import org.apache.myfaces.shared_tomahawk.util._ComponentUtils;
+
+import javax.faces.context.FacesContext;
+import javax.faces.el.ValueBinding;
+
+/**
+ * @author Bruno Aranda
+ * @version $Revision$ $Date: 2005-05-11 17:34:57 +0200 (Wed, 11 May 2005) $
+ */
+public class HtmlGraphicImage
+ extends javax.faces.component.html.HtmlGraphicImage
+ implements UserRoleAware
+{
+ public String getClientId(FacesContext context)
+ {
+ String clientId = HtmlComponentUtils.getClientId(this, getRenderer(context), context);
+ if (clientId == null)
+ {
+ clientId = super.getClientId(context);
+ }
+
+ return clientId;
+ }
+
+ //------------------ GENERATED CODE BEGIN (do not modify!) --------------------
+
+ public static final String COMPONENT_TYPE = "org.apache.myfaces.HtmlGraphicImage";
+
+ private String _enabledOnUserRole = null;
+ private String _visibleOnUserRole = null;
+
+ public HtmlGraphicImage()
+ {
+ }
+
+
+ public void setEnabledOnUserRole(String enabledOnUserRole)
+ {
+ _enabledOnUserRole = enabledOnUserRole;
+ }
+
+ public String getEnabledOnUserRole()
+ {
+ if (_enabledOnUserRole != null) return _enabledOnUserRole;
+ ValueBinding vb = getValueBinding("enabledOnUserRole");
+ return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
+ }
+
+ public void setVisibleOnUserRole(String visibleOnUserRole)
+ {
+ _visibleOnUserRole = visibleOnUserRole;
+ }
+
+ public String getVisibleOnUserRole()
+ {
+ if (_visibleOnUserRole != null) return _visibleOnUserRole;
+ ValueBinding vb = getValueBinding("visibleOnUserRole");
+ return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
+ }
+
+
+ public boolean isRendered()
+ {
+ if (!UserRoleUtils.isVisibleOnUserRole(this)) return false;
+ return super.isRendered();
+ }
+
+ public Object saveState(FacesContext context)
+ {
+ Object values[] = new Object[3];
+ values[0] = super.saveState(context);
+ values[1] = _enabledOnUserRole;
+ values[2] = _visibleOnUserRole;
+ return ((Object) (values));
+ }
+
+ public void restoreState(FacesContext context, Object state)
+ {
+ Object values[] = (Object[])state;
+ super.restoreState(context, values[0]);
+ _enabledOnUserRole = (String)values[1];
+ _visibleOnUserRole = (String)values[2];
+ }
+ //------------------ GENERATED CODE END ---------------------------------------
+}
Propchange: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlGraphicImage.java
------------------------------------------------------------------------------
svn:eol-style = native