java.lang Cleanup

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1827406 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/fop-core/src/main/java/org/apache/fop/fonts/GlyphMapping.java b/fop-core/src/main/java/org/apache/fop/fonts/GlyphMapping.java
index f79a04e97a16c83844c7e1e2cc4e6942575ee81f..dce045c2cac2cba9f37bd9912959d5d1262b4006 100644 (file)
--- a/fop-core/src/main/java/org/apache/fop/fonts/GlyphMapping.java
+++ b/fop-core/src/main/java/org/apache/fop/fonts/GlyphMapping.java
@@ -257,7 +257,7 @@ public class GlyphMapping {
             if (kerning) {
                 int kern = 0;
                 if (offset > 0) {
-                    int previousChar = java.lang.Character.codePointAt(ics, offset - 1);
+                    int previousChar = Character.codePointAt(ics, offset - 1);
                     kern = font.getKernValue(previousChar, currentChar);
                 } else if (precedingChar != 0) {
                     kern = font.getKernValue(precedingChar, currentChar);
@@ -276,9 +276,9 @@ public class GlyphMapping {
                 && endsWithHyphen) {
             int endChar = text.charAt(endIndex - 1);
 
-            if (java.lang.Character.isLowSurrogate((char) endChar)) {
+            if (Character.isLowSurrogate((char) endChar)) {
                 char highSurrogate = text.charAt(endIndex - 2);
-                endChar = java.lang.Character.toCodePoint(highSurrogate, (char) endChar);
+                endChar = Character.toCodePoint(highSurrogate, (char) endChar);
             }
 
             int kern = font.getKernValue(endChar, (int) breakOpportunityChar);

diff --git a/fop-core/src/main/java/org/apache/fop/fonts/truetype/OpenFont.java b/fop-core/src/main/java/org/apache/fop/fonts/truetype/OpenFont.java
index 586943d585b53b4b4c83a51f74c94e30016b7938..3d15fc4d874ba1bbc53974cb53103664c4549135 100644 (file)
--- a/fop-core/src/main/java/org/apache/fop/fonts/truetype/OpenFont.java
+++ b/fop-core/src/main/java/org/apache/fop/fonts/truetype/OpenFont.java
@@ -695,7 +695,7 @@ public abstract class OpenFont {
                     // Also add winAnsiWidth.
                     List<Integer> ansiIndexes = null;
 
-                    if (charCodeL <= java.lang.Character.MAX_VALUE) {
+                    if (charCodeL <= Character.MAX_VALUE) {
                         ansiIndexes = ansiIndex.get((int) charCodeL);
                     }
 

diff --git a/fop-core/src/test/java/org/apache/fop/visual/ConvertUtils.java b/fop-core/src/test/java/org/apache/fop/visual/ConvertUtils.java
index aa4dadf47eef138b26f601212bdcf99545cab6b7..bb0570e227464f78b2c582da68e3fc460009dea9 100644 (file)
--- a/fop-core/src/test/java/org/apache/fop/visual/ConvertUtils.java
+++ b/fop-core/src/test/java/org/apache/fop/visual/ConvertUtils.java
@@ -71,7 +71,7 @@ public final class ConvertUtils {
             new Thread(outputRedirector).start();
 
             process.waitFor();
-        } catch (java.lang.InterruptedException ie) {
+        } catch (InterruptedException ie) {
             throw new IOException("The call to the external converter failed: " + ie.getMessage());
         } catch (java.io.IOException ioe) {
             throw new IOException("The call to the external converter failed: " + ioe.getMessage());

diff --git a/fop/examples/embedding/java/embedding/tools/AbstractObjectReader.java b/fop/examples/embedding/java/embedding/tools/AbstractObjectReader.java
index df34d09ee931a17926acadedbd31fcc3cbd676c3..59ad5ea1f2753718741cc64c9887bfaca63d7557 100644 (file)
--- a/fop/examples/embedding/java/embedding/tools/AbstractObjectReader.java
+++ b/fop/examples/embedding/java/embedding/tools/AbstractObjectReader.java
@@ -121,20 +121,20 @@ public abstract class AbstractObjectReader implements XMLReader {
     /**
      * @see org.xml.sax.XMLReader#getProperty(String)
      */
-    public Object getProperty(java.lang.String name) {
+    public Object getProperty(String name) {
         return null;
     }
 
     /**
      * @see org.xml.sax.XMLReader#setProperty(String, Object)
      */
-    public void setProperty(java.lang.String name, java.lang.Object value) {
+    public void setProperty(String name, Object value) {
     }
 
     /**
      * @see org.xml.sax.XMLReader#getFeature(String)
      */
-    public boolean getFeature(java.lang.String name) {
+    public boolean getFeature(String name) {
         return (Boolean) features.get(name);
     }
 
@@ -157,7 +157,7 @@ public abstract class AbstractObjectReader implements XMLReader {
     /**
      * @see org.xml.sax.XMLReader#setFeature(String, boolean)
      */
-    public void setFeature(java.lang.String name, boolean value) {
+    public void setFeature(String name, boolean value) {
         this.features.put(name, value);
     }