You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2015/09/07 22:33:46 UTC

svn commit: r1701692 - in /directory/apacheds/trunk/i18n/src: checkstyle/ checkstyle/suppressions.xml main/java/org/apache/directory/server/i18n/I18n.java

Author: seelmann
Date: Mon Sep  7 20:33:45 2015
New Revision: 1701692

URL: http://svn.apache.org/r1701692
Log:
Fix checkstyle issues

Added:
    directory/apacheds/trunk/i18n/src/checkstyle/
    directory/apacheds/trunk/i18n/src/checkstyle/suppressions.xml   (with props)
Modified:
    directory/apacheds/trunk/i18n/src/main/java/org/apache/directory/server/i18n/I18n.java

Added: directory/apacheds/trunk/i18n/src/checkstyle/suppressions.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/i18n/src/checkstyle/suppressions.xml?rev=1701692&view=auto
==============================================================================
--- directory/apacheds/trunk/i18n/src/checkstyle/suppressions.xml (added)
+++ directory/apacheds/trunk/i18n/src/checkstyle/suppressions.xml Mon Sep  7 20:33:45 2015
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+
+<!DOCTYPE suppressions PUBLIC
+    "-//Puppy Crawl//DTD Suppressions 1.1//EN"
+    "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
+
+<suppressions>
+    <!-- More than 7 parameters in private method -->
+    <suppress files="org.apache.directory.server.i18n.errors_fr.properties" checks="Translation"/>
+    <suppress files="org.apache.directory.server.i18n.errors_de.properties" checks="Translation"/>
+</suppressions>

Propchange: directory/apacheds/trunk/i18n/src/checkstyle/suppressions.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/apacheds/trunk/i18n/src/checkstyle/suppressions.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: directory/apacheds/trunk/i18n/src/main/java/org/apache/directory/server/i18n/I18n.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/i18n/src/main/java/org/apache/directory/server/i18n/I18n.java?rev=1701692&r1=1701691&r2=1701692&view=diff
==============================================================================
--- directory/apacheds/trunk/i18n/src/main/java/org/apache/directory/server/i18n/I18n.java (original)
+++ directory/apacheds/trunk/i18n/src/main/java/org/apache/directory/server/i18n/I18n.java Mon Sep  7 20:33:45 2015
@@ -785,10 +785,10 @@ public enum I18n
     ERR_749("ERR_749"),
     ERR_750("ERR_750");
 
-    private static ResourceBundle errBundle = ResourceBundle
+    private static final ResourceBundle ERR_BUNDLE = ResourceBundle
         .getBundle( "org.apache.directory.server.i18n.errors" );
 
-    private static final ResourceBundle msgBundle = ResourceBundle
+    private static final ResourceBundle MSG_BUNDLE = ResourceBundle
         .getBundle( "org/apache/directory/server/i18n/messages" );
 
     /** The error code */
@@ -825,7 +825,7 @@ public enum I18n
     {
         try
         {
-            return err + " " + MessageFormat.format( errBundle.getString( err.getErrorCode() ), args );
+            return err + " " + MessageFormat.format( ERR_BUNDLE.getString( err.getErrorCode() ), args );
         }
         catch ( Exception e )
         {
@@ -863,7 +863,7 @@ public enum I18n
     {
         try
         {
-            return MessageFormat.format( msgBundle.getString( msg ), args );
+            return MessageFormat.format( MSG_BUNDLE.getString( msg ), args );
         }
         catch ( MissingResourceException mre )
         {