hg4j: src/org/tmatesoft/hg/util/Path.java comparison

Merge command: implement conflict resolution alternatives

author	Artem Tikhomirov <tikhomirov.artem@gmail.com>
date	Thu, 15 Aug 2013 18:43:50 +0200
parents	5d8798772cca
children

comparison

equal deleted inserted replaced

-:7743a9c10bfa
+:b4242b7e7dfe
 	 * and optionally piping through a converter to get e.g. cached instance
 	 */
 	public static class SimpleSource implements Source {
 		private final PathRewrite normalizer;
 		private final Convertor<Path> convertor;
+		private final Path.Source delegate;
 		public SimpleSource() {
 			this(new PathRewrite.Empty(), null);
 		}
 		public SimpleSource(PathRewrite pathRewrite) {
 			this(pathRewrite, null);
 		}
 		public SimpleSource(PathRewrite pathRewrite, Convertor<Path> pathConvertor) {
+			assert pathRewrite != null;
 			normalizer = pathRewrite;
 			convertor = pathConvertor;
+			delegate = null;
+		}
+		public SimpleSource(Path.Source actual, Convertor<Path> pathConvertor) {
+			assert actual != null;
+			normalizer = null;
+			delegate = actual;
+			convertor = pathConvertor;
 		}
 		public Path path(CharSequence p) {
-			Path rv = Path.create(normalizer.rewrite(p));
+			// in fact, it's nicer to have sequence of sources, and a bunch of small
+			// Source implementations each responsible for specific aspect, like Convertor
+			// or delegation to another Source. However, these classes are just too small
+			// to justify their existence
+			Path rv;
+			if (delegate != null) {
+				rv = delegate.path(p);
+			} else {
+				rv = Path.create(normalizer.rewrite(p));
+			}
 			if (convertor != null) {
 				return convertor.mangle(rv);
 			}
 			return rv;
 		}

Mercurial > hg4j