Projects >> knime-scripting >>78e9e82c51ac09fd84e9e34a1ea478da93884a9a

Chunk
Conflicting content 
package de.mpicbg.knime.knutils;

<<<<<<< HEAD
=======
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;

import org.knime.core.data.DataColumnSpec;
>>>>>>> 958b5014677d13340a6b208ebd345547d90a56cb
import org.knime.core.data.DataColumnSpecCreator;
import org.knime.core.data.DataRow;
import org.knime.core.data.DataTableSpec;
Solution content 
package de.mpicbg.knime.knutils;

import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;

import org.knime.core.data.DataColumnSpec;
import org.knime.core.data.DataColumnSpecCreator;
import org.knime.core.data.DataRow;
import org.knime.core.data.DataTableSpec;
File
BufTableUtils.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
import org.knime.core.node.ExecutionContext;
import org.knime.core.node.port.PortObjectSpec;

<<<<<<< HEAD
import java.io.*;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;

=======
>>>>>>> 958b5014677d13340a6b208ebd345547d90a56cb

/**
 * Document me!
Solution content 
import org.knime.core.node.ExecutionContext;
import org.knime.core.node.port.PortObjectSpec;



/**
 * Document me!
File
BufTableUtils.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
        exec.checkCanceled();
        exec.setProgress((double) done / (double) all);
    }
<<<<<<< HEAD


	public static DataTableSpec createNewDataTableSpec(LinkedHashMap newColumns) {
		DataTableSpecCreator createSpec = new DataTableSpecCreator();
		
		for(String colName : newColumns.keySet()) {
			DataColumnSpecCreator colSpecCreate = new DataColumnSpecCreator(colName, newColumns.get(colName));
			createSpec.addColumns(colSpecCreate.createSpec());
		}
		
		return createSpec.createSpec();
	}
=======
    
    /**
     * creates a data table spec based on a hash map with column names and types
     * @param columns
     * @return new data table spec
     */
    public static DataTableSpec createNewDataTableSpec(LinkedHashMap columns) {
    	DataColumnSpecCreator colSpecCreator = null;
    	DataColumnSpec[] cSpecList = new DataColumnSpec[columns.size()];
    	int i = 0;
    	for(String columnName : columns.keySet()) {
    		colSpecCreator = new DataColumnSpecCreator(columnName, columns.get(columnName));
    		cSpecList[i] = colSpecCreator.createSpec();
    		i++;
    	}
    	
    	DataTableSpecCreator specCreator = new DataTableSpecCreator();
    	specCreator.addColumns(cSpecList);
    	
    	return specCreator.createSpec();
    }
>>>>>>> 958b5014677d13340a6b208ebd345547d90a56cb
}
Solution content 
        exec.checkCanceled();
        exec.setProgress((double) done / (double) all);
    }
    
    /**
     * creates a data table spec based on a hash map with column names and types
     * @param columns
     * @return new data table spec
     */
    public static DataTableSpec createNewDataTableSpec(LinkedHashMap columns) {
    	DataColumnSpecCreator colSpecCreator = null;
    	DataColumnSpec[] cSpecList = new DataColumnSpec[columns.size()];
    	int i = 0;
    	for(String columnName : columns.keySet()) {
    		colSpecCreator = new DataColumnSpecCreator(columnName, columns.get(columnName));
    		cSpecList[i] = colSpecCreator.createSpec();
    		i++;
    	}
    	
    	DataTableSpecCreator specCreator = new DataTableSpecCreator();
    	specCreator.addColumns(cSpecList);
    	
    	return specCreator.createSpec();
    }
}
File
BufTableUtils.java
Developer's decision
Version 2
Kind of conflict
Comment
Method declaration