Home » Modeling » EMF "Technology" (Ecore Tools, EMFatic, etc) » Integrate EMF Compare in Subversion
| Integrate EMF Compare in Subversion [message #126975] |
Thu, 10 July 2008 09:00  |
Eclipse User |
|
|
|
Originally posted by: schlichtomat.gmx.de
Hi! I got a question and it would be great if anyone could help me out
with this one: Is there a way to use EMF Compare as differencing and merge
tool in subversion? I did not find anything in the web, yet. I'm wondering
if this would be useful (this is what I think) and if so, I'm looking for
an existing integration.
|
|
| |
| Re: Integrate EMF Compare in Subversion [message #130214 is a reply to message #127013] |
Thu, 16 October 2008 16:34  |
| Eclipse User |
|
|
|
Originally posted by: sramasamy.ifmc.sdps.org
I've verified that EMF Compare works when comparing workspace .ecore
files against those stored in subversion.
But when I attempt to compare a workspace .genmodel file against that in
subversion I get several NPE. I'm using subclipse 1.4.5 with EMF Compare
0.8.1. If I compare the two .genmodel files stored in my workspace I
don't get these NPEs.
Here is the stack trace:
!ENTRY org.eclipse.jface 4 2 2008-10-16 11:29:47.484
!MESSAGE Problems occurred when invoking code from plug-in:
"org.eclipse.jface".
!STACK 0
java.lang.NullPointerException
at
org.eclipse.emf.codegen.ecore.genmodel.impl.GenDataTypeImpl. getQualifiedInstanceClassName(GenDataTypeImpl.java:212)
at
org.eclipse.emf.codegen.ecore.genmodel.provider.GenDataTypeI temProvider.getText(GenDataTypeItemProvider.java:120)
at
org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider .getText(AdapterFactoryLabelProvider.java:374)
at
org.eclipse.jface.viewers.WrappedViewerLabelProvider.getText (WrappedViewerLabelProvider.java:108)
at
org.eclipse.jface.viewers.WrappedViewerLabelProvider.update( WrappedViewerLabelProvider.java:164)
at org.eclipse.jface.viewers.ViewerColumn.refresh(ViewerColumn. java:145)
at
org.eclipse.jface.viewers.AbstractTreeViewer.doUpdateItem(Ab stractTreeViewer.java:932)
at
org.eclipse.jface.viewers.AbstractTreeViewer$UpdateItemSafeR unnable.run(AbstractTreeViewer.java:102)
at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:37)
at org.eclipse.core.runtime.Platform.run(Platform.java:880)
at org.eclipse.ui.internal.JFaceUtil$1.run(JFaceUtil.java:48)
at org.eclipse.jface.util.SafeRunnable.run(SafeRunnable.java:17 5)
at
org.eclipse.jface.viewers.AbstractTreeViewer.doUpdateItem(Ab stractTreeViewer.java:1012)
at
org.eclipse.jface.viewers.StructuredViewer$UpdateItemSafeRun nable.run(StructuredViewer.java:466)
at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:37)
at org.eclipse.core.runtime.Platform.run(Platform.java:880)
at org.eclipse.ui.internal.JFaceUtil$1.run(JFaceUtil.java:48)
at org.eclipse.jface.util.SafeRunnable.run(SafeRunnable.java:17 5)
at
org.eclipse.jface.viewers.StructuredViewer.updateItem(Struct uredViewer.java:2041)
at
org.eclipse.jface.viewers.AbstractTreeViewer.createTreeItem( AbstractTreeViewer.java:827)
at
org.eclipse.jface.viewers.AbstractTreeViewer$1.run(AbstractT reeViewer.java:802)
at org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
at
org.eclipse.jface.viewers.AbstractTreeViewer.createChildren( AbstractTreeViewer.java:776)
at org.eclipse.jface.viewers.TreeViewer.createChildren(TreeView er.java:634)
at
org.eclipse.jface.viewers.AbstractTreeViewer.internalExpandT oLevel(AbstractTreeViewer.java:1702)
at
org.eclipse.jface.viewers.AbstractTreeViewer.internalExpandT oLevel(AbstractTreeViewer.java:1712)
at
org.eclipse.jface.viewers.AbstractTreeViewer.internalExpandT oLevel(AbstractTreeViewer.java:1712)
at
org.eclipse.jface.viewers.AbstractTreeViewer.expandToLevel(A bstractTreeViewer.java:1054)
at
org.eclipse.jface.viewers.AbstractTreeViewer.expandToLevel(A bstractTreeViewer.java:1035)
at
org.eclipse.jface.viewers.AbstractTreeViewer.expandAll(Abstr actTreeViewer.java:1024)
at
org.eclipse.emf.compare.ui.viewer.content.part.diff.ModelCon tentMergeDiffTab.inputChanged(ModelContentMergeDiffTab.java: 364)
at org.eclipse.jface.viewers.ContentViewer.setInput(ContentView er.java:251)
at
org.eclipse.jface.viewers.StructuredViewer.setInput(Structur edViewer.java:1603)
at
org.eclipse.emf.compare.ui.viewer.content.part.diff.ModelCon tentMergeDiffTab.setReflectiveInput(ModelContentMergeDiffTab .java:278)
at
org.eclipse.emf.compare.ui.viewer.content.part.ModelContentM ergeTabFolder.setInput(ModelContentMergeTabFolder.java:310)
at
org.eclipse.emf.compare.ui.viewer.content.ModelContentMergeV iewer.updateContent(ModelContentMergeViewer.java:675)
at
org.eclipse.compare.contentmergeviewer.ContentMergeViewer.in ternalRefresh(ContentMergeViewer.java:715)
at
org.eclipse.compare.contentmergeviewer.ContentMergeViewer.in putChanged(ContentMergeViewer.java:615)
at org.eclipse.jface.viewers.ContentViewer.setInput(ContentView er.java:251)
at
org.eclipse.emf.compare.ui.viewer.content.ModelContentMergeV iewer.setInput(ModelContentMergeViewer.java:281)
at
org.eclipse.compare.CompareViewerSwitchingPane.setInput(Comp areViewerSwitchingPane.java:256)
at
org.eclipse.compare.CompareEditorInput.internalSetContentPan eInput(CompareEditorInput.java:791)
at
org.eclipse.compare.CompareEditorInput.access$7(CompareEdito rInput.java:789)
at
org.eclipse.compare.CompareEditorInput$13.run(CompareEditorI nput.java:729)
at org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
at
org.eclipse.compare.CompareEditorInput.feed1(CompareEditorIn put.java:723)
at
org.eclipse.compare.CompareEditorInput.feedInput(CompareEdit orInput.java:701)
at
org.eclipse.compare.CompareEditorInput.createContents(Compar eEditorInput.java:524)
at
org.eclipse.compare.internal.CompareEditor.createCompareCont rol(CompareEditor.java:415)
at
org.eclipse.compare.internal.CompareEditor.createPartControl (CompareEditor.java:379)
at
org.eclipse.ui.internal.EditorReference.createPartHelper(Edi torReference.java:661)
at
org.eclipse.ui.internal.EditorReference.createPart(EditorRef erence.java:428)
at
org.eclipse.ui.internal.WorkbenchPartReference.getPart(Workb enchPartReference.java:594)
at
org.eclipse.ui.internal.EditorReference.getEditor(EditorRefe rence.java:266)
at
org.eclipse.ui.internal.WorkbenchPage.busyOpenEditorBatched( WorkbenchPage.java:2820)
at
org.eclipse.ui.internal.WorkbenchPage.busyOpenEditor(Workben chPage.java:2729)
at org.eclipse.ui.internal.WorkbenchPage.access$11(WorkbenchPag e.java:2721)
at org.eclipse.ui.internal.WorkbenchPage$10.run(WorkbenchPage.j ava:2673)
at org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
at
org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPa ge.java:2668)
at
org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPa ge.java:2652)
at
org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPa ge.java:2635)
at
org.eclipse.compare.internal.CompareUIPlugin$1.run(CompareUI Plugin.java:454)
at
org.eclipse.compare.internal.CompareUIPlugin.syncExec(Compar eUIPlugin.java:1171)
at
org.eclipse.compare.internal.CompareUIPlugin.internalOpenEdi tor(CompareUIPlugin.java:465)
at
org.eclipse.compare.internal.CompareUIPlugin.openCompareEdit or(CompareUIPlugin.java:429)
at
org.eclipse.compare.CompareUI.openCompareEditorOnPage(Compar eUI.java:135)
at
org.tigris.subversion.subclipse.ui.actions.CompareWithRemote Action$1.run(CompareWithRemoteAction.java:57)
at
org.tigris.subversion.subclipse.ui.repository.RepositoryMana ger.run(RepositoryManager.java:375)
at
org.tigris.subversion.subclipse.ui.actions.SVNAction$1.run(S VNAction.java:226)
at
org.tigris.subversion.subclipse.ui.actions.SVNAction$2.run(S VNAction.java:235)
at org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
at
org.tigris.subversion.subclipse.ui.actions.SVNAction.run(SVN Action.java:232)
at
org.tigris.subversion.subclipse.ui.actions.CompareWithRemote Action.execute(CompareWithRemoteAction.java:53)
at
org.tigris.subversion.subclipse.ui.actions.SVNAction.run(SVN Action.java:56)
at
org.eclipse.ui.actions.ActionDelegate.runWithEvent(ActionDel egate.java:70)
at org.eclipse.ui.internal.PluginAction.runWithEvent(PluginActi on.java:241)
at
org.eclipse.jface.action.ActionContributionItem.handleWidget Selection(ActionContributionItem.java:583)
at
org.eclipse.jface.action.ActionContributionItem.access$2(Act ionContributionItem.java:500)
at
org.eclipse.jface.action.ActionContributionItem$5.handleEven t(ActionContributionItem.java:411)
at org.eclipse.swt.widgets.EventTable.sendEvent(EventTable.java :84)
at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1003)
at org.eclipse.swt.widgets.Display.runDeferredEvents(Display.ja va:3823)
at org.eclipse.swt.widgets.Display.readAndDispatch(Display.java :3422)
at org.eclipse.ui.internal.Workbench.runEventLoop(Workbench.jav a:2382)
at org.eclipse.ui.internal.Workbench.runUI(Workbench.java:2346)
at org.eclipse.ui.internal.Workbench.access$4(Workbench.java:21 98)
at org.eclipse.ui.internal.Workbench$5.run(Workbench.java:493)
at
org.eclipse.core.databinding.observable.Realm.runWithDefault (Realm.java:288)
at
org.eclipse.ui.internal.Workbench.createAndRunWorkbench(Work bench.java:488)
at org.eclipse.ui.PlatformUI.createAndRunWorkbench(PlatformUI.j ava:149)
at
org.eclipse.ui.internal.ide.application.IDEApplication.start (IDEApplication.java:113)
at
org.eclipse.equinox.internal.app.EclipseAppHandle.run(Eclips eAppHandle.java:193)
at
org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher .runApplication(EclipseAppLauncher.java:110)
at
org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher .start(EclipseAppLauncher.java:79)
at
org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseS tarter.java:386)
at
org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseS tarter.java:179)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source)
at java.lang.reflect.Method.invoke(Unknown Source)
at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java: 549)
at org.eclipse.equinox.launcher.Main.basicRun(Main.java:504)
at org.eclipse.equinox.launcher.Main.run(Main.java:1236)
!ENTRY org.eclipse.jface 4 2 2008-10-16 11:29:47.703
!MESSAGE Problems occurred when invoking code from plug-in:
"org.eclipse.jface".
!STACK 0
java.lang.NullPointerException
at
org.eclipse.emf.codegen.ecore.genmodel.impl.GenDataTypeImpl. getQualifiedInstanceClassName(GenDataTypeImpl.java:212)
at
org.eclipse.emf.codegen.ecore.genmodel.provider.GenDataTypeI temProvider.getText(GenDataTypeItemProvider.java:120)
at
org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider .getText(AdapterFactoryLabelProvider.java:374)
at
org.eclipse.jface.viewers.WrappedViewerLabelProvider.getText (WrappedViewerLabelProvider.java:108)
at
org.eclipse.jface.viewers.WrappedViewerLabelProvider.update( WrappedViewerLabelProvider.java:164)
at org.eclipse.jface.viewers.ViewerColumn.refresh(ViewerColumn. java:145)
at
org.eclipse.jface.viewers.AbstractTreeViewer.doUpdateItem(Ab stractTreeViewer.java:932)
at
org.eclipse.jface.viewers.AbstractTreeViewer$UpdateItemSafeR unnable.run(AbstractTreeViewer.java:102)
at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:37)
at org.eclipse.core.runtime.Platform.run(Platform.java:880)
at org.eclipse.ui.internal.JFaceUtil$1.run(JFaceUtil.java:48)
at org.eclipse.jface.util.SafeRunnable.run(SafeRunnable.java:17 5)
at
org.eclipse.jface.viewers.AbstractTreeViewer.doUpdateItem(Ab stractTreeViewer.java:1012)
at
org.eclipse.jface.viewers.StructuredViewer$UpdateItemSafeRun nable.run(StructuredViewer.java:466)
at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:37)
at org.eclipse.core.runtime.Platform.run(Platform.java:880)
at org.eclipse.ui.internal.JFaceUtil$1.run(JFaceUtil.java:48)
at org.eclipse.jface.util.SafeRunnable.run(SafeRunnable.java:17 5)
at
org.eclipse.jface.viewers.StructuredViewer.updateItem(Struct uredViewer.java:2041)
at
org.eclipse.jface.viewers.AbstractTreeViewer.createTreeItem( AbstractTreeViewer.java:827)
at
org.eclipse.jface.viewers.AbstractTreeViewer$1.run(AbstractT reeViewer.java:802)
at org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
at
org.eclipse.jface.viewers.AbstractTreeViewer.createChildren( AbstractTreeViewer.java:776)
at org.eclipse.jface.viewers.TreeViewer.createChildren(TreeView er.java:634)
at
org.eclipse.jface.viewers.AbstractTreeViewer.internalExpandT oLevel(AbstractTreeViewer.java:1702)
at
org.eclipse.jface.viewers.AbstractTreeViewer.internalExpandT oLevel(AbstractTreeViewer.java:1712)
at
org.eclipse.jface.viewers.AbstractTreeViewer.internalExpandT oLevel(AbstractTreeViewer.java:1712)
at
org.eclipse.jface.viewers.AbstractTreeViewer.expandToLevel(A bstractTreeViewer.java:1054)
at
org.eclipse.jface.viewers.AbstractTreeViewer.expandToLevel(A bstractTreeViewer.java:1035)
at
org.eclipse.jface.viewers.AbstractTreeViewer.expandAll(Abstr actTreeViewer.java:1024)
at
org.eclipse.emf.compare.ui.viewer.content.part.diff.ModelCon tentMergeDiffTab.inputChanged(ModelContentMergeDiffTab.java: 364)
at org.eclipse.jface.viewers.ContentViewer.setInput(ContentView er.java:251)
at
org.eclipse.jface.viewers.StructuredViewer.setInput(Structur edViewer.java:1603)
at
org.eclipse.emf.compare.ui.viewer.content.part.diff.ModelCon tentMergeDiffTab.setReflectiveInput(ModelContentMergeDiffTab .java:278)
at
org.eclipse.emf.compare.ui.viewer.content.part.ModelContentM ergeTabFolder.setInput(ModelContentMergeTabFolder.java:310)
at
org.eclipse.emf.compare.ui.viewer.content.ModelContentMergeV iewer.updateContent(ModelContentMergeViewer.java:675)
at
org.eclipse.compare.contentmergeviewer.ContentMergeViewer.in ternalRefresh(ContentMergeViewer.java:715)
at
org.eclipse.compare.contentmergeviewer.ContentMergeViewer.in putChanged(ContentMergeViewer.java:615)
at org.eclipse.jface.viewers.ContentViewer.setInput(ContentView er.java:251)
at
org.eclipse.emf.compare.ui.viewer.content.ModelContentMergeV iewer.setInput(ModelContentMergeViewer.java:281)
at
org.eclipse.compare.CompareViewerSwitchingPane.setInput(Comp areViewerSwitchingPane.java:256)
at
org.eclipse.compare.CompareEditorInput.internalSetContentPan eInput(CompareEditorInput.java:791)
at
org.eclipse.compare.CompareEditorInput.access$7(CompareEdito rInput.java:789)
at
org.eclipse.compare.CompareEditorInput$13.run(CompareEditorI nput.java:729)
at org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
at
org.eclipse.compare.CompareEditorInput.feed1(CompareEditorIn put.java:723)
at
org.eclipse.compare.CompareEditorInput.feedInput(CompareEdit orInput.java:701)
at
org.eclipse.compare.CompareEditorInput.createContents(Compar eEditorInput.java:524)
at
org.eclipse.compare.internal.CompareEditor.createCompareCont rol(CompareEditor.java:415)
at
org.eclipse.compare.internal.CompareEditor.createPartControl (CompareEditor.java:379)
at
org.eclipse.ui.internal.EditorReference.createPartHelper(Edi torReference.java:661)
at
org.eclipse.ui.internal.EditorReference.createPart(EditorRef erence.java:428)
at
org.eclipse.ui.internal.WorkbenchPartReference.getPart(Workb enchPartReference.java:594)
at
org.eclipse.ui.internal.EditorReference.getEditor(EditorRefe rence.java:266)
at
org.eclipse.ui.internal.WorkbenchPage.busyOpenEditorBatched( WorkbenchPage.java:2820)
at
org.eclipse.ui.internal.WorkbenchPage.busyOpenEditor(Workben chPage.java:2729)
at org.eclipse.ui.internal.WorkbenchPage.access$11(WorkbenchPag e.java:2721)
at org.eclipse.ui.internal.WorkbenchPage$10.run(WorkbenchPage.j ava:2673)
at org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
at
org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPa ge.java:2668)
at
org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPa ge.java:2652)
at
org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPa ge.java:2635)
at
org.eclipse.compare.internal.CompareUIPlugin$1.run(CompareUI Plugin.java:454)
at
org.eclipse.compare.internal.CompareUIPlugin.syncExec(Compar eUIPlugin.java:1171)
at
org.eclipse.compare.internal.CompareUIPlugin.internalOpenEdi tor(CompareUIPlugin.java:465)
at
org.eclipse.compare.internal.CompareUIPlugin.openCompareEdit or(CompareUIPlugin.java:429)
at
org.eclipse.compare.CompareUI.openCompareEditorOnPage(Compar eUI.java:135)
at
org.tigris.subversion.subclipse.ui.actions.CompareWithRemote Action$1.run(CompareWithRemoteAction.java:57)
at
org.tigris.subversion.subclipse.ui.repository.RepositoryMana ger.run(RepositoryManager.java:375)
at
org.tigris.subversion.subclipse.ui.actions.SVNAction$1.run(S VNAction.java:226)
at
org.tigris.subversion.subclipse.ui.actions.SVNAction$2.run(S VNAction.java:235)
at org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
at
org.tigris.subversion.subclipse.ui.actions.SVNAction.run(SVN Action.java:232)
at
org.tigris.subversion.subclipse.ui.actions.CompareWithRemote Action.execute(CompareWithRemoteAction.java:53)
at
org.tigris.subversion.subclipse.ui.actions.SVNAction.run(SVN Action.java:56)
at
org.eclipse.ui.actions.ActionDelegate.runWithEvent(ActionDel egate.java:70)
at org.eclipse.ui.internal.PluginAction.runWithEvent(PluginActi on.java:241)
at
org.eclipse.jface.action.ActionContributionItem.handleWidget Selection(ActionContributionItem.java:583)
at
org.eclipse.jface.action.ActionContributionItem.access$2(Act ionContributionItem.java:500)
at
org.eclipse.jface.action.ActionContributionItem$5.handleEven t(ActionContributionItem.java:411)
at org.eclipse.swt.widgets.EventTable.sendEvent(EventTable.java :84)
at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1003)
at org.eclipse.swt.widgets.Display.runDeferredEvents(Display.ja va:3823)
at org.eclipse.swt.widgets.Display.readAndDispatch(Display.java :3422)
at org.eclipse.ui.internal.Workbench.runEventLoop(Workbench.jav a:2382)
at org.eclipse.ui.internal.Workbench.runUI(Workbench.java:2346)
at org.eclipse.ui.internal.Workbench.access$4(Workbench.java:21 98)
at org.eclipse.ui.internal.Workbench$5.run(Workbench.java:493)
at
org.eclipse.core.databinding.observable.Realm.runWithDefault (Realm.java:288)
at
org.eclipse.ui.internal.Workbench.createAndRunWorkbench(Work bench.java:488)
at org.eclipse.ui.PlatformUI.createAndRunWorkbench(PlatformUI.j ava:149)
at
org.eclipse.ui.internal.ide.application.IDEApplication.start (IDEApplication.java:113)
at
org.eclipse.equinox.internal.app.EclipseAppHandle.run(Eclips eAppHandle.java:193)
at
org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher .runApplication(EclipseAppLauncher.java:110)
at
org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher .start(EclipseAppLauncher.java:79)
at
org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseS tarter.java:386)
at
org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseS tarter.java:179)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source)
at java.lang.reflect.Method.invoke(Unknown Source)
at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java: 549)
at org.eclipse.equinox.launcher.Main.basicRun(Main.java:504)
at org.eclipse.equinox.launcher.Main.run(Main.java:1236)
!ENTRY org.eclipse.jface 4 2 2008-10-16 11:29:47.781
!MESSAGE Problems occurred when invoking code from plug-in:
"org.eclipse.jface".
!STACK 0
java.lang.NullPointerException
at
org.eclipse.emf.codegen.ecore.genmodel.impl.GenDataTypeImpl. getQualifiedInstanceClassName(GenDataTypeImpl.java:212)
at
org.eclipse.emf.codegen.ecore.genmodel.provider.GenDataTypeI temProvider.getText(GenDataTypeItemProvider.java:120)
at
org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider .getText(AdapterFactoryLabelProvider.java:374)
at
org.eclipse.jface.viewers.WrappedViewerLabelProvider.getText (WrappedViewerLabelProvider.java:108)
at
org.eclipse.jface.viewers.WrappedViewerLabelProvider.update( WrappedViewerLabelProvider.java:164)
at org.eclipse.jface.viewers.ViewerColumn.refresh(ViewerColumn. java:145)
at
org.eclipse.jface.viewers.AbstractTreeViewer.doUpdateItem(Ab stractTreeViewer.java:932)
at
org.eclipse.jface.viewers.AbstractTreeViewer$UpdateItemSafeR unnable.run(AbstractTreeViewer.java:102)
at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:37)
at org.eclipse.core.runtime.Platform.run(Platform.java:880)
at org.eclipse.ui.internal.JFaceUtil$1.run(JFaceUtil.java:48)
at org.eclipse.jface.util.SafeRunnable.run(SafeRunnable.java:17 5)
at
org.eclipse.jface.viewers.AbstractTreeViewer.doUpdateItem(Ab stractTreeViewer.java:1012)
at
org.eclipse.jface.viewers.StructuredViewer$UpdateItemSafeRun nable.run(StructuredViewer.java:466)
at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:37)
at org.eclipse.core.runtime.Platform.run(Platform.java:880)
at org.eclipse.ui.internal.JFaceUtil$1.run(JFaceUtil.java:48)
at org.eclipse.jface.util.SafeRunnable.run(SafeRunnable.java:17 5)
at
org.eclipse.jface.viewers.StructuredViewer.updateItem(Struct uredViewer.java:2041)
at
org.eclipse.jface.viewers.AbstractTreeViewer.createTreeItem( AbstractTreeViewer.java:827)
at
org.eclipse.jface.viewers.AbstractTreeViewer$1.run(AbstractT reeViewer.java:802)
at org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
at
org.eclipse.jface.viewers.AbstractTreeViewer.createChildren( AbstractTreeViewer.java:776)
at org.eclipse.jface.viewers.TreeViewer.createChildren(TreeView er.java:634)
at
org.eclipse.jface.viewers.AbstractTreeViewer.internalExpandT oLevel(AbstractTreeViewer.java:1702)
at
org.eclipse.jface.viewers.AbstractTreeViewer.internalExpandT oLevel(AbstractTreeViewer.java:1712)
at
org.eclipse.jface.viewers.AbstractTreeViewer.internalExpandT oLevel(AbstractTreeViewer.java:1712)
at
org.eclipse.jface.viewers.AbstractTreeViewer.expandToLevel(A bstractTreeViewer.java:1054)
at
org.eclipse.jface.viewers.AbstractTreeViewer.expandToLevel(A bstractTreeViewer.java:1035)
at
org.eclipse.jface.viewers.AbstractTreeViewer.expandAll(Abstr actTreeViewer.java:1024)
at
org.eclipse.emf.compare.ui.viewer.content.part.diff.ModelCon tentMergeDiffTab.inputChanged(ModelContentMergeDiffTab.java: 364)
at org.eclipse.jface.viewers.ContentViewer.setInput(ContentView er.java:251)
at
org.eclipse.jface.viewers.StructuredViewer.setInput(Structur edViewer.java:1603)
at
org.eclipse.emf.compare.ui.viewer.content.part.diff.ModelCon tentMergeDiffTab.setReflectiveInput(ModelContentMergeDiffTab .java:278)
at
org.eclipse.emf.compare.ui.viewer.content.part.ModelContentM ergeTabFolder.setInput(ModelContentMergeTabFolder.java:310)
at
org.eclipse.emf.compare.ui.viewer.content.ModelContentMergeV iewer.updateContent(ModelContentMergeViewer.java:675)
at
org.eclipse.compare.contentmergeviewer.ContentMergeViewer.in ternalRefresh(ContentMergeViewer.java:715)
at
org.eclipse.compare.contentmergeviewer.ContentMergeViewer.in putChanged(ContentMergeViewer.java:615)
at org.eclipse.jface.viewers.ContentViewer.setInput(ContentView er.java:251)
at
org.eclipse.emf.compare.ui.viewer.content.ModelContentMergeV iewer.setInput(ModelContentMergeViewer.java:281)
at
org.eclipse.compare.CompareViewerSwitchingPane.setInput(Comp areViewerSwitchingPane.java:256)
at
org.eclipse.compare.CompareEditorInput.internalSetContentPan eInput(CompareEditorInput.java:791)
at
org.eclipse.compare.CompareEditorInput.access$7(CompareEdito rInput.java:789)
at
org.eclipse.compare.CompareEditorInput$13.run(CompareEditorI nput.java:729)
at org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
at
org.eclipse.compare.CompareEditorInput.feed1(CompareEditorIn put.java:723)
at
org.eclipse.compare.CompareEditorInput.feedInput(CompareEdit orInput.java:701)
at
org.eclipse.compare.CompareEditorInput.createContents(Compar eEditorInput.java:524)
at
org.eclipse.compare.internal.CompareEditor.createCompareCont rol(CompareEditor.java:415)
at
org.eclipse.compare.internal.CompareEditor.createPartControl (CompareEditor.java:379)
at
org.eclipse.ui.internal.EditorReference.createPartHelper(Edi torReference.java:661)
at
org.eclipse.ui.internal.EditorReference.createPart(EditorRef erence.java:428)
at
org.eclipse.ui.internal.WorkbenchPartReference.getPart(Workb enchPartReference.java:594)
at
org.eclipse.ui.internal.EditorReference.getEditor(EditorRefe rence.java:266)
at
org.eclipse.ui.internal.WorkbenchPage.busyOpenEditorBatched( WorkbenchPage.java:2820)
at
org.eclipse.ui.internal.WorkbenchPage.busyOpenEditor(Workben chPage.java:2729)
at org.eclipse.ui.internal.WorkbenchPage.access$11(WorkbenchPag e.java:2721)
at org.eclipse.ui.internal.WorkbenchPage$10.run(WorkbenchPage.j ava:2673)
at org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
at
org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPa ge.java:2668)
at
org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPa ge.java:2652)
at
org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPa ge.java:2635)
at
org.eclipse.compare.internal.CompareUIPlugin$1.run(CompareUI Plugin.java:454)
at
org.eclipse.compare.internal.CompareUIPlugin.syncExec(Compar eUIPlugin.java:1171)
at
org.eclipse.compare.internal.CompareUIPlugin.internalOpenEdi tor(CompareUIPlugin.java:465)
at
org.eclipse.compare.internal.CompareUIPlugin.openCompareEdit or(CompareUIPlugin.java:429)
at
org.eclipse.compare.CompareUI.openCompareEditorOnPage(Compar eUI.java:135)
at
org.tigris.subversion.subclipse.ui.actions.CompareWithRemote Action$1.run(CompareWithRemoteAction.java:57)
at
org.tigris.subversion.subclipse.ui.repository.RepositoryMana ger.run(RepositoryManager.java:375)
at
org.tigris.subversion.subclipse.ui.actions.SVNAction$1.run(S VNAction.java:226)
at
org.tigris.subversion.subclipse.ui.actions.SVNAction$2.run(S VNAction.java:235)
at org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
at
org.tigris.subversion.subclipse.ui.actions.SVNAction.run(SVN Action.java:232)
at
org.tigris.subversion.subclipse.ui.actions.CompareWithRemote Action.execute(CompareWithRemoteAction.java:53)
at
org.tigris.subversion.subclipse.ui.actions.SVNAction.run(SVN Action.java:56)
at
org.eclipse.ui.actions.ActionDelegate.runWithEvent(ActionDel egate.java:70)
at org.eclipse.ui.internal.PluginAction.runWithEvent(PluginActi on.java:241)
at
org.eclipse.jface.action.ActionContributionItem.handleWidget Selection(ActionContributionItem.java:583)
at
org.eclipse.jface.action.ActionContributionItem.access$2(Act ionContributionItem.java:500)
at
org.eclipse.jface.action.ActionContributionItem$5.handleEven t(ActionContributionItem.java:411)
at org.eclipse.swt.widgets.EventTable.sendEvent(EventTable.java :84)
at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1003)
at org.eclipse.swt.widgets.Display.runDeferredEvents(Display.ja va:3823)
at org.eclipse.swt.widgets.Display.readAndDispatch(Display.java :3422)
at org.eclipse.ui.internal.Workbench.runEventLoop(Workbench.jav a:2382)
at org.eclipse.ui.internal.Workbench.runUI(Workbench.java:2346)
at org.eclipse.ui.internal.Workbench.access$4(Workbench.java:21 98)
at org.eclipse.ui.internal.Workbench$5.run(Workbench.java:493)
at
org.eclipse.core.databinding.observable.Realm.runWithDefault (Realm.java:288)
at
org.eclipse.ui.internal.Workbench.createAndRunWorkbench(Work bench.java:488)
at org.eclipse.ui.PlatformUI.createAndRunWorkbench(PlatformUI.j ava:149)
at
org.eclipse.ui.internal.ide.application.IDEApplication.start (IDEApplication.java:113)
at
org.eclipse.equinox.internal.app.EclipseAppHandle.run(Eclips eAppHandle.java:193)
at
org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher .runApplication(EclipseAppLauncher.java:110)
at
org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher .start(EclipseAppLauncher.java:79)
at
org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseS tarter.java:386)
at
org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseS tarter.java:179)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source)
at java.lang.reflect.Method.invoke(Unknown Source)
at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java: 549)
at org.eclipse.equinox.launcher.Main.basicRun(Main.java:504)
at org.eclipse.equinox.launcher.Main.run(Main.java:1236)
Cédric Brun wrote:
> Hi Marco,
>
> EMF compare is, indeed, already integrated with Subversion if you're using a an plugin providing Eclipse integration with Subversion (aka Subversive or Subclipse). That means for instance that comparing models with the team repository should trigger EMF Compare.
>
> We even have a specific plugin for Subversive correcting a few issues we had at some time but as we are not sure yet if it's an issue from our side or from the subversive implementation we did not build this plugin yet and it's only available on the Eclipse modeling CVS.
>
> Anyway installing an SVN plugin + EMF compare should work fine, please tell us if you encounter issues.
> Cédric
>
> Marco wrote:
>
>> Hi! I got a question and it would be great if anyone could help me out
>> with this one: Is there a way to use EMF Compare as differencing and merge
>> tool in subversion? I did not find anything in the web, yet. I'm wondering
>> if this would be useful (this is what I think) and if so, I'm looking for
>> an existing integration.
>
|
|
|
| Re: Integrate EMF Compare in Subversion [message #130229 is a reply to message #130214] |
Thu, 16 October 2008 19:19 |
| Eclipse User |
|
|
|
Originally posted by: sramasamy.ifmc.sdps.org
I just noticed that this bug occurs when you compare a genmodel file
even with it's local history. So this may rule out any issue with
Suversion/Subclipe and place the issue in the Eclipse file versioning
code. This is verified on Eclipse 3.4.1
-sud
Sudhakar wrote:
> I've verified that EMF Compare works when comparing workspace .ecore
> files against those stored in subversion.
>
> But when I attempt to compare a workspace .genmodel file against that in
> subversion I get several NPE. I'm using subclipse 1.4.5 with EMF Compare
> 0.8.1. If I compare the two .genmodel files stored in my workspace I
> don't get these NPEs.
>
>
> Here is the stack trace:
>
> !ENTRY org.eclipse.jface 4 2 2008-10-16 11:29:47.484
> !MESSAGE Problems occurred when invoking code from plug-in:
> "org.eclipse.jface".
> !STACK 0
> java.lang.NullPointerException
> at
> org.eclipse.emf.codegen.ecore.genmodel.impl.GenDataTypeImpl. getQualifiedInstanceClassName(GenDataTypeImpl.java:212)
>
> at
> org.eclipse.emf.codegen.ecore.genmodel.provider.GenDataTypeI temProvider.getText(GenDataTypeItemProvider.java:120)
>
> at
> org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider .getText(AdapterFactoryLabelProvider.java:374)
>
> at
> org.eclipse.jface.viewers.WrappedViewerLabelProvider.getText (WrappedViewerLabelProvider.java:108)
>
> at
> org.eclipse.jface.viewers.WrappedViewerLabelProvider.update( WrappedViewerLabelProvider.java:164)
>
> at
> org.eclipse.jface.viewers.ViewerColumn.refresh(ViewerColumn. java:145)
> at
> org.eclipse.jface.viewers.AbstractTreeViewer.doUpdateItem(Ab stractTreeViewer.java:932)
>
> at
> org.eclipse.jface.viewers.AbstractTreeViewer$UpdateItemSafeR unnable.run(AbstractTreeViewer.java:102)
>
> at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:37)
> at org.eclipse.core.runtime.Platform.run(Platform.java:880)
> at org.eclipse.ui.internal.JFaceUtil$1.run(JFaceUtil.java:48)
> at org.eclipse.jface.util.SafeRunnable.run(SafeRunnable.java:17 5)
> at
> org.eclipse.jface.viewers.AbstractTreeViewer.doUpdateItem(Ab stractTreeViewer.java:1012)
>
> at
> org.eclipse.jface.viewers.StructuredViewer$UpdateItemSafeRun nable.run(StructuredViewer.java:466)
>
> at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:37)
> at org.eclipse.core.runtime.Platform.run(Platform.java:880)
> at org.eclipse.ui.internal.JFaceUtil$1.run(JFaceUtil.java:48)
> at org.eclipse.jface.util.SafeRunnable.run(SafeRunnable.java:17 5)
> at
> org.eclipse.jface.viewers.StructuredViewer.updateItem(Struct uredViewer.java:2041)
>
> at
> org.eclipse.jface.viewers.AbstractTreeViewer.createTreeItem( AbstractTreeViewer.java:827)
>
> at
> org.eclipse.jface.viewers.AbstractTreeViewer$1.run(AbstractT reeViewer.java:802)
>
> at
> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
> at
> org.eclipse.jface.viewers.AbstractTreeViewer.createChildren( AbstractTreeViewer.java:776)
>
> at
> org.eclipse.jface.viewers.TreeViewer.createChildren(TreeView er.java:634)
> at
> org.eclipse.jface.viewers.AbstractTreeViewer.internalExpandT oLevel(AbstractTreeViewer.java:1702)
>
> at
> org.eclipse.jface.viewers.AbstractTreeViewer.internalExpandT oLevel(AbstractTreeViewer.java:1712)
>
> at
> org.eclipse.jface.viewers.AbstractTreeViewer.internalExpandT oLevel(AbstractTreeViewer.java:1712)
>
> at
> org.eclipse.jface.viewers.AbstractTreeViewer.expandToLevel(A bstractTreeViewer.java:1054)
>
> at
> org.eclipse.jface.viewers.AbstractTreeViewer.expandToLevel(A bstractTreeViewer.java:1035)
>
> at
> org.eclipse.jface.viewers.AbstractTreeViewer.expandAll(Abstr actTreeViewer.java:1024)
>
> at
> org.eclipse.emf.compare.ui.viewer.content.part.diff.ModelCon tentMergeDiffTab.inputChanged(ModelContentMergeDiffTab.java: 364)
>
> at
> org.eclipse.jface.viewers.ContentViewer.setInput(ContentView er.java:251)
> at
> org.eclipse.jface.viewers.StructuredViewer.setInput(Structur edViewer.java:1603)
>
> at
> org.eclipse.emf.compare.ui.viewer.content.part.diff.ModelCon tentMergeDiffTab.setReflectiveInput(ModelContentMergeDiffTab .java:278)
>
> at
> org.eclipse.emf.compare.ui.viewer.content.part.ModelContentM ergeTabFolder.setInput(ModelContentMergeTabFolder.java:310)
>
> at
> org.eclipse.emf.compare.ui.viewer.content.ModelContentMergeV iewer.updateContent(ModelContentMergeViewer.java:675)
>
> at
> org.eclipse.compare.contentmergeviewer.ContentMergeViewer.in ternalRefresh(ContentMergeViewer.java:715)
>
> at
> org.eclipse.compare.contentmergeviewer.ContentMergeViewer.in putChanged(ContentMergeViewer.java:615)
>
> at
> org.eclipse.jface.viewers.ContentViewer.setInput(ContentView er.java:251)
> at
> org.eclipse.emf.compare.ui.viewer.content.ModelContentMergeV iewer.setInput(ModelContentMergeViewer.java:281)
>
> at
> org.eclipse.compare.CompareViewerSwitchingPane.setInput(Comp areViewerSwitchingPane.java:256)
>
> at
> org.eclipse.compare.CompareEditorInput.internalSetContentPan eInput(CompareEditorInput.java:791)
>
> at
> org.eclipse.compare.CompareEditorInput.access$7(CompareEdito rInput.java:789)
>
> at
> org.eclipse.compare.CompareEditorInput$13.run(CompareEditorI nput.java:729)
> at
> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
> at
> org.eclipse.compare.CompareEditorInput.feed1(CompareEditorIn put.java:723)
> at
> org.eclipse.compare.CompareEditorInput.feedInput(CompareEdit orInput.java:701)
>
> at
> org.eclipse.compare.CompareEditorInput.createContents(Compar eEditorInput.java:524)
>
> at
> org.eclipse.compare.internal.CompareEditor.createCompareCont rol(CompareEditor.java:415)
>
> at
> org.eclipse.compare.internal.CompareEditor.createPartControl (CompareEditor.java:379)
>
> at
> org.eclipse.ui.internal.EditorReference.createPartHelper(Edi torReference.java:661)
>
> at
> org.eclipse.ui.internal.EditorReference.createPart(EditorRef erence.java:428)
>
> at
> org.eclipse.ui.internal.WorkbenchPartReference.getPart(Workb enchPartReference.java:594)
>
> at
> org.eclipse.ui.internal.EditorReference.getEditor(EditorRefe rence.java:266)
> at
> org.eclipse.ui.internal.WorkbenchPage.busyOpenEditorBatched( WorkbenchPage.java:2820)
>
> at
> org.eclipse.ui.internal.WorkbenchPage.busyOpenEditor(Workben chPage.java:2729)
>
> at
> org.eclipse.ui.internal.WorkbenchPage.access$11(WorkbenchPag e.java:2721)
> at
> org.eclipse.ui.internal.WorkbenchPage$10.run(WorkbenchPage.j ava:2673)
> at
> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
> at
> org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPa ge.java:2668)
> at
> org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPa ge.java:2652)
> at
> org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPa ge.java:2635)
> at
> org.eclipse.compare.internal.CompareUIPlugin$1.run(CompareUI Plugin.java:454)
>
> at
> org.eclipse.compare.internal.CompareUIPlugin.syncExec(Compar eUIPlugin.java:1171)
>
> at
> org.eclipse.compare.internal.CompareUIPlugin.internalOpenEdi tor(CompareUIPlugin.java:465)
>
> at
> org.eclipse.compare.internal.CompareUIPlugin.openCompareEdit or(CompareUIPlugin.java:429)
>
> at
> org.eclipse.compare.CompareUI.openCompareEditorOnPage(Compar eUI.java:135)
> at
> org.tigris.subversion.subclipse.ui.actions.CompareWithRemote Action$1.run(CompareWithRemoteAction.java:57)
>
> at
> org.tigris.subversion.subclipse.ui.repository.RepositoryMana ger.run(RepositoryManager.java:375)
>
> at
> org.tigris.subversion.subclipse.ui.actions.SVNAction$1.run(S VNAction.java:226)
>
> at
> org.tigris.subversion.subclipse.ui.actions.SVNAction$2.run(S VNAction.java:235)
>
> at
> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
> at
> org.tigris.subversion.subclipse.ui.actions.SVNAction.run(SVN Action.java:232)
>
> at
> org.tigris.subversion.subclipse.ui.actions.CompareWithRemote Action.execute(CompareWithRemoteAction.java:53)
>
> at
> org.tigris.subversion.subclipse.ui.actions.SVNAction.run(SVN Action.java:56)
> at
> org.eclipse.ui.actions.ActionDelegate.runWithEvent(ActionDel egate.java:70)
> at
> org.eclipse.ui.internal.PluginAction.runWithEvent(PluginActi on.java:241)
> at
> org.eclipse.jface.action.ActionContributionItem.handleWidget Selection(ActionContributionItem.java:583)
>
> at
> org.eclipse.jface.action.ActionContributionItem.access$2(Act ionContributionItem.java:500)
>
> at
> org.eclipse.jface.action.ActionContributionItem$5.handleEven t(ActionContributionItem.java:411)
>
> at org.eclipse.swt.widgets.EventTable.sendEvent(EventTable.java :84)
> at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1003)
> at org.eclipse.swt.widgets.Display.runDeferredEvents(Display.ja va:3823)
> at org.eclipse.swt.widgets.Display.readAndDispatch(Display.java :3422)
> at org.eclipse.ui.internal.Workbench.runEventLoop(Workbench.jav a:2382)
> at org.eclipse.ui.internal.Workbench.runUI(Workbench.java:2346)
> at org.eclipse.ui.internal.Workbench.access$4(Workbench.java:21 98)
> at org.eclipse.ui.internal.Workbench$5.run(Workbench.java:493)
> at
> org.eclipse.core.databinding.observable.Realm.runWithDefault (Realm.java:288)
>
> at
> org.eclipse.ui.internal.Workbench.createAndRunWorkbench(Work bench.java:488)
> at org.eclipse.ui.PlatformUI.createAndRunWorkbench(PlatformUI.j ava:149)
> at
> org.eclipse.ui.internal.ide.application.IDEApplication.start (IDEApplication.java:113)
>
> at
> org.eclipse.equinox.internal.app.EclipseAppHandle.run(Eclips eAppHandle.java:193)
>
> at
> org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher .runApplication(EclipseAppLauncher.java:110)
>
> at
> org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher .start(EclipseAppLauncher.java:79)
>
> at
> org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseS tarter.java:386)
>
> at
> org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseS tarter.java:179)
>
> at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
> at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source)
> at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source)
> at java.lang.reflect.Method.invoke(Unknown Source)
> at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java: 549)
> at org.eclipse.equinox.launcher.Main.basicRun(Main.java:504)
> at org.eclipse.equinox.launcher.Main.run(Main.java:1236)
>
> !ENTRY org.eclipse.jface 4 2 2008-10-16 11:29:47.703
> !MESSAGE Problems occurred when invoking code from plug-in:
> "org.eclipse.jface".
> !STACK 0
> java.lang.NullPointerException
> at
> org.eclipse.emf.codegen.ecore.genmodel.impl.GenDataTypeImpl. getQualifiedInstanceClassName(GenDataTypeImpl.java:212)
>
> at
> org.eclipse.emf.codegen.ecore.genmodel.provider.GenDataTypeI temProvider.getText(GenDataTypeItemProvider.java:120)
>
> at
> org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider .getText(AdapterFactoryLabelProvider.java:374)
>
> at
> org.eclipse.jface.viewers.WrappedViewerLabelProvider.getText (WrappedViewerLabelProvider.java:108)
>
> at
> org.eclipse.jface.viewers.WrappedViewerLabelProvider.update( WrappedViewerLabelProvider.java:164)
>
> at
> org.eclipse.jface.viewers.ViewerColumn.refresh(ViewerColumn. java:145)
> at
> org.eclipse.jface.viewers.AbstractTreeViewer.doUpdateItem(Ab stractTreeViewer.java:932)
>
> at
> org.eclipse.jface.viewers.AbstractTreeViewer$UpdateItemSafeR unnable.run(AbstractTreeViewer.java:102)
>
> at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:37)
> at org.eclipse.core.runtime.Platform.run(Platform.java:880)
> at org.eclipse.ui.internal.JFaceUtil$1.run(JFaceUtil.java:48)
> at org.eclipse.jface.util.SafeRunnable.run(SafeRunnable.java:17 5)
> at
> org.eclipse.jface.viewers.AbstractTreeViewer.doUpdateItem(Ab stractTreeViewer.java:1012)
>
> at
> org.eclipse.jface.viewers.StructuredViewer$UpdateItemSafeRun nable.run(StructuredViewer.java:466)
>
> at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:37)
> at org.eclipse.core.runtime.Platform.run(Platform.java:880)
> at org.eclipse.ui.internal.JFaceUtil$1.run(JFaceUtil.java:48)
> at org.eclipse.jface.util.SafeRunnable.run(SafeRunnable.java:17 5)
> at
> org.eclipse.jface.viewers.StructuredViewer.updateItem(Struct uredViewer.java:2041)
>
> at
> org.eclipse.jface.viewers.AbstractTreeViewer.createTreeItem( AbstractTreeViewer.java:827)
>
> at
> org.eclipse.jface.viewers.AbstractTreeViewer$1.run(AbstractT reeViewer.java:802)
>
> at
> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
> at
> org.eclipse.jface.viewers.AbstractTreeViewer.createChildren( AbstractTreeViewer.java:776)
>
> at
> org.eclipse.jface.viewers.TreeViewer.createChildren(TreeView er.java:634)
> at
> org.eclipse.jface.viewers.AbstractTreeViewer.internalExpandT oLevel(AbstractTreeViewer.java:1702)
>
> at
> org.eclipse.jface.viewers.AbstractTreeViewer.internalExpandT oLevel(AbstractTreeViewer.java:1712)
>
> at
> org.eclipse.jface.viewers.AbstractTreeViewer.internalExpandT oLevel(AbstractTreeViewer.java:1712)
>
> at
> org.eclipse.jface.viewers.AbstractTreeViewer.expandToLevel(A bstractTreeViewer.java:1054)
>
> at
> org.eclipse.jface.viewers.AbstractTreeViewer.expandToLevel(A bstractTreeViewer.java:1035)
>
> at
> org.eclipse.jface.viewers.AbstractTreeViewer.expandAll(Abstr actTreeViewer.java:1024)
>
> at
> org.eclipse.emf.compare.ui.viewer.content.part.diff.ModelCon tentMergeDiffTab.inputChanged(ModelContentMergeDiffTab.java: 364)
>
> at
> org.eclipse.jface.viewers.ContentViewer.setInput(ContentView er.java:251)
> at
> org.eclipse.jface.viewers.StructuredViewer.setInput(Structur edViewer.java:1603)
>
> at
> org.eclipse.emf.compare.ui.viewer.content.part.diff.ModelCon tentMergeDiffTab.setReflectiveInput(ModelContentMergeDiffTab .java:278)
>
> at
> org.eclipse.emf.compare.ui.viewer.content.part.ModelContentM ergeTabFolder.setInput(ModelContentMergeTabFolder.java:310)
>
> at
> org.eclipse.emf.compare.ui.viewer.content.ModelContentMergeV iewer.updateContent(ModelContentMergeViewer.java:675)
>
> at
> org.eclipse.compare.contentmergeviewer.ContentMergeViewer.in ternalRefresh(ContentMergeViewer.java:715)
>
> at
> org.eclipse.compare.contentmergeviewer.ContentMergeViewer.in putChanged(ContentMergeViewer.java:615)
>
> at
> org.eclipse.jface.viewers.ContentViewer.setInput(ContentView er.java:251)
> at
> org.eclipse.emf.compare.ui.viewer.content.ModelContentMergeV iewer.setInput(ModelContentMergeViewer.java:281)
>
> at
> org.eclipse.compare.CompareViewerSwitchingPane.setInput(Comp areViewerSwitchingPane.java:256)
>
> at
> org.eclipse.compare.CompareEditorInput.internalSetContentPan eInput(CompareEditorInput.java:791)
>
> at
> org.eclipse.compare.CompareEditorInput.access$7(CompareEdito rInput.java:789)
>
> at
> org.eclipse.compare.CompareEditorInput$13.run(CompareEditorI nput.java:729)
> at
> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
> at
> org.eclipse.compare.CompareEditorInput.feed1(CompareEditorIn put.java:723)
> at
> org.eclipse.compare.CompareEditorInput.feedInput(CompareEdit orInput.java:701)
>
> at
> org.eclipse.compare.CompareEditorInput.createContents(Compar eEditorInput.java:524)
>
> at
> org.eclipse.compare.internal.CompareEditor.createCompareCont rol(CompareEditor.java:415)
>
> at
> org.eclipse.compare.internal.CompareEditor.createPartControl (CompareEditor.java:379)
>
> at
> org.eclipse.ui.internal.EditorReference.createPartHelper(Edi torReference.java:661)
>
> at
> org.eclipse.ui.internal.EditorReference.createPart(EditorRef erence.java:428)
>
> at
> org.eclipse.ui.internal.WorkbenchPartReference.getPart(Workb enchPartReference.java:594)
>
> at
> org.eclipse.ui.internal.EditorReference.getEditor(EditorRefe rence.java:266)
> at
> org.eclipse.ui.internal.WorkbenchPage.busyOpenEditorBatched( WorkbenchPage.java:2820)
>
> at
> org.eclipse.ui.internal.WorkbenchPage.busyOpenEditor(Workben chPage.java:2729)
>
> at
> org.eclipse.ui.internal.WorkbenchPage.access$11(WorkbenchPag e.java:2721)
> at
> org.eclipse.ui.internal.WorkbenchPage$10.run(WorkbenchPage.j ava:2673)
> at
> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
> at
> org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPa ge.java:2668)
> at
> org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPa ge.java:2652)
> at
> org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPa ge.java:2635)
> at
> org.eclipse.compare.internal.CompareUIPlugin$1.run(CompareUI Plugin.java:454)
>
> at
> org.eclipse.compare.internal.CompareUIPlugin.syncExec(Compar eUIPlugin.java:1171)
>
> at
> org.eclipse.compare.internal.CompareUIPlugin.internalOpenEdi tor(CompareUIPlugin.java:465)
>
> at
> org.eclipse.compare.internal.CompareUIPlugin.openCompareEdit or(CompareUIPlugin.java:429)
>
> at
> org.eclipse.compare.CompareUI.openCompareEditorOnPage(Compar eUI.java:135)
> at
> org.tigris.subversion.subclipse.ui.actions.CompareWithRemote Action$1.run(CompareWithRemoteAction.java:57)
>
> at
> org.tigris.subversion.subclipse.ui.repository.RepositoryMana ger.run(RepositoryManager.java:375)
>
> at
> org.tigris.subversion.subclipse.ui.actions.SVNAction$1.run(S VNAction.java:226)
>
> at
> org.tigris.subversion.subclipse.ui.actions.SVNAction$2.run(S VNAction.java:235)
>
> at
> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
> at
> org.tigris.subversion.subclipse.ui.actions.SVNAction.run(SVN Action.java:232)
>
> at
> org.tigris.subversion.subclipse.ui.actions.CompareWithRemote Action.execute(CompareWithRemoteAction.java:53)
>
> at
> org.tigris.subversion.subclipse.ui.actions.SVNAction.run(SVN Action.java:56)
> at
> org.eclipse.ui.actions.ActionDelegate.runWithEvent(ActionDel egate.java:70)
> at
> org.eclipse.ui.internal.PluginAction.runWithEvent(PluginActi on.java:241)
> at
> org.eclipse.jface.action.ActionContributionItem.handleWidget Selection(ActionContributionItem.java:583)
>
> at
> org.eclipse.jface.action.ActionContributionItem.access$2(Act ionContributionItem.java:500)
>
> at
> org.eclipse.jface.action.ActionContributionItem$5.handleEven t(ActionContributionItem.java:411)
>
> at org.eclipse.swt.widgets.EventTable.sendEvent(EventTable.java :84)
> at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1003)
> at org.eclipse.swt.widgets.Display.runDeferredEvents(Display.ja va:3823)
> at org.eclipse.swt.widgets.Display.readAndDispatch(Display.java :3422)
> at org.eclipse.ui.internal.Workbench.runEventLoop(Workbench.jav a:2382)
> at org.eclipse.ui.internal.Workbench.runUI(Workbench.java:2346)
> at org.eclipse.ui.internal.Workbench.access$4(Workbench.java:21 98)
> at org.eclipse.ui.internal.Workbench$5.run(Workbench.java:493)
> at
> org.eclipse.core.databinding.observable.Realm.runWithDefault (Realm.java:288)
>
> at
> org.eclipse.ui.internal.Workbench.createAndRunWorkbench(Work bench.java:488)
> at org.eclipse.ui.PlatformUI.createAndRunWorkbench(PlatformUI.j ava:149)
> at
> org.eclipse.ui.internal.ide.application.IDEApplication.start (IDEApplication.java:113)
>
> at
> org.eclipse.equinox.internal.app.EclipseAppHandle.run(Eclips eAppHandle.java:193)
>
> at
> org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher .runApplication(EclipseAppLauncher.java:110)
>
> at
> org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher .start(EclipseAppLauncher.java:79)
>
> at
> org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseS tarter.java:386)
>
> at
> org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseS tarter.java:179)
>
> at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
> at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source)
> at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source)
> at java.lang.reflect.Method.invoke(Unknown Source)
> at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java: 549)
> at org.eclipse.equinox.launcher.Main.basicRun(Main.java:504)
> at org.eclipse.equinox.launcher.Main.run(Main.java:1236)
>
> !ENTRY org.eclipse.jface 4 2 2008-10-16 11:29:47.781
> !MESSAGE Problems occurred when invoking code from plug-in:
> "org.eclipse.jface".
> !STACK 0
> java.lang.NullPointerException
> at
> org.eclipse.emf.codegen.ecore.genmodel.impl.GenDataTypeImpl. getQualifiedInstanceClassName(GenDataTypeImpl.java:212)
>
> at
> org.eclipse.emf.codegen.ecore.genmodel.provider.GenDataTypeI temProvider.getText(GenDataTypeItemProvider.java:120)
>
> at
> org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider .getText(AdapterFactoryLabelProvider.java:374)
>
> at
> org.eclipse.jface.viewers.WrappedViewerLabelProvider.getText (WrappedViewerLabelProvider.java:108)
>
> at
> org.eclipse.jface.viewers.WrappedViewerLabelProvider.update( WrappedViewerLabelProvider.java:164)
>
> at
> org.eclipse.jface.viewers.ViewerColumn.refresh(ViewerColumn. java:145)
> at
> org.eclipse.jface.viewers.AbstractTreeViewer.doUpdateItem(Ab stractTreeViewer.java:932)
>
> at
> org.eclipse.jface.viewers.AbstractTreeViewer$UpdateItemSafeR unnable.run(AbstractTreeViewer.java:102)
>
> at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:37)
> at org.eclipse.core.runtime.Platform.run(Platform.java:880)
> at org.eclipse.ui.internal.JFaceUtil$1.run(JFaceUtil.java:48)
> at org.eclipse.jface.util.SafeRunnable.run(SafeRunnable.java:17 5)
> at
> org.eclipse.jface.viewers.AbstractTreeViewer.doUpdateItem(Ab stractTreeViewer.java:1012)
>
> at
> org.eclipse.jface.viewers.StructuredViewer$UpdateItemSafeRun nable.run(StructuredViewer.java:466)
>
> at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:37)
> at org.eclipse.core.runtime.Platform.run(Platform.java:880)
> at org.eclipse.ui.internal.JFaceUtil$1.run(JFaceUtil.java:48)
> at org.eclipse.jface.util.SafeRunnable.run(SafeRunnable.java:17 5)
> at
> org.eclipse.jface.viewers.StructuredViewer.updateItem(Struct uredViewer.java:2041)
>
> at
> org.eclipse.jface.viewers.AbstractTreeViewer.createTreeItem( AbstractTreeViewer.java:827)
>
> at
> org.eclipse.jface.viewers.AbstractTreeViewer$1.run(AbstractT reeViewer.java:802)
>
> at
> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
> at
> org.eclipse.jface.viewers.AbstractTreeViewer.createChildren( AbstractTreeViewer.java:776)
>
> at
> org.eclipse.jface.viewers.TreeViewer.createChildren(TreeView er.java:634)
> at
> org.eclipse.jface.viewers.AbstractTreeViewer.internalExpandT oLevel(AbstractTreeViewer.java:1702)
>
> at
> org.eclipse.jface.viewers.AbstractTreeViewer.internalExpandT oLevel(AbstractTreeViewer.java:1712)
>
> at
> org.eclipse.jface.viewers.AbstractTreeViewer.internalExpandT oLevel(AbstractTreeViewer.java:1712)
>
> at
> org.eclipse.jface.viewers.AbstractTreeViewer.expandToLevel(A bstractTreeViewer.java:1054)
>
> at
> org.eclipse.jface.viewers.AbstractTreeViewer.expandToLevel(A bstractTreeViewer.java:1035)
>
> at
> org.eclipse.jface.viewers.AbstractTreeViewer.expandAll(Abstr actTreeViewer.java:1024)
>
> at
> org.eclipse.emf.compare.ui.viewer.content.part.diff.ModelCon tentMergeDiffTab.inputChanged(ModelContentMergeDiffTab.java: 364)
>
> at
> org.eclipse.jface.viewers.ContentViewer.setInput(ContentView er.java:251)
> at
> org.eclipse.jface.viewers.StructuredViewer.setInput(Structur edViewer.java:1603)
>
> at
> org.eclipse.emf.compare.ui.viewer.content.part.diff.ModelCon tentMergeDiffTab.setReflectiveInput(ModelContentMergeDiffTab .java:278)
>
> at
> org.eclipse.emf.compare.ui.viewer.content.part.ModelContentM ergeTabFolder.setInput(ModelContentMergeTabFolder.java:310)
>
> at
> org.eclipse.emf.compare.ui.viewer.content.ModelContentMergeV iewer.updateContent(ModelContentMergeViewer.java:675)
>
> at
> org.eclipse.compare.contentmergeviewer.ContentMergeViewer.in ternalRefresh(ContentMergeViewer.java:715)
>
> at
> org.eclipse.compare.contentmergeviewer.ContentMergeViewer.in putChanged(ContentMergeViewer.java:615)
>
> at
> org.eclipse.jface.viewers.ContentViewer.setInput(ContentView er.java:251)
> at
> org.eclipse.emf.compare.ui.viewer.content.ModelContentMergeV iewer.setInput(ModelContentMergeViewer.java:281)
>
> at
> org.eclipse.compare.CompareViewerSwitchingPane.setInput(Comp areViewerSwitchingPane.java:256)
>
> at
> org.eclipse.compare.CompareEditorInput.internalSetContentPan eInput(CompareEditorInput.java:791)
>
> at
> org.eclipse.compare.CompareEditorInput.access$7(CompareEdito rInput.java:789)
>
> at
> org.eclipse.compare.CompareEditorInput$13.run(CompareEditorI nput.java:729)
> at
> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
> at
> org.eclipse.compare.CompareEditorInput.feed1(CompareEditorIn put.java:723)
> at
> org.eclipse.compare.CompareEditorInput.feedInput(CompareEdit orInput.java:701)
>
> at
> org.eclipse.compare.CompareEditorInput.createContents(Compar eEditorInput.java:524)
>
> at
> org.eclipse.compare.internal.CompareEditor.createCompareCont rol(CompareEditor.java:415)
>
> at
> org.eclipse.compare.internal.CompareEditor.createPartControl (CompareEditor.java:379)
>
> at
> org.eclipse.ui.internal.EditorReference.createPartHelper(Edi torReference.java:661)
>
> at
> org.eclipse.ui.internal.EditorReference.createPart(EditorRef erence.java:428)
>
> at
> org.eclipse.ui.internal.WorkbenchPartReference.getPart(Workb enchPartReference.java:594)
>
> at
> org.eclipse.ui.internal.EditorReference.getEditor(EditorRefe rence.java:266)
> at
> org.eclipse.ui.internal.WorkbenchPage.busyOpenEditorBatched( WorkbenchPage.java:2820)
>
> at
> org.eclipse.ui.internal.WorkbenchPage.busyOpenEditor(Workben chPage.java:2729)
>
> at
> org.eclipse.ui.internal.WorkbenchPage.access$11(WorkbenchPag e.java:2721)
> at
> org.eclipse.ui.internal.WorkbenchPage$10.run(WorkbenchPage.j ava:2673)
> at
> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
> at
> org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPa ge.java:2668)
> at
> org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPa ge.java:2652)
> at
> org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPa ge.java:2635)
> at
> org.eclipse.compare.internal.CompareUIPlugin$1.run(CompareUI Plugin.java:454)
>
> at
> org.eclipse.compare.internal.CompareUIPlugin.syncExec(Compar eUIPlugin.java:1171)
>
> at
> org.eclipse.compare.internal.CompareUIPlugin.internalOpenEdi tor(CompareUIPlugin.java:465)
>
> at
> org.eclipse.compare.internal.CompareUIPlugin.openCompareEdit or(CompareUIPlugin.java:429)
>
> at
> org.eclipse.compare.CompareUI.openCompareEditorOnPage(Compar eUI.java:135)
> at
> org.tigris.subversion.subclipse.ui.actions.CompareWithRemote Action$1.run(CompareWithRemoteAction.java:57)
>
> at
> org.tigris.subversion.subclipse.ui.repository.RepositoryMana ger.run(RepositoryManager.java:375)
>
> at
> org.tigris.subversion.subclipse.ui.actions.SVNAction$1.run(S VNAction.java:226)
>
> at
> org.tigris.subversion.subclipse.ui.actions.SVNAction$2.run(S VNAction.java:235)
>
> at
> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
> at
> org.tigris.subversion.subclipse.ui.actions.SVNAction.run(SVN Action.java:232)
>
> at
> org.tigris.subversion.subclipse.ui.actions.CompareWithRemote Action.execute(CompareWithRemoteAction.java:53)
>
> at
> org.tigris.subversion.subclipse.ui.actions.SVNAction.run(SVN Action.java:56)
> at
> org.eclipse.ui.actions.ActionDelegate.runWithEvent(ActionDel egate.java:70)
> at
> org.eclipse.ui.internal.PluginAction.runWithEvent(PluginActi on.java:241)
> at
> org.eclipse.jface.action.ActionContributionItem.handleWidget Selection(ActionContributionItem.java:583)
>
> at
> org.eclipse.jface.action.ActionContributionItem.access$2(Act ionContributionItem.java:500)
>
> at
> org.eclipse.jface.action.ActionContributionItem$5.handleEven t(ActionContributionItem.java:411)
>
> at org.eclipse.swt.widgets.EventTable.sendEvent(EventTable.java :84)
> at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1003)
> at org.eclipse.swt.widgets.Display.runDeferredEvents(Display.ja va:3823)
> at org.eclipse.swt.widgets.Display.readAndDispatch(Display.java :3422)
> at org.eclipse.ui.internal.Workbench.runEventLoop(Workbench.jav a:2382)
> at org.eclipse.ui.internal.Workbench.runUI(Workbench.java:2346)
> at org.eclipse.ui.internal.Workbench.access$4(Workbench.java:21 98)
> at org.eclipse.ui.internal.Workbench$5.run(Workbench.java:493)
> at
> org.eclipse.core.databinding.observable.Realm.runWithDefault (Realm.java:288)
>
> at
> org.eclipse.ui.internal.Workbench.createAndRunWorkbench(Work bench.java:488)
> at org.eclipse.ui.PlatformUI.createAndRunWorkbench(PlatformUI.j ava:149)
> at
> org.eclipse.ui.internal.ide.application.IDEApplication.start (IDEApplication.java:113)
>
> at
> org.eclipse.equinox.internal.app.EclipseAppHandle.run(Eclips eAppHandle.java:193)
>
> at
> org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher .runApplication(EclipseAppLauncher.java:110)
>
> at
> org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher .start(EclipseAppLauncher.java:79)
>
> at
> org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseS tarter.java:386)
>
> at
> org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseS tarter.java:179)
>
> at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
> at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source)
> at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source)
> at java.lang.reflect.Method.invoke(Unknown Source)
> at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java: 549)
> at org.eclipse.equinox.launcher.Main.basicRun(Main.java:504)
> at org.eclipse.equinox.launcher.Main.run(Main.java:1236)
>
>
>
> Cédric Brun wrote:
>> Hi Marco,
>>
>> EMF compare is, indeed, already integrated with Subversion if you're
>> using a an plugin providing Eclipse integration with Subversion (aka
>> Subversive or Subclipse). That means for instance that comparing
>> models with the team repository should trigger EMF Compare.
>>
>> We even have a specific plugin for Subversive correcting a few issues
>> we had at some time but as we are not sure yet if it's an issue from
>> our side or from the subversive implementation we did not build this
>> plugin yet and it's only available on the Eclipse modeling CVS.
>>
>> Anyway installing an SVN plugin + EMF compare should work fine, please
>> tell us if you encounter issues.
>> Cédric
>>
>> Marco wrote:
>>
>>> Hi! I got a question and it would be great if anyone could help me out
>>> with this one: Is there a way to use EMF Compare as differencing and
>>> merge
>>> tool in subversion? I did not find anything in the web, yet. I'm
>>> wondering
>>> if this would be useful (this is what I think) and if so, I'm looking
>>> for
>>> an existing integration.
>>
|
|
|
| Re: Integrate EMF Compare in Subversion [message #130267 is a reply to message #130229] |
Fri, 17 October 2008 07:37 |
|
This is a multi-part message in MIME format.
--------------040202060309030609060007
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
Hi Sudhakar,
We've has many issues with the genmodel comparison ... something must be
wrong in the way we load it. Can you fill a bug with your stack trace so
that we remember this has to be fixed?
Laurent Goubet
Obeo
Sudhakar a écrit :
> I just noticed that this bug occurs when you compare a genmodel file
> even with it's local history. So this may rule out any issue with
> Suversion/Subclipe and place the issue in the Eclipse file versioning
> code. This is verified on Eclipse 3.4.1
>
> -sud
>
> Sudhakar wrote:
>> I've verified that EMF Compare works when comparing workspace .ecore
>> files against those stored in subversion.
>>
>> But when I attempt to compare a workspace .genmodel file against that
>> in subversion I get several NPE. I'm using subclipse 1.4.5 with EMF
>> Compare 0.8.1. If I compare the two .genmodel files stored in my
>> workspace I don't get these NPEs.
>>
>>
>> Here is the stack trace:
>>
>> !ENTRY org.eclipse.jface 4 2 2008-10-16 11:29:47.484
>> !MESSAGE Problems occurred when invoking code from plug-in:
>> "org.eclipse.jface".
>> !STACK 0
>> java.lang.NullPointerException
>> at
>> org.eclipse.emf.codegen.ecore.genmodel.impl.GenDataTypeImpl. getQualifiedInstanceClassName(GenDataTypeImpl.java:212)
>>
>> at
>> org.eclipse.emf.codegen.ecore.genmodel.provider.GenDataTypeI temProvider.getText(GenDataTypeItemProvider.java:120)
>>
>> at
>> org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider .getText(AdapterFactoryLabelProvider.java:374)
>>
>> at
>> org.eclipse.jface.viewers.WrappedViewerLabelProvider.getText (WrappedViewerLabelProvider.java:108)
>>
>> at
>> org.eclipse.jface.viewers.WrappedViewerLabelProvider.update( WrappedViewerLabelProvider.java:164)
>>
>> at
>> org.eclipse.jface.viewers.ViewerColumn.refresh(ViewerColumn. java:145)
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer.doUpdateItem(Ab stractTreeViewer.java:932)
>>
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer$UpdateItemSafeR unnable.run(AbstractTreeViewer.java:102)
>>
>> at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:37)
>> at org.eclipse.core.runtime.Platform.run(Platform.java:880)
>> at org.eclipse.ui.internal.JFaceUtil$1.run(JFaceUtil.java:48)
>> at org.eclipse.jface.util.SafeRunnable.run(SafeRunnable.java:17 5)
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer.doUpdateItem(Ab stractTreeViewer.java:1012)
>>
>> at
>> org.eclipse.jface.viewers.StructuredViewer$UpdateItemSafeRun nable.run(StructuredViewer.java:466)
>>
>> at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:37)
>> at org.eclipse.core.runtime.Platform.run(Platform.java:880)
>> at org.eclipse.ui.internal.JFaceUtil$1.run(JFaceUtil.java:48)
>> at org.eclipse.jface.util.SafeRunnable.run(SafeRunnable.java:17 5)
>> at
>> org.eclipse.jface.viewers.StructuredViewer.updateItem(Struct uredViewer.java:2041)
>>
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer.createTreeItem( AbstractTreeViewer.java:827)
>>
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer$1.run(AbstractT reeViewer.java:802)
>>
>> at
>> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer.createChildren( AbstractTreeViewer.java:776)
>>
>> at
>> org.eclipse.jface.viewers.TreeViewer.createChildren(TreeView er.java:634)
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer.internalExpandT oLevel(AbstractTreeViewer.java:1702)
>>
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer.internalExpandT oLevel(AbstractTreeViewer.java:1712)
>>
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer.internalExpandT oLevel(AbstractTreeViewer.java:1712)
>>
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer.expandToLevel(A bstractTreeViewer.java:1054)
>>
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer.expandToLevel(A bstractTreeViewer.java:1035)
>>
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer.expandAll(Abstr actTreeViewer.java:1024)
>>
>> at
>> org.eclipse.emf.compare.ui.viewer.content.part.diff.ModelCon tentMergeDiffTab.inputChanged(ModelContentMergeDiffTab.java: 364)
>>
>> at
>> org.eclipse.jface.viewers.ContentViewer.setInput(ContentView er.java:251)
>> at
>> org.eclipse.jface.viewers.StructuredViewer.setInput(Structur edViewer.java:1603)
>>
>> at
>> org.eclipse.emf.compare.ui.viewer.content.part.diff.ModelCon tentMergeDiffTab.setReflectiveInput(ModelContentMergeDiffTab .java:278)
>>
>> at
>> org.eclipse.emf.compare.ui.viewer.content.part.ModelContentM ergeTabFolder.setInput(ModelContentMergeTabFolder.java:310)
>>
>> at
>> org.eclipse.emf.compare.ui.viewer.content.ModelContentMergeV iewer.updateContent(ModelContentMergeViewer.java:675)
>>
>> at
>> org.eclipse.compare.contentmergeviewer.ContentMergeViewer.in ternalRefresh(ContentMergeViewer.java:715)
>>
>> at
>> org.eclipse.compare.contentmergeviewer.ContentMergeViewer.in putChanged(ContentMergeViewer.java:615)
>>
>> at
>> org.eclipse.jface.viewers.ContentViewer.setInput(ContentView er.java:251)
>> at
>> org.eclipse.emf.compare.ui.viewer.content.ModelContentMergeV iewer.setInput(ModelContentMergeViewer.java:281)
>>
>> at
>> org.eclipse.compare.CompareViewerSwitchingPane.setInput(Comp areViewerSwitchingPane.java:256)
>>
>> at
>> org.eclipse.compare.CompareEditorInput.internalSetContentPan eInput(CompareEditorInput.java:791)
>>
>> at
>> org.eclipse.compare.CompareEditorInput.access$7(CompareEdito rInput.java:789)
>>
>> at
>> org.eclipse.compare.CompareEditorInput$13.run(CompareEditorI nput.java:729)
>>
>> at
>> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
>> at
>> org.eclipse.compare.CompareEditorInput.feed1(CompareEditorIn put.java:723)
>> at
>> org.eclipse.compare.CompareEditorInput.feedInput(CompareEdit orInput.java:701)
>>
>> at
>> org.eclipse.compare.CompareEditorInput.createContents(Compar eEditorInput.java:524)
>>
>> at
>> org.eclipse.compare.internal.CompareEditor.createCompareCont rol(CompareEditor.java:415)
>>
>> at
>> org.eclipse.compare.internal.CompareEditor.createPartControl (CompareEditor.java:379)
>>
>> at
>> org.eclipse.ui.internal.EditorReference.createPartHelper(Edi torReference.java:661)
>>
>> at
>> org.eclipse.ui.internal.EditorReference.createPart(EditorRef erence.java:428)
>>
>> at
>> org.eclipse.ui.internal.WorkbenchPartReference.getPart(Workb enchPartReference.java:594)
>>
>> at
>> org.eclipse.ui.internal.EditorReference.getEditor(EditorRefe rence.java:266)
>>
>> at
>> org.eclipse.ui.internal.WorkbenchPage.busyOpenEditorBatched( WorkbenchPage.java:2820)
>>
>> at
>> org.eclipse.ui.internal.WorkbenchPage.busyOpenEditor(Workben chPage.java:2729)
>>
>> at
>> org.eclipse.ui.internal.WorkbenchPage.access$11(WorkbenchPag e.java:2721)
>> at
>> org.eclipse.ui.internal.WorkbenchPage$10.run(WorkbenchPage.j ava:2673)
>> at
>> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
>> at
>> org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPa ge.java:2668)
>> at
>> org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPa ge.java:2652)
>> at
>> org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPa ge.java:2635)
>> at
>> org.eclipse.compare.internal.CompareUIPlugin$1.run(CompareUI Plugin.java:454)
>>
>> at
>> org.eclipse.compare.internal.CompareUIPlugin.syncExec(Compar eUIPlugin.java:1171)
>>
>> at
>> org.eclipse.compare.internal.CompareUIPlugin.internalOpenEdi tor(CompareUIPlugin.java:465)
>>
>> at
>> org.eclipse.compare.internal.CompareUIPlugin.openCompareEdit or(CompareUIPlugin.java:429)
>>
>> at
>> org.eclipse.compare.CompareUI.openCompareEditorOnPage(Compar eUI.java:135)
>> at
>> org.tigris.subversion.subclipse.ui.actions.CompareWithRemote Action$1.run(CompareWithRemoteAction.java:57)
>>
>> at
>> org.tigris.subversion.subclipse.ui.repository.RepositoryMana ger.run(RepositoryManager.java:375)
>>
>> at
>> org.tigris.subversion.subclipse.ui.actions.SVNAction$1.run(S VNAction.java:226)
>>
>> at
>> org.tigris.subversion.subclipse.ui.actions.SVNAction$2.run(S VNAction.java:235)
>>
>> at
>> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
>> at
>> org.tigris.subversion.subclipse.ui.actions.SVNAction.run(SVN Action.java:232)
>>
>> at
>> org.tigris.subversion.subclipse.ui.actions.CompareWithRemote Action.execute(CompareWithRemoteAction.java:53)
>>
>> at
>> org.tigris.subversion.subclipse.ui.actions.SVNAction.run(SVN Action.java:56)
>>
>> at
>> org.eclipse.ui.actions.ActionDelegate.runWithEvent(ActionDel egate.java:70)
>>
>> at
>> org.eclipse.ui.internal.PluginAction.runWithEvent(PluginActi on.java:241)
>> at
>> org.eclipse.jface.action.ActionContributionItem.handleWidget Selection(ActionContributionItem.java:583)
>>
>> at
>> org.eclipse.jface.action.ActionContributionItem.access$2(Act ionContributionItem.java:500)
>>
>> at
>> org.eclipse.jface.action.ActionContributionItem$5.handleEven t(ActionContributionItem.java:411)
>>
>> at org.eclipse.swt.widgets.EventTable.sendEvent(EventTable.java :84)
>> at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1003)
>> at
>> org.eclipse.swt.widgets.Display.runDeferredEvents(Display.ja va:3823)
>> at org.eclipse.swt.widgets.Display.readAndDispatch(Display.java :3422)
>> at
>> org.eclipse.ui.internal.Workbench.runEventLoop(Workbench.jav a:2382)
>> at org.eclipse.ui.internal.Workbench.runUI(Workbench.java:2346)
>> at org.eclipse.ui.internal.Workbench.access$4(Workbench.java:21 98)
>> at org.eclipse.ui.internal.Workbench$5.run(Workbench.java:493)
>> at
>> org.eclipse.core.databinding.observable.Realm.runWithDefault (Realm.java:288)
>>
>> at
>> org.eclipse.ui.internal.Workbench.createAndRunWorkbench(Work bench.java:488)
>>
>> at
>> org.eclipse.ui.PlatformUI.createAndRunWorkbench(PlatformUI.j ava:149)
>> at
>> org.eclipse.ui.internal.ide.application.IDEApplication.start (IDEApplication.java:113)
>>
>> at
>> org.eclipse.equinox.internal.app.EclipseAppHandle.run(Eclips eAppHandle.java:193)
>>
>> at
>> org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher .runApplication(EclipseAppLauncher.java:110)
>>
>> at
>> org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher .start(EclipseAppLauncher.java:79)
>>
>> at
>> org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseS tarter.java:386)
>>
>> at
>> org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseS tarter.java:179)
>>
>> at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
>> at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source)
>> at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source)
>> at java.lang.reflect.Method.invoke(Unknown Source)
>> at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java: 549)
>> at org.eclipse.equinox.launcher.Main.basicRun(Main.java:504)
>> at org.eclipse.equinox.launcher.Main.run(Main.java:1236)
>>
>> !ENTRY org.eclipse.jface 4 2 2008-10-16 11:29:47.703
>> !MESSAGE Problems occurred when invoking code from plug-in:
>> "org.eclipse.jface".
>> !STACK 0
>> java.lang.NullPointerException
>> at
>> org.eclipse.emf.codegen.ecore.genmodel.impl.GenDataTypeImpl. getQualifiedInstanceClassName(GenDataTypeImpl.java:212)
>>
>> at
>> org.eclipse.emf.codegen.ecore.genmodel.provider.GenDataTypeI temProvider.getText(GenDataTypeItemProvider.java:120)
>>
>> at
>> org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider .getText(AdapterFactoryLabelProvider.java:374)
>>
>> at
>> org.eclipse.jface.viewers.WrappedViewerLabelProvider.getText (WrappedViewerLabelProvider.java:108)
>>
>> at
>> org.eclipse.jface.viewers.WrappedViewerLabelProvider.update( WrappedViewerLabelProvider.java:164)
>>
>> at
>> org.eclipse.jface.viewers.ViewerColumn.refresh(ViewerColumn. java:145)
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer.doUpdateItem(Ab stractTreeViewer.java:932)
>>
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer$UpdateItemSafeR unnable.run(AbstractTreeViewer.java:102)
>>
>> at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:37)
>> at org.eclipse.core.runtime.Platform.run(Platform.java:880)
>> at org.eclipse.ui.internal.JFaceUtil$1.run(JFaceUtil.java:48)
>> at org.eclipse.jface.util.SafeRunnable.run(SafeRunnable.java:17 5)
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer.doUpdateItem(Ab stractTreeViewer.java:1012)
>>
>> at
>> org.eclipse.jface.viewers.StructuredViewer$UpdateItemSafeRun nable.run(StructuredViewer.java:466)
>>
>> at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:37)
>> at org.eclipse.core.runtime.Platform.run(Platform.java:880)
>> at org.eclipse.ui.internal.JFaceUtil$1.run(JFaceUtil.java:48)
>> at org.eclipse.jface.util.SafeRunnable.run(SafeRunnable.java:17 5)
>> at
>> org.eclipse.jface.viewers.StructuredViewer.updateItem(Struct uredViewer.java:2041)
>>
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer.createTreeItem( AbstractTreeViewer.java:827)
>>
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer$1.run(AbstractT reeViewer.java:802)
>>
>> at
>> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer.createChildren( AbstractTreeViewer.java:776)
>>
>> at
>> org.eclipse.jface.viewers.TreeViewer.createChildren(TreeView er.java:634)
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer.internalExpandT oLevel(AbstractTreeViewer.java:1702)
>>
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer.internalExpandT oLevel(AbstractTreeViewer.java:1712)
>>
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer.internalExpandT oLevel(AbstractTreeViewer.java:1712)
>>
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer.expandToLevel(A bstractTreeViewer.java:1054)
>>
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer.expandToLevel(A bstractTreeViewer.java:1035)
>>
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer.expandAll(Abstr actTreeViewer.java:1024)
>>
>> at
>> org.eclipse.emf.compare.ui.viewer.content.part.diff.ModelCon tentMergeDiffTab.inputChanged(ModelContentMergeDiffTab.java: 364)
>>
>> at
>> org.eclipse.jface.viewers.ContentViewer.setInput(ContentView er.java:251)
>> at
>> org.eclipse.jface.viewers.StructuredViewer.setInput(Structur edViewer.java:1603)
>>
>> at
>> org.eclipse.emf.compare.ui.viewer.content.part.diff.ModelCon tentMergeDiffTab.setReflectiveInput(ModelContentMergeDiffTab .java:278)
>>
>> at
>> org.eclipse.emf.compare.ui.viewer.content.part.ModelContentM ergeTabFolder.setInput(ModelContentMergeTabFolder.java:310)
>>
>> at
>> org.eclipse.emf.compare.ui.viewer.content.ModelContentMergeV iewer.updateContent(ModelContentMergeViewer.java:675)
>>
>> at
>> org.eclipse.compare.contentmergeviewer.ContentMergeViewer.in ternalRefresh(ContentMergeViewer.java:715)
>>
>> at
>> org.eclipse.compare.contentmergeviewer.ContentMergeViewer.in putChanged(ContentMergeViewer.java:615)
>>
>> at
>> org.eclipse.jface.viewers.ContentViewer.setInput(ContentView er.java:251)
>> at
>> org.eclipse.emf.compare.ui.viewer.content.ModelContentMergeV iewer.setInput(ModelContentMergeViewer.java:281)
>>
>> at
>> org.eclipse.compare.CompareViewerSwitchingPane.setInput(Comp areViewerSwitchingPane.java:256)
>>
>> at
>> org.eclipse.compare.CompareEditorInput.internalSetContentPan eInput(CompareEditorInput.java:791)
>>
>> at
>> org.eclipse.compare.CompareEditorInput.access$7(CompareEdito rInput.java:789)
>>
>> at
>> org.eclipse.compare.CompareEditorInput$13.run(CompareEditorI nput.java:729)
>>
>> at
>> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
>> at
>> org.eclipse.compare.CompareEditorInput.feed1(CompareEditorIn put.java:723)
>> at
>> org.eclipse.compare.CompareEditorInput.feedInput(CompareEdit orInput.java:701)
>>
>> at
>> org.eclipse.compare.CompareEditorInput.createContents(Compar eEditorInput.java:524)
>>
>> at
>> org.eclipse.compare.internal.CompareEditor.createCompareCont rol(CompareEditor.java:415)
>>
>> at
>> org.eclipse.compare.internal.CompareEditor.createPartControl (CompareEditor.java:379)
>>
>> at
>> org.eclipse.ui.internal.EditorReference.createPartHelper(Edi torReference.java:661)
>>
>> at
>> org.eclipse.ui.internal.EditorReference.createPart(EditorRef erence.java:428)
>>
>> at
>> org.eclipse.ui.internal.WorkbenchPartReference.getPart(Workb enchPartReference.java:594)
>>
>> at
>> org.eclipse.ui.internal.EditorReference.getEditor(EditorRefe rence.java:266)
>>
>> at
>> org.eclipse.ui.internal.WorkbenchPage.busyOpenEditorBatched( WorkbenchPage.java:2820)
>>
>> at
>> org.eclipse.ui.internal.WorkbenchPage.busyOpenEditor(Workben chPage.java:2729)
>>
>> at
>> org.eclipse.ui.internal.WorkbenchPage.access$11(WorkbenchPag e.java:2721)
>> at
>> org.eclipse.ui.internal.WorkbenchPage$10.run(WorkbenchPage.j ava:2673)
>> at
>> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
>> at
>> org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPa ge.java:2668)
>> at
>> org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPa ge.java:2652)
>> at
>> org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPa ge.java:2635)
>> at
>> org.eclipse.compare.internal.CompareUIPlugin$1.run(CompareUI Plugin.java:454)
>>
>> at
>> org.eclipse.compare.internal.CompareUIPlugin.syncExec(Compar eUIPlugin.java:1171)
>>
>> at
>> org.eclipse.compare.internal.CompareUIPlugin.internalOpenEdi tor(CompareUIPlugin.java:465)
>>
>> at
>> org.eclipse.compare.internal.CompareUIPlugin.openCompareEdit or(CompareUIPlugin.java:429)
>>
>> at
>> org.eclipse.compare.CompareUI.openCompareEditorOnPage(Compar eUI.java:135)
>> at
>> org.tigris.subversion.subclipse.ui.actions.CompareWithRemote Action$1.run(CompareWithRemoteAction.java:57)
>>
>> at
>> org.tigris.subversion.subclipse.ui.repository.RepositoryMana ger.run(RepositoryManager.java:375)
>>
>> at
>> org.tigris.subversion.subclipse.ui.actions.SVNAction$1.run(S VNAction.java:226)
>>
>> at
>> org.tigris.subversion.subclipse.ui.actions.SVNAction$2.run(S VNAction.java:235)
>>
>> at
>> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
>> at
>> org.tigris.subversion.subclipse.ui.actions.SVNAction.run(SVN Action.java:232)
>>
>> at
>> org.tigris.subversion.subclipse.ui.actions.CompareWithRemote Action.execute(CompareWithRemoteAction.java:53)
>>
>> at
>> org.tigris.subversion.subclipse.ui.actions.SVNAction.run(SVN Action.java:56)
>>
>> at
>> org.eclipse.ui.actions.ActionDelegate.runWithEvent(ActionDel egate.java:70)
>>
>> at
>> org.eclipse.ui.internal.PluginAction.runWithEvent(PluginActi on.java:241)
>> at
>> org.eclipse.jface.action.ActionContributionItem.handleWidget Selection(ActionContributionItem.java:583)
>>
>> at
>> org.eclipse.jface.action.ActionContributionItem.access$2(Act ionContributionItem.java:500)
>>
>> at
>> org.eclipse.jface.action.ActionContributionItem$5.handleEven t(ActionContributionItem.java:411)
>>
>> at org.eclipse.swt.widgets.EventTable.sendEvent(EventTable.java :84)
>> at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1003)
>> at
>> org.eclipse.swt.widgets.Display.runDeferredEvents(Display.ja va:3823)
>> at org.eclipse.swt.widgets.Display.readAndDispatch(Display.java :3422)
>> at
>> org.eclipse.ui.internal.Workbench.runEventLoop(Workbench.jav a:2382)
>> at org.eclipse.ui.internal.Workbench.runUI(Workbench.java:2346)
>> at org.eclipse.ui.internal.Workbench.access$4(Workbench.java:21 98)
>> at org.eclipse.ui.internal.Workbench$5.run(Workbench.java:493)
>> at
>> org.eclipse.core.databinding.observable.Realm.runWithDefault (Realm.java:288)
>>
>> at
>> org.eclipse.ui.internal.Workbench.createAndRunWorkbench(Work bench.java:488)
>>
>> at
>> org.eclipse.ui.PlatformUI.createAndRunWorkbench(PlatformUI.j ava:149)
>> at
>> org.eclipse.ui.internal.ide.application.IDEApplication.start (IDEApplication.java:113)
>>
>> at
>> org.eclipse.equinox.internal.app.EclipseAppHandle.run(Eclips eAppHandle.java:193)
>>
>> at
>> org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher .runApplication(EclipseAppLauncher.java:110)
>>
>> at
>> org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher .start(EclipseAppLauncher.java:79)
>>
>> at
>> org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseS tarter.java:386)
>>
>> at
>> org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseS tarter.java:179)
>>
>> at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
>> at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source)
>> at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source)
>> at java.lang.reflect.Method.invoke(Unknown Source)
>> at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java: 549)
>> at org.eclipse.equinox.launcher.Main.basicRun(Main.java:504)
>> at org.eclipse.equinox.launcher.Main.run(Main.java:1236)
>>
>> !ENTRY org.eclipse.jface 4 2 2008-10-16 11:29:47.781
>> !MESSAGE Problems occurred when invoking code from plug-in:
>> "org.eclipse.jface".
>> !STACK 0
>> java.lang.NullPointerException
>> at
>> org.eclipse.emf.codegen.ecore.genmodel.impl.GenDataTypeImpl. getQualifiedInstanceClassName(GenDataTypeImpl.java:212)
>>
>> at
>> org.eclipse.emf.codegen.ecore.genmodel.provider.GenDataTypeI temProvider.getText(GenDataTypeItemProvider.java:120)
>>
>> at
>> org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider .getText(AdapterFactoryLabelProvider.java:374)
>>
>> at
>> org.eclipse.jface.viewers.WrappedViewerLabelProvider.getText (WrappedViewerLabelProvider.java:108)
>>
>> at
>> org.eclipse.jface.viewers.WrappedViewerLabelProvider.update( WrappedViewerLabelProvider.java:164)
>>
>> at
>> org.eclipse.jface.viewers.ViewerColumn.refresh(ViewerColumn. java:145)
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer.doUpdateItem(Ab stractTreeViewer.java:932)
>>
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer$UpdateItemSafeR unnable.run(AbstractTreeViewer.java:102)
>>
>> at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:37)
>> at org.eclipse.core.runtime.Platform.run(Platform.java:880)
>> at org.eclipse.ui.internal.JFaceUtil$1.run(JFaceUtil.java:48)
>> at org.eclipse.jface.util.SafeRunnable.run(SafeRunnable.java:17 5)
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer.doUpdateItem(Ab stractTreeViewer.java:1012)
>>
>> at
>> org.eclipse.jface.viewers.StructuredViewer$UpdateItemSafeRun nable.run(StructuredViewer.java:466)
>>
>> at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:37)
>> at org.eclipse.core.runtime.Platform.run(Platform.java:880)
>> at org.eclipse.ui.internal.JFaceUtil$1.run(JFaceUtil.java:48)
>> at org.eclipse.jface.util.SafeRunnable.run(SafeRunnable.java:17 5)
>> at
>> org.eclipse.jface.viewers.StructuredViewer.updateItem(Struct uredViewer.java:2041)
>>
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer.createTreeItem( AbstractTreeViewer.java:827)
>>
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer$1.run(AbstractT reeViewer.java:802)
>>
>> at
>> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer.createChildren( AbstractTreeViewer.java:776)
>>
>> at
>> org.eclipse.jface.viewers.TreeViewer.createChildren(TreeView er.java:634)
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer.internalExpandT oLevel(AbstractTreeViewer.java:1702)
>>
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer.internalExpandT oLevel(AbstractTreeViewer.java:1712)
>>
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer.internalExpandT oLevel(AbstractTreeViewer.java:1712)
>>
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer.expandToLevel(A bstractTreeViewer.java:1054)
>>
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer.expandToLevel(A bstractTreeViewer.java:1035)
>>
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer.expandAll(Abstr actTreeViewer.java:1024)
>>
>> at
>> org.eclipse.emf.compare.ui.viewer.content.part.diff.ModelCon tentMergeDiffTab.inputChanged(ModelContentMergeDiffTab.java: 364)
>>
>> at
>> org.eclipse.jface.viewers.ContentViewer.setInput(ContentView er.java:251)
>> at
>> org.eclipse.jface.viewers.StructuredViewer.setInput(Structur edViewer.java:1603)
>>
>> at
>> org.eclipse.emf.compare.ui.viewer.content.part.diff.ModelCon tentMergeDiffTab.setReflectiveInput(ModelContentMergeDiffTab .java:278)
>>
>> at
>> org.eclipse.emf.compare.ui.viewer.content.part.ModelContentM ergeTabFolder.setInput(ModelContentMergeTabFolder.java:310)
>>
>> at
>> org.eclipse.emf.compare.ui.viewer.content.ModelContentMergeV iewer.updateContent(ModelContentMergeViewer.java:675)
>>
>> at
>> org.eclipse.compare.contentmergeviewer.ContentMergeViewer.in ternalRefresh(ContentMergeViewer.java:715)
>>
>> at
>> org.eclipse.compare.contentmergeviewer.ContentMergeViewer.in putChanged(ContentMergeViewer.java:615)
>>
>> at
>> org.eclipse.jface.viewers.ContentViewer.setInput(ContentView er.java:251)
>> at
>> org.eclipse.emf.compare.ui.viewer.content.ModelContentMergeV iewer.setInput(ModelContentMergeViewer.java:281)
>>
>> at
>> org.eclipse.compare.CompareViewerSwitchingPane.setInput(Comp areViewerSwitchingPane.java:256)
>>
>> at
>> org.eclipse.compare.CompareEditorInput.internalSetContentPan eInput(CompareEditorInput.java:791)
>>
>> at
>> org.eclipse.compare.CompareEditorInput.access$7(CompareEdito rInput.java:789)
>>
>> at
>> org.eclipse.compare.CompareEditorInput$13.run(CompareEditorI nput.java:729)
>>
>> at
>> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
>> at
>> org.eclipse.compare.CompareEditorInput.feed1(CompareEditorIn put.java:723)
>> at
>> org.eclipse.compare.CompareEditorInput.feedInput(CompareEdit orInput.java:701)
>>
>> at
>> org.eclipse.compare.CompareEditorInput.createContents(Compar eEditorInput.java:524)
>>
>> at
>> org.eclipse.compare.internal.CompareEditor.createCompareCont rol(CompareEditor.java:415)
>>
>> at
>> org.eclipse.compare.internal.CompareEditor.createPartControl (CompareEditor.java:379)
>>
>> at
>> org.eclipse.ui.internal.EditorReference.createPartHelper(Edi torReference.java:661)
>>
>> at
>> org.eclipse.ui.internal.EditorReference.createPart(EditorRef erence.java:428)
>>
>> at
>> org.eclipse.ui.internal.WorkbenchPartReference.getPart(Workb enchPartReference.java:594)
>>
>> at
>> org.eclipse.ui.internal.EditorReference.getEditor(EditorRefe rence.java:266)
>>
>> at
>> org.eclipse.ui.internal.WorkbenchPage.busyOpenEditorBatched( WorkbenchPage.java:2820)
>>
>> at
>> org.eclipse.ui.internal.WorkbenchPage.busyOpenEditor(Workben chPage.java:2729)
>>
>> at
>> org.eclipse.ui.internal.WorkbenchPage.access$11(WorkbenchPag e.java:2721)
>> at
>> org.eclipse.ui.internal.WorkbenchPage$10.run(WorkbenchPage.j ava:2673)
>> at
>> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
>> at
>> org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPa ge.java:2668)
>> at
>> org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPa ge.java:2652)
>> at
>> org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPa ge.java:2635)
>> at
>> org.eclipse.compare.internal.CompareUIPlugin$1.run(CompareUI Plugin.java:454)
>>
>> at
>> org.eclipse.compare.internal.CompareUIPlugin.syncExec(Compar eUIPlugin.java:1171)
>>
>> at
>> org.eclipse.compare.internal.CompareUIPlugin.internalOpenEdi tor(CompareUIPlugin.java:465)
>>
>> at
>> org.eclipse.compare.internal.CompareUIPlugin.openCompareEdit or(CompareUIPlugin.java:429)
>>
>> at
>> org.eclipse.compare.CompareUI.openCompareEditorOnPage(Compar eUI.java:135)
>> at
>> org.tigris.subversion.subclipse.ui.actions.CompareWithRemote Action$1.run(CompareWithRemoteAction.java:57)
>>
>> at
>> org.tigris.subversion.subclipse.ui.repository.RepositoryMana ger.run(RepositoryManager.java:375)
>>
>> at
>> org.tigris.subversion.subclipse.ui.actions.SVNAction$1.run(S VNAction.java:226)
>>
>> at
>> org.tigris.subversion.subclipse.ui.actions.SVNAction$2.run(S VNAction.java:235)
>>
>> at
>> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
>> at
>> org.tigris.subversion.subclipse.ui.actions.SVNAction.run(SVN Action.java:232)
>>
>> at
>> org.tigris.subversion.subclipse.ui.actions.CompareWithRemote Action.execute(CompareWithRemoteAction.java:53)
>>
>> at
>> org.tigris.subversion.subclipse.ui.actions.SVNAction.run(SVN Action.java:56)
>>
>> at
>> org.eclipse.ui.actions.ActionDelegate.runWithEvent(ActionDel egate.java:70)
>>
>> at
>> org.eclipse.ui.internal.PluginAction.runWithEvent(PluginActi on.java:241)
>> at
>> org.eclipse.jface.action.ActionContributionItem.handleWidget Selection(ActionContributionItem.java:583)
>>
>> at
>> org.eclipse.jface.action.ActionContributionItem.access$2(Act ionContributionItem.java:500)
>>
>> at
>> org.eclipse.jface.action.ActionContributionItem$5.handleEven t(ActionContributionItem.java:411)
>>
>> at org.eclipse.swt.widgets.EventTable.sendEvent(EventTable.java :84)
>> at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1003)
>> at
>> org.eclipse.swt.widgets.Display.runDeferredEvents(Display.ja va:3823)
>> at org.eclipse.swt.widgets.Display.readAndDispatch(Display.java :3422)
>> at
>> org.eclipse.ui.internal.Workbench.runEventLoop(Workbench.jav a:2382)
>> at org.eclipse.ui.internal.Workbench.runUI(Workbench.java:2346)
>> at org.eclipse.ui.internal.Workbench.access$4(Workbench.java:21 98)
>> at org.eclipse.ui.internal.Workbench$5.run(Workbench.java:493)
>> at
>> org.eclipse.core.databinding.observable.Realm.runWithDefault (Realm.java:288)
>>
>> at
>> org.eclipse.ui.internal.Workbench.createAndRunWorkbench(Work bench.java:488)
>>
>> at
>> org.eclipse.ui.PlatformUI.createAndRunWorkbench(PlatformUI.j ava:149)
>> at
>> org.eclipse.ui.internal.ide.application.IDEApplication.start (IDEApplication.java:113)
>>
>> at
>> org.eclipse.equinox.internal.app.EclipseAppHandle.run(Eclips eAppHandle.java:193)
>>
>> at
>> org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher .runApplication(EclipseAppLauncher.java:110)
>>
>> at
>> org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher .start(EclipseAppLauncher.java:79)
>>
>> at
>> org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseS tarter.java:386)
>>
>> at
>> org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseS tarter.java:179)
>>
>> at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
>> at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source)
>> at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source)
>> at java.lang.reflect.Method.invoke(Unknown Source)
>> at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java: 549)
>> at org.eclipse.equinox.launcher.Main.basicRun(Main.java:504)
>> at org.eclipse.equinox.launcher.Main.run(Main.java:1236)
>>
>>
>>
>> Cédric Brun wrote:
>>> Hi Marco,
>>>
>>> EMF compare is, indeed, already integrated with Subversion if you're
>>> using a an plugin providing Eclipse integration with Subversion (aka
>>> Subversive or Subclipse). That means for instance that comparing
>>> models with the team repository should trigger EMF Compare.
>>>
>>> We even have a specific plugin for Subversive correcting a few issues
>>> we had at some time but as we are not sure yet if it's an issue from
>>> our side or from the subversive implementation we did not build this
>>> plugin yet and it's only available on the Eclipse modeling CVS.
>>>
>>> Anyway installing an SVN plugin + EMF compare should work fine,
>>> please tell us if you encounter issues.
>>> Cédric
>>>
>>> Marco wrote:
>>>
>>>> Hi! I got a question and it would be great if anyone could help me out
>>>> with this one: Is there a way to use EMF Compare as differencing and
>>>> merge
>>>> tool in subversion? I did not find anything in the web, yet. I'm
>>>> wondering
>>>> if this would be useful (this is what I think) and if so, I'm
>>>> looking for
>>>> an existing integration.
>>>
--------------040202060309030609060007
Content-Type: text/x-vcard; charset=utf-8;
name="laurent_goubet.vcf"
Content-Transfer-Encoding: base64
Content-Disposition: attachment;
filename="laurent_goubet.vcf"
YmVnaW46dmNhcmQNCmZuOkxhdXJlbnQgR291YmV0DQpuOkdvdWJldDtMYXVy ZW50DQpvcmc6
PGEgaHJlZj0iaHR0cDovL3d3dy5vYmVvLmZyLyI+T2JlbzwvYT4NCmVtYWls O2ludGVybmV0
OmxhdXJlbnQuZ291YmV0QG9iZW8uZnINCnVybDpodHRwOi8vd3d3Lm9iZW8u ZnINCnZlcnNp
b246Mi4xDQplbmQ6dmNhcmQNCg0K
--------------040202060309030609060007--
|
|
|
| Re: Integrate EMF Compare in Subversion [message #130354 is a reply to message #130267] |
Mon, 20 October 2008 19:14 |
| Eclipse User |
|
|
|
Originally posted by: sramasamy.ifmc.sdps.org
Logged bug
https://bugs.eclipse.org/bugs/show_bug.cgi?id=251456
Thanks
-sud
laurent Goubet wrote:
> Hi Sudhakar,
>
> We've has many issues with the genmodel comparison ... something must be
> wrong in the way we load it. Can you fill a bug with your stack trace so
> that we remember this has to be fixed?
>
> Laurent Goubet
> Obeo
>
> Sudhakar a écrit :
>> I just noticed that this bug occurs when you compare a genmodel file
>> even with it's local history. So this may rule out any issue with
>> Suversion/Subclipe and place the issue in the Eclipse file versioning
>> code. This is verified on Eclipse 3.4.1
>>
>> -sud
>>
>> Sudhakar wrote:
>>> I've verified that EMF Compare works when comparing workspace .ecore
>>> files against those stored in subversion.
>>>
>>> But when I attempt to compare a workspace .genmodel file against that
>>> in subversion I get several NPE. I'm using subclipse 1.4.5 with EMF
>>> Compare 0.8.1. If I compare the two .genmodel files stored in my
>>> workspace I don't get these NPEs.
>>>
>>>
>>> Here is the stack trace:
>>>
>>> !ENTRY org.eclipse.jface 4 2 2008-10-16 11:29:47.484
>>> !MESSAGE Problems occurred when invoking code from plug-in:
>>> "org.eclipse.jface".
>>> !STACK 0
>>> java.lang.NullPointerException
>>> at
>>> org.eclipse.emf.codegen.ecore.genmodel.impl.GenDataTypeImpl. getQualifiedInstanceClassName(GenDataTypeImpl.java:212)
>>>
>>> at
>>> org.eclipse.emf.codegen.ecore.genmodel.provider.GenDataTypeI temProvider.getText(GenDataTypeItemProvider.java:120)
>>>
>>> at
>>> org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider .getText(AdapterFactoryLabelProvider.java:374)
>>>
>>> at
>>> org.eclipse.jface.viewers.WrappedViewerLabelProvider.getText (WrappedViewerLabelProvider.java:108)
>>>
>>> at
>>> org.eclipse.jface.viewers.WrappedViewerLabelProvider.update( WrappedViewerLabelProvider.java:164)
>>>
>>> at
>>> org.eclipse.jface.viewers.ViewerColumn.refresh(ViewerColumn. java:145)
>>> at
>>> org.eclipse.jface.viewers.AbstractTreeViewer.doUpdateItem(Ab stractTreeViewer.java:932)
>>>
>>> at
>>> org.eclipse.jface.viewers.AbstractTreeViewer$UpdateItemSafeR unnable.run(AbstractTreeViewer.java:102)
>>>
>>> at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:37)
>>> at org.eclipse.core.runtime.Platform.run(Platform.java:880)
>>> at org.eclipse.ui.internal.JFaceUtil$1.run(JFaceUtil.java:48)
>>> at org.eclipse.jface.util.SafeRunnable.run(SafeRunnable.java:17 5)
>>> at
>>> org.eclipse.jface.viewers.AbstractTreeViewer.doUpdateItem(Ab stractTreeViewer.java:1012)
>>>
>>> at
>>> org.eclipse.jface.viewers.StructuredViewer$UpdateItemSafeRun nable.run(StructuredViewer.java:466)
>>>
>>> at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:37)
>>> at org.eclipse.core.runtime.Platform.run(Platform.java:880)
>>> at org.eclipse.ui.internal.JFaceUtil$1.run(JFaceUtil.java:48)
>>> at org.eclipse.jface.util.SafeRunnable.run(SafeRunnable.java:17 5)
>>> at
>>> org.eclipse.jface.viewers.StructuredViewer.updateItem(Struct uredViewer.java:2041)
>>>
>>> at
>>> org.eclipse.jface.viewers.AbstractTreeViewer.createTreeItem( AbstractTreeViewer.java:827)
>>>
>>> at
>>> org.eclipse.jface.viewers.AbstractTreeViewer$1.run(AbstractT reeViewer.java:802)
>>>
>>> at
>>> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
>>> at
>>> org.eclipse.jface.viewers.AbstractTreeViewer.createChildren( AbstractTreeViewer.java:776)
>>>
>>> at
>>> org.eclipse.jface.viewers.TreeViewer.createChildren(TreeView er.java:634)
>>> at
>>> org.eclipse.jface.viewers.AbstractTreeViewer.internalExpandT oLevel(AbstractTreeViewer.java:1702)
>>>
>>> at
>>> org.eclipse.jface.viewers.AbstractTreeViewer.internalExpandT oLevel(AbstractTreeViewer.java:1712)
>>>
>>> at
>>> org.eclipse.jface.viewers.AbstractTreeViewer.internalExpandT oLevel(AbstractTreeViewer.java:1712)
>>>
>>> at
>>> org.eclipse.jface.viewers.AbstractTreeViewer.expandToLevel(A bstractTreeViewer.java:1054)
>>>
>>> at
>>> org.eclipse.jface.viewers.AbstractTreeViewer.expandToLevel(A bstractTreeViewer.java:1035)
>>>
>>> at
>>> org.eclipse.jface.viewers.AbstractTreeViewer.expandAll(Abstr actTreeViewer.java:1024)
>>>
>>> at
>>> org.eclipse.emf.compare.ui.viewer.content.part.diff.ModelCon tentMergeDiffTab.inputChanged(ModelContentMergeDiffTab.java: 364)
>>>
>>> at
>>> org.eclipse.jface.viewers.ContentViewer.setInput(ContentView er.java:251)
>>> at
>>> org.eclipse.jface.viewers.StructuredViewer.setInput(Structur edViewer.java:1603)
>>>
>>> at
>>> org.eclipse.emf.compare.ui.viewer.content.part.diff.ModelCon tentMergeDiffTab.setReflectiveInput(ModelContentMergeDiffTab .java:278)
>>>
>>> at
>>> org.eclipse.emf.compare.ui.viewer.content.part.ModelContentM ergeTabFolder.setInput(ModelContentMergeTabFolder.java:310)
>>>
>>> at
>>> org.eclipse.emf.compare.ui.viewer.content.ModelContentMergeV iewer.updateContent(ModelContentMergeViewer.java:675)
>>>
>>> at
>>> org.eclipse.compare.contentmergeviewer.ContentMergeViewer.in ternalRefresh(ContentMergeViewer.java:715)
>>>
>>> at
>>> org.eclipse.compare.contentmergeviewer.ContentMergeViewer.in putChanged(ContentMergeViewer.java:615)
>>>
>>> at
>>> org.eclipse.jface.viewers.ContentViewer.setInput(ContentView er.java:251)
>>> at
>>> org.eclipse.emf.compare.ui.viewer.content.ModelContentMergeV iewer.setInput(ModelContentMergeViewer.java:281)
>>>
>>> at
>>> org.eclipse.compare.CompareViewerSwitchingPane.setInput(Comp areViewerSwitchingPane.java:256)
>>>
>>> at
>>> org.eclipse.compare.CompareEditorInput.internalSetContentPan eInput(CompareEditorInput.java:791)
>>>
>>> at
>>> org.eclipse.compare.CompareEditorInput.access$7(CompareEdito rInput.java:789)
>>>
>>> at
>>> org.eclipse.compare.CompareEditorInput$13.run(CompareEditorI nput.java:729)
>>>
>>> at
>>> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
>>> at
>>> org.eclipse.compare.CompareEditorInput.feed1(CompareEditorIn put.java:723)
>>>
>>> at
>>> org.eclipse.compare.CompareEditorInput.feedInput(CompareEdit orInput.java:701)
>>>
>>> at
>>> org.eclipse.compare.CompareEditorInput.createContents(Compar eEditorInput.java:524)
>>>
>>> at
>>> org.eclipse.compare.internal.CompareEditor.createCompareCont rol(CompareEditor.java:415)
>>>
>>> at
>>> org.eclipse.compare.internal.CompareEditor.createPartControl (CompareEditor.java:379)
>>>
>>> at
>>> org.eclipse.ui.internal.EditorReference.createPartHelper(Edi torReference.java:661)
>>>
>>> at
>>> org.eclipse.ui.internal.EditorReference.createPart(EditorRef erence.java:428)
>>>
>>> at
>>> org.eclipse.ui.internal.WorkbenchPartReference.getPart(Workb enchPartReference.java:594)
>>>
>>> at
>>> org.eclipse.ui.internal.EditorReference.getEditor(EditorRefe rence.java:266)
>>>
>>> at
>>> org.eclipse.ui.internal.WorkbenchPage.busyOpenEditorBatched( WorkbenchPage.java:2820)
>>>
>>> at
>>> org.eclipse.ui.internal.WorkbenchPage.busyOpenEditor(Workben chPage.java:2729)
>>>
>>> at
>>> org.eclipse.ui.internal.WorkbenchPage.access$11(WorkbenchPag e.java:2721)
>>> at
>>> org.eclipse.ui.internal.WorkbenchPage$10.run(WorkbenchPage.j ava:2673)
>>> at
>>> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
>>> at
>>> org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPa ge.java:2668)
>>>
>>> at
>>> org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPa ge.java:2652)
>>>
>>> at
>>> org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPa ge.java:2635)
>>>
>>> at
>>> org.eclipse.compare.internal.CompareUIPlugin$1.run(CompareUI Plugin.java:454)
>>>
>>> at
>>> org.eclipse.compare.internal.CompareUIPlugin.syncExec(Compar eUIPlugin.java:1171)
>>>
>>> at
>>> org.eclipse.compare.internal.CompareUIPlugin.internalOpenEdi tor(CompareUIPlugin.java:465)
>>>
>>> at
>>> org.eclipse.compare.internal.CompareUIPlugin.openCompareEdit or(CompareUIPlugin.java:429)
>>>
>>> at
>>> org.eclipse.compare.CompareUI.openCompareEditorOnPage(Compar eUI.java:135)
>>>
>>> at
>>> org.tigris.subversion.subclipse.ui.actions.CompareWithRemote Action$1.run(CompareWithRemoteAction.java:57)
>>>
>>> at
>>> org.tigris.subversion.subclipse.ui.repository.RepositoryMana ger.run(RepositoryManager.java:375)
>>>
>>> at
>>> org.tigris.subversion.subclipse.ui.actions.SVNAction$1.run(S VNAction.java:226)
>>>
>>> at
>>> org.tigris.subversion.subclipse.ui.actions.SVNAction$2.run(S VNAction.java:235)
>>>
>>> at
>>> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
>>> at
>>> org.tigris.subversion.subclipse.ui.actions.SVNAction.run(SVN Action.java:232)
>>>
>>> at
>>> org.tigris.subversion.subclipse.ui.actions.CompareWithRemote Action.execute(CompareWithRemoteAction.java:53)
>>>
>>> at
>>> org.tigris.subversion.subclipse.ui.actions.SVNAction.run(SVN Action.java:56)
>>>
>>> at
>>> org.eclipse.ui.actions.ActionDelegate.runWithEvent(ActionDel egate.java:70)
>>>
>>> at
>>> org.eclipse.ui.internal.PluginAction.runWithEvent(PluginActi on.java:241)
>>> at
>>> org.eclipse.jface.action.ActionContributionItem.handleWidget Selection(ActionContributionItem.java:583)
>>>
>>> at
>>> org.eclipse.jface.action.ActionContributionItem.access$2(Act ionContributionItem.java:500)
>>>
>>> at
>>> org.eclipse.jface.action.ActionContributionItem$5.handleEven t(ActionContributionItem.java:411)
>>>
>>> at org.eclipse.swt.widgets.EventTable.sendEvent(EventTable.java :84)
>>> at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1003)
>>> at
>>> org.eclipse.swt.widgets.Display.runDeferredEvents(Display.ja va:3823)
>>> at
>>> org.eclipse.swt.widgets.Display.readAndDispatch(Display.java :3422)
>>> at
>>> org.eclipse.ui.internal.Workbench.runEventLoop(Workbench.jav a:2382)
>>> at org.eclipse.ui.internal.Workbench.runUI(Workbench.java:2346)
>>> at org.eclipse.ui.internal.Workbench.access$4(Workbench.java:21 98)
>>> at org.eclipse.ui.internal.Workbench$5.run(Workbench.java:493)
>>> at
>>> org.eclipse.core.databinding.observable.Realm.runWithDefault (Realm.java:288)
>>>
>>> at
>>> org.eclipse.ui.internal.Workbench.createAndRunWorkbench(Work bench.java:488)
>>>
>>> at
>>> org.eclipse.ui.PlatformUI.createAndRunWorkbench(PlatformUI.j ava:149)
>>> at
>>> org.eclipse.ui.internal.ide.application.IDEApplication.start (IDEApplication.java:113)
>>>
>>> at
>>> org.eclipse.equinox.internal.app.EclipseAppHandle.run(Eclips eAppHandle.java:193)
>>>
>>> at
>>> org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher .runApplication(EclipseAppLauncher.java:110)
>>>
>>> at
>>> org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher .start(EclipseAppLauncher.java:79)
>>>
>>> at
>>> org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseS tarter.java:386)
>>>
>>> at
>>> org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseS tarter.java:179)
>>>
>>> at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
>>> at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source)
>>> at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source)
>>> at java.lang.reflect.Method.invoke(Unknown Source)
>>> at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java: 549)
>>> at org.eclipse.equinox.launcher.Main.basicRun(Main.java:504)
>>> at org.eclipse.equinox.launcher.Main.run(Main.java:1236)
>>>
>>> !ENTRY org.eclipse.jface 4 2 2008-10-16 11:29:47.703
>>> !MESSAGE Problems occurred when invoking code from plug-in:
>>> "org.eclipse.jface".
>>> !STACK 0
>>> java.lang.NullPointerException
>>> at
>>> org.eclipse.emf.codegen.ecore.genmodel.impl.GenDataTypeImpl. getQualifiedInstanceClassName(GenDataTypeImpl.java:212)
>>>
>>> at
>>> org.eclipse.emf.codegen.ecore.genmodel.provider.GenDataTypeI temProvider.getText(GenDataTypeItemProvider.java:120)
>>>
>>> at
>>> org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider .getText(AdapterFactoryLabelProvider.java:374)
>>>
>>> at
>>> org.eclipse.jface.viewers.WrappedViewerLabelProvider.getText (WrappedViewerLabelProvider.java:108)
>>>
>>> at
>>> org.eclipse.jface.viewers.WrappedViewerLabelProvider.update( WrappedViewerLabelProvider.java:164)
>>>
>>> at
>>> org.eclipse.jface.viewers.ViewerColumn.refresh(ViewerColumn. java:145)
>>> at
>>> org.eclipse.jface.viewers.AbstractTreeViewer.doUpdateItem(Ab stractTreeViewer.java:932)
>>>
>>> at
>>> org.eclipse.jface.viewers.AbstractTreeViewer$UpdateItemSafeR unnable.run(AbstractTreeViewer.java:102)
>>>
>>> at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:37)
>>> at org.eclipse.core.runtime.Platform.run(Platform.java:880)
>>> at org.eclipse.ui.internal.JFaceUtil$1.run(JFaceUtil.java:48)
>>> at org.eclipse.jface.util.SafeRunnable.run(SafeRunnable.java:17 5)
>>> at
>>> org.eclipse.jface.viewers.AbstractTreeViewer.doUpdateItem(Ab stractTreeViewer.java:1012)
>>>
>>> at
>>> org.eclipse.jface.viewers.StructuredViewer$UpdateItemSafeRun nable.run(StructuredViewer.java:466)
>>>
>>> at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:37)
>>> at org.eclipse.core.runtime.Platform.run(Platform.java:880)
>>> at org.eclipse.ui.internal.JFaceUtil$1.run(JFaceUtil.java:48)
>>> at org.eclipse.jface.util.SafeRunnable.run(SafeRunnable.java:17 5)
>>> at
>>> org.eclipse.jface.viewers.StructuredViewer.updateItem(Struct uredViewer.java:2041)
>>>
>>> at
>>> org.eclipse.jface.viewers.AbstractTreeViewer.createTreeItem( AbstractTreeViewer.java:827)
>>>
>>> at
>>> org.eclipse.jface.viewers.AbstractTreeViewer$1.run(AbstractT reeViewer.java:802)
>>>
>>> at
>>> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
>>> at
>>> org.eclipse.jface.viewers.AbstractTreeViewer.createChildren( AbstractTreeViewer.java:776)
>>>
>>> at
>>> org.eclipse.jface.viewers.TreeViewer.createChildren(TreeView er.java:634)
>>> at
>>> org.eclipse.jface.viewers.AbstractTreeViewer.internalExpandT oLevel(AbstractTreeViewer.java:1702)
>>>
>>> at
>>> org.eclipse.jface.viewers.AbstractTreeViewer.internalExpandT oLevel(AbstractTreeViewer.java:1712)
>>>
>>> at
>>> org.eclipse.jface.viewers.AbstractTreeViewer.internalExpandT oLevel(AbstractTreeViewer.java:1712)
>>>
>>> at
>>> org.eclipse.jface.viewers.AbstractTreeViewer.expandToLevel(A bstractTreeViewer.java:1054)
>>>
>>> at
>>> org.eclipse.jface.viewers.AbstractTreeViewer.expandToLevel(A bstractTreeViewer.java:1035)
>>>
>>> at
>>> org.eclipse.jface.viewers.AbstractTreeViewer.expandAll(Abstr actTreeViewer.java:1024)
>>>
>>> at
>>> org.eclipse.emf.compare.ui.viewer.content.part.diff.ModelCon tentMergeDiffTab.inputChanged(ModelContentMergeDiffTab.java: 364)
>>>
>>> at
>>> org.eclipse.jface.viewers.ContentViewer.setInput(ContentView er.java:251)
>>> at
>>> org.eclipse.jface.viewers.StructuredViewer.setInput(Structur edViewer.java:1603)
>>>
>>> at
>>> org.eclipse.emf.compare.ui.viewer.content.part.diff.ModelCon tentMergeDiffTab.setReflectiveInput(ModelContentMergeDiffTab .java:278)
>>>
>>> at
>>> org.eclipse.emf.compare.ui.viewer.content.part.ModelContentM ergeTabFolder.setInput(ModelContentMergeTabFolder.java:310)
>>>
>>> at
>>> org.eclipse.emf.compare.ui.viewer.content.ModelContentMergeV iewer.updateContent(ModelContentMergeViewer.java:675)
>>>
>>> at
>>> org.eclipse.compare.contentmergeviewer.ContentMergeViewer.in ternalRefresh(ContentMergeViewer.java:715)
>>>
>>> at
>>> org.eclipse.compare.contentmergeviewer.ContentMergeViewer.in putChanged(ContentMergeViewer.java:615)
>>>
>>> at
>>> org.eclipse.jface.viewers.ContentViewer.setInput(ContentView er.java:251)
>>> at
>>> org.eclipse.emf.compare.ui.viewer.content.ModelContentMergeV iewer.setInput(ModelContentMergeViewer.java:281)
>>>
>>> at
>>> org.eclipse.compare.CompareViewerSwitchingPane.setInput(Comp areViewerSwitchingPane.java:256)
>>>
>>> at
>>> org.eclipse.compare.CompareEditorInput.internalSetContentPan eInput(CompareEditorInput.java:791)
>>>
>>> at
>>> org.eclipse.compare.CompareEditorInput.access$7(CompareEdito rInput.java:789)
>>>
>>> at
>>> org.eclipse.compare.CompareEditorInput$13.run(CompareEditorI nput.java:729)
>>>
>>> at
>>> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
>>> at
>>> org.eclipse.compare.CompareEditorInput.feed1(CompareEditorIn put.java:723)
>>>
>>> at
>>> org.eclipse.compare.CompareEditorInput.feedInput(CompareEdit orInput.java:701)
>>>
>>> at
>>> org.eclipse.compare.CompareEditorInput.createContents(Compar eEditorInput.java:524)
>>>
>>> at
>>> org.eclipse.compare.internal.CompareEditor.createCompareCont rol(CompareEditor.java:415)
>>>
>>> at
>>> org.eclipse.compare.internal.CompareEditor.createPartControl (CompareEditor.java:379)
>>>
>>> at
>>> org.eclipse.ui.internal.EditorReference.createPartHelper(Edi torReference.java:661)
>>>
>>> at
>>> org.eclipse.ui.internal.EditorReference.createPart(EditorRef erence.java:428)
>>>
>>> at
>>> org.eclipse.ui.internal.WorkbenchPartReference.getPart(Workb enchPartReference.java:594)
>>>
>>> at
>>> org.eclipse.ui.internal.EditorReference.getEditor(EditorRefe rence.java:266)
>>>
>>> at
>>> org.eclipse.ui.internal.WorkbenchPage.busyOpenEditorBatched( WorkbenchPage.java:2820)
>>>
>>> at
>>> org.eclipse.ui.internal.WorkbenchPage.busyOpenEditor(Workben chPage.java:2729)
>>>
>>> at
>>> org.eclipse.ui.internal.WorkbenchPage.access$11(WorkbenchPag e.java:2721)
>>> at
>>> org.eclipse.ui.internal.WorkbenchPage$10.run(WorkbenchPage.j ava:2673)
>>> at
>>> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
>>> at
>>> org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPa ge.java:2668)
>>>
>>> at
>>> org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPa ge.java:2652)
>>>
>>> at
>>> org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPa ge.java:2635)
>>>
>>> at
>>> org.eclipse.compare.internal.CompareUIPlugin$1.run(CompareUI Plugin.java:454)
>>>
>>> at
>>> org.eclipse.compare.internal.CompareUIPlugin.syncExec(Compar eUIPlugin.java:1171)
>>>
>>> at
>>> org.eclipse.compare.internal.CompareUIPlugin.internalOpenEdi tor(CompareUIPlugin.java:465)
>>>
>>> at
>>> org.eclipse.compare.internal.CompareUIPlugin.openCompareEdit or(CompareUIPlugin.java:429)
>>>
>>> at
>>> org.eclipse.compare.CompareUI.openCompareEditorOnPage(Compar eUI.java:135)
>>>
>>> at
>>> org.tigris.subversion.subclipse.ui.actions.CompareWithRemote Action$1.run(CompareWithRemoteAction.java:57)
>>>
>>> at
>>> org.tigris.subversion.subclipse.ui.repository.RepositoryMana ger.run(RepositoryManager.java:375)
>>>
>>> at
>>> org.tigris.subversion.subclipse.ui.actions.SVNAction$1.run(S VNAction.java:226)
>>>
>>> at
>>> org.tigris.subversion.subclipse.ui.actions.SVNAction$2.run(S VNAction.java:235)
>>>
>>> at
>>> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
>>> at
>>> org.tigris.subversion.subclipse.ui.actions.SVNAction.run(SVN Action.java:232)
>>>
>>> at
>>> org.tigris.subversion.subclipse.ui.actions.CompareWithRemote Action.execute(CompareWithRemoteAction.java:53)
>>>
>>> at
>>> org.tigris.subversion.subclipse.ui.actions.SVNAction.run(SVN Action.java:56)
>>>
>>> at
>>> org.eclipse.ui.actions.ActionDelegate.runWithEvent(ActionDel egate.java:70)
>>>
>>> at
>>> org.eclipse.ui.internal.PluginAction.runWithEvent(PluginActi on.java:241)
>>> at
>>> org.eclipse.jface.action.ActionContributionItem.handleWidget Selection(ActionContributionItem.java:583)
>>>
>>> at
>>> org.eclipse.jface.action.ActionContributionItem.access$2(Act ionContributionItem.java:500)
>>>
>>> at
>>> org.eclipse.jface.action.ActionContributionItem$5.handleEven t(ActionContributionItem.java:411)
>>>
>>> at org.eclipse.swt.widgets.EventTable.sendEvent(EventTable.java :84)
>>> at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1003)
>>> at
>>> org.eclipse.swt.widgets.Display.runDeferredEvents(Display.ja va:3823)
>>> at
>>> org.eclipse.swt.widgets.Display.readAndDispatch(Display.java :3422)
>>> at
>>> org.eclipse.ui.internal.Workbench.runEventLoop(Workbench.jav a:2382)
>>> at org.eclipse.ui.internal.Workbench.runUI(Workbench.java:2346)
>>> at org.eclipse.ui.internal.Workbench.access$4(Workbench.java:21 98)
>>> at org.eclipse.ui.internal.Workbench$5.run(Workbench.java:493)
>>> at
>>> org.eclipse.core.databinding.observable.Realm.runWithDefault (Realm.java:288)
>>>
>>> at
>>> org.eclipse.ui.internal.Workbench.createAndRunWorkbench(Work bench.java:488)
>>>
>>> at
>>> org.eclipse.ui.PlatformUI.createAndRunWorkbench(PlatformUI.j ava:149)
>>> at
>>> org.eclipse.ui.internal.ide.application.IDEApplication.start (IDEApplication.java:113)
>>>
>>> at
>>> org.eclipse.equinox.internal.app.EclipseAppHandle.run(Eclips eAppHandle.java:193)
>>>
>>> at
>>> org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher .runApplication(EclipseAppLauncher.java:110)
>>>
>>> at
>>> org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher .start(EclipseAppLauncher.java:79)
>>>
>>> at
>>> org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseS tarter.java:386)
>>>
>>> at
>>> org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseS tarter.java:179)
>>>
>>> at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
>>> at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source)
>>> at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source)
>>> at java.lang.reflect.Method.invoke(Unknown Source)
>>> at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java: 549)
>>> at org.eclipse.equinox.launcher.Main.basicRun(Main.java:504)
>>> at org.eclipse.equinox.launcher.Main.run(Main.java:1236)
>>>
>>> !ENTRY org.eclipse.jface 4 2 2008-10-16 11:29:47.781
>>> !MESSAGE Problems occurred when invoking code from plug-in:
>>> "org.eclipse.jface".
>>> !STACK 0
>>> java.lang.NullPointerException
>>> at
>>> org.eclipse.emf.codegen.ecore.genmodel.impl.GenDataTypeImpl. getQualifiedInstanceClassName(GenDataTypeImpl.java:212)
>>>
>>> at
>>> org.eclipse.emf.codegen.ecore.genmodel.provider.GenDataTypeI temProvider.getText(GenDataTypeItemProvider.java:120)
>>>
>>> at
>>> org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider .getText(AdapterFactoryLabelProvider.java:374)
>>>
>>> at
>>> org.eclipse.jface.viewers.WrappedViewerLabelProvider.getText (WrappedViewerLabelProvider.java:108)
>>>
>>> at
>>> org.eclipse.jface.viewers.WrappedViewerLabelProvider.update( WrappedViewerLabelProvider.java:164)
>>>
>>> at
>>> org.eclipse.jface.viewers.ViewerColumn.refresh(ViewerColumn. java:145)
>>> at
>>> org.eclipse.jface.viewers.AbstractTreeViewer.doUpdateItem(Ab stractTreeViewer.java:932)
>>>
>>> at
>>> org.eclipse.jface.viewers.AbstractTreeViewer$UpdateItemSafeR unnable.run(AbstractTreeViewer.java:102)
>>>
>>> at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:37)
>>> at org.eclipse.core.runtime.Platform.run(Platform.java:880)
>>> at org.eclipse.ui.internal.JFaceUtil$1.run(JFaceUtil.java:48)
>>> at org.eclipse.jface.util.SafeRunnable.run(SafeRunnable.java:17 5)
>>> at
>>> org.eclipse.jface.viewers.AbstractTreeViewer.doUpdateItem(Ab stractTreeViewer.java:1012)
>>>
>>> at
>>> org.eclipse.jface.viewers.StructuredViewer$UpdateItemSafeRun nable.run(StructuredViewer.java:466)
>>>
>>> at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:37)
>>> at org.eclipse.core.runtime.Platform.run(Platform.java:880)
>>> at org.eclipse.ui.internal.JFaceUtil$1.run(JFaceUtil.java:48)
>>> at org.eclipse.jface.util.SafeRunnable.run(SafeRunnable.java:17 5)
>>> at
>>> org.eclipse.jface.viewers.StructuredViewer.updateItem(Struct uredViewer.java:2041)
>>>
>>> at
>>> org.eclipse.jface.viewers.AbstractTreeViewer.createTreeItem( AbstractTreeViewer.java:827)
>>>
>>> at
>>> org.eclipse.jface.viewers.AbstractTreeViewer$1.run(AbstractT reeViewer.java:802)
>>>
>>> at
>>> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
>>> at
>>> org.eclipse.jface.viewers.AbstractTreeViewer.createChildren( AbstractTreeViewer.java:776)
>>>
>>> at
>>> org.eclipse.jface.viewers.TreeViewer.createChildren(TreeView er.java:634)
>>> at
>>> org.eclipse.jface.viewers.AbstractTreeViewer.internalExpandT oLevel(AbstractTreeViewer.java:1702)
>>>
>>> at
>>> org.eclipse.jface.viewers.AbstractTreeViewer.internalExpandT oLevel(AbstractTreeViewer.java:1712)
>>>
>>> at
>>> org.eclipse.jface.viewers.AbstractTreeViewer.internalExpandT oLevel(AbstractTreeViewer.java:1712)
>>>
>>> at
>>> org.eclipse.jface.viewers.AbstractTreeViewer.expandToLevel(A bstractTreeViewer.java:1054)
>>>
>>> at
>>> org.eclipse.jface.viewers.AbstractTreeViewer.expandToLevel(A bstractTreeViewer.java:1035)
>>>
>>> at
>>> org.eclipse.jface.viewers.AbstractTreeViewer.expandAll(Abstr actTreeViewer.java:1024)
>>>
>>> at
>>> org.eclipse.emf.compare.ui.viewer.content.part.diff.ModelCon tentMergeDiffTab.inputChanged(ModelContentMergeDiffTab.java: 364)
>>>
>>> at
>>> org.eclipse.jface.viewers.ContentViewer.setInput(ContentView er.java:251)
>>> at
>>> org.eclipse.jface.viewers.StructuredViewer.setInput(Structur edViewer.java:1603)
>>>
>>> at
>>> org.eclipse.emf.compare.ui.viewer.content.part.diff.ModelCon tentMergeDiffTab.setReflectiveInput(ModelContentMergeDiffTab .java:278)
>>>
>>> at
>>> org.eclipse.emf.compare.ui.viewer.content.part.ModelContentM ergeTabFolder.setInput(ModelContentMergeTabFolder.java:310)
>>>
>>> at
>>> org.eclipse.emf.compare.ui.viewer.content.ModelContentMergeV iewer.updateContent(ModelContentMergeViewer.java:675)
>>>
>>> at
>>> org.eclipse.compare.contentmergeviewer.ContentMergeViewer.in ternalRefresh(ContentMergeViewer.java:715)
>>>
>>> at
>>> org.eclipse.compare.contentmergeviewer.ContentMergeViewer.in putChanged(ContentMergeViewer.java:615)
>>>
>>> at
>>> org.eclipse.jface.viewers.ContentViewer.setInput(ContentView er.java:251)
>>> at
>>> org.eclipse.emf.compare.ui.viewer.content.ModelContentMergeV iewer.setInput(ModelContentMergeViewer.java:281)
>>>
>>> at
>>> org.eclipse.compare.CompareViewerSwitchingPane.setInput(Comp areViewerSwitchingPane.java:256)
>>>
>>> at
>>> org.eclipse.compare.CompareEditorInput.internalSetContentPan eInput(CompareEditorInput.java:791)
>>>
>>> at
>>> org.eclipse.compare.CompareEditorInput.access$7(CompareEdito rInput.java:789)
>>>
>>> at
>>> org.eclipse.compare.CompareEditorInput$13.run(CompareEditorI nput.java:729)
>>>
>>> at
>>> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
>>> at
>>> org.eclipse.compare.CompareEditorInput.feed1(CompareEditorIn put.java:723)
>>>
>>> at
>>> org.eclipse.compare.CompareEditorInput.feedInput(CompareEdit orInput.java:701)
>>>
>>> at
>>> org.eclipse.compare.CompareEditorInput.createContents(Compar eEditorInput.java:524)
>>>
>>> at
>>> org.eclipse.compare.internal.CompareEditor.createCompareCont rol(CompareEditor.java:415)
>>>
>>> at
>>> org.eclipse.compare.internal.CompareEditor.createPartControl (CompareEditor.java:379)
>>>
>>> at
>>> org.eclipse.ui.internal.EditorReference.createPartHelper(Edi torReference.java:661)
>>>
>>> at
>>> org.eclipse.ui.internal.EditorReference.createPart(EditorRef erence.java:428)
>>>
>>> at
>>> org.eclipse.ui.internal.WorkbenchPartReference.getPart(Workb enchPartReference.java:594)
>>>
>>> at
>>> org.eclipse.ui.internal.EditorReference.getEditor(EditorRefe rence.java:266)
>>>
>>> at
>>> org.eclipse.ui.internal.WorkbenchPage.busyOpenEditorBatched( WorkbenchPage.java:2820)
>>>
>>> at
>>> org.eclipse.ui.internal.WorkbenchPage.busyOpenEditor(Workben chPage.java:2729)
>>>
>>> at
>>> org.eclipse.ui.internal.WorkbenchPage.access$11(WorkbenchPag e.java:2721)
>>> at
>>> org.eclipse.ui.internal.WorkbenchPage$10.run(WorkbenchPage.j ava:2673)
>>> at
>>> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
>>> at
>>> org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPa ge.java:2668)
>>>
>>> at
>>> org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPa ge.java:2652)
>>>
>>> at
>>> org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPa ge.java:2635)
>>>
>>> at
>>> org.eclipse.compare.internal.CompareUIPlugin$1.run(CompareUI Plugin.java:454)
>>>
>>> at
>>> org.eclipse.compare.internal.CompareUIPlugin.syncExec(Compar eUIPlugin.java:1171)
>>>
>>> at
>>> org.eclipse.compare.internal.CompareUIPlugin.internalOpenEdi tor(CompareUIPlugin.java:465)
>>>
>>> at
>>> org.eclipse.compare.internal.CompareUIPlugin.openCompareEdit or(CompareUIPlugin.java:429)
>>>
>>> at
>>> org.eclipse.compare.CompareUI.openCompareEditorOnPage(Compar eUI.java:135)
>>>
>>> at
>>> org.tigris.subversion.subclipse.ui.actions.CompareWithRemote Action$1.run(CompareWithRemoteAction.java:57)
>>>
>>> at
>>> org.tigris.subversion.subclipse.ui.repository.RepositoryMana ger.run(RepositoryManager.java:375)
>>>
>>> at
>>> org.tigris.subversion.subclipse.ui.actions.SVNAction$1.run(S VNAction.java:226)
>>>
>>> at
>>> org.tigris.subversion.subclipse.ui.actions.SVNAction$2.run(S VNAction.java:235)
>>>
>>> at
>>> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
>>> at
>>> org.tigris.subversion.subclipse.ui.actions.SVNAction.run(SVN Action.java:232)
>>>
>>> at
>>> org.tigris.subversion.subclipse.ui.actions.CompareWithRemote Action.execute(CompareWithRemoteAction.java:53)
>>>
>>> at
>>> org.tigris.subversion.subclipse.ui.actions.SVNAction.run(SVN Action.java:56)
>>>
>>> at
>>> org.eclipse.ui.actions.ActionDelegate.runWithEvent(ActionDel egate.java:70)
>>>
>>> at
>>> org.eclipse.ui.internal.PluginAction.runWithEvent(PluginActi on.java:241)
>>> at
>>> org.eclipse.jface.action.ActionContributionItem.handleWidget Selection(ActionContributionItem.java:583)
>>>
>>> at
>>> org.eclipse.jface.action.ActionContributionItem.access$2(Act ionContributionItem.java:500)
>>>
>>> at
>>> org.eclipse.jface.action.ActionContributionItem$5.handleEven t(ActionContributionItem.java:411)
>>>
>>> at org.eclipse.swt.widgets.EventTable.sendEvent(EventTable.java :84)
>>> at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1003)
>>> at
>>> org.eclipse.swt.widgets.Display.runDeferredEvents(Display.ja va:3823)
>>> at
>>> org.eclipse.swt.widgets.Display.readAndDispatch(Display.java :3422)
>>> at
>>> org.eclipse.ui.internal.Workbench.runEventLoop(Workbench.jav a:2382)
>>> at org.eclipse.ui.internal.Workbench.runUI(Workbench.java:2346)
>>> at org.eclipse.ui.internal.Workbench.access$4(Workbench.java:21 98)
>>> at org.eclipse.ui.internal.Workbench$5.run(Workbench.java:493)
>>> at
>>> org.eclipse.core.databinding.observable.Realm.runWithDefault (Realm.java:288)
>>>
>>> at
>>> org.eclipse.ui.internal.Workbench.createAndRunWorkbench(Work bench.java:488)
>>>
>>> at
>>> org.eclipse.ui.PlatformUI.createAndRunWorkbench(PlatformUI.j ava:149)
>>> at
>>> org.eclipse.ui.internal.ide.application.IDEApplication.start (IDEApplication.java:113)
>>>
>>> at
>>> org.eclipse.equinox.internal.app.EclipseAppHandle.run(Eclips eAppHandle.java:193)
>>>
>>> at
>>> org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher .runApplication(EclipseAppLauncher.java:110)
>>>
>>> at
>>> org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher .start(EclipseAppLauncher.java:79)
>>>
>>> at
>>> org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseS tarter.java:386)
>>>
>>> at
>>> org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseS tarter.java:179)
>>>
>>> at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
>>> at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source)
>>> at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source)
>>> at java.lang.reflect.Method.invoke(Unknown Source)
>>> at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java: 549)
>>> at org.eclipse.equinox.launcher.Main.basicRun(Main.java:504)
>>> at org.eclipse.equinox.launcher.Main.run(Main.java:1236)
>>>
>>>
>>>
>>> Cédric Brun wrote:
>>>> Hi Marco,
>>>>
>>>> EMF compare is, indeed, already integrated with Subversion if you're
>>>> using a an plugin providing Eclipse integration with Subversion (aka
>>>> Subversive or Subclipse). That means for instance that comparing
>>>> models with the team repository should trigger EMF Compare.
>>>>
>>>> We even have a specific plugin for Subversive correcting a few
>>>> issues we had at some time but as we are not sure yet if it's an
>>>> issue from our side or from the subversive implementation we did not
>>>> build this plugin yet and it's only available on the Eclipse
>>>> modeling CVS.
>>>>
>>>> Anyway installing an SVN plugin + EMF compare should work fine,
>>>> please tell us if you encounter issues.
>>>> Cédric
>>>>
>>>> Marco wrote:
>>>>
>>>>> Hi! I got a question and it would be great if anyone could help me out
>>>>> with this one: Is there a way to use EMF Compare as differencing
>>>>> and merge
>>>>> tool in subversion? I did not find anything in the web, yet. I'm
>>>>> wondering
>>>>> if this would be useful (this is what I think) and if so, I'm
>>>>> looking for
>>>>> an existing integration.
>>>>
>
|
|
|
| Re: Integrate EMF Compare in Subversion [message #130370 is a reply to message #130354] |
Tue, 21 October 2008 07:14 |
|
This is a multi-part message in MIME format.
--------------010104010006050808000702
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
Thanks Sudhakar,
We'll try to handle this issue asap.
Laurent Goubet
Obeo
Sudhakar a écrit :
> Logged bug
>
> https://bugs.eclipse.org/bugs/show_bug.cgi?id=251456
>
> Thanks
> -sud
>
>
> laurent Goubet wrote:
>> Hi Sudhakar,
>>
>> We've has many issues with the genmodel comparison ... something must
>> be wrong in the way we load it. Can you fill a bug with your stack
>> trace so that we remember this has to be fixed?
>>
>> Laurent Goubet
>> Obeo
>>
>> Sudhakar a écrit :
>>> I just noticed that this bug occurs when you compare a genmodel file
>>> even with it's local history. So this may rule out any issue with
>>> Suversion/Subclipe and place the issue in the Eclipse file versioning
>>> code. This is verified on Eclipse 3.4.1
>>>
>>> -sud
>>>
>>> Sudhakar wrote:
>>>> I've verified that EMF Compare works when comparing workspace .ecore
>>>> files against those stored in subversion.
>>>>
>>>> But when I attempt to compare a workspace .genmodel file against
>>>> that in subversion I get several NPE. I'm using subclipse 1.4.5 with
>>>> EMF Compare 0.8.1. If I compare the two .genmodel files stored in my
>>>> workspace I don't get these NPEs.
>>>>
>>>>
>>>> Here is the stack trace:
>>>>
>>>> !ENTRY org.eclipse.jface 4 2 2008-10-16 11:29:47.484
>>>> !MESSAGE Problems occurred when invoking code from plug-in:
>>>> "org.eclipse.jface".
>>>> !STACK 0
>>>> java.lang.NullPointerException
>>>> at
>>>> org.eclipse.emf.codegen.ecore.genmodel.impl.GenDataTypeImpl. getQualifiedInstanceClassName(GenDataTypeImpl.java:212)
>>>>
>>>> at
>>>> org.eclipse.emf.codegen.ecore.genmodel.provider.GenDataTypeI temProvider.getText(GenDataTypeItemProvider.java:120)
>>>>
>>>> at
>>>> org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider .getText(AdapterFactoryLabelProvider.java:374)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.WrappedViewerLabelProvider.getText (WrappedViewerLabelProvider.java:108)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.WrappedViewerLabelProvider.update( WrappedViewerLabelProvider.java:164)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.ViewerColumn.refresh(ViewerColumn. java:145)
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer.doUpdateItem(Ab stractTreeViewer.java:932)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer$UpdateItemSafeR unnable.run(AbstractTreeViewer.java:102)
>>>>
>>>> at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:37)
>>>> at org.eclipse.core.runtime.Platform.run(Platform.java:880)
>>>> at org.eclipse.ui.internal.JFaceUtil$1.run(JFaceUtil.java:48)
>>>> at org.eclipse.jface.util.SafeRunnable.run(SafeRunnable.java:17 5)
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer.doUpdateItem(Ab stractTreeViewer.java:1012)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.StructuredViewer$UpdateItemSafeRun nable.run(StructuredViewer.java:466)
>>>>
>>>> at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:37)
>>>> at org.eclipse.core.runtime.Platform.run(Platform.java:880)
>>>> at org.eclipse.ui.internal.JFaceUtil$1.run(JFaceUtil.java:48)
>>>> at org.eclipse.jface.util.SafeRunnable.run(SafeRunnable.java:17 5)
>>>> at
>>>> org.eclipse.jface.viewers.StructuredViewer.updateItem(Struct uredViewer.java:2041)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer.createTreeItem( AbstractTreeViewer.java:827)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer$1.run(AbstractT reeViewer.java:802)
>>>>
>>>> at
>>>> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer.createChildren( AbstractTreeViewer.java:776)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.TreeViewer.createChildren(TreeView er.java:634)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer.internalExpandT oLevel(AbstractTreeViewer.java:1702)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer.internalExpandT oLevel(AbstractTreeViewer.java:1712)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer.internalExpandT oLevel(AbstractTreeViewer.java:1712)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer.expandToLevel(A bstractTreeViewer.java:1054)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer.expandToLevel(A bstractTreeViewer.java:1035)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer.expandAll(Abstr actTreeViewer.java:1024)
>>>>
>>>> at
>>>> org.eclipse.emf.compare.ui.viewer.content.part.diff.ModelCon tentMergeDiffTab.inputChanged(ModelContentMergeDiffTab.java: 364)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.ContentViewer.setInput(ContentView er.java:251)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.StructuredViewer.setInput(Structur edViewer.java:1603)
>>>>
>>>> at
>>>> org.eclipse.emf.compare.ui.viewer.content.part.diff.ModelCon tentMergeDiffTab.setReflectiveInput(ModelContentMergeDiffTab .java:278)
>>>>
>>>> at
>>>> org.eclipse.emf.compare.ui.viewer.content.part.ModelContentM ergeTabFolder.setInput(ModelContentMergeTabFolder.java:310)
>>>>
>>>> at
>>>> org.eclipse.emf.compare.ui.viewer.content.ModelContentMergeV iewer.updateContent(ModelContentMergeViewer.java:675)
>>>>
>>>> at
>>>> org.eclipse.compare.contentmergeviewer.ContentMergeViewer.in ternalRefresh(ContentMergeViewer.java:715)
>>>>
>>>> at
>>>> org.eclipse.compare.contentmergeviewer.ContentMergeViewer.in putChanged(ContentMergeViewer.java:615)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.ContentViewer.setInput(ContentView er.java:251)
>>>>
>>>> at
>>>> org.eclipse.emf.compare.ui.viewer.content.ModelContentMergeV iewer.setInput(ModelContentMergeViewer.java:281)
>>>>
>>>> at
>>>> org.eclipse.compare.CompareViewerSwitchingPane.setInput(Comp areViewerSwitchingPane.java:256)
>>>>
>>>> at
>>>> org.eclipse.compare.CompareEditorInput.internalSetContentPan eInput(CompareEditorInput.java:791)
>>>>
>>>> at
>>>> org.eclipse.compare.CompareEditorInput.access$7(CompareEdito rInput.java:789)
>>>>
>>>> at
>>>> org.eclipse.compare.CompareEditorInput$13.run(CompareEditorI nput.java:729)
>>>>
>>>> at
>>>> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
>>>> at
>>>> org.eclipse.compare.CompareEditorInput.feed1(CompareEditorIn put.java:723)
>>>>
>>>> at
>>>> org.eclipse.compare.CompareEditorInput.feedInput(CompareEdit orInput.java:701)
>>>>
>>>> at
>>>> org.eclipse.compare.CompareEditorInput.createContents(Compar eEditorInput.java:524)
>>>>
>>>> at
>>>> org.eclipse.compare.internal.CompareEditor.createCompareCont rol(CompareEditor.java:415)
>>>>
>>>> at
>>>> org.eclipse.compare.internal.CompareEditor.createPartControl (CompareEditor.java:379)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.EditorReference.createPartHelper(Edi torReference.java:661)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.EditorReference.createPart(EditorRef erence.java:428)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.WorkbenchPartReference.getPart(Workb enchPartReference.java:594)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.EditorReference.getEditor(EditorRefe rence.java:266)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.WorkbenchPage.busyOpenEditorBatched( WorkbenchPage.java:2820)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.WorkbenchPage.busyOpenEditor(Workben chPage.java:2729)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.WorkbenchPage.access$11(WorkbenchPag e.java:2721)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.WorkbenchPage$10.run(WorkbenchPage.j ava:2673)
>>>> at
>>>> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
>>>> at
>>>> org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPa ge.java:2668)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPa ge.java:2652)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPa ge.java:2635)
>>>>
>>>> at
>>>> org.eclipse.compare.internal.CompareUIPlugin$1.run(CompareUI Plugin.java:454)
>>>>
>>>> at
>>>> org.eclipse.compare.internal.CompareUIPlugin.syncExec(Compar eUIPlugin.java:1171)
>>>>
>>>> at
>>>> org.eclipse.compare.internal.CompareUIPlugin.internalOpenEdi tor(CompareUIPlugin.java:465)
>>>>
>>>> at
>>>> org.eclipse.compare.internal.CompareUIPlugin.openCompareEdit or(CompareUIPlugin.java:429)
>>>>
>>>> at
>>>> org.eclipse.compare.CompareUI.openCompareEditorOnPage(Compar eUI.java:135)
>>>>
>>>> at
>>>> org.tigris.subversion.subclipse.ui.actions.CompareWithRemote Action$1.run(CompareWithRemoteAction.java:57)
>>>>
>>>> at
>>>> org.tigris.subversion.subclipse.ui.repository.RepositoryMana ger.run(RepositoryManager.java:375)
>>>>
>>>> at
>>>> org.tigris.subversion.subclipse.ui.actions.SVNAction$1.run(S VNAction.java:226)
>>>>
>>>> at
>>>> org.tigris.subversion.subclipse.ui.actions.SVNAction$2.run(S VNAction.java:235)
>>>>
>>>> at
>>>> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
>>>> at
>>>> org.tigris.subversion.subclipse.ui.actions.SVNAction.run(SVN Action.java:232)
>>>>
>>>> at
>>>> org.tigris.subversion.subclipse.ui.actions.CompareWithRemote Action.execute(CompareWithRemoteAction.java:53)
>>>>
>>>> at
>>>> org.tigris.subversion.subclipse.ui.actions.SVNAction.run(SVN Action.java:56)
>>>>
>>>> at
>>>> org.eclipse.ui.actions.ActionDelegate.runWithEvent(ActionDel egate.java:70)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.PluginAction.runWithEvent(PluginActi on.java:241)
>>>>
>>>> at
>>>> org.eclipse.jface.action.ActionContributionItem.handleWidget Selection(ActionContributionItem.java:583)
>>>>
>>>> at
>>>> org.eclipse.jface.action.ActionContributionItem.access$2(Act ionContributionItem.java:500)
>>>>
>>>> at
>>>> org.eclipse.jface.action.ActionContributionItem$5.handleEven t(ActionContributionItem.java:411)
>>>>
>>>> at org.eclipse.swt.widgets.EventTable.sendEvent(EventTable.java :84)
>>>> at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1003)
>>>> at
>>>> org.eclipse.swt.widgets.Display.runDeferredEvents(Display.ja va:3823)
>>>> at
>>>> org.eclipse.swt.widgets.Display.readAndDispatch(Display.java :3422)
>>>> at
>>>> org.eclipse.ui.internal.Workbench.runEventLoop(Workbench.jav a:2382)
>>>> at org.eclipse.ui.internal.Workbench.runUI(Workbench.java:2346)
>>>> at org.eclipse.ui.internal.Workbench.access$4(Workbench.java:21 98)
>>>> at org.eclipse.ui.internal.Workbench$5.run(Workbench.java:493)
>>>> at
>>>> org.eclipse.core.databinding.observable.Realm.runWithDefault (Realm.java:288)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.Workbench.createAndRunWorkbench(Work bench.java:488)
>>>>
>>>> at
>>>> org.eclipse.ui.PlatformUI.createAndRunWorkbench(PlatformUI.j ava:149)
>>>> at
>>>> org.eclipse.ui.internal.ide.application.IDEApplication.start (IDEApplication.java:113)
>>>>
>>>> at
>>>> org.eclipse.equinox.internal.app.EclipseAppHandle.run(Eclips eAppHandle.java:193)
>>>>
>>>> at
>>>> org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher .runApplication(EclipseAppLauncher.java:110)
>>>>
>>>> at
>>>> org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher .start(EclipseAppLauncher.java:79)
>>>>
>>>> at
>>>> org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseS tarter.java:386)
>>>>
>>>> at
>>>> org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseS tarter.java:179)
>>>>
>>>> at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
>>>> at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source)
>>>> at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source)
>>>> at java.lang.reflect.Method.invoke(Unknown Source)
>>>> at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java: 549)
>>>> at org.eclipse.equinox.launcher.Main.basicRun(Main.java:504)
>>>> at org.eclipse.equinox.launcher.Main.run(Main.java:1236)
>>>>
>>>> !ENTRY org.eclipse.jface 4 2 2008-10-16 11:29:47.703
>>>> !MESSAGE Problems occurred when invoking code from plug-in:
>>>> "org.eclipse.jface".
>>>> !STACK 0
>>>> java.lang.NullPointerException
>>>> at
>>>> org.eclipse.emf.codegen.ecore.genmodel.impl.GenDataTypeImpl. getQualifiedInstanceClassName(GenDataTypeImpl.java:212)
>>>>
>>>> at
>>>> org.eclipse.emf.codegen.ecore.genmodel.provider.GenDataTypeI temProvider.getText(GenDataTypeItemProvider.java:120)
>>>>
>>>> at
>>>> org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider .getText(AdapterFactoryLabelProvider.java:374)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.WrappedViewerLabelProvider.getText (WrappedViewerLabelProvider.java:108)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.WrappedViewerLabelProvider.update( WrappedViewerLabelProvider.java:164)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.ViewerColumn.refresh(ViewerColumn. java:145)
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer.doUpdateItem(Ab stractTreeViewer.java:932)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer$UpdateItemSafeR unnable.run(AbstractTreeViewer.java:102)
>>>>
>>>> at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:37)
>>>> at org.eclipse.core.runtime.Platform.run(Platform.java:880)
>>>> at org.eclipse.ui.internal.JFaceUtil$1.run(JFaceUtil.java:48)
>>>> at org.eclipse.jface.util.SafeRunnable.run(SafeRunnable.java:17 5)
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer.doUpdateItem(Ab stractTreeViewer.java:1012)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.StructuredViewer$UpdateItemSafeRun nable.run(StructuredViewer.java:466)
>>>>
>>>> at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:37)
>>>> at org.eclipse.core.runtime.Platform.run(Platform.java:880)
>>>> at org.eclipse.ui.internal.JFaceUtil$1.run(JFaceUtil.java:48)
>>>> at org.eclipse.jface.util.SafeRunnable.run(SafeRunnable.java:17 5)
>>>> at
>>>> org.eclipse.jface.viewers.StructuredViewer.updateItem(Struct uredViewer.java:2041)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer.createTreeItem( AbstractTreeViewer.java:827)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer$1.run(AbstractT reeViewer.java:802)
>>>>
>>>> at
>>>> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer.createChildren( AbstractTreeViewer.java:776)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.TreeViewer.createChildren(TreeView er.java:634)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer.internalExpandT oLevel(AbstractTreeViewer.java:1702)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer.internalExpandT oLevel(AbstractTreeViewer.java:1712)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer.internalExpandT oLevel(AbstractTreeViewer.java:1712)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer.expandToLevel(A bstractTreeViewer.java:1054)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer.expandToLevel(A bstractTreeViewer.java:1035)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer.expandAll(Abstr actTreeViewer.java:1024)
>>>>
>>>> at
>>>> org.eclipse.emf.compare.ui.viewer.content.part.diff.ModelCon tentMergeDiffTab.inputChanged(ModelContentMergeDiffTab.java: 364)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.ContentViewer.setInput(ContentView er.java:251)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.StructuredViewer.setInput(Structur edViewer.java:1603)
>>>>
>>>> at
>>>> org.eclipse.emf.compare.ui.viewer.content.part.diff.ModelCon tentMergeDiffTab.setReflectiveInput(ModelContentMergeDiffTab .java:278)
>>>>
>>>> at
>>>> org.eclipse.emf.compare.ui.viewer.content.part.ModelContentM ergeTabFolder.setInput(ModelContentMergeTabFolder.java:310)
>>>>
>>>> at
>>>> org.eclipse.emf.compare.ui.viewer.content.ModelContentMergeV iewer.updateContent(ModelContentMergeViewer.java:675)
>>>>
>>>> at
>>>> org.eclipse.compare.contentmergeviewer.ContentMergeViewer.in ternalRefresh(ContentMergeViewer.java:715)
>>>>
>>>> at
>>>> org.eclipse.compare.contentmergeviewer.ContentMergeViewer.in putChanged(ContentMergeViewer.java:615)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.ContentViewer.setInput(ContentView er.java:251)
>>>>
>>>> at
>>>> org.eclipse.emf.compare.ui.viewer.content.ModelContentMergeV iewer.setInput(ModelContentMergeViewer.java:281)
>>>>
>>>> at
>>>> org.eclipse.compare.CompareViewerSwitchingPane.setInput(Comp areViewerSwitchingPane.java:256)
>>>>
>>>> at
>>>> org.eclipse.compare.CompareEditorInput.internalSetContentPan eInput(CompareEditorInput.java:791)
>>>>
>>>> at
>>>> org.eclipse.compare.CompareEditorInput.access$7(CompareEdito rInput.java:789)
>>>>
>>>> at
>>>> org.eclipse.compare.CompareEditorInput$13.run(CompareEditorI nput.java:729)
>>>>
>>>> at
>>>> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
>>>> at
>>>> org.eclipse.compare.CompareEditorInput.feed1(CompareEditorIn put.java:723)
>>>>
>>>> at
>>>> org.eclipse.compare.CompareEditorInput.feedInput(CompareEdit orInput.java:701)
>>>>
>>>> at
>>>> org.eclipse.compare.CompareEditorInput.createContents(Compar eEditorInput.java:524)
>>>>
>>>> at
>>>> org.eclipse.compare.internal.CompareEditor.createCompareCont rol(CompareEditor.java:415)
>>>>
>>>> at
>>>> org.eclipse.compare.internal.CompareEditor.createPartControl (CompareEditor.java:379)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.EditorReference.createPartHelper(Edi torReference.java:661)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.EditorReference.createPart(EditorRef erence.java:428)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.WorkbenchPartReference.getPart(Workb enchPartReference.java:594)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.EditorReference.getEditor(EditorRefe rence.java:266)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.WorkbenchPage.busyOpenEditorBatched( WorkbenchPage.java:2820)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.WorkbenchPage.busyOpenEditor(Workben chPage.java:2729)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.WorkbenchPage.access$11(WorkbenchPag e.java:2721)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.WorkbenchPage$10.run(WorkbenchPage.j ava:2673)
>>>> at
>>>> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
>>>> at
>>>> org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPa ge.java:2668)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPa ge.java:2652)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPa ge.java:2635)
>>>>
>>>> at
>>>> org.eclipse.compare.internal.CompareUIPlugin$1.run(CompareUI Plugin.java:454)
>>>>
>>>> at
>>>> org.eclipse.compare.internal.CompareUIPlugin.syncExec(Compar eUIPlugin.java:1171)
>>>>
>>>> at
>>>> org.eclipse.compare.internal.CompareUIPlugin.internalOpenEdi tor(CompareUIPlugin.java:465)
>>>>
>>>> at
>>>> org.eclipse.compare.internal.CompareUIPlugin.openCompareEdit or(CompareUIPlugin.java:429)
>>>>
>>>> at
>>>> org.eclipse.compare.CompareUI.openCompareEditorOnPage(Compar eUI.java:135)
>>>>
>>>> at
>>>> org.tigris.subversion.subclipse.ui.actions.CompareWithRemote Action$1.run(CompareWithRemoteAction.java:57)
>>>>
>>>> at
>>>> org.tigris.subversion.subclipse.ui.repository.RepositoryMana ger.run(RepositoryManager.java:375)
>>>>
>>>> at
>>>> org.tigris.subversion.subclipse.ui.actions.SVNAction$1.run(S VNAction.java:226)
>>>>
>>>> at
>>>> org.tigris.subversion.subclipse.ui.actions.SVNAction$2.run(S VNAction.java:235)
>>>>
>>>> at
>>>> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
>>>> at
>>>> org.tigris.subversion.subclipse.ui.actions.SVNAction.run(SVN Action.java:232)
>>>>
>>>> at
>>>> org.tigris.subversion.subclipse.ui.actions.CompareWithRemote Action.execute(CompareWithRemoteAction.java:53)
>>>>
>>>> at
>>>> org.tigris.subversion.subclipse.ui.actions.SVNAction.run(SVN Action.java:56)
>>>>
>>>> at
>>>> org.eclipse.ui.actions.ActionDelegate.runWithEvent(ActionDel egate.java:70)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.PluginAction.runWithEvent(PluginActi on.java:241)
>>>>
>>>> at
>>>> org.eclipse.jface.action.ActionContributionItem.handleWidget Selection(ActionContributionItem.java:583)
>>>>
>>>> at
>>>> org.eclipse.jface.action.ActionContributionItem.access$2(Act ionContributionItem.java:500)
>>>>
>>>> at
>>>> org.eclipse.jface.action.ActionContributionItem$5.handleEven t(ActionContributionItem.java:411)
>>>>
>>>> at org.eclipse.swt.widgets.EventTable.sendEvent(EventTable.java :84)
>>>> at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1003)
>>>> at
>>>> org.eclipse.swt.widgets.Display.runDeferredEvents(Display.ja va:3823)
>>>> at
>>>> org.eclipse.swt.widgets.Display.readAndDispatch(Display.java :3422)
>>>> at
>>>> org.eclipse.ui.internal.Workbench.runEventLoop(Workbench.jav a:2382)
>>>> at org.eclipse.ui.internal.Workbench.runUI(Workbench.java:2346)
>>>> at org.eclipse.ui.internal.Workbench.access$4(Workbench.java:21 98)
>>>> at org.eclipse.ui.internal.Workbench$5.run(Workbench.java:493)
>>>> at
>>>> org.eclipse.core.databinding.observable.Realm.runWithDefault (Realm.java:288)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.Workbench.createAndRunWorkbench(Work bench.java:488)
>>>>
>>>> at
>>>> org.eclipse.ui.PlatformUI.createAndRunWorkbench(PlatformUI.j ava:149)
>>>> at
>>>> org.eclipse.ui.internal.ide.application.IDEApplication.start (IDEApplication.java:113)
>>>>
>>>> at
>>>> org.eclipse.equinox.internal.app.EclipseAppHandle.run(Eclips eAppHandle.java:193)
>>>>
>>>> at
>>>> org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher .runApplication(EclipseAppLauncher.java:110)
>>>>
>>>> at
>>>> org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher .start(EclipseAppLauncher.java:79)
>>>>
>>>> at
>>>> org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseS tarter.java:386)
>>>>
>>>> at
>>>> org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseS tarter.java:179)
>>>>
>>>> at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
>>>> at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source)
>>>> at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source)
>>>> at java.lang.reflect.Method.invoke(Unknown Source)
>>>> at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java: 549)
>>>> at org.eclipse.equinox.launcher.Main.basicRun(Main.java:504)
>>>> at org.eclipse.equinox.launcher.Main.run(Main.java:1236)
>>>>
>>>> !ENTRY org.eclipse.jface 4 2 2008-10-16 11:29:47.781
>>>> !MESSAGE Problems occurred when invoking code from plug-in:
>>>> "org.eclipse.jface".
>>>> !STACK 0
>>>> java.lang.NullPointerException
>>>> at
>>>> org.eclipse.emf.codegen.ecore.genmodel.impl.GenDataTypeImpl. getQualifiedInstanceClassName(GenDataTypeImpl.java:212)
>>>>
>>>> at
>>>> org.eclipse.emf.codegen.ecore.genmodel.provider.GenDataTypeI temProvider.getText(GenDataTypeItemProvider.java:120)
>>>>
>>>> at
>>>> org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider .getText(AdapterFactoryLabelProvider.java:374)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.WrappedViewerLabelProvider.getText (WrappedViewerLabelProvider.java:108)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.WrappedViewerLabelProvider.update( WrappedViewerLabelProvider.java:164)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.ViewerColumn.refresh(ViewerColumn. java:145)
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer.doUpdateItem(Ab stractTreeViewer.java:932)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer$UpdateItemSafeR unnable.run(AbstractTreeViewer.java:102)
>>>>
>>>> at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:37)
>>>> at org.eclipse.core.runtime.Platform.run(Platform.java:880)
>>>> at org.eclipse.ui.internal.JFaceUtil$1.run(JFaceUtil.java:48)
>>>> at org.eclipse.jface.util.SafeRunnable.run(SafeRunnable.java:17 5)
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer.doUpdateItem(Ab stractTreeViewer.java:1012)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.StructuredViewer$UpdateItemSafeRun nable.run(StructuredViewer.java:466)
>>>>
>>>> at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:37)
>>>> at org.eclipse.core.runtime.Platform.run(Platform.java:880)
>>>> at org.eclipse.ui.internal.JFaceUtil$1.run(JFaceUtil.java:48)
>>>> at org.eclipse.jface.util.SafeRunnable.run(SafeRunnable.java:17 5)
>>>> at
>>>> org.eclipse.jface.viewers.StructuredViewer.updateItem(Struct uredViewer.java:2041)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer.createTreeItem( AbstractTreeViewer.java:827)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer$1.run(AbstractT reeViewer.java:802)
>>>>
>>>> at
>>>> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer.createChildren( AbstractTreeViewer.java:776)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.TreeViewer.createChildren(TreeView er.java:634)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer.internalExpandT oLevel(AbstractTreeViewer.java:1702)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer.internalExpandT oLevel(AbstractTreeViewer.java:1712)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer.internalExpandT oLevel(AbstractTreeViewer.java:1712)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer.expandToLevel(A bstractTreeViewer.java:1054)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer.expandToLevel(A bstractTreeViewer.java:1035)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer.expandAll(Abstr actTreeViewer.java:1024)
>>>>
>>>> at
>>>> org.eclipse.emf.compare.ui.viewer.content.part.diff.ModelCon tentMergeDiffTab.inputChanged(ModelContentMergeDiffTab.java: 364)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.ContentViewer.setInput(ContentView er.java:251)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.StructuredViewer.setInput(Structur edViewer.java:1603)
>>>>
>>>> at
>>>> org.eclipse.emf.compare.ui.viewer.content.part.diff.ModelCon tentMergeDiffTab.setReflectiveInput(ModelContentMergeDiffTab .java:278)
>>>>
>>>> at
>>>> org.eclipse.emf.compare.ui.viewer.content.part.ModelContentM ergeTabFolder.setInput(ModelContentMergeTabFolder.java:310)
>>>>
>>>> at
>>>> org.eclipse.emf.compare.ui.viewer.content.ModelContentMergeV iewer.updateContent(ModelContentMergeViewer.java:675)
>>>>
>>>> at
>>>> org.eclipse.compare.contentmergeviewer.ContentMergeViewer.in ternalRefresh(ContentMergeViewer.java:715)
>>>>
>>>> at
>>>> org.eclipse.compare.contentmergeviewer.ContentMergeViewer.in putChanged(ContentMergeViewer.java:615)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.ContentViewer.setInput(ContentView er.java:251)
>>>>
>>>> at
>>>> org.eclipse.emf.compare.ui.viewer.content.ModelContentMergeV iewer.setInput(ModelContentMergeViewer.java:281)
>>>>
>>>> at
>>>> org.eclipse.compare.CompareViewerSwitchingPane.setInput(Comp areViewerSwitchingPane.java:256)
>>>>
>>>> at
>>>> org.eclipse.compare.CompareEditorInput.internalSetContentPan eInput(CompareEditorInput.java:791)
>>>>
>>>> at
>>>> org.eclipse.compare.CompareEditorInput.access$7(CompareEdito rInput.java:789)
>>>>
>>>> at
>>>> org.eclipse.compare.CompareEditorInput$13.run(CompareEditorI nput.java:729)
>>>>
>>>> at
>>>> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
>>>> at
>>>> org.eclipse.compare.CompareEditorInput.feed1(CompareEditorIn put.java:723)
>>>>
>>>> at
>>>> org.eclipse.compare.CompareEditorInput.feedInput(CompareEdit orInput.java:701)
>>>>
>>>> at
>>>> org.eclipse.compare.CompareEditorInput.createContents(Compar eEditorInput.java:524)
>>>>
>>>> at
>>>> org.eclipse.compare.internal.CompareEditor.createCompareCont rol(CompareEditor.java:415)
>>>>
>>>> at
>>>> org.eclipse.compare.internal.CompareEditor.createPartControl (CompareEditor.java:379)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.EditorReference.createPartHelper(Edi torReference.java:661)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.EditorReference.createPart(EditorRef erence.java:428)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.WorkbenchPartReference.getPart(Workb enchPartReference.java:594)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.EditorReference.getEditor(EditorRefe rence.java:266)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.WorkbenchPage.busyOpenEditorBatched( WorkbenchPage.java:2820)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.WorkbenchPage.busyOpenEditor(Workben chPage.java:2729)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.WorkbenchPage.access$11(WorkbenchPag e.java:2721)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.WorkbenchPage$10.run(WorkbenchPage.j ava:2673)
>>>> at
>>>> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
>>>> at
>>>> org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPa ge.java:2668)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPa ge.java:2652)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPa ge.java:2635)
>>>>
>>>> at
>>>> org.eclipse.compare.internal.CompareUIPlugin$1.run(CompareUI Plugin.java:454)
>>>>
>>>> at
>>>> org.eclipse.compare.internal.CompareUIPlugin.syncExec(Compar eUIPlugin.java:1171)
>>>>
>>>> at
>>>> org.eclipse.compare.internal.CompareUIPlugin.internalOpenEdi tor(CompareUIPlugin.java:465)
>>>>
>>>> at
>>>> org.eclipse.compare.internal.CompareUIPlugin.openCompareEdit or(CompareUIPlugin.java:429)
>>>>
>>>> at
>>>> org.eclipse.compare.CompareUI.openCompareEditorOnPage(Compar eUI.java:135)
>>>>
>>>> at
>>>> org.tigris.subversion.subclipse.ui.actions.CompareWithRemote Action$1.run(CompareWithRemoteAction.java:57)
>>>>
>>>> at
>>>> org.tigris.subversion.subclipse.ui.repository.RepositoryMana ger.run(RepositoryManager.java:375)
>>>>
>>>> at
>>>> org.tigris.subversion.subclipse.ui.actions.SVNAction$1.run(S VNAction.java:226)
>>>>
>>>> at
>>>> org.tigris.subversion.subclipse.ui.actions.SVNAction$2.run(S VNAction.java:235)
>>>>
>>>> at
>>>> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
>>>> at
>>>> org.tigris.subversion.subclipse.ui.actions.SVNAction.run(SVN Action.java:232)
>>>>
>>>> at
>>>> org.tigris.subversion.subclipse.ui.actions.CompareWithRemote Action.execute(CompareWithRemoteAction.java:53)
>>>>
>>>> at
>>>> org.tigris.subversion.subclipse.ui.actions.SVNAction.run(SVN Action.java:56)
>>>>
>>>> at
>>>> org.eclipse.ui.actions.ActionDelegate.runWithEvent(ActionDel egate.java:70)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.PluginAction.runWithEvent(PluginActi on.java:241)
>>>>
>>>> at
>>>> org.eclipse.jface.action.ActionContributionItem.handleWidget Selection(ActionContributionItem.java:583)
>>>>
>>>> at
>>>> org.eclipse.jface.action.ActionContributionItem.access$2(Act ionContributionItem.java:500)
>>>>
>>>> at
>>>> org.eclipse.jface.action.ActionContributionItem$5.handleEven t(ActionContributionItem.java:411)
>>>>
>>>> at org.eclipse.swt.widgets.EventTable.sendEvent(EventTable.java :84)
>>>> at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1003)
>>>> at
>>>> org.eclipse.swt.widgets.Display.runDeferredEvents(Display.ja va:3823)
>>>> at
>>>> org.eclipse.swt.widgets.Display.readAndDispatch(Display.java :3422)
>>>> at
>>>> org.eclipse.ui.internal.Workbench.runEventLoop(Workbench.jav a:2382)
>>>> at org.eclipse.ui.internal.Workbench.runUI(Workbench.java:2346)
>>>> at org.eclipse.ui.internal.Workbench.access$4(Workbench.java:21 98)
>>>> at org.eclipse.ui.internal.Workbench$5.run(Workbench.java:493)
>>>> at
>>>> org.eclipse.core.databinding.observable.Realm.runWithDefault (Realm.java:288)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.Workbench.createAndRunWorkbench(Work bench.java:488)
>>>>
>>>> at
>>>> org.eclipse.ui.PlatformUI.createAndRunWorkbench(PlatformUI.j ava:149)
>>>> at
>>>> org.eclipse.ui.internal.ide.application.IDEApplication.start (IDEApplication.java:113)
>>>>
>>>> at
>>>> org.eclipse.equinox.internal.app.EclipseAppHandle.run(Eclips eAppHandle.java:193)
>>>>
>>>> at
>>>> org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher .runApplication(EclipseAppLauncher.java:110)
>>>>
>>>> at
>>>> org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher .start(EclipseAppLauncher.java:79)
>>>>
>>>> at
>>>> org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseS tarter.java:386)
>>>>
>>>> at
>>>> org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseS tarter.java:179)
>>>>
>>>> at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
>>>> at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source)
>>>> at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source)
>>>> at java.lang.reflect.Method.invoke(Unknown Source)
>>>> at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java: 549)
>>>> at org.eclipse.equinox.launcher.Main.basicRun(Main.java:504)
>>>> at org.eclipse.equinox.launcher.Main.run(Main.java:1236)
>>>>
>>>>
>>>>
>>>> Cédric Brun wrote:
>>>>> Hi Marco,
>>>>>
>>>>> EMF compare is, indeed, already integrated with Subversion if
>>>>> you're using a an plugin providing Eclipse integration with
>>>>> Subversion (aka Subversive or Subclipse). That means for instance
>>>>> that comparing models with the team repository should trigger EMF
>>>>> Compare.
>>>>>
>>>>> We even have a specific plugin for Subversive correcting a few
>>>>> issues we had at some time but as we are not sure yet if it's an
>>>>> issue from our side or from the subversive implementation we did
>>>>> not build this plugin yet and it's only available on the Eclipse
>>>>> modeling CVS.
>>>>>
>>>>> Anyway installing an SVN plugin + EMF compare should work fine,
>>>>> please tell us if you encounter issues.
>>>>> Cédric
>>>>>
>>>>> Marco wrote:
>>>>>
>>>>>> Hi! I got a question and it would be great if anyone could help me
>>>>>> out
>>>>>> with this one: Is there a way to use EMF Compare as differencing
>>>>>> and merge
>>>>>> tool in subversion? I did not find anything in the web, yet. I'm
>>>>>> wondering
>>>>>> if this would be useful (this is what I think) and if so, I'm
>>>>>> looking for
>>>>>> an existing integration.
>>>>>
>>
--------------010104010006050808000702
Content-Type: text/x-vcard; charset=utf-8;
name="laurent_goubet.vcf"
Content-Transfer-Encoding: base64
Content-Disposition: attachment;
filename="laurent_goubet.vcf"
YmVnaW46dmNhcmQNCmZuOkxhdXJlbnQgR291YmV0DQpuOkdvdWJldDtMYXVy ZW50DQpvcmc6
PGEgaHJlZj0iaHR0cDovL3d3dy5vYmVvLmZyLyI+T2JlbzwvYT4NCmVtYWls O2ludGVybmV0
OmxhdXJlbnQuZ291YmV0QG9iZW8uZnINCnVybDpodHRwOi8vd3d3Lm9iZW8u ZnINCnZlcnNp
b246Mi4xDQplbmQ6dmNhcmQNCg0K
--------------010104010006050808000702--
|
|
|
| Re: Integrate EMF Compare in Subversion [message #619375 is a reply to message #126975] |
Thu, 10 July 2008 09:47 |
 Cedric Brun
Messages: 431
Registered: July 2009 |
Senior Member |
|
|
Hi Marco,
EMF compare is, indeed, already integrated with Subversion if you're using a an plugin providing Eclipse integration with Subversion (aka Subversive or Subclipse). That means for instance that comparing models with the team repository should trigger EMF Compare.
We even have a specific plugin for Subversive correcting a few issues we had at some time but as we are not sure yet if it's an issue from our side or from the subversive implementation we did not build this plugin yet and it's only available on the Eclipse modeling CVS.
Anyway installing an SVN plugin + EMF compare should work fine, please tell us if you encounter issues.
Cédric
Marco wrote:
> Hi! I got a question and it would be great if anyone could help me out
> with this one: Is there a way to use EMF Compare as differencing and merge
> tool in subversion? I did not find anything in the web, yet. I'm wondering
> if this would be useful (this is what I think) and if so, I'm looking for
> an existing integration.
http://cedric.brun.io news and articles on eclipse and eclipse modeling.
|
|
| | |
| Re: Integrate EMF Compare in Subversion [message #620355 is a reply to message #130229] |
Fri, 17 October 2008 07:37 |
|
This is a multi-part message in MIME format.
--------------040202060309030609060007
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
Hi Sudhakar,
We've has many issues with the genmodel comparison ... something must be
wrong in the way we load it. Can you fill a bug with your stack trace so
that we remember this has to be fixed?
Laurent Goubet
Obeo
Sudhakar a écrit :
> I just noticed that this bug occurs when you compare a genmodel file
> even with it's local history. So this may rule out any issue with
> Suversion/Subclipe and place the issue in the Eclipse file versioning
> code. This is verified on Eclipse 3.4.1
>
> -sud
>
> Sudhakar wrote:
>> I've verified that EMF Compare works when comparing workspace .ecore
>> files against those stored in subversion.
>>
>> But when I attempt to compare a workspace .genmodel file against that
>> in subversion I get several NPE. I'm using subclipse 1.4.5 with EMF
>> Compare 0.8.1. If I compare the two .genmodel files stored in my
>> workspace I don't get these NPEs.
>>
>>
>> Here is the stack trace:
>>
>> !ENTRY org.eclipse.jface 4 2 2008-10-16 11:29:47.484
>> !MESSAGE Problems occurred when invoking code from plug-in:
>> "org.eclipse.jface".
>> !STACK 0
>> java.lang.NullPointerException
>> at
>> org.eclipse.emf.codegen.ecore.genmodel.impl.GenDataTypeImpl. getQualifiedInstanceClassName(GenDataTypeImpl.java:212)
>>
>> at
>> org.eclipse.emf.codegen.ecore.genmodel.provider.GenDataTypeI temProvider.getText(GenDataTypeItemProvider.java:120)
>>
>> at
>> org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider .getText(AdapterFactoryLabelProvider.java:374)
>>
>> at
>> org.eclipse.jface.viewers.WrappedViewerLabelProvider.getText (WrappedViewerLabelProvider.java:108)
>>
>> at
>> org.eclipse.jface.viewers.WrappedViewerLabelProvider.update( WrappedViewerLabelProvider.java:164)
>>
>> at
>> org.eclipse.jface.viewers.ViewerColumn.refresh(ViewerColumn. java:145)
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer.doUpdateItem(Ab stractTreeViewer.java:932)
>>
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer$UpdateItemSafeR unnable.run(AbstractTreeViewer.java:102)
>>
>> at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:37)
>> at org.eclipse.core.runtime.Platform.run(Platform.java:880)
>> at org.eclipse.ui.internal.JFaceUtil$1.run(JFaceUtil.java:48)
>> at org.eclipse.jface.util.SafeRunnable.run(SafeRunnable.java:17 5)
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer.doUpdateItem(Ab stractTreeViewer.java:1012)
>>
>> at
>> org.eclipse.jface.viewers.StructuredViewer$UpdateItemSafeRun nable.run(StructuredViewer.java:466)
>>
>> at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:37)
>> at org.eclipse.core.runtime.Platform.run(Platform.java:880)
>> at org.eclipse.ui.internal.JFaceUtil$1.run(JFaceUtil.java:48)
>> at org.eclipse.jface.util.SafeRunnable.run(SafeRunnable.java:17 5)
>> at
>> org.eclipse.jface.viewers.StructuredViewer.updateItem(Struct uredViewer.java:2041)
>>
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer.createTreeItem( AbstractTreeViewer.java:827)
>>
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer$1.run(AbstractT reeViewer.java:802)
>>
>> at
>> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer.createChildren( AbstractTreeViewer.java:776)
>>
>> at
>> org.eclipse.jface.viewers.TreeViewer.createChildren(TreeView er.java:634)
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer.internalExpandT oLevel(AbstractTreeViewer.java:1702)
>>
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer.internalExpandT oLevel(AbstractTreeViewer.java:1712)
>>
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer.internalExpandT oLevel(AbstractTreeViewer.java:1712)
>>
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer.expandToLevel(A bstractTreeViewer.java:1054)
>>
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer.expandToLevel(A bstractTreeViewer.java:1035)
>>
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer.expandAll(Abstr actTreeViewer.java:1024)
>>
>> at
>> org.eclipse.emf.compare.ui.viewer.content.part.diff.ModelCon tentMergeDiffTab.inputChanged(ModelContentMergeDiffTab.java: 364)
>>
>> at
>> org.eclipse.jface.viewers.ContentViewer.setInput(ContentView er.java:251)
>> at
>> org.eclipse.jface.viewers.StructuredViewer.setInput(Structur edViewer.java:1603)
>>
>> at
>> org.eclipse.emf.compare.ui.viewer.content.part.diff.ModelCon tentMergeDiffTab.setReflectiveInput(ModelContentMergeDiffTab .java:278)
>>
>> at
>> org.eclipse.emf.compare.ui.viewer.content.part.ModelContentM ergeTabFolder.setInput(ModelContentMergeTabFolder.java:310)
>>
>> at
>> org.eclipse.emf.compare.ui.viewer.content.ModelContentMergeV iewer.updateContent(ModelContentMergeViewer.java:675)
>>
>> at
>> org.eclipse.compare.contentmergeviewer.ContentMergeViewer.in ternalRefresh(ContentMergeViewer.java:715)
>>
>> at
>> org.eclipse.compare.contentmergeviewer.ContentMergeViewer.in putChanged(ContentMergeViewer.java:615)
>>
>> at
>> org.eclipse.jface.viewers.ContentViewer.setInput(ContentView er.java:251)
>> at
>> org.eclipse.emf.compare.ui.viewer.content.ModelContentMergeV iewer.setInput(ModelContentMergeViewer.java:281)
>>
>> at
>> org.eclipse.compare.CompareViewerSwitchingPane.setInput(Comp areViewerSwitchingPane.java:256)
>>
>> at
>> org.eclipse.compare.CompareEditorInput.internalSetContentPan eInput(CompareEditorInput.java:791)
>>
>> at
>> org.eclipse.compare.CompareEditorInput.access$7(CompareEdito rInput.java:789)
>>
>> at
>> org.eclipse.compare.CompareEditorInput$13.run(CompareEditorI nput.java:729)
>>
>> at
>> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
>> at
>> org.eclipse.compare.CompareEditorInput.feed1(CompareEditorIn put.java:723)
>> at
>> org.eclipse.compare.CompareEditorInput.feedInput(CompareEdit orInput.java:701)
>>
>> at
>> org.eclipse.compare.CompareEditorInput.createContents(Compar eEditorInput.java:524)
>>
>> at
>> org.eclipse.compare.internal.CompareEditor.createCompareCont rol(CompareEditor.java:415)
>>
>> at
>> org.eclipse.compare.internal.CompareEditor.createPartControl (CompareEditor.java:379)
>>
>> at
>> org.eclipse.ui.internal.EditorReference.createPartHelper(Edi torReference.java:661)
>>
>> at
>> org.eclipse.ui.internal.EditorReference.createPart(EditorRef erence.java:428)
>>
>> at
>> org.eclipse.ui.internal.WorkbenchPartReference.getPart(Workb enchPartReference.java:594)
>>
>> at
>> org.eclipse.ui.internal.EditorReference.getEditor(EditorRefe rence.java:266)
>>
>> at
>> org.eclipse.ui.internal.WorkbenchPage.busyOpenEditorBatched( WorkbenchPage.java:2820)
>>
>> at
>> org.eclipse.ui.internal.WorkbenchPage.busyOpenEditor(Workben chPage.java:2729)
>>
>> at
>> org.eclipse.ui.internal.WorkbenchPage.access$11(WorkbenchPag e.java:2721)
>> at
>> org.eclipse.ui.internal.WorkbenchPage$10.run(WorkbenchPage.j ava:2673)
>> at
>> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
>> at
>> org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPa ge.java:2668)
>> at
>> org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPa ge.java:2652)
>> at
>> org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPa ge.java:2635)
>> at
>> org.eclipse.compare.internal.CompareUIPlugin$1.run(CompareUI Plugin.java:454)
>>
>> at
>> org.eclipse.compare.internal.CompareUIPlugin.syncExec(Compar eUIPlugin.java:1171)
>>
>> at
>> org.eclipse.compare.internal.CompareUIPlugin.internalOpenEdi tor(CompareUIPlugin.java:465)
>>
>> at
>> org.eclipse.compare.internal.CompareUIPlugin.openCompareEdit or(CompareUIPlugin.java:429)
>>
>> at
>> org.eclipse.compare.CompareUI.openCompareEditorOnPage(Compar eUI.java:135)
>> at
>> org.tigris.subversion.subclipse.ui.actions.CompareWithRemote Action$1.run(CompareWithRemoteAction.java:57)
>>
>> at
>> org.tigris.subversion.subclipse.ui.repository.RepositoryMana ger.run(RepositoryManager.java:375)
>>
>> at
>> org.tigris.subversion.subclipse.ui.actions.SVNAction$1.run(S VNAction.java:226)
>>
>> at
>> org.tigris.subversion.subclipse.ui.actions.SVNAction$2.run(S VNAction.java:235)
>>
>> at
>> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
>> at
>> org.tigris.subversion.subclipse.ui.actions.SVNAction.run(SVN Action.java:232)
>>
>> at
>> org.tigris.subversion.subclipse.ui.actions.CompareWithRemote Action.execute(CompareWithRemoteAction.java:53)
>>
>> at
>> org.tigris.subversion.subclipse.ui.actions.SVNAction.run(SVN Action.java:56)
>>
>> at
>> org.eclipse.ui.actions.ActionDelegate.runWithEvent(ActionDel egate.java:70)
>>
>> at
>> org.eclipse.ui.internal.PluginAction.runWithEvent(PluginActi on.java:241)
>> at
>> org.eclipse.jface.action.ActionContributionItem.handleWidget Selection(ActionContributionItem.java:583)
>>
>> at
>> org.eclipse.jface.action.ActionContributionItem.access$2(Act ionContributionItem.java:500)
>>
>> at
>> org.eclipse.jface.action.ActionContributionItem$5.handleEven t(ActionContributionItem.java:411)
>>
>> at org.eclipse.swt.widgets.EventTable.sendEvent(EventTable.java :84)
>> at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1003)
>> at
>> org.eclipse.swt.widgets.Display.runDeferredEvents(Display.ja va:3823)
>> at org.eclipse.swt.widgets.Display.readAndDispatch(Display.java :3422)
>> at
>> org.eclipse.ui.internal.Workbench.runEventLoop(Workbench.jav a:2382)
>> at org.eclipse.ui.internal.Workbench.runUI(Workbench.java:2346)
>> at org.eclipse.ui.internal.Workbench.access$4(Workbench.java:21 98)
>> at org.eclipse.ui.internal.Workbench$5.run(Workbench.java:493)
>> at
>> org.eclipse.core.databinding.observable.Realm.runWithDefault (Realm.java:288)
>>
>> at
>> org.eclipse.ui.internal.Workbench.createAndRunWorkbench(Work bench.java:488)
>>
>> at
>> org.eclipse.ui.PlatformUI.createAndRunWorkbench(PlatformUI.j ava:149)
>> at
>> org.eclipse.ui.internal.ide.application.IDEApplication.start (IDEApplication.java:113)
>>
>> at
>> org.eclipse.equinox.internal.app.EclipseAppHandle.run(Eclips eAppHandle.java:193)
>>
>> at
>> org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher .runApplication(EclipseAppLauncher.java:110)
>>
>> at
>> org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher .start(EclipseAppLauncher.java:79)
>>
>> at
>> org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseS tarter.java:386)
>>
>> at
>> org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseS tarter.java:179)
>>
>> at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
>> at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source)
>> at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source)
>> at java.lang.reflect.Method.invoke(Unknown Source)
>> at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java: 549)
>> at org.eclipse.equinox.launcher.Main.basicRun(Main.java:504)
>> at org.eclipse.equinox.launcher.Main.run(Main.java:1236)
>>
>> !ENTRY org.eclipse.jface 4 2 2008-10-16 11:29:47.703
>> !MESSAGE Problems occurred when invoking code from plug-in:
>> "org.eclipse.jface".
>> !STACK 0
>> java.lang.NullPointerException
>> at
>> org.eclipse.emf.codegen.ecore.genmodel.impl.GenDataTypeImpl. getQualifiedInstanceClassName(GenDataTypeImpl.java:212)
>>
>> at
>> org.eclipse.emf.codegen.ecore.genmodel.provider.GenDataTypeI temProvider.getText(GenDataTypeItemProvider.java:120)
>>
>> at
>> org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider .getText(AdapterFactoryLabelProvider.java:374)
>>
>> at
>> org.eclipse.jface.viewers.WrappedViewerLabelProvider.getText (WrappedViewerLabelProvider.java:108)
>>
>> at
>> org.eclipse.jface.viewers.WrappedViewerLabelProvider.update( WrappedViewerLabelProvider.java:164)
>>
>> at
>> org.eclipse.jface.viewers.ViewerColumn.refresh(ViewerColumn. java:145)
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer.doUpdateItem(Ab stractTreeViewer.java:932)
>>
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer$UpdateItemSafeR unnable.run(AbstractTreeViewer.java:102)
>>
>> at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:37)
>> at org.eclipse.core.runtime.Platform.run(Platform.java:880)
>> at org.eclipse.ui.internal.JFaceUtil$1.run(JFaceUtil.java:48)
>> at org.eclipse.jface.util.SafeRunnable.run(SafeRunnable.java:17 5)
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer.doUpdateItem(Ab stractTreeViewer.java:1012)
>>
>> at
>> org.eclipse.jface.viewers.StructuredViewer$UpdateItemSafeRun nable.run(StructuredViewer.java:466)
>>
>> at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:37)
>> at org.eclipse.core.runtime.Platform.run(Platform.java:880)
>> at org.eclipse.ui.internal.JFaceUtil$1.run(JFaceUtil.java:48)
>> at org.eclipse.jface.util.SafeRunnable.run(SafeRunnable.java:17 5)
>> at
>> org.eclipse.jface.viewers.StructuredViewer.updateItem(Struct uredViewer.java:2041)
>>
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer.createTreeItem( AbstractTreeViewer.java:827)
>>
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer$1.run(AbstractT reeViewer.java:802)
>>
>> at
>> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer.createChildren( AbstractTreeViewer.java:776)
>>
>> at
>> org.eclipse.jface.viewers.TreeViewer.createChildren(TreeView er.java:634)
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer.internalExpandT oLevel(AbstractTreeViewer.java:1702)
>>
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer.internalExpandT oLevel(AbstractTreeViewer.java:1712)
>>
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer.internalExpandT oLevel(AbstractTreeViewer.java:1712)
>>
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer.expandToLevel(A bstractTreeViewer.java:1054)
>>
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer.expandToLevel(A bstractTreeViewer.java:1035)
>>
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer.expandAll(Abstr actTreeViewer.java:1024)
>>
>> at
>> org.eclipse.emf.compare.ui.viewer.content.part.diff.ModelCon tentMergeDiffTab.inputChanged(ModelContentMergeDiffTab.java: 364)
>>
>> at
>> org.eclipse.jface.viewers.ContentViewer.setInput(ContentView er.java:251)
>> at
>> org.eclipse.jface.viewers.StructuredViewer.setInput(Structur edViewer.java:1603)
>>
>> at
>> org.eclipse.emf.compare.ui.viewer.content.part.diff.ModelCon tentMergeDiffTab.setReflectiveInput(ModelContentMergeDiffTab .java:278)
>>
>> at
>> org.eclipse.emf.compare.ui.viewer.content.part.ModelContentM ergeTabFolder.setInput(ModelContentMergeTabFolder.java:310)
>>
>> at
>> org.eclipse.emf.compare.ui.viewer.content.ModelContentMergeV iewer.updateContent(ModelContentMergeViewer.java:675)
>>
>> at
>> org.eclipse.compare.contentmergeviewer.ContentMergeViewer.in ternalRefresh(ContentMergeViewer.java:715)
>>
>> at
>> org.eclipse.compare.contentmergeviewer.ContentMergeViewer.in putChanged(ContentMergeViewer.java:615)
>>
>> at
>> org.eclipse.jface.viewers.ContentViewer.setInput(ContentView er.java:251)
>> at
>> org.eclipse.emf.compare.ui.viewer.content.ModelContentMergeV iewer.setInput(ModelContentMergeViewer.java:281)
>>
>> at
>> org.eclipse.compare.CompareViewerSwitchingPane.setInput(Comp areViewerSwitchingPane.java:256)
>>
>> at
>> org.eclipse.compare.CompareEditorInput.internalSetContentPan eInput(CompareEditorInput.java:791)
>>
>> at
>> org.eclipse.compare.CompareEditorInput.access$7(CompareEdito rInput.java:789)
>>
>> at
>> org.eclipse.compare.CompareEditorInput$13.run(CompareEditorI nput.java:729)
>>
>> at
>> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
>> at
>> org.eclipse.compare.CompareEditorInput.feed1(CompareEditorIn put.java:723)
>> at
>> org.eclipse.compare.CompareEditorInput.feedInput(CompareEdit orInput.java:701)
>>
>> at
>> org.eclipse.compare.CompareEditorInput.createContents(Compar eEditorInput.java:524)
>>
>> at
>> org.eclipse.compare.internal.CompareEditor.createCompareCont rol(CompareEditor.java:415)
>>
>> at
>> org.eclipse.compare.internal.CompareEditor.createPartControl (CompareEditor.java:379)
>>
>> at
>> org.eclipse.ui.internal.EditorReference.createPartHelper(Edi torReference.java:661)
>>
>> at
>> org.eclipse.ui.internal.EditorReference.createPart(EditorRef erence.java:428)
>>
>> at
>> org.eclipse.ui.internal.WorkbenchPartReference.getPart(Workb enchPartReference.java:594)
>>
>> at
>> org.eclipse.ui.internal.EditorReference.getEditor(EditorRefe rence.java:266)
>>
>> at
>> org.eclipse.ui.internal.WorkbenchPage.busyOpenEditorBatched( WorkbenchPage.java:2820)
>>
>> at
>> org.eclipse.ui.internal.WorkbenchPage.busyOpenEditor(Workben chPage.java:2729)
>>
>> at
>> org.eclipse.ui.internal.WorkbenchPage.access$11(WorkbenchPag e.java:2721)
>> at
>> org.eclipse.ui.internal.WorkbenchPage$10.run(WorkbenchPage.j ava:2673)
>> at
>> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
>> at
>> org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPa ge.java:2668)
>> at
>> org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPa ge.java:2652)
>> at
>> org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPa ge.java:2635)
>> at
>> org.eclipse.compare.internal.CompareUIPlugin$1.run(CompareUI Plugin.java:454)
>>
>> at
>> org.eclipse.compare.internal.CompareUIPlugin.syncExec(Compar eUIPlugin.java:1171)
>>
>> at
>> org.eclipse.compare.internal.CompareUIPlugin.internalOpenEdi tor(CompareUIPlugin.java:465)
>>
>> at
>> org.eclipse.compare.internal.CompareUIPlugin.openCompareEdit or(CompareUIPlugin.java:429)
>>
>> at
>> org.eclipse.compare.CompareUI.openCompareEditorOnPage(Compar eUI.java:135)
>> at
>> org.tigris.subversion.subclipse.ui.actions.CompareWithRemote Action$1.run(CompareWithRemoteAction.java:57)
>>
>> at
>> org.tigris.subversion.subclipse.ui.repository.RepositoryMana ger.run(RepositoryManager.java:375)
>>
>> at
>> org.tigris.subversion.subclipse.ui.actions.SVNAction$1.run(S VNAction.java:226)
>>
>> at
>> org.tigris.subversion.subclipse.ui.actions.SVNAction$2.run(S VNAction.java:235)
>>
>> at
>> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
>> at
>> org.tigris.subversion.subclipse.ui.actions.SVNAction.run(SVN Action.java:232)
>>
>> at
>> org.tigris.subversion.subclipse.ui.actions.CompareWithRemote Action.execute(CompareWithRemoteAction.java:53)
>>
>> at
>> org.tigris.subversion.subclipse.ui.actions.SVNAction.run(SVN Action.java:56)
>>
>> at
>> org.eclipse.ui.actions.ActionDelegate.runWithEvent(ActionDel egate.java:70)
>>
>> at
>> org.eclipse.ui.internal.PluginAction.runWithEvent(PluginActi on.java:241)
>> at
>> org.eclipse.jface.action.ActionContributionItem.handleWidget Selection(ActionContributionItem.java:583)
>>
>> at
>> org.eclipse.jface.action.ActionContributionItem.access$2(Act ionContributionItem.java:500)
>>
>> at
>> org.eclipse.jface.action.ActionContributionItem$5.handleEven t(ActionContributionItem.java:411)
>>
>> at org.eclipse.swt.widgets.EventTable.sendEvent(EventTable.java :84)
>> at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1003)
>> at
>> org.eclipse.swt.widgets.Display.runDeferredEvents(Display.ja va:3823)
>> at org.eclipse.swt.widgets.Display.readAndDispatch(Display.java :3422)
>> at
>> org.eclipse.ui.internal.Workbench.runEventLoop(Workbench.jav a:2382)
>> at org.eclipse.ui.internal.Workbench.runUI(Workbench.java:2346)
>> at org.eclipse.ui.internal.Workbench.access$4(Workbench.java:21 98)
>> at org.eclipse.ui.internal.Workbench$5.run(Workbench.java:493)
>> at
>> org.eclipse.core.databinding.observable.Realm.runWithDefault (Realm.java:288)
>>
>> at
>> org.eclipse.ui.internal.Workbench.createAndRunWorkbench(Work bench.java:488)
>>
>> at
>> org.eclipse.ui.PlatformUI.createAndRunWorkbench(PlatformUI.j ava:149)
>> at
>> org.eclipse.ui.internal.ide.application.IDEApplication.start (IDEApplication.java:113)
>>
>> at
>> org.eclipse.equinox.internal.app.EclipseAppHandle.run(Eclips eAppHandle.java:193)
>>
>> at
>> org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher .runApplication(EclipseAppLauncher.java:110)
>>
>> at
>> org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher .start(EclipseAppLauncher.java:79)
>>
>> at
>> org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseS tarter.java:386)
>>
>> at
>> org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseS tarter.java:179)
>>
>> at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
>> at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source)
>> at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source)
>> at java.lang.reflect.Method.invoke(Unknown Source)
>> at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java: 549)
>> at org.eclipse.equinox.launcher.Main.basicRun(Main.java:504)
>> at org.eclipse.equinox.launcher.Main.run(Main.java:1236)
>>
>> !ENTRY org.eclipse.jface 4 2 2008-10-16 11:29:47.781
>> !MESSAGE Problems occurred when invoking code from plug-in:
>> "org.eclipse.jface".
>> !STACK 0
>> java.lang.NullPointerException
>> at
>> org.eclipse.emf.codegen.ecore.genmodel.impl.GenDataTypeImpl. getQualifiedInstanceClassName(GenDataTypeImpl.java:212)
>>
>> at
>> org.eclipse.emf.codegen.ecore.genmodel.provider.GenDataTypeI temProvider.getText(GenDataTypeItemProvider.java:120)
>>
>> at
>> org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider .getText(AdapterFactoryLabelProvider.java:374)
>>
>> at
>> org.eclipse.jface.viewers.WrappedViewerLabelProvider.getText (WrappedViewerLabelProvider.java:108)
>>
>> at
>> org.eclipse.jface.viewers.WrappedViewerLabelProvider.update( WrappedViewerLabelProvider.java:164)
>>
>> at
>> org.eclipse.jface.viewers.ViewerColumn.refresh(ViewerColumn. java:145)
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer.doUpdateItem(Ab stractTreeViewer.java:932)
>>
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer$UpdateItemSafeR unnable.run(AbstractTreeViewer.java:102)
>>
>> at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:37)
>> at org.eclipse.core.runtime.Platform.run(Platform.java:880)
>> at org.eclipse.ui.internal.JFaceUtil$1.run(JFaceUtil.java:48)
>> at org.eclipse.jface.util.SafeRunnable.run(SafeRunnable.java:17 5)
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer.doUpdateItem(Ab stractTreeViewer.java:1012)
>>
>> at
>> org.eclipse.jface.viewers.StructuredViewer$UpdateItemSafeRun nable.run(StructuredViewer.java:466)
>>
>> at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:37)
>> at org.eclipse.core.runtime.Platform.run(Platform.java:880)
>> at org.eclipse.ui.internal.JFaceUtil$1.run(JFaceUtil.java:48)
>> at org.eclipse.jface.util.SafeRunnable.run(SafeRunnable.java:17 5)
>> at
>> org.eclipse.jface.viewers.StructuredViewer.updateItem(Struct uredViewer.java:2041)
>>
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer.createTreeItem( AbstractTreeViewer.java:827)
>>
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer$1.run(AbstractT reeViewer.java:802)
>>
>> at
>> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer.createChildren( AbstractTreeViewer.java:776)
>>
>> at
>> org.eclipse.jface.viewers.TreeViewer.createChildren(TreeView er.java:634)
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer.internalExpandT oLevel(AbstractTreeViewer.java:1702)
>>
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer.internalExpandT oLevel(AbstractTreeViewer.java:1712)
>>
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer.internalExpandT oLevel(AbstractTreeViewer.java:1712)
>>
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer.expandToLevel(A bstractTreeViewer.java:1054)
>>
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer.expandToLevel(A bstractTreeViewer.java:1035)
>>
>> at
>> org.eclipse.jface.viewers.AbstractTreeViewer.expandAll(Abstr actTreeViewer.java:1024)
>>
>> at
>> org.eclipse.emf.compare.ui.viewer.content.part.diff.ModelCon tentMergeDiffTab.inputChanged(ModelContentMergeDiffTab.java: 364)
>>
>> at
>> org.eclipse.jface.viewers.ContentViewer.setInput(ContentView er.java:251)
>> at
>> org.eclipse.jface.viewers.StructuredViewer.setInput(Structur edViewer.java:1603)
>>
>> at
>> org.eclipse.emf.compare.ui.viewer.content.part.diff.ModelCon tentMergeDiffTab.setReflectiveInput(ModelContentMergeDiffTab .java:278)
>>
>> at
>> org.eclipse.emf.compare.ui.viewer.content.part.ModelContentM ergeTabFolder.setInput(ModelContentMergeTabFolder.java:310)
>>
>> at
>> org.eclipse.emf.compare.ui.viewer.content.ModelContentMergeV iewer.updateContent(ModelContentMergeViewer.java:675)
>>
>> at
>> org.eclipse.compare.contentmergeviewer.ContentMergeViewer.in ternalRefresh(ContentMergeViewer.java:715)
>>
>> at
>> org.eclipse.compare.contentmergeviewer.ContentMergeViewer.in putChanged(ContentMergeViewer.java:615)
>>
>> at
>> org.eclipse.jface.viewers.ContentViewer.setInput(ContentView er.java:251)
>> at
>> org.eclipse.emf.compare.ui.viewer.content.ModelContentMergeV iewer.setInput(ModelContentMergeViewer.java:281)
>>
>> at
>> org.eclipse.compare.CompareViewerSwitchingPane.setInput(Comp areViewerSwitchingPane.java:256)
>>
>> at
>> org.eclipse.compare.CompareEditorInput.internalSetContentPan eInput(CompareEditorInput.java:791)
>>
>> at
>> org.eclipse.compare.CompareEditorInput.access$7(CompareEdito rInput.java:789)
>>
>> at
>> org.eclipse.compare.CompareEditorInput$13.run(CompareEditorI nput.java:729)
>>
>> at
>> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
>> at
>> org.eclipse.compare.CompareEditorInput.feed1(CompareEditorIn put.java:723)
>> at
>> org.eclipse.compare.CompareEditorInput.feedInput(CompareEdit orInput.java:701)
>>
>> at
>> org.eclipse.compare.CompareEditorInput.createContents(Compar eEditorInput.java:524)
>>
>> at
>> org.eclipse.compare.internal.CompareEditor.createCompareCont rol(CompareEditor.java:415)
>>
>> at
>> org.eclipse.compare.internal.CompareEditor.createPartControl (CompareEditor.java:379)
>>
>> at
>> org.eclipse.ui.internal.EditorReference.createPartHelper(Edi torReference.java:661)
>>
>> at
>> org.eclipse.ui.internal.EditorReference.createPart(EditorRef erence.java:428)
>>
>> at
>> org.eclipse.ui.internal.WorkbenchPartReference.getPart(Workb enchPartReference.java:594)
>>
>> at
>> org.eclipse.ui.internal.EditorReference.getEditor(EditorRefe rence.java:266)
>>
>> at
>> org.eclipse.ui.internal.WorkbenchPage.busyOpenEditorBatched( WorkbenchPage.java:2820)
>>
>> at
>> org.eclipse.ui.internal.WorkbenchPage.busyOpenEditor(Workben chPage.java:2729)
>>
>> at
>> org.eclipse.ui.internal.WorkbenchPage.access$11(WorkbenchPag e.java:2721)
>> at
>> org.eclipse.ui.internal.WorkbenchPage$10.run(WorkbenchPage.j ava:2673)
>> at
>> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
>> at
>> org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPa ge.java:2668)
>> at
>> org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPa ge.java:2652)
>> at
>> org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPa ge.java:2635)
>> at
>> org.eclipse.compare.internal.CompareUIPlugin$1.run(CompareUI Plugin.java:454)
>>
>> at
>> org.eclipse.compare.internal.CompareUIPlugin.syncExec(Compar eUIPlugin.java:1171)
>>
>> at
>> org.eclipse.compare.internal.CompareUIPlugin.internalOpenEdi tor(CompareUIPlugin.java:465)
>>
>> at
>> org.eclipse.compare.internal.CompareUIPlugin.openCompareEdit or(CompareUIPlugin.java:429)
>>
>> at
>> org.eclipse.compare.CompareUI.openCompareEditorOnPage(Compar eUI.java:135)
>> at
>> org.tigris.subversion.subclipse.ui.actions.CompareWithRemote Action$1.run(CompareWithRemoteAction.java:57)
>>
>> at
>> org.tigris.subversion.subclipse.ui.repository.RepositoryMana ger.run(RepositoryManager.java:375)
>>
>> at
>> org.tigris.subversion.subclipse.ui.actions.SVNAction$1.run(S VNAction.java:226)
>>
>> at
>> org.tigris.subversion.subclipse.ui.actions.SVNAction$2.run(S VNAction.java:235)
>>
>> at
>> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
>> at
>> org.tigris.subversion.subclipse.ui.actions.SVNAction.run(SVN Action.java:232)
>>
>> at
>> org.tigris.subversion.subclipse.ui.actions.CompareWithRemote Action.execute(CompareWithRemoteAction.java:53)
>>
>> at
>> org.tigris.subversion.subclipse.ui.actions.SVNAction.run(SVN Action.java:56)
>>
>> at
>> org.eclipse.ui.actions.ActionDelegate.runWithEvent(ActionDel egate.java:70)
>>
>> at
>> org.eclipse.ui.internal.PluginAction.runWithEvent(PluginActi on.java:241)
>> at
>> org.eclipse.jface.action.ActionContributionItem.handleWidget Selection(ActionContributionItem.java:583)
>>
>> at
>> org.eclipse.jface.action.ActionContributionItem.access$2(Act ionContributionItem.java:500)
>>
>> at
>> org.eclipse.jface.action.ActionContributionItem$5.handleEven t(ActionContributionItem.java:411)
>>
>> at org.eclipse.swt.widgets.EventTable.sendEvent(EventTable.java :84)
>> at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1003)
>> at
>> org.eclipse.swt.widgets.Display.runDeferredEvents(Display.ja va:3823)
>> at org.eclipse.swt.widgets.Display.readAndDispatch(Display.java :3422)
>> at
>> org.eclipse.ui.internal.Workbench.runEventLoop(Workbench.jav a:2382)
>> at org.eclipse.ui.internal.Workbench.runUI(Workbench.java:2346)
>> at org.eclipse.ui.internal.Workbench.access$4(Workbench.java:21 98)
>> at org.eclipse.ui.internal.Workbench$5.run(Workbench.java:493)
>> at
>> org.eclipse.core.databinding.observable.Realm.runWithDefault (Realm.java:288)
>>
>> at
>> org.eclipse.ui.internal.Workbench.createAndRunWorkbench(Work bench.java:488)
>>
>> at
>> org.eclipse.ui.PlatformUI.createAndRunWorkbench(PlatformUI.j ava:149)
>> at
>> org.eclipse.ui.internal.ide.application.IDEApplication.start (IDEApplication.java:113)
>>
>> at
>> org.eclipse.equinox.internal.app.EclipseAppHandle.run(Eclips eAppHandle.java:193)
>>
>> at
>> org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher .runApplication(EclipseAppLauncher.java:110)
>>
>> at
>> org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher .start(EclipseAppLauncher.java:79)
>>
>> at
>> org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseS tarter.java:386)
>>
>> at
>> org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseS tarter.java:179)
>>
>> at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
>> at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source)
>> at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source)
>> at java.lang.reflect.Method.invoke(Unknown Source)
>> at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java: 549)
>> at org.eclipse.equinox.launcher.Main.basicRun(Main.java:504)
>> at org.eclipse.equinox.launcher.Main.run(Main.java:1236)
>>
>>
>>
>> Cédric Brun wrote:
>>> Hi Marco,
>>>
>>> EMF compare is, indeed, already integrated with Subversion if you're
>>> using a an plugin providing Eclipse integration with Subversion (aka
>>> Subversive or Subclipse). That means for instance that comparing
>>> models with the team repository should trigger EMF Compare.
>>>
>>> We even have a specific plugin for Subversive correcting a few issues
>>> we had at some time but as we are not sure yet if it's an issue from
>>> our side or from the subversive implementation we did not build this
>>> plugin yet and it's only available on the Eclipse modeling CVS.
>>>
>>> Anyway installing an SVN plugin + EMF compare should work fine,
>>> please tell us if you encounter issues.
>>> Cédric
>>>
>>> Marco wrote:
>>>
>>>> Hi! I got a question and it would be great if anyone could help me out
>>>> with this one: Is there a way to use EMF Compare as differencing and
>>>> merge
>>>> tool in subversion? I did not find anything in the web, yet. I'm
>>>> wondering
>>>> if this would be useful (this is what I think) and if so, I'm
>>>> looking for
>>>> an existing integration.
>>>
--------------040202060309030609060007
Content-Type: text/x-vcard; charset=utf-8;
name="laurent_goubet.vcf"
Content-Transfer-Encoding: base64
Content-Disposition: attachment;
filename="laurent_goubet.vcf"
YmVnaW46dmNhcmQNCmZuOkxhdXJlbnQgR291YmV0DQpuOkdvdWJldDtMYXVy ZW50DQpvcmc6
PGEgaHJlZj0iaHR0cDovL3d3dy5vYmVvLmZyLyI+T2JlbzwvYT4NCmVtYWls O2ludGVybmV0
OmxhdXJlbnQuZ291YmV0QG9iZW8uZnINCnVybDpodHRwOi8vd3d3Lm9iZW8u ZnINCnZlcnNp
b246Mi4xDQplbmQ6dmNhcmQNCg0K
--------------040202060309030609060007--
|
|
| |
| Re: Integrate EMF Compare in Subversion [message #620363 is a reply to message #130354] |
Tue, 21 October 2008 07:14 |
|
This is a multi-part message in MIME format.
--------------010104010006050808000702
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
Thanks Sudhakar,
We'll try to handle this issue asap.
Laurent Goubet
Obeo
Sudhakar a écrit :
> Logged bug
>
> https://bugs.eclipse.org/bugs/show_bug.cgi?id=251456
>
> Thanks
> -sud
>
>
> laurent Goubet wrote:
>> Hi Sudhakar,
>>
>> We've has many issues with the genmodel comparison ... something must
>> be wrong in the way we load it. Can you fill a bug with your stack
>> trace so that we remember this has to be fixed?
>>
>> Laurent Goubet
>> Obeo
>>
>> Sudhakar a écrit :
>>> I just noticed that this bug occurs when you compare a genmodel file
>>> even with it's local history. So this may rule out any issue with
>>> Suversion/Subclipe and place the issue in the Eclipse file versioning
>>> code. This is verified on Eclipse 3.4.1
>>>
>>> -sud
>>>
>>> Sudhakar wrote:
>>>> I've verified that EMF Compare works when comparing workspace .ecore
>>>> files against those stored in subversion.
>>>>
>>>> But when I attempt to compare a workspace .genmodel file against
>>>> that in subversion I get several NPE. I'm using subclipse 1.4.5 with
>>>> EMF Compare 0.8.1. If I compare the two .genmodel files stored in my
>>>> workspace I don't get these NPEs.
>>>>
>>>>
>>>> Here is the stack trace:
>>>>
>>>> !ENTRY org.eclipse.jface 4 2 2008-10-16 11:29:47.484
>>>> !MESSAGE Problems occurred when invoking code from plug-in:
>>>> "org.eclipse.jface".
>>>> !STACK 0
>>>> java.lang.NullPointerException
>>>> at
>>>> org.eclipse.emf.codegen.ecore.genmodel.impl.GenDataTypeImpl. getQualifiedInstanceClassName(GenDataTypeImpl.java:212)
>>>>
>>>> at
>>>> org.eclipse.emf.codegen.ecore.genmodel.provider.GenDataTypeI temProvider.getText(GenDataTypeItemProvider.java:120)
>>>>
>>>> at
>>>> org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider .getText(AdapterFactoryLabelProvider.java:374)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.WrappedViewerLabelProvider.getText (WrappedViewerLabelProvider.java:108)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.WrappedViewerLabelProvider.update( WrappedViewerLabelProvider.java:164)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.ViewerColumn.refresh(ViewerColumn. java:145)
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer.doUpdateItem(Ab stractTreeViewer.java:932)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer$UpdateItemSafeR unnable.run(AbstractTreeViewer.java:102)
>>>>
>>>> at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:37)
>>>> at org.eclipse.core.runtime.Platform.run(Platform.java:880)
>>>> at org.eclipse.ui.internal.JFaceUtil$1.run(JFaceUtil.java:48)
>>>> at org.eclipse.jface.util.SafeRunnable.run(SafeRunnable.java:17 5)
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer.doUpdateItem(Ab stractTreeViewer.java:1012)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.StructuredViewer$UpdateItemSafeRun nable.run(StructuredViewer.java:466)
>>>>
>>>> at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:37)
>>>> at org.eclipse.core.runtime.Platform.run(Platform.java:880)
>>>> at org.eclipse.ui.internal.JFaceUtil$1.run(JFaceUtil.java:48)
>>>> at org.eclipse.jface.util.SafeRunnable.run(SafeRunnable.java:17 5)
>>>> at
>>>> org.eclipse.jface.viewers.StructuredViewer.updateItem(Struct uredViewer.java:2041)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer.createTreeItem( AbstractTreeViewer.java:827)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer$1.run(AbstractT reeViewer.java:802)
>>>>
>>>> at
>>>> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer.createChildren( AbstractTreeViewer.java:776)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.TreeViewer.createChildren(TreeView er.java:634)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer.internalExpandT oLevel(AbstractTreeViewer.java:1702)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer.internalExpandT oLevel(AbstractTreeViewer.java:1712)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer.internalExpandT oLevel(AbstractTreeViewer.java:1712)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer.expandToLevel(A bstractTreeViewer.java:1054)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer.expandToLevel(A bstractTreeViewer.java:1035)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer.expandAll(Abstr actTreeViewer.java:1024)
>>>>
>>>> at
>>>> org.eclipse.emf.compare.ui.viewer.content.part.diff.ModelCon tentMergeDiffTab.inputChanged(ModelContentMergeDiffTab.java: 364)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.ContentViewer.setInput(ContentView er.java:251)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.StructuredViewer.setInput(Structur edViewer.java:1603)
>>>>
>>>> at
>>>> org.eclipse.emf.compare.ui.viewer.content.part.diff.ModelCon tentMergeDiffTab.setReflectiveInput(ModelContentMergeDiffTab .java:278)
>>>>
>>>> at
>>>> org.eclipse.emf.compare.ui.viewer.content.part.ModelContentM ergeTabFolder.setInput(ModelContentMergeTabFolder.java:310)
>>>>
>>>> at
>>>> org.eclipse.emf.compare.ui.viewer.content.ModelContentMergeV iewer.updateContent(ModelContentMergeViewer.java:675)
>>>>
>>>> at
>>>> org.eclipse.compare.contentmergeviewer.ContentMergeViewer.in ternalRefresh(ContentMergeViewer.java:715)
>>>>
>>>> at
>>>> org.eclipse.compare.contentmergeviewer.ContentMergeViewer.in putChanged(ContentMergeViewer.java:615)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.ContentViewer.setInput(ContentView er.java:251)
>>>>
>>>> at
>>>> org.eclipse.emf.compare.ui.viewer.content.ModelContentMergeV iewer.setInput(ModelContentMergeViewer.java:281)
>>>>
>>>> at
>>>> org.eclipse.compare.CompareViewerSwitchingPane.setInput(Comp areViewerSwitchingPane.java:256)
>>>>
>>>> at
>>>> org.eclipse.compare.CompareEditorInput.internalSetContentPan eInput(CompareEditorInput.java:791)
>>>>
>>>> at
>>>> org.eclipse.compare.CompareEditorInput.access$7(CompareEdito rInput.java:789)
>>>>
>>>> at
>>>> org.eclipse.compare.CompareEditorInput$13.run(CompareEditorI nput.java:729)
>>>>
>>>> at
>>>> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
>>>> at
>>>> org.eclipse.compare.CompareEditorInput.feed1(CompareEditorIn put.java:723)
>>>>
>>>> at
>>>> org.eclipse.compare.CompareEditorInput.feedInput(CompareEdit orInput.java:701)
>>>>
>>>> at
>>>> org.eclipse.compare.CompareEditorInput.createContents(Compar eEditorInput.java:524)
>>>>
>>>> at
>>>> org.eclipse.compare.internal.CompareEditor.createCompareCont rol(CompareEditor.java:415)
>>>>
>>>> at
>>>> org.eclipse.compare.internal.CompareEditor.createPartControl (CompareEditor.java:379)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.EditorReference.createPartHelper(Edi torReference.java:661)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.EditorReference.createPart(EditorRef erence.java:428)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.WorkbenchPartReference.getPart(Workb enchPartReference.java:594)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.EditorReference.getEditor(EditorRefe rence.java:266)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.WorkbenchPage.busyOpenEditorBatched( WorkbenchPage.java:2820)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.WorkbenchPage.busyOpenEditor(Workben chPage.java:2729)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.WorkbenchPage.access$11(WorkbenchPag e.java:2721)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.WorkbenchPage$10.run(WorkbenchPage.j ava:2673)
>>>> at
>>>> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
>>>> at
>>>> org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPa ge.java:2668)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPa ge.java:2652)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPa ge.java:2635)
>>>>
>>>> at
>>>> org.eclipse.compare.internal.CompareUIPlugin$1.run(CompareUI Plugin.java:454)
>>>>
>>>> at
>>>> org.eclipse.compare.internal.CompareUIPlugin.syncExec(Compar eUIPlugin.java:1171)
>>>>
>>>> at
>>>> org.eclipse.compare.internal.CompareUIPlugin.internalOpenEdi tor(CompareUIPlugin.java:465)
>>>>
>>>> at
>>>> org.eclipse.compare.internal.CompareUIPlugin.openCompareEdit or(CompareUIPlugin.java:429)
>>>>
>>>> at
>>>> org.eclipse.compare.CompareUI.openCompareEditorOnPage(Compar eUI.java:135)
>>>>
>>>> at
>>>> org.tigris.subversion.subclipse.ui.actions.CompareWithRemote Action$1.run(CompareWithRemoteAction.java:57)
>>>>
>>>> at
>>>> org.tigris.subversion.subclipse.ui.repository.RepositoryMana ger.run(RepositoryManager.java:375)
>>>>
>>>> at
>>>> org.tigris.subversion.subclipse.ui.actions.SVNAction$1.run(S VNAction.java:226)
>>>>
>>>> at
>>>> org.tigris.subversion.subclipse.ui.actions.SVNAction$2.run(S VNAction.java:235)
>>>>
>>>> at
>>>> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
>>>> at
>>>> org.tigris.subversion.subclipse.ui.actions.SVNAction.run(SVN Action.java:232)
>>>>
>>>> at
>>>> org.tigris.subversion.subclipse.ui.actions.CompareWithRemote Action.execute(CompareWithRemoteAction.java:53)
>>>>
>>>> at
>>>> org.tigris.subversion.subclipse.ui.actions.SVNAction.run(SVN Action.java:56)
>>>>
>>>> at
>>>> org.eclipse.ui.actions.ActionDelegate.runWithEvent(ActionDel egate.java:70)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.PluginAction.runWithEvent(PluginActi on.java:241)
>>>>
>>>> at
>>>> org.eclipse.jface.action.ActionContributionItem.handleWidget Selection(ActionContributionItem.java:583)
>>>>
>>>> at
>>>> org.eclipse.jface.action.ActionContributionItem.access$2(Act ionContributionItem.java:500)
>>>>
>>>> at
>>>> org.eclipse.jface.action.ActionContributionItem$5.handleEven t(ActionContributionItem.java:411)
>>>>
>>>> at org.eclipse.swt.widgets.EventTable.sendEvent(EventTable.java :84)
>>>> at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1003)
>>>> at
>>>> org.eclipse.swt.widgets.Display.runDeferredEvents(Display.ja va:3823)
>>>> at
>>>> org.eclipse.swt.widgets.Display.readAndDispatch(Display.java :3422)
>>>> at
>>>> org.eclipse.ui.internal.Workbench.runEventLoop(Workbench.jav a:2382)
>>>> at org.eclipse.ui.internal.Workbench.runUI(Workbench.java:2346)
>>>> at org.eclipse.ui.internal.Workbench.access$4(Workbench.java:21 98)
>>>> at org.eclipse.ui.internal.Workbench$5.run(Workbench.java:493)
>>>> at
>>>> org.eclipse.core.databinding.observable.Realm.runWithDefault (Realm.java:288)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.Workbench.createAndRunWorkbench(Work bench.java:488)
>>>>
>>>> at
>>>> org.eclipse.ui.PlatformUI.createAndRunWorkbench(PlatformUI.j ava:149)
>>>> at
>>>> org.eclipse.ui.internal.ide.application.IDEApplication.start (IDEApplication.java:113)
>>>>
>>>> at
>>>> org.eclipse.equinox.internal.app.EclipseAppHandle.run(Eclips eAppHandle.java:193)
>>>>
>>>> at
>>>> org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher .runApplication(EclipseAppLauncher.java:110)
>>>>
>>>> at
>>>> org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher .start(EclipseAppLauncher.java:79)
>>>>
>>>> at
>>>> org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseS tarter.java:386)
>>>>
>>>> at
>>>> org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseS tarter.java:179)
>>>>
>>>> at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
>>>> at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source)
>>>> at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source)
>>>> at java.lang.reflect.Method.invoke(Unknown Source)
>>>> at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java: 549)
>>>> at org.eclipse.equinox.launcher.Main.basicRun(Main.java:504)
>>>> at org.eclipse.equinox.launcher.Main.run(Main.java:1236)
>>>>
>>>> !ENTRY org.eclipse.jface 4 2 2008-10-16 11:29:47.703
>>>> !MESSAGE Problems occurred when invoking code from plug-in:
>>>> "org.eclipse.jface".
>>>> !STACK 0
>>>> java.lang.NullPointerException
>>>> at
>>>> org.eclipse.emf.codegen.ecore.genmodel.impl.GenDataTypeImpl. getQualifiedInstanceClassName(GenDataTypeImpl.java:212)
>>>>
>>>> at
>>>> org.eclipse.emf.codegen.ecore.genmodel.provider.GenDataTypeI temProvider.getText(GenDataTypeItemProvider.java:120)
>>>>
>>>> at
>>>> org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider .getText(AdapterFactoryLabelProvider.java:374)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.WrappedViewerLabelProvider.getText (WrappedViewerLabelProvider.java:108)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.WrappedViewerLabelProvider.update( WrappedViewerLabelProvider.java:164)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.ViewerColumn.refresh(ViewerColumn. java:145)
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer.doUpdateItem(Ab stractTreeViewer.java:932)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer$UpdateItemSafeR unnable.run(AbstractTreeViewer.java:102)
>>>>
>>>> at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:37)
>>>> at org.eclipse.core.runtime.Platform.run(Platform.java:880)
>>>> at org.eclipse.ui.internal.JFaceUtil$1.run(JFaceUtil.java:48)
>>>> at org.eclipse.jface.util.SafeRunnable.run(SafeRunnable.java:17 5)
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer.doUpdateItem(Ab stractTreeViewer.java:1012)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.StructuredViewer$UpdateItemSafeRun nable.run(StructuredViewer.java:466)
>>>>
>>>> at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:37)
>>>> at org.eclipse.core.runtime.Platform.run(Platform.java:880)
>>>> at org.eclipse.ui.internal.JFaceUtil$1.run(JFaceUtil.java:48)
>>>> at org.eclipse.jface.util.SafeRunnable.run(SafeRunnable.java:17 5)
>>>> at
>>>> org.eclipse.jface.viewers.StructuredViewer.updateItem(Struct uredViewer.java:2041)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer.createTreeItem( AbstractTreeViewer.java:827)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer$1.run(AbstractT reeViewer.java:802)
>>>>
>>>> at
>>>> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer.createChildren( AbstractTreeViewer.java:776)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.TreeViewer.createChildren(TreeView er.java:634)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer.internalExpandT oLevel(AbstractTreeViewer.java:1702)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer.internalExpandT oLevel(AbstractTreeViewer.java:1712)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer.internalExpandT oLevel(AbstractTreeViewer.java:1712)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer.expandToLevel(A bstractTreeViewer.java:1054)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer.expandToLevel(A bstractTreeViewer.java:1035)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer.expandAll(Abstr actTreeViewer.java:1024)
>>>>
>>>> at
>>>> org.eclipse.emf.compare.ui.viewer.content.part.diff.ModelCon tentMergeDiffTab.inputChanged(ModelContentMergeDiffTab.java: 364)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.ContentViewer.setInput(ContentView er.java:251)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.StructuredViewer.setInput(Structur edViewer.java:1603)
>>>>
>>>> at
>>>> org.eclipse.emf.compare.ui.viewer.content.part.diff.ModelCon tentMergeDiffTab.setReflectiveInput(ModelContentMergeDiffTab .java:278)
>>>>
>>>> at
>>>> org.eclipse.emf.compare.ui.viewer.content.part.ModelContentM ergeTabFolder.setInput(ModelContentMergeTabFolder.java:310)
>>>>
>>>> at
>>>> org.eclipse.emf.compare.ui.viewer.content.ModelContentMergeV iewer.updateContent(ModelContentMergeViewer.java:675)
>>>>
>>>> at
>>>> org.eclipse.compare.contentmergeviewer.ContentMergeViewer.in ternalRefresh(ContentMergeViewer.java:715)
>>>>
>>>> at
>>>> org.eclipse.compare.contentmergeviewer.ContentMergeViewer.in putChanged(ContentMergeViewer.java:615)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.ContentViewer.setInput(ContentView er.java:251)
>>>>
>>>> at
>>>> org.eclipse.emf.compare.ui.viewer.content.ModelContentMergeV iewer.setInput(ModelContentMergeViewer.java:281)
>>>>
>>>> at
>>>> org.eclipse.compare.CompareViewerSwitchingPane.setInput(Comp areViewerSwitchingPane.java:256)
>>>>
>>>> at
>>>> org.eclipse.compare.CompareEditorInput.internalSetContentPan eInput(CompareEditorInput.java:791)
>>>>
>>>> at
>>>> org.eclipse.compare.CompareEditorInput.access$7(CompareEdito rInput.java:789)
>>>>
>>>> at
>>>> org.eclipse.compare.CompareEditorInput$13.run(CompareEditorI nput.java:729)
>>>>
>>>> at
>>>> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
>>>> at
>>>> org.eclipse.compare.CompareEditorInput.feed1(CompareEditorIn put.java:723)
>>>>
>>>> at
>>>> org.eclipse.compare.CompareEditorInput.feedInput(CompareEdit orInput.java:701)
>>>>
>>>> at
>>>> org.eclipse.compare.CompareEditorInput.createContents(Compar eEditorInput.java:524)
>>>>
>>>> at
>>>> org.eclipse.compare.internal.CompareEditor.createCompareCont rol(CompareEditor.java:415)
>>>>
>>>> at
>>>> org.eclipse.compare.internal.CompareEditor.createPartControl (CompareEditor.java:379)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.EditorReference.createPartHelper(Edi torReference.java:661)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.EditorReference.createPart(EditorRef erence.java:428)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.WorkbenchPartReference.getPart(Workb enchPartReference.java:594)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.EditorReference.getEditor(EditorRefe rence.java:266)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.WorkbenchPage.busyOpenEditorBatched( WorkbenchPage.java:2820)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.WorkbenchPage.busyOpenEditor(Workben chPage.java:2729)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.WorkbenchPage.access$11(WorkbenchPag e.java:2721)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.WorkbenchPage$10.run(WorkbenchPage.j ava:2673)
>>>> at
>>>> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
>>>> at
>>>> org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPa ge.java:2668)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPa ge.java:2652)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPa ge.java:2635)
>>>>
>>>> at
>>>> org.eclipse.compare.internal.CompareUIPlugin$1.run(CompareUI Plugin.java:454)
>>>>
>>>> at
>>>> org.eclipse.compare.internal.CompareUIPlugin.syncExec(Compar eUIPlugin.java:1171)
>>>>
>>>> at
>>>> org.eclipse.compare.internal.CompareUIPlugin.internalOpenEdi tor(CompareUIPlugin.java:465)
>>>>
>>>> at
>>>> org.eclipse.compare.internal.CompareUIPlugin.openCompareEdit or(CompareUIPlugin.java:429)
>>>>
>>>> at
>>>> org.eclipse.compare.CompareUI.openCompareEditorOnPage(Compar eUI.java:135)
>>>>
>>>> at
>>>> org.tigris.subversion.subclipse.ui.actions.CompareWithRemote Action$1.run(CompareWithRemoteAction.java:57)
>>>>
>>>> at
>>>> org.tigris.subversion.subclipse.ui.repository.RepositoryMana ger.run(RepositoryManager.java:375)
>>>>
>>>> at
>>>> org.tigris.subversion.subclipse.ui.actions.SVNAction$1.run(S VNAction.java:226)
>>>>
>>>> at
>>>> org.tigris.subversion.subclipse.ui.actions.SVNAction$2.run(S VNAction.java:235)
>>>>
>>>> at
>>>> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
>>>> at
>>>> org.tigris.subversion.subclipse.ui.actions.SVNAction.run(SVN Action.java:232)
>>>>
>>>> at
>>>> org.tigris.subversion.subclipse.ui.actions.CompareWithRemote Action.execute(CompareWithRemoteAction.java:53)
>>>>
>>>> at
>>>> org.tigris.subversion.subclipse.ui.actions.SVNAction.run(SVN Action.java:56)
>>>>
>>>> at
>>>> org.eclipse.ui.actions.ActionDelegate.runWithEvent(ActionDel egate.java:70)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.PluginAction.runWithEvent(PluginActi on.java:241)
>>>>
>>>> at
>>>> org.eclipse.jface.action.ActionContributionItem.handleWidget Selection(ActionContributionItem.java:583)
>>>>
>>>> at
>>>> org.eclipse.jface.action.ActionContributionItem.access$2(Act ionContributionItem.java:500)
>>>>
>>>> at
>>>> org.eclipse.jface.action.ActionContributionItem$5.handleEven t(ActionContributionItem.java:411)
>>>>
>>>> at org.eclipse.swt.widgets.EventTable.sendEvent(EventTable.java :84)
>>>> at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1003)
>>>> at
>>>> org.eclipse.swt.widgets.Display.runDeferredEvents(Display.ja va:3823)
>>>> at
>>>> org.eclipse.swt.widgets.Display.readAndDispatch(Display.java :3422)
>>>> at
>>>> org.eclipse.ui.internal.Workbench.runEventLoop(Workbench.jav a:2382)
>>>> at org.eclipse.ui.internal.Workbench.runUI(Workbench.java:2346)
>>>> at org.eclipse.ui.internal.Workbench.access$4(Workbench.java:21 98)
>>>> at org.eclipse.ui.internal.Workbench$5.run(Workbench.java:493)
>>>> at
>>>> org.eclipse.core.databinding.observable.Realm.runWithDefault (Realm.java:288)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.Workbench.createAndRunWorkbench(Work bench.java:488)
>>>>
>>>> at
>>>> org.eclipse.ui.PlatformUI.createAndRunWorkbench(PlatformUI.j ava:149)
>>>> at
>>>> org.eclipse.ui.internal.ide.application.IDEApplication.start (IDEApplication.java:113)
>>>>
>>>> at
>>>> org.eclipse.equinox.internal.app.EclipseAppHandle.run(Eclips eAppHandle.java:193)
>>>>
>>>> at
>>>> org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher .runApplication(EclipseAppLauncher.java:110)
>>>>
>>>> at
>>>> org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher .start(EclipseAppLauncher.java:79)
>>>>
>>>> at
>>>> org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseS tarter.java:386)
>>>>
>>>> at
>>>> org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseS tarter.java:179)
>>>>
>>>> at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
>>>> at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source)
>>>> at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source)
>>>> at java.lang.reflect.Method.invoke(Unknown Source)
>>>> at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java: 549)
>>>> at org.eclipse.equinox.launcher.Main.basicRun(Main.java:504)
>>>> at org.eclipse.equinox.launcher.Main.run(Main.java:1236)
>>>>
>>>> !ENTRY org.eclipse.jface 4 2 2008-10-16 11:29:47.781
>>>> !MESSAGE Problems occurred when invoking code from plug-in:
>>>> "org.eclipse.jface".
>>>> !STACK 0
>>>> java.lang.NullPointerException
>>>> at
>>>> org.eclipse.emf.codegen.ecore.genmodel.impl.GenDataTypeImpl. getQualifiedInstanceClassName(GenDataTypeImpl.java:212)
>>>>
>>>> at
>>>> org.eclipse.emf.codegen.ecore.genmodel.provider.GenDataTypeI temProvider.getText(GenDataTypeItemProvider.java:120)
>>>>
>>>> at
>>>> org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider .getText(AdapterFactoryLabelProvider.java:374)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.WrappedViewerLabelProvider.getText (WrappedViewerLabelProvider.java:108)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.WrappedViewerLabelProvider.update( WrappedViewerLabelProvider.java:164)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.ViewerColumn.refresh(ViewerColumn. java:145)
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer.doUpdateItem(Ab stractTreeViewer.java:932)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer$UpdateItemSafeR unnable.run(AbstractTreeViewer.java:102)
>>>>
>>>> at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:37)
>>>> at org.eclipse.core.runtime.Platform.run(Platform.java:880)
>>>> at org.eclipse.ui.internal.JFaceUtil$1.run(JFaceUtil.java:48)
>>>> at org.eclipse.jface.util.SafeRunnable.run(SafeRunnable.java:17 5)
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer.doUpdateItem(Ab stractTreeViewer.java:1012)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.StructuredViewer$UpdateItemSafeRun nable.run(StructuredViewer.java:466)
>>>>
>>>> at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:37)
>>>> at org.eclipse.core.runtime.Platform.run(Platform.java:880)
>>>> at org.eclipse.ui.internal.JFaceUtil$1.run(JFaceUtil.java:48)
>>>> at org.eclipse.jface.util.SafeRunnable.run(SafeRunnable.java:17 5)
>>>> at
>>>> org.eclipse.jface.viewers.StructuredViewer.updateItem(Struct uredViewer.java:2041)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer.createTreeItem( AbstractTreeViewer.java:827)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer$1.run(AbstractT reeViewer.java:802)
>>>>
>>>> at
>>>> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer.createChildren( AbstractTreeViewer.java:776)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.TreeViewer.createChildren(TreeView er.java:634)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer.internalExpandT oLevel(AbstractTreeViewer.java:1702)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer.internalExpandT oLevel(AbstractTreeViewer.java:1712)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer.internalExpandT oLevel(AbstractTreeViewer.java:1712)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer.expandToLevel(A bstractTreeViewer.java:1054)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer.expandToLevel(A bstractTreeViewer.java:1035)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.AbstractTreeViewer.expandAll(Abstr actTreeViewer.java:1024)
>>>>
>>>> at
>>>> org.eclipse.emf.compare.ui.viewer.content.part.diff.ModelCon tentMergeDiffTab.inputChanged(ModelContentMergeDiffTab.java: 364)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.ContentViewer.setInput(ContentView er.java:251)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.StructuredViewer.setInput(Structur edViewer.java:1603)
>>>>
>>>> at
>>>> org.eclipse.emf.compare.ui.viewer.content.part.diff.ModelCon tentMergeDiffTab.setReflectiveInput(ModelContentMergeDiffTab .java:278)
>>>>
>>>> at
>>>> org.eclipse.emf.compare.ui.viewer.content.part.ModelContentM ergeTabFolder.setInput(ModelContentMergeTabFolder.java:310)
>>>>
>>>> at
>>>> org.eclipse.emf.compare.ui.viewer.content.ModelContentMergeV iewer.updateContent(ModelContentMergeViewer.java:675)
>>>>
>>>> at
>>>> org.eclipse.compare.contentmergeviewer.ContentMergeViewer.in ternalRefresh(ContentMergeViewer.java:715)
>>>>
>>>> at
>>>> org.eclipse.compare.contentmergeviewer.ContentMergeViewer.in putChanged(ContentMergeViewer.java:615)
>>>>
>>>> at
>>>> org.eclipse.jface.viewers.ContentViewer.setInput(ContentView er.java:251)
>>>>
>>>> at
>>>> org.eclipse.emf.compare.ui.viewer.content.ModelContentMergeV iewer.setInput(ModelContentMergeViewer.java:281)
>>>>
>>>> at
>>>> org.eclipse.compare.CompareViewerSwitchingPane.setInput(Comp areViewerSwitchingPane.java:256)
>>>>
>>>> at
>>>> org.eclipse.compare.CompareEditorInput.internalSetContentPan eInput(CompareEditorInput.java:791)
>>>>
>>>> at
>>>> org.eclipse.compare.CompareEditorInput.access$7(CompareEdito rInput.java:789)
>>>>
>>>> at
>>>> org.eclipse.compare.CompareEditorInput$13.run(CompareEditorI nput.java:729)
>>>>
>>>> at
>>>> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
>>>> at
>>>> org.eclipse.compare.CompareEditorInput.feed1(CompareEditorIn put.java:723)
>>>>
>>>> at
>>>> org.eclipse.compare.CompareEditorInput.feedInput(CompareEdit orInput.java:701)
>>>>
>>>> at
>>>> org.eclipse.compare.CompareEditorInput.createContents(Compar eEditorInput.java:524)
>>>>
>>>> at
>>>> org.eclipse.compare.internal.CompareEditor.createCompareCont rol(CompareEditor.java:415)
>>>>
>>>> at
>>>> org.eclipse.compare.internal.CompareEditor.createPartControl (CompareEditor.java:379)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.EditorReference.createPartHelper(Edi torReference.java:661)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.EditorReference.createPart(EditorRef erence.java:428)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.WorkbenchPartReference.getPart(Workb enchPartReference.java:594)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.EditorReference.getEditor(EditorRefe rence.java:266)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.WorkbenchPage.busyOpenEditorBatched( WorkbenchPage.java:2820)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.WorkbenchPage.busyOpenEditor(Workben chPage.java:2729)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.WorkbenchPage.access$11(WorkbenchPag e.java:2721)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.WorkbenchPage$10.run(WorkbenchPage.j ava:2673)
>>>> at
>>>> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
>>>> at
>>>> org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPa ge.java:2668)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPa ge.java:2652)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPa ge.java:2635)
>>>>
>>>> at
>>>> org.eclipse.compare.internal.CompareUIPlugin$1.run(CompareUI Plugin.java:454)
>>>>
>>>> at
>>>> org.eclipse.compare.internal.CompareUIPlugin.syncExec(Compar eUIPlugin.java:1171)
>>>>
>>>> at
>>>> org.eclipse.compare.internal.CompareUIPlugin.internalOpenEdi tor(CompareUIPlugin.java:465)
>>>>
>>>> at
>>>> org.eclipse.compare.internal.CompareUIPlugin.openCompareEdit or(CompareUIPlugin.java:429)
>>>>
>>>> at
>>>> org.eclipse.compare.CompareUI.openCompareEditorOnPage(Compar eUI.java:135)
>>>>
>>>> at
>>>> org.tigris.subversion.subclipse.ui.actions.CompareWithRemote Action$1.run(CompareWithRemoteAction.java:57)
>>>>
>>>> at
>>>> org.tigris.subversion.subclipse.ui.repository.RepositoryMana ger.run(RepositoryManager.java:375)
>>>>
>>>> at
>>>> org.tigris.subversion.subclipse.ui.actions.SVNAction$1.run(S VNAction.java:226)
>>>>
>>>> at
>>>> org.tigris.subversion.subclipse.ui.actions.SVNAction$2.run(S VNAction.java:235)
>>>>
>>>> at
>>>> org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator .java:70)
>>>> at
>>>> org.tigris.subversion.subclipse.ui.actions.SVNAction.run(SVN Action.java:232)
>>>>
>>>> at
>>>> org.tigris.subversion.subclipse.ui.actions.CompareWithRemote Action.execute(CompareWithRemoteAction.java:53)
>>>>
>>>> at
>>>> org.tigris.subversion.subclipse.ui.actions.SVNAction.run(SVN Action.java:56)
>>>>
>>>> at
>>>> org.eclipse.ui.actions.ActionDelegate.runWithEvent(ActionDel egate.java:70)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.PluginAction.runWithEvent(PluginActi on.java:241)
>>>>
>>>> at
>>>> org.eclipse.jface.action.ActionContributionItem.handleWidget Selection(ActionContributionItem.java:583)
>>>>
>>>> at
>>>> org.eclipse.jface.action.ActionContributionItem.access$2(Act ionContributionItem.java:500)
>>>>
>>>> at
>>>> org.eclipse.jface.action.ActionContributionItem$5.handleEven t(ActionContributionItem.java:411)
>>>>
>>>> at org.eclipse.swt.widgets.EventTable.sendEvent(EventTable.java :84)
>>>> at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1003)
>>>> at
>>>> org.eclipse.swt.widgets.Display.runDeferredEvents(Display.ja va:3823)
>>>> at
>>>> org.eclipse.swt.widgets.Display.readAndDispatch(Display.java :3422)
>>>> at
>>>> org.eclipse.ui.internal.Workbench.runEventLoop(Workbench.jav a:2382)
>>>> at org.eclipse.ui.internal.Workbench.runUI(Workbench.java:2346)
>>>> at org.eclipse.ui.internal.Workbench.access$4(Workbench.java:21 98)
>>>> at org.eclipse.ui.internal.Workbench$5.run(Workbench.java:493)
>>>> at
>>>> org.eclipse.core.databinding.observable.Realm.runWithDefault (Realm.java:288)
>>>>
>>>> at
>>>> org.eclipse.ui.internal.Workbench.createAndRunWorkbench(Work bench.java:488)
>>>>
>>>> at
>>>> org.eclipse.ui.PlatformUI.createAndRunWorkbench(PlatformUI.j ava:149)
>>>> at
>>>> org.eclipse.ui.internal.ide.application.IDEApplication.start (IDEApplication.java:113)
>>>>
>>>> at
>>>> org.eclipse.equinox.internal.app.EclipseAppHandle.run(Eclips eAppHandle.java:193)
>>>>
>>>> at
>>>> org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher .runApplication(EclipseAppLauncher.java:110)
>>>>
>>>> at
>>>> org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher .start(EclipseAppLauncher.java:79)
>>>>
>>>> at
>>>> org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseS tarter.java:386)
>>>>
>>>> at
>>>> org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseS tarter.java:179)
>>>>
>>>> at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
>>>> at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source)
>>>> at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source)
>>>> at java.lang.reflect.Method.invoke(Unknown Source)
>>>> at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java: 549)
>>>> at org.eclipse.equinox.launcher.Main.basicRun(Main.java:504)
>>>> at org.eclipse.equinox.launcher.Main.run(Main.java:1236)
>>>>
>>>>
>>>>
>>>> Cédric Brun wrote:
>>>>> Hi Marco,
>>>>>
>>>>> EMF compare is, indeed, already integrated with Subversion if
>>>>> you're using a an plugin providing Eclipse integration with
>>>>> Subversion (aka Subversive or Subclipse). That means for instance
>>>>> that comparing models with the team repository should trigger EMF
>>>>> Compare.
>>>>>
>>>>> We even have a specific plugin for Subversive correcting a few
>>>>> issues we had at some time but as we are not sure yet if it's an
>>>>> issue from our side or from the subversive implementation we did
>>>>> not build this plugin yet and it's only available on the Eclipse
>>>>> modeling CVS.
>>>>>
>>>>> Anyway installing an SVN plugin + EMF compare should work fine,
>>>>> please tell us if you encounter issues.
>>>>> Cédric
>>>>>
>>>>> Marco wrote:
>>>>>
>>>>>> Hi! I got a question and it would be great if anyone could help me
>>>>>> out
>>>>>> with this one: Is there a way to use EMF Compare as differencing
>>>>>> and merge
>>>>>> tool in subversion? I did not find anything in the web, yet. I'm
>>>>>> wondering
>>>>>> if this would be useful (this is what I think) and if so, I'm
>>>>>> looking for
>>>>>> an existing integration.
>>>>>
>>
--------------010104010006050808000702
Content-Type: text/x-vcard; charset=utf-8;
name="laurent_goubet.vcf"
Content-Transfer-Encoding: base64
Content-Disposition: attachment;
filename="laurent_goubet.vcf"
YmVnaW46dmNhcmQNCmZuOkxhdXJlbnQgR291YmV0DQpuOkdvdWJldDtMYXVy ZW50DQpvcmc6
PGEgaHJlZj0iaHR0cDovL3d3dy5vYmVvLmZyLyI+T2JlbzwvYT4NCmVtYWls O2ludGVybmV0
OmxhdXJlbnQuZ291YmV0QG9iZW8uZnINCnVybDpodHRwOi8vd3d3Lm9iZW8u ZnINCnZlcnNp
b246Mi4xDQplbmQ6dmNhcmQNCg0K
--------------010104010006050808000702--
|
|
|
Goto Forum:
Current Time: Fri Apr 19 10:56:11 GMT 2024
Powered by FUDForum. Page generated in 0.03433 seconds |
] 
Search
Help
Register
Login
Home
