Author: jkuhnert
Date: Sat Mar 11 15:21:36 2006
New Revision: 385196
URL: http://svn.apache.org/viewcvs?rev=385196&view=rev
Log:
Updated checkstyle, started new JSONWriter
Added:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/IJSONWriter.java
Modified:
jakarta/tapestry/trunk/.classpath
jakarta/tapestry/trunk/.project
jakarta/tapestry/trunk/.settings/org.eclipse.jdt.core.prefs
jakarta/tapestry/trunk/.settings/org.eclipse.jdt.ui.prefs
jakarta/tapestry/trunk/annotations/src/java/org/apache/tapestry/annotations/AnnotationMessages.java
jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/table/TreeTableValueRenderSource.java
jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/pages/ConfirmBookDelete.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/AbstractComponent.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/IMarkupWriter.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/markup/AbstractMarkupFilter.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/markup/AsciiMarkupFilter.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/markup/MarkupFilter.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/markup/MarkupFilterUtils.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/markup/MarkupMessages.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/markup/MarkupStrings.properties
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/markup/MarkupWriterImpl.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/markup/MarkupWriterSource.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/markup/MarkupWriterSourceImpl.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/markup/NestedMarkupWriterImpl.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/markup/UTFMarkupFilter.java
jakarta/tapestry/trunk/tapestry-checkstyle.xml
Modified: jakarta/tapestry/trunk/.classpath
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/.classpath?rev=385196&r1=385195&r2=385196&view=diff
==============================================================================
Binary files - no diff available.
Modified: jakarta/tapestry/trunk/.project
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/.project?rev=385196&r1=385195&r2=385196&view=diff
==============================================================================
Binary files - no diff available.
Modified: jakarta/tapestry/trunk/.settings/org.eclipse.jdt.core.prefs
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/.settings/org.eclipse.jdt.core.prefs?rev=385196&r1=385195&r2=385196&view=diff
==============================================================================
--- jakarta/tapestry/trunk/.settings/org.eclipse.jdt.core.prefs (original)
+++ jakarta/tapestry/trunk/.settings/org.eclipse.jdt.core.prefs Sat Mar 11
15:21:36 2006
@@ -1,4 +1,4 @@
-#Sat Mar 11 12:41:59 EST 2006
+#Sat Mar 11 18:13:15 EST 2006
=\=\=\=\=\=\=
<<<<<<<=.working
>>>>>>>=.merge-right.r368223
@@ -125,6 +125,7 @@
org.eclipse.jdt.core.formatter.continuation_indentation=2
org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
@@ -143,6 +144,7 @@
org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert
org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=insert
org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do
not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
Modified: jakarta/tapestry/trunk/.settings/org.eclipse.jdt.ui.prefs
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/.settings/org.eclipse.jdt.ui.prefs?rev=385196&r1=385195&r2=385196&view=diff
==============================================================================
--- jakarta/tapestry/trunk/.settings/org.eclipse.jdt.ui.prefs (original)
+++ jakarta/tapestry/trunk/.settings/org.eclipse.jdt.ui.prefs Sat Mar 11
15:21:36 2006
@@ -1,7 +1,15 @@
-#Wed Jun 08 16:11:32 EDT 2005
+#Sat Mar 11 18:13:15 EST 2006
eclipse.preferences.version=1
+formatter_profile=_tapestry
+formatter_settings_version=10
internal.default.compliance=default
org.eclipse.jdt.ui.exception.name=ex
org.eclipse.jdt.ui.gettersetter.use.is=true
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.javadoc=true
org.eclipse.jdt.ui.keywordthis=false
+org.eclipse.jdt.ui.ondemandthreshold=99
org.eclipse.jdt.ui.overrideannotation=true
+org.eclipse.jdt.ui.staticondemandthreshold=99
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0"
encoding\="UTF-8"?><templates><template autoinsert\="true"
context\="gettercomment_context" deleted\="false" description\="Comment for
getter method" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment"
name\="gettercomment">/**\n * @return the ${bare_field_name}\n
*/</template><template autoinsert\="true" context\="settercomment_context"
deleted\="false" description\="Comment for setter method" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.settercomment"
name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n
*/</template><template autoinsert\="true" context\="constructorcomment_context"
deleted\="false" description\="Comment for created constructors"
enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment"
name\="constructorcomment">/**\n * ${tags}\n */</template><template
autoinsert\="true" context\="filecomment_context" deleted\
="false" description\="Comment for created Java files" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.filecomment"
name\="filecomment">/**\n * \n */</template><template autoinsert\="true"
context\="typecomment_context" deleted\="false" description\="Comment for
created types" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.typecomment"
name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n
*/</template><template autoinsert\="true" context\="fieldcomment_context"
deleted\="false" description\="Comment for fields" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment"
name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true"
context\="methodcomment_context" deleted\="false" description\="Comment for
non-overriding methods" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment"
name\="methodcomment">/**\n * ${tags}\n */</template><template
autoinsert\="true" context\="overridecomment_context" del
eted\="false" description\="Comment for overriding methods" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment"
name\="overridecomment">/* (non-Javadoc)\n * ${see_to_overridden}\n
*/</template><template autoinsert\="true" context\="newtype_context"
deleted\="false" description\="Newly created files" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.newtype"
name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template
autoinsert\="true" context\="classbody_context" deleted\="false"
description\="Code in new class type bodies" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.classbody"
name\="classbody">\n</template><template autoinsert\="true"
context\="interfacebody_context" deleted\="false" description\="Code in new
interface type bodies" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody"
name\="interfacebody">\n</template><template autoinsert\="true" conte
xt\="enumbody_context" deleted\="false" description\="Code in new enum type
bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody"
name\="enumbody">\n</template><template autoinsert\="true"
context\="annotationbody_context" deleted\="false" description\="Code in new
annotation type bodies" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody"
name\="annotationbody">\n</template><template autoinsert\="true"
context\="catchblock_context" deleted\="false" description\="Code in new catch
blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock"
name\="catchblock">// ${todo} Auto-generated catch
block\n${exception_var}.printStackTrace();</template><template
autoinsert\="true" context\="methodbody_context" deleted\="false"
description\="Code in created method stubs" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">//
${todo} Auto-generated method stub\n${body_statement}</templa
te><template autoinsert\="true" context\="constructorbody_context"
deleted\="false" description\="Code in created constructor stubs"
enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody"
name\="constructorbody">${body_statement}\n// ${todo} Auto-generated
constructor stub</template><template autoinsert\="true"
context\="getterbody_context" deleted\="false" description\="Code in created
getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody"
name\="getterbody">return ${field};</template><template autoinsert\="true"
context\="setterbody_context" deleted\="false" description\="Code in created
setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody"
name\="setterbody">${field} \= ${param};</template></templates>
Modified:
jakarta/tapestry/trunk/annotations/src/java/org/apache/tapestry/annotations/AnnotationMessages.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/annotations/src/java/org/apache/tapestry/annotations/AnnotationMessages.java?rev=385196&r1=385195&r2=385196&view=diff
==============================================================================
---
jakarta/tapestry/trunk/annotations/src/java/org/apache/tapestry/annotations/AnnotationMessages.java
(original)
+++
jakarta/tapestry/trunk/annotations/src/java/org/apache/tapestry/annotations/AnnotationMessages.java
Sat Mar 11 15:21:36 2006
@@ -25,11 +25,14 @@
* @since 4.0
*/
-class AnnotationMessages
+final class AnnotationMessages
{
private static final MessageFormatter _formatter = new MessageFormatter(
AnnotationMessages.class);
-
+
+ /* defeat instantiation */
+ private AnnotationMessages() { }
+
static String noParametersExpected(Method m)
{
return _formatter.format("no-parameters-expected", m);
Modified:
jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/table/TreeTableValueRenderSource.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/table/TreeTableValueRenderSource.java?rev=385196&r1=385195&r2=385196&view=diff
==============================================================================
---
jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/table/TreeTableValueRenderSource.java
(original)
+++
jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/table/TreeTableValueRenderSource.java
Sat Mar 11 15:21:36 2006
@@ -27,53 +27,45 @@
*/
public class TreeTableValueRenderSource implements ITableRendererSource
{
- private static final long serialVersionUID = 3237638859391458116L;
-
- private ComponentTableRendererSource m_objComponentRenderer;
- private ComponentAddress m_objComponentAddress = null;
-
- public TreeTableValueRenderSource()
- {
- m_objComponentRenderer = null;
- }
-
- public TreeTableValueRenderSource(ComponentAddress objComponentAddress)
- {
- m_objComponentAddress = objComponentAddress;
- }
-
- /**
- * @see
org.apache.tapestry.contrib.table.model.ITableRendererSource#getRenderer(IRequestCycle,
ITableModelSource, ITableColumn, Object)
- */
- public IRender getRenderer(
- IRequestCycle objCycle,
- ITableModelSource objSource,
- ITableColumn objColumn,
- Object objRow)
- {
- if (m_objComponentRenderer == null)
- {
- synchronized (this)
- {
- if (m_objComponentRenderer == null)
- {
-
- ComponentAddress objAddress =
m_objComponentAddress;
- if(m_objComponentAddress == null)
- objAddress = new
ComponentAddress(
-
"contrib:TreeTableNodeViewPage",
-
"treeTableNodeViewDelegator");
- m_objComponentRenderer =
- new
ComponentTableRendererSource(objAddress);
- }
- }
- }
-
- return m_objComponentRenderer.getRenderer(
- objCycle,
- objSource,
- objColumn,
- objRow);
- }
+
+ private static final long serialVersionUID = 3237638859391458116L;
+
+ private ComponentTableRendererSource m_objComponentRenderer;
+ private ComponentAddress m_objComponentAddress = null;
+
+ public TreeTableValueRenderSource()
+ {
+ m_objComponentRenderer = null;
+ }
+
+ public TreeTableValueRenderSource(ComponentAddress objComponentAddress)
+ {
+ m_objComponentAddress = objComponentAddress;
+ }
+
+ /**
+ * @see
org.apache.tapestry.contrib.table.model.ITableRendererSource#getRenderer(IRequestCycle,
+ * ITableModelSource, ITableColumn, Object)
+ */
+ public IRender getRenderer(IRequestCycle objCycle, ITableModelSource
objSource, ITableColumn objColumn,
+ Object objRow)
+ {
+ if (m_objComponentRenderer == null)
+ {
+ synchronized(this)
+ {
+ if (m_objComponentRenderer == null)
+ {
+
+ ComponentAddress objAddress = m_objComponentAddress;
+ if (m_objComponentAddress == null)
+ objAddress = new
ComponentAddress("contrib:TreeTableNodeViewPage", "treeTableNodeViewDelegator");
+ m_objComponentRenderer = new
ComponentTableRendererSource(objAddress);
+ }
+ }
+ }
+
+ return m_objComponentRenderer.getRenderer(objCycle, objSource,
objColumn, objRow);
+ }
}
Modified:
jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/pages/ConfirmBookDelete.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/pages/ConfirmBookDelete.java?rev=385196&r1=385195&r2=385196&view=diff
==============================================================================
---
jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/pages/ConfirmBookDelete.java
(original)
+++
jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/pages/ConfirmBookDelete.java
Sat Mar 11 15:21:36 2006
@@ -19,8 +19,7 @@
import javax.ejb.RemoveException;
import org.apache.hivemind.ApplicationRuntimeException;
-import org.apache.tapestry.IPage;
-import org.apache.tapestry.IRequestCycle;
+
import org.apache.tapestry.annotations.InjectPage;
import org.apache.tapestry.annotations.Message;
import org.apache.tapestry.annotations.Meta;
@@ -95,4 +94,4 @@
myLibrary.activate();
}
-}
\ No newline at end of file
+}
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/AbstractComponent.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/AbstractComponent.java?rev=385196&r1=385195&r2=385196&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/AbstractComponent.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/AbstractComponent.java
Sat Mar 11 15:21:36 2006
@@ -42,6 +42,16 @@
public abstract class AbstractComponent extends BaseLocatable implements
IComponent
{
+ private static final int MAP_SIZE = 5;
+
+ private static final int BODY_INIT_SIZE = 5;
+
+ /**
+ * Used in place of JDK 1.3's Collections.EMPTY_MAP (which is not
available in JDK 1.2).
+ */
+
+ private static final Map EMPTY_MAP = Collections.unmodifiableMap(new
HashMap(1));
+
/**
* The page that contains the component, possibly itself (if the component
is in fact, a page).
*/
@@ -68,8 +78,6 @@
private String _idPath;
- private static final int MAP_SIZE = 5;
-
/**
* A [EMAIL PROTECTED] Map}of all bindings (for which there isn't a
corresponding JavaBeans property); the
* keys are the names of formal and informal parameters.
@@ -79,17 +87,9 @@
private Map _components;
- private static final int BODY_INIT_SIZE = 5;
-
private INamespace _namespace;
/**
- * Used in place of JDK 1.3's Collections.EMPTY_MAP (which is not
available in JDK 1.2).
- */
-
- private static final Map EMPTY_MAP = Collections.unmodifiableMap(new
HashMap(1));
-
- /**
* The number of [EMAIL PROTECTED] IRender}objects in the body of this
component.
*/
@@ -740,7 +740,7 @@
/**
* Returns true if the component has been transitioned into its active
state by invoking
- * [EMAIL PROTECTED] #enterActiveState()}
+ * [EMAIL PROTECTED] #enterActiveState()}.
*
* @since 4.0
*/
@@ -804,7 +804,7 @@
}
/**
- * Convienience method for invoking [EMAIL PROTECTED]
IMessages#format(String, Locale, Object)}
+ * Convienience method for invoking [EMAIL PROTECTED]
IMessages#format(String, Locale, Object)}.
*
* @since 3.0
* @deprecated To be removed in 4.1. Use [EMAIL PROTECTED] #getMessages()}
instead.
@@ -857,4 +857,4 @@
_containedComponent = containedComponent;
}
-}
\ No newline at end of file
+}
Added:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/IJSONWriter.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/IJSONWriter.java?rev=385196&view=auto
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/IJSONWriter.java
(added)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/IJSONWriter.java
Sat Mar 11 15:21:36 2006
@@ -0,0 +1,28 @@
+// Copyright 2006 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.tapestry;
+
+
+/**
+ * JavaScript Object Notation writer interface that defines an object capable
of
+ * writing JSON style output.
+ *
+ * @see <a href="http://www.json.org/";>http://www.json.org/</a>
+ * @author jkuhnert
+ */
+public interface IJSONWriter
+{
+
+}
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/IMarkupWriter.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/IMarkupWriter.java?rev=385196&r1=385195&r2=385196&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/IMarkupWriter.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/IMarkupWriter.java
Sat Mar 11 15:21:36 2006
@@ -32,7 +32,7 @@
* if there is no open tag.
*/
- public void attribute(String name, int value);
+ void attribute(String name, int value);
/**
* Writes a boolean attribute into the currently open tag.
@@ -42,7 +42,7 @@
* @since 3.0
*/
- public void attribute(String name, boolean value);
+ void attribute(String name, boolean value);
/**
* Writes an attribute into the most recently opened tag. This must be
called after
@@ -54,7 +54,7 @@
* if there is no open tag.
*/
- public void attribute(String name, String value);
+ void attribute(String name, String value);
/**
* Similar to [EMAIL PROTECTED] #attribute(String, String)}but no escaping
of invalid elements is done for
@@ -65,27 +65,27 @@
* @since 3.0
*/
- public void attributeRaw(String name, String value);
+ void attributeRaw(String name, String value);
/**
* Closes any existing tag then starts a new element. The new element is
pushed onto the active
* element stack.
*/
- public void begin(String name);
+ void begin(String name);
/**
* Starts an element that will not later be matched with an
<code>end()</code> call. This is
* useful for elements that do not need closing tags.
*/
- public void beginEmpty(String name);
+ void beginEmpty(String name);
/**
* Invokes checkError() on the <code>PrintWriter</code> used to format
output.
*/
- public boolean checkError();
+ boolean checkError();
/**
* Closes this <code>IMarkupWriter</code>. Close tags are written for any
active elements.
@@ -93,7 +93,7 @@
* commit its buffer to its containing writer.
*/
- public void close();
+ void close();
/**
* Closes the most recently opened element by writing the '>' that ends
it. Once this is
@@ -101,7 +101,7 @@
* with [EMAIL PROTECTED] #begin(String)}or or [EMAIL PROTECTED]
#beginEmpty(String)}.
*/
- public void closeTag();
+ void closeTag();
/**
* Writes an XML/HTML comment. Any open tag is first closed. The method
takes care of providing
@@ -112,28 +112,28 @@
* (much like [EMAIL PROTECTED] #printRaw(String)}.
*/
- public void comment(String value);
+ void comment(String value);
/**
* Ends the element most recently started by [EMAIL PROTECTED](String)}.
The name of the tag is
* popped off of the active element stack and used to form an HTML close
tag.
*/
- public void end();
+ void end();
/**
* Ends the most recently started element with the given name. This will
also end any other
* intermediate elements. This is very useful for easily ending a table or
even an entire page.
*/
- public void end(String name);
+ void end(String name);
/**
* Forwards <code>flush()</code> to this <code>IMarkupWriter</code>'s
* <code>PrintWriter</code>.
*/
- public void flush();
+ void flush();
/**
* Returns a nested writer, one that accumulates its changes in a buffer.
When the nested writer
@@ -141,14 +141,14 @@
* using [EMAIL PROTECTED] #printRaw(String)}.
*/
- public NestedMarkupWriter getNestedWriter();
+ NestedMarkupWriter getNestedWriter();
/**
* Version of [EMAIL PROTECTED] #print(char[], int, int,
boolean)} that assumes filter is
* <em>enabled</em>.
*/
- public void print(char[] data, int offset, int length);
+ void print(char[] data, int offset, int length);
/**
* The primary <code>print()</code> method, used by most other methods.
@@ -171,7 +171,7 @@
* @since 4.0
*/
- public void print(char[] data, int offset, int length, boolean raw);
+ void print(char[] data, int offset, int length, boolean raw);
/**
* Prints a single character, or its equivalent entity.
@@ -179,7 +179,7 @@
* Closes any open tag.
*/
- public void print(char value);
+ void print(char value);
/**
* Prints an integer.
@@ -187,44 +187,44 @@
* Closes any open tag.
*/
- public void print(int value);
+ void print(int value);
/**
* As with [EMAIL PROTECTED] #print(char[], int, int, boolean)}, but the
data to print is defined by the
* String. Assumes filtering is <em>enabled</em>.
*/
- public void print(String value);
+ void print(String value);
/**
* As with [EMAIL PROTECTED] #print(char[], int, int, boolean)}, but the
data to print is defined by the
* String.
*/
- public void print(String value, boolean raw);
+ void print(String value, boolean raw);
/**
* Closes the open tag (if any), then prints a line seperator to the
output stream.
*/
- public void println();
+ void println();
/**
* Version of [EMAIL PROTECTED] #print(char[], int, int, boolean)}that
assumes filter is <em>enabled</em>.
*/
- public void printRaw(char[] buffer, int offset, int length);
+ void printRaw(char[] buffer, int offset, int length);
/**
* As with [EMAIL PROTECTED] #print(char[], int, int, boolean)}, but the
data to print is defined by the
* String. Assumes filtering is <em>disabled</em>.
*/
- public void printRaw(String value);
+ void printRaw(String value);
/**
* Returns the type of content generated by this response writer, as a
MIME type.
*/
- public String getContentType();
-}
\ No newline at end of file
+ String getContentType();
+}
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/markup/AbstractMarkupFilter.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/markup/AbstractMarkupFilter.java?rev=385196&r1=385195&r2=385196&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/markup/AbstractMarkupFilter.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/markup/AbstractMarkupFilter.java
Sat Mar 11 15:21:36 2006
@@ -41,4 +41,4 @@
{
MarkupFilterUtils.print(writer, data, offset, length, escapeQuotes,
_translator);
}
-}
\ No newline at end of file
+}
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/markup/AsciiMarkupFilter.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/markup/AsciiMarkupFilter.java?rev=385196&r1=385195&r2=385196&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/markup/AsciiMarkupFilter.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/markup/AsciiMarkupFilter.java
Sat Mar 11 15:21:36 2006
@@ -30,4 +30,4 @@
super(new MarkupCharacterTranslator(true));
}
-}
\ No newline at end of file
+}
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/markup/MarkupFilter.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/markup/MarkupFilter.java?rev=385196&r1=385195&r2=385196&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/markup/MarkupFilter.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/markup/MarkupFilter.java
Sat Mar 11 15:21:36 2006
@@ -45,6 +45,6 @@
* through unchanged.
*/
- public void print(PrintWriter writer, char[] data, int offset, int length,
boolean escapeQuotes);
+ void print(PrintWriter writer, char[] data, int offset, int length,
boolean escapeQuotes);
-}
\ No newline at end of file
+}
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/markup/MarkupFilterUtils.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/markup/MarkupFilterUtils.java?rev=385196&r1=385195&r2=385196&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/markup/MarkupFilterUtils.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/markup/MarkupFilterUtils.java
Sat Mar 11 15:21:36 2006
@@ -26,8 +26,11 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
-public class MarkupFilterUtils
+public final class MarkupFilterUtils
{
+ /* defeat instantiation */
+ private MarkupFilterUtils() { }
+
public static void print(PrintWriter writer, char[] data, int offset, int
length,
boolean escapeQuotes, ICharacterTranslator translator)
{
@@ -61,4 +64,4 @@
writer.print(buffer.toString());
}
-}
\ No newline at end of file
+}
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/markup/MarkupMessages.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/markup/MarkupMessages.java?rev=385196&r1=385195&r2=385196&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/markup/MarkupMessages.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/markup/MarkupMessages.java
Sat Mar 11 15:21:36 2006
@@ -23,11 +23,14 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
-class MarkupMessages
+final class MarkupMessages
{
- private final static MessageFormatter _formatter = new
MessageFormatter(MarkupMessages.class,
+ private static final MessageFormatter _formatter = new
MessageFormatter(MarkupMessages.class,
"MarkupStrings");
+ /* defeat insantiation */
+ private MarkupMessages() { }
+
static String tagNotOpen()
{
return _formatter.getMessage("tag-not-open");
@@ -64,4 +67,4 @@
{
return _formatter.getMessage("close-once");
}
-}
\ No newline at end of file
+}
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/markup/MarkupStrings.properties
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/markup/MarkupStrings.properties?rev=385196&r1=385195&r2=385196&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/markup/MarkupStrings.properties
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/markup/MarkupStrings.properties
Sat Mar 11 15:21:36 2006
@@ -16,4 +16,4 @@
element-not-on-stack=Can not close to element ''{0}'', because no such element
is on the active elements stack ({1}).
end-with-empty-stack=Can not end most recent element because the stack of
active elements is empty.
no-filter-match=No markup filter could be found for content type ''{0}''; a
default filter has been used.
-close-once=A markup writer may only be closed once.
\ No newline at end of file
+close-once=A markup writer may only be closed once.
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/markup/MarkupWriterImpl.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/markup/MarkupWriterImpl.java?rev=385196&r1=385195&r2=385196&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/markup/MarkupWriterImpl.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/markup/MarkupWriterImpl.java
Sat Mar 11 15:21:36 2006
@@ -368,4 +368,4 @@
{
return _activeElementStack == null || _activeElementStack.isEmpty();
}
-}
\ No newline at end of file
+}
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/markup/MarkupWriterSource.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/markup/MarkupWriterSource.java?rev=385196&r1=385195&r2=385196&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/markup/MarkupWriterSource.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/markup/MarkupWriterSource.java
Sat Mar 11 15:21:36 2006
@@ -42,5 +42,5 @@
* @return The configured markup writer instance.
*/
- public IMarkupWriter newMarkupWriter(PrintWriter writer, ContentType
contentType);
-}
\ No newline at end of file
+ IMarkupWriter newMarkupWriter(PrintWriter writer, ContentType contentType);
+}
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/markup/MarkupWriterSourceImpl.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/markup/MarkupWriterSourceImpl.java?rev=385196&r1=385195&r2=385196&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/markup/MarkupWriterSourceImpl.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/markup/MarkupWriterSourceImpl.java
Sat Mar 11 15:21:36 2006
@@ -74,4 +74,4 @@
{
_log = log;
}
-}
\ No newline at end of file
+}
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/markup/NestedMarkupWriterImpl.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/markup/NestedMarkupWriterImpl.java?rev=385196&r1=385195&r2=385196&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/markup/NestedMarkupWriterImpl.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/markup/NestedMarkupWriterImpl.java
Sat Mar 11 15:21:36 2006
@@ -36,18 +36,6 @@
private boolean _closed;
- public String getBuffer()
- {
- if (_closed)
- throw new IllegalStateException(MarkupMessages.closeOnce());
-
- _closed = true;
-
- super.close();
-
- return _charArrayWriter.toString();
- }
-
public NestedMarkupWriterImpl(IMarkupWriter parent, MarkupFilter filter)
{
// Need to do this awkward double constructor because we want
@@ -64,6 +52,18 @@
_parent = parent;
_charArrayWriter = writer;
}
+
+ public String getBuffer()
+ {
+ if (_closed)
+ throw new IllegalStateException(MarkupMessages.closeOnce());
+
+ _closed = true;
+
+ super.close();
+
+ return _charArrayWriter.toString();
+ }
/**
* Closes the internal [EMAIL PROTECTED] CharArrayWriter}, then captures
its content and invokes
@@ -77,4 +77,4 @@
_parent.printRaw(content);
}
-}
\ No newline at end of file
+}
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/markup/UTFMarkupFilter.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/markup/UTFMarkupFilter.java?rev=385196&r1=385195&r2=385196&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/markup/UTFMarkupFilter.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/markup/UTFMarkupFilter.java
Sat Mar 11 15:21:36 2006
@@ -31,4 +31,4 @@
super(new MarkupCharacterTranslator(false));
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/tapestry-checkstyle.xml
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/tapestry-checkstyle.xml?rev=385196&r1=385195&r2=385196&view=diff
==============================================================================
--- jakarta/tapestry/trunk/tapestry-checkstyle.xml (original)
+++ jakarta/tapestry/trunk/tapestry-checkstyle.xml Sat Mar 11 15:21:36 2006
@@ -12,7 +12,9 @@
<property name="severity" value="warning"/>
<module name="TreeWalker">
<module name="JavadocStyle"/>
- <module name="ConstantName"/>
+ <module name="ConstantName">
+ <property name="format"
value="^[A-Z][A-Z0-9]|[a-z][a-z0-9]*(_[A-Z0-9]|[a-z0-9]+)*$"/>
+ </module>
<module name="LocalFinalVariableName"/>
<module name="LocalVariableName"/>
<module name="MemberName">
@@ -34,26 +36,21 @@
<module name="AvoidStarImport"/>
<module name="ImportOrder"/>
<module name="RedundantImport"/>
- <module name="UnusedImports">
- <property name="severity" value="error"/>
- </module>
- <module name="TabCharacter">
- <property name="severity" value="error"/>
- </module>
+ <module name="UnusedImports"/>
+ <module name="TabCharacter"/>
<module name="ModifierOrder"/>
<module name="RedundantModifier"/>
<module name="DefaultComesLast"/>
<module name="DeclarationOrder"/>
<module name="DoubleCheckedLocking">
- <property name="severity" value="error"/>
+ <property name="severity" value="info"/>
</module>
<module name="EmptyStatement"/>
<module name="HiddenField"/>
- <module name="JUnitTestCase">
- <property name="severity" value="error"/>
- </module>
+ <module name="JUnitTestCase"/>
<module name="MissingSwitchDefault">
- <property name="severity" value="error"/>
+ <metadata
name="com.atlassw.tools.eclipse.checkstyle.lastEnabledSeverity" value="error"/>
+ <property name="severity" value="ignore"/>
</module>
<module name="PackageDeclaration">
<property name="severity" value="error"/>
@@ -63,10 +60,10 @@
</module>
<module name="RedundantThrows"/>
<module name="SimplifyBooleanExpression">
- <property name="severity" value="error"/>
+ <property name="severity" value="info"/>
</module>
<module name="SimplifyBooleanReturn">
- <property name="severity" value="error"/>
+ <property name="severity" value="info"/>
</module>
<module name="StringLiteralEquality">
<property name="severity" value="error"/>
@@ -77,19 +74,13 @@
<module name="SuperFinalize">
<property name="severity" value="error"/>
</module>
- <module name="FinalClass">
- <property name="severity" value="error"/>
- </module>
- <module name="HideUtilityClassConstructor">
- <property name="severity" value="error"/>
- </module>
+ <module name="FinalClass"/>
+ <module name="HideUtilityClassConstructor"/>
<module name="InterfaceIsType"/>
<module name="MutableException"/>
<module name="ArrayTypeStyle"/>
<module name="UpperEll"/>
- <module name="JavadocType">
- <property name="severity" value="error"/>
- </module>
+ <module name="JavadocType"/>
</module>
<module name="PackageHtml"/>
<module name="NewlineAtEndOfFile"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
