Commit afd39cd0 authored by Ashmi Banerjee's avatar Ashmi Banerjee
Browse files

Merge remote-tracking branch 'origin/master' into 3418

Conflicts:
	org.fortiss.af3.mira.ui/src/org/fortiss/af3/mira/ui/editor/.ratings
	org.fortiss.af3.mira.ui/src/org/fortiss/af3/mira/ui/editorbinding/.ratings
	org.fortiss.af3.mira.ui/src/org/fortiss/af3/mira/ui/editorbinding/AspectBindings.java
	org.fortiss.af3.mira.ui/src/org/fortiss/af3/mira/ui/handler/.ratings
	org.fortiss.af3.mira.ui/src/org/fortiss/af3/mira/ui/handler/AspectHandlers.java
	org.fortiss.af3.mira.ui/src/org/fortiss/af3/mira/ui/handler/RequirementHandler.java
	org.fortiss.af3.mira/model/.ratings
	org.fortiss.af3.mira/src/org/fortiss/af3/mira/compose/.ratings
	org.fortiss.af3.mira/src/org/fortiss/af3/mira/compose/RequirementCompositor.java
	org.fortiss.af3.mira/src/org/fortiss/af3/mira/prototype/.ratings
parents 4373d897 68e58d0d
/*/bin/
/*/build/
/*/generated-src/
*.rej
.DS_Store
._.DS_Store
......@@ -67,9 +67,6 @@
[submodule "org.fortiss.af3.msc.ui/.settings"]
path = org.fortiss.af3.msc.ui/.settings
url = https://git.fortiss.org/af3/plugin-settings.git
[submodule "org.fortiss.af3.multicore/.settings"]
path = org.fortiss.af3.multicore/.settings
url = https://git.fortiss.org/af3/plugin-settings.git
[submodule "org.fortiss.af3.ocra/.settings"]
path = org.fortiss.af3.ocra/.settings
url = https://git.fortiss.org/af3/plugin-settings.git
......
......@@ -18,4 +18,4 @@ Bundle-NativeCode: lib/x64/libz3.so ; lib/x64/libz3java.so ; osname = linux ; pr
Export-Package: com.microsoft.z3,
com.microsoft.z3.enumerations
Eclipse-BundleShape: dir
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.9.100"
Require-Bundle: org.fortiss.tooling.base
AF3z3Activator.java e7b05a7479225129374045638dbc3f3a7f8714eb GREEN
AF3z3Activator.java 5fb8c96356e6f28a327f2fd5d39894ada1ae72f5 YELLOW
Z3Type.java 73e319ae206d2fd456ec9430c01b5ff7fc7282d0 GREEN
Z3javaAPIWrapper.java ef4f9879f607b2e4517a8fb5bcc80aab4ff2605a GREEN
package com.microsoft.z3;
import static java.lang.System.getProperty;
import static java.lang.System.getenv;
import static java.lang.System.load;
import static java.lang.System.mapLibraryName;
import static org.eclipse.core.runtime.FileLocator.toFileURL;
import static org.fortiss.tooling.base.utils.SystemUtils.isOs64BitArch;
import static org.fortiss.tooling.base.utils.SystemUtils.isWindowsPlatform;
import org.eclipse.core.runtime.Plugin;
import org.osgi.framework.Bundle;
......@@ -35,12 +35,9 @@ public class AF3z3Activator extends Plugin {
plugin = this;
String path, prefix = "";
boolean is64bit;
if(System.getProperty("os.name").contains("Windows")) {
is64bit = (getenv("ProgramFiles(x86)") != null);
boolean is64bit = isOs64BitArch();
if(isWindowsPlatform()) {
prefix = "lib";
} else {
is64bit = (getProperty("os.arch").indexOf("64") != -1);
}
if(is64bit) {
......
documentation.html d5d160170ff0e2dfe7ec316e7bea92df5b6f176e RED
<html><body>
<H1>Developer Documentation for <I>eu.fbk.af3.tools.diagram.ui</I></H1>
<P>// TODO
</body></html>
documentation.html b22065b54d957431469acaf58bb1d3aea7ba8d60 RED
<html><body>
<H1>Developer Documentation for <I>eu.fbk.af3.tools.diagram</I></H1>
<P>// TODO
</body></html>
documentation.html 17bd6188b75517bd2b9cd530a18ebe3542918e47 RED
<html><body>
<H1>Developer Documentation for <I>org.fortiss.af3.allocation.ui</I></H1>
<P>// TODO
</body></html>
documentation.html 770c6a8c3215748f25287f56031bda97c796ad75 RED
<html><body>
<H1>Developer Documentation for <I>org.fortiss.af3.allocation</I></H1>
<P>// TODO
</body></html>
allocation.ecore 8996d02dc30ab90950bfe7c9b7287f7f76ccd060 RED
......@@ -6,7 +6,7 @@
modelName="Model" modelPluginClass="" editPluginClass="org.fortiss.af3.allocation.model.provider.ModelEditPlugin"
editorPluginClass="org.fortiss.af3.allocation.model.presentation.ModelEditorPlugin"
testsDirectory="/org.fortiss.af3.allocation.tests/test-src" importerID="org.eclipse.emf.importer.ecore"
containmentProxies="true" complianceLevel="6.0" copyrightFields="false" language=""
containmentProxies="true" complianceLevel="8.0" copyrightFields="false" language=""
usedGenPackages="platform:/resource/org.fortiss.tooling.base/model/base.genmodel#//model platform:/resource/org.fortiss.tooling.kernel/model/kernel.genmodel#//model">
<foreignModel>allocation.ecore</foreignModel>
<genPackages prefix="AF3Allocation" basePackage="org.fortiss.af3.allocation" disposableProviderFactory="true"
......
documentation.html 54373a5beed76fda975bb28b64a371fccbf6b377 RED
<html><body>
<H1>Developer Documentation for <I>org.fortiss.af3.component.ui</I></H1>
<P>// TODO
</body></html>
ComponentArchitectureTransformationMenuBase.java 8e095afd701af01ae2884c7ae540fb2bb132f68d GREEN
ComponentArchitectureTransformationMenuBase.java 865e8b745e07818898d95ebbe1359dafcefd0c3d GREEN
......@@ -22,7 +22,6 @@ import static org.fortiss.af3.project.utils.ProjectUtils.getFileProject;
import static org.fortiss.tooling.kernel.service.IElementCompositorService.getInstance;
import static org.fortiss.tooling.kernel.utils.EcoreUtils.getChildrenWithType;
import static org.fortiss.tooling.kernel.utils.EcoreUtils.getFirstChildWithType;
import static org.fortiss.tooling.kernel.utils.UniqueIDUtils.fixMissingIDs;
import java.util.ArrayList;
import java.util.List;
......@@ -116,7 +115,6 @@ public abstract class ComponentArchitectureTransformationMenuBase<A extends IPro
}
IHierarchicElement arch = compTrans.transform(ca.getTopComponent(), null);
fixMissingIDs(arch, ca.getTopComponent());
IAutoLayouter al = new KielerAutoLayouter();
cs.compose(fileProject, arch, null);
al.performAutoLayout(arch);
......
CodeSpecificationEditor.java 8160f484c1b6a1d1282d57c31f54356b1e184fa7 GREEN
CodeSpecificationEditor.java 35b198eec85b24ca0840efc3dcb66d293a2c3542 GREEN
CodeSpecificationEditorBinding.java aeff3d23f484b3adeac6dfa01bb52ddcb8daba94 GREEN
ComponentArchitectureEditorBinding.java c7756ac19f55df928c6b9b0ece1982c47e8f0e1c GREEN
ComponentStructureEditor.java 2eb198630fa961f42568b0bd272d19db5e6630aa GREEN
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment