Projects >> fop >>a0c1ba36959d7f564d590e1ea0aa159b2dc7745e

Chunk
Conflicting content 
        }
    }
    /**
     * {@inheritDoc}
     */
<<<<<<< HEAD
    public boolean performsSubstitution() {
        load(true);
        if ( realFontDescriptor instanceof Substitutable ) {
            return ((Substitutable)realFontDescriptor).performsSubstitution();
        } else {
            return false;
        }
    }

    /**
     * {@inheritDoc}
     */
    public CharSequence performSubstitution ( CharSequence cs, String script, String language ) {
        load(true);
        if ( realFontDescriptor instanceof Substitutable ) {
            return ((Substitutable)realFontDescriptor).performSubstitution(cs, script, language);
        } else {
            return cs;
        }
    }

    /**
     * {@inheritDoc}
     */
    public CharSequence reorderCombiningMarks
        ( CharSequence cs, int[][] gpa, String script, String language ) {
        load(true);
        if ( realFontDescriptor instanceof Substitutable ) {
            return ((Substitutable)realFontDescriptor).
                reorderCombiningMarks(cs, gpa, script, language);
        } else {
            return cs;
        }
    }

    /**
     * {@inheritDoc}
     */
    public boolean performsPositioning() {
        load(true);
        if ( realFontDescriptor instanceof Positionable ) {
            return ((Positionable)realFontDescriptor).performsPositioning();
        } else {
            return false;

    /**
     * {@inheritDoc}
     */
    public int[][]
        performPositioning ( CharSequence cs, String script, String language, int fontSize ) {
        load(true);
        if ( realFontDescriptor instanceof Positionable ) {
            return ((Positionable)realFontDescriptor)
                .performPositioning(cs, script, language, fontSize);
        } else {
            return null;
        }
    }

    /**
     * {@inheritDoc}
     */
    public int[][]
        performPositioning ( CharSequence cs, String script, String language ) {
        load(true);
        if ( realFontDescriptor instanceof Positionable ) {
            return ((Positionable)realFontDescriptor)
                .performPositioning(cs, script, language);
        } else {
            return null;
        }
=======
    public boolean isSubsetEmbedded() {
        load(true);
        return realFont.isMultiByte();
>>>>>>> 3e0d3a0c3b46fc1631314d9a9228595a98d3298a
    }

}
Solution content 
    /**
    /**
     * {@inheritDoc}
     */
    public boolean performsSubstitution() {
        load(true);
        if ( realFontDescriptor instanceof Substitutable ) {
            return ((Substitutable)realFontDescriptor).performsSubstitution();
        } else {
            return false;
        }
    }

     * {@inheritDoc}
     */
    public CharSequence performSubstitution ( CharSequence cs, String script, String language ) {
        load(true);
        if ( realFontDescriptor instanceof Substitutable ) {
            return ((Substitutable)realFontDescriptor).performSubstitution(cs, script, language);
        } else {
            return cs;
        }
    }

    /**
     * {@inheritDoc}
     */
    public CharSequence reorderCombiningMarks
        ( CharSequence cs, int[][] gpa, String script, String language ) {
        load(true);
        if ( realFontDescriptor instanceof Substitutable ) {
            return ((Substitutable)realFontDescriptor).
                reorderCombiningMarks(cs, gpa, script, language);
        } else {
            return cs;
        }
    }

    /**
     * {@inheritDoc}
     */
    public boolean performsPositioning() {
        load(true);
        if ( realFontDescriptor instanceof Positionable ) {
            return ((Positionable)realFontDescriptor).performsPositioning();
        } else {
            return false;
        }
    }

    /**
     * {@inheritDoc}
     */
    public int[][]
        performPositioning ( CharSequence cs, String script, String language, int fontSize ) {
        load(true);
        if ( realFontDescriptor instanceof Positionable ) {
            return ((Positionable)realFontDescriptor)
                .performPositioning(cs, script, language, fontSize);
        } else {
            return null;
        }
    }

    /**
     * {@inheritDoc}
     */
    public int[][]
        performPositioning ( CharSequence cs, String script, String language ) {
        load(true);
        if ( realFontDescriptor instanceof Positionable ) {
            return ((Positionable)realFontDescriptor)
                .performPositioning(cs, script, language);
        } else {
            return null;
        }
    }

    /**
     * {@inheritDoc}
     */
    public boolean isSubsetEmbedded() {
        load(true);
        return realFont.isMultiByte();
    }

}
File
LazyFont.java
Developer's decision
Manual
Kind of conflict
Comment
If statement
Method declaration
Method invocation
Method signature
Return statement
Chunk
Conflicting content 
package org.apache.fop.fonts;

<<<<<<< HEAD
import java.nio.CharBuffer;
import java.nio.IntBuffer;
import java.text.DecimalFormat;
=======
//Java
>>>>>>> 3e0d3a0c3b46fc1631314d9a9228595a98d3298a
import java.util.Map;

import org.apache.commons.logging.Log;
Solution content 
package org.apache.fop.fonts;

import java.nio.CharBuffer;
import java.nio.IntBuffer;
import java.util.Map;

import org.apache.commons.logging.Log;
File
MultiByteFont.java
Developer's decision
Combination
Kind of conflict
Comment
Import