[FOray-commit] SF.net SVN: foray: [7926] trunk/foray/foray-app/src/java/org/foray

[<vic...@us...>]

Revision: 7926
          http://svn.sourceforge.net/foray/?rev=7926&view=rev
Author:   victormote
Date:     2006-09-05 17:06:35 -0700 (Tue, 05 Sep 2006)

Log Message:
-----------
Conform to standard class-ordering scheme, as reported by checkstyle.

Modified Paths:
--------------
    trunk/foray/foray-app/src/java/org/foray/app/AWTStarter.java
    trunk/foray/foray-app/src/java/org/foray/app/CommandLineOptions.java
    trunk/foray/foray-app/src/java/org/foray/app/CommandLineStarter.java
    trunk/foray/foray-app/src/java/org/foray/app/Starter.java
    trunk/foray/foray-app/src/java/org/foray/app/ant/FOrayAntTask.java
    trunk/foray/foray-app/src/java/org/foray/app/test/TestConverter.java
    trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoAWTViewer.java
    trunk/foray/foray-app/src/java/org/foray/demo/embed/model/ProjectTeamXMLReader.java
    trunk/foray/foray-app/src/java/org/foray/demo/embed/tools/AbstractObjectReader.java

Modified: trunk/foray/foray-app/src/java/org/foray/app/AWTStarter.java
===================================================================
--- trunk/foray/foray-app/src/java/org/foray/app/AWTStarter.java	2006-09-05 23:55:49 UTC (rev 7925)
+++ trunk/foray/foray-app/src/java/org/foray/app/AWTStarter.java	2006-09-06 00:06:35 UTC (rev 7926)
@@ -58,12 +58,12 @@
  */
 public class AWTStarter extends CommandLineStarter {
 
+    private static final String TRANSLATION_PATH =
+        "/org/foray/render/awt/viewer/resources/";
+
     PreviewDialog frame;
     AWTRenderer renderer;
-    protected FOraySession session;
-    protected FOrayDocument document;
-    public static final String TRANSLATION_PATH =
-        "/org/foray/render/awt/viewer/resources/";
+    private FOrayDocument document;
 
     private Translator resource;
     private UserMessage userMessage;

Modified: trunk/foray/foray-app/src/java/org/foray/app/CommandLineOptions.java
===================================================================
--- trunk/foray/foray-app/src/java/org/foray/app/CommandLineOptions.java	2006-09-05 23:55:49 UTC (rev 7925)
+++ trunk/foray/foray-app/src/java/org/foray/app/CommandLineOptions.java	2006-09-06 00:06:35 UTC (rev 7926)
@@ -71,13 +71,13 @@
     private File outfile = null;
 
     /** The input mode. */
-    int inputmode = INPUT_NOT_SET;
+    private int inputmode = INPUT_NOT_SET;
 
     /** The output mode. */
-    int outputmode = INPUT_NOT_SET;
+    private int outputmode = INPUT_NOT_SET;
 
     /** Language for user information */
-    String language = null;
+    private String language = null;
 
     private SessionConfig sessionConfig;
     private OutputConfig rendererOptions;

Modified: trunk/foray/foray-app/src/java/org/foray/app/CommandLineStarter.java
===================================================================
--- trunk/foray/foray-app/src/java/org/foray/app/CommandLineStarter.java	2006-09-05 23:55:49 UTC (rev 7925)
+++ trunk/foray/foray-app/src/java/org/foray/app/CommandLineStarter.java	2006-09-06 00:06:35 UTC (rev 7926)
@@ -83,7 +83,8 @@
          * in the order submitted.
          */
         FOrayDocument document = null;
-        if (this.commandLineOptions.inputmode == CommandLineOptions.INPUT_FO) {
+        if (this.commandLineOptions.getInputMode()
+                == CommandLineOptions.INPUT_FO) {
             document = new FOrayDocument(session, inputSource, null);
         } else {
             document = new FOrayDocument(session,
@@ -98,7 +99,7 @@
          * as well.
          */
         final int outputType = commandLineOptions.getOutputType();
-        final OutputConfig outputOptions = this.outputConfig;
+        final OutputConfig outputOptions = this.getOutputConfig();
         final OutputTarget outputTarget = OutputTargetFactory.makeOutputTarget(
                 outputType, outputOptions, session.getLogger());
 

Modified: trunk/foray/foray-app/src/java/org/foray/app/Starter.java
===================================================================
--- trunk/foray/foray-app/src/java/org/foray/app/Starter.java	2006-09-05 23:55:49 UTC (rev 7925)
+++ trunk/foray/foray-app/src/java/org/foray/app/Starter.java	2006-09-06 00:06:35 UTC (rev 7926)
@@ -42,13 +42,11 @@
     Options options;
     InputSource inputSource;
     private Log logger;
-    protected SessionConfig sessionConfig;
-    protected OutputConfig outputConfig;
+    private OutputConfig outputConfig;
 
     public Starter(final Log logger, final SessionConfig sessionConfig,
             final OutputConfig renderConfig) throws FOrayException {
         this.logger = logger;
-        this.sessionConfig = sessionConfig;
         this.outputConfig = renderConfig;
         options = new Options(logger, sessionConfig, renderConfig);
     }
@@ -63,4 +61,11 @@
         return this.logger;
     }
 
+    /**
+     * @return Returns the outputConfig.
+     */
+    public OutputConfig getOutputConfig() {
+        return this.outputConfig;
+    }
+
 }

Modified: trunk/foray/foray-app/src/java/org/foray/app/ant/FOrayAntTask.java
===================================================================
--- trunk/foray/foray-app/src/java/org/foray/app/ant/FOrayAntTask.java	2006-09-05 23:55:49 UTC (rev 7925)
+++ trunk/foray/foray-app/src/java/org/foray/app/ant/FOrayAntTask.java	2006-09-06 00:06:35 UTC (rev 7926)
@@ -68,7 +68,7 @@
     int messageType = Project.MSG_VERBOSE;
     boolean logFiles = true;
     private boolean force = false;
-    Log logger;
+    private Log logger;
 
     /**
      * Sets the user configuration file.

Modified: trunk/foray/foray-app/src/java/org/foray/app/test/TestConverter.java
===================================================================
--- trunk/foray/foray-app/src/java/org/foray/app/test/TestConverter.java	2006-09-05 23:55:49 UTC (rev 7925)
+++ trunk/foray/foray-app/src/java/org/foray/app/test/TestConverter.java	2006-09-06 00:06:35 UTC (rev 7926)
@@ -73,6 +73,10 @@
     HashMap differ = new HashMap();
     private Log log;
 
+    public TestConverter() {
+        setupLogging();
+    }
+
     /**
      * This main method can be used to run the test converter from
      * the command line.
@@ -123,10 +127,6 @@
         tc.runTests(testFile, output, null);
     }
 
-    public TestConverter() {
-        setupLogging();
-    }
-
     private void setupLogging() {
         log = Logging.makeQuietLogger();
     }

Modified: trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoAWTViewer.java
===================================================================
--- trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoAWTViewer.java	2006-09-05 23:55:49 UTC (rev 7925)
+++ trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoAWTViewer.java	2006-09-06 00:06:35 UTC (rev 7926)
@@ -53,13 +53,13 @@
  */
 public class DemoAWTViewer extends EmbedDemo {
 
+    public static final String TRANSLATION_PATH =
+        "/org/foray/render/awt/viewer/resources/";
+
     public DemoAWTViewer() {
         super();
     }
 
-    public static final String TRANSLATION_PATH =
-        "/org/foray/render/awt/viewer/resources/";
-
     protected PreviewDialog createPreviewDialog(
             final AWTRenderer renderer,
             final Translator res) {

Modified: trunk/foray/foray-app/src/java/org/foray/demo/embed/model/ProjectTeamXMLReader.java
===================================================================
--- trunk/foray/foray-app/src/java/org/foray/demo/embed/model/ProjectTeamXMLReader.java	2006-09-05 23:55:49 UTC (rev 7925)
+++ trunk/foray/foray-app/src/java/org/foray/demo/embed/model/ProjectTeamXMLReader.java	2006-09-06 00:06:35 UTC (rev 7926)
@@ -62,18 +62,18 @@
             throw new NullPointerException("Parameter projectTeam must not be "
                     + "null");
         }
-        if (handler == null) {
+        if (this.getHandler() == null) {
             throw new IllegalStateException("ContentHandler not set");
         }
 
         //Start the document
-        handler.startDocument();
+        this.getHandler().startDocument();
 
         //Generate SAX events for the ProjectTeam
         generateFor(projectTeam);
 
         //End the document
-        handler.endDocument();
+        this.getHandler().endDocument();
     }
 
 
@@ -88,18 +88,18 @@
             throw new NullPointerException("Parameter projectTeam must not be "
                     + "null");
         }
-        if (handler == null) {
+        if (this.getHandler() == null) {
             throw new IllegalStateException("ContentHandler not set");
         }
 
-        handler.startElement("projectteam");
-        handler.element("projectname", projectTeam.getProjectName());
+        this.getHandler().startElement("projectteam");
+        this.getHandler().element("projectname", projectTeam.getProjectName());
         final Iterator i = projectTeam.getMembers().iterator();
         while (i.hasNext()) {
             final ProjectMember member = (ProjectMember)i.next();
             generateFor(member);
         }
-        handler.endElement("projectteam");
+        this.getHandler().endElement("projectteam");
     }
 
     /**
@@ -113,15 +113,15 @@
             throw new NullPointerException("Parameter projectMember must not "
                     + "be null");
         }
-        if (handler == null) {
+        if (this.getHandler() == null) {
             throw new IllegalStateException("ContentHandler not set");
         }
 
-        handler.startElement("member");
-        handler.element("name", projectMember.getName());
-        handler.element("function", projectMember.getFunction());
-        handler.element("email", projectMember.getEmail());
-        handler.endElement("member");
+        this.getHandler().startElement("member");
+        this.getHandler().element("name", projectMember.getName());
+        this.getHandler().element("function", projectMember.getFunction());
+        this.getHandler().element("email", projectMember.getEmail());
+        this.getHandler().endElement("member");
     }
 
 }

Modified: trunk/foray/foray-app/src/java/org/foray/demo/embed/tools/AbstractObjectReader.java
===================================================================
--- trunk/foray/foray-app/src/java/org/foray/demo/embed/tools/AbstractObjectReader.java	2006-09-05 23:55:49 UTC (rev 7925)
+++ trunk/foray/foray-app/src/java/org/foray/demo/embed/tools/AbstractObjectReader.java	2006-09-06 00:06:35 UTC (rev 7926)
@@ -51,9 +51,10 @@
     private ContentHandler orgHandler;
 
     /** Proxy for easy SAX event generation */
-    protected EasyContentHandlerProxy handler;
+    private EasyContentHandlerProxy handler;
+
     /** Error handler */
-    protected ErrorHandler errorHandler;
+    private ErrorHandler errorHandler;
 
 
     /**
@@ -179,4 +180,11 @@
     public abstract void parse(InputSource input)
         throws IOException, SAXException;
 
+    /**
+     * @return Returns the handler.
+     */
+    public EasyContentHandlerProxy getHandler() {
+        return this.handler;
+    }
+
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.