From f0b034a9a7d42babf68b04e0e4fa580e424eba7d Mon Sep 17 00:00:00 2001
From: Jan Belle
Date: Fri, 15 May 2020 20:51:30 +0200
Subject: [core.room] Remove compound protocols

Bug 563234

Change-Id: I40839986d6b390600b932b79053538ea9942eed8
---
 .../eclipse/etrice/core/ui/labeling/RoomLabelProvider.java | 14 --------------
 1 file changed, 14 deletions(-)

(limited to 'plugins/org.eclipse.etrice.core.room.ui/src')

diff --git a/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/labeling/RoomLabelProvider.java b/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/labeling/RoomLabelProvider.java
index 6ac514465..7638b51aa 100644
--- a/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/labeling/RoomLabelProvider.java
+++ b/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/labeling/RoomLabelProvider.java
@@ -29,7 +29,6 @@ import org.eclipse.etrice.core.room.ActorRef;
 import org.eclipse.etrice.core.room.Attribute;
 import org.eclipse.etrice.core.room.Binding;
 import org.eclipse.etrice.core.room.ClassStructor;
-import org.eclipse.etrice.core.room.CompoundProtocolClass;
 import org.eclipse.etrice.core.room.DataClass;
 import org.eclipse.etrice.core.room.EnumLiteral;
 import org.eclipse.etrice.core.room.EnumerationType;
@@ -48,7 +47,6 @@ import org.eclipse.etrice.core.room.RoomModel;
 import org.eclipse.etrice.core.room.SAP;
 import org.eclipse.etrice.core.room.SPP;
 import org.eclipse.etrice.core.room.ServiceImplementation;
-import org.eclipse.etrice.core.room.SubProtocol;
 import org.eclipse.etrice.core.room.SubSystemClass;
 import org.eclipse.etrice.core.room.SubSystemRef;
 import org.eclipse.etrice.core.room.util.RoomHelpers;
@@ -105,14 +103,6 @@ public class RoomLabelProvider extends FSMLabelProvider {
 		return "ProtocolClass.gif";
 	}
 
-	String image(CompoundProtocolClass pc) {
-		return "CompoundProtocolClass.gif";
-	}
-
-	String image(SubProtocol pc) {
-		return "SubProtocol.gif";
-	}
-
 	String image(ActorClass ac) {
 		return "ActorClass.gif";
 	}
@@ -242,10 +232,6 @@ public class RoomLabelProvider extends FSMLabelProvider {
 		return pc.getName()+base;
 	}
 
-	String text(SubProtocol pc) {
-		return pc.getName()+": "+pc.getProtocol().getName();
-	}
-
 	StyledString text(ActorClass ac) {
 		String base = ac.getActorBase()!=null? " extends "+ac.getActorBase().getName():"";
 		StyledString result = new StyledString(ac.getName()+base);
-- 
cgit v1.2.3