Projects >> sip-creator >>8669527df21ead1adcb1d69b3acb3b842c5dd803

Chunk
Conflicting content 
package eu.delving.sip.actions;

import eu.delving.metadata.Hasher;
<<<<<<< HEAD
import eu.delving.plugin.MediaFiles;
import eu.delving.sip.base.ProgressListener;
import eu.delving.sip.base.Swing;
import eu.delving.sip.base.Work;
=======
import eu.delving.sip.base.*;
>>>>>>> b5e3d4c4ee8eb50bb09da28474d745ea123773d0
import eu.delving.sip.files.DataSet;
import eu.delving.sip.files.DataSetState;
import eu.delving.sip.model.DataSetModel;
Solution content 
package eu.delving.sip.actions;

import eu.delving.metadata.Hasher;
import eu.delving.plugin.MediaFiles;
import eu.delving.sip.base.CancelException;
import eu.delving.sip.base.ProgressListener;
import eu.delving.sip.base.Swing;
import eu.delving.sip.base.Work;
import eu.delving.sip.files.DataSet;
import eu.delving.sip.files.DataSetState;
import eu.delving.sip.model.DataSetModel;
File
MediaImportAction.java
Developer's decision
Manual
Kind of conflict
Import
Chunk
Conflicting content 
import eu.delving.sip.xml.FileProcessor;

import javax.swing.*;
<<<<<<< HEAD
import java.awt.*;
=======
>>>>>>> b5e3d4c4ee8eb50bb09da28474d745ea123773d0
import java.awt.event.ActionEvent;

import static eu.delving.sip.base.KeystrokeHelper.configAction;
Solution content 
import eu.delving.sip.xml.FileProcessor;

import javax.swing.AbstractAction;
import java.awt.event.ActionEvent;

import static eu.delving.sip.base.KeystrokeHelper.configAction;
File
ValidateAction.java
Developer's decision
Manual
Kind of conflict
Import
Chunk
Conflicting content 
import eu.delving.sip.model.SipModel;

import javax.swing.*;
<<<<<<< HEAD
import java.awt.*;
=======
import java.awt.BorderLayout;
import java.awt.Container;
import java.awt.FlowLayout;
>>>>>>> b5e3d4c4ee8eb50bb09da28474d745ea123773d0
import java.awt.event.ActionEvent;
import java.util.List;
Solution content 
import eu.delving.sip.model.SipModel;

import javax.swing.*;
import java.awt.BorderLayout;
import java.awt.Container;
import java.awt.FlowLayout;
import java.awt.event.ActionEvent;
import java.util.List;
File
ReportFrame.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
=======
import javax.swing.tree.DefaultTreeModel;
import javax.swing.tree.TreePath;
import javax.swing.tree.TreeSelectionModel;
<<<<<<< HEAD
import java.awt.*;
import java.awt.event.KeyEvent;
import java.awt.BorderLayout;
import java.awt.Container;
import java.awt.Dimension;
>>>>>>> b5e3d4c4ee8eb50bb09da28474d745ea123773d0
import java.util.ArrayList;
import java.util.Collections;
Solution content 
import javax.swing.tree.DefaultTreeModel;
import javax.swing.tree.TreePath;
import javax.swing.tree.TreeSelectionModel;
import java.awt.BorderLayout;
import java.awt.Container;
import java.awt.Dimension;
import java.util.ArrayList;
import java.util.Collections;
File
StatsFrame.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
package eu.delving.groovy;

<<<<<<< HEAD
import eu.delving.PluginBinding;
import eu.delving.metadata.*;
=======
import eu.delving.metadata.CodeGenerator;
import eu.delving.metadata.EditPath;
import eu.delving.metadata.RecDefTree;
import eu.delving.metadata.RecMapping;
>>>>>>> b5e3d4c4ee8eb50bb09da28474d745ea123773d0
import groovy.lang.Binding;
import groovy.lang.MissingPropertyException;
import groovy.lang.Script;
Solution content 
package eu.delving.groovy;

import eu.delving.PluginBinding;
import eu.delving.metadata.*;
import groovy.lang.Binding;
import groovy.lang.MissingPropertyException;
import groovy.lang.Script;
File
MappingRunner.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
    public MappingRunner(GroovyCodeResource groovyCodeResource, RecMapping recMapping, PluginBinding pluginBinding, EditPath editPath) {
        this.groovyCodeResource = groovyCodeResource;
        this.recMapping = recMapping;
<<<<<<< HEAD
        this.pluginBinding = pluginBinding;
        CodeOut codeOut = CodeOut.create();
        recMapping.toCode(codeOut, editPath);
        code = codeOut.toString();
        script = groovyCodeResource.createMappingScript(code);
=======
        this.code = new CodeGenerator(recMapping).withEditPath(editPath).toRecordMappingCode();
        this.script = groovyCodeResource.createMappingScript(code);
>>>>>>> b5e3d4c4ee8eb50bb09da28474d745ea123773d0
        for (Map.Entry entry : recMapping.getFacts().entrySet()) {
            new GroovyNode(factsNode, entry.getKey(), entry.getValue());
        }
Solution content 
    public MappingRunner(GroovyCodeResource groovyCodeResource, RecMapping recMapping, PluginBinding pluginBinding, EditPath editPath) {
        this.groovyCodeResource = groovyCodeResource;
        this.recMapping = recMapping;
        this.pluginBinding = pluginBinding;
        this.code = new CodeGenerator(recMapping).withEditPath(editPath).toRecordMappingCode();
        this.script = groovyCodeResource.createMappingScript(code);
        for (Map.Entry entry : recMapping.getFacts().entrySet()) {
            new GroovyNode(factsNode, entry.getKey(), entry.getValue());
        }
File
MappingRunner.java
Developer's decision
Combination
Kind of conflict
Attribute
Method invocation
Variable
Chunk
Conflicting content 
        counter += 1;
        try {
            Binding binding = new Binding();
<<<<<<< HEAD
            DOMBuilder builder = DOMBuilder.newInstance(recMapping.getRecDefTree().getNamespaces());
            RecDef recDef = recMapping.getRecDefTree().getRecDef();
            binding.setVariable("_optLookup", recDef.optLookup);
=======
            DOMBuilder builder = DOMBuilder.newInstance(recMapping.getRecDefTree().getRecDef());
            binding.setVariable("_optLookup", recMapping.getRecDefTree().getRecDef().optLookup);
>>>>>>> b5e3d4c4ee8eb50bb09da28474d745ea123773d0
            binding.setVariable("output", builder);
            binding.setVariable("input", wrap(metadataRecord.getRootNode()));
            binding.setVariable("_facts", wrap(factsNode));
Solution content 
        counter += 1;
        try {
            Binding binding = new Binding();
            DOMBuilder builder = DOMBuilder.newInstance(recMapping.getRecDefTree().getRecDef());
            binding.setVariable("_optLookup", recMapping.getRecDefTree().getRecDef().optLookup);
            binding.setVariable("output", builder);
            binding.setVariable("input", wrap(metadataRecord.getRootNode()));
            binding.setVariable("_facts", wrap(factsNode));
File
MappingRunner.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable