| 1 |
|
|
| 2 |
|
|
| 3 |
|
|
| 4 |
|
|
| 5 |
|
|
| 6 |
|
|
| 7 |
|
|
| 8 |
|
|
| 9 |
|
|
| 10 |
|
|
| 11 |
|
|
| 12 |
|
|
| 13 |
|
|
| 14 |
|
|
| 15 |
|
|
| 16 |
|
|
| 17 |
|
|
| 18 |
|
|
| 19 |
|
|
| 20 |
|
|
| 21 |
|
|
| 22 |
|
|
| 23 |
|
|
| 24 |
|
|
| 25 |
|
|
| 26 |
|
|
| 27 |
|
|
| 28 |
|
|
| 29 |
|
|
| 30 |
|
|
| 31 |
|
|
| 32 |
|
|
| 33 |
|
|
| 34 |
|
|
| 35 |
|
|
| 36 |
|
|
| 37 |
|
|
| 38 |
|
|
| 39 |
|
|
| 40 |
|
|
| 41 |
|
|
| 42 |
|
|
| 43 |
|
|
| 44 |
|
|
| 45 |
|
|
| 46 |
|
|
| 47 |
|
|
| 48 |
|
|
| 49 |
|
|
| 50 |
|
|
| 51 |
|
|
| 52 |
|
|
| 53 |
|
|
| 54 |
|
|
| 55 |
|
|
| 56 |
|
|
| 57 |
|
|
| 58 |
|
package com.bonevich.eclipse.cvsgrapher.model; |
| 59 |
|
|
| 60 |
|
import org.apache.commons.logging.Log; |
| 61 |
|
import org.apache.commons.logging.LogFactory; |
| 62 |
|
import org.eclipse.core.runtime.IAdaptable; |
| 63 |
|
import org.eclipse.team.internal.ccvs.core.CVSTag; |
| 64 |
|
import org.eclipse.team.internal.ccvs.core.ILogEntry; |
| 65 |
|
import org.eclipse.team.internal.ccvs.ui.VersionCollator; |
| 66 |
|
|
| 67 |
|
import com.bonevich.eclipse.cvsgrapher.CvsGraphPlugin; |
| 68 |
|
|
| 69 |
|
import java.util.*; |
| 70 |
|
import java.util.regex.Matcher; |
| 71 |
|
import java.util.regex.Pattern; |
| 72 |
|
|
| 73 |
|
|
| 74 |
|
|
| 75 |
|
|
| 76 |
|
|
| 77 |
|
|
| 78 |
|
public final class CvsGraphModel |
| 79 |
|
{ |
| 80 |
|
private static final Log _logger = LogFactory.getLog(CvsGraphModel.class); |
| 81 |
|
|
| 82 |
|
private static final String MAIN_BRANCH = "MAIN"; |
| 83 |
|
|
| 84 |
|
private final List _entries; |
| 85 |
|
|
| 86 |
|
private CvsGraphBranchModel _rootBranch; |
| 87 |
|
private List _nodes = new ArrayList(); |
| 88 |
|
private Map _sourceTagMap = new HashMap(); |
| 89 |
|
private Map _mergeTagMap = new HashMap(); |
| 90 |
|
|
| 91 |
|
public CvsGraphModel(ILogEntry[] entries) |
| 92 |
|
{ |
| 93 |
|
_entries = Arrays.asList(entries); |
| 94 |
|
Collections.sort(_entries, new LogEntrySorter()); |
| 95 |
|
init(); |
| 96 |
|
} |
| 97 |
|
|
| 98 |
|
private void init() |
| 99 |
|
{ |
| 100 |
|
ListIterator entries = _entries.listIterator(); |
| 101 |
|
_rootBranch = createBranch("1", MAIN_BRANCH); |
| 102 |
|
addEntry(_rootBranch, _rootBranch, entries); |
| 103 |
|
|
| 104 |
|
createMergeConnections(); |
| 105 |
|
} |
| 106 |
|
|
| 107 |
|
private void createMergeConnections() |
| 108 |
|
{ |
| 109 |
|
Iterator sourceTags = _sourceTagMap.keySet().iterator(); |
| 110 |
|
while (sourceTags.hasNext()) |
| 111 |
|
{ |
| 112 |
|
String sourceTag = (String) sourceTags.next(); |
| 113 |
|
CvsGraphVersionModel sourceNode = (CvsGraphVersionModel) _sourceTagMap.get(sourceTag); |
| 114 |
|
CvsGraphVersionModel mergeNode = (CvsGraphVersionModel) _mergeTagMap.get(sourceTag); |
| 115 |
|
if (sourceNode != null && mergeNode != class="keyword">null && sourceNode != mergeNode) |
| 116 |
|
{ |
| 117 |
|
createConnection(sourceNode, mergeNode, true); |
| 118 |
|
} |
| 119 |
|
} |
| 120 |
|
} |
| 121 |
|
|
| 122 |
|
private void addEntry(ICvsGraphNodeModel previous, CvsGraphBranchModel currentBranch, ListIterator entries) |
| 123 |
|
{ |
| 124 |
|
if (_logger.isDebugEnabled()) |
| 125 |
|
{ |
| 126 |
|
_logger.debug("adding entry = " + previous.getVersion()); |
| 127 |
|
} |
| 128 |
|
|
| 129 |
|
if (!entries.hasNext()) |
| 130 |
|
{ |
| 131 |
|
return; |
| 132 |
|
} |
| 133 |
|
ILogEntry entry = (ILogEntry) entries.next(); |
| 134 |
|
if (isBranchTerminus(currentBranch, entry)) |
| 135 |
|
{ |
| 136 |
|
entries.previous(); |
| 137 |
|
return; |
| 138 |
|
} |
| 139 |
|
previous = createVersion(previous, entry); |
| 140 |
|
List branchTags = processTags(entry, previous); |
| 141 |
|
if (branchTags != null) |
| 142 |
|
{ |
| 143 |
|
int versionSuffix = 0; |
| 144 |
|
Iterator tags = branchTags.iterator(); |
| 145 |
|
while (tags.hasNext()) |
| 146 |
|
{ |
| 147 |
|
versionSuffix += 2; |
| 148 |
|
String version = previous.getVersion() + "." + versionSuffix; |
| 149 |
|
addBranch(previous, entries, (String) tags.next(), version); |
| 150 |
|
} |
| 151 |
|
} |
| 152 |
|
addEntry(previous, currentBranch, entries); |
| 153 |
|
} |
| 154 |
|
|
| 155 |
|
private void addBranch(ICvsGraphNodeModel previous, ListIterator entries, String tag, String version) |
| 156 |
|
{ |
| 157 |
|
CvsGraphBranchModel branch = createBranch(version, tag); |
| 158 |
|
previous.addChildNode(branch); |
| 159 |
|
branch.setParent(previous); |
| 160 |
|
|
| 161 |
|
if (_logger.isDebugEnabled()) |
| 162 |
|
{ |
| 163 |
|
_logger.debug("adding branch = " + branch.getVersion()); |
| 164 |
|
} |
| 165 |
|
|
| 166 |
|
createConnection(previous, branch); |
| 167 |
|
addEntry(branch, branch, entries); |
| 168 |
|
} |
| 169 |
|
|
| 170 |
|
private CvsGraphBranchModel createBranch(String version, String tag) |
| 171 |
|
{ |
| 172 |
|
CvsGraphBranchModel branch = new CvsGraphBranchModel(version, tag); |
| 173 |
|
_nodes.add(branch); |
| 174 |
|
return branch; |
| 175 |
|
} |
| 176 |
|
|
| 177 |
|
private List processTags(ILogEntry entry, ICvsGraphNodeModel node) |
| 178 |
|
{ |
| 179 |
|
List branchTags = null; |
| 180 |
|
CVSTag[] tags = entry.getTags(); |
| 181 |
|
if (tags.length > 0) |
| 182 |
|
{ |
| 183 |
|
branchTags = new ArrayList(tags.length); |
| 184 |
|
for (int j = 0; j < tags.length; j++) |
| 185 |
|
{ |
| 186 |
|
String tag = tags[j].getName(); |
| 187 |
|
if (tags[j].getType() == CVSTag.BRANCH) |
| 188 |
|
{ |
| 189 |
|
|
| 190 |
|
branchTags.add(0, tag); |
| 191 |
|
} |
| 192 |
|
else |
| 193 |
|
{ |
| 194 |
|
extractMergeTag(tag, node); |
| 195 |
|
} |
| 196 |
|
} |
| 197 |
|
} |
| 198 |
|
return branchTags; |
| 199 |
|
} |
| 200 |
|
|
| 201 |
|
private void extractMergeTag(String tag, ICvsGraphNodeModel node) |
| 202 |
|
{ |
| 203 |
|
Pattern source = CvsGraphPlugin.getPlugin().getMergeTagSourcePreference(); |
| 204 |
|
if (! extractMergeTag(tag, node, source, _sourceTagMap)) |
| 205 |
|
{ |
| 206 |
|
Pattern dest = CvsGraphPlugin.getPlugin().getMergeTagDestPreference(); |
| 207 |
|
extractMergeTag(tag, node, dest, _mergeTagMap); |
| 208 |
|
} |
| 209 |
|
} |
| 210 |
|
|
| 211 |
|
private boolean extractMergeTag(String tag, ICvsGraphNodeModel node, Pattern pattern, Map tagMap) |
| 212 |
|
{ |
| 213 |
|
Matcher matcher = pattern.matcher(tag); |
| 214 |
|
if (matcher.find()) |
| 215 |
|
{ |
| 216 |
|
tagMap.put(tag.substring(matcher.start(1), matcher.end(1)), node); |
| 217 |
|
return true; |
| 218 |
|
} |
| 219 |
|
return false; |
| 220 |
|
} |
| 221 |
|
|
| 222 |
|
private CvsGraphVersionModel createVersion(ICvsGraphNodeModel previous, ILogEntry entry) |
| 223 |
|
{ |
| 224 |
|
CvsGraphVersionModel node = new CvsGraphVersionModel(entry); |
| 225 |
|
_nodes.add(node); |
| 226 |
|
previous.addChildNode(node); |
| 227 |
|
node.setParent(previous); |
| 228 |
|
|
| 229 |
|
if (_logger.isDebugEnabled()) |
| 230 |
|
{ |
| 231 |
|
_logger.debug("new node = " + node.getVersion()); |
| 232 |
|
} |
| 233 |
|
createConnection(previous, node); |
| 234 |
|
|
| 235 |
|
if (_logger.isDebugEnabled()) |
| 236 |
|
{ |
| 237 |
|
_logger.debug("connected to previous = " + previous.getVersion()); |
| 238 |
|
} |
| 239 |
|
return node; |
| 240 |
|
} |
| 241 |
|
|
| 242 |
|
private void createConnection(ICvsGraphNodeModel previous, ICvsGraphNodeModel node) |
| 243 |
|
{ |
| 244 |
|
createConnection(previous, node, false); |
| 245 |
|
} |
| 246 |
|
|
| 247 |
|
private void createConnection(ICvsGraphNodeModel src, ICvsGraphNodeModel dest, boolean isMerge) |
| 248 |
|
{ |
| 249 |
|
|
| 250 |
|
CvsGraphConnectionModel connection = new CvsGraphConnectionModel(isMerge); |
| 251 |
|
|
| 252 |
|
connection.setSource(src); |
| 253 |
|
connection.setTarget(dest); |
| 254 |
|
|
| 255 |
|
src.addSourceConnection(connection); |
| 256 |
|
dest.addTargetConnection(connection); |
| 257 |
|
} |
| 258 |
|
|
| 259 |
|
private boolean isBranchTerminus(CvsGraphBranchModel currentBranch, ILogEntry next) |
| 260 |
|
{ |
| 261 |
|
String branchVersionPrefix = currentBranch.getVersion() + "."; |
| 262 |
|
String nextVersion = next.getRevision(); |
| 263 |
|
return (! nextVersion.startsWith(branchVersionPrefix)); |
| 264 |
|
} |
| 265 |
|
|
| 266 |
|
public List getNodes() |
| 267 |
|
{ |
| 268 |
|
return _nodes; |
| 269 |
|
} |
| 270 |
|
|
| 271 |
|
public CvsGraphBranchModel getRootBranch() |
| 272 |
|
{ |
| 273 |
|
return _rootBranch; |
| 274 |
|
} |
| 275 |
|
|
| 276 |
|
protected ILogEntry adaptToLogEntry(Object element) |
| 277 |
|
{ |
| 278 |
|
|
| 279 |
|
ILogEntry entry = null; |
| 280 |
|
if (element instanceof ILogEntry) |
| 281 |
|
{ |
| 282 |
|
entry = (ILogEntry) element; |
| 283 |
|
} |
| 284 |
|
else if (element instanceof IAdaptable) |
| 285 |
|
{ |
| 286 |
|
entry = (ILogEntry) ((IAdaptable) element).getAdapter(ILogEntry.class); |
| 287 |
|
} |
| 288 |
|
return entry; |
| 289 |
|
} |
| 290 |
|
|
| 291 |
0 |
final class LogEntrySorter implements Comparator |
| 292 |
|
{ |
| 293 |
0 |
private VersionCollator versionCollator = new VersionCollator(); |
| 294 |
|
|
| 295 |
|
|
| 296 |
|
|
| 297 |
|
|
| 298 |
|
public int compare(Object arg0, Object arg1) |
| 299 |
|
{ |
| 300 |
0 |
ILogEntry e1 = adaptToLogEntry(arg0); |
| 301 |
0 |
ILogEntry e2 = adaptToLogEntry(arg1); |
| 302 |
|
|
| 303 |
0 |
return versionCollator.compare(e1.getRevision(), e2.getRevision()); |
| 304 |
|
} |
| 305 |
|
} |
| 306 |
|
|
| 307 |
|
} |