[562542] Added simple FB icon and show it correctly in all places
With this commit we finally have an icon for simple FBs. Furthermore
this new icon is correctly shown at all places where simple FB types or
instances are used.
Furthermore this commit includes a clean-up in the edit model to
correctly provide the right icons for all types.
Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=562542
Change-Id: I0abfdb7f597432ce998c35104935d30e6793349c
Signed-off-by: Alois Zoitl <alois.zoitl@gmx.at>
diff --git a/plugins/org.eclipse.fordiac.ide.application/src/org/eclipse/fordiac/ide/application/editors/FBNetworkContextMenuProvider.java b/plugins/org.eclipse.fordiac.ide.application/src/org/eclipse/fordiac/ide/application/editors/FBNetworkContextMenuProvider.java
index 5e23cb8..e362da6 100644
--- a/plugins/org.eclipse.fordiac.ide.application/src/org/eclipse/fordiac/ide/application/editors/FBNetworkContextMenuProvider.java
+++ b/plugins/org.eclipse.fordiac.ide.application/src/org/eclipse/fordiac/ide/application/editors/FBNetworkContextMenuProvider.java
@@ -45,6 +45,7 @@
import org.eclipse.fordiac.ide.model.libraryElement.BasicFBType;
import org.eclipse.fordiac.ide.model.libraryElement.CompositeFBType;
import org.eclipse.fordiac.ide.model.libraryElement.Resource;
+import org.eclipse.fordiac.ide.model.libraryElement.SimpleFBType;
import org.eclipse.fordiac.ide.model.libraryElement.SubAppType;
import org.eclipse.fordiac.ide.model.typelibrary.TypeLibrary;
import org.eclipse.fordiac.ide.ui.imageprovider.FordiacImage;
@@ -224,6 +225,8 @@
image = FordiacImage.ICON_SUB_APP.getImageDescriptor();
} else if (entry.getType() instanceof BasicFBType) {
image = FordiacImage.ICON_BASIC_FB.getImageDescriptor();
+ } else if (entry.getType() instanceof SimpleFBType) {
+ image = FordiacImage.ICON_SIMPLE_FB.getImageDescriptor();
} else if (entry.getType() instanceof CompositeFBType) {
image = FordiacImage.ICON_COMPOSITE_FB.getImageDescriptor();
} else {
diff --git a/plugins/org.eclipse.fordiac.ide.application/src/org/eclipse/fordiac/ide/application/editors/NewInstanceCellEditor.java b/plugins/org.eclipse.fordiac.ide.application/src/org/eclipse/fordiac/ide/application/editors/NewInstanceCellEditor.java
index 9aec737..d247298 100644
--- a/plugins/org.eclipse.fordiac.ide.application/src/org/eclipse/fordiac/ide/application/editors/NewInstanceCellEditor.java
+++ b/plugins/org.eclipse.fordiac.ide.application/src/org/eclipse/fordiac/ide/application/editors/NewInstanceCellEditor.java
@@ -19,6 +19,7 @@
import org.eclipse.fordiac.ide.model.Palette.PaletteEntry;
import org.eclipse.fordiac.ide.model.libraryElement.BasicFBType;
import org.eclipse.fordiac.ide.model.libraryElement.CompositeFBType;
+import org.eclipse.fordiac.ide.model.libraryElement.SimpleFBType;
import org.eclipse.fordiac.ide.model.libraryElement.SubAppType;
import org.eclipse.fordiac.ide.model.typelibrary.PaletteFilter;
import org.eclipse.fordiac.ide.ui.imageprovider.FordiacImage;
@@ -238,6 +239,8 @@
return FordiacImage.ICON_SUB_APP.getImage();
} else if (entry.getType() instanceof BasicFBType) {
return FordiacImage.ICON_BASIC_FB.getImage();
+ } else if (entry.getType() instanceof SimpleFBType) {
+ return FordiacImage.ICON_SIMPLE_FB.getImage();
} else if (entry.getType() instanceof CompositeFBType) {
return FordiacImage.ICON_COMPOSITE_FB.getImage();
} else {
diff --git a/plugins/org.eclipse.fordiac.ide.images/fordiacimages.properties b/plugins/org.eclipse.fordiac.ide.images/fordiacimages.properties
index 44f84c7..a811394 100644
--- a/plugins/org.eclipse.fordiac.ide.images/fordiacimages.properties
+++ b/plugins/org.eclipse.fordiac.ide.images/fordiacimages.properties
@@ -79,6 +79,7 @@
ICON_SERVICE=service.png
ICON_SERVICE_SEQUENCE=sequence.png
ICON_SIFB=sifb_16.png
+ICON_SIMPLE_FB=simplefb.png
ICON_SOCKETS=sockets_16.png
ICON_START=start.gif
ICON_START_MONITORING=startMon.gif
diff --git a/plugins/org.eclipse.fordiac.ide.images/image_src/subapp.xcf b/plugins/org.eclipse.fordiac.ide.images/image_src/subapp.xcf
index 5a2ba28..a4ea6f5 100644
--- a/plugins/org.eclipse.fordiac.ide.images/image_src/subapp.xcf
+++ b/plugins/org.eclipse.fordiac.ide.images/image_src/subapp.xcf
Binary files differ
diff --git a/plugins/org.eclipse.fordiac.ide.images/images/simplefb.png b/plugins/org.eclipse.fordiac.ide.images/images/simplefb.png
new file mode 100644
index 0000000..4ee8fbb
--- /dev/null
+++ b/plugins/org.eclipse.fordiac.ide.images/images/simplefb.png
Binary files differ
diff --git a/plugins/org.eclipse.fordiac.ide.model.edit/src-gen/org/eclipse/fordiac/ide/model/libraryElement/provider/AdapterFBTypeItemProvider.java b/plugins/org.eclipse.fordiac.ide.model.edit/src-gen/org/eclipse/fordiac/ide/model/libraryElement/provider/AdapterFBTypeItemProvider.java
index 0d03e13..45b69de 100644
--- a/plugins/org.eclipse.fordiac.ide.model.edit/src-gen/org/eclipse/fordiac/ide/model/libraryElement/provider/AdapterFBTypeItemProvider.java
+++ b/plugins/org.eclipse.fordiac.ide.model.edit/src-gen/org/eclipse/fordiac/ide/model/libraryElement/provider/AdapterFBTypeItemProvider.java
@@ -1,13 +1,13 @@
/**
* *******************************************************************************
* Copyright (c) 2008 - 2017 Profactor GmbH, TU Wien ACIN, fortiss GmbH
- *
+ *
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0.
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* Gerhard Ebenhofer, Alois Zoitl, Ingo Hegny, Monika Wenger, Martin Jobst
* - initial API and implementation and/or initial documentation
@@ -24,19 +24,20 @@
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.fordiac.ide.model.libraryElement.AdapterFBType;
import org.eclipse.fordiac.ide.model.libraryElement.LibraryElementPackage;
+import org.eclipse.fordiac.ide.ui.imageprovider.FordiacImage;
/**
* This is the item provider adapter for a
* {@link org.eclipse.fordiac.ide.model.libraryElement.AdapterFBType} object.
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class AdapterFBTypeItemProvider extends FBTypeItemProvider {
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
public AdapterFBTypeItemProvider(AdapterFactory adapterFactory) {
@@ -46,7 +47,7 @@
/**
* This returns the property descriptors for the adapted class. <!--
* begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -62,7 +63,7 @@
/**
* This adds a property descriptor for the Adapter Type feature. <!--
* begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addAdapterTypePropertyDescriptor(Object object) {
@@ -76,18 +77,18 @@
/**
* This returns AdapterFBType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
+ *
+ * @generated not
*/
@Override
public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/AdapterFBType")); //$NON-NLS-1$
+ return overlayImage(object, FordiacImage.ICON_ADAPTER.getImage());
}
/**
* This returns the label text for the adapted class. <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -101,7 +102,7 @@
* 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
@@ -114,7 +115,7 @@
* 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
diff --git a/plugins/org.eclipse.fordiac.ide.model.edit/src-gen/org/eclipse/fordiac/ide/model/libraryElement/provider/BasicFBTypeItemProvider.java b/plugins/org.eclipse.fordiac.ide.model.edit/src-gen/org/eclipse/fordiac/ide/model/libraryElement/provider/BasicFBTypeItemProvider.java
index a655b8d..b3d82b1 100644
--- a/plugins/org.eclipse.fordiac.ide.model.edit/src-gen/org/eclipse/fordiac/ide/model/libraryElement/provider/BasicFBTypeItemProvider.java
+++ b/plugins/org.eclipse.fordiac.ide.model.edit/src-gen/org/eclipse/fordiac/ide/model/libraryElement/provider/BasicFBTypeItemProvider.java
@@ -1,13 +1,13 @@
/**
* *******************************************************************************
* Copyright (c) 2008 - 2017 Profactor GmbH, TU Wien ACIN, fortiss GmbH
- *
+ *
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0.
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* Gerhard Ebenhofer, Alois Zoitl, Ingo Hegny, Monika Wenger, Martin Jobst
* - initial API and implementation and/or initial documentation
@@ -26,19 +26,20 @@
import org.eclipse.fordiac.ide.model.libraryElement.BasicFBType;
import org.eclipse.fordiac.ide.model.libraryElement.LibraryElementFactory;
import org.eclipse.fordiac.ide.model.libraryElement.LibraryElementPackage;
+import org.eclipse.fordiac.ide.ui.imageprovider.FordiacImage;
/**
* This is the item provider adapter for a
* {@link org.eclipse.fordiac.ide.model.libraryElement.BasicFBType} object. <!--
* begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class BasicFBTypeItemProvider extends BaseFBTypeItemProvider {
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
public BasicFBTypeItemProvider(AdapterFactory adapterFactory) {
@@ -48,7 +49,7 @@
/**
* This returns the property descriptors for the adapted class. <!--
* begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -66,7 +67,7 @@
* {@link org.eclipse.emf.edit.command.RemoveCommand} or
* {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -81,7 +82,7 @@
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -95,18 +96,18 @@
/**
* This returns BasicFBType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
+ *
+ * @generated not
*/
@Override
public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/BasicFBType")); //$NON-NLS-1$
+ return overlayImage(object, FordiacImage.ICON_BASIC_FB.getImage());
}
/**
* This returns the label text for the adapted class. <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -120,7 +121,7 @@
* 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
@@ -140,7 +141,7 @@
* 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
diff --git a/plugins/org.eclipse.fordiac.ide.model.edit/src-gen/org/eclipse/fordiac/ide/model/libraryElement/provider/DeviceTypeItemProvider.java b/plugins/org.eclipse.fordiac.ide.model.edit/src-gen/org/eclipse/fordiac/ide/model/libraryElement/provider/DeviceTypeItemProvider.java
index bcee6db..7b235dd 100644
--- a/plugins/org.eclipse.fordiac.ide.model.edit/src-gen/org/eclipse/fordiac/ide/model/libraryElement/provider/DeviceTypeItemProvider.java
+++ b/plugins/org.eclipse.fordiac.ide.model.edit/src-gen/org/eclipse/fordiac/ide/model/libraryElement/provider/DeviceTypeItemProvider.java
@@ -27,19 +27,20 @@
import org.eclipse.fordiac.ide.model.libraryElement.DeviceType;
import org.eclipse.fordiac.ide.model.libraryElement.LibraryElementFactory;
import org.eclipse.fordiac.ide.model.libraryElement.LibraryElementPackage;
+import org.eclipse.fordiac.ide.ui.imageprovider.FordiacImage;
/**
* This is the item provider adapter for a
* {@link org.eclipse.fordiac.ide.model.libraryElement.DeviceType} object. <!--
* begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class DeviceTypeItemProvider extends CompilableTypeItemProvider {
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
public DeviceTypeItemProvider(AdapterFactory adapterFactory) {
@@ -49,7 +50,7 @@
/**
* This returns the property descriptors for the adapted class. <!--
* begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -65,7 +66,7 @@
/**
* This adds a property descriptor for the Profile feature. <!-- begin-user-doc
* --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected void addProfilePropertyDescriptor(Object object) {
@@ -84,7 +85,7 @@
* {@link org.eclipse.emf.edit.command.RemoveCommand} or
* {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -101,7 +102,7 @@
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -115,18 +116,18 @@
/**
* This returns DeviceType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
+ *
+ * @generated not
*/
@Override
public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/DeviceType")); //$NON-NLS-1$
+ return overlayImage(object, FordiacImage.ICON_DEVICE.getImage());
}
/**
* This returns the label text for the adapted class. <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -140,7 +141,7 @@
* 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
@@ -166,7 +167,7 @@
* 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
diff --git a/plugins/org.eclipse.fordiac.ide.model.edit/src-gen/org/eclipse/fordiac/ide/model/libraryElement/provider/FBItemProvider.java b/plugins/org.eclipse.fordiac.ide.model.edit/src-gen/org/eclipse/fordiac/ide/model/libraryElement/provider/FBItemProvider.java
index 1dd6d80..844ec8d 100644
--- a/plugins/org.eclipse.fordiac.ide.model.edit/src-gen/org/eclipse/fordiac/ide/model/libraryElement/provider/FBItemProvider.java
+++ b/plugins/org.eclipse.fordiac.ide.model.edit/src-gen/org/eclipse/fordiac/ide/model/libraryElement/provider/FBItemProvider.java
@@ -1,13 +1,13 @@
/**
* *******************************************************************************
* Copyright (c) 2008 - 2017 Profactor GmbH, TU Wien ACIN, fortiss GmbH
- *
+ *
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0.
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* Gerhard Ebenhofer, Alois Zoitl, Ingo Hegny, Monika Wenger, Martin Jobst
* - initial API and implementation and/or initial documentation
@@ -26,20 +26,21 @@
import org.eclipse.fordiac.ide.model.libraryElement.FB;
import org.eclipse.fordiac.ide.model.libraryElement.FBType;
import org.eclipse.fordiac.ide.model.libraryElement.ServiceInterfaceFBType;
+import org.eclipse.fordiac.ide.model.libraryElement.SimpleFBType;
import org.eclipse.fordiac.ide.ui.imageprovider.FordiacImage;
/**
* This is the item provider adapter for a
* {@link org.eclipse.fordiac.ide.model.libraryElement.FB} object. <!--
* begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class FBItemProvider extends FBNetworkElementItemProvider {
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
public FBItemProvider(AdapterFactory adapterFactory) {
@@ -49,7 +50,7 @@
/**
* This returns the property descriptors for the adapted class. <!--
* begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -63,7 +64,7 @@
/**
* This returns FB.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated not
*/
@Override
@@ -71,6 +72,8 @@
FBType type = ((FB) object).getType();
if (type instanceof BasicFBType) {
return overlayImage(object, FordiacImage.ICON_BASIC_FB.getImage());
+ } else if (type instanceof SimpleFBType) {
+ return overlayImage(object, FordiacImage.ICON_SIMPLE_FB.getImage());
} else if (type instanceof CompositeFBType) {
return overlayImage(object, FordiacImage.ICON_COMPOSITE_FB.getImage());
} else if (type instanceof ServiceInterfaceFBType) {
@@ -82,7 +85,7 @@
/**
* This returns the label text for the adapted class. <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated not
*/
@Override
@@ -95,7 +98,7 @@
* 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
@@ -108,7 +111,7 @@
* 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
diff --git a/plugins/org.eclipse.fordiac.ide.model.edit/src-gen/org/eclipse/fordiac/ide/model/libraryElement/provider/SegmentTypeItemProvider.java b/plugins/org.eclipse.fordiac.ide.model.edit/src-gen/org/eclipse/fordiac/ide/model/libraryElement/provider/SegmentTypeItemProvider.java
index 58c8e86..02fa1f2 100644
--- a/plugins/org.eclipse.fordiac.ide.model.edit/src-gen/org/eclipse/fordiac/ide/model/libraryElement/provider/SegmentTypeItemProvider.java
+++ b/plugins/org.eclipse.fordiac.ide.model.edit/src-gen/org/eclipse/fordiac/ide/model/libraryElement/provider/SegmentTypeItemProvider.java
@@ -26,19 +26,20 @@
import org.eclipse.fordiac.ide.model.libraryElement.LibraryElementFactory;
import org.eclipse.fordiac.ide.model.libraryElement.LibraryElementPackage;
import org.eclipse.fordiac.ide.model.libraryElement.SegmentType;
+import org.eclipse.fordiac.ide.ui.imageprovider.FordiacImage;
/**
* This is the item provider adapter for a
* {@link org.eclipse.fordiac.ide.model.libraryElement.SegmentType} object. <!--
* begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class SegmentTypeItemProvider extends CompilableTypeItemProvider {
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
public SegmentTypeItemProvider(AdapterFactory adapterFactory) {
@@ -48,7 +49,7 @@
/**
* This returns the property descriptors for the adapted class. <!--
* begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -66,7 +67,7 @@
* {@link org.eclipse.emf.edit.command.RemoveCommand} or
* {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -80,7 +81,7 @@
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -94,18 +95,18 @@
/**
* This returns SegmentType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
+ *
+ * @generated not
*/
@Override
public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/SegmentType")); //$NON-NLS-1$
+ return overlayImage(object, FordiacImage.ICON_SEGMENT.getImage());
}
/**
* This returns the label text for the adapted class. <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -119,7 +120,7 @@
* 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
@@ -138,7 +139,7 @@
* 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
diff --git a/plugins/org.eclipse.fordiac.ide.model.edit/src-gen/org/eclipse/fordiac/ide/model/libraryElement/provider/SimpleFBTypeItemProvider.java b/plugins/org.eclipse.fordiac.ide.model.edit/src-gen/org/eclipse/fordiac/ide/model/libraryElement/provider/SimpleFBTypeItemProvider.java
index f1c5fad..7cc508e 100644
--- a/plugins/org.eclipse.fordiac.ide.model.edit/src-gen/org/eclipse/fordiac/ide/model/libraryElement/provider/SimpleFBTypeItemProvider.java
+++ b/plugins/org.eclipse.fordiac.ide.model.edit/src-gen/org/eclipse/fordiac/ide/model/libraryElement/provider/SimpleFBTypeItemProvider.java
@@ -1,13 +1,13 @@
/**
* *******************************************************************************
* Copyright (c) 2008 - 2017 Profactor GmbH, TU Wien ACIN, fortiss GmbH
- *
+ *
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0.
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* Gerhard Ebenhofer, Alois Zoitl, Ingo Hegny, Monika Wenger, Martin Jobst
* - initial API and implementation and/or initial documentation
@@ -26,19 +26,20 @@
import org.eclipse.fordiac.ide.model.libraryElement.LibraryElementFactory;
import org.eclipse.fordiac.ide.model.libraryElement.LibraryElementPackage;
import org.eclipse.fordiac.ide.model.libraryElement.SimpleFBType;
+import org.eclipse.fordiac.ide.ui.imageprovider.FordiacImage;
/**
* This is the item provider adapter for a
* {@link org.eclipse.fordiac.ide.model.libraryElement.SimpleFBType} object.
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class SimpleFBTypeItemProvider extends BaseFBTypeItemProvider {
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
public SimpleFBTypeItemProvider(AdapterFactory adapterFactory) {
@@ -48,7 +49,7 @@
/**
* This returns the property descriptors for the adapted class. <!--
* begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -66,7 +67,7 @@
* {@link org.eclipse.emf.edit.command.RemoveCommand} or
* {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -80,7 +81,7 @@
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -94,18 +95,18 @@
/**
* This returns SimpleFBType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
+ *
+ * @generated not
*/
@Override
public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/SimpleFBType")); //$NON-NLS-1$
+ return overlayImage(object, FordiacImage.ICON_SIMPLE_FB.getImage());
}
/**
* This returns the label text for the adapted class. <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -119,7 +120,7 @@
* 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
@@ -138,7 +139,7 @@
* 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
diff --git a/plugins/org.eclipse.fordiac.ide.model.edit/src-gen/org/eclipse/fordiac/ide/model/libraryElement/provider/SubAppTypeItemProvider.java b/plugins/org.eclipse.fordiac.ide.model.edit/src-gen/org/eclipse/fordiac/ide/model/libraryElement/provider/SubAppTypeItemProvider.java
index d58fab5..d24c667 100644
--- a/plugins/org.eclipse.fordiac.ide.model.edit/src-gen/org/eclipse/fordiac/ide/model/libraryElement/provider/SubAppTypeItemProvider.java
+++ b/plugins/org.eclipse.fordiac.ide.model.edit/src-gen/org/eclipse/fordiac/ide/model/libraryElement/provider/SubAppTypeItemProvider.java
@@ -1,13 +1,13 @@
/**
* *******************************************************************************
* Copyright (c) 2008 - 2017 Profactor GmbH, TU Wien ACIN, fortiss GmbH
- *
+ *
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0.
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* Gerhard Ebenhofer, Alois Zoitl, Ingo Hegny, Monika Wenger, Martin Jobst
* - initial API and implementation and/or initial documentation
@@ -22,19 +22,20 @@
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.fordiac.ide.model.libraryElement.SubAppType;
+import org.eclipse.fordiac.ide.ui.imageprovider.FordiacImage;
/**
* This is the item provider adapter for a
* {@link org.eclipse.fordiac.ide.model.libraryElement.SubAppType} object. <!--
* begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class SubAppTypeItemProvider extends CompositeFBTypeItemProvider {
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
public SubAppTypeItemProvider(AdapterFactory adapterFactory) {
@@ -44,7 +45,7 @@
/**
* This returns the property descriptors for the adapted class. <!--
* begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -58,18 +59,18 @@
/**
* This returns SubAppType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
+ *
+ * @generated not
*/
@Override
public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/SubAppType")); //$NON-NLS-1$
+ return overlayImage(object, FordiacImage.ICON_SUB_APP.getImage());
}
/**
* This returns the label text for the adapted class. <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -83,7 +84,7 @@
* 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
@@ -96,7 +97,7 @@
* 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
diff --git a/plugins/org.eclipse.fordiac.ide.typemanagement/src/org/eclipse/fordiac/ide/typemanagement/navigator/FBTypeComposedAdapterFactory.java b/plugins/org.eclipse.fordiac.ide.typemanagement/src/org/eclipse/fordiac/ide/typemanagement/navigator/FBTypeComposedAdapterFactory.java
index a87b60b..9f1218b 100644
--- a/plugins/org.eclipse.fordiac.ide.typemanagement/src/org/eclipse/fordiac/ide/typemanagement/navigator/FBTypeComposedAdapterFactory.java
+++ b/plugins/org.eclipse.fordiac.ide.typemanagement/src/org/eclipse/fordiac/ide/typemanagement/navigator/FBTypeComposedAdapterFactory.java
@@ -1,6 +1,6 @@
/*******************************************************************************
* Copyright (c) 2011, 2017 TU Wien ACIN, fortiss GmbH
- *
+ *
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0.
@@ -34,7 +34,7 @@
}
private static List<AdapterFactory> createFactoryList() {
- ArrayList<AdapterFactory> factories = new ArrayList<AdapterFactory>();
+ List<AdapterFactory> factories = new ArrayList<>();
factories.add(new LibraryElementItemProviderAdapterFactory());
factories.add(new DataItemProviderAdapterFactory());
return factories;
diff --git a/plugins/org.eclipse.fordiac.ide.typemanagement/src/org/eclipse/fordiac/ide/typemanagement/navigator/FBTypeLabelProvider.java b/plugins/org.eclipse.fordiac.ide.typemanagement/src/org/eclipse/fordiac/ide/typemanagement/navigator/FBTypeLabelProvider.java
index deebf09..6e9a891 100644
--- a/plugins/org.eclipse.fordiac.ide.typemanagement/src/org/eclipse/fordiac/ide/typemanagement/navigator/FBTypeLabelProvider.java
+++ b/plugins/org.eclipse.fordiac.ide.typemanagement/src/org/eclipse/fordiac/ide/typemanagement/navigator/FBTypeLabelProvider.java
@@ -30,6 +30,7 @@
import org.eclipse.fordiac.ide.model.libraryElement.CompositeFBType;
import org.eclipse.fordiac.ide.model.libraryElement.FBType;
import org.eclipse.fordiac.ide.model.libraryElement.ServiceInterfaceFBType;
+import org.eclipse.fordiac.ide.model.libraryElement.SimpleFBType;
import org.eclipse.fordiac.ide.model.typelibrary.TypeLibrary;
import org.eclipse.fordiac.ide.model.typelibrary.TypeLibraryTags;
import org.eclipse.fordiac.ide.typemanagement.Activator;
@@ -77,6 +78,8 @@
return FordiacImage.ICON_BASIC_FB.getImage();
} else if (type instanceof CompositeFBType) {
return FordiacImage.ICON_COMPOSITE_FB.getImage();
+ } else if (type instanceof SimpleFBType) {
+ return FordiacImage.ICON_SIMPLE_FB.getImage();
} else if (type instanceof ServiceInterfaceFBType) {
return FordiacImage.ICON_SIFB.getImage();
}
diff --git a/plugins/org.eclipse.fordiac.ide.ui/src/org/eclipse/fordiac/ide/ui/imageprovider/FordiacImage.java b/plugins/org.eclipse.fordiac.ide.ui/src/org/eclipse/fordiac/ide/ui/imageprovider/FordiacImage.java
index a3926db..9f67af7 100644
--- a/plugins/org.eclipse.fordiac.ide.ui/src/org/eclipse/fordiac/ide/ui/imageprovider/FordiacImage.java
+++ b/plugins/org.eclipse.fordiac.ide.ui/src/org/eclipse/fordiac/ide/ui/imageprovider/FordiacImage.java
@@ -52,9 +52,9 @@
ICON_MONITORING_PERSPECTIVE, ICON_NEW_APPLICATION, ICON_NEW_FUNCTIONBLOCK, ICON_NEW_SYSTEM, ICON_OK, ICON_PLUGS,
ICON_PROPERTIES, ICON_REFRESH, ICON_REMOVE_WATCH, ICON_RESOURCE, ICON_RIGHT_INPUT_PRIMITIVE,
ICON_RIGHT_OUTPUT_PRIMITIVE, ICON_RUN_DEBUG, ICON_SEGMENT, ICON_SERVICE, ICON_SERVICE_SEQUENCE, ICON_SIFB,
- ICON_SUB_APP, ICON_SOCKETS, ICON_START, ICON_START_MONITORING, ICON_STOP, ICON_STRUCTURED_TEXT, ICON_SYSTEM,
- ICON_SYSTEM_CONFIGURATION, ICON_SYSTEM_EXPLORER, ICON_SYSTEM_PERSPECTIVE, ICON_TYPE_NAVIGATOR, ICON_TRANSACTION,
- ICON_TRIGGER_EVENT, ICON_WATCHES_VIEW, ICON_WATCH_INTERFACE_ELEMENTS,
+ ICON_SIMPLE_FB, ICON_SUB_APP, ICON_SOCKETS, ICON_START, ICON_START_MONITORING, ICON_STOP, ICON_STRUCTURED_TEXT,
+ ICON_SYSTEM, ICON_SYSTEM_CONFIGURATION, ICON_SYSTEM_EXPLORER, ICON_SYSTEM_PERSPECTIVE, ICON_TYPE_NAVIGATOR,
+ ICON_TRANSACTION, ICON_TRIGGER_EVENT, ICON_WATCHES_VIEW, ICON_WATCH_INTERFACE_ELEMENTS,
// to be deleted with removing the tester
ICON_FBTest, ICON_TestFailed, ICON_TestOK, ICON_NoTest, ICON_TesterTemplate,
