Skip to content

Add icon for flow implementation. Display proper icon based on selected #2480

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lwrage merged 3 commits into from
Oct 27, 2020
Merged

Add icon for flow implementation. Display proper icon based on selected #2480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
566f476
Add icon for flow implementation. Display proper icon based on selected
Oct 7, 2020
6a84b9d
Add letter I to flow path, flow sink and flow source images
asazonova Oct 15, 2020
49b697e
Use separate icons for flow specification sink/path/source and flow
asazonova Oct 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified core/org.osate.aadl2.edit/icons/full/obj16/EndToEndFlow.gif
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified core/org.osate.aadl2.edit/icons/full/obj16/FlowImplementation.gif
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added core/org.osate.aadl2.edit/icons/full/obj16/FlowPathImplementation.gif
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified core/org.osate.aadl2.edit/icons/full/obj16/FlowSink.gif
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added core/org.osate.aadl2.edit/icons/full/obj16/FlowSinkImplementation.gif
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added core/org.osate.aadl2.edit/icons/full/obj16/FlowSourceImplementation.gif
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 20 additions & 2 deletions core/org.osate.aadl2.edit/src/org/osate/aadl2/provider/FlowImplementationItemProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import org.osate.aadl2.Aadl2Factory;
import org.osate.aadl2.Aadl2Package;
import org.osate.aadl2.FlowImplementation;
import org.osate.aadl2.impl.FlowImplementationImpl;

/**
* This is the item provider adapter for a {@link org.osate.aadl2.FlowImplementation} object.
Expand All @@ -60,6 +61,7 @@ public FlowImplementationItemProvider(AdapterFactory adapterFactory) {
* <!-- end-user-doc -->
* @generated
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
if (itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
Expand Down Expand Up @@ -110,6 +112,7 @@ protected void addSpecificationPropertyDescriptor(Object object) {
* <!-- end-user-doc -->
* @generated
*/
@Override
public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
if (childrenFeatures == null) {
super.getChildrenFeatures(object);
Expand All @@ -125,6 +128,7 @@ public Collection<? extends EStructuralFeature> getChildrenFeatures(Object objec
* <!-- end-user-doc -->
* @generated
*/
@Override
protected EStructuralFeature getChildFeature(Object object, Object child) {
// Check the type of the specified child object and return the proper feature to use for
// adding (see {@link AddCommand}) it as a child.
Expand All @@ -136,10 +140,20 @@ protected EStructuralFeature getChildFeature(Object object, Object child) {
* This returns FlowImplementation.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @generated NOT
*/
@Override
public Object getImage(Object object) {
return overlayImage(object, getResourceLocator().getImage("full/obj16/FlowImplementation"));
if (((FlowImplementationImpl) object).getInEnd() == null
&& ((FlowImplementationImpl) object).getOutEnd() == null) {
return null;
} else if (((FlowImplementationImpl) object).getInEnd() == null) {
return overlayImage(object, getResourceLocator().getImage("full/obj16/FlowSourceImplementation"));
} else if (((FlowImplementationImpl) object).getOutEnd() == null) {
return overlayImage(object, getResourceLocator().getImage("full/obj16/FlowSinkImplementation"));
}

return overlayImage(object, getResourceLocator().getImage("full/obj16/FlowPathImplementation"));
}

/**
Expand All @@ -164,6 +178,7 @@ protected void addKindPropertyDescriptor(Object object) {
* <!-- end-user-doc -->
* @generated
*/
@Override
public String getText(Object object) {
String label = ((FlowImplementation) object).getName();
return label == null || label.length() == 0 ? getString("_UI_FlowImplementation_type")
Expand All @@ -177,6 +192,7 @@ public String getText(Object object) {
* <!-- end-user-doc -->
* @generated
*/
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);

Expand All @@ -200,6 +216,7 @@ public void notifyChanged(Notification notification) {
* <!-- end-user-doc -->
* @generated
*/
@Override
protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);

Expand All @@ -219,6 +236,7 @@ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors
* <!-- end-user-doc -->
* @generated
*/
@Override
public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
Object childFeature = feature;
Object childObject = child;
Expand Down
22 changes: 20 additions & 2 deletions core/org.osate.aadl2.edit/src/org/osate/aadl2/provider/FlowSpecificationItemProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import org.osate.aadl2.Aadl2Factory;
import org.osate.aadl2.Aadl2Package;
import org.osate.aadl2.FlowSpecification;
import org.osate.aadl2.impl.FlowSpecificationImpl;

/**
* This is the item provider adapter for a {@link org.osate.aadl2.FlowSpecification} object.
Expand All @@ -60,6 +61,7 @@ public FlowSpecificationItemProvider(AdapterFactory adapterFactory) {
* <!-- end-user-doc -->
* @generated
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
if (itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
Expand Down Expand Up @@ -126,6 +128,7 @@ protected void addKindPropertyDescriptor(Object object) {
* <!-- end-user-doc -->
* @generated
*/
@Override
public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
if (childrenFeatures == null) {
super.getChildrenFeatures(object);
Expand All @@ -140,6 +143,7 @@ public Collection<? extends EStructuralFeature> getChildrenFeatures(Object objec
* <!-- end-user-doc -->
* @generated
*/
@Override
protected EStructuralFeature getChildFeature(Object object, Object child) {
// Check the type of the specified child object and return the proper feature to use for
// adding (see {@link AddCommand}) it as a child.
Expand All @@ -166,10 +170,20 @@ protected void addRefinedPropertyDescriptor(Object object) {
* This returns FlowSpecification.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @generated NOT
*/
@Override
public Object getImage(Object object) {
return overlayImage(object, getResourceLocator().getImage("full/obj16/FlowSpecification"));
if (((FlowSpecificationImpl) object).getAllInEnd() == null
&& ((FlowSpecificationImpl) object).getAllOutEnd() == null) {
return null;
} else if (((FlowSpecificationImpl) object).getAllInEnd() == null) {
return overlayImage(object, getResourceLocator().getImage("full/obj16/FlowSource"));
} else if (((FlowSpecificationImpl) object).getAllOutEnd() == null) {
return overlayImage(object, getResourceLocator().getImage("full/obj16/FlowSink"));
}

return overlayImage(object, getResourceLocator().getImage("full/obj16/FlowPath"));
}

/**
Expand All @@ -178,6 +192,7 @@ public Object getImage(Object object) {
* <!-- end-user-doc -->
* @generated
*/
@Override
public String getText(Object object) {
String label = ((FlowSpecification) object).getName();
return label == null || label.length() == 0 ? getString("_UI_FlowSpecification_type")
Expand All @@ -191,6 +206,7 @@ public String getText(Object object) {
* <!-- end-user-doc -->
* @generated
*/
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);

Expand All @@ -213,6 +229,7 @@ public void notifyChanged(Notification notification) {
* <!-- end-user-doc -->
* @generated
*/
@Override
protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);

Expand All @@ -229,6 +246,7 @@ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors
* <!-- end-user-doc -->
* @generated
*/
@Override
public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
Object childFeature = feature;
Object childObject = child;
Expand Down