eclipse-archived#190 In progress TqCL-syntax and library services

Author: rtotaro

org.eclipse.triquetrum.commands.api/src/main/java/org/eclipse/triquetrum/commands/api/services/ActorDescriptor.java

@@ -0,0 +1,14 @@
+package org.eclipse.triquetrum.commands.api.services;
+
+public class ActorDescriptor extends EntityDescriptor {
+
+	public ActorDescriptor(String displayName, String clazz, String icon) {
+		super(displayName, clazz, icon);
+	}
+
+	@Override
+	public String getCategory() {
+		return "Actor";
+	}
+
+}

org.eclipse.triquetrum.commands.api/src/main/java/org/eclipse/triquetrum/commands/api/services/DirectorDescriptor.java

@@ -0,0 +1,15 @@
+package org.eclipse.triquetrum.commands.api.services;
+
+public class DirectorDescriptor extends EntityDescriptor {
+
+	public DirectorDescriptor(String displayName, String clazz, String icon) {
+		super(displayName, clazz, icon);
+		// TODO Auto-generated constructor stub
+	}
+
+	@Override
+	public String getCategory() {
+		return "Director";
+	}
+
+}

org.eclipse.triquetrum.commands.api/src/main/java/org/eclipse/triquetrum/commands/api/services/EntityDescriptor.java

@@ -0,0 +1,34 @@
+package org.eclipse.triquetrum.commands.api.services;
+
+public abstract class EntityDescriptor {
+	
+	private String clazz;
+	
+	private String displayName;
+
+	private String icon;
+
+	public EntityDescriptor(String displayName, String clazz, String icon) {
+		super();
+		this.displayName = displayName;
+		this.clazz = clazz;
+		this.icon = icon;
+	}
+
+	public String getClazz() {
+		return clazz;
+	}
+
+	public String getDisplayName() {
+		return displayName;
+	}
+
+	public String getIcon() {
+		return icon;
+	}
+	
+	public abstract String getCategory();
+	
+	
+	
+}

org.eclipse.triquetrum.commands.api/src/main/java/org/eclipse/triquetrum/commands/api/services/TqCLLibraryProvider.java

@@ -15,9 +15,9 @@
 
 public interface TqCLLibraryProvider {
 
-	public List<String> getActors(String library) throws TqCLLibraryException;
+	public List<ActorDescriptor> getActors(String library) throws TqCLLibraryException;
 
-	public List<String> getDirectors(String library) throws TqCLLibraryException;
+	public List<DirectorDescriptor> getDirectors(String library) throws TqCLLibraryException;
 
 	public List<String> getParameterTypes(String library) throws TqCLLibraryException;
 

org.eclipse.triquetrum.commands.api/src/main/java/org/eclipse/triquetrum/commands/api/services/impl/TcQLLibraryProviderProxy.java

@@ -17,6 +17,8 @@
 import java.util.Map;
 import java.util.Set;
 
+import org.eclipse.triquetrum.commands.api.services.ActorDescriptor;
+import org.eclipse.triquetrum.commands.api.services.DirectorDescriptor;
 import org.eclipse.triquetrum.commands.api.services.TqCLLibraryException;
 import org.eclipse.triquetrum.commands.api.services.TqCLLibraryProvider;
 
@@ -26,7 +28,7 @@ public class TcQLLibraryProviderProxy implements TqCLLibraryProvider {
 
 
 	@Override
-	public List<String> getActors(String library) throws TqCLLibraryException {
+	public List<ActorDescriptor> getActors(String library) throws TqCLLibraryException {
 		checkLibrary(library);
 		return libraryProviders.get(library).getActors(library);
 	}
@@ -39,7 +41,7 @@ private void checkLibrary(String library) throws TqCLLibraryException {
 	}
 
 	@Override
-	public List<String> getDirectors(String library) throws TqCLLibraryException {
+	public List<DirectorDescriptor> getDirectors(String library) throws TqCLLibraryException {
 		checkLibrary(library);
 		return libraryProviders.get(library).getDirectors(library);
 	}
@@ -95,11 +97,6 @@ public boolean hasElement(String element) {
 		return false;
 	}
 
-	public void setLibraryProviders(Collection<TqCLLibraryProvider> libraryProviders) {
-		for (TqCLLibraryProvider tqCLLibraryProvider : libraryProviders) {
-			addLibraryProvider(tqCLLibraryProvider);
-		}
-	}
 
 	public void addLibraryProvider(TqCLLibraryProvider tqCLLibraryProvider) {
 		Set<String> libraryNames = tqCLLibraryProvider.getLibraryNames();

org.eclipse.triquetrum.commands.xtext.ide/src/main/java-gen/org/eclipse/triquetrum/commands/ide/contentassist/antlr/internal/InternalTqcl.g

@@ -941,25 +941,25 @@ rule__Category__Alternatives
 :
 	(
 		{ before(grammarAccess.getCategoryAccess().getActorEnumLiteralDeclaration_0()); }
-		('actor')
+		('Actor')
 		{ after(grammarAccess.getCategoryAccess().getActorEnumLiteralDeclaration_0()); }
 	)
 	|
 	(
 		{ before(grammarAccess.getCategoryAccess().getParameterEnumLiteralDeclaration_1()); }
-		('parameter')
+		('Parameter')
 		{ after(grammarAccess.getCategoryAccess().getParameterEnumLiteralDeclaration_1()); }
 	)
 	|
 	(
 		{ before(grammarAccess.getCategoryAccess().getPortEnumLiteralDeclaration_2()); }
-		('port')
+		('Port')
 		{ after(grammarAccess.getCategoryAccess().getPortEnumLiteralDeclaration_2()); }
 	)
 	|
 	(
 		{ before(grammarAccess.getCategoryAccess().getDirectorEnumLiteralDeclaration_3()); }
-		('director')
+		('Director')
 		{ after(grammarAccess.getCategoryAccess().getDirectorEnumLiteralDeclaration_3()); }
 	)
 ;
@@ -4114,9 +4114,9 @@ rule__Insert__NameAssignment_4
 	}
 :
 	(
-		{ before(grammarAccess.getInsertAccess().getNameNamedObjParserRuleCall_4_0()); }
-		ruleNamedObj
-		{ after(grammarAccess.getInsertAccess().getNameNamedObjParserRuleCall_4_0()); }
+		{ before(grammarAccess.getInsertAccess().getNameSTRINGTerminalRuleCall_4_0()); }
+		RULE_STRING
+		{ after(grammarAccess.getInsertAccess().getNameSTRINGTerminalRuleCall_4_0()); }
 	)
 ;
 finally {

org.eclipse.triquetrum.commands.xtext.ide/src/main/java-gen/org/eclipse/triquetrum/commands/ide/contentassist/antlr/internal/InternalTqcl.tokens

@@ -10,12 +10,14 @@
 '=>'=29
 '>'=33
 '?'=34
+'Actor'=10
+'Director'=13
+'Parameter'=11
+'Port'=12
 '['=27
 ']'=28
-'actor'=10
 'as'=18
 'connect'=22
-'director'=13
 'extends'=35
 'extension'=43
 'go'=24
@@ -25,8 +27,6 @@
 'into'=40
 'library'=16
 'out'=41
-'parameter'=11
-'port'=12
 'set'=21
 'static'=42
 'super'=37