Return-Path: 
 <commits-return-4700-apmail-pdfbox-commits-archive=pdfbox.apache.org@pdfbox.apache.org>
X-Original-To: apmail-pdfbox-commits-archive@www.apache.org
Delivered-To: apmail-pdfbox-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id EE0C917BF0
	for <apmail-pdfbox-commits-archive@www.apache.org>;
 Thu, 15 Jan 2015 22:45:12 +0000 (UTC)
Received: (qmail 70809 invoked by uid 500); 15 Jan 2015 22:45:14 -0000
Delivered-To: apmail-pdfbox-commits-archive@pdfbox.apache.org
Received: (qmail 70785 invoked by uid 500); 15 Jan 2015 22:45:14 -0000
Mailing-List: contact commits-help@pdfbox.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@pdfbox.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@pdfbox.apache.org>
List-Post: <mailto:commits@pdfbox.apache.org>
List-Id: <commits.pdfbox.apache.org>
Reply-To: dev@pdfbox.apache.org
Delivered-To: mailing list commits@pdfbox.apache.org
Received: (qmail 70769 invoked by uid 99); 15 Jan 2015 22:45:14 -0000
Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Jan 2015 22:45:14 +0000
Received: from hades.apache.org (localhost [127.0.0.1])
	by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id
 E8C79AC07BD;
	Thu, 15 Jan 2015 22:45:05 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1652296 - in
 /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox:
 contentstream/operator/Operator.java pdmodel/font/ExternalFonts.java
 pdmodel/font/Standard14Fonts.java
Date: Thu, 15 Jan 2015 22:45:05 -0000
To: commits@pdfbox.apache.org
From: tilman@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20150115224509.E8C79AC07BD@hades.apache.org>

Author: tilman
Date: Thu Jan 15 22:45:05 2015
New Revision: 1652296

URL: http://svn.apache.org/r1652296
Log:
PDFBOX-2576: fix modifier order according to JLS

Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/Operator.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/ExternalFonts.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/Standard14Fonts.java

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/Operator.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/Operator.java?rev=1652296&r1=1652295&r2=1652296&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/Operator.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/Operator.java Thu Jan 15 22:45:05 2015
@@ -32,7 +32,7 @@ public class Operator
     private COSDictionary imageParameters;
 
     /** map for singleton operator objects; use {@link ConcurrentHashMap} for better scalability with multiple threads */
-    private final static ConcurrentHashMap<String,Operator> operators = new ConcurrentHashMap<String, Operator>();
+    private static final ConcurrentHashMap<String,Operator> operators = new ConcurrentHashMap<String, Operator>();
 
     /**
      * Constructor.

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/ExternalFonts.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/ExternalFonts.java?rev=1652296&r1=1652295&r2=1652296&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/ExternalFonts.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/ExternalFonts.java Thu Jan 15 22:45:05 2015
@@ -113,7 +113,7 @@ public final class ExternalFonts
     }
 
     /** Map of PostScript name substitutes, in priority order. */
-    private final static Map<String, List<String>> substitutes = new HashMap<String, List<String>>();
+    private static final Map<String, List<String>> substitutes = new HashMap<String, List<String>>();
     static
     {
         // substitutes for standard 14 fonts

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/Standard14Fonts.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/Standard14Fonts.java?rev=1652296&r1=1652295&r2=1652296&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/Standard14Fonts.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/Standard14Fonts.java Thu Jan 15 22:45:05 2015
@@ -40,8 +40,8 @@ class Standard14Fonts
     {
     }
 
-    private final static Set<String> STANDARD_14_NAMES = new HashSet<String>();
-    private final static Map<String, String> STANDARD_14_MAPPING = new HashMap<String, String>();
+    private static final Set<String> STANDARD_14_NAMES = new HashSet<String>();
+    private static final Map<String, String> STANDARD_14_MAPPING = new HashMap<String, String>();
     private static final Map<String, FontMetrics> STANDARD14_AFM_MAP;
     static
     {