package innovimax.mixthem.operation;

import innovimax.mixthem.MixException;
import innovimax.mixthem.MixThem;

import java.util.logging.Level;

/**
* <p>Zips two lines on a common field.</p>
* <p>This is the default implementation of IZipLine.</p>
* @see IZipLine
* @author Innovimax
* @version 1.0
*/
public class DefaultLineZipping implements IZipLine {

	@Override
	public String zip(String line1, String line2) throws MixException {
		String zippedLine = null;
		if (line1 != null && line2 != null) {
      			MixThem.LOGGER.logp(Level.INFO, "DefaultLineZipping", "zip", "TO IMPLEMENT");
		}
		return zippedLine;
	}

}

@@ -191,78 +191,27 @@
 %3E%0A* 
-%3Cp%3EThis is the default implementation of IZipLine.%3C/p%3E%0A* @see IZipLine
+@see ILineOperation
 %0A* @
@@ -293,18 +293,254 @@
 ts I
-ZipLine %7B%0A
+LineOperation %7B%0A%09/**%0A %09* Returns the result of zipping two lines.%0A%09* @param line1 The first line to zip%0A %09* @param line2 The second line to zip%09%0A %09* @return The result of zipping two lines%0A %09* @throws MixException - If an mixing error occurs%0A %09*/
 %0A%09@O
@@ -562,19 +562,23 @@
  String 
-zip
+process
 (String 

Update DefaultLineZipping.java