Permalink
Browse files

[#89]: Relax input spec grammar by using Xtext options

Added the remaining model properties for scheduling properties

Task-Url: http://github.com/roberthilbrich/assist-public/issues/89
  • Loading branch information...
RobertHilbrich committed Oct 11, 2018
1 parent eb14e8f commit 0f373e059ea9d3440cefbbc4c4a6aa9a7d3c8f05
Showing with 6,279 additions and 1,872 deletions.
  1. BIN ...bri.assist.model.edit/icons/full/ctool16/CreateHardwareElement_properties_AddInitTimeProperty.gif
  2. BIN ch.hilbri.assist.model.edit/icons/full/ctool16/CreateHardwareElement_properties_ColorProperty.gif
  3. BIN ch.hilbri.assist.model.edit/icons/full/ctool16/CreateHardwareElement_properties_DurationProperty.gif
  4. BIN ....assist.model.edit/icons/full/ctool16/CreateHardwareElement_properties_EarlyToleranceProperty.gif
  5. BIN ...i.assist.model.edit/icons/full/ctool16/CreateHardwareElement_properties_LateToleranceProperty.gif
  6. BIN ...lbri.assist.model.edit/icons/full/ctool16/CreateHardwareElement_properties_MaxEndTimeProperty.gif
  7. BIN ...ri.assist.model.edit/icons/full/ctool16/CreateHardwareElement_properties_MaxStartTimeProperty.gif
  8. BIN ...ssist.model.edit/icons/full/ctool16/CreateHardwareElement_properties_MinSliceDurationProperty.gif
  9. BIN ch.hilbri.assist.model.edit/icons/full/ctool16/CreateHardwareElement_properties_PeriodProperty.gif
  10. BIN ...bri.assist.model.edit/icons/full/ctool16/CreateHardwareElement_properties_PeriodicityProperty.gif
  11. BIN ch.hilbri.assist.model.edit/icons/full/ctool16/CreateHardwareElement_properties_SlicesProperty.gif
  12. BIN ...bri.assist.model.edit/icons/full/ctool16/CreateSoftwareElement_properties_AddInitTimeProperty.gif
  13. BIN ch.hilbri.assist.model.edit/icons/full/ctool16/CreateSoftwareElement_properties_ColorProperty.gif
  14. BIN ch.hilbri.assist.model.edit/icons/full/ctool16/CreateSoftwareElement_properties_DurationProperty.gif
  15. BIN ....assist.model.edit/icons/full/ctool16/CreateSoftwareElement_properties_EarlyToleranceProperty.gif
  16. BIN ...i.assist.model.edit/icons/full/ctool16/CreateSoftwareElement_properties_LateToleranceProperty.gif
  17. BIN ...lbri.assist.model.edit/icons/full/ctool16/CreateSoftwareElement_properties_MaxEndTimeProperty.gif
  18. BIN ...ri.assist.model.edit/icons/full/ctool16/CreateSoftwareElement_properties_MaxStartTimeProperty.gif
  19. BIN ...ssist.model.edit/icons/full/ctool16/CreateSoftwareElement_properties_MinSliceDurationProperty.gif
  20. BIN ch.hilbri.assist.model.edit/icons/full/ctool16/CreateSoftwareElement_properties_PeriodProperty.gif
  21. BIN ...bri.assist.model.edit/icons/full/ctool16/CreateSoftwareElement_properties_PeriodicityProperty.gif
  22. BIN ch.hilbri.assist.model.edit/icons/full/ctool16/CreateSoftwareElement_properties_SlicesProperty.gif
  23. BIN ch.hilbri.assist.model.edit/icons/full/obj16/AddInitTimeProperty.gif
  24. BIN ch.hilbri.assist.model.edit/icons/full/obj16/ColorProperty.gif
  25. BIN ch.hilbri.assist.model.edit/icons/full/obj16/DurationProperty.gif
  26. BIN ch.hilbri.assist.model.edit/icons/full/obj16/EarlyToleranceProperty.gif
  27. BIN ch.hilbri.assist.model.edit/icons/full/obj16/LateToleranceProperty.gif
  28. BIN ch.hilbri.assist.model.edit/icons/full/obj16/MaxEndTimeProperty.gif
  29. BIN ch.hilbri.assist.model.edit/icons/full/obj16/MaxStartTimeProperty.gif
  30. BIN ch.hilbri.assist.model.edit/icons/full/obj16/MinSliceDurationProperty.gif
  31. BIN ch.hilbri.assist.model.edit/icons/full/obj16/PeriodProperty.gif
  32. BIN ch.hilbri.assist.model.edit/icons/full/obj16/PeriodicityProperty.gif
  33. BIN ch.hilbri.assist.model.edit/icons/full/obj16/SlicesProperty.gif
  34. +13 −0 ch.hilbri.assist.model.edit/plugin.properties
  35. +97 −0 ch.hilbri.assist.model.edit/src/ch/hilbri/assist/model/provider/AddInitTimePropertyItemProvider.java
  36. +134 −0 ch.hilbri.assist.model.edit/src/ch/hilbri/assist/model/provider/ColorPropertyItemProvider.java
  37. +97 −0 ch.hilbri.assist.model.edit/src/ch/hilbri/assist/model/provider/DurationPropertyItemProvider.java
  38. +97 −0 ...bri.assist.model.edit/src/ch/hilbri/assist/model/provider/EarlyTolerancePropertyItemProvider.java
  39. +56 −1 ch.hilbri.assist.model.edit/src/ch/hilbri/assist/model/provider/HardwareElementItemProvider.java
  40. +97 −0 ...lbri.assist.model.edit/src/ch/hilbri/assist/model/provider/LateTolerancePropertyItemProvider.java
  41. +97 −0 ch.hilbri.assist.model.edit/src/ch/hilbri/assist/model/provider/MaxEndTimePropertyItemProvider.java
  42. +97 −0 ...ilbri.assist.model.edit/src/ch/hilbri/assist/model/provider/MaxStartTimePropertyItemProvider.java
  43. +97 −0 ...i.assist.model.edit/src/ch/hilbri/assist/model/provider/MinSliceDurationPropertyItemProvider.java
  44. +366 −102 ch.hilbri.assist.model.edit/src/ch/hilbri/assist/model/provider/ModelItemProviderAdapterFactory.java
  45. +97 −0 ch.hilbri.assist.model.edit/src/ch/hilbri/assist/model/provider/PeriodPropertyItemProvider.java
  46. +134 −0 ch.hilbri.assist.model.edit/src/ch/hilbri/assist/model/provider/PeriodicityPropertyItemProvider.java
  47. +97 −0 ch.hilbri.assist.model.edit/src/ch/hilbri/assist/model/provider/SlicesPropertyItemProvider.java
  48. +56 −1 ch.hilbri.assist.model.edit/src/ch/hilbri/assist/model/provider/SoftwareElementItemProvider.java
  49. +0 −264 ch.hilbri.assist.model.edit/src/ch/hilbri/assist/model/provider/TaskItemProvider.java
  50. +253 −253 ch.hilbri.assist.model.editor/src/ch/hilbri/assist/model/presentation/ModelEditor.java
  51. +208 −78 ch.hilbri.assist.model/model/ASSIST-Model.xcore
  52. +17 −0 ch.hilbri.assist.model/src-gen/ch/hilbri/assist/model/AddInitTimeProperty.java
  53. +1 −1 ch.hilbri.assist.model/src-gen/ch/hilbri/assist/model/Application.java
  54. +53 −0 ch.hilbri.assist.model/src-gen/ch/hilbri/assist/model/ColorProperty.java
  55. +17 −0 ch.hilbri.assist.model/src-gen/ch/hilbri/assist/model/DurationProperty.java
  56. +17 −0 ch.hilbri.assist.model/src-gen/ch/hilbri/assist/model/EarlyToleranceProperty.java
  57. +17 −0 ch.hilbri.assist.model/src-gen/ch/hilbri/assist/model/LateToleranceProperty.java
  58. +17 −0 ch.hilbri.assist.model/src-gen/ch/hilbri/assist/model/MaxEndTimeProperty.java
  59. +17 −0 ch.hilbri.assist.model/src-gen/ch/hilbri/assist/model/MaxStartTimeProperty.java
  60. +17 −0 ch.hilbri.assist.model/src-gen/ch/hilbri/assist/model/MinSliceDurationProperty.java
  61. +102 −3 ch.hilbri.assist.model/src-gen/ch/hilbri/assist/model/ModelFactory.java
  62. +1,233 −282 ch.hilbri.assist.model/src-gen/ch/hilbri/assist/model/ModelPackage.java
  63. +17 −0 ch.hilbri.assist.model/src-gen/ch/hilbri/assist/model/PeriodProperty.java
  64. +53 −0 ch.hilbri.assist.model/src-gen/ch/hilbri/assist/model/PeriodicityProperty.java
  65. +17 −0 ch.hilbri.assist.model/src-gen/ch/hilbri/assist/model/SlicesProperty.java
  66. +97 −235 ch.hilbri.assist.model/src-gen/ch/hilbri/assist/model/Task.java
  67. +37 −0 ch.hilbri.assist.model/src-gen/ch/hilbri/assist/model/impl/AddInitTimePropertyImpl.java
  68. +3 −3 ch.hilbri.assist.model/src-gen/ch/hilbri/assist/model/impl/ApplicationImpl.java
  69. +163 −0 ch.hilbri.assist.model/src-gen/ch/hilbri/assist/model/impl/ColorPropertyImpl.java
  70. +37 −0 ch.hilbri.assist.model/src-gen/ch/hilbri/assist/model/impl/DurationPropertyImpl.java
  71. +37 −0 ch.hilbri.assist.model/src-gen/ch/hilbri/assist/model/impl/EarlyTolerancePropertyImpl.java
  72. +37 −0 ch.hilbri.assist.model/src-gen/ch/hilbri/assist/model/impl/LateTolerancePropertyImpl.java
  73. +37 −0 ch.hilbri.assist.model/src-gen/ch/hilbri/assist/model/impl/MaxEndTimePropertyImpl.java
  74. +37 −0 ch.hilbri.assist.model/src-gen/ch/hilbri/assist/model/impl/MaxStartTimePropertyImpl.java
  75. +37 −0 ch.hilbri.assist.model/src-gen/ch/hilbri/assist/model/impl/MinSliceDurationPropertyImpl.java
  76. +136 −4 ch.hilbri.assist.model/src-gen/ch/hilbri/assist/model/impl/ModelFactoryImpl.java
  77. +492 −74 ch.hilbri.assist.model/src-gen/ch/hilbri/assist/model/impl/ModelPackageImpl.java
  78. +37 −0 ch.hilbri.assist.model/src-gen/ch/hilbri/assist/model/impl/PeriodPropertyImpl.java
  79. +163 −0 ch.hilbri.assist.model/src-gen/ch/hilbri/assist/model/impl/PeriodicityPropertyImpl.java
  80. +37 −0 ch.hilbri.assist.model/src-gen/ch/hilbri/assist/model/impl/SlicesPropertyImpl.java
  81. +720 −558 ch.hilbri.assist.model/src-gen/ch/hilbri/assist/model/impl/TaskImpl.java
  82. +214 −5 ch.hilbri.assist.model/src-gen/ch/hilbri/assist/model/util/ModelAdapterFactory.java
  83. +270 −8 ch.hilbri.assist.model/src-gen/ch/hilbri/assist/model/util/ModelSwitch.java
Binary file not shown.
Binary file not shown.
Binary file not shown.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
@@ -547,3 +547,16 @@ _UI_CoreUtilizationProperty_type = Core Utilization Property
_UI_Board_newValue_feature = New Value
_UI_Board_ModelFactory_feature = Model Factory
_UI_Board___feature =
_UI_DurationProperty_type = Duration Property
_UI_PeriodProperty_type = Period Property
_UI_EarlyToleranceProperty_type = Early Tolerance Property
_UI_LateToleranceProperty_type = Late Tolerance Property
_UI_MaxStartTimeProperty_type = Max Start Time Property
_UI_MaxEndTimeProperty_type = Max End Time Property
_UI_AddInitTimeProperty_type = Add Init Time Property
_UI_SlicesProperty_type = Slices Property
_UI_MinSliceDurationProperty_type = Min Slice Duration Property
_UI_PeriodicityProperty_type = Periodicity Property
_UI_PeriodicityProperty_value_feature = Value
_UI_ColorProperty_type = Color Property
_UI_ColorProperty_value_feature = Value
@@ -0,0 +1,97 @@
/**
*/
package ch.hilbri.assist.model.provider;
import ch.hilbri.assist.model.AddInitTimeProperty;
import java.util.Collection;
import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
/**
* This is the item provider adapter for a {@link ch.hilbri.assist.model.AddInitTimeProperty} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
public class AddInitTimePropertyItemProvider extends IntPropertyItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
public AddInitTimePropertyItemProvider(AdapterFactory adapterFactory) {
super(adapterFactory);
}
/**
* This returns the property descriptors for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
if (itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
}
return itemPropertyDescriptors;
}
/**
* This returns AddInitTimeProperty.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
public Object getImage(Object object) {
return overlayImage(object, getResourceLocator().getImage("full/obj16/AddInitTimeProperty"));
}
/**
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
public String getText(Object object) {
AddInitTimeProperty addInitTimeProperty = (AddInitTimeProperty)object;
return getString("_UI_AddInitTimeProperty_type") + " " + addInitTimeProperty.getValue();
}
/**
* This handles model notifications by calling {@link #updateChildren} to update any cached
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
super.notifyChanged(notification);
}
/**
* This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
* that can be created under this object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
}
}
@@ -0,0 +1,134 @@
/**
*/
package ch.hilbri.assist.model.provider;
import ch.hilbri.assist.model.Color;
import ch.hilbri.assist.model.ColorProperty;
import ch.hilbri.assist.model.ModelPackage;
import java.util.Collection;
import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
/**
* This is the item provider adapter for a {@link ch.hilbri.assist.model.ColorProperty} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
public class ColorPropertyItemProvider extends PropertyItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
public ColorPropertyItemProvider(AdapterFactory adapterFactory) {
super(adapterFactory);
}
/**
* This returns the property descriptors for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
if (itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
addValuePropertyDescriptor(object);
}
return itemPropertyDescriptors;
}
/**
* This adds a property descriptor for the Value feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected void addValuePropertyDescriptor(Object object) {
itemPropertyDescriptors.add
(createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_ColorProperty_value_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_ColorProperty_value_feature", "_UI_ColorProperty_type"),
ModelPackage.Literals.COLOR_PROPERTY__VALUE,
true,
false,
false,
ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
null,
null));
}
/**
* This returns ColorProperty.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
public Object getImage(Object object) {
return overlayImage(object, getResourceLocator().getImage("full/obj16/ColorProperty"));
}
/**
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
public String getText(Object object) {
Color labelValue = ((ColorProperty)object).getValue();
String label = labelValue == null ? null : labelValue.toString();
return label == null || label.length() == 0 ?
getString("_UI_ColorProperty_type") :
getString("_UI_ColorProperty_type") + " " + label;
}
/**
* This handles model notifications by calling {@link #updateChildren} to update any cached
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
switch (notification.getFeatureID(ColorProperty.class)) {
case ModelPackage.COLOR_PROPERTY__VALUE:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
}
super.notifyChanged(notification);
}
/**
* This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
* that can be created under this object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
}
}
@@ -0,0 +1,97 @@
/**
*/
package ch.hilbri.assist.model.provider;
import ch.hilbri.assist.model.DurationProperty;
import java.util.Collection;
import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
/**
* This is the item provider adapter for a {@link ch.hilbri.assist.model.DurationProperty} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
public class DurationPropertyItemProvider extends IntPropertyItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
public DurationPropertyItemProvider(AdapterFactory adapterFactory) {
super(adapterFactory);
}
/**
* This returns the property descriptors for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
if (itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
}
return itemPropertyDescriptors;
}
/**
* This returns DurationProperty.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
public Object getImage(Object object) {
return overlayImage(object, getResourceLocator().getImage("full/obj16/DurationProperty"));
}
/**
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
public String getText(Object object) {
DurationProperty durationProperty = (DurationProperty)object;
return getString("_UI_DurationProperty_type") + " " + durationProperty.getValue();
}
/**
* This handles model notifications by calling {@link #updateChildren} to update any cached
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
super.notifyChanged(notification);
}
/**
* This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
* that can be created under this object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
}
}
Oops, something went wrong.

0 comments on commit 0f373e0

Please sign in to comment.