|
Lines 11-17
Link Here
|
| 11 |
|
11 |
|
| 12 |
package org.eclipse.mylar.internal.team; |
12 |
package org.eclipse.mylar.internal.team; |
| 13 |
|
13 |
|
| 14 |
import org.eclipse.compare.structuremergeviewer.DiffNode; |
|
|
| 15 |
import org.eclipse.compare.structuremergeviewer.IDiffElement; |
14 |
import org.eclipse.compare.structuremergeviewer.IDiffElement; |
| 16 |
import org.eclipse.core.resources.IProject; |
15 |
import org.eclipse.core.resources.IProject; |
| 17 |
import org.eclipse.core.resources.IResource; |
16 |
import org.eclipse.core.resources.IResource; |
|
Lines 20-33
Link Here
|
| 20 |
import org.eclipse.core.runtime.IAdapterFactory; |
19 |
import org.eclipse.core.runtime.IAdapterFactory; |
| 21 |
import org.eclipse.core.runtime.IAdapterManager; |
20 |
import org.eclipse.core.runtime.IAdapterManager; |
| 22 |
import org.eclipse.core.runtime.Platform; |
21 |
import org.eclipse.core.runtime.Platform; |
| 23 |
import org.eclipse.mylar.internal.team.template.CommitTemplateManager; |
|
|
| 24 |
import org.eclipse.mylar.tasks.core.TaskRepository; |
22 |
import org.eclipse.mylar.tasks.core.TaskRepository; |
| 25 |
import org.eclipse.mylar.tasks.ui.TasksUiPlugin; |
23 |
import org.eclipse.mylar.tasks.ui.TasksUiPlugin; |
| 26 |
import org.eclipse.mylar.team.MylarTeamPlugin; |
|
|
| 27 |
import org.eclipse.team.core.history.IFileRevision; |
24 |
import org.eclipse.team.core.history.IFileRevision; |
| 28 |
import org.eclipse.team.core.variants.IResourceVariant; |
25 |
import org.eclipse.team.core.variants.IResourceVariant; |
| 29 |
import org.eclipse.team.internal.ccvs.core.CVSException; |
26 |
import org.eclipse.team.internal.ccvs.core.CVSException; |
| 30 |
import org.eclipse.team.internal.ccvs.core.ICVSResource; |
27 |
import org.eclipse.team.internal.ccvs.core.ICVSResource; |
|
|
28 |
import org.eclipse.team.internal.ccvs.core.client.listeners.LogEntry; |
| 31 |
import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; |
29 |
import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; |
| 32 |
import org.eclipse.team.internal.ccvs.core.resources.RemoteResource; |
30 |
import org.eclipse.team.internal.ccvs.core.resources.RemoteResource; |
| 33 |
import org.eclipse.team.internal.core.subscribers.ChangeSet; |
31 |
import org.eclipse.team.internal.core.subscribers.ChangeSet; |
|
Lines 35-43
Link Here
|
| 35 |
import org.eclipse.team.internal.ui.synchronize.ChangeSetDiffNode; |
33 |
import org.eclipse.team.internal.ui.synchronize.ChangeSetDiffNode; |
| 36 |
import org.eclipse.team.internal.ui.synchronize.SynchronizeModelElement; |
34 |
import org.eclipse.team.internal.ui.synchronize.SynchronizeModelElement; |
| 37 |
|
35 |
|
| 38 |
|
|
|
| 39 |
/** |
36 |
/** |
| 40 |
* Adapter factory used to create adapters for <code>LinkedTaskInfo</code> |
37 |
* Adapter factory used to create adapters for <code>LinkedTaskInfo</code> |
| 41 |
* |
38 |
* |
| 42 |
* @author Eugene Kuleshov |
39 |
* @author Eugene Kuleshov |
| 43 |
*/ |
40 |
*/ |
|
Lines 48-59
Link Here
|
| 48 |
|
45 |
|
| 49 |
private static IAdapterFactory FACTORY = new LinkedTaskInfoAdapterFactory(); |
46 |
private static IAdapterFactory FACTORY = new LinkedTaskInfoAdapterFactory(); |
| 50 |
|
47 |
|
| 51 |
private static final String PREFIX_HTTP = "http://"; |
|
|
| 52 |
|
| 53 |
private static final String PREFIX_HTTPS = "https://"; |
| 54 |
|
48 |
|
| 55 |
// private static boolean haveSubclipse; |
|
|
| 56 |
|
| 57 |
public static void registerAdapters() { |
49 |
public static void registerAdapters() { |
| 58 |
IAdapterManager adapterManager = Platform.getAdapterManager(); |
50 |
IAdapterManager adapterManager = Platform.getAdapterManager(); |
| 59 |
|
51 |
|
|
Lines 62-116
Link Here
|
| 62 |
|
54 |
|
| 63 |
// Team public |
55 |
// Team public |
| 64 |
adapterManager.registerAdapters(FACTORY, IFileRevision.class); |
56 |
adapterManager.registerAdapters(FACTORY, IFileRevision.class); |
| 65 |
adapterManager.registerAdapters(FACTORY, DiffNode.class); |
|
|
| 66 |
|
57 |
|
| 67 |
// Team internal |
58 |
// Team internal |
| 68 |
adapterManager.registerAdapters(FACTORY, DiffChangeSet.class); // CVSCheckedInChangeSet ??? |
59 |
adapterManager.registerAdapters(FACTORY, DiffChangeSet.class); // CVSCheckedInChangeSet |
| 69 |
adapterManager.registerAdapters(FACTORY, ChangeSetDiffNode.class); |
60 |
adapterManager.registerAdapters(FACTORY, ChangeSetDiffNode.class); |
| 70 |
adapterManager.registerAdapters(FACTORY, SynchronizeModelElement.class); |
61 |
adapterManager.registerAdapters(FACTORY, SynchronizeModelElement.class); |
| 71 |
|
62 |
|
| 72 |
// Team CVS internal; is it used? Maybe CVS History view in Eclipse 3.1? |
63 |
// Team CVS internal; is it used? Maybe CVS History view in Eclipse 3.1? |
| 73 |
adapterManager.registerAdapters(FACTORY, org.eclipse.team.internal.ccvs.core.client.listeners.LogEntry.class); |
64 |
adapterManager.registerAdapters(FACTORY, LogEntry.class); |
| 74 |
|
|
|
| 75 |
// Subclipse |
| 76 |
// try { |
| 77 |
// SubclipseWrapper.init(adapterManager, FACTORY); |
| 78 |
// haveSubclipse = true; |
| 79 |
// } catch (Throwable ex) { |
| 80 |
// // ignore |
| 81 |
// } |
| 82 |
} |
65 |
} |
| 83 |
|
66 |
|
| 84 |
public static void unregisterAdapters() { |
67 |
public static void unregisterAdapters() { |
| 85 |
Platform.getAdapterManager().unregisterAdapters(FACTORY); |
68 |
Platform.getAdapterManager().unregisterAdapters(FACTORY); |
| 86 |
} |
69 |
} |
| 87 |
|
70 |
|
| 88 |
|
|
|
| 89 |
private LinkedTaskInfoAdapterFactory() { |
71 |
private LinkedTaskInfoAdapterFactory() { |
| 90 |
} |
72 |
} |
| 91 |
|
73 |
|
| 92 |
@SuppressWarnings("unchecked") |
74 |
@SuppressWarnings("unchecked") |
| 93 |
public Object getAdapter(Object object, Class adapterType) { |
75 |
public Object getAdapter(Object object, Class adapterType) { |
| 94 |
if(!ILinkedTaskInfo.class.equals(adapterType)) { |
76 |
if (!ILinkedTaskInfo.class.equals(adapterType)) { |
| 95 |
return null; |
77 |
return null; |
| 96 |
} |
78 |
} |
| 97 |
|
79 |
|
| 98 |
if(object instanceof ChangeSetDiffNode) { |
80 |
if (object instanceof ChangeSetDiffNode) { |
| 99 |
return adaptChangeSetDiffNode(object); |
81 |
return adaptChangeSetDiffNode(object); |
| 100 |
} |
82 |
} |
| 101 |
|
83 |
|
| 102 |
if(object instanceof DiffNode) { |
|
|
| 103 |
return getAdapter(((DiffNode) object).getParent(), adapterType); |
| 104 |
} |
| 105 |
|
| 106 |
// if(haveSubclipse && |
| 107 |
// "org.tigris.subversion.subclipse.core.history.LogEntry".equals(object.getClass().getName())) { |
| 108 |
// ILinkedTaskInfo info = SubclipseWrapper.adaptSubclipseLogEntry(object); |
| 109 |
// if(info!=null) { |
| 110 |
// return info; |
| 111 |
// } |
| 112 |
// } |
| 113 |
|
| 114 |
// TODO add other adapted types |
84 |
// TODO add other adapted types |
| 115 |
|
85 |
|
| 116 |
return adaptFromComment(object); |
86 |
return adaptFromComment(object); |
|
Lines 122-278
Link Here
|
| 122 |
} |
92 |
} |
| 123 |
|
93 |
|
| 124 |
private ILinkedTaskInfo adaptChangeSetDiffNode(Object object) { |
94 |
private ILinkedTaskInfo adaptChangeSetDiffNode(Object object) { |
| 125 |
ChangeSetDiffNode diffNode = (ChangeSetDiffNode) object; |
95 |
ChangeSetDiffNode diffNode = (ChangeSetDiffNode) object; |
| 126 |
ChangeSet set = diffNode.getSet(); |
96 |
ChangeSet set = diffNode.getSet(); |
| 127 |
if (set instanceof ContextChangeSet) { |
97 |
|
| 128 |
return new LinkedTaskInfo(((ContextChangeSet) set).getTask()); |
98 |
Object adapter = null; |
| 129 |
} |
99 |
if (set instanceof IAdaptable) { |
| 130 |
// else if(haveSubclipse && set.getClass().getName().startsWith("org.tigris")) { |
100 |
adapter = ((IAdaptable) set).getAdapter(ILinkedTaskInfo.class); |
| 131 |
// ILinkedTaskInfo info = SubclipseWrapper.adaptSubclipseChangeset(diffNode, set); |
101 |
} |
| 132 |
// if(info!=null) { |
102 |
if (adapter == null) { |
| 133 |
// return info; |
103 |
adapter = Platform.getAdapterManager().getAdapter(set, ILinkedTaskInfo.class); |
| 134 |
// } |
104 |
} |
| 135 |
// } |
105 |
if (adapter != null) { |
|
|
106 |
return (ILinkedTaskInfo) adapter; |
| 107 |
} |
| 136 |
|
108 |
|
| 137 |
return adaptFromComment(object); |
109 |
return adaptFromComment(object); |
| 138 |
} |
110 |
} |
| 139 |
|
111 |
|
| 140 |
private ILinkedTaskInfo adaptFromComment(Object object) { |
112 |
private ILinkedTaskInfo adaptFromComment(Object object) { |
| 141 |
String comment = getCommentFromElement(object); |
113 |
String comment = getCommentForElement(object); |
|
|
114 |
if (comment == null) { |
| 115 |
return null; |
| 116 |
} |
| 142 |
|
117 |
|
| 143 |
CommitTemplateManager commitTemplateManager = MylarTeamPlugin.getDefault().getCommitTemplateManager(); |
118 |
IResource resource = getResourceForElement(object); |
| 144 |
String taskId = commitTemplateManager.getTaskIdFromCommentOrLabel(comment); |
119 |
if (resource != null) { |
| 145 |
if (taskId == null) { |
120 |
TaskRepository repository = TasksUiPlugin.getDefault().getRepositoryForResource(resource, false); |
| 146 |
taskId = getTaskIdFromLegacy07Label(comment); |
121 |
if (repository != null) { |
|
|
122 |
return new LinkedTaskInfo(repository.getUrl(), null, null, comment); |
| 123 |
} |
| 147 |
} |
124 |
} |
| 148 |
|
125 |
|
| 149 |
IProject project = findCorrespondingProject(object); |
126 |
return new LinkedTaskInfo(null, null, null, comment); |
| 150 |
if (project != null) { |
127 |
} |
| 151 |
TaskRepository repository = TasksUiPlugin.getDefault().getRepositoryForResource(project, false); |
128 |
|
| 152 |
if (repository != null && taskId!=null) { |
129 |
private static String getCommentForElement(Object element) { |
| 153 |
return new LinkedTaskInfo(repository.getUrl(), taskId, null); |
130 |
if (element instanceof DiffChangeSet) { |
| 154 |
} |
131 |
return ((DiffChangeSet) element).getComment(); |
|
|
132 |
} else if (element instanceof ChangeSetDiffNode) { |
| 133 |
return ((ChangeSetDiffNode) element).getName(); |
| 134 |
} else if (element instanceof IFileRevision) { |
| 135 |
return ((IFileRevision) element).getComment(); |
| 136 |
} else if (element instanceof LogEntry) { |
| 137 |
return ((LogEntry) element).getComment(); |
| 155 |
} |
138 |
} |
| 156 |
|
139 |
return null; |
| 157 |
String fullTaskUrl = getUrlFromComment(comment); |
|
|
| 158 |
if(fullTaskUrl!=null) { |
| 159 |
return new LinkedTaskInfo(fullTaskUrl); |
| 160 |
} |
| 161 |
|
| 162 |
return null; |
| 163 |
} |
140 |
} |
| 164 |
|
|
|
| 165 |
private String getCommentFromElement(Object element) { |
| 166 |
if (element instanceof DiffChangeSet) { |
| 167 |
return ((DiffChangeSet) element).getComment(); |
| 168 |
} else if (element instanceof ChangeSetDiffNode) { |
| 169 |
return ((ChangeSetDiffNode) element).getName(); |
| 170 |
} else if (element instanceof IFileRevision) { |
| 171 |
return ((IFileRevision) element).getComment(); |
| 172 |
} else if (element instanceof org.eclipse.team.internal.ccvs.core.client.listeners.LogEntry) { |
| 173 |
return ((org.eclipse.team.internal.ccvs.core.client.listeners.LogEntry) element).getComment(); |
| 174 |
} else if (element instanceof org.tigris.subversion.subclipse.core.history.LogEntry) { |
| 175 |
return ((org.tigris.subversion.subclipse.core.history.LogEntry) element).getComment(); |
| 176 |
} |
| 177 |
return null; |
| 178 |
} |
| 179 |
|
| 180 |
|
| 181 |
// |
| 182 |
|
141 |
|
| 183 |
public static String getUrlFromComment(String comment) { |
142 |
private static IResource getResourceForElement(Object element) { |
| 184 |
int httpIndex = comment.indexOf(PREFIX_HTTP); |
143 |
if (element instanceof DiffChangeSet) { |
| 185 |
int httpsIndex = comment.indexOf(PREFIX_HTTPS); |
144 |
IResource[] resources = ((DiffChangeSet) element).getResources(); |
| 186 |
int idStart = -1; |
145 |
if (resources.length > 0) { |
| 187 |
if (httpIndex != -1) { |
146 |
// TODO: only checks first resource |
| 188 |
idStart = httpIndex; |
147 |
return resources[0]; |
| 189 |
} else if (httpsIndex != -1) { |
148 |
} |
| 190 |
idStart = httpsIndex; |
149 |
} |
| 191 |
} |
150 |
if (element instanceof SynchronizeModelElement) { |
| 192 |
if (idStart != -1) { |
151 |
SynchronizeModelElement modelElement = (SynchronizeModelElement) element; |
| 193 |
int idEnd = comment.indexOf(' ', idStart); |
152 |
IResource resource = modelElement.getResource(); |
| 194 |
if (idEnd == -1) { |
153 |
if (resource != null) { |
| 195 |
return comment.substring(idStart); |
154 |
return resource; |
| 196 |
} else if (idEnd != -1 && idStart < idEnd) { |
155 |
} else { |
| 197 |
return comment.substring(idStart, idEnd); |
156 |
IDiffElement[] elements = modelElement.getChildren(); |
| 198 |
} |
157 |
if (elements.length > 0) { |
| 199 |
} |
158 |
// TODO: only checks first diff |
| 200 |
return null; |
159 |
if (elements[0] instanceof SynchronizeModelElement) { |
| 201 |
} |
160 |
return ((SynchronizeModelElement) elements[0]).getResource(); |
| 202 |
|
161 |
} |
| 203 |
public static String getTaskIdFromLegacy07Label(String comment) { |
162 |
} |
| 204 |
String PREFIX_DELIM = ":"; |
163 |
} |
| 205 |
String PREFIX_START_1 = "Progress on:"; |
164 |
} |
| 206 |
String PREFIX_START_2 = "Completed:"; |
165 |
if (element instanceof IAdaptable) { |
| 207 |
String usedPrefix = PREFIX_START_1; |
166 |
IAdaptable adaptable = (IAdaptable) element; |
| 208 |
int firstDelimIndex = comment.indexOf(PREFIX_START_1); |
|
|
| 209 |
if (firstDelimIndex == -1) { |
| 210 |
firstDelimIndex = comment.indexOf(PREFIX_START_2); |
| 211 |
usedPrefix = PREFIX_START_2; |
| 212 |
} |
| 213 |
if (firstDelimIndex != -1) { |
| 214 |
int idStart = firstDelimIndex + usedPrefix.length(); |
| 215 |
int idEnd = comment.indexOf(PREFIX_DELIM, firstDelimIndex + usedPrefix.length());// comment.indexOf(PREFIX_DELIM); |
| 216 |
if (idEnd != -1 && idStart < idEnd) { |
| 217 |
String id = comment.substring(idStart, idEnd); |
| 218 |
if (id != null) { |
| 219 |
return id.trim(); |
| 220 |
} |
| 221 |
} else { |
| 222 |
return comment.substring(0, firstDelimIndex); |
| 223 |
} |
| 224 |
} |
| 225 |
return null; |
| 226 |
} |
| 227 |
|
| 228 |
private static IProject findCorrespondingProject(Object element) { |
| 229 |
if (element instanceof DiffChangeSet) { |
| 230 |
IResource[] resources = ((DiffChangeSet) element).getResources(); |
| 231 |
if (resources.length > 0) { |
| 232 |
// TODO: only checks first resource |
| 233 |
return resources[0].getProject(); |
| 234 |
} |
| 235 |
} else if (element instanceof SynchronizeModelElement) { |
| 236 |
SynchronizeModelElement modelElement = (SynchronizeModelElement)element; |
| 237 |
IResource resource = modelElement.getResource(); |
| 238 |
if (resource != null) { |
| 239 |
return resource.getProject(); |
| 240 |
} else { |
| 241 |
IDiffElement[] elements = modelElement.getChildren(); |
| 242 |
if (elements.length > 0) { |
| 243 |
// TODO: only checks first diff |
| 244 |
if (elements[0] instanceof SynchronizeModelElement) { |
| 245 |
return ((SynchronizeModelElement)elements[0]).getResource().getProject(); |
| 246 |
} |
| 247 |
} |
| 248 |
} |
| 249 |
} else if (element instanceof IAdaptable) { |
| 250 |
IAdaptable adaptable = (IAdaptable) element; |
| 251 |
IResourceVariant resourceVariant = (IResourceVariant) adaptable.getAdapter(IResourceVariant.class); |
167 |
IResourceVariant resourceVariant = (IResourceVariant) adaptable.getAdapter(IResourceVariant.class); |
| 252 |
if (resourceVariant != null && resourceVariant instanceof RemoteResource) { |
168 |
if (resourceVariant != null && resourceVariant instanceof RemoteResource) { |
| 253 |
RemoteResource remoteResource = (RemoteResource) resourceVariant; |
169 |
RemoteResource remoteResource = (RemoteResource) resourceVariant; |
| 254 |
// TODO is there a better way then iterating trough all projects? |
170 |
// TODO is there a better way then iterating trough all projects? |
| 255 |
String path = remoteResource.getRepositoryRelativePath(); |
171 |
String path = remoteResource.getRepositoryRelativePath(); |
| 256 |
for (IProject project : ResourcesPlugin.getWorkspace().getRoot().getProjects()) { |
172 |
for (IProject project : ResourcesPlugin.getWorkspace().getRoot().getProjects()) { |
| 257 |
if(project.isAccessible()) { |
173 |
if (project.isAccessible()) { |
| 258 |
ICVSResource cvsResource = CVSWorkspaceRoot.getCVSFolderFor(project); |
174 |
ICVSResource cvsResource = CVSWorkspaceRoot.getCVSFolderFor(project); |
| 259 |
try { |
175 |
try { |
| 260 |
if(cvsResource!=null && path.startsWith(cvsResource.getRepositoryRelativePath())) { |
176 |
if (cvsResource != null && path.startsWith(cvsResource.getRepositoryRelativePath())) { |
| 261 |
return project; |
177 |
return project; |
| 262 |
} |
178 |
} |
| 263 |
} catch (CVSException ex) { |
179 |
} catch (CVSException ex) { |
| 264 |
// ignore |
180 |
// ignore |
| 265 |
} |
181 |
} |
| 266 |
} |
182 |
} |
| 267 |
} |
183 |
} |
| 268 |
|
184 |
} |
| 269 |
return null; |
185 |
} |
| 270 |
} |
186 |
|
| 271 |
} else { |
187 |
// TODO any other resource types? |
| 272 |
// TODO |
188 |
|
| 273 |
|
189 |
return null; |
| 274 |
} |
190 |
} |
| 275 |
return null; |
191 |
|
| 276 |
} |
|
|
| 277 |
} |
192 |
} |
| 278 |
|
193 |
|