Projects >> WordCram >>086d3eb5331ddf4a5831dc1a9c5cd7ae861b897f

Chunk
Conflicting content 
 limitations under the License.
 */

<<<<<<< HEAD
import java.io.FileNotFoundException;
import java.util.*;
=======
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
>>>>>>> dd9e76cd89f9918c51a2392fce9e259e99a53506

import processing.core.PApplet;
import processing.core.PFont;
Solution content 
 limitations under the License.
 */

import java.io.FileNotFoundException;
import java.util.*;

import processing.core.PApplet;
import processing.core.PFont;
File
Main.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
                     : textCase == TextCase.Upper ? text.toUpperCase()
                     : text;

<<<<<<< HEAD
                words = new WordCounter().withExtraStopWords(extraStopWords).shouldExcludeNumbers(excludeNumbers).count(text, renderOptions);

=======
                words = new WordCounter().withExtraStopWords(extraStopWords).shouldExcludeNumbers(excludeNumbers).count(text);
                observer.wordsCounted(words);
>>>>>>> dd9e76cd89f9918c51a2392fce9e259e99a53506
                if (words.length == 0) {
                	warnScripterAboutEmptyWordArray();
                }
Solution content 
                     : textCase == TextCase.Upper ? text.toUpperCase()
                     : text;

                words = new WordCounter().withExtraStopWords(extraStopWords).shouldExcludeNumbers(excludeNumbers).count(text, renderOptions);
                observer.wordsCounted(words);
                if (words.length == 0) {
                	warnScripterAboutEmptyWordArray();
                }
File
WordCram.java
Developer's decision
Combination
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
            if (angler == null) angler = Anglers.mostlyHoriz();
            if (placer == null) placer = Placers.horizLine();
            if (nudger == null) nudger = new SpiralWordNudger();
<<<<<<< HEAD
            wordCramEngine = new WordCramEngine(renderer, words, fonter, sizer, colorer, angler, placer, nudger, new WordShaper(renderOptions), new BBTreeBuilder(), renderOptions);
=======
            PGraphics canvas = destination == null? parent.g : destination;
            wordCramEngine = new WordCramEngine(canvas, words, fonter, sizer, colorer, angler, placer, nudger, new WordShaper(), new BBTreeBuilder(), renderOptions, observer);
>>>>>>> dd9e76cd89f9918c51a2392fce9e259e99a53506
        }
     return wordCramEngine;
    }
Solution content 
            if (angler == null) angler = Anglers.mostlyHoriz();
            if (placer == null) placer = Placers.horizLine();
            if (nudger == null) nudger = new SpiralWordNudger();

            wordCramEngine = new WordCramEngine(renderer, words, fonter, sizer, colorer, angler, placer, nudger, new WordShaper(renderOptions), new BBTreeBuilder(), renderOptions, observer);
        }
     return wordCramEngine;
    }
File
WordCram.java
Developer's decision
Manual
Kind of conflict
Attribute
Method invocation
Variable
Chunk
Conflicting content 
*/

import java.awt.Color;
<<<<<<< HEAD
import java.awt.Shape;
=======
import java.awt.Graphics2D;
import java.awt.RenderingHints;
import java.awt.Shape;
import java.awt.geom.GeneralPath;
>>>>>>> dd9e76cd89f9918c51a2392fce9e259e99a53506
import java.awt.geom.Rectangle2D;
import java.util.ArrayList;
Solution content 
*/

import java.awt.Color;
import java.awt.Shape;
import java.awt.geom.Rectangle2D;
import java.util.ArrayList;
File
WordCramEngine.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
    private RenderOptions renderOptions;
    private Observer observer;

<<<<<<< HEAD
    WordCramEngine(WordRenderer renderer, Word[] words, WordFonter fonter, WordSizer sizer, WordColorer colorer, WordAngler angler, WordPlacer placer, WordNudger nudger, WordShaper shaper, BBTreeBuilder bbTreeBuilder, RenderOptions renderOptions) {
        this.renderer = renderer;
=======
    WordCramEngine(PGraphics destination, Word[] words, WordFonter fonter, WordSizer sizer, WordColorer colorer, WordAngler angler, WordPlacer placer, WordNudger nudger, WordShaper shaper, BBTreeBuilder bbTreeBuilder, RenderOptions renderOptions, Observer observer) {
        this.destination = destination;
>>>>>>> dd9e76cd89f9918c51a2392fce9e259e99a53506

        this.fonter = fonter;
        this.sizer = sizer;
Solution content 
    private RenderOptions renderOptions;
    private Observer observer;

    WordCramEngine(WordRenderer renderer, Word[] words, WordFonter fonter, WordSizer sizer, WordColorer colorer, WordAngler angler, WordPlacer placer, WordNudger nudger, WordShaper shaper, BBTreeBuilder bbTreeBuilder, RenderOptions renderOptions, Observer observer) {
        this.renderer = renderer;

        this.fonter = fonter;
        this.sizer = sizer;
File
WordCramEngine.java
Developer's decision
Manual
Kind of conflict
Attribute
Method signature
Chunk
Conflicting content 
//              "Drew a word. Progress: " + (eWordIndex + 1) +
//            "/" + eWords.length + "(" + ((int) (getProgress() * 100)) + "%)";
        }
<<<<<<< HEAD
        renderer.finish();
=======
        observer.endDraw(words);
>>>>>>> dd9e76cd89f9918c51a2392fce9e259e99a53506
    }

    void drawNext() {
Solution content 
//              "Drew a word. Progress: " + (eWordIndex + 1) +
//            "/" + eWords.length + "(" + ((int) (getProgress() * 100)) + "%)";
        }
        renderer.finish();
        observer.endDraw(words);
    }

    void drawNext() {
File
WordCramEngine.java
Developer's decision
Concatenation
Kind of conflict
Method invocation
Chunk
Conflicting content 
	}

	private WordCramEngine getEngine(Word... words) {
<<<<<<< HEAD
		return new WordCramEngine(renderer, words, fonter, sizer, colorer, angler, placer, nudger, shaper, bbTreeBuilder, renderOptions);
=======
		return null;
//		return new WordCramEngine(destination, words, fonter, sizer, colorer, angler, placer, nudger, shaper, bbTreeBuilder, renderOptions);
>>>>>>> dd9e76cd89f9918c51a2392fce9e259e99a53506
	}
}
Solution content 
	}

	private WordCramEngine getEngine(Word... words) {
		return new WordCramEngine(renderer, words, fonter, sizer, colorer, angler, placer, nudger, shaper, bbTreeBuilder, renderOptions);
	}
}
File
AWordCramEngine.java
Developer's decision
Version 1
Kind of conflict
Comment
Method invocation
Return statement