Mailing-List: contact hivemind-cvs-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
Reply-To: hivemind-dev@jakarta.apache.org
Date: 21 Jun 2004 14:25:12 -0000
Message-ID: <20040621142512.62941.qmail@minotaur.apache.org>
From: hlship@apache.org
To: jakarta-hivemind-cvs@apache.org
Subject: cvs commit:
 jakarta-hivemind/framework/src/java/org/apache/hivemind/order
 OrdererMessages.java OrdererStrings.properties

hlship      2004/06/21 07:25:12

  Modified:    framework/src/java/org/apache/hivemind/order
                        OrdererMessages.java OrdererStrings.properties
  Log:
  Modify some messages related to Orderer to not include the location of the error.
  
  Revision  Changes    Path
  1.6       +3 -7      jakarta-hivemind/framework/src/java/org/apache/hivemind/order/OrdererMessages.java
  
  Index: OrdererMessages.java
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/framework/src/java/org/apache/hivemind/order/OrdererMessages.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- OrdererMessages.java	18 Jun 2004 13:50:03 -0000	1.5
  +++ OrdererMessages.java	21 Jun 2004 14:25:12 -0000	1.6
  @@ -36,11 +36,9 @@
       {
           return _formatter.format(
               "duplicate-name",
  -            new Object[] {
  -                StringUtils.capitalize(objectType),
  -                objectName,
  -                HiveMind.getLocationString(newObject),
  -                HiveMind.getLocationString(existingObject)});
  +            StringUtils.capitalize(objectType),
  +            objectName,
  +            HiveMind.getLocationString(existingObject));
       }
   
       public static String exception(String objectType, Throwable cause)
  @@ -58,7 +56,6 @@
               new Object[] {
                   StringUtils.capitalize(objectType),
                   newOrdering.getName(),
  -                HiveMind.getLocationString(newOrdering.getObject()),
                   existingLeader.getName(),
                   HiveMind.getLocationString(existingLeader.getObject())});
       }
  @@ -73,7 +70,6 @@
               new Object[] {
                   StringUtils.capitalize(objectType),
                   newOrdering.getName(),
  -                HiveMind.getLocationString(newOrdering.getObject()),
                   existingTrailer.getName(),
                   HiveMind.getLocationString(existingTrailer.getObject())});
       }
  
  
  
  1.3       +3 -3      jakarta-hivemind/framework/src/java/org/apache/hivemind/order/OrdererStrings.properties
  
  Index: OrdererStrings.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/framework/src/java/org/apache/hivemind/order/OrdererStrings.properties,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- OrdererStrings.properties	15 Jun 2004 20:35:56 -0000	1.2
  +++ OrdererStrings.properties	21 Jun 2004 14:25:12 -0000	1.3
  @@ -13,9 +13,9 @@
   # See the License for the specific language governing permissions and
   # limitations under the License.
   
  -duplicate-name={0} ''{1}'' (at {2}) duplicates previous value (at {3}) and is being ignored.
  +duplicate-name={0} ''{1}'' duplicates previous value (at {2}) and is being ignored.
   bad-dependency=Unknown {0} dependency ''{1}'' (for ''{2}'').
   dependency-cycle=Unable to order {0} ''{1}'' due to dependency cycle: {2}
   exception=Unable to order {0}s: {1}
  -dupe-leader={0} ''{1}'' (at {2}) has been ordered first, conflicting with ''{3}'' (at {4}).
  -dupe-trailer={0} ''{1}'' (at {2}) has been ordered last, conflicting with ''{3}'' (at {4}).
  +dupe-leader={0} ''{1}'' has been ordered first, conflicting with ''{2}'' (at {3}).
  +dupe-trailer={0} ''{1}'' has been ordered last, conflicting with ''{2}'' (at {3}).
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: hivemind-cvs-unsubscribe@jakarta.apache.org
For additional commands, e-mail: hivemind-cvs-help@jakarta.apache.org