agent name changes removed in platformagent

actoron · Feb 22, 2021 · c4791ce · c4791ce
1 parent 163191d
commit c4791ce
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 11 deletions.
diff --git a/platform/base/src/main/java/jadex/platform/PlatformAgent.java b/platform/base/src/main/java/jadex/platform/PlatformAgent.java
@@ -377,9 +377,14 @@ else if (entry.getKey().lastModified() == moddates.get(entry.getKey()))
 			EnumInfo ei = (EnumInfo)ai.getValue("autostart");
 			if(ei==null)
 				System.out.println("No autostart agent: "+ci);
-			boolean ok = ei==null? true: "true".equals(ei.getValue().toLowerCase());
+
 			String name = ai.getValue("name")==null || ((String)ai.getValue("name")).length()==0? null: (String)ai.getValue("name");
 
+			if("rt".equals(name))
+				System.out.println("sdgjndfjk");
+
+			boolean ok = ei==null? true: "true".equals(ei.getValue().toLowerCase());
+
 			Boolean agentstart = null;
 			if(name!=null)
 			{
@@ -390,25 +395,31 @@ else if (entry.getKey().lastModified() == moddates.get(entry.getKey()))
 
 			if(agentstart==null)
 			{
-				name = SReflect.getUnqualifiedTypeName(ci.getClassName());
+				String typename = SReflect.getUnqualifiedTypeName(ci.getClassName());
 
-				if(getAgentStart(name.toLowerCase())!=null)
+				if(getAgentStart(typename.toLowerCase())!=null)
 				{	
-					ok = getAgentStart(name.toLowerCase());
+					ok = getAgentStart(typename.toLowerCase());
+					if(name==null)
+						name = typename;
 				}
 				else
 				{
 					// check classname - suffix (BDI/Agent etc) in lowercase
-					int suf = SUtil.inndexOfLastUpperCaseCharacter(name);
+					int suf = SUtil.inndexOfLastUpperCaseCharacter(typename);
 					if(suf>0)
 					{
-						name = name.substring(0, suf).toLowerCase();
-						if(getAgentStart(name)!=null)
+						typename = typename.substring(0, suf).toLowerCase();
+						if(getAgentStart(typename)!=null)
 						{	
-							ok = getAgentStart(name);
+							ok = getAgentStart(typename);
 						}
 					}
 				}
+
+				// only set name, if was not explicitly set
+				if(name==null)
+					name = typename;
 			}
 
 			if(ok)
@@ -422,7 +433,7 @@ else if (entry.getKey().lastModified() == moddates.get(entry.getKey()))
 		}
 
 		//for(CreationInfo ci: infos)
-		//	System.out.println("creating: "+ci.getFilename());
+		//	System.out.println("creating: "+ci);
 
 		agent.getFeature(ISubcomponentsFeature.class).createComponents(infos.toArray(new CreationInfo[infos.size()])).addResultListener(new IResultListener<Collection<IExternalAccess>>()
 		{
@@ -505,7 +516,7 @@ protected void addComponentToLevels(DependencyResolver<String> dr, ClassInfo ci,
 
 				String name = ai.getValue("name")==null || ((String)ai.getValue("name")).length()==0? null: (String)ai.getValue("name");
 //				String name = autostart.name().length()==0? null: autostart.name();
-
+								
 				EnumInfo ei = (EnumInfo)ai.getValue("autostart");
 
 				String val = ei.getValue();

diff --git a/platform/bridge/src/main/java/jadex/bridge/service/types/cms/CreationInfo.java b/platform/bridge/src/main/java/jadex/bridge/service/types/cms/CreationInfo.java
@@ -570,5 +570,15 @@ public CreationInfo setPojo(Object pojo)
 		this.pojo = pojo;
 		return this;
 	}
+
+	/**
+	 *  Get the string representation.
+	 *  @return The string representation.
+	 */
+	@Override
+	public String toString()
+	{
+		return "CreationInfo(name=" + name + ", filename=" + filename + ")";
+	}
 
 }
diff --git a/...port/src/main/java/jadex/platform/service/message/relaytransport/RelayTransportAgent.java b/...port/src/main/java/jadex/platform/service/message/relaytransport/RelayTransportAgent.java
@@ -46,7 +46,6 @@
 import jadex.commons.future.Future;
 import jadex.commons.future.IFuture;
 import jadex.commons.future.IIntermediateFuture;
-import jadex.commons.future.IIntermediateResultListener;
 import jadex.commons.future.IResultListener;
 import jadex.commons.future.ITerminableFuture;
 import jadex.commons.future.IntermediateEmptyResultListener;