Skip to content

Commit

Permalink
Some fixes
Browse files Browse the repository at this point in the history 
Signed-off-by: Kyrill Zotkin <[email protected]>
  • Loading branch information
@kyrillzotkin
kyrillzotkin committed Aug 19, 2018
1 parent 09a31c5 commit b355e65
Show file tree
Hide file tree
Showing 13 changed files with 103 additions and 55 deletions.
10 changes: 0 additions & 10 deletions bundles/org.enterprisedomain.classmaker.edit/plugin.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,4 @@
</extension>


<extension
point="org.eclipse.emf.ecp.view.model.provider.xmi.file">
<file
filePath="src/org/enterprisedomain/classmaker/edit/dialogs/EOperation.view">
<filter
key="detail"
value="true">
</filter>
</file>
</extension>
</plugin>
9 changes: 0 additions & 9 deletions ...sedomain.classmaker.edit/src/org/enterprisedomain/classmaker/edit/dialogs/EOperation.view
View file

This file was deleted.

9 changes: 6 additions & 3 deletions ...org.enterprisedomain.classmaker/src/org/enterprisedomain/classmaker/impl/ProjectImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -926,8 +926,14 @@ public String initialize(boolean commit) {
} catch (IOException e) {
ClassMakerPlugin.getInstance().getLog().log(ClassMakerPlugin.createErrorStatus(e));
}
if (eIsSet(ClassMakerPackage.PROJECT__REVISION)
&& getRevision().eIsSet(ClassMakerPackage.Literals.REVISION__STATE))
getRevision().getState().setResource(resource);
} else {
resource = getWorkspace().getResourceSet().createResource(uri);
if (eIsSet(ClassMakerPackage.PROJECT__REVISION)
&& getRevision().eIsSet(ClassMakerPackage.Literals.REVISION__STATE))
getRevision().getState().setResource(resource);
if (commit)
try {
resource.save(Collections.emptyMap());
Expand All @@ -937,9 +943,6 @@ public String initialize(boolean commit) {
}
getWorkspace().getResourceSet().eAdapters().add(resourceAdapter);
addResourceChangeListener(getResourceReloadListener());
if (eIsSet(ClassMakerPackage.PROJECT__REVISION)
&& getRevision().eIsSet(ClassMakerPackage.Literals.REVISION__STATE))
getRevision().getState().setResource(resource);
// TODO Add SCM support if commit
return ""; //$NON-NLS-1$
}
Expand Down
26 changes: 26 additions & 0 deletions ...sedomain.classmaker/src/org/enterprisedomain/classmaker/impl/ResourceSetURIConverter.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package org.enterprisedomain.classmaker.impl;

import java.util.Map;

import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.resource.URIConverter;
import org.eclipse.emf.ecore.resource.impl.ExtensibleURIConverterImpl;
import org.enterprisedomain.classmaker.Project;
import org.enterprisedomain.classmaker.Revision;
import org.enterprisedomain.classmaker.core.ClassMakerPlugin;

public class ResourceSetURIConverter extends ExtensibleURIConverterImpl implements URIConverter {

@Override
public Map<URI, URI> getURIMap() {
Map<URI, URI> results = super.getURIMap();
for (Project project : ClassMakerPlugin.getClassMaker().getWorkspace().getProjects()) {
Revision revision = project.getRevision();
if (revision.getDomainModel().getDynamic() != null && revision.getState().getResource() != null)
results.put(URI.createURI(revision.getDomainModel().getDynamic().getNsURI()),
revision.getState().getResource().getURI());
}
return results;
}

}
3 changes: 2 additions & 1 deletion ...s/org.enterprisedomain.classmaker/src/org/enterprisedomain/classmaker/impl/StateImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -543,8 +543,9 @@ else if (create && !eIsSet(ClassMakerPackage.STATE__RESOURCE)) {
} catch (IOException e) {
ClassMakerPlugin.getInstance().getLog().log(ClassMakerPlugin.createWarningStatus(e));
}
if (!getResource().getContents().isEmpty())
if (!getResource().getContents().isEmpty()) {
getDomainModel().setDynamic(EcoreUtil.copy((EPackage) getResource().getContents().get(0)));
}
loading = false;
}

Expand Down
6 changes: 5 additions & 1 deletion ...g.enterprisedomain.classmaker/src/org/enterprisedomain/classmaker/impl/WorkspaceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,10 @@ public class WorkspaceImpl extends EObjectImpl implements Workspace {
*/
protected static final ResourceSet RESOURCE_SET_EDEFAULT = new ResourceSetImpl();

static {
RESOURCE_SET_EDEFAULT.setURIConverter(new ResourceSetURIConverter());
}

/**
* The cached value of the '{@link #getResourceSet() <em>Resource Set</em>}'
* attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
Expand Down Expand Up @@ -344,7 +348,7 @@ public void provision(IProgressMonitor monitor) throws CoreException {
ITargetDefinition targetDefinition = null;
targetDefinition = targetPlatformService.newTarget();
targetDefinition.setName("Platform");
Bundle[] bundles = Platform.getBundle("org.eclipse.core.runtime").getBundleContext().getBundles();
Bundle[] bundles = Platform.getBundle(Platform.PI_RUNTIME).getBundleContext().getBundles();
List<ITargetLocation> bundleContainers = new ArrayList<ITargetLocation>();
Set<File> dirs = new HashSet<File>();
for (Bundle bundle : bundles) {
Expand Down
17 changes: 15 additions & 2 deletions bundles/org.enterprisedomain.ecp/src/org/enterprisedomain/ecp/EnterpriseDomainProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,8 @@ public class EnterpriseDomainProvider extends DefaultProvider {

private final IResourceChangeListener resourceChangeListener = new EnterpriseDomainResourceListener();

private static Map<InternalProject, Boolean> initing = new HashMap<InternalProject, Boolean>();

private Adapter adapter = new EContentAdapter() {

@SuppressWarnings("unchecked")
Expand Down Expand Up @@ -206,6 +208,9 @@ public void handleLifecycle(ECPContainer context, LifecycleEvent event) {
}

protected void initProject(final InternalProject project) {
if (initing.containsKey(project) && initing.get(project))
return;
initing.put(project, true);
final EditingDomain editingDomain = project.getEditingDomain();
editingDomain.getResourceSet().eAdapters().add(new EnterpriseDomainProjectObserver(project, this));
final ClassMakerService classMaker = Activator.getClassMaker();
Expand Down Expand Up @@ -333,9 +338,9 @@ public boolean canDelete(EObject objectToBeDeleted) {
}

});
initing.put(project, false);
}

@SuppressWarnings("unchecked")
@Override
public ECPContainer getModelContext(Object element) {
if (element instanceof ECPContainer) {
Expand All @@ -360,7 +365,13 @@ public ECPContainer getModelContext(Object element) {
return getModelContext(((ResourceAdapter) element).getProject());

if (element instanceof Resource) {
for (InternalProject project : getOpenProjects()) {
Collection<InternalProject> projects = null;
try {
projects = getOpenProjects();
} catch (RuntimeException e) {
return null;
}
for (InternalProject project : projects) {
Project domainProject = Activator.getClassMaker().getWorkspace().getProject((Resource) element);
if (domainProject != null && domainProject.getName().equals(project.getName()))
return project;
Expand Down Expand Up @@ -390,6 +401,7 @@ private void addVisiblePackages(InternalProject project) {
}

protected void disposeProject(InternalProject project) {
initing.remove(project);
ClassMakerService service = Activator.getClassMaker();
if (service != null) {
Project domainProject = service.getWorkspace().getProject(project.getName());
Expand All @@ -409,6 +421,7 @@ protected void disposeProject(InternalProject project) {
}

protected void removeProject(InternalProject project) {
initing.remove(project);
Project domainProject = (Project) Activator.getClassMaker().getWorkspace().getProject(project.getName());
try {
domainProject.delete(getUIProvider().getAdapter(project, IProgressMonitor.class));
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.enterprisedomain.workbench/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.emf.ecp.ui.rcp;bundle-version="[1.17.0,1.18.0)",
org.eclipse.emf.ecp.application.e3;bundle-version="[1.17.0,1.18.0)",
org.eclipse.emfforms.setup.base;bundle-version="[1.17.0,1.18.0)",
org.apache.batik.css;bundle-version="1.7.0"
org.apache.batik.css;bundle-version="[1.8.0,1.9.1]"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Import-Package: org.eclipse.ui,
Expand Down
3 changes: 2 additions & 1 deletion ...omain.workbench/src/org/enterprisedomain/workplace/ApplicationWorkbenchWindowAdvisor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import java.io.PrintStream;
import java.lang.reflect.InvocationTargetException;

import org.eclipse.core.runtime.Platform;
import org.eclipse.emf.ecp.core.util.ECPUtil;
import org.eclipse.emf.ecp.spi.core.DefaultProvider;
import org.eclipse.emf.ecp.spi.ui.DefaultUIProvider;
Expand Down Expand Up @@ -118,7 +119,7 @@ public void postWindowCreate() {
MessageConsole out = new MessageConsole("Output", null);
System.setOut(new PrintStream(out.newOutputStream()));
ConsolePlugin.getDefault().getConsoleManager().addConsoles(new IConsole[] { out });
ConsolePlugin.getDefault().getConsoleManager().refresh(out);
ConsolePlugin.getDefault().getConsoleManager().refresh(out);
}

@Override
Expand Down
11 changes: 8 additions & 3 deletions bundles/org.enterprisedomain.workbench/src/org/enterprisedomain/workplace/ModelEditor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
public class ModelEditor extends MultiPageEditorPart {

private int genericEditorIndex;
private InternalProject ecpProject;

public ModelEditor() {
}
Expand All @@ -35,15 +36,19 @@ protected void createPages() {
URI uri = EditUIUtil.getURI(getEditorInput());
final Resource resource = Activator.getClassMaker().getWorkspace().getResourceSet().getResource(uri, true);
final Project project = Activator.getClassMaker().getWorkspace().getProject(resource);
final InternalProject ecpProject = (InternalProject) ECPUtil.getECPProjectManager()
.getProject(project.getProjectName());
try {
ecpProject = (InternalProject) ECPUtil.getECPProjectManager().getProject(project.getProjectName());
} catch (RuntimeException e) {
}
getGenericEditor().getResourceSet().eAdapters().add(new EContentAdapter() {

@Override
public void notifyChanged(Notification notification) {
super.notifyChanged(notification);
Collection<Object> objects = (Collection<Object>) (Collection<?>) Arrays.asList(ecpProject);
ecpProject.notifyObjectsChanged(objects, true);
if (ecpProject != null) {
ecpProject.notifyObjectsChanged(objects, true);
}
}

});
Expand Down
3 changes: 2 additions & 1 deletion features/org.enterprisedomain.classmaker.feature/build.properties
View file
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
bin.includes = feature.xml
bin.includes = feature.xml,\
p2.inf
13 changes: 13 additions & 0 deletions features/org.enterprisedomain.classmaker.feature/p2.inf
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
instructions.install = \
addJvmArg(jvmArg:-Dds.delayed.keepInstances=true);

instructions.install.import = \
org.eclipse.equinox.p2.touchpoint.eclipse.addJvmArg, \
org.eclipse.equinox.p2.touchpoint.eclipse.removeJvmArg;

instructions.uninstall = \
removeJvmArg(jvmArg:-Dds.delayed.keepInstances=true);

instructions.uninstall.import = \
org.eclipse.equinox.p2.touchpoint.eclipse.addJvmArg, \
org.eclipse.equinox.p2.touchpoint.eclipse.removeJvmArg;
46 changes: 23 additions & 23 deletions releng/org.enterprisedomain.target/org.enterprisedomain.target.target
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
<target name="org.enterprisedomain.target" sequenceNumber="1531391091">
<target name="org.enterprisedomain.target" sequenceNumber="1533486210">
<locations>
<location includeMode="slicer" includeAllPlatforms="true" includeSource="false" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.platform.feature.group" version="4.7.3.v20180330-0640"/>
Expand Down Expand Up @@ -56,31 +56,31 @@
<repository location="http://download.eclipse.org/emfstore/releases_18"/>
</location>
<location includeMode="slicer" includeAllPlatforms="true" includeSource="false" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.emf.ecp.application.e3" version="1.17.0.20180611-0706"/>
<unit id="org.eclipse.emf.ecp.e3.feature.feature.group" version="1.17.0.20180611-0706"/>
<unit id="org.eclipse.emf.ecp.ecore.feature.feature.group" version="1.17.0.20180611-0706"/>
<unit id="org.eclipse.emf.ecp.emfforms.runtime.feature.feature.group" version="1.17.0.20180611-0706"/>
<unit id="org.eclipse.emfforms.setup.base" version="1.17.0.20180611-0706"/>
<unit id="org.eclipse.emf.ecp.feature.feature.group" version="1.17.0.20180611-0706"/>
<unit id="org.eclipse.emf.ecp.validation.view.feature.feature.group" version="1.17.0.20180611-0706"/>
<unit id="org.eclipse.emf.ecp.view.table.validation" version="1.17.0.20180611-0706"/>
<unit id="org.eclipse.emf.ecp.view.treemasterdetail.validation" version="1.17.0.20180611-0706"/>
<unit id="org.eclipse.emfforms.core.services.databinding.index" version="1.17.0.20180611-0706"/>
<unit id="org.eclipse.emfforms.core.services.databinding.mapping" version="1.17.0.20180611-0706"/>
<unit id="org.eclipse.emfforms.core.services.domainexpander.index" version="1.17.0.20180611-0706"/>
<unit id="org.eclipse.emfforms.core.services.domainexpander.mapping" version="1.17.0.20180611-0706"/>
<unit id="org.eclipse.emfforms.core.services.structuralchange.index" version="1.17.0.20180611-0706"/>
<unit id="org.eclipse.emfforms.core.services.structuralchange.mapping" version="1.17.0.20180611-0706"/>
<unit id="org.eclipse.emf.ecp.view.indexdmr.model" version="1.17.0.20180611-0706"/>
<unit id="org.eclipse.emf.ecp.view.mappingdmr.model" version="1.17.0.20180611-0706"/>
<unit id="org.eclipse.emfforms.swt.control.multiattribute" version="1.17.0.20180611-0706"/>
<unit id="org.eclipse.emfforms.editor.feature.feature.group" version="1.17.0.20180611-0706"/>
<unit id="org.eclipse.emf.ecp.application.e3" version="1.17.1.20180714-1935"/>
<unit id="org.eclipse.emf.ecp.e3.feature.feature.group" version="1.17.1.20180714-1935"/>
<unit id="org.eclipse.emf.ecp.ecore.feature.feature.group" version="1.17.1.20180714-1935"/>
<unit id="org.eclipse.emf.ecp.emfforms.runtime.feature.feature.group" version="1.17.1.20180714-1935"/>
<unit id="org.eclipse.emfforms.setup.base" version="1.17.1.20180714-1935"/>
<unit id="org.eclipse.emf.ecp.feature.feature.group" version="1.17.1.20180714-1935"/>
<unit id="org.eclipse.emf.ecp.validation.view.feature.feature.group" version="1.17.1.20180714-1935"/>
<unit id="org.eclipse.emf.ecp.view.table.validation" version="1.17.1.20180714-1935"/>
<unit id="org.eclipse.emf.ecp.view.treemasterdetail.validation" version="1.17.1.20180714-1935"/>
<unit id="org.eclipse.emfforms.core.services.databinding.index" version="1.17.1.20180714-1935"/>
<unit id="org.eclipse.emfforms.core.services.databinding.mapping" version="1.17.1.20180714-1935"/>
<unit id="org.eclipse.emfforms.core.services.domainexpander.index" version="1.17.1.20180714-1935"/>
<unit id="org.eclipse.emfforms.core.services.domainexpander.mapping" version="1.17.1.20180714-1935"/>
<unit id="org.eclipse.emfforms.core.services.structuralchange.index" version="1.17.1.20180714-1935"/>
<unit id="org.eclipse.emfforms.core.services.structuralchange.mapping" version="1.17.1.20180714-1935"/>
<unit id="org.eclipse.emf.ecp.view.indexdmr.model" version="1.17.1.20180714-1935"/>
<unit id="org.eclipse.emf.ecp.view.mappingdmr.model" version="1.17.1.20180714-1935"/>
<unit id="org.eclipse.emfforms.swt.control.multiattribute" version="1.17.1.20180714-1935"/>
<unit id="org.eclipse.emfforms.editor.feature.feature.group" version="1.17.1.20180714-1935"/>
<repository id="ecp" location="http://download.eclipse.org/ecp/releases/releases_target_117/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="true" includeSource="false" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jgit.feature.group" version="5.0.1.201806211838-r"/>
<unit id="org.eclipse.jgit.http.apache.feature.group" version="5.0.1.201806211838-r"/>
<unit id="org.eclipse.jgit.pgm.feature.group" version="5.0.1.201806211838-r"/>
<unit id="org.eclipse.jgit.feature.group" version="5.0.2.201807311906-r"/>
<unit id="org.eclipse.jgit.http.apache.feature.group" version="5.0.2.201807311906-r"/>
<unit id="org.eclipse.jgit.pgm.feature.group" version="5.0.2.201807311906-r"/>
<repository location="http://download.eclipse.org/egit/updates/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="true" includeSource="false" includeConfigurePhase="true" type="InstallableUnit">
Expand Down

0 comments on commit b355e65

Please sign in to comment.