Skip to content

Commit

Permalink
eclipse-capella#178 Update EGF Patterns
Browse files Browse the repository at this point in the history
Regen with EGF 1.6.4
Removed Requirement from patterns

Update TP

Change-Id: Ic6f6691e912d28c279cc3db42f0e4b18087f3397
Signed-off-by: Erwann Traisnel <[email protected]>
  • Loading branch information
etraisnel2 committed Sep 26, 2023
1 parent 7436507 commit 90873d9
Show file tree
Hide file tree
Showing 40 changed files with 52 additions and 65 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ public String getText(Object object) {
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
super.notifyChanged(notification);
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ public String getText(Object object) {
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
super.notifyChanged(notification);
}

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//Generated with EGF 1.6.3.202110291409
//Generated with EGF 1.6.4.202309201142
package org.polarsys.capella.extension.genchain.patterns;

import java.util.HashMap;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//Generated with EGF 1.6.3.202110291409
//Generated with EGF 1.6.4.202309201142
package org.polarsys.capella.extension.genchain.patterns;

import java.util.HashMap;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//Generated with EGF 1.6.3.202110291409
//Generated with EGF 1.6.4.202309201142
package org.polarsys.capella.extension.genchain.patterns;

import java.util.HashMap;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ Require-Bundle: org.eclipse.egf.pattern;visibility:=reexport,
org.polarsys.capella.core.data.helpers,
org.polarsys.capella.core.model.helpers,
org.polarsys.capella.core.data.sharedmodel.properties,
org.polarsys.capella.core.data.requirement.properties,
org.polarsys.capella.core.data.common.properties,
org.polarsys.capella.core.data.core.properties,
org.polarsys.capella.core.data.cs.properties,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//Generated with EGF 1.6.3.202110291409
//Generated with EGF 1.6.4.202309201142
package org.polarsys.capella.extension.tools.patterns.capellaElement.generation;

import org.eclipse.egf.common.helper.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//Generated with EGF 1.6.3.202110291409
//Generated with EGF 1.6.4.202309201142
package org.polarsys.capella.extension.tools.patterns.edit.generation;

import java.util.HashMap;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//Generated with EGF 1.6.3.202110291409
//Generated with EGF 1.6.4.202309201142
package org.polarsys.capella.extension.tools.patterns.edit.generation;

import org.polarsys.capella.extension.tools.HelperClassGenerator.HelperInfo;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//Generated with EGF 1.6.3.202110291409
//Generated with EGF 1.6.4.202309201142
package org.polarsys.capella.extension.tools.patterns.edit.generation;

import java.util.*;
Expand Down Expand Up @@ -60,7 +60,6 @@ protected void method_addRequirement(final StringBuffer out, final PatternContex
genModel.getEditPluginVariables().add("org.polarsys.capella.core.menu.dynamic");
genModel.getEditPluginVariables().add("org.polarsys.capella.core.ui.properties");
genModel.getEditPluginVariables().add("org.polarsys.capella.core.data.sharedmodel.properties");
genModel.getEditPluginVariables().add("org.polarsys.capella.core.data.requirement.properties");
genModel.getEditPluginVariables().add("org.polarsys.capella.core.data.common.properties");
genModel.getEditPluginVariables().add("org.polarsys.capella.core.data.core.properties");
genModel.getEditPluginVariables().add("org.polarsys.capella.core.data.cs.properties");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//Generated with EGF 1.6.3.202110291409
//Generated with EGF 1.6.4.202309201142
package org.polarsys.capella.extension.tools.patterns.edit.generation;

import org.eclipse.emf.codegen.ecore.genmodel.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//Generated with EGF 1.6.3.202110291409
//Generated with EGF 1.6.4.202309201142
package org.polarsys.capella.extension.tools.patterns.edit.generation;

import java.util.HashMap;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//Generated with EGF 1.6.3.202110291409
//Generated with EGF 1.6.4.202309201142
package org.polarsys.capella.extension.tools.patterns.edit.icons.generation;

import org.eclipse.egf.emf.pattern.base.CodegenGeneratorAdapter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//Generated with EGF 1.6.3.202110291409
//Generated with EGF 1.6.4.202309201142
package org.polarsys.capella.extension.tools.patterns.edit.icons.generation;

import org.eclipse.emf.codegen.ecore.genmodel.*;
Expand Down Expand Up @@ -143,7 +143,6 @@ public static synchronized PluginPattern create(String lineSeparator) {
protected final String TEXT_70 = "\".equals(key)) return IMAGES.";
protected final String TEXT_71 = "return key;" + NL + "\t}" + NL;
protected final String TEXT_72 = NL + "}";
protected final String TEXT_73 = NL;

public PluginPattern() {
//Here is the constructor
Expand Down Expand Up @@ -179,8 +178,8 @@ public String generate(Object argument) throws Exception {
ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
}

stringBuffer.append(TEXT_73);
stringBuffer.append(TEXT_73);
stringBuffer.append(TEXT_14);
stringBuffer.append(TEXT_14);
return stringBuffer.toString();
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//Generated with EGF 1.6.3.202110291409
//Generated with EGF 1.6.4.202309201142
package org.polarsys.capella.extension.tools.patterns.model.generation;

import org.eclipse.egf.common.helper.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//Generated with EGF 1.6.3.202110291409
//Generated with EGF 1.6.4.202309201142
package org.polarsys.capella.extension.tools.patterns.model.generation;

import java.util.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//Generated with EGF 1.6.3.202110291409
//Generated with EGF 1.6.4.202309201142
package org.polarsys.capella.extension.tools.patterns.model.generation;

import org.polarsys.capella.extension.tools.HelperClassGenerator.HelperInfo;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//Generated with EGF 1.6.3.202110291409
//Generated with EGF 1.6.4.202309201142
package org.polarsys.capella.extension.tools.patterns.model.generation;

import java.util.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//Generated with EGF 1.6.3.202110291409
//Generated with EGF 1.6.4.202309201142
package org.polarsys.capella.extension.tools.patterns.model.generation;

import java.util.HashMap;
Expand Down Expand Up @@ -228,7 +228,6 @@
import org.polarsys.capella.core.data.helpers.pa.delegates.PhysicalFunctionHelper;
import org.polarsys.capella.core.data.helpers.pa.delegates.PhysicalNodeHelper;
import org.polarsys.capella.core.data.helpers.pa.delegates.PortInstanceHelper;
import org.polarsys.capella.core.data.helpers.requirement.delegates.RequirementHelper;
import org.polarsys.capella.core.data.information.InformationPackage;
import org.polarsys.capella.core.data.information.communication.CommunicationPackage;
import org.polarsys.capella.core.data.information.communication.properties.sections.CommunicationItemSection;
Expand Down Expand Up @@ -439,11 +438,8 @@
import org.polarsys.capella.core.data.pa.properties.sections.PhysicalFunctionPkgSection;
import org.polarsys.capella.core.data.pa.properties.sections.PhysicalFunctionSection;
import org.polarsys.capella.core.data.pa.properties.sections.PhysicalNodeSection;
import org.polarsys.capella.core.data.requirement.RequirementPackage;
import org.polarsys.capella.core.data.requirement.properties.sections.RequirementSection;
import org.polarsys.capella.extension.tools.HelperClassGenerator;

import org.polarsys.capella.extension.tools.HelperClassGenerator;

public class RegisterHelperPattern {

Expand Down Expand Up @@ -926,8 +922,6 @@ protected void method_body(final StringBuffer out, final PatternContext ctx) thr
PhysicalArchitecturePkgItemContribution.class, PhysicalArchitecturePkgSection.class);
HelperClassGenerator.registerHelperAndSection(PaPackage.eINSTANCE.getPhysicalFunctionPkg(), null,
PhysicalFunctionPkgItemContribution.class, PhysicalFunctionPkgSection.class);
HelperClassGenerator.registerHelperAndSection(RequirementPackage.eINSTANCE.getRequirement(),
RequirementHelper.class, RequirementSection.class);
HelperClassGenerator.registerHelper(ActivityPackage.eINSTANCE.getAbstractActivity(),
AbstractActivityHelper.class);
HelperClassGenerator.registerHelper(ActivityPackage.eINSTANCE.getActivityEdge(), ActivityEdgeHelper.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,6 @@ import org.polarsys.capella.core.data.helpers.pa.delegates.PhysicalComponentHelp
import org.polarsys.capella.core.data.helpers.pa.delegates.PhysicalFunctionHelper;
import org.polarsys.capella.core.data.helpers.pa.delegates.PhysicalNodeHelper;
import org.polarsys.capella.core.data.helpers.pa.delegates.PortInstanceHelper;
import org.polarsys.capella.core.data.helpers.requirement.delegates.RequirementHelper;
import org.polarsys.capella.core.data.information.InformationPackage;
import org.polarsys.capella.core.data.information.communication.CommunicationPackage;
import org.polarsys.capella.core.data.information.communication.properties.sections.CommunicationItemSection;
Expand Down Expand Up @@ -438,8 +437,6 @@ import org.polarsys.capella.core.data.pa.properties.sections.PhysicalComponentSe
import org.polarsys.capella.core.data.pa.properties.sections.PhysicalFunctionPkgSection;
import org.polarsys.capella.core.data.pa.properties.sections.PhysicalFunctionSection;
import org.polarsys.capella.core.data.pa.properties.sections.PhysicalNodeSection;
import org.polarsys.capella.core.data.requirement.RequirementPackage;
import org.polarsys.capella.core.data.requirement.properties.sections.RequirementSection;
import org.polarsys.capella.extension.tools.HelperClassGenerator;

import org.polarsys.capella.extension.tools.HelperClassGenerator;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,6 @@
HelperClassGenerator.registerHelperAndSection(PaPackage.eINSTANCE.getPhysicalArchitecture(), null, PhysicalArchitectureItemContribution.class, PhysicalArchitectureSection.class);
HelperClassGenerator.registerHelperAndSection(PaPackage.eINSTANCE.getPhysicalArchitecturePkg(), null, PhysicalArchitecturePkgItemContribution.class, PhysicalArchitecturePkgSection.class);
HelperClassGenerator.registerHelperAndSection(PaPackage.eINSTANCE.getPhysicalFunctionPkg(), null, PhysicalFunctionPkgItemContribution.class, PhysicalFunctionPkgSection.class);
HelperClassGenerator.registerHelperAndSection(RequirementPackage.eINSTANCE.getRequirement(), RequirementHelper.class, RequirementSection.class);
HelperClassGenerator.registerHelper(ActivityPackage.eINSTANCE.getAbstractActivity(), AbstractActivityHelper.class);
HelperClassGenerator.registerHelper(ActivityPackage.eINSTANCE.getActivityEdge(), ActivityEdgeHelper.class);
HelperClassGenerator.registerHelper(ActivityPackage.eINSTANCE.getActivityExchange(), ActivityExchangeHelper.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
genModel.getEditPluginVariables().add("org.polarsys.capella.core.menu.dynamic");
genModel.getEditPluginVariables().add("org.polarsys.capella.core.ui.properties");
genModel.getEditPluginVariables().add("org.polarsys.capella.core.data.sharedmodel.properties");
genModel.getEditPluginVariables().add("org.polarsys.capella.core.data.requirement.properties");
genModel.getEditPluginVariables().add("org.polarsys.capella.core.data.common.properties");
genModel.getEditPluginVariables().add("org.polarsys.capella.core.data.core.properties");
genModel.getEditPluginVariables().add("org.polarsys.capella.core.data.cs.properties");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*******************************************************************************/
target "capellastudio" with source, requirements

include "https://raw.githubusercontent.com/eclipse/kitalpha/master/releng/plugins/org.polarsys.kitalpha.releng.targets/kitalpha.targetplatform"
include "https://download.eclipse.org/kitalpha/updates/stable/runtime/7.0.0.20230926/targets/kitalpha.targetplatform"

location sirius-query-legacy-1.1.0 "https://download.eclipse.org/sirius/updates/legacy/1.1.0" {
org.eclipse.sirius.query.legacy.feature.feature.group lazy
Expand All @@ -24,7 +24,7 @@ location Eclipse-2023-03 "https://download.eclipse.org/releases/2023-03/" {
org.eclipse.equinox.core.sdk.feature.group lazy
}

location kitalpha-sdk "https://download.eclipse.org/kitalpha/updates/stable/sdk/7.0.0.20230607/" {
location kitalpha-sdk "https://download.eclipse.org/kitalpha/updates/stable/sdk/7.0.0.20230926/" {
org.polarsys.kitalpha.ad.viewpoint.dsl.generation.feature.feature.group lazy
org.polarsys.kitalpha.ad.viewpoint.dsl.generation.feature.source.feature.group lazy
org.polarsys.kitalpha.ad.viewpoint.dsl.as.feature.feature.group lazy
Expand Down Expand Up @@ -142,7 +142,7 @@ location kitalpha-sdk "https://download.eclipse.org/kitalpha/updates/stable/sdk/
org.polarsys.kitalpha.diffmerge.bridge.integration.transposer lazy
}

location kitalpha-runtime "https://download.eclipse.org/kitalpha/updates/stable/runtime/7.0.0.20230607/" {
location kitalpha-runtime "https://download.eclipse.org/kitalpha/updates/stable/runtime/7.0.0.20230926/" {
org.polarsys.kitalpha.runtime.feature.feature.group lazy
org.polarsys.kitalpha.runtime.feature.source.feature.group lazy
org.polarsys.kitalpha.common.feature.feature.group lazy
Expand All @@ -151,12 +151,12 @@ location kitalpha-runtime "https://download.eclipse.org/kitalpha/updates/stable/
org.polarsys.kitalpha.massactions.feature.source.feature.group lazy
}

location capella-egf-patterns "https://download.eclipse.org/capella/core/updates/stable/7.0.0-S20230717/org.polarsys.capella.egf.site/" {
location capella-egf-patterns "https://download.eclipse.org/capella/core/updates/nightly/master-PR-2721-2/org.polarsys.capella.egf.site/" {
org.polarsys.capella.core.egf.feature.feature.group lazy
org.polarsys.capella.core.egf.feature.source.feature.group lazy
}

location capella "https://download.eclipse.org/capella/core/updates/stable/7.0.0-S20230717/org.polarsys.capella.rcp.site/" {
location capella "https://download.eclipse.org/capella/core/updates/nightly/master-PR-2721-2/org.polarsys.capella.rcp.site/" {
org.polarsys.capella.rcp.feature.group lazy
org.polarsys.capella.rcp.source.feature.group lazy
org.polarsys.capella.cdo.mock.feature.feature.group lazy
Expand All @@ -168,7 +168,7 @@ location capella "https://download.eclipse.org/capella/core/updates/stable/7.0.0
org.polarsys.capella.core.feature.source.feature.group lazy
}

location capella-tests "https://download.eclipse.org/capella/core/updates/stable/7.0.0-S20230717/org.polarsys.capella.test.site" {
location capella-tests "https://download.eclipse.org/capella/core/updates/nightly/master-PR-2721-2/org.polarsys.capella.test.site" {
org.polarsys.capella.test.feature.feature.group
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//Generated with EGF 1.4.1.v20161010-1511
//Generated with EGF 1.6.4.202309201142
package org.polarsys.capella.ad.viewpoint.dsl.generation.ui.common;

import org.eclipse.egf.common.helper.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//Generated with EGF 1.6.3.202110251509
//Generated with EGF 1.6.4.202309201142
package org.polarsys.capella.ad.viewpoint.dsl.generation.ui.common;

import org.eclipse.egf.common.helper.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//Generated with EGF 1.4.1.v20161010-1511
//Generated with EGF 1.6.4.202309201142
package org.polarsys.capella.ad.viewpoint.dsl.generation.ui.common;

import java.util.*;
Expand All @@ -17,6 +17,7 @@ public class generateWidgetData {
public generateWidgetData() {
//Here is the constructor
// add initialisation of the pattern variables (declaration has been already done).

}

public void generate(Object argument) throws Exception {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//Generated with EGF 1.6.0.201805040915
//Generated with EGF 1.6.4.202309201142
package org.polarsys.capella.ad.viewpoint.dsl.generation.ui.extension;

import org.eclipse.egf.common.helper.*;
Expand Down Expand Up @@ -36,7 +36,6 @@ public static synchronized UI2PropertyTab create(String lineSeparator) {
protected final String TEXT_7 = "\">" + NL + "\t\t </propertyTab> " + NL + "\t\t\t";
protected final String TEXT_8 = NL + "\t</propertyTabs>" + NL + "</extension> " + NL;
protected final String TEXT_9 = NL;
protected final String TEXT_10 = NL;

public UI2PropertyTab() {
//Here is the constructor
Expand Down Expand Up @@ -73,7 +72,7 @@ public String generate(Object argument) throws Exception {
}

stringBuffer.append(TEXT_9);
stringBuffer.append(TEXT_10);
stringBuffer.append(TEXT_9);
return stringBuffer.toString();
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//Generated with EGF 1.4.1.v20161010-1511
//Generated with EGF 1.6.4.202309201142
package org.polarsys.capella.ad.viewpoint.dsl.generation.ui.extension;

import org.eclipse.egf.common.helper.*;
Expand Down Expand Up @@ -34,7 +34,6 @@ public static synchronized UIContainer2PropertySection create(String lineSeparat
protected final String TEXT_7 = "\">" + NL + " </input>";
protected final String TEXT_8 = NL + "\t\t </propertySection> " + NL + "\t\t ";
protected final String TEXT_9 = NL;
protected final String TEXT_10 = NL;

public UIContainer2PropertySection() {
//Here is the constructor
Expand Down Expand Up @@ -71,7 +70,7 @@ public String generate(Object argument) throws Exception {
}

stringBuffer.append(TEXT_9);
stringBuffer.append(TEXT_10);
stringBuffer.append(TEXT_9);
return stringBuffer.toString();
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//Generated with EGF 1.6.1.201906060805
//Generated with EGF 1.6.4.202309201142
package org.polarsys.capella.ad.viewpoint.dsl.generation.ui.extension;

import java.util.Map.Entry;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//Generated with EGF 1.6.1.201906060805
//Generated with EGF 1.6.4.202309201142
package org.polarsys.capella.ad.viewpoint.dsl.generation.ui.javaclasses;

import org.eclipse.egf.common.helper.*;
Expand Down Expand Up @@ -242,7 +242,7 @@ protected void method_genSemanticImports(final StringBuffer stringBuffer, final
stringBuffer.append(TEXT_16);
}
InternalPatternContext ictx = (InternalPatternContext) ctx;
new Node.DataLeaf(ictx.getNode(), getClass(), "genSematicImports", stringBuffer.toString());
new Node.DataLeaf(ictx.getNode(), getClass(), "genSemanticImports", stringBuffer.toString());
}

public boolean preCondition(PatternContext ctx) throws Exception {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//Generated with EGF 1.6.1.201906060805
//Generated with EGF 1.6.4.202309201142
package org.polarsys.capella.ad.viewpoint.dsl.generation.ui.javaclasses;

import org.eclipse.egf.common.helper.*;
Expand Down Expand Up @@ -215,7 +215,7 @@ protected void method_genSemanticImports(final StringBuffer stringBuffer, final
stringBuffer.append(TEXT_10);
}
InternalPatternContext ictx = (InternalPatternContext) ctx;
new Node.DataLeaf(ictx.getNode(), getClass(), "genSematicImports", stringBuffer.toString());
new Node.DataLeaf(ictx.getNode(), getClass(), "genSemanticImports", stringBuffer.toString());
}

public boolean preCondition(PatternContext ctx) throws Exception {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//Generated with EGF 1.6.1.201906060805
//Generated with EGF 1.6.4.202309201142
package org.polarsys.capella.ad.viewpoint.dsl.generation.ui.javaclasses;

import org.eclipse.egf.common.helper.*;
Expand Down Expand Up @@ -267,7 +267,7 @@ protected void method_genSemanticImports(final StringBuffer stringBuffer, final
stringBuffer.append(iDataWidget.computeWidgetFieldETypeEPackage());
stringBuffer.append(TEXT_2);
InternalPatternContext ictx = (InternalPatternContext) ctx;
new Node.DataLeaf(ictx.getNode(), getClass(), "genSematicImports", stringBuffer.toString());
new Node.DataLeaf(ictx.getNode(), getClass(), "genSemanticImports", stringBuffer.toString());
}

protected void method_registerExtension(final StringBuffer stringBuffer, final PatternContext ctx)
Expand Down
Loading

0 comments on commit 90873d9

Please sign in to comment.