From 14ce1527da98295378a4539fc827a9e38998ec61 Mon Sep 17 00:00:00 2001
From: Peter Donald <donaldp@apache.org>
Date: Sat, 12 Jan 2002 23:36:14 +0000
Subject: [PATCH] Made sur estylebook compiled, made protected members private
 and moved validation code into a separate method.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270695 13f79535-47bb-0310-9956-ffa450edef68
---
 .../ant/taskdefs/optional/StyleBook.java      | 33 ++++++++++---------
 .../ant/taskdefs/optional/StyleBook.java      | 33 ++++++++++---------
 2 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/StyleBook.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/StyleBook.java
index 0799d723b..5749091ec 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/StyleBook.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/StyleBook.java
@@ -21,16 +21,15 @@ import org.apache.tools.ant.taskdefs.Java;
 public class StyleBook
     extends Java
 {
-    protected File m_book;
-    protected String m_loaderConfig;
-    protected File m_skinDirectory;
-    protected File m_targetDirectory;
+    private File m_book;
+    private String m_loaderConfig;
+    private File m_skinDirectory;
+    private File m_targetDirectory;
 
     public StyleBook()
     {
         setClassname( "org.apache.stylebook.StyleBook" );
         setFork( true );
-        setFailonerror( true );
     }
 
     public void setBook( final File book )
@@ -56,7 +55,21 @@ public class StyleBook
     public void execute()
         throws TaskException
     {
+        validate();
 
+        createArg().setValue( "targetDirectory=" + m_targetDirectory );
+        createArg().setValue( m_book.toString() );
+        createArg().setValue( m_skinDirectory.toString() );
+        if( null != m_loaderConfig )
+        {
+            createArg().setValue( "loaderConfig=" + m_loaderConfig );
+        }
+
+        super.execute();
+    }
+
+    private void validate() throws TaskException
+    {
         if( null == m_targetDirectory )
         {
             throw new TaskException( "TargetDirectory attribute not set." );
@@ -71,16 +84,6 @@ public class StyleBook
         {
             throw new TaskException( "book attribute not set." );
         }
-
-        createArg().setValue( "targetDirectory=" + m_targetDirectory );
-        createArg().setValue( m_book.toString() );
-        createArg().setValue( m_skinDirectory.toString() );
-        if( null != m_loaderConfig )
-        {
-            createArg().setValue( "loaderConfig=" + m_loaderConfig );
-        }
-
-        super.execute();
     }
 }
 
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/StyleBook.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/StyleBook.java
index 0799d723b..5749091ec 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/StyleBook.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/StyleBook.java
@@ -21,16 +21,15 @@ import org.apache.tools.ant.taskdefs.Java;
 public class StyleBook
     extends Java
 {
-    protected File m_book;
-    protected String m_loaderConfig;
-    protected File m_skinDirectory;
-    protected File m_targetDirectory;
+    private File m_book;
+    private String m_loaderConfig;
+    private File m_skinDirectory;
+    private File m_targetDirectory;
 
     public StyleBook()
     {
         setClassname( "org.apache.stylebook.StyleBook" );
         setFork( true );
-        setFailonerror( true );
     }
 
     public void setBook( final File book )
@@ -56,7 +55,21 @@ public class StyleBook
     public void execute()
         throws TaskException
     {
+        validate();
 
+        createArg().setValue( "targetDirectory=" + m_targetDirectory );
+        createArg().setValue( m_book.toString() );
+        createArg().setValue( m_skinDirectory.toString() );
+        if( null != m_loaderConfig )
+        {
+            createArg().setValue( "loaderConfig=" + m_loaderConfig );
+        }
+
+        super.execute();
+    }
+
+    private void validate() throws TaskException
+    {
         if( null == m_targetDirectory )
         {
             throw new TaskException( "TargetDirectory attribute not set." );
@@ -71,16 +84,6 @@ public class StyleBook
         {
             throw new TaskException( "book attribute not set." );
         }
-
-        createArg().setValue( "targetDirectory=" + m_targetDirectory );
-        createArg().setValue( m_book.toString() );
-        createArg().setValue( m_skinDirectory.toString() );
-        if( null != m_loaderConfig )
-        {
-            createArg().setValue( "loaderConfig=" + m_loaderConfig );
-        }
-
-        super.execute();
     }
 }