Projects >> eclipse-color-theme >>18c2dbe200afbb4761bd08997d4264554f87798a

Chunk
Conflicting content 
package com.github.fhd.eclipsecolortheme;

<<<<<<< HEAD
import java.io.*;
import java.util.*;

import javax.xml.parsers.*;

import org.osgi.service.prefs.*;
import org.w3c.dom.*;
import org.xml.sax.*;

import com.github.fhd.eclipsecolortheme.mapper.*;
=======
import java.io.IOException;
import java.io.InputStream;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;

import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;

import org.osgi.service.prefs.BackingStoreException;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;

import com.github.fhd.eclipsecolortheme.mapper.CppEditorMapper;
import com.github.fhd.eclipsecolortheme.mapper.JavaEditorMapper;
import com.github.fhd.eclipsecolortheme.mapper.JavaPropertiesEditorMapper;
import com.github.fhd.eclipsecolortheme.mapper.JavaScriptEditorMapper;
import com.github.fhd.eclipsecolortheme.mapper.PhpEditorMapper;
import com.github.fhd.eclipsecolortheme.mapper.TextEditorMapper;
import com.github.fhd.eclipsecolortheme.mapper.ThemePreferenceMapper;
import com.github.fhd.eclipsecolortheme.mapper.WebEditorMapper;
>>>>>>> f5941049abffde3c308da63367306f714de0c179
import com.github.fhd.eclipsecolortheme.mapper.WebEditorMapper.Type;

/** Loads and applies color themes. */
Solution content 
package com.github.fhd.eclipsecolortheme;

import java.io.IOException;
import java.io.InputStream;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;

import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;

import org.osgi.service.prefs.BackingStoreException;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;

import com.github.fhd.eclipsecolortheme.mapper.CppEditorMapper;
import com.github.fhd.eclipsecolortheme.mapper.JavaEditorMapper;
import com.github.fhd.eclipsecolortheme.mapper.JavaPropertiesEditorMapper;
import com.github.fhd.eclipsecolortheme.mapper.JavaScriptEditorMapper;
import com.github.fhd.eclipsecolortheme.mapper.PhpEditorMapper;
import com.github.fhd.eclipsecolortheme.mapper.TextEditorMapper;
import com.github.fhd.eclipsecolortheme.mapper.ThemePreferenceMapper;
import com.github.fhd.eclipsecolortheme.mapper.WebEditorMapper;
import com.github.fhd.eclipsecolortheme.mapper.WebEditorMapper.Type;

/** Loads and applies color themes. */
File
ColorThemeManager.java
Developer's decision
Version 2
Kind of conflict
Import