Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonas Ruettimann2011-05-27 14:38:00 +0000
committerJonas Ruettimann2011-06-07 12:11:58 +0000
commit1af4c3aaf566526d7a7a2606414167d0a2557861 (patch)
tree123f01ce656fadbf0c5121f9ff5ce14015bac0bc
parentc007b462ca5c3fe8f976ccbc47b3c489e5119872 (diff)
downloadorg.eclipse.amp-1af4c3aaf566526d7a7a2606414167d0a2557861.tar.gz
org.eclipse.amp-1af4c3aaf566526d7a7a2606414167d0a2557861.tar.xz
org.eclipse.amp-1af4c3aaf566526d7a7a2606414167d0a2557861.zip
Bug 347456: generate package name using the Agent's ID
-rw-r--r--org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd/src/org/eclipse/amp/amf/sd/util/PackageGetter.java11
-rw-r--r--org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd/src/org/eclipse/amp/amf/sd/util/PropertyGetter.java9
-rw-r--r--org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd/src/org/eclipse/amp/amf/sd/util/SrcGenGetter.java9
3 files changed, 16 insertions, 13 deletions
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd/src/org/eclipse/amp/amf/sd/util/PackageGetter.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd/src/org/eclipse/amp/amf/sd/util/PackageGetter.java
index 8f555285..1c0697a1 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd/src/org/eclipse/amp/amf/sd/util/PackageGetter.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd/src/org/eclipse/amp/amf/sd/util/PackageGetter.java
@@ -2,7 +2,6 @@ package org.eclipse.amp.amf.sd.util;
import org.metaabm.IAgentChild;
import org.metaabm.SAgent;
-import org.metaabm.SImplementation;
public class PackageGetter extends PropertyGetter {
@@ -10,9 +9,13 @@ public class PackageGetter extends PropertyGetter {
* @see org.metaabm.IAgentChild#getPackage()
*/
@Override
- String getAgentProperty(SAgent parent) {
- SImplementation impl = parent.getImplementation();
- return impl.getPackage() + "." + impl.getClassName().toLowerCase() + "agent_SD";
+ String getAgentProperty(SAgent agent) {
+ String packge = agent.getImplementation().getPackage();
+ if (packge == null || packge.length() == 0) {
+ packge = agent.getOwner().getImplementation().getPackage();
+ }
+
+ return packge + "." + agent.getID().toLowerCase() + "_SD";
}
public static final String getPackage(IAgentChild agentChild) {
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd/src/org/eclipse/amp/amf/sd/util/PropertyGetter.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd/src/org/eclipse/amp/amf/sd/util/PropertyGetter.java
index f42313de..f4390222 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd/src/org/eclipse/amp/amf/sd/util/PropertyGetter.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd/src/org/eclipse/amp/amf/sd/util/PropertyGetter.java
@@ -6,14 +6,9 @@ import org.metaabm.SAgent;
public abstract class PropertyGetter {
public String getProperty(IAgentChild agentChild) {
- SAgent parent = agentChild.getParent();
- if (parent.getImplementation().getPackage() == null) {
- parent = parent.getOwner();
- }
-
- return getAgentProperty(parent);
+ return getAgentProperty(agentChild.getParent());
}
- abstract String getAgentProperty(SAgent parent);
+ abstract String getAgentProperty(SAgent agent);
}
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd/src/org/eclipse/amp/amf/sd/util/SrcGenGetter.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd/src/org/eclipse/amp/amf/sd/util/SrcGenGetter.java
index 9305ecfa..a14aaa24 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd/src/org/eclipse/amp/amf/sd/util/SrcGenGetter.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.sd/src/org/eclipse/amp/amf/sd/util/SrcGenGetter.java
@@ -6,8 +6,13 @@ import org.metaabm.SAgent;
public class SrcGenGetter extends PropertyGetter {
@Override
- String getAgentProperty(SAgent parent) {
- return parent.getImplementation().getSrcDir();
+ String getAgentProperty(SAgent agent) {
+ String srcDir = agent.getImplementation().getSrcDir();
+ if (srcDir == null || srcDir.length() == 0) {
+ srcDir = agent.getOwner().getImplementation().getSrcDir();
+ }
+
+ return srcDir;
}
public static final String getSrcGen(IAgentChild agentChild) {

Back to the top