cmlenz 01/09/18 06:42:53
Modified: src/taglib/common/org/apache/slide/taglib/bean LockBean.java
NodeBean.java PropertyBean.java RevisionBean.java
src/taglib/common/org/apache/slide/taglib/tag
NodeTagSupport.java PropertyTagSupport.java
RevisionTagSupport.java
Log:
some style cleanup
Revision Changes Path
1.2 +5 -8
jakarta-slide/src/taglib/common/org/apache/slide/taglib/bean/LockBean.java
Index: LockBean.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/taglib/common/org/apache/slide/taglib/bean/LockBean.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LockBean.java 2001/09/18 09:18:07 1.1
+++ LockBean.java 2001/09/18 13:42:52 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/taglib/common/org/apache/slide/taglib/bean/LockBean.java,v
1.1 2001/09/18 09:18:07 cmlenz Exp $
- * $Revision: 1.1 $
- * $Date: 2001/09/18 09:18:07 $
+ * $Header:
/home/cvs/jakarta-slide/src/taglib/common/org/apache/slide/taglib/bean/LockBean.java,v
1.2 2001/09/18 13:42:52 cmlenz Exp $
+ * $Revision: 1.2 $
+ * $Date: 2001/09/18 13:42:52 $
*
* ====================================================================
*
@@ -77,7 +77,7 @@
* layer technologies such as JSP or Velocity.</p>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Christopher Lenz</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class LockBean
extends AbstractBean {
@@ -111,10 +111,7 @@
* @param st the slide token
* @param lock the NodeLock to wrap
*/
- public LockBean(
- NamespaceAccessToken nat,
- SlideToken st,
- NodeLock lock) {
+ public LockBean(NamespaceAccessToken nat, SlideToken st, NodeLock lock) {
super(nat, st);
setNodeLock(lock);
1.2 +7 -17
jakarta-slide/src/taglib/common/org/apache/slide/taglib/bean/NodeBean.java
Index: NodeBean.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/taglib/common/org/apache/slide/taglib/bean/NodeBean.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NodeBean.java 2001/09/18 09:18:07 1.1
+++ NodeBean.java 2001/09/18 13:42:52 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/taglib/common/org/apache/slide/taglib/bean/NodeBean.java,v
1.1 2001/09/18 09:18:07 cmlenz Exp $
- * $Revision: 1.1 $
- * $Date: 2001/09/18 09:18:07 $
+ * $Header:
/home/cvs/jakarta-slide/src/taglib/common/org/apache/slide/taglib/bean/NodeBean.java,v
1.2 2001/09/18 13:42:52 cmlenz Exp $
+ * $Revision: 1.2 $
+ * $Date: 2001/09/18 13:42:52 $
*
* ====================================================================
*
@@ -82,7 +82,7 @@
* layer technologies such as JSP or Velocity.</p>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Christopher Lenz</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class NodeBean
extends AbstractBean {
@@ -122,10 +122,7 @@
* @param st the slide token
* @param node the node to wrap
*/
- public NodeBean(
- NamespaceAccessToken nat,
- SlideToken st,
- ObjectNode node) {
+ public NodeBean(NamespaceAccessToken nat, SlideToken st, ObjectNode node) {
super(nat, st);
setObjectNode(node);
@@ -611,8 +608,7 @@
* @see #getLatestRevision
* @see #getRevision(String)
*/
- public RevisionBean getRevision(
- NodeRevisionNumber number) {
+ public RevisionBean getRevision(NodeRevisionNumber number) {
RevisionBean revision = null;
try {
@@ -646,13 +642,7 @@
* @see #getLatestRevision
* @see #getRevision(NodeRevisionNumber)
*/
- public RevisionBean getRevision(
- String branch) {
-
- // check bean state
- if ((nat == null) || (node == null)) {
- throw new IllegalStateException("Bean not correctly initialized");
- }
+ public RevisionBean getRevision(String branch) {
RevisionBean revision = null;
try {
1.2 +6 -8
jakarta-slide/src/taglib/common/org/apache/slide/taglib/bean/PropertyBean.java
Index: PropertyBean.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/taglib/common/org/apache/slide/taglib/bean/PropertyBean.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PropertyBean.java 2001/09/18 09:18:07 1.1
+++ PropertyBean.java 2001/09/18 13:42:52 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/taglib/common/org/apache/slide/taglib/bean/PropertyBean.java,v
1.1 2001/09/18 09:18:07 cmlenz Exp $
- * $Revision: 1.1 $
- * $Date: 2001/09/18 09:18:07 $
+ * $Header:
/home/cvs/jakarta-slide/src/taglib/common/org/apache/slide/taglib/bean/PropertyBean.java,v
1.2 2001/09/18 13:42:52 cmlenz Exp $
+ * $Revision: 1.2 $
+ * $Date: 2001/09/18 13:42:52 $
*
* ====================================================================
*
@@ -74,7 +74,7 @@
* layer technologies such as JSP or Velocity.</p>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Christopher Lenz</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class PropertyBean
extends AbstractBean {
@@ -108,10 +108,8 @@
* @param st the slide token
* @param property the property to wrap
*/
- public PropertyBean(
- NamespaceAccessToken nat,
- SlideToken st,
- NodeProperty property) {
+ public PropertyBean(NamespaceAccessToken nat, SlideToken st,
+ NodeProperty property) {
super(nat, st);
this.property = property;
1.2 +8 -13
jakarta-slide/src/taglib/common/org/apache/slide/taglib/bean/RevisionBean.java
Index: RevisionBean.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/taglib/common/org/apache/slide/taglib/bean/RevisionBean.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RevisionBean.java 2001/09/18 09:18:07 1.1
+++ RevisionBean.java 2001/09/18 13:42:52 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/taglib/common/org/apache/slide/taglib/bean/RevisionBean.java,v
1.1 2001/09/18 09:18:07 cmlenz Exp $
- * $Revision: 1.1 $
- * $Date: 2001/09/18 09:18:07 $
+ * $Header:
/home/cvs/jakarta-slide/src/taglib/common/org/apache/slide/taglib/bean/RevisionBean.java,v
1.2 2001/09/18 13:42:52 cmlenz Exp $
+ * $Revision: 1.2 $
+ * $Date: 2001/09/18 13:42:52 $
*
* ====================================================================
*
@@ -80,7 +80,7 @@
* layer technologies such as JSP or Velocity.</p>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Christopher Lenz</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class RevisionBean
extends AbstractBean {
@@ -114,10 +114,8 @@
* @param st the slide token
* @param revision the revision to wrap
*/
- public RevisionBean(
- NamespaceAccessToken nat,
- SlideToken st,
- NodeRevisionDescriptor revision) {
+ public RevisionBean(NamespaceAccessToken nat, SlideToken st,
+ NodeRevisionDescriptor revision) {
super(nat, st);
setNodeRevisionDescriptor(revision);
@@ -185,8 +183,7 @@
*
* @param revision the NodeRevisionDescriptor to wrap
*/
- public void setNodeRevisionDescriptor(
- NodeRevisionDescriptor revision) {
+ public void setNodeRevisionDescriptor(NodeRevisionDescriptor revision) {
this.revision = revision;
}
@@ -208,9 +205,7 @@
*
* @see #getProperties
*/
- public PropertyBean getProperty(
- String name,
- String namespace) {
+ public PropertyBean getProperty(String name, String namespace) {
NodeProperty np;
if ((namespace == null) || namespace.length() == 0) {
1.2 +6 -8
jakarta-slide/src/taglib/common/org/apache/slide/taglib/tag/NodeTagSupport.java
Index: NodeTagSupport.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/taglib/common/org/apache/slide/taglib/tag/NodeTagSupport.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NodeTagSupport.java 2001/09/18 13:31:23 1.1
+++ NodeTagSupport.java 2001/09/18 13:42:53 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/taglib/common/org/apache/slide/taglib/tag/NodeTagSupport.java,v
1.1 2001/09/18 13:31:23 cmlenz Exp $
- * $Revision: 1.1 $
- * $Date: 2001/09/18 13:31:23 $
+ * $Header:
/home/cvs/jakarta-slide/src/taglib/common/org/apache/slide/taglib/tag/NodeTagSupport.java,v
1.2 2001/09/18 13:42:53 cmlenz Exp $
+ * $Revision: 1.2 $
+ * $Date: 2001/09/18 13:42:53 $
*
* ====================================================================
*
@@ -79,7 +79,7 @@
* variable.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Christopher Lenz</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public abstract class NodeTagSupport
extends TagSupport {
@@ -249,10 +249,8 @@
* @param uri the URI of the node to retrieve
* @param resolveLinks whether to resolve links when retrieving the node
*/
- protected NodeBean getNode(
- NamespaceBean namespace,
- String uri,
- boolean resolveLinks) {
+ protected NodeBean getNode(NamespaceBean namespace, String uri,
+ boolean resolveLinks) {
NodeBean bean = null;
if ((namespace != null) && (uri != null)) {
1.2 +6 -8
jakarta-slide/src/taglib/common/org/apache/slide/taglib/tag/PropertyTagSupport.java
Index: PropertyTagSupport.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/taglib/common/org/apache/slide/taglib/tag/PropertyTagSupport.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PropertyTagSupport.java 2001/09/18 13:31:23 1.1
+++ PropertyTagSupport.java 2001/09/18 13:42:53 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/taglib/common/org/apache/slide/taglib/tag/PropertyTagSupport.java,v
1.1 2001/09/18 13:31:23 cmlenz Exp $
- * $Revision: 1.1 $
- * $Date: 2001/09/18 13:31:23 $
+ * $Header:
/home/cvs/jakarta-slide/src/taglib/common/org/apache/slide/taglib/tag/PropertyTagSupport.java,v
1.2 2001/09/18 13:42:53 cmlenz Exp $
+ * $Revision: 1.2 $
+ * $Date: 2001/09/18 13:42:53 $
*
* ====================================================================
*
@@ -78,7 +78,7 @@
* variable.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Christopher Lenz</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
**/
public abstract class PropertyTagSupport
extends TagSupport {
@@ -249,10 +249,8 @@
* @param namespace the namespace of the property, or <code>null</code> to
* use the default namespace ("DAV:")
**/
- protected PropertyBean getProperty(
- RevisionBean revision,
- String name,
- String namespace) {
+ protected PropertyBean getProperty(RevisionBean revision, String name,
+ String namespace) {
PropertyBean bean = null;
if (revision != null) {
1.2 +7 -8
jakarta-slide/src/taglib/common/org/apache/slide/taglib/tag/RevisionTagSupport.java
Index: RevisionTagSupport.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/taglib/common/org/apache/slide/taglib/tag/RevisionTagSupport.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RevisionTagSupport.java 2001/09/18 13:31:23 1.1
+++ RevisionTagSupport.java 2001/09/18 13:42:53 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/taglib/common/org/apache/slide/taglib/tag/RevisionTagSupport.java,v
1.1 2001/09/18 13:31:23 cmlenz Exp $
- * $Revision: 1.1 $
- * $Date: 2001/09/18 13:31:23 $
+ * $Header:
/home/cvs/jakarta-slide/src/taglib/common/org/apache/slide/taglib/tag/RevisionTagSupport.java,v
1.2 2001/09/18 13:42:53 cmlenz Exp $
+ * $Revision: 1.2 $
+ * $Date: 2001/09/18 13:42:53 $
*
* ====================================================================
*
@@ -79,7 +79,7 @@
* variable.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Christopher Lenz</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public abstract class RevisionTagSupport
extends TagSupport {
@@ -255,10 +255,9 @@
* @param branch name of the branch of which to retrieve the latest
* revision
*/
- protected RevisionBean getRevision(
- NodeBean node,
- NodeRevisionNumber number,
- String branch) {
+ protected RevisionBean getRevision(NodeBean node,
+ NodeRevisionNumber number,
+ String branch) {
RevisionBean bean = null;
if (number != null) {
