Skip to content
This repository has been archived by the owner on Sep 17, 2019. It is now read-only.

Commit

Permalink
package rename org.gemoc.xdsmlframework.api in
Browse files Browse the repository at this point in the history
org.eclipse.gemoc.xdsmlframework.api
  • Loading branch information
dvojtise committed Jun 15, 2017
1 parent cfde9a0 commit d7fb619
Show file tree
Hide file tree
Showing 11 changed files with 22 additions and 22 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Require-Bundle: org.eclipse.xtend.lib;bundle-version="2.7.0";visibility:="privat

fr.inria.diverse.k3.al.annotationprocessor.plugin;bundle-version="0.0.0";visibility:="reexport",

org.gemoc.xdsmlframework.api;bundle-version="0.0.0";visibility:="reexport",
org.eclipse.gemoc.xdsmlframework.api;bundle-version="0.0.0";visibility:="reexport",

org.gemoc.execution.sequential.javaxdsml.api;bundle-version="0.0.0";visibility:="reexport",

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.gemoc.commons.eclipse,
fr.inria.diverse.trace.gemoc,
fr.inria.diverse.trace.gemoc.api,
org.gemoc.xdsmlframework.api,
org.eclipse.gemoc.xdsmlframework.api,
org.gemoc.sequential_addons.multidimensional.timeline,
org.eclipse.gemoc.timeline,
fr.inria.diverse.trace.commons
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -177,23 +177,23 @@ private fsmTrace.States.SpecificState copyState(fsmTrace.States.SpecificState ol

@SuppressWarnings("unchecked")
@Override
public void addState(List<org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.ModelChange> changes) {
public void addState(List<org.eclipse.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.ModelChange> changes) {
if (lastState == null) {
addInitialState();
} else if (!changes.isEmpty()) {
boolean stateChanged = false;
// We start by a (shallow) copy of the last state
// But we will have to rollback a little by replacing values that changed
fsmTrace.States.SpecificState newState = copyState(lastState);
for (org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.ModelChange modelChange : changes) {
for (org.eclipse.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.ModelChange modelChange : changes) {
EObject o = modelChange.getChangedObject();
// Here we must look at non-collection mutable fields
// We must rollback the last values from the copied state, and add new values as well
// ie. mix of remove and new
if (modelChange instanceof org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.NonCollectionFieldModelChange) {
if (modelChange instanceof org.eclipse.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.NonCollectionFieldModelChange) {
stateChanged = true;

org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.NonCollectionFieldModelChange modelChange_cast = (org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.NonCollectionFieldModelChange) modelChange;
org.eclipse.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.NonCollectionFieldModelChange modelChange_cast = (org.eclipse.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.NonCollectionFieldModelChange) modelChange;
org.eclipse.emf.ecore.EStructuralFeature p = modelChange_cast.getChangedField();

if (o instanceof org.gemoc.sample.legacyfsm.xsfsm.xsfsm.fsm.StateMachine) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
import java.util.List;

import org.eclipse.emf.ecore.EObject;
import org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.BatchModelChangeListener;
import org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.ModelChange;
import org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.NewObjectModelChange;
import org.eclipse.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.BatchModelChangeListener;
import org.eclipse.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.ModelChange;
import org.eclipse.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.NewObjectModelChange;

import fr.inria.diverse.trace.gemoc.api.ITraceListener;
import fr.inria.diverse.trace.gemoc.api.ITraceNotifier;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Require-Bundle: org.eclipse.xtend.lib;bundle-version="2.7.0";visibility:="privat
fr.inria.diverse.melange.resource;bundle-version="0.1.0";visibility:="reexport",
fr.inria.diverse.melange.adapters;bundle-version="0.1.0";visibility:="reexport",
fr.inria.diverse.k3.al.annotationprocessor.plugin;bundle-version="0.0.0";visibility:="reexport",
org.gemoc.xdsmlframework.api;bundle-version="0.0.0";visibility:="reexport",
org.eclipse.gemoc.xdsmlframework.api;bundle-version="0.0.0";visibility:="reexport",
org.gemoc.execution.sequential.javaxdsml.api;bundle-version="0.0.0";visibility:="reexport",
org.gemoc.executionframework.engine;bundle-version="0.0.0";visibility:="reexport",
org.gemoc.sample.legacyfsm.fsm.model;bundle-version="0.0.0";visibility:="private",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.xtend.lib;bundle-version="2.7.0";visibility:="privat
fr.inria.diverse.melange.resource;bundle-version="0.1.0";visibility:="reexport",
fr.inria.diverse.melange.adapters;bundle-version="0.1.0";visibility:="reexport",
fr.inria.diverse.k3.al.annotationprocessor.plugin;bundle-version="0.0.0";visibility:="reexport",
org.gemoc.xdsmlframework.api;bundle-version="0.0.0";visibility:="reexport",
org.eclipse.gemoc.xdsmlframework.api;bundle-version="0.0.0";visibility:="reexport",
org.gemoc.execution.sequential.javaxdsml.api;bundle-version="0.0.0";visibility:="reexport",
org.gemoc.executionframework.engine;bundle-version="0.0.0";visibility:="reexport",
org.gemoc.executionframework.extensions.sirius;bundle-version="0.0.0";visibility:=reexport,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Require-Bundle: org.eclipse.emf.ecore.xmi;visibility:=reexport,
org.gemoc.sample.tfsm.model;bundle-version="0.0.0";visibility:=reexport,
org.gemoc.sample.tfsm.k3dsa;bundle-version="0.0.0";visibility:=reexport,
org.gemoc.execution.concurrent.ccsljavaengine.extensions.k3;bundle-version="0.0.0";visibility:=reexport,
org.gemoc.xdsmlframework.api,
org.eclipse.gemoc.xdsmlframework.api,
org.gemoc.executionframework.engine,
org.gemoc.execution.concurrent.ccsljavaengine,
org.gemoc.sample.tfsm.moc.lib;bundle-version="0.0.0";visibility:=reexport,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.gemoc.commons.eclipse,
fr.inria.diverse.trace.gemoc,
fr.inria.diverse.trace.gemoc.api,
org.gemoc.xdsmlframework.api,
org.eclipse.gemoc.xdsmlframework.api,
org.gemoc.sequential_addons.multidimensional.timeline,
org.eclipse.gemoc.timeline,
fr.inria.diverse.trace.commons
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ private tfsm_plaink3Trace.States.State copyState(tfsm_plaink3Trace.States.State

@SuppressWarnings("unchecked")
@Override
public void addState(List<org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.ModelChange> changes) {
public void addState(List<org.eclipse.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.ModelChange> changes) {
if (lastState == null) {
addInitialState();
}
Expand All @@ -311,15 +311,15 @@ public void addState(List<org.gemoc.xdsmlframework.api.engine_addon.modelchangel
// We start by a (shallow) copy of the last state
// But we will have to rollback a little by replacing values that changed
tfsm_plaink3Trace.States.State newState = copyState(lastState);
for (org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.ModelChange modelChange : changes) {
for (org.eclipse.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.ModelChange modelChange : changes) {
EObject o = modelChange.getChangedObject();
// Here we must look at non-collection mutable fields
// We must rollback the last values from the copied state, and add new values as well
// ie. mix of remove and new
if (modelChange instanceof org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.NonCollectionFieldModelChange) {
if (modelChange instanceof org.eclipse.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.NonCollectionFieldModelChange) {
stateChanged = true;

org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.NonCollectionFieldModelChange modelChange_cast = (org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.NonCollectionFieldModelChange) modelChange;
org.eclipse.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.NonCollectionFieldModelChange modelChange_cast = (org.eclipse.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.NonCollectionFieldModelChange) modelChange;
org.eclipse.emf.ecore.EStructuralFeature p = modelChange_cast.getChangedField();

if (o instanceof org.gemoc.sample.tfsm.plaink3.xdsml.xtfsm.tfsm_plaink3.TFSM) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.gemoc.commons.eclipse,
fr.inria.diverse.trace.gemoc,
fr.inria.diverse.trace.gemoc.api,
org.gemoc.xdsmlframework.api,
org.eclipse.gemoc.xdsmlframework.api,
org.gemoc.sequential_addons.multidimensional.timeline,
org.eclipse.gemoc.timeline,
fr.inria.diverse.trace.commons
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ private tfsmTrace.States.State copyState(tfsmTrace.States.State oldState) {

@SuppressWarnings("unchecked")
@Override
public void addState(List<org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.ModelChange> changes) {
public void addState(List<org.eclipse.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.ModelChange> changes) {
if (lastState == null) {
addInitialState();
}
Expand All @@ -299,15 +299,15 @@ public void addState(List<org.gemoc.xdsmlframework.api.engine_addon.modelchangel
// We start by a (shallow) copy of the last state
// But we will have to rollback a little by replacing values that changed
tfsmTrace.States.State newState = copyState(lastState);
for (org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.ModelChange modelChange : changes) {
for (org.eclipse.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.ModelChange modelChange : changes) {
EObject o = modelChange.getChangedObject();
// Here we must look at non-collection mutable fields
// We must rollback the last values from the copied state, and add new values as well
// ie. mix of remove and new
if (modelChange instanceof org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.NonCollectionFieldModelChange) {
if (modelChange instanceof org.eclipse.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.NonCollectionFieldModelChange) {
stateChanged = true;

org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.NonCollectionFieldModelChange modelChange_cast = (org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.NonCollectionFieldModelChange) modelChange;
org.eclipse.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.NonCollectionFieldModelChange modelChange_cast = (org.eclipse.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.NonCollectionFieldModelChange) modelChange;
org.eclipse.emf.ecore.EStructuralFeature p = modelChange_cast.getChangedField();

if (o instanceof org.gemoc.sample.tfsm.sequential.xtfsm.tfsm.FSMClock) {
Expand Down

0 comments on commit d7fb619

Please sign in to comment.