Author: [log in to unmask]
Date: Mon Mar 30 18:57:06 2015
New Revision: 2633

Log:
Minor changes to comments.

Modified:
    java/branches/monitoring-app-dev/src/main/java/org/hps/monitoring/application/DataSourceComboBox.java
    java/branches/monitoring-app-dev/src/main/java/org/hps/monitoring/application/MonitoringApplication.java
    java/branches/monitoring-app-dev/src/main/java/org/hps/monitoring/application/PlotInfoPanel.java
    java/branches/monitoring-app-dev/src/main/java/org/hps/monitoring/application/package-info.java

Modified: java/branches/monitoring-app-dev/src/main/java/org/hps/monitoring/application/DataSourceComboBox.java
 =============================================================================
--- java/branches/monitoring-app-dev/src/main/java/org/hps/monitoring/application/DataSourceComboBox.java	(original)
+++ java/branches/monitoring-app-dev/src/main/java/org/hps/monitoring/application/DataSourceComboBox.java	Mon Mar 30 18:57:06 2015
@@ -22,7 +22,7 @@
 
 /**
  * This is a combo box that shows the current data source such as an LCIO file, EVIO file or ET ring.
- * It can also be used to selected a new data source for the new session. 
+ * It can also be used to select a new data source for the new session. 
  * <p>
  * The way this works is kind of odd because it is not directly connected to an event loop, so it must 
  * catch changes to the configuration and update its items accordingly.

Modified: java/branches/monitoring-app-dev/src/main/java/org/hps/monitoring/application/MonitoringApplication.java
 =============================================================================
--- java/branches/monitoring-app-dev/src/main/java/org/hps/monitoring/application/MonitoringApplication.java	(original)
+++ java/branches/monitoring-app-dev/src/main/java/org/hps/monitoring/application/MonitoringApplication.java	Mon Mar 30 18:57:06 2015
@@ -326,7 +326,7 @@
      * Setup AIDA plotting into the GUI components.
      */
     void setupAida() {
-        // Register the factory for display plots in tabs.
+        // Register the factory for displaying plots in tabs.
         MonitoringAnalysisFactory.register();
         
         // Set the root tab pane for displaying plots.
@@ -349,6 +349,7 @@
     /**
      * This method sets the configuration on the model, which fires a change for every property.
      * @param configuration The new configuration.
+     * @param merge True to merge the configuration into the current one rather than replace it.
      */
     void loadConfiguration(Configuration configuration, boolean merge) {
                                

Modified: java/branches/monitoring-app-dev/src/main/java/org/hps/monitoring/application/PlotInfoPanel.java
 =============================================================================
--- java/branches/monitoring-app-dev/src/main/java/org/hps/monitoring/application/PlotInfoPanel.java	(original)
+++ java/branches/monitoring-app-dev/src/main/java/org/hps/monitoring/application/PlotInfoPanel.java	Mon Mar 30 18:57:06 2015
@@ -175,7 +175,7 @@
 
     /**
      * Get the title of an AIDA object.  Unfortunately there is no base type with this information,
-     * so it is gotten manually from each possible type.
+     * so it is read manually from each possible type.
      * @param object The AIDA object.
      * @return The title of the object from its title method or value of its toString method, if
      *         none exists.

Modified: java/branches/monitoring-app-dev/src/main/java/org/hps/monitoring/application/package-info.java
 =============================================================================
--- java/branches/monitoring-app-dev/src/main/java/org/hps/monitoring/application/package-info.java	(original)
+++ java/branches/monitoring-app-dev/src/main/java/org/hps/monitoring/application/package-info.java	Mon Mar 30 18:57:06 2015
@@ -1,13 +1,10 @@
 /**
- * <p>
  * The Monitoring Application is a flexible framework for monitoring the 
  * event processing chain of the HPS experiment.  It implements the conversion
  * of ET byte buffers to EVIO and then the building of LCIO events from the 
  * raw EVIO data.
- * <p>
  * <p>  
- * It provides three primary GUI components:
- * </p> 
+ * It provides three primary GUI components: 
  * <ul>
  * <li>run dashboard showing basic information about data received</li>
  * <li>system status monitor that can monitor the status of specific subsystems</li>
@@ -19,7 +16,7 @@
  * <a href="http://java.freehep.org/freehep-record/">freehep-record</a>
  * module to manage the flow of records and activate any processors that are listening
  * on the record loops.
- * </p>
+
  * @author Jeremy McCormick <[log in to unmask]>
  */
 package org.hps.monitoring.application;